diff options
| author | Nicolas Hennion <nicolas@nicolargo.com> | 2014-03-22 12:54:51 +0100 |
|---|---|---|
| committer | Nicolas Hennion <nicolas@nicolargo.com> | 2014-03-22 12:54:51 +0100 |
| commit | 0259a7293841152f07ac6b65d12cb3f29ad53e8e (patch) | |
| tree | 9a4e064da9d9a7ff505f0c4fdc3c0c86573b5109 | |
| parent | 64d6cfb22b5e86d39a64eb012767d8c79f609519 (diff) | |
| parent | f71caa27fc841f7bfd4bf6938e45851bd189e924 (diff) | |
Merge branch 'master' of github.com:nicolargo/glances
| -rw-r--r-- | docs/glances-doc.rst | 2 | ||||
| -rw-r--r-- | glances/glances.py | 6 | ||||
| -rw-r--r-- | man/glances.1 | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/docs/glances-doc.rst b/docs/glances-doc.rst index 0290ed54..a3fbf2a9 100644 --- a/docs/glances-doc.rst +++ b/docs/glances-doc.rst @@ -147,7 +147,7 @@ The following commands (key pressed) are supported while in Glances: ``y`` Show/hide hddtemp stats (only available with -y flag) ``z`` - Show/hide processes list(for low CPU consumption) + Show/hide processes list (for low CPU consumption) ``1`` Switch between global CPU and per-CPU stats diff --git a/glances/glances.py b/glances/glances.py index 9c625dd9..cef32811 100644 --- a/glances/glances.py +++ b/glances/glances.py @@ -1206,7 +1206,7 @@ class GlancesGrabProcesses: procstat['name'] = proc.name() except TypeError: procstat['name'] = proc.name - + # Process username (cached with internal cache) try: @@ -3811,7 +3811,7 @@ class glancesScreen: except UnicodeEncodeError: self.term_window.addnstr(monitor_y + 3 + processes, process_x + process_name_x, - process_name, max_process_name) + process_name, max_process_name) def displayCaption(self, cs_status="None"): """ @@ -3991,7 +3991,7 @@ class glancesScreen: [_("h"), _("Show/hide this help screen")], [_("t"), _("View network I/O as combination")], [_("u"), _("View cumulative network I/O")], - [_("z"), _("Show/hide processes list (low CPU usage)")], + [_("z"), _("Show/hide processes list")], [_("q"), _("Quit (Esc and Ctrl-C also work)")]] key_table_x = self.help_x + 38 key_table_y = limits_table_y + 1 diff --git a/man/glances.1 b/man/glances.1 index 5edaaf45..120c9110 100644 --- a/man/glances.1 +++ b/man/glances.1 @@ -135,6 +135,9 @@ Delete finished warning and critical log messages .B y Show/hide hddtemp stats (only available with \-y flag) .TP +.B z +Show/hide processes list (for low CPU consumption) +.TP .B 1 Switch between global CPU and per-CPU stats .SH EXAMPLES |