version 1.4.1v1.4.1

12 files changed, 137 insertions, 77 deletions

diff --git a/NEWS b/NEWS
index 7794948e..318cf3c4 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Version 1.4.1
 
 	* Per core CPU stats (if space is available)
 	* Add Process IO Read/Write information (if space is available)
+	* Uniformize units
 
 Version 1.4
 ===========
diff --git a/README b/README
index f72f4193..c5f9a582 100644
--- a/README
+++ b/README
@@ -12,8 +12,14 @@ Glances uses the PsUtil library to get information from your system.
 
 It is developed in Python.
 
+Console (80x24) screenshot:
+
 ![screenshot](https://github.com/nicolargo/glances/raw/master/screenshot.png)
 
+Wide terminal (> 90x24) screenshot:
+
+![screenshot](https://github.com/nicolargo/glances/raw/master/screenshot-wide.png)
+
 ## Installation
 
 Pre-requisites (information for packagers):
@@ -29,36 +35,40 @@ Pre-requisites (information for packagers):
 
 Packages exist for Arch, Fedora, Redhat, FreeBSD...
 
-### From PPA (easy way for Ubuntu/Mint...)
+### From PyPi (easy and cross platform way)
 
-Arnaud Hartmann (thanks to him !) maintains a PPA with the latest Glances version:
+PyPi is an official Python package manager.
 
-The PPA is available for Ubuntu version 9.10 to 12.04.
+You first need to install pypi on your system. For example on Debian/Ubuntu:
 
-To install the PPA just enter:
+    $ sudo apt-get install python-pip build-essential python-dev
 
-        $ sudo add-apt-repository ppa:arnaud-hartmann/glances-stable
-        $ sudo apt-get update
+Then install the latest Glances version:
 
-Then install Glances:
+    $ sudo pip install glances
+        
+Note: if you are behind an HTTP Proxy, you should use
 
-        $ sudo apt-get install glances
+    $ sudo pip install --proxy=user:password@url:port glances
 
-### From PyPi (easy way)
+### From PPA (easy way for Ubuntu/Mint...)
 
-PyPi is an official Python package manager.
+Arnaud Hartmann (thanks to him !) maintains a PPA with the latest Glances version:
 
-You first need to install pypi on your system. For example on Debian/Ubuntu:
+The PPA is available for Ubuntu version 9.10 to 12.04.
 
-        $ sudo apt-get install python-pip build-essential python-dev
+To install the PPA just enter:
 
-Then install the latest Glances version:
+    $ sudo add-apt-repository ppa:arnaud-hartmann/glances-stable
+    $ sudo apt-get update
 
-        $ sudo pip install glances
+Then install Glances:
+
+    $ sudo apt-get install glances
 
 ### From [Homebrew](http://mxcl.github.com/homebrew/) via PyPi (OS X)
 
-	$ brew install brew-pip
+    $ brew install brew-pip
 	$ export PYTHONPATH=$(brew --prefix)/lib/python2.7/site-packages
 	$ brew pip Glances
 
@@ -66,13 +76,15 @@ Then install the latest Glances version:
 
 Get the latest version:
 
-	$ wget https://github.com/downloads/nicolargo/glances/glances-1.4.tar.gz
+	$ rm -rf /tm/nicolargo-glances-* 
+    $ wget -O /tmp/glances-last.tgz https://github.com/nicolargo/glances/tarball/master
 
-Glances use a standard GNU style installer:
+Glances use a standard GNU style installer (for a Debian like system):
 
     $ sudo apt-get install python-setuptools build-essential python-dev
-	$ tar zxvf glances-1.4.tar.gz
-	$ cd glances-1.4
+    $ cd /tmp
+	$ tar zxvf glances-last.tgz
+	$ cd nicolargo-glances-*
 	$ sudo python setup.py install
 
 ## Running
@@ -121,8 +133,14 @@ The header shows the host name and the operating system name, version and archit
 
 ### CPU
 
+Short view:
+
 ![screenshot](https://github.com/nicolargo/glances/raw/master/doc/cpu.png)
 
+Long view (only available if your terminal is wide enough)
+
+![screenshot](https://github.com/nicolargo/glances/raw/master/doc/cpu-wide.png)
+
 The CPU stats are shown as a percentage and for the configured refresh
 time. The total CPU usage is displayed on the first line.
 
@@ -184,7 +202,7 @@ If memory is > 90%, then status is set to "CRITICAL".
 
 ![screenshot](https://github.com/nicolargo/glances/raw/master/doc/network.png)
 
-Glances displays the network interface bit rate. The unit is adapted
+Glances display the network interface bit rate. The unit is adapted
 dynamicaly (bits per second, Kbits per second, Mbits per second...).
 
 Alerts are set only if the network interface maximum speed is available.
@@ -204,7 +222,7 @@ if the bit rate is higher than 70 Mbps.
 
 ![screenshot](https://github.com/nicolargo/glances/raw/master/doc/diskio.png)
 
-Glances display the disk I/O throughput. The unit is adapted dynamically
+Glances displays the disk I/O throughput. The unit is adapted dynamically
 (bytes per second, Kbytes per second, Mbytes per second...).
 
 There is no alert on this information.
@@ -213,7 +231,7 @@ There is no alert on this information.
 
 ![screenshot](https://github.com/nicolargo/glances/raw/master/doc/fs.png)
 
-Glances display the total and used filesytem disk space. The unit is
+Glances displays the total and used filesytem disk space. The unit is
 adapted dynamically (bytes per second, Kbytes per second, Mbytes per
 second...).
 
@@ -229,8 +247,14 @@ If disk used is > 90%, then status is set to "CRITICAL".
 
 ### Processes
 
+Short view:
+
 ![screenshot](https://github.com/nicolargo/glances/raw/master/doc/processlist.png)
 
+Long view (only available if your terminal is wide enough)
+
+![screenshot](https://github.com/nicolargo/glances/raw/master/doc/processlist-wide.png)
+
 Glances displays a summary and a list of processes.
 
 By default (or if you hit the 'a' key) the process list is automatically
@@ -253,6 +277,7 @@ The number of processes in the list is adapted to the screen size.
    T - Traced or stopped
    Z - Zombie or "hung" process
 
+* IO READ and WRITE: Per process IO read and write
 * TIME+:  Cumulative CPU time used
 * NAME: Process name or command line
 
@@ -286,11 +311,3 @@ i18n_francais_generate.sh
 
 To generate spanish locale execute as root or sudo :
 i18n_espanol_generate.sh
-
-## Todo
-
-You are welcome to contribute to this software.
-
-* Code optimization
-* Port to FreeBSD and Mac OS X
-* Documentation for HTML and CVS export option
diff --git a/README-fr b/README-fr
index b5a82b74..a7a9108c 100644
--- a/README-fr
+++ b/README-fr
@@ -12,8 +12,14 @@ système d'exploitation GNU/Linux ou BSD à partir d'une interface texte.
 Glances utilise la librairie PsUtil pour récupérer les informations de
 votre système. Il est développé en Python.
 
+Copie d'écran sur une console:
+
 ![screenshot](https://github.com/nicolargo/glances/raw/master/screenshot.png)
 
+Copie d'écran sur un terminal avec une taille importante:
+
+![screenshot](https://github.com/nicolargo/glances/raw/master/screenshot-wide.png)
+
 ## Installation
 
 Glances a besoin des dépendances suivantes:
@@ -32,18 +38,6 @@ Le processus de packaging est actuellement en cours sur d'autres distribs, je
 vous conseille donc de rechercher Glances sur votre gestionnaire de package
 avant de faire une installation depuis les sources.
 
-### Depuis le PPA (Ubuntu/Mint)
-
-Arnaud Hartmann maintient un PPA avec la version stable de Glances.
-
-Pour installer Glances à partir de ce PPA, il suffit de saisir:
-
-	$ sudo add-apt-repository ppa:arnaud-hartmann/glances-stable
-	$ sudo apt-get update
-	$ sudo apt-get install glances
-
-Le PPA propose les paquets pour les versions Ubuntu 9.10 jusqu'à 12.04.
-
 ### Depuis PyPi
 
 PyPi est un gestionnaire officiel des paquets Python.
@@ -57,6 +51,22 @@ Puis on installe la dernière version de Glances:
 
         $ sudo pip install glances
 
+Note: si vous êtes derrière un Proxy alors il faut utiliser
+
+    $ sudo pip install --proxy=user:password@url:port glances
+
+### Depuis le PPA (Ubuntu/Mint)
+
+Arnaud Hartmann maintient un PPA avec la version stable de Glances.
+
+Pour installer Glances à partir de ce PPA, il suffit de saisir:
+
+	$ sudo add-apt-repository ppa:arnaud-hartmann/glances-stable
+	$ sudo apt-get update
+	$ sudo apt-get install glances
+
+Le PPA propose les paquets pour les versions Ubuntu 9.10 jusqu'à 12.04.
+
 ### Depuis [Homebrew](http://mxcl.github.com/homebrew/) et pat PyPi (pour OS X)
 
         $ brew install brew-pip
@@ -70,15 +80,17 @@ Le projet Glances est hébergé sur GitHUB: https://github.com/nicolargo/glances
 Pour l'installer, il suffit de suivre les instructions suivantes depuis un
 terminal.
 
-Récupération de la dernière version (1.4):
+Récupération de la dernière version:
 
-	$ wget https://github.com/downloads/nicolargo/glances/glances-1.4.tar.gz
+	$ rm -rf /tm/nicolargo-glances-* 
+    $ wget -O /tmp/glances-last.tgz https://github.com/nicolargo/glances/tarball/master
 
-Procédez ensuite à l'installation:
+Procédez ensuite à l'installation (exemple pour un system Debian):
 
-	$ sudo apt-get install python-setuptools build-essential python-dev
-    $ tar zxvf glances-1.4.tar.gz
-	$ cd glances-1.4
+    $ sudo apt-get install python-setuptools build-essential python-dev
+    $ cd /tmp
+	$ tar zxvf glances-last.tgz
+	$ cd nicolargo-glances-*
 	$ sudo python setup.py install
 
 ## Lancement de Glances
@@ -132,8 +144,14 @@ qu'une information sur le système d'exploitation (nom, version).
 
 ### CPU
 
+Vue par défaut:
+
 ![screenshot](https://github.com/nicolargo/glances/raw/master/doc/cpu.png)
 
+Vue si la taille du terminal est suffisante:
+
+![screenshot](https://github.com/nicolargo/glances/raw/master/doc/cpu-wide.png)
+
 L'état de la CPU est affiché par un pourcentage de l'utilisation globale.
 
 ![screenshot](https://github.com/nicolargo/glances/raw/master/doc/percpu.png)
@@ -242,8 +260,14 @@ Si l'espace disque utilisé est > 90%, alors le status est "CRITICAL".
 
 ### Les processus
 
+Vue par défaut:
+
 ![screenshot](https://github.com/nicolargo/glances/raw/master/doc/processlist.png)
 
+Vue sur grand écran:
+
+![screenshot](https://github.com/nicolargo/glances/raw/master/doc/processlist-wide.png)
+
 Glances affiche un résumé sur l'état des processus ainsi qu'une liste
 détaillée.
 
diff --git a/README.md b/README.md
index ea593088..c5f9a582 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,14 @@ Glances uses the PsUtil library to get information from your system.
 
 It is developed in Python.
 
+Console (80x24) screenshot:
+
 ![screenshot](https://github.com/nicolargo/glances/raw/master/screenshot.png)
 
+Wide terminal (> 90x24) screenshot:
+
+![screenshot](https://github.com/nicolargo/glances/raw/master/screenshot-wide.png)
+
 ## Installation
 
 Pre-requisites (information for packagers):
@@ -29,36 +35,40 @@ Pre-requisites (information for packagers):
 
 Packages exist for Arch, Fedora, Redhat, FreeBSD...
 
-### From PPA (easy way for Ubuntu/Mint...)
+### From PyPi (easy and cross platform way)
 
-Arnaud Hartmann (thanks to him !) maintains a PPA with the latest Glances version:
+PyPi is an official Python package manager.
 
-The PPA is available for Ubuntu version 9.10 to 12.04.
+You first need to install pypi on your system. For example on Debian/Ubuntu:
 
-To install the PPA just enter:
+    $ sudo apt-get install python-pip build-essential python-dev
 
-        $ sudo add-apt-repository ppa:arnaud-hartmann/glances-stable
-        $ sudo apt-get update
+Then install the latest Glances version:
 
-Then install Glances:
+    $ sudo pip install glances
+        
+Note: if you are behind an HTTP Proxy, you should use
 
-        $ sudo apt-get install glances
+    $ sudo pip install --proxy=user:password@url:port glances
 
-### From PyPi (easy way)
+### From PPA (easy way for Ubuntu/Mint...)
 
-PyPi is an official Python package manager.
+Arnaud Hartmann (thanks to him !) maintains a PPA with the latest Glances version:
 
-You first need to install pypi on your system. For example on Debian/Ubuntu:
+The PPA is available for Ubuntu version 9.10 to 12.04.
 
-        $ sudo apt-get install python-pip build-essential python-dev
+To install the PPA just enter:
 
-Then install the latest Glances version:
+    $ sudo add-apt-repository ppa:arnaud-hartmann/glances-stable
+    $ sudo apt-get update
 
-        $ sudo pip install glances
+Then install Glances:
+
+    $ sudo apt-get install glances
 
 ### From [Homebrew](http://mxcl.github.com/homebrew/) via PyPi (OS X)
 
-	$ brew install brew-pip
+    $ brew install brew-pip
 	$ export PYTHONPATH=$(brew --prefix)/lib/python2.7/site-packages
 	$ brew pip Glances
 
@@ -66,13 +76,15 @@ Then install the latest Glances version:
 
 Get the latest version:
 
-	$ wget https://github.com/downloads/nicolargo/glances/glances-1.4.tar.gz
+	$ rm -rf /tm/nicolargo-glances-* 
+    $ wget -O /tmp/glances-last.tgz https://github.com/nicolargo/glances/tarball/master
 
-Glances use a standard GNU style installer:
+Glances use a standard GNU style installer (for a Debian like system):
 
     $ sudo apt-get install python-setuptools build-essential python-dev
-	$ tar zxvf glances-1.4.tar.gz
-	$ cd glances-1.4
+    $ cd /tmp
+	$ tar zxvf glances-last.tgz
+	$ cd nicolargo-glances-*
 	$ sudo python setup.py install
 
 ## Running
@@ -121,8 +133,14 @@ The header shows the host name and the operating system name, version and archit
 
 ### CPU
 
+Short view:
+
 ![screenshot](https://github.com/nicolargo/glances/raw/master/doc/cpu.png)
 
+Long view (only available if your terminal is wide enough)
+
+![screenshot](https://github.com/nicolargo/glances/raw/master/doc/cpu-wide.png)
+
 The CPU stats are shown as a percentage and for the configured refresh
 time. The total CPU usage is displayed on the first line.
 
@@ -229,8 +247,14 @@ If disk used is > 90%, then status is set to "CRITICAL".
 
 ### Processes
 
+Short view:
+
 ![screenshot](https://github.com/nicolargo/glances/raw/master/doc/processlist.png)
 
+Long view (only available if your terminal is wide enough)
+
+![screenshot](https://github.com/nicolargo/glances/raw/master/doc/processlist-wide.png)
+
 Glances displays a summary and a list of processes.
 
 By default (or if you hit the 'a' key) the process list is automatically
@@ -253,6 +277,7 @@ The number of processes in the list is adapted to the screen size.
    T - Traced or stopped
    Z - Zombie or "hung" process
 
+* IO READ and WRITE: Per process IO read and write
 * TIME+:  Cumulative CPU time used
 * NAME: Process name or command line
 
@@ -286,11 +311,3 @@ i18n_francais_generate.sh
 
 To generate spanish locale execute as root or sudo :
 i18n_espanol_generate.sh
-
-## Todo
-
-You are welcome to contribute to this software.
-
-* Code optimization
-* Port to FreeBSD and Mac OS X
-* Documentation for HTML and CVS export option
diff --git a/TODO b/TODO
index d54f73ff..662aec1b 100644
--- a/TODO
+++ b/TODO
@@ -1 +1,2 @@
 - Include in the Debian repos (contributors needed)
+- Update the PPA with the latest version
diff --git a/doc/cpu-wide.png b/doc/cpu-wide.png
new file mode 100644
index 00000000..59ceaea1
--- /dev/null
+++ b/doc/cpu-wide.png
diff --git a/doc/cpu.png b/doc/cpu.png
index 71ea2717..257e186c 100644
--- a/doc/cpu.png
+++ b/doc/cpu.png
diff --git a/doc/processlist-wide.png b/doc/processlist-wide.png
new file mode 100644
index 00000000..9fc7ff74
--- /dev/null
+++ b/doc/processlist-wide.png
diff --git a/doc/processlist.png b/doc/processlist.png
index f76c1e32..cf0df9ab 100644
--- a/doc/processlist.png
+++ b/doc/processlist.png
diff --git a/screenshot-wide.png b/screenshot-wide.png
new file mode 100644
index 00000000..62d439c6
--- /dev/null
+++ b/screenshot-wide.png
diff --git a/screenshot.png b/screenshot.png
index a8102410..88e203b5 100644
--- a/screenshot.png
+++ b/screenshot.png
diff --git a/setup.py b/setup.py
index 9fd4b23a..ed57eac1 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',
-      download_url='https://github.com/downloads/nicolargo/glances/glances-1.4.tar.gz',
+      version='1.4.1',
+      download_url='https://github.com/downloads/nicolargo/glances/glances-1.4.1.tar.gz',
       url='https://github.com/nicolargo/glances',
       description='CLI curses-based monitoring tool',
       author='Nicolas Hennion',