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.

diff --git a/sysctl.8 b/sysctl.8
index d57ecd180238c053aa8ef47d2377d7d2dd200b7d..faf2255aaab4a1a01e1478648ac245983b639153 100644 (file)
--- 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 5b2b2645433b9461b8f127b357273ce983b4805a..7537f1db5aaf58a7aaeb6c340251024dd4d3443e 100644 (file)
--- 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 fee9308ca3418d501ecc3f83a87d0a6b79b9f6f8..c80e117a16e21ec4dc231e8fbd0c7cc526a0b793 100644 (file)
--- 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}