Fix terminology, replace 'actual' by 'current'.

Closes: https://bugs.debian.org/739642

4 files changed, 11 insertions, 11 deletions

diff --git a/NEWS b/NEWS
index c3efed8..e8ea831 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ o Releases are now gpg signed with key "4096R/4D23A27E 2013-05-26"
 0.5
 ~~~
 o Adapt the display to the maximum pid width
-o Include both total and actual disk bandwidth in the summary
+o Include both total and current disk bandwidth in the summary
 o Conversion to Python 3
 o Installation to sbin instead of bin
 
diff --git a/THANKS b/THANKS
index af1d6b2..a6ee349 100644
--- a/THANKS
+++ b/THANKS
@@ -47,4 +47,4 @@ Ka-Hing Cheung <kcheung@riverbed.com>
     Contributed code to show custom thread names.
 
 Igor Bazhitov <ibazhitov@parallels.com>
-    Contributed the differentiation between total and actual I/O.
+    Contributed the differentiation between total and current I/O.
diff --git a/iotop.8 b/iotop.8
index 68d9edd..6908a28 100644
--- a/iotop.8
+++ b/iotop.8
@@ -20,10 +20,10 @@ In addition, the total I/O bandwidth read and written during the sampling
 period is displayed at the top of the interface.
 \fBTotal DISK READ\fR and \fBTotal DISK WRITE\fR values represent total read
 and write bandwidth between processes and kernel threads on the one side and
-kernel block device subsystem on the other. While \fBActual DISK READ\fR and
-\fBActual DISK WRITE\fR values represent corresponding bandwidths for actual
+kernel block device subsystem on the other. While \fBCurrent DISK READ\fR and
+\fBCurrent DISK WRITE\fR values represent corresponding bandwidths for current
 disk I/O between kernel block device subsystem and underlying hardware (HDD, SSD, etc.).
-Thus \fBTotal\fR and \fBActual\fR values may not be equal at any given moment of time
+Thus \fBTotal\fR and \fBCurrent\fR values may not be equal at any given moment of time
 due to data caching and I/O operations reordering that take place inside Linux kernel.
 .PP
 Use the left and right arrows to change the sorting, r to reverse the
diff --git a/iotop/ui.py b/iotop/ui.py
index 31a9ae4..6d4305c 100644
--- a/iotop/ui.py
+++ b/iotop/ui.py
@@ -171,8 +171,8 @@ class IOTopUI(object):
             poll.register(sys.stdin.fileno(), select.POLLIN | select.POLLPRI)
         while self.options.iterations is None or \
               iterations < self.options.iterations:
-            total, actual = self.process_list.refresh_processes()
-            self.refresh_display(iterations == 0, total, actual,
+            total, current = self.process_list.refresh_processes()
+            self.refresh_display(iterations == 0, total, current,
                                  self.process_list.duration)
             if self.options.iterations is not None:
                 iterations += 1
@@ -440,14 +440,14 @@ class IOTopUI(object):
             del processes[self.height - 2:]
         return list(map(format, processes))
 
-    def refresh_display(self, first_time, total, actual, duration):
+    def refresh_display(self, first_time, total, current, duration):
         summary = [
                 'Total DISK READ : %s | Total DISK WRITE : %s' % (
                 format_bandwidth(self.options, total[0], duration).rjust(14),
                 format_bandwidth(self.options, total[1], duration).rjust(14)),
-                'Actual DISK READ: %s | Actual DISK WRITE: %s' % (
-                format_bandwidth(self.options, actual[0], duration).rjust(14),
-                format_bandwidth(self.options, actual[1], duration).rjust(14))
+                'Current DISK READ: %s | Current DISK WRITE: %s' % (
+                format_bandwidth(self.options, current[0], duration).rjust(14),
+                format_bandwidth(self.options, current[1], duration).rjust(14))
         ]
 
         pid = max(0, (MAX_PID_WIDTH - 3)) * ' '