Merge tag 'upstream/2.1.2'

Upstream version 2.1.2

1 files changed, 4 insertions, 4 deletions

diff --git a/inxi.1 b/inxi.1
index b205e92..74d5453 100755
--- a/inxi.1
+++ b/inxi.1
@@ -1,4 +1,4 @@
-.TH INXI 1 "2014\-03\-13" inxi "inxi manual"
+.TH INXI 1 "2014\-03\-14" inxi "inxi manual"
 .SH NAME
 inxi  \- Command line system information script for console and IRC 
 
@@ -85,7 +85,7 @@ Setting specific color type removes the global color selection.
 
 .TP
 .B \-C  
-Show full CPU output, including per CPU clockspeed if available.
+Show full CPU output, including per CPU clockspeed if available. See \fB\-x\fR for more options.
 .TP
 .B \-d  
 Shows optical drive data. Same as \fB\-Dd\fR. With \fB\-x\fR, adds features line to output. 
@@ -110,7 +110,7 @@ Show Graphic card information. Card(s), Display Server (vendor and version numbe
 may be added once enough data has been collected.
 .TP
 .B \-h
-The help menu. Features dynamic sizing to fit into terminal window. Set script global \fBLINE_MAX_BASIC\fR
+The help menu. Features dynamic sizing to fit into terminal window. Set script global \fBCOLS_MAX_CONSOLE\fR
 if you want a different default value.
 .TP
 .B \-\-help
@@ -296,7 +296,7 @@ The following shows which lines / items get extra information with each extra da
 \- Shows PCI Bus ID/Usb ID number of each Audio device.
 .TP 
 .B \-x \-C 
-\- bogomips on CPU (if available).
+\- bogomips on CPU (if available); CPU Flags (short list).
 .TP
 .B \-x \-d
 \- Adds items to features line of optical drive; adds rev version to optical drive.