Table of Contents
@@ -221,7 +221,7 @@ just run on the server:
-c IP
| Connect to a Glances server by IPv4/IPv6 address or hostname |
|
--C file |
+-C FILE
Path to the configuration file |
|
-d |
@@ -230,7 +230,7 @@ just run on the server:
-e
Enable sensors module (requires pysensors, Linux-only) |
|
--f file |
+-f FILE
Set the HTML output folder or CSV file |
|
-h |
@@ -242,22 +242,25 @@ just run on the server:
-n
Disable network module |
|
--o output |
+-o OUTPUT
Define additional output (available: HTML or CSV) |
|
-p PORT |
Define the client/server TCP port (default: 61209) |
|
--P password |
+-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 |
+-t SECONDS
Set refresh time in seconds (default: 3 sec) |
|
-v |
diff --git a/docs/glances-doc.rst b/docs/glances-doc.rst
index b57e0d5a..09fd2049 100644
--- a/docs/glances-doc.rst
+++ b/docs/glances-doc.rst
@@ -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
-September 2013
+November 2013
.. contents:: Table of Contents
@@ -81,20 +81,20 @@ 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
+-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
+-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)
+-o OUTPUT Define additional output (available: HTML or CSV)
-p PORT Define the client/server TCP port (default: 61209)
--P password Define the client/server password
-or --password Define the client/server password from the prompt
+-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)
+-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
diff --git a/docs/man/glances.1 b/docs/man/glances.1
index ac38a7eb..ff5e77ed 100644
--- a/docs/man/glances.1
+++ b/docs/man/glances.1
@@ -19,13 +19,13 @@ The command-line options are the following:
.B \-b
Display network rate in Byte per second (default: bit per second)
.TP
-.B \-B @IP|host
+.B \-B @IP|HOST
Bind server to the given IPv4/IPv6 address or hostname
.TP
-.B \-c @IP|host
+.B \-c @IP|HOST
Connect to a Glances server by IPv4/IPv6 address or hostname
.TP
-.B \-C file
+.B \-C FILE
Path to the configuration file
.TP
.B \-d
@@ -34,7 +34,7 @@ Disable disk I/O module
.B \-e
Enable sensors module (requires pysensors, Linux-only)
.TP
-.B \-f file
+.B \-f FILE
Set the HTML output folder or CSV file
.TP
.B \-h
@@ -46,22 +46,25 @@ Disable mount module
.B \-n
Disable network module
.TP
-.B \-o output
+.B \-o OUTPUT
Define additional output (available: HTML or CSV)
.TP
.B \-p PORT
Define the client/server TCP port (default: 61209)
.TP
-.B \-P password
+.B \-P PASSWORD
Define a client/server password
.TP
+.B\---password
+Define a client/server password from the prompt
+.TP
.B \-r
Disable process list (for low CPU consumption)
.TP
.B \-s
Run Glances in server mode
.TP
-.B \-t seconds
+.B \-t SECONDS
Set refresh time in seconds (default: 3 sec)
.TP
.B \-v
diff --git a/glances/glances.py b/glances/glances.py
index 85cea521..d5f868e8 100644
--- a/glances/glances.py
+++ b/glances/glances.py
@@ -4257,23 +4257,23 @@ def printSyntax():
print(_("Usage: glances [options]"))
print(_("\nOptions:"))
print(_("\t-b\t\tDisplay network rate in Byte per second"))
- print(_("\t-B @IP|host\tBind server to the given IPv4/IPv6 address or hostname"))
- print(_("\t-c @IP|host\tConnect to a Glances server by IPv4/IPv6 address or hostname"))
- print(_("\t-C file\t\tPath to the configuration file"))
+ print(_("\t-B @IP|HOST\tBind server to the given IPv4/IPv6 address or hostname"))
+ print(_("\t-c @IP|HOST\tConnect to a Glances server by IPv4/IPv6 address or hostname"))
+ print(_("\t-C FILE\t\tPath to the configuration file"))
print(_("\t-d\t\tDisable disk I/O module"))
print(_("\t-e\t\tEnable sensors module"))
- print(_("\t-f file\t\tSet the HTML output folder or CSV file"))
+ print(_("\t-f FILE\t\tSet the HTML output folder or CSV file"))
print(_("\t-h\t\tDisplay the help and exit"))
print(_("\t-m\t\tDisable mount module"))
print(_("\t-n\t\tDisable network module"))
- print(_("\t-o output\tDefine additional output (available: HTML or CSV)"))
+ print(_("\t-o OUTPUT\tDefine additional output (available: HTML or CSV)"))
print(_("\t-p PORT\t\tDefine the client/server TCP port (default: %d)" %
server_port))
- print(_("\t-P password\tDefine a client/server password"))
- print(_("\tor --password\tEnter the password from the command line"))
+ print(_("\t-P PASSWORD\tDefine a client/server password"))
+ print(_("\t--password\tDefine a client/server password from the prompt"))
print(_("\t-r\t\tDisable process list"))
print(_("\t-s\t\tRun Glances in server mode"))
- print(_("\t-t seconds\tSet refresh time in seconds (default: %d sec)" %
+ print(_("\t-t SECONDS\tSet refresh time in seconds (default: %d sec)" %
refresh_time))
print(_("\t-v\t\tDisplay the version and exit"))
print(_("\t-y\t\tEnable hddtemp module"))