From 151e4f21da47f19ae89829b8b64857b23824e3fa Mon Sep 17 00:00:00 2001
From: Jaromir Capik <jcapik@redhat.com>
Date: Fri, 19 Jul 2013 14:50:02 +0200
Subject: [PATCH] sysctl, w: miscelaneous usage/man fixes

This commit is a result of RH man page mass scan, that failed.
All the broken/missing switches should be fixed now.
---
 sysctl.8 | 2 +-
 w.1      | 2 +-
 w.c      | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sysctl.8 b/sysctl.8
index d57ecd18..faf2255a 100644
--- a/sysctl.8
+++ b/sysctl.8
@@ -92,7 +92,7 @@ Load settings from all system configuration files.
 .br
 /etc/sysctl.conf
 .TP
-\fB\-\-pattern\fR \fIpattern\fR
+\fB\-r\fR, \fB\-\-pattern\fR \fIpattern\fR
 Only apply settings that match
 .IR pattern .
 The
diff --git a/w.1 b/w.1
index 5b2b2645..7537f1db 100644
--- a/w.1
+++ b/w.1
@@ -49,7 +49,7 @@ field is shown by default.
 \fB\-\-help\fR
 Display help text and exit.
 .TP
-\fB\-\-ip\-addr\fR
+\fB\-i\fR, \fB\-\-ip\-addr\fR
 Display IP address instead of hostname for \fBfrom\fR field.
 .TP
 \fB\-V\fR, \fB\-\-version\fR
diff --git a/w.c b/w.c
index fee9308c..c80e117a 100644
--- a/w.c
+++ b/w.c
@@ -475,9 +475,10 @@ int main(int argc, char **argv)
 	static const struct option longopts[] = {
 		{"no-header", no_argument, NULL, 'h'},
 		{"no-current", no_argument, NULL, 'u'},
-		{"sort", no_argument, NULL, 's'},
+		{"short", no_argument, NULL, 's'},
 		{"from", no_argument, NULL, 'f'},
 		{"old-style", no_argument, NULL, 'o'},
+		{"ip-addr", no_argument, NULL, 'i'},
 		{"help", no_argument, NULL, HELP_OPTION},
 		{"version", no_argument, NULL, 'V'},
 		{NULL, 0, NULL, 0}