(usage): Alphabetize option descriptions the way sort -f would.

3 files changed, 9 insertions, 17 deletions

diff --git a/src/env.c b/src/env.c
index 57ffe55d9..86d00d795 100644
--- a/src/env.c
+++ b/src/env.c
@@ -194,8 +194,8 @@ Usage: %s [OPTION]... [-] [NAME=VALUE]... [COMMAND [ARG]...]\n"),
       printf (_("\
 Set each NAME to VALUE in the environment and run COMMAND.\n\
 \n\
-  -u, --unset=NAME           remove variable from the environment\n\
   -i, --ignore-environment   start with an empty environment\n\
+  -u, --unset=NAME           remove variable from the environment\n\
       --help                 display this help and exit\n\
       --version              output version information and exit\n\
 \n\
diff --git a/src/test.c b/src/test.c
index 42e8ca0df..a9b150fb0 100644
--- a/src/test.c
+++ b/src/test.c
@@ -1011,20 +1011,20 @@ EXPRESSION is true or false and sets exit status.  It is one of:\n\
   FILE1 -nt FILE2   FILE1 is newer (modification date) than FILE2\n\
   FILE1 -ot FILE2   FILE1 is older than FILE2\n\
 \n\
-  -G FILE     FILE exists and is owned by the effective group ID\n\
-  -L FILE     FILE exists and is a symbolic link\n\
-  -O FILE     FILE exists and is owned by the effective user ID\n\
-  -S FILE     FILE exists and is a socket\n\
   -b FILE     FILE exists and is block special\n\
   -c FILE     FILE exists and is character special\n\
   -d FILE     FILE exists and is a directory\n\
   -e FILE     FILE exists\n\
   -f FILE     FILE exists and is a regular file\n\
   -g FILE     FILE exists and is set-group-ID\n\
+  -G FILE     FILE exists and is owned by the effective group ID\n\
   -k FILE     FILE exists and has its sticky bit set\n\
+  -L FILE     FILE exists and is a symbolic link\n\
+  -O FILE     FILE exists and is owned by the effective user ID\n\
   -p FILE     FILE exists and is a named pipe\n\
   -r FILE     FILE exists and is readable\n\
   -s FILE     FILE exists and has a size greater than zero\n\
+  -S FILE     FILE exists and is a socket\n\
   -t [FD]     file descriptor FD (stdout by default) is opened on a terminal\n\
   -u FILE     FILE exists and its set-user-ID bit is set\n\
   -w FILE     FILE exists and is writable\n\
diff --git a/src/who-users.c b/src/who-users.c
index 3a54ffea9..50c0a6bde 100644
--- a/src/who-users.c
+++ b/src/who-users.c
@@ -22,15 +22,7 @@
    state: -T
    name, line, time: not -q
    idle: -u
-
-   Options:
-   -m		Same as 'who am i', for POSIX.
-   -q		Only user names and # logged on; overrides all other options.
-   -s		Name, line, time (default).
-   -i, -u	Idle hours and minutes; '.' means active in last minute;
-		'old' means idle for >24 hours.
-   -H		Print column headings at top.
-   -w, -T	-s plus mesg (+ or -, or ? if bad line). */
+*/
 
 #include <config.h>
 #include <stdio.h>
@@ -637,15 +629,15 @@ usage (int status)
       printf (_("\
 \n\
   -H, --heading     print line of column headings\n\
-  -T, -w, --mesg    add user's message status as +, - or ?\n\
   -i, -u, --idle    add user idle time as HOURS:MINUTES, . or old\n\
   -m                only hostname and user associated with stdin\n\
   -q, --count       all login names and number of users logged on\n\
   -s                (ignored)\n\
-      --help        display this help and exit\n\
+  -T, -w, --mesg    add user's message status as +, - or ?\n\
       --message     same as -T\n\
-      --version     output version information and exit\n\
       --writeable   same as -T\n\
+      --help        display this help and exit\n\
+      --version     output version information and exit\n\
 \n\
 If FILE not given, uses /etc/utmp.  /etc/wtmp as FILE is common.\n\
 If ARG1 ARG2 given, -m presumed: `am i' or `mom likes' are usual.\n\