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

@@ -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

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

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}