diff options
| author | Alessio Sergi <al3hex@gmail.com> | 2014-06-14 12:44:24 +0200 |
|---|---|---|
| committer | Alessio Sergi <al3hex@gmail.com> | 2014-06-14 12:52:26 +0200 |
| commit | c29ddd58bf64fc81abe18ebcd2bbaf12c0e61ef5 (patch) | |
| tree | c9370af4e72c566093c915298057b641b0628620 /docs/glances-doc.rst | |
| parent | 09bdb9de74281553bca86fc0746493ad1987d1ce (diff) | |
Fix leftovers from merge conflict
Diffstat (limited to 'docs/glances-doc.rst')
| -rw-r--r-- | docs/glances-doc.rst | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/docs/glances-doc.rst b/docs/glances-doc.rst index cea11d38..2eb929ff 100644 --- a/docs/glances-doc.rst +++ b/docs/glances-doc.rst @@ -462,7 +462,7 @@ The number of processes in the list is adapted to the screen size. ``MEM%`` % of MEM used by the process ``VIRT`` - Total program size aka Virtual Memory Size (VMS) + Total program size - Virtual Memory Size (VMS) ``RES`` Resident Set Size (RSS) ``PID`` @@ -495,7 +495,7 @@ Process status legend: ``Z`` Zombie -*Note*: limits values can be overwritten in the configuration file under +*Note*: limit values can be overwritten in the configuration file under the ``[process]`` section. Monitored Processes List @@ -597,38 +597,8 @@ API Documentation Glances uses a `XML-RPC server`_ and can be used by another client software. -<<<<<<< HEAD -API documentation is available at https://github.com/nicolargo/glances/wiki/The-Glances-API-How-To - -Other outputs -============= - -Thanks to the -o (output) option, it is possible to export statistics to `CSV` or `HTML` files. - -.. code-block:: console - - $ glances -o CSV -f /tmp - -The CSV output file is named ``glances.csv``. - -CSV files have on line per stats: - -- load,load1,load5,load15 -- mem,total,used,free -- swap,total,used,free -- cpu,user,system,nice,idle,iowait,irq - -.. code-block:: console - - $ glances -o HTML -f /tmp - -The HTML output file is named ``glances.html``. - -*Note*: The css and img folders (glances/data) should be in the /tmp folder. -======= API documentation is available at https://github.com/nicolargo/glances/wiki/The-Glances-2.x-API-How-to. ->>>>>>> release/v2.0 Support ======= |