version 1.7.3

bd7576bc · Nicolas Hennion · d997802d · bd7576bc · bd7576bc · bd7576bc
17 changed file
--- a/NEWS
+++ b/NEWS
@@ -2,8 +2,8 @@ Version 1.7.3
 =============

    * Add --password argument to enter the client/server password from the prompt
-    * Fix an issue with the configuration file path
-    * ...
+    * Fix an issue with the configuration file path (#296)
+    * Fix an issue with the HTML template (#301)

 Version 1.7.2
 =============

--- a/README.rst
+++ b/README.rst
@@ -26,7 +26,7 @@ Requirements
 ============

 - ``python >= 2.6`` (tested with version 2.6, 2.7, 3.2, 3.3)
- ``psutil >= 0.5.1`` (recommended version >= 1.1.0)
+- ``psutil >= 0.5.1`` (recommended version >= 1.2.1)
 - ``jinja`` (optional for HTML output)
 - ``pysensors`` (optional for HW monitoring support) [Linux-only]
 - ``hddtemp`` (optional for HDD temperature monitoring support)
@@ -111,7 +111,7 @@ MacPorts
 Windows
 -------

-Glances 1.7.2 proposes a Windows client based on the `colorconsole`_ Python library.
+Glances proposes a Windows client based on the `colorconsole`_ Python library.

 Glances < 1.7.2 only works in server mode. It will run in server mode automatically.

@@ -158,6 +158,8 @@ Just run:

    $ glances

+and RTFM...
+
 Documentation
 =============


--- a/docs/_build/doctrees/environment.pickle
+++ b/docs/_build/doctrees/environment.pickle
--- a/docs/_build/doctrees/glances-doc.doctree
+++ b/docs/_build/doctrees/glances-doc.doctree
--- a/docs/_build/html/.buildinfo
+++ b/docs/_build/html/.buildinfo
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: d0d20961c041fc20aa9ab1847c268834
+config: 88f9709ac94d939db26f5322044ea5df
 tags: fbb0d17656682115ca4d033fb2f83ba1
--- a/docs/_build/html/_sources/glances-doc.txt
+++ b/docs/_build/html/_sources/glances-doc.txt
@@ -2,11 +2,11 @@
 Glances
 =======

-This manual describes *Glances* version 1.7.2.
+This manual describes *Glances* version 1.7.3.

 Copyright © 2012-2013 Nicolas Hennion <nicolas@nicolargo.com>

-September 2013
+November 2013

 .. contents:: Table of Contents

@@ -78,26 +78,27 @@ Command reference
 Command-line options
 --------------------

-b           Display network rate in Byte per second (default: bit per second)
-B IP        Bind server to the given IPv4/IPv6 address or hostname
-c IP        Connect to a Glances server by IPv4/IPv6 address or hostname
-C file      Path to the configuration file
-d           Disable disk I/O module
-e           Enable sensors module (requires pysensors, Linux-only)
-f file      Set the HTML output folder or CSV file
-h           Display the help and exit
-m           Disable mount module
-n           Disable network module
-o output    Define additional output (available: HTML or CSV)
-p PORT      Define the client/server TCP port (default: 61209)
-P password  Define a client/server password
-r           Disable process list (for low CPU consumption)
-s           Run Glances in server mode
-t seconds   Set refresh time in seconds (default: 3 sec)
-v           Display the version and exit
-y           Enable hddtemp module (requires hddtemp)
-z           Do not use the bold color attribute
-1           Start Glances in per-CPU mode
+-b             Display network rate in Byte per second (default: bit per second)
+-B IP          Bind server to the given IPv4/IPv6 address or hostname
+-c IP          Connect to a Glances server by IPv4/IPv6 address or hostname
+-C FILE        Path to the configuration file
+-d             Disable disk I/O module
+-e             Enable sensors module (requires pysensors, Linux-only)
+-f FILE        Set the HTML output folder or CSV file
+-h             Display the help and exit
+-m             Disable mount module
+-n             Disable network module
+-o OUTPUT      Define additional output (available: HTML or CSV)
+-p PORT        Define the client/server TCP port (default: 61209)
+-P PASSWORD    Define a client/server password
+--password     Define a client/server password from the prompt
+-r             Disable process list (for low CPU consumption)
+-s             Run Glances in server mode
+-t SECONDS     Set refresh time in seconds (default: 3 sec)
+-v             Display the version and exit
+-y             Enable hddtemp module (requires hddtemp)
+-z             Do not use the bold color attribute
+-1             Start Glances in per-CPU mode

 Interactive commands
 --------------------
@@ -372,9 +373,9 @@ sorted by CPU of memory usage.
 The number of processes in the list is adapted to the screen size.

 ``VIRT``
-    Virtual memory size
+    Total program size (VMS)
 ``RES``
-    Resident memory
+    Resident set size (RSS)
 ``CPU%``
    % of CPU used by the process
 ``MEM%``

--- a/docs/_build/html/genindex.html
+++ b/docs/_build/html/genindex.html
@@ -10,7 +10,7 @@
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    
-    <title>Index &mdash; Glances 1.7.2 documentation</title>
+    <title>Index &mdash; Glances 1.7.3 documentation</title>
    
    <link rel="stylesheet" href="_static/default.css" type="text/css" />
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -18,7 +18,7 @@
    <script type="text/javascript">
      var DOCUMENTATION_OPTIONS = {
        URL_ROOT:    '',
-        VERSION:     '1.7.2',
+        VERSION:     '1.7.3',
        COLLAPSE_INDEX: false,
        FILE_SUFFIX: '.html',
        HAS_SOURCE:  true
@@ -27,7 +27,7 @@
    <script type="text/javascript" src="_static/jquery.js"></script>
    <script type="text/javascript" src="_static/underscore.js"></script>
    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Glances 1.7.2 documentation" href="index.html" /> 
+    <link rel="top" title="Glances 1.7.3 documentation" href="index.html" /> 
  </head>
  <body>
    <div class="related">
@@ -36,7 +36,7 @@
        <li class="right" style="margin-right: 10px">
          <a href="#" title="General Index"
             accesskey="I">index</a></li>
-        <li><a href="index.html">Glances 1.7.2 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Glances 1.7.3 documentation</a> &raquo;</li> 
      </ul>
    </div>  

@@ -84,7 +84,7 @@
        <li class="right" style="margin-right: 10px">
          <a href="#" title="General Index"
             >index</a></li>
-        <li><a href="index.html">Glances 1.7.2 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Glances 1.7.3 documentation</a> &raquo;</li> 
      </ul>
    </div>
    <div class="footer">

--- a/docs/_build/html/glances-doc.html
+++ b/docs/_build/html/glances-doc.html
@@ -8,7 +8,7 @@
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    
-    <title>Glances &mdash; Glances 1.7.2 documentation</title>
+    <title>Glances &mdash; Glances 1.7.3 documentation</title>
    
    <link rel="stylesheet" href="_static/default.css" type="text/css" />
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -16,7 +16,7 @@
    <script type="text/javascript">
      var DOCUMENTATION_OPTIONS = {
        URL_ROOT:    '',
-        VERSION:     '1.7.2',
+        VERSION:     '1.7.3',
        COLLAPSE_INDEX: false,
        FILE_SUFFIX: '.html',
        HAS_SOURCE:  true
@@ -25,7 +25,7 @@
    <script type="text/javascript" src="_static/jquery.js"></script>
    <script type="text/javascript" src="_static/underscore.js"></script>
    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Glances 1.7.2 documentation" href="index.html" />
+    <link rel="top" title="Glances 1.7.3 documentation" href="index.html" />
    <link rel="prev" title="Welcome to Glances’s documentation!" href="index.html" /> 
  </head>
  <body>
@@ -38,7 +38,7 @@
        <li class="right" >
          <a href="index.html" title="Welcome to Glances’s documentation!"
             accesskey="P">previous</a> |</li>
-        <li><a href="index.html">Glances 1.7.2 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Glances 1.7.3 documentation</a> &raquo;</li> 
      </ul>
    </div>  

@@ -49,9 +49,9 @@
            
  <div class="section" id="glances">
 <h1><a class="toc-backref" href="#id7">Glances</a><a class="headerlink" href="#glances" title="Permalink to this headline">¶</a></h1>
-<p>This manual describes <em>Glances</em> version 1.7.2.</p>
+<p>This manual describes <em>Glances</em> version 1.7.3.</p>
 <p>Copyright © 2012-2013 Nicolas Hennion &lt;<a class="reference external" href="mailto:nicolas&#37;&#52;&#48;nicolargo&#46;com">nicolas<span>&#64;</span>nicolargo<span>&#46;</span>com</a>&gt;</p>
-<p>September 2013</p>
+<p>November 2013</p>
 <div class="contents topic" id="table-of-contents">
 <p class="topic-title first">Table of Contents</p>
 <ul class="simple">
@@ -150,7 +150,7 @@ just run on the server:</p>
 <kbd><span class="option">-c <var>IP</var></span></kbd></td>
 <td>Connect to a Glances server by IPv4/IPv6 address or hostname</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">-C <var>file</var></span></kbd></td>
+<kbd><span class="option">-C <var>FILE</var></span></kbd></td>
 <td>Path to the configuration file</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-d</span></kbd></td>
@@ -159,7 +159,7 @@ just run on the server:</p>
 <kbd><span class="option">-e</span></kbd></td>
 <td>Enable sensors module (requires pysensors, Linux-only)</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">-f <var>file</var></span></kbd></td>
+<kbd><span class="option">-f <var>FILE</var></span></kbd></td>
 <td>Set the HTML output folder or CSV file</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-h</span></kbd></td>
@@ -171,22 +171,25 @@ just run on the server:</p>
 <kbd><span class="option">-n</span></kbd></td>
 <td>Disable network module</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">-o <var>output</var></span></kbd></td>
+<kbd><span class="option">-o <var>OUTPUT</var></span></kbd></td>
 <td>Define additional output (available: HTML or CSV)</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-p <var>PORT</var></span></kbd></td>
 <td>Define the client/server TCP port (default: 61209)</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">-P <var>password</var></span></kbd></td>
+<kbd><span class="option">-P <var>PASSWORD</var></span></kbd></td>
 <td>Define a client/server password</td></tr>
 <tr><td class="option-group">
+<kbd><span class="option">--password</span></kbd></td>
+<td>Define a client/server password from the prompt</td></tr>
+<tr><td class="option-group">
 <kbd><span class="option">-r</span></kbd></td>
 <td>Disable process list (for low CPU consumption)</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-s</span></kbd></td>
 <td>Run Glances in server mode</td></tr>
 <tr><td class="option-group">
-<kbd><span class="option">-t <var>seconds</var></span></kbd></td>
+<kbd><span class="option">-t <var>SECONDS</var></span></kbd></td>
 <td>Set refresh time in seconds (default: 3 sec)</td></tr>
 <tr><td class="option-group">
 <kbd><span class="option">-v</span></kbd></td>
@@ -429,9 +432,9 @@ sorted by CPU of memory usage.</p>
 <p>The number of processes in the list is adapted to the screen size.</p>
 <dl class="docutils">
 <dt><tt class="docutils literal"><span class="pre">VIRT</span></tt></dt>
-<dd>Virtual memory size</dd>
+<dd>Total program size (VMS)</dd>
 <dt><tt class="docutils literal"><span class="pre">RES</span></tt></dt>
-<dd>Resident memory</dd>
+<dd>Resident set size (RSS)</dd>
 <dt><tt class="docutils literal"><span class="pre">CPU%</span></tt></dt>
 <dd>% of CPU used by the process</dd>
 <dt><tt class="docutils literal"><span class="pre">MEM%</span></tt></dt>
@@ -651,7 +654,7 @@ is installed on your system then Glances displays the available percent capacity
        <li class="right" >
          <a href="index.html" title="Welcome to Glances’s documentation!"
             >previous</a> |</li>
-        <li><a href="index.html">Glances 1.7.2 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Glances 1.7.3 documentation</a> &raquo;</li> 
      </ul>
    </div>
    <div class="footer">

--- a/docs/_build/html/index.html
+++ b/docs/_build/html/index.html
@@ -8,7 +8,7 @@
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    
-    <title>Welcome to Glances’s documentation! &mdash; Glances 1.7.2 documentation</title>
+    <title>Welcome to Glances’s documentation! &mdash; Glances 1.7.3 documentation</title>
    
    <link rel="stylesheet" href="_static/default.css" type="text/css" />
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -16,7 +16,7 @@
    <script type="text/javascript">
      var DOCUMENTATION_OPTIONS = {
        URL_ROOT:    '',
-        VERSION:     '1.7.2',
+        VERSION:     '1.7.3',
        COLLAPSE_INDEX: false,
        FILE_SUFFIX: '.html',
        HAS_SOURCE:  true
@@ -25,7 +25,7 @@
    <script type="text/javascript" src="_static/jquery.js"></script>
    <script type="text/javascript" src="_static/underscore.js"></script>
    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Glances 1.7.2 documentation" href="#" />
+    <link rel="top" title="Glances 1.7.3 documentation" href="#" />
    <link rel="next" title="Glances" href="glances-doc.html" /> 
  </head>
  <body>
@@ -38,7 +38,7 @@
        <li class="right" >
          <a href="glances-doc.html" title="Glances"
             accesskey="N">next</a> |</li>
-        <li><a href="#">Glances 1.7.2 documentation</a> &raquo;</li> 
+        <li><a href="#">Glances 1.7.3 documentation</a> &raquo;</li> 
      </ul>
    </div>  

@@ -135,7 +135,7 @@
        <li class="right" >
          <a href="glances-doc.html" title="Glances"
             >next</a> |</li>
-        <li><a href="#">Glances 1.7.2 documentation</a> &raquo;</li> 
+        <li><a href="#">Glances 1.7.3 documentation</a> &raquo;</li> 
      </ul>
    </div>
    <div class="footer">

--- a/docs/_build/html/objects.inv
+++ b/docs/_build/html/objects.inv
--- a/docs/_build/html/search.html
+++ b/docs/_build/html/search.html
@@ -8,7 +8,7 @@
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    
-    <title>Search &mdash; Glances 1.7.2 documentation</title>
+    <title>Search &mdash; Glances 1.7.3 documentation</title>
    
    <link rel="stylesheet" href="_static/default.css" type="text/css" />
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -16,7 +16,7 @@
    <script type="text/javascript">
      var DOCUMENTATION_OPTIONS = {
        URL_ROOT:    '',
-        VERSION:     '1.7.2',
+        VERSION:     '1.7.3',
        COLLAPSE_INDEX: false,
        FILE_SUFFIX: '.html',
        HAS_SOURCE:  true
@@ -26,7 +26,7 @@
    <script type="text/javascript" src="_static/underscore.js"></script>
    <script type="text/javascript" src="_static/doctools.js"></script>
    <script type="text/javascript" src="_static/searchtools.js"></script>
-    <link rel="top" title="Glances 1.7.2 documentation" href="index.html" />
+    <link rel="top" title="Glances 1.7.3 documentation" href="index.html" />
  <script type="text/javascript">
    jQuery(function() { Search.loadIndex("searchindex.js"); });
  </script>
@@ -42,7 +42,7 @@
        <li class="right" style="margin-right: 10px">
          <a href="genindex.html" title="General Index"
             accesskey="I">index</a></li>
-        <li><a href="index.html">Glances 1.7.2 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Glances 1.7.3 documentation</a> &raquo;</li> 
      </ul>
    </div>  

@@ -90,7 +90,7 @@
        <li class="right" style="margin-right: 10px">
          <a href="genindex.html" title="General Index"
             >index</a></li>
-        <li><a href="index.html">Glances 1.7.2 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Glances 1.7.3 documentation</a> &raquo;</li> 
      </ul>
    </div>
    <div class="footer">

--- a/docs/_build/html/searchindex.js
+++ b/docs/_build/html/searchindex.js
-Search.setIndex({objects:{},terms:{represent:0,all:0,code:1,appdata:0,global:0,sleep:0,follow:0,disk:0,compact:0,middl:0,depend:0,swap:0,under:0,list_1_command:0,sourc:1,string:0,iowait:0,trough:0,pocess:[],level:0,list:0,item:0,rate:0,port:0,compat:0,index:1,hide:0,sum:0,access:0,delet:0,version:0,"new":0,net:0,method:0,full:0,mem:0,batinfo:0,here:0,address:0,path:0,legend:0,valu:0,wait:0,search:1,queue:0,throughput:0,list_1_countmax:0,modul:[0,1],unix:0,api:[0,1],xdg_config_hom:0,instal:0,total:0,unit:0,regex:0,from:[0,1],describ:0,memori:0,two:0,call:0,usr:0,sort:0,warn:0,flag:0,setup:0,work:0,can:0,root:0,overrid:0,process:0,indic:1,critic:0,minimum:0,caution:0,want:0,magenta:0,occur:0,end:0,fpm:0,anoth:0,write:0,how:0,csv:0,max:0,date:0,data:0,averag:0,github:[0,1],footer:0,bind:0,countmin:0,issu:0,inform:[0,1],"switch":0,curent:[],green:0,allow:0,ethernet:0,order:0,hennion:0,cyberc:0,help:0,over:0,privileg:0,dynam:0,group:0,monitor:[0,1],fit:0,platform:[0,1],window:0,good:0,"return":0,python:[0,1],interrupt:0,introduct:[0,1],name:0,refresh:0,psutil:[0,1],mode:0,each:0,found:0,side:0,hard:0,connect:0,tirrel:0,shown:0,network:0,space:0,content:[0,1],adapt:0,sensor:0,red:0,free:0,standalon:0,base:[0,1],zombi:0,releas:0,"byte":0,care:0,mbit:0,filter:0,summari:0,first:0,softwar:0,feel:0,number:0,system:[0,1],mai:0,messag:0,size:0,sheep:0,given:0,script:0,interact:0,mkdir:0,capac:0,least:0,stori:0,cumul:0,termin:0,listen:0,shell:0,consol:0,option:0,tool:[0,1],copi:0,"short":0,hddtemp:0,list_1_regex:0,than:0,remot:0,second:0,horizont:0,were:0,consumpt:0,minut:0,zachari:0,counter:0,ran:0,ram:0,have:0,tabl:[0,1],need:0,min:0,note:0,also:0,ideal:0,client:0,which:0,combin:0,singl:0,anatomi:[0,1],blue:0,trace:0,track:0,regular:0,"80x24":0,bsd:0,request:0,drive:0,section:0,show:0,xml:0,current:0,onli:0,locat:0,execut:0,copyright:0,configur:[0,1],written:[0,1],should:0,folder:0,local:0,overwritten:0,hit:0,contribut:0,get:[0,1],express:0,stop:0,report:0,requir:0,enabl:0,through:0,grab:0,septemb:0,where:0,view:0,wiki:0,kernel:0,set:0,displai:0,see:0,sec:0,statu:0,extend:0,list_1_descript:0,enough:0,between:0,attribut:0,hddtemperatur:0,august:[],kei:0,screen:0,job:0,addit:0,etc:0,com:0,load:0,simpli:0,color:0,period:0,header:0,rpc:0,linux:0,batteri:0,nicola:0,quit:0,three:0,sinc:0,json:0,quickli:0,present:0,mount:0,aim:0,defin:0,"while":0,abov:0,mandatori:0,file:0,list_1_countmin:0,virt:0,conf:0,nicolargo:0,avg:0,welcom:1,minim:0,cross:[0,1],html:0,nosheep:0,document:[0,1],higher:0,finish:0,http:0,hostnam:0,iow:0,ior:0,alert:0,user:0,php:0,exampl:0,command:[0,1],thi:0,filesystem:0,left:0,just:0,tip:0,tcp:0,speed:0,web:0,except:0,blog:0,add:0,els:0,applic:[0,1],read:0,howto:0,nginx:0,temperatur:0,biz:0,press:0,bit:0,password:0,daemon:0,resid:0,manual:0,server:0,kbit:0,output:0,architectur:0,page:1,www:0,some:[0,1],percentag:0,intern:1,librari:[0,1],bottom:0,definit:0,per:0,pysensor:0,exit:0,ipv4:0,refer:[0,1],machin:0,core:0,plu:0,run:0,bold:0,usag:[0,1],column:0,roam:0,disabl:0,countmax:0,automat:0,mbp:0,your:[0,1],log:0,support:[0,1],avail:[0,1],start:0,interfac:0,low:0,ipv6:0,newer:0,line:0,bug:0,count:0,"default":0,maximum:0,limit:0,embed:0,featur:0,curs:[0,1],classic:0,pid:0,"char":0,glanc:[0,1],vista:0,percent:0,virtual:0,you:0,nice:0,stat:0,easili:0,furthermor:0,directori:0,descript:0,getallmonitor:0,time:0,cpu:0},objtypes:{},titles:["Glances","Welcome to Glances&#8217;s documentation!"],objnames:{},filenames:["glances-doc","index"]})
\ No newline at end of file
+Search.setIndex({objects:{},terms:{represent:0,all:0,code:1,appdata:0,global:0,sleep:0,follow:0,disk:0,compact:0,middl:0,depend:0,program:0,swap:0,under:0,list_1_command:0,sourc:1,string:0,iowait:0,trough:0,pocess:[],level:0,list:0,item:0,rate:0,port:0,compat:0,index:1,hide:0,sum:0,access:0,delet:0,version:0,"new":0,net:0,method:0,full:0,mem:0,batinfo:0,here:0,address:0,path:0,legend:0,valu:0,wait:0,search:1,queue:0,throughput:0,list_1_countmax:0,modul:[0,1],unix:0,api:[0,1],xdg_config_hom:0,instal:0,total:0,unit:0,regex:0,from:[0,1],describ:0,memori:0,two:0,call:0,usr:0,sort:0,warn:0,flag:0,setup:0,work:0,can:0,root:0,overrid:0,prompt:0,process:0,indic:1,critic:0,minimum:0,caution:0,want:0,magenta:0,occur:0,end:0,fpm:0,anoth:0,write:0,how:0,low:0,csv:0,max:0,mai:0,data:0,averag:0,"short":0,footer:0,bind:0,counter:0,issu:0,inform:[0,1],"switch":0,curent:[],combin:0,allow:0,ethernet:0,order:0,hennion:0,cyberc:0,help:0,over:0,privileg:0,dynam:0,group:0,monitor:[0,1],fit:0,platform:[0,1],window:0,good:0,"return":0,python:[0,1],interrupt:0,introduct:[0,1],name:0,refresh:0,psutil:[0,1],mode:0,each:0,found:0,side:0,hard:0,connect:0,tirrel:0,shown:0,network:0,space:0,content:[0,1],adapt:0,sensor:0,red:0,free:0,standalon:0,base:[0,1],zombi:0,releas:0,"byte":0,care:0,mbit:0,filter:0,view:0,first:0,softwar:0,feel:0,number:0,system:[0,1],date:0,messag:0,size:0,sheep:0,given:0,script:0,interact:0,mkdir:0,capac:0,least:0,stori:0,cumul:0,termin:0,listen:0,shell:0,consol:0,option:0,tool:[0,1],copi:0,github:[0,1],hddtemp:0,list_1_regex:0,than:0,rss:0,remot:0,second:0,horizont:0,were:0,consumpt:0,minut:0,zachari:0,countmin:0,ran:0,ram:0,have:0,tabl:[0,1],need:0,min:0,note:0,also:0,ideal:0,client:0,which:0,green:0,singl:0,anatomi:[0,1],blue:0,trace:0,track:0,regular:0,"80x24":0,bsd:0,request:0,drive:0,section:0,show:0,xml:0,current:0,onli:0,locat:0,execut:0,copyright:0,configur:[0,1],written:[0,1],should:0,folder:0,local:0,overwritten:0,hit:0,contribut:0,get:[0,1],express:0,stop:0,report:0,requir:0,enabl:0,through:0,grab:0,septemb:[],where:0,summari:0,wiki:0,kernel:0,set:0,maximum:0,see:0,sec:0,statu:0,kei:0,list_1_descript:0,enough:0,between:0,attribut:0,hddtemperatur:0,august:[],extend:0,screen:0,job:0,addit:0,etc:0,com:0,load:0,simpli:0,color:0,period:0,header:0,rpc:0,linux:0,batteri:0,nicola:0,quit:0,three:0,sinc:0,json:0,quickli:0,present:0,mount:0,aim:0,defin:0,"while":0,abov:0,mandatori:0,glanc:[0,1],list_1_countmin:0,virt:0,conf:0,nicolargo:0,avg:0,welcom:1,minim:0,cross:[0,1],html:0,nosheep:0,document:[0,1],higher:0,finish:0,http:0,hostnam:0,iow:0,ior:0,alert:0,user:0,php:0,exampl:0,command:[0,1],thi:0,filesystem:0,left:0,just:0,percent:0,tcp:0,speed:0,web:0,except:0,blog:0,add:0,els:0,applic:[0,1],read:0,howto:0,nginx:0,temperatur:0,biz:0,press:0,bit:0,password:0,daemon:0,resid:0,manual:0,server:0,kbit:0,output:0,nice:0,page:1,www:0,some:[0,1],percentag:0,intern:1,librari:[0,1],bottom:0,definit:0,per:0,pysensor:0,exit:0,refer:[0,1],machin:0,core:0,plu:0,run:0,bold:0,usag:[0,1],column:0,roam:0,disabl:0,countmax:0,automat:0,mbp:0,your:[0,1],log:0,support:[0,1],avail:[0,1],start:0,interfac:0,ipv4:0,ipv6:0,newer:0,line:0,bug:0,count:0,"default":0,displai:0,limit:0,embed:0,featur:0,curs:[0,1],classic:0,pid:0,"char":0,novemb:0,file:0,vista:0,tip:0,virtual:[],you:0,architectur:0,stat:0,easili:0,furthermor:0,directori:0,descript:0,getallmonitor:0,time:0,cpu:0},objtypes:{},titles:["Glances","Welcome to Glances&#8217;s documentation!"],objnames:{},filenames:["glances-doc","index"]})
\ No newline at end of file
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@ copyright = u'2013, Nicolas Hennion'
 # built documents.
 #
 # The short X.Y version.
-version = '1.7.2'
+version = '1.7.3'
 # The full version, including alpha/beta/rc tags.
-release = '1.7.2'
+release = '1.7.3'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

--- a/docs/glances-doc.html
+++ b/docs/glances-doc.html
@@ -503,9 +503,9 @@ sorted by CPU of memory usage.</p>
 <p>The number of processes in the list is adapted to the screen size.</p>
 <dl class="docutils">
 <dt><tt class="docutils literal">VIRT</tt></dt>
-<dd>Virtual memory size</dd>
+<dd>Total program size (VMS)</dd>
 <dt><tt class="docutils literal">RES</tt></dt>
-<dd>Resident memory</dd>
+<dd>Resident set size (RSS)</dd>
 <dt><tt class="docutils literal">CPU%</tt></dt>
 <dd>% of CPU used by the process</dd>
 <dt><tt class="docutils literal">MEM%</tt></dt>

--- a/glances/glances.py
+++ b/glances/glances.py
@@ -19,7 +19,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.

 __appname__ = 'glances'
-__version__ = "1.7.3_BETA"
+__version__ = "1.7.3"
 __author__ = "Nicolas Hennion <nicolas@nicolargo.com>"
 __licence__ = "LGPL"


--- a/man/glances.1
+++ b/man/glances.1
-.TH glances 1  "September, 2013" "version 1.7.2" "USER COMMANDS"
+.TH glances 1  "December, 2013" "version 1.7.3" "USER COMMANDS"
 .SH NAME
 glances \- A cross-platform curses-based monitoring tool
 .SH SYNOPSIS

--- a/setup.py
+++ b/setup.py
@@ -33,13 +33,13 @@ else:

 setup(
    name='Glances',
-    version='1.7.2',
+    version='1.7.3',
    description="A cross-platform curses-based monitoring tool",
    long_description=open('README.rst').read(),
    author='Nicolas Hennion',
    author_email='nicolas@nicolargo.com',
    url='https://github.com/nicolargo/glances',
-    # download_url='https://s3.amazonaws.com/glances/glances-1.7.1.tar.gz',
+    # download_url='https://s3.amazonaws.com/glances/glances-1.7.3.tar.gz',
    license="LGPL",
    keywords="cli curses monitoring system",
    install_requires=requires,