Merge commit 'refs/merge-requests/2' of git://gitorious.org/procps/procps into merge-requests/2

Conflicts: uptime.c
2013-09-11 20:50:48 +10:00
parent 13f20a4811 3e7f78d296
commit 5e4d9d5a92
7 changed files with 101 additions and 34 deletions
--- a/uptime.1
+++ b/uptime.1
@@ -25,6 +25,9 @@ is loaded all the time while on a 4 CPU system it means it was idle 75% of
 the time.
 .SH OPTIONS
 .TP
+\fB\-p\fR, \fB\-\-pretty\fR
+show uptime in pretty format
+.TP
 \fB\-h\fR, \fB\-\-help\fR
 display this help text
 .TP