Correct merge issue with master

This commit is contained in:
Nicolargo 2014-12-13 22:43:18 +01:00
commit e8417b7c76
3 changed files with 4 additions and 4 deletions

2
NEWS
View File

@ -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

View File

@ -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>

View File

@ -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).