diff options
| author | Nicolargo <nicolas@nicolargo.com> | 2014-12-13 22:43:18 +0100 |
|---|---|---|
| committer | Nicolargo <nicolas@nicolargo.com> | 2014-12-13 22:43:18 +0100 |
| commit | e8417b7c76fff71002f4a994496a972d2270497c (patch) | |
| tree | 5097dcdb62630039774e3f640b4d9f8b876dbe7b | |
| parent | f5747a5b00d308d5af10cb60d92c63a4868bef60 (diff) | |
| parent | 54b1efab687a66d93d862ceb0b9b10609d5e3140 (diff) | |
Correct merge issue with masterv2.2
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | docs/glances-doc.html | 2 | ||||
| -rw-r--r-- | docs/glances-doc.rst | 4 |
3 files changed, 4 insertions, 4 deletions
@@ -57,7 +57,7 @@ Version 2.1 or by pressing the ENTER key in the curse interface. For the moment, process filter feature is only available in standalone mode. * Add extended processes informations for top process - Top process stats availables: CPU affinity, extended memory information (shared, text, lib, datat, dirty, swap), openned threads/files and TCP/UDP network sessions, IO nice level + Top process stats availables: CPU affinity, extended memory information (shared, text, lib, datat, dirty, swap), open threads/files and TCP/UDP network sessions, IO nice level For the moment, extended processes stats are only available in standalone mode. * Add --process-short-name tag and '/' key to switch between short/command line * Create a max_processes key in the configuration file diff --git a/docs/glances-doc.html b/docs/glances-doc.html index 26412c31..a4462130 100644 --- a/docs/glances-doc.html +++ b/docs/glances-doc.html @@ -755,7 +755,7 @@ User cans switch to the process name by pressing on the <tt class="docutils lite <ul class="simple"> <li>CPU affinity (number of cores used by the process)</li> <li>Extended memory information (swap, shared, text, lib, data and dirty on Linux)</li> -<li>Openned threads, files and network sessions (TCP and UDP)</li> +<li>Open threads, files and network sessions (TCP and UDP)</li> <li>IO nice level</li> </ul> <p>The extended stats feature could be enabled using the --enable-process-extended option (command line) or the <tt class="docutils literal">e</tt> key (curses interface).</p> diff --git a/docs/glances-doc.rst b/docs/glances-doc.rst index fa0dc956..90531f9d 100644 --- a/docs/glances-doc.rst +++ b/docs/glances-doc.rst @@ -577,8 +577,8 @@ In standalone mode, additionals informations are provided for the top process: * CPU affinity (number of cores used by the process) * Extended memory information (swap, shared, text, lib, data and dirty on Linux) -* Openned threads, files and network sessions (TCP and UDP) -* IO nice level +* Open threads, files and network sessions (TCP and UDP) +* IO nice level The extended stats feature could be enabled using the --enable-process-extended option (command line) or the ``e`` key (curses interface). |