Merge tag 'upstream/2.2.27'

Upstream version 2.2.27

# gpg: Signature made Mon 17 Aug 2015 03:48:34 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 5 insertions, 3 deletions

diff --git a/inxi.1 b/inxi.1
index 2d71f77..548b718 100755
--- a/inxi.1
+++ b/inxi.1
@@ -1,4 +1,4 @@
-.TH INXI 1 "2015\-02\-15" inxi "inxi manual"
+.TH INXI 1 "2015\-05\-30" inxi "inxi manual"
 .SH NAME
 inxi  \- Command line system information script for console and IRC 
 .SH SYNOPSIS
@@ -211,7 +211,8 @@ Make sure to have no space between letters and numbers (\fB\-t cm10\fR \- right,
 \- cpu only. With \fB\-x\fR, shows also memory for that process on same line.
 .TP
 .B \-t m\fR
-\- memory only. With \fB\-x\fR, shows also cpu for that process on same line.
+\- memory only. With \fB\-x\fR, shows also cpu for that process on same line. If the \i-I line is not triggered,
+will also show the system used/total ram information in the first \fBMemory\fR line of output.
 .TP
 .B \-t cm\fR
 \- cpu+memory. With \fB\-x\fR, shows also cpu or memory for that process on same line.
@@ -365,7 +366,8 @@ version number, if available.
 \- Desktop toolkit if available (GNOME/XFCE/KDE only); Kernel gcc version.
 .TP
 .B \-x \-t 
-\- Adds memory use output to cpu (\fB\-xt c\fR), and cpu use to memory (\fB\-xt m\fR).
+\- Adds memory use output to cpu (\fB\-xt c\fR), and cpu use to memory (\fB\-xt m\fR). For \fB\-xt c\fR will also show
+system Used/Total ram data if \fB\-t m\fR (memory) is not used AND \fB\-I\fR is not triggered.
 .TP
 .B \-x \-w / \-W
 \- Adds wind speed and time zone (\fB\-w\fR only), and makes output go to two lines.