diff options
Diffstat (limited to 'docs/man/glances.1')
| -rw-r--r-- | docs/man/glances.1 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docs/man/glances.1 b/docs/man/glances.1 index 6cd003c1..1d400bb2 100644 --- a/docs/man/glances.1 +++ b/docs/man/glances.1 @@ -1,6 +1,10 @@ .\" Man page generated from reStructuredText. . +<<<<<<< HEAD +.TH "GLANCES" "1" "Jan 19, 2019" "3.1.0" "Glances" +======= .TH "GLANCES" "1" "Sep 29, 2018" "3.0.2" "Glances" +>>>>>>> master .SH NAME glances \- An eye on your system . @@ -569,6 +573,7 @@ have a section. Below an example for the CPU plugin: .nf .ft C [cpu] +disable=false user_careful=50 user_warning=70 user_critical=90 @@ -850,6 +855,6 @@ $ glances –browser .sp Nicolas Hennion aka Nicolargo <\fI\%contact@nicolargo.com\fP> .SH COPYRIGHT -2018, Nicolas Hennion +2019, Nicolas Hennion .\" Generated by docutils manpage writer. . |