summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolargo <nicolas@nicolargo.com>2018-10-20 10:47:30 +0200
committernicolargo <nicolas@nicolargo.com>2018-10-20 10:47:30 +0200
commit91c266f4c939cbb8208d506d92b3d07221fecced (patch)
treeba6f9620287377e82404e5e6a9be670c54b729e7
parent1119593befca525d5f55621a33179d58aa6e6f44 (diff)
Add Docker doc to the index
-rw-r--r--NEWS4
-rw-r--r--docs/index.rst1
-rw-r--r--docs/man/glances.16
3 files changed, 8 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index d844087b..2d0bf26f 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,10 @@ Bugs corrected:
* Crash after running fine for several hours #1335
* Timezone listed doesn’t match system timezone, outputs wrong time #1337
+Others:
+
+ * Add Docker documentation (thanks to @rgarrigue)
+
Version 3.0.2
=============
diff --git a/docs/index.rst b/docs/index.rst
index e6515a15..f0fcfeb8 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -31,5 +31,6 @@ Table of Contents
aoa/index
gw/index
api
+ docker
faq
support
diff --git a/docs/man/glances.1 b/docs/man/glances.1
index 68a15b08..782c1344 100644
--- a/docs/man/glances.1
+++ b/docs/man/glances.1
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "GLANCES" "1" "Sep 04, 2018" "3.0.1" "Glances"
+.TH "GLANCES" "1" "Oct 20, 2018" "3.1.0_beta" "Glances"
.SH NAME
glances \- An eye on your system
.
@@ -74,7 +74,7 @@ display modules (plugins & exports) list and exit
.INDENT 0.0
.TP
.B \-\-disable\-plugin PLUGIN
-disable PLUGIN (comma separated list)
+disable PLUGIN (comma separed list)
.UNINDENT
.INDENT 0.0
.TP
@@ -84,7 +84,7 @@ display stats to stdout (comma separated list of plugins/plugins.attribute)
.INDENT 0.0
.TP
.B \-\-export EXPORT
-enable EXPORT module (comma separated list)
+enable EXPORT module (comma separed list)
.UNINDENT
.INDENT 0.0
.TP