diff --git a/NEWS b/NEWS index 3b7fb47559b1295148b135363bf6ead3b1600a48..963bea711c700e3cffe7f7b48b156b49a6cd80f1 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ Version 1.4.2 * Use the news virtual_memory() and virtual_swap() fct (PsUtil) * Display "Top process" in logs + * Minor patch on man page for Debian packaging + * Code optimization (less try and except) Version 1.4.1.1 =============== diff --git a/glances/glances.py b/glances/glances.py index 1778acffc90a6620787bce21f5ff8cc115d3f367..6cbdd4ade1897d78c7a36fd3b2a4944eb8899b81 100755 --- a/glances/glances.py +++ b/glances/glances.py @@ -20,7 +20,7 @@ # __appname__ = 'glances' -__version__ = "1.4.2b" +__version__ = "1.4.2" __author__ = "Nicolas Hennion " __licence__ = "LGPL" diff --git a/man/glances.1 b/man/glances.1 index f42564e6cd69d34633ff1165ec373b0c245e2c73..02bddbe41376ba2a31db73b3b66db37bd2e1a074 100644 --- a/man/glances.1 +++ b/man/glances.1 @@ -1,4 +1,4 @@ -.TH glances 1 "January, 2012" "version 1.3.7" "USER COMMANDS" +.TH glances 1 "September, 2012" "version 1.4.2" "USER COMMANDS" .SH NAME glances \- CLI curses based monitoring tool .SH SYNOPSIS @@ -7,7 +7,7 @@ glances \- CLI curses based monitoring tool .SH DESCRIPTION Glances is a free (LGPL) curses-based monitoring tool which aims to present a maximum of information in a minimum of space, ideally to fit in a classical 80x24 terminal. Glances can adapt dynamicaly the -displayed informations depending on the terminal size. +displayed information depending on the terminal size. .PP This tool is written in Python and uses PsUtil to fetch the statistical values from key elements. .PP @@ -36,13 +36,31 @@ process number and details. .SH OPTIONS .TP .TP +\-b +Display network rate in Byte per second +.TP +\-d +Disable disk I/O module +.TP +\-f file +Set the output folder (HTML) or file (CSV) +.TP \-h Display the syntax and exit .TP -\-t -Set the refresh time in second default is 1 +\-m +Disable mount module +.TP +\-n +Disable network module +.TP +\-o output +Define additional output (available: HTML or CSV) +.TP +\-t sec +Set the refresh time in seconds (default: 2) .TP --v +\-v Display the version and exit .SH EXAMPLES .TP diff --git a/setup.py b/setup.py index a10708bdc4903f535bfa05c4d6a09ee519147659..a2d9fb083c919d02f22ab9ff217b473114d9cb4c 100755 --- a/setup.py +++ b/setup.py @@ -23,8 +23,8 @@ for mo in glob('i18n/*/LC_MESSAGES/*.mo'): data_files.append((dirname(mo).replace('i18n/', 'share/locale/'), [mo])) setup(name='Glances', - version='1.4.1.1', - download_url='https://github.com/downloads/nicolargo/glances/glances-1.4.1.1.tar.gz', + version='1.4.2', + download_url='https://github.com/downloads/nicolargo/glances/glances-1.4.2.tar.gz', url='https://github.com/nicolargo/glances', description='CLI curses-based monitoring tool', author='Nicolas Hennion',