udhcpc: support for -O <option>.
[oweals/busybox.git] / include / usage.h
index 0b30ecf35650b65be3249bae2f7df84fdce09826..12d2cefd9c1ab4d0950dc1e18f90c851a1c6c6eb 100644 (file)
@@ -27,7 +27,7 @@
        "       -g GECOS        GECOS field\n" \
        "       -s SHELL        Login shell\n" \
        "       -G GROUP        Add user to existing group\n" \
-       "       -S              Create a system user (ignored)\n" \
+       "       -S              Create a system user\n" \
        "       -D              Do not assign a password\n" \
        "       -H              Do not create home directory"
 
@@ -76,7 +76,7 @@
        "\n     -H hwtype       Hardware address type"
 
 #define arping_trivial_usage \
-       "[-fqbDUA] [-c count] [-w timeout] [-i device] [-s sender] target"
+       "[-fqbDUA] [-c count] [-w timeout] [-I dev] [-s sender] target"
 #define arping_full_usage \
        "Ping hosts by ARP requests/replies" \
        "\n\nOptions:\n" \
        "       -q              Quiet\n" \
        "       -b              Keep broadcasting, don't go unicast\n" \
        "       -D              Duplicated address detection mode\n" \
-       "       -U              Unsolicited ARP mode, update your neighbours\n" \
-       "       -A              ARP answer mode, update your neighbours\n" \
-       "       -c count        Stop after sending count ARP request packets\n" \
+       "       -U              Unsolicited ARP mode, update your neighbors\n" \
+       "       -A              ARP answer mode, update your neighbors\n" \
+       "       -c N            Stop after sending N ARP requests\n" \
        "       -w timeout      Time to wait for ARP reply, in seconds\n" \
-       "       -I device       Outgoing interface name, default is eth0\n" \
-       "       -s sender       Set specific sender IP address\n" \
-       "       target          Target IP address of ARP request"
+       "       -I dev          Interface to use (default eth0)\n" \
+       "       -s sender       Sender IP address\n" \
+       "       target          Target IP address"
 
 #define ash_trivial_usage \
        "[FILE]...\n" \
        "The ash shell (command interpreter)"
 
 #define awk_trivial_usage \
-       "[OPTION]... [program-text] [FILE ...]"
+       "[OPTION]... [program-text] [FILE...]"
 #define awk_full_usage \
        "Options:\n" \
        "       -v var=val      Set variable\n" \
        "       -F sep          Use sep as field separator\n" \
-       "       -f filename     Read program from file"
+       "       -f file         Read program from file"
 
 #define basename_trivial_usage \
        "FILE [SUFFIX]"
        "       -c      Write output to standard output\n" \
        "       -f      Force"
 
+#define bzip2_trivial_usage \
+       "[OPTION]... [FILE]..."
+#define bzip2_full_usage \
+       "Compress FILE(s) with bzip2 algorithm.\n" \
+       "When FILE is '-' or unspecified, reads standard input. Implies -c." \
+       "\n\nOptions:" \
+       "\n     -c      Write output to standard output instead of FILE.bz2" \
+       "\n     -d      Decompress" \
+       "\n     -f      Force" \
+       "\n     -1..-9  Compression level"
+
 #define busybox_notes_usage \
        "Hello world!\n"
 
        "       -v      Set the file's version/generation number"
 
 #define chcon_trivial_usage \
-       "[OPTIONS] CONTEXT FILE...\n" \
-       "       chcon [OPTIONS] [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE...\n" \
-       "       chcon [OPTIONS] --reference=RFILE FILE...\n"
+       "[OPTIONS] CONTEXT FILE..." \
+       "\n     chcon [OPTIONS] [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE..." \
+       USE_FEATURE_CHCON_LONG_OPTIONS( \
+       "\n     chcon [OPTIONS] --reference=RFILE FILE..." \
+       )
 #define chcon_full_usage \
        "Change the security context of each FILE to CONTEXT\n" \
-       "\n     -v, --verbose           Verbose" \
-       "\n     -c, --changes           Report changes made" \
-       "\n     -h, --no-dereference    Affect symlinks instead of their targets" \
-       "\n     -f, --silent, --quiet   Suppress most error messages" \
+       USE_FEATURE_CHCON_LONG_OPTIONS( \
+       "\n     -v,--verbose            Verbose" \
+       "\n     -c,--changes            Report changes made" \
+       "\n     -h,--no-dereference     Affect symlinks instead of their targets" \
+       "\n     -f,--silent,--quiet     Suppress most error messages" \
        "\n     --reference=RFILE       Use RFILE's group instead of using a CONTEXT value" \
-       "\n     -u, --user=USER         Set user USER in the target security context" \
-       "\n     -r, --role=ROLE         Set role ROLE in the target security context" \
-       "\n     -t, --type=TYPE         Set type TYPE in the target security context" \
-       "\n     -l, --range=RANGE       Set range RANGE in the target security context" \
-       "\n     -R, --recursive         Recurse subdirectories" \
+       "\n     -u,--user=USER          Set user USER in the target security context" \
+       "\n     -r,--role=ROLE          Set role ROLE in the target security context" \
+       "\n     -t,--type=TYPE          Set type TYPE in the target security context" \
+       "\n     -l,--range=RANGE        Set range RANGE in the target security context" \
+       "\n     -R,--recursive          Recurse subdirectories" \
+       ) \
+       SKIP_FEATURE_CHCON_LONG_OPTIONS( \
+       "\n     -v      Verbose" \
+       "\n     -c      Report changes made" \
+       "\n     -h      Affect symlinks instead of their targets" \
+       "\n     -f      Suppress most error messages" \
+       "\n     -u USER Set user USER in the target security context" \
+       "\n     -r ROLE Set role ROLE in the target security context" \
+       "\n     -t TYPE Set type TYPE in the target security context" \
+       "\n     -l RNG  Set range RNE in the target security context" \
+       "\n     -R      Recurse subdirectories" \
+       )
+
 
 #define chmod_trivial_usage \
        "[-R"USE_DESKTOP("cvf")"] MODE[,MODE]... FILE..."
        "       -d [#] -l [#] -S -L logfile -f -b -c dir\n" \
        "       -d num  Debug level\n" \
        "       -l num  Log level (8 - default)\n" \
-       "       -S      Log to syslogd (default)\n" \
+       "       -S      Log to syslog (default)\n" \
        "       -L file Log to file\n" \
        "       -f      Run in foreground\n" \
        "       -b      Run in background (default)\n" \
        "Wed Apr 12 18:52:41 MDT 2000\n"
 
 #define dc_trivial_usage \
-       "expression ..."
+       "expression..."
 #define dc_full_usage \
        "This is a Tiny RPN calculator that understands the\n" \
        "following operations: +, add, -, sub, *, mul, /, div, %, mod, " \
 
 #define devfsd_trivial_usage \
        "mntpnt [-v]" \
-       USE_DEVFSD_FG_NP("[-fg][-np]" )
+       USE_DEVFSD_FG_NP("[-fg][-np]")
 #define devfsd_full_usage \
        "Manage devfs permissions and old device name symlinks" \
        "\n\nOptions:" \
        "\n             and processing synthetic REGISTER events," \
        "\n             do not poll for events")
 
+/* -k is accepted but ignored for !HUMAN_READABLE,
+ * but we won't mention this (unimportant) */
+#if ENABLE_FEATURE_HUMAN_READABLE || ENABLE_FEATURE_DF_INODE
+#define DF_HAS_OPTIONS(x) x
+#else
+#define DF_HAS_OPTIONS(x)
+#endif
 #define df_trivial_usage \
-       "[-" USE_FEATURE_HUMAN_READABLE("hm") "k] [FILESYSTEM ...]"
+       DF_HAS_OPTIONS("[-") \
+       USE_FEATURE_HUMAN_READABLE("hmk") USE_FEATURE_DF_INODE("i") \
+       DF_HAS_OPTIONS("] ") "[FILESYSTEM...]"
 #define df_full_usage \
-       "Print the filesystem space used and space available" \
+       "Print filesystem usage statistics" \
+       DF_HAS_OPTIONS("\n\nOptions:") \
        USE_FEATURE_HUMAN_READABLE( \
-       "\n\nOptions control size display:" \
        "\n     -h      Human readable (e.g. 1K 243M 2G)" \
        "\n     -m      1024*1024 blocks" \
-       "\n     -k      1024 blocks") \
-       SKIP_FEATURE_HUMAN_READABLE( \
-       "\n\nOptions:" \
-       "\n     -k      Ignored")
+       "\n     -k      1024 blocks" \
+       ) \
+       USE_FEATURE_DF_INODE( \
+       "\n     -i      Inodes" \
+       )
 #define df_example_usage \
        "$ df\n" \
        "Filesystem           1k-blocks      Used Available Use% Mounted on\n" \
 #define dmesg_full_usage \
        "Print or control the kernel ring buffer" \
        "\n\nOptions:\n" \
-       "       -c              Clears the ring buffer's contents after printing\n" \
-       "       -n LEVEL        Sets console logging level\n" \
-       "       -s SIZE         Use a buffer of size SIZE"
+       "       -c              Clear ring buffer after printing\n" \
+       "       -n LEVEL        Set console logging level\n" \
+       "       -s SIZE         Buffer size"
 
 #define dnsd_trivial_usage \
        "[-c config] [-t seconds] [-p port] [-i iface-ip] [-d]"
 #define dumpleases_full_usage \
        "Display DHCP leases granted by udhcpd" \
        "\n\nOptions:\n" \
-       "       -f, --file=FILENAME     Leases file to load\n" \
-       "       -r, --remaining         Interpret lease times as time remaining\n" \
-       "       -a, --absolute          Interpret lease times as expire time"
+       USE_GETOPT_LONG( \
+       "       -f,--file=FILE  Leases file to load\n" \
+       "       -r,--remaining  Interpret lease times as time remaining\n" \
+       "       -a,--absolute   Interpret lease times as expire time" \
+       ) \
+       SKIP_GETOPT_LONG( \
+       "       -f FILE Leases file to load\n" \
+       "       -r      Interpret lease times as time remaining\n" \
+       "       -a      Interpret lease times as expire time" \
+       )
 
 #define e2fsck_trivial_usage \
        "[-panyrcdfvstDFSV] [-b superblock] [-B blocksize] " \
        "       -L file         Set badblocks list"
 
 #define echo_trivial_usage \
-       USE_FEATURE_FANCY_ECHO("[-neE] ") "[ARG ...]"
+       USE_FEATURE_FANCY_ECHO("[-neE] ") "[ARG...]"
 #define echo_full_usage \
        "Print the specified ARGs to stdout" \
        USE_FEATURE_FANCY_ECHO( \
 #define expand_full_usage \
        "Convert tabs to spaces, writing to standard output." \
        "\n\nOptions:" \
-       "\n     -i" USE_FEATURE_EXPAND_LONG_OPTIONS(",--initial") \
-       "       Do not convert tabs after non blanks" \
-       "\n     -t" USE_FEATURE_EXPAND_LONG_OPTIONS(",--tabs=N") \
-       "       Tabstops every N chars"
+       USE_FEATURE_EXPAND_LONG_OPTIONS( \
+       "\n     -i,--initial    Do not convert tabs after non blanks" \
+       "\n     -t,--tabs=N     Tabstops every N chars" \
+       ) \
+       SKIP_FEATURE_EXPAND_LONG_OPTIONS( \
+       "\n     -i      Do not convert tabs after non blanks" \
+       "\n     -t      Tabstops every N chars" \
+       )
 
 #define expr_trivial_usage \
        "EXPRESSION"
 #define expr_full_usage \
        "Print the value of EXPRESSION to standard output.\n\n" \
        "EXPRESSION may be:\n" \
-       "       ARG1 |  ARG2    ARG1 if it is neither null nor 0, otherwise ARG2\n" \
-       "       ARG1 &  ARG2    ARG1 if neither argument is null or 0, otherwise 0\n" \
-       "       ARG1 <  ARG2    ARG1 is less than ARG2\n" \
-       "       ARG1 <= ARG2    ARG1 is less than or equal to ARG2\n" \
-       "       ARG1 =  ARG2    ARG1 is equal to ARG2\n" \
-       "       ARG1 != ARG2    ARG1 is unequal to ARG2\n" \
-       "       ARG1 >= ARG2    ARG1 is greater than or equal to ARG2\n" \
-       "       ARG1 >  ARG2    ARG1 is greater than ARG2\n" \
-       "       ARG1 +  ARG2    Sum of ARG1 and ARG2\n" \
-       "       ARG1 -  ARG2    Difference of ARG1 and ARG2\n" \
-       "       ARG1 *  ARG2    Product of ARG1 and ARG2\n" \
-       "       ARG1 /  ARG2    Quotient of ARG1 divided by ARG2\n" \
-       "       ARG1 %  ARG2    Remainder of ARG1 divided by ARG2\n" \
+       "       ARG1 | ARG2     ARG1 if it is neither null nor 0, otherwise ARG2\n" \
+       "       ARG1 & ARG2     ARG1 if neither argument is null or 0, otherwise 0\n" \
+       "       ARG1 < ARG2     1 if ARG1 is less than ARG2, else 0. Similarly:\n" \
+       "       ARG1 <= ARG2\n" \
+       "       ARG1 = ARG2\n" \
+       "       ARG1 != ARG2\n" \
+       "       ARG1 >= ARG2\n" \
+       "       ARG1 > ARG2\n" \
+       "       ARG1 + ARG2     Sum of ARG1 and ARG2. Similarly:\n" \
+       "       ARG1 - ARG2\n" \
+       "       ARG1 * ARG2\n" \
+       "       ARG1 / ARG2\n" \
+       "       ARG1 % ARG2\n" \
        "       STRING : REGEXP         Anchored pattern match of REGEXP in STRING\n" \
        "       match STRING REGEXP     Same as STRING : REGEXP\n" \
        "       substr STRING POS LENGTH Substring of STRING, POS counted from 1\n" \
      "\n       -maxdepth N     Descend at most N levels. -maxdepth 0 applies" \
      "\n                       tests/actions to command line arguments only") \
      "\n       -name PATTERN   File name (w/o directory name) matches PATTERN" \
+     "\n       -iname PATTERN  Case insensitive -name" \
        USE_FEATURE_FIND_PATH( \
      "\n       -path PATTERN   Path matches PATTERN") \
        USE_FEATURE_FIND_REGEX( \
        "$ freeramdisk /dev/ram2\n"
 
 #define fsck_trivial_usage \
-       "[-ANPRTV] [-C fd] [-t fstype] [fs-options] [filesys ...]"
+       "[-ANPRTV] [-C fd] [-t fstype] [fs-options] [filesys...]"
 #define fsck_full_usage \
        "Check and repair filesystems" \
        "\n\nOptions:\n" \
 #define fsck_minix_full_usage \
        "Perform a consistency check for MINIX filesystems" \
        "\n\nOptions:\n" \
-       "       -l      Lists all filenames\n" \
+       "       -l      List all filenames\n" \
        "       -r      Perform interactive repairs\n" \
        "       -a      Perform automatic repairs\n" \
        "       -v      Verbose\n" \
-       "       -s      Outputs super-block information\n" \
-       "       -m      Activates MINIX-like \"mode not cleared\" warnings\n" \
+       "       -s      Output super-block information\n" \
+       "       -m      Activate MINIX-like \"mode not cleared\" warnings\n" \
        "       -f      Force file system check"
 
 #define ftpget_trivial_usage \
 #define ftpget_full_usage \
        "Retrieve a remote file via FTP" \
        "\n\nOptions:\n" \
-       "       -c, --continue  Continue a previous transfer\n" \
-       "       -v, --verbose   Verbose\n" \
-       "       -u, --username  Username to be used\n" \
-       "       -p, --password  Password to be used\n" \
-       "       -P, --port      Port number to be used"
+       USE_GETOPT_LONG( \
+       "       -c,--continue   Continue previous transfer\n" \
+       "       -v,--verbose    Verbose\n" \
+       "       -u,--username   Username\n" \
+       "       -p,--password   Password\n" \
+       "       -P,--port       Port number" \
+       ) \
+       SKIP_GETOPT_LONG( \
+       "       -c      Continue previous transfer\n" \
+       "       -v      Verbose\n" \
+       "       -u      Username\n" \
+       "       -p      Password\n" \
+       "       -P      Port number" \
+       )
 
 #define ftpput_trivial_usage \
        "[options] remote-host remote-file local-file"
 #define ftpput_full_usage \
        "Store a local file on a remote machine via FTP" \
        "\n\nOptions:\n" \
-       "       -v, --verbose   Verbose\n" \
-       "       -u, --username  Username to be used\n" \
-       "       -p, --password  Password to be used\n" \
-       "       -P, --port      Port number to be used"
+       USE_GETOPT_LONG( \
+       "       -v,--verbose    Verbose\n" \
+       "       -u,--username   Username\n" \
+       "       -p,--password   Password\n" \
+       "       -P,--port       Port number" \
+       ) \
+       SKIP_GETOPT_LONG( \
+       "       -v      Verbose\n" \
+       "       -u      Username\n" \
+       "       -p      Password\n" \
+       "       -P      Port number" \
+       )
 
 #define fuser_trivial_usage \
        "[options] file OR port/proto"
        "[OPTIONS]..."
 #define getopt_full_usage \
        "Parse command options\n" \
-       "       -a, --alternative               Allow long options starting with single -\n" \
-       "       -l, --longoptions=longopts      Long options to be recognized\n" \
-       "       -n, --name=progname             The name under which errors are reported\n" \
-       "       -o, --options=optstring         Short options to be recognized\n" \
-       "       -q, --quiet                     Disable error reporting by getopt(3)\n" \
-       "       -Q, --quiet-output              No normal output\n" \
-       "       -s, --shell=shell               Set shell quoting conventions\n" \
-       "       -T, --test                      Test for getopt(1) version\n" \
-       "       -u, --unquoted                  Do not quote the output"
+       USE_GETOPT_LONG( \
+       "       -a,--alternative                Allow long options starting with single -\n" \
+       "       -l,--longoptions=longopts       Long options to be recognized\n" \
+       "       -n,--name=progname              The name under which errors are reported\n" \
+       "       -o,--options=optstring          Short options to be recognized\n" \
+       "       -q,--quiet                      Disable error reporting by getopt(3)\n" \
+       "       -Q,--quiet-output               No normal output\n" \
+       "       -s,--shell=shell                Set shell quoting conventions\n" \
+       "       -T,--test                       Test for getopt(1) version\n" \
+       "       -u,--unquoted                   Don't quote the output" \
+       ) \
+       SKIP_GETOPT_LONG( \
+       "       -a              Allow long options starting with single -\n" \
+       "       -l longopts     Long options to be recognized\n" \
+       "       -n progname     The name under which errors are reported\n" \
+       "       -o optstring    Short options to be recognized\n" \
+       "       -q              Disable error reporting by getopt(3)\n" \
+       "       -Q              No normal output\n" \
+       "       -s shell        Set shell quoting conventions\n" \
+       "       -T              Test for getopt(1) version\n" \
+       "       -u              Don't quote the output" \
+       )
 #define getopt_example_usage \
        "$ cat getopt.test\n" \
        "#!/bin/sh\n" \
        "Uncompress FILE (or standard input if FILE is '-')" \
        "\n\nOptions:\n" \
        "       -c      Write output to standard output\n" \
-       "       -f      Force read when source is a terminal\n" \
+       "       -f      Force\n" \
        "       -t      Test compressed file integrity"
 #define gunzip_example_usage \
        "$ ls -la /tmp/BusyBox*\n" \
        "\n\nOptions:\n" \
        "       -c      Write output to standard output instead of FILE.gz\n" \
        "       -d      Decompress\n" \
-       "       -f      Force write when destination is a terminal"
+       "       -f      Force"
 #define gzip_example_usage \
        "$ ls -la /tmp/busybox*\n" \
        "-rw-rw-r--    1 andersen andersen  1761280 Apr 14 17:47 /tmp/busybox.tar\n" \
        "daemon:x:1:1:daemon:/usr/sbin:/bin/sh\n"
 
 #define hexdump_trivial_usage \
-       "[-[bcCdefnosvx]] [OPTION] FILE"
+       "[-bcCdefnosvx" USE_FEATURE_HEXDUMP_REVERSE("R") "] FILE..."
 #define hexdump_full_usage \
        "Display file(s) or standard input in a user specified format" \
-       "\n\nOptions:\n" \
-       "       -b              One-byte octal display\n" \
-       "       -c              One-byte character display\n" \
-       "       -C              Canonical hex+ASCII, 16 bytes per line\n" \
-       "       -d              Two-byte decimal display\n" \
-       "       -e FORMAT STRING\n" \
-       "       -f FORMAT FILE\n" \
-       "       -n LENGTH       Interpret only length bytes of input\n" \
-       "       -o              Two-byte octal display\n" \
-       "       -s OFFSET       Skip offset bytes\n" \
-       "       -v              Display all input data\n" \
-       "       -x              Two-byte hexadecimal display"
+       "\n\nOptions:" \
+     "\n       -b              One-byte octal display" \
+     "\n       -c              One-byte character display" \
+     "\n       -C              Canonical hex+ASCII, 16 bytes per line" \
+     "\n       -d              Two-byte decimal display" \
+     "\n       -e FORMAT STRING" \
+     "\n       -f FORMAT FILE" \
+     "\n       -n LENGTH       Interpret only LENGTH bytes of input" \
+     "\n       -o              Two-byte octal display" \
+     "\n       -s OFFSET       Skip OFFSET bytes" \
+     "\n       -v              Display all input data" \
+     "\n       -x              Two-byte hexadecimal display" \
+       USE_FEATURE_HEXDUMP_REVERSE( \
+     "\n       -R              Reverse of 'hexdump -Cv'") \
+
+#define hd_trivial_usage \
+       "FILE..."
+#define hd_full_usage \
+       "hd is an alias for hexdump -C"
 
 #define hostid_trivial_usage \
        ""
        "\n     -d STRING       URL decode STRING" \
 
 #define hwclock_trivial_usage \
+       USE_GETOPT_LONG( \
        "[-r|--show] [-s|--hctosys] [-w|--systohc]" \
        " [-l|--localtime] [-u|--utc]" \
-       " [-f FILE]"
+       " [-f FILE]" \
+       ) \
+       SKIP_GETOPT_LONG( \
+       "[-r] [-s] [-w] [-l] [-u] [-f FILE]" \
+       )
 #define hwclock_full_usage \
        "Query and set a hardware clock (RTC)" \
        "\n\nOptions:\n" \
        "       -r      Read hardware clock and print result\n" \
        "       -s      Set the system time from the hardware clock\n" \
-       "       -w      Set the hardware clock to the current system time\n" \
+       "       -w      Set the hardware clock to the system time\n" \
        "       -u      The hardware clock is kept in coordinated universal time\n" \
        "       -l      The hardware clock is kept in local time\n" \
        "       -f FILE Use the specified clock (e.g. /dev/rtc2)"
        "Print information for USERNAME or the current user" \
        "\n\nOptions:\n" \
        USE_SELINUX( \
-       "       -Z      prints only the security context\n" \
+       "       -Z      Prints only the security context\n" \
        ) \
        "       -g      Prints only the group ID\n" \
        "       -u      Prints only the user ID\n" \
 #define ipcalc_full_usage \
        "Calculate IP network settings from a IP address" \
        "\n\nOptions:" \
-       "\n     -b      --broadcast     Display calculated broadcast address" \
-       "\n     -n      --network       Display calculated network address" \
-       "\n     -m      --netmask       Display default netmask for IP" \
+       USE_FEATURE_IPCALC_LONG_OPTIONS( \
+       "\n     -b,--broadcast  Display calculated broadcast address" \
+       "\n     -n,--network    Display calculated network address" \
+       "\n     -m,--netmask    Display default netmask for IP" \
+       USE_FEATURE_IPCALC_FANCY( \
+       "\n     -p,--prefix     Display the prefix for IP/NETMASK" \
+       "\n     -h,--hostname   Display first resolved host name" \
+       "\n     -s,--silent     Don't ever display error messages" \
+       ) \
+       ) \
+       SKIP_FEATURE_IPCALC_LONG_OPTIONS( \
+       "\n     -b      Display calculated broadcast address" \
+       "\n     -n      Display calculated network address" \
+       "\n     -m      Display default netmask for IP" \
        USE_FEATURE_IPCALC_FANCY( \
-       "\n     -p      --prefix        Display the prefix for IP/NETMASK" \
-       "\n     -h      --hostname      Display first resolved host name" \
-       "\n     -s      --silent        Don't ever display error messages")
+       "\n     -p      Display the prefix for IP/NETMASK" \
+       "\n     -h      Display first resolved host name" \
+       "\n     -s      Don't ever display error messages" \
+       ) \
+       )
 
 #define ipcrm_trivial_usage \
        "[-[MQS] key] [-[mqs] id]"
        "       [[i|o]seq] [[i|o]key KEY] [[i|o]csum]\n" \
        "       [ttl TTL] [tos TOS] [[no]pmtudisc] [dev PHYS_DEV]"
 
+#define kbd_mode_trivial_usage \
+       "[-a|k|s|u]"
+#define kbd_mode_full_usage \
+       "Report or set the keyboard mode" \
+       "\n\nOptions set mode:\n" \
+       "       -a      Default (ASCII)\n" \
+       "       -k      Medium-raw (keyboard)\n" \
+       "       -s      Raw (scancode)\n" \
+       "       -u      Unicode (utf-8)"
+
 #define kill_trivial_usage \
-       "[-l] [-signal] process-id [process-id ...]"
+       "[-l] [-signal] process-id [process-id...]"
 #define kill_full_usage \
        "Send a signal (default is TERM) to the specified process(es)" \
        "\n\nOptions:\n" \
        "$ kill 252\n"
 
 #define killall_trivial_usage \
-       "[-l] [-q] [-signal] process-name [process-name ...]"
+       "[-l] [-q] [-signal] process-name [process-name...]"
 #define killall_full_usage \
        "Send a signal (default is TERM) to the specified process(es)" \
        "\n\nOptions:\n" \
        "               reached"
 
 #define setarch_trivial_usage \
-       "personality program [args ...]"
+       "personality program [args...]"
 #define setarch_full_usage \
        "Personality may be:\n" \
        "       linux32         Set 32bit uname emulation\n" \
        "$ logger \"hello\"\n"
 
 #define login_trivial_usage \
-       "[OPTION]... [username] [ENV=VAR ...]"
+       "[OPTION]... [username] [ENV=VAR...]"
 #define login_full_usage \
        "Begin a new session on the system" \
        "\n\nOptions:\n" \
        "and * (run both after creating and before deleting). The commands run in\n" \
        "the /dev directory, and use system() which calls /bin/sh.\n\n" \
        ) \
-       "Config file parsing stops on the first matching line. If no config\n"\
-       "entry is matched, devices are created with default 0:0 660. (Make\n"\
+       "Config file parsing stops on the first matching line. If no config\n" \
+       "entry is matched, devices are created with default 0:0 660. (Make\n" \
        "the last line match .* to override this.)\n\n" \
        )
 
        "-rw-------    1 andersen andersen        0 Apr 25 17:10 /tmp/temp.mWiLjM\n"
 
 #define modprobe_trivial_usage \
-       "[-knqrsv] MODULE [symbol=value ...]"
+       "[-knqrsv] MODULE [symbol=value...]"
 #define modprobe_full_usage \
        "Options:\n" \
        "       -k      Make module autoclean-able\n" \
-       "       -n      Just show what would be done\n" \
+       "       -n      Dry run\n" \
        "       -q      Quiet\n" \
        "       -r      Remove module (stacks) or do autoclean\n" \
        "       -s      Report via syslog instead of stderr\n" \
 "    the module and the alias.\n" \
 "    A module can be aliased more than once.\n" \
 "\n" \
-"  options <mod_name|alias_name> <symbol=value ...>\n" \
+"  options <mod_name|alias_name> <symbol=value...>\n" \
 "    When loading module mod_name (or the module aliased by alias_name), pass\n" \
 "    the \"symbol=value\" pairs as option to that module.\n" \
 "\n" \
        "   from the command line\n"
 
 #define more_trivial_usage \
-       "[FILE ...]"
+       "[FILE...]"
 #define more_full_usage \
        "View FILE or standard input one screenful at a time"
 #define more_example_usage \
        "\n\nOptions:\n" \
        "       -a              Mount all filesystems in fstab\n" \
        USE_FEATURE_MTAB_SUPPORT( \
-       "       -f              \"Fake\" Add entry to mount table but don't mount it\n" \
-       "       -n              Don't write a mount table entry\n" \
+       "       -f              Update /etc/mtab, but don't mount\n" \
+       "       -n              Don't update /etc/mtab\n" \
        ) \
-       "       -o option       One of many filesystem options, listed below\n" \
-       "       -r              Mount the filesystem read-only\n" \
+       "       -r              Read-only mount\n" \
        "       -t fs-type      Filesystem type\n" \
-       "       -w              Mount for reading and writing (default)\n" \
+       "       -w              Read-write mount (default)\n" \
        "\n" \
-       "Options for use with the \"-o\" flag:\n" \
+       "-o option:\n" \
        USE_FEATURE_MOUNT_LOOP( \
        "       loop            Ignored (loop devices are autodetected)\n" \
        ) \
        USE_NC_SERVER( \
        "-l             Listen mode, for inbound connects\n" \
        ) \
-       "-n             Do not do DNS resolution" \
+       "-n             Don't do DNS resolution" \
      "\n-s addr                Local address" \
      "\n-p port                Local port" \
      "\n-u             UDP mode" \
        )
 
 #define nice_trivial_usage \
-       "[-n ADJUST] [COMMAND [ARG] ...]"
+       "[-n ADJUST] [COMMAND [ARG]...]"
 #define nice_full_usage \
        "Run a program with modified scheduling priority" \
        "\n\nOptions:\n" \
        "       -u      Unlocks (re-enables) the specified user account"
 
 #define chpasswd_trivial_usage \
-       "[--md5|--encrypt]"
+       USE_GETOPT_LONG("[--md5|--encrypt]") SKIP_GETOPT_LONG("[-m|-e]")
 #define chpasswd_full_usage \
        "Read user:password information from stdin\n" \
        "and update /etc/passwd accordingly." \
        "\n\nOptions:" \
-       "\n     -e, --encrypt   Supplied passwords are in encrypted form" \
-       "\n     -m, --md5       Use MD5 encryption instead of DES"
+       USE_GETOPT_LONG( \
+       "\n     -e,--encrypt    Supplied passwords are in encrypted form" \
+       "\n     -m,--md5        Use MD5 encryption instead of DES" \
+       ) \
+       SKIP_GETOPT_LONG( \
+       "\n     -e      Supplied passwords are in encrypted form" \
+       "\n     -m      Use MD5 encryption instead of DES" \
+       )
 
 #define patch_trivial_usage \
        "[-p num] [-i diff]"
 #endif
 
 #define pidof_trivial_usage \
-       "process-name [OPTION] [process-name ...]"
+       "process-name [OPTION] [process-name...]"
 
 #define pidof_full_usage \
        "List the PIDs of all processes with names that match the\n" \
        "       -n              Disable byte order auto-detection"
 
 #define realpath_trivial_usage \
-       "pathname ..."
+       "pathname..."
 #define realpath_full_usage \
        "Return the absolute pathnames of given argument"
 
        "       -f      Force reboot (don't go through init)"
 
 #define renice_trivial_usage \
-       "{{-n INCREMENT} | PRIORITY} [[-p | -g | -u] ID ...]"
+       "{{-n INCREMENT} | PRIORITY} [[-p | -g | -u] ID...]"
 #define renice_full_usage \
        "Change priority of running processes" \
        "\n\nOptions:\n" \
-       "       -n      Adjusts current nice value (smaller is faster)\n" \
+       "       -n      Adjust current nice value (smaller is faster)\n" \
        "       -p      Process id(s) (default)\n" \
        "       -g      Process group id(s)\n" \
        "       -u      Process user name(s) and/or id(s)"
 #define restorecon_full_usage \
        "Reset security contexts of files in pathname\n" \
        "\n     -i              Ignore files that do not exist" \
-       "\n     -f filename     File with list of files to process. Use - for stdin" \
+       "\n     -f file         File with list of files to process. Use - for stdin" \
        "\n     -e directory    Directory to exclude" \
        "\n     -R,-r           Recurse directories" \
        "\n     -n              Don't change any file labels" \
-       "\n     -o filename     Save list of files with incorrect context" \
+       "\n     -o file         Save list of files with incorrect context" \
        "\n     -v              Verbose" \
        "\n     -vv             Show changed labels" \
        "\n     -F              Force reset of context to match file_context" \
        "[-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n" \
        "       runcon CONTEXT COMMAND [args]"
 #define runcon_full_usage \
-       "runcon [-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n" \
-       "runcon CONTEXT COMMAND [args]\n" \
        "Run a program in a different security context\n\n" \
        "       CONTEXT         Complete security context\n" \
-       "       -c, --compute   Compute process transition context before modifying\n" \
-       "       -t, --type=TYPE Type (for same role as parent)\n" \
-       "       -u, --user=USER User identity\n" \
-       "       -r, --role=ROLE Role\n" \
-       "       -l, --range=RNG Levelrange" \
+       USE_GETOPT_LONG( \
+       "       -c,--compute    Compute process transition context before modifying\n" \
+       "       -t,--type=TYPE  Type (for same role as parent)\n" \
+       "       -u,--user=USER  User identity\n" \
+       "       -r,--role=ROLE  Role\n" \
+       "       -l,--range=RNG  Levelrange" \
+       ) \
+       SKIP_GETOPT_LONG( \
+       "       -c      Compute process transition context before modifying\n" \
+       "       -t TYPE Type (for same role as parent)\n" \
+       "       -u USER User identity\n" \
+       "       -r ROLE Role\n" \
+       "       -l RNG  Levelrange" \
+       )
 
 #define run_parts_trivial_usage \
        "[-t] "USE_FEATURE_RUN_PARTS_FANCY("[-l] ")"[-a ARG] [-u MASK] DIRECTORY"
@@ -2996,8 +3122,14 @@ USE_FEATURE_RUN_PARTS_FANCY("\n  -l      Prints names of all matching files even when
        "       FIRST LAST\n" \
        "       FIRST INCREMENT LAST"
 
+#define sestatus_trivial_usage \
+       "[-vb]"
+#define sestatus_full_usage \
+       "-v     Verbose\n" \
+       "-b     Display current state of booleans"
+
 #define setconsole_trivial_usage \
-       "[-r|--reset] [DEVICE]"
+       "[-r" USE_FEATURE_SETCONSOLE_LONG_OPTIONS("|--reset") "] [DEVICE]"
 #define setconsole_full_usage \
        "Redirect system console output to DEVICE (default: /dev/tty)" \
        "\n\nOptions:\n" \
@@ -3008,7 +3140,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n   -l      Prints names of all matching files even when
 #define setenforce_full_usage
 
 #define setfiles_trivial_usage \
-       "[-dnpqsvW] [-e dir]... [-o filename] [-r alt_root_path]" \
+       "[-dnpqsvW] [-e dir]... [-o file] [-r alt_root_path]" \
        USE_FEATURE_SETFILES_CHECK_OPTION( \
        " [-c policyfile] spec_file" \
        ) \
@@ -3033,7 +3165,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n   -l      Prints names of all matching files even when
        "\n     -W      Display warnings about entries that had no matching files"
 
 #define setkeycodes_trivial_usage \
-       "SCANCODE KEYCODE ..."
+       "SCANCODE KEYCODE..."
 #define setkeycodes_full_usage \
        "Set entries into the kernel's scancode-to-keycode map,\n" \
        "allowing unusual keyboards to generate usable keycodes.\n\n" \
@@ -3047,8 +3179,14 @@ USE_FEATURE_RUN_PARTS_FANCY("\n  -l      Prints names of all matching files even when
 #define setlogcons_full_usage \
        "Redirect the kernel output to console N (0 for current)"
 
+#define setsebool_trivial_usage \
+       "boolean value"
+
+#define setsebool_full_usage \
+       "Change boolean setting"
+
 #define setsid_trivial_usage \
-       "program [arg ...]"
+       "program [arg...]"
 #define setsid_full_usage \
        "Run any program in a new session by calling setsid() before\n" \
        "exec'ing the rest of its arguments. See setsid(2) for details."
@@ -3057,15 +3195,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n  -l      Prints names of all matching files even when
        "[FILE]...\n" \
        "or: sh -c command [args]..."
 #define lash_full_usage \
-       "The BusyBox LAme SHell (command interpreter)"
-#define lash_notes_usage \
-       "This command does not yet have proper documentation.\n\n" \
-       "Use lash just as you would use any other shell. It properly handles pipes,\n" \
-       "redirects, job control, can be used as the shell for scripts, and has a\n" \
-       "sufficient set of builtins to do what is needed. It does not (yet) support\n" \
-       "Bourne Shell syntax. If you need things like \"if-then-else\", \"while\", and such\n" \
-       "use ash or bash. If you just need a very simple and extremely small shell,\n" \
-       "this will do the job."
+       "lash is deprecated, please use hush"
 
 #define last_trivial_usage \
        ""
@@ -3171,27 +3301,50 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l      Prints names of all matching files even when
        "$ cat TODO | split -a 2 -l 2 TODO_\n"
 
 #define start_stop_daemon_trivial_usage \
-       "[OPTIONS] [--start|--stop] ... [-- arguments...]"
+       "[OPTIONS] [" \
+       USE_GETOPT_LONG("--start|--stop") SKIP_GETOPT_LONG("-S|-K") \
+       "] ... [-- arguments...]"
 #define start_stop_daemon_full_usage \
        "Start and stop services" \
        "\n\nOptions:" \
-       "\n     -S|--start                      Start" \
-       "\n     -K|--stop                       Stop" \
-       "\n     -a|--startas pathname           Starts process specified by pathname" \
-       "\n     -b|--background                 Put process into background" \
-       "\n     -u|--user username|uid          Stop this user's processes" \
-       "\n     -x|--exec executable            Program to either start or check" \
-       "\n     -m|--make-pidfile               Create the -p file and enter pid in it" \
-       "\n     -n|--name process-name          Stop processes with this name" \
-       "\n     -p|--pidfile pid-file           Save or load pid using a pid-file" \
-       "\n     -q|--quiet                      Quiet" \
+       USE_GETOPT_LONG( \
+       "\n     -S,--start              Start" \
+       "\n     -K,--stop               Stop" \
+       "\n     -a,--startas pathname   Starts process specified by pathname" \
+       "\n     -b,--background         Put process into background" \
+       "\n     -u,--user username|uid  Stop this user's processes" \
+       "\n     -x,--exec executable    Program to either start or check" \
+       "\n     -n,--name process-name  Stop processes with this name" \
+       "\n     -p,--pidfile pid-file   Save or load pid using a pid-file" \
+       "\n     -m,--make-pidfile       Create the -p file and enter pid in it" \
+       "\n     -q,--quiet              Quiet" \
        USE_FEATURE_START_STOP_DAEMON_FANCY( \
-       "\n     -o|--oknodo                     Exit status 0 if nothing done" \
-       "\n     -v|--verbose                    Verbose" \
-       "\n     -N|--nicelevel N                Add N to process's nice level" \
+       "\n     -o,--oknodo             Exit status 0 if nothing done" \
+       "\n     -v,--verbose            Verbose" \
+       "\n     -N,--nicelevel N        Add N to process's nice level" \
+       ) \
+       "\n     -s,--signal signal      Signal to send (default TERM)" \
+       "\n     -c,--chuid user[:[grp]] Change to specified user/group" \
        ) \
-       "\n     -s|--signal signal              Signal to send (default TERM)" \
-       "\n     -c|--chuid user[:[group]]       Change to specified user/group"
+       SKIP_GETOPT_LONG( \
+       "\n     -S              Start" \
+       "\n     -K              Stop" \
+       "\n     -a pathname     Starts process specified by pathname" \
+       "\n     -b              Put process into background" \
+       "\n     -u username|uid Stop this user's processes" \
+       "\n     -x executable   Program to either start or check" \
+       "\n     -n process-name Stop processes with this name" \
+       "\n     -p pid-file     Save or load pid using a pid-file" \
+       "\n     -m              Create the -p file and enter pid in it" \
+       "\n     -q              Quiet" \
+       USE_FEATURE_START_STOP_DAEMON_FANCY( \
+       "\n     -o              Exit status 0 if nothing done" \
+       "\n     -v              Verbose" \
+       "\n     -N N            Add N to process's nice level" \
+       ) \
+       "\n     -s signal       Signal to send (default TERM)" \
+       "\n     -c user[:[grp]] Change to specified user/group" \
+       )
 
 #define stat_trivial_usage \
        "[OPTION] FILE..."
@@ -3253,14 +3406,14 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l      Prints names of all matching files even when
        )
 
 #define strings_trivial_usage \
-       "[-afo] [-n length] [file ...]"
+       "[-afo] [-n length] [file...]"
 #define strings_full_usage \
        "Display printable strings in a binary file" \
        "\n\nOptions:" \
-       "\n     -a      Scan the whole files (this is the default)" \
-       "\n     -f      Precede each string with the name of the file where it was found" \
-       "\n     -n N    Specifies that at least N characters forms a sequence (default 4)" \
-       "\n     -o      Each string is preceded by its decimal offset in the file"
+       "\n     -a      Scan whole file (default)" \
+       "\n     -f      Precede strings with filenames" \
+       "\n     -n N    At least N characters form a string (default 4)" \
+       "\n     -o      Precede strings with decimal offsets"
 
 #define stty_trivial_usage \
        "[-a|g] [-F DEVICE] [SETTING]..."
@@ -3352,17 +3505,18 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l      Prints names of all matching files even when
 #define sysctl_full_usage \
        "Configure kernel parameters at runtime" \
        "\n\nOptions:\n" \
-       "       -n      Use this option to disable printing of the key name when printing values\n" \
-       "       -w      Use this option when you want to change a sysctl setting\n" \
-       "       -p      Load in sysctl settings from the file specified or /etc/sysctl.conf if none given\n" \
-       "       -a      Display all values currently available\n" \
-       "       -A      Display all values currently available in table form"
+       "       -n      Disable printing of key names\n" \
+       "       -e      Don't warn about unknown keys\n" \
+       "       -w      Change sysctl setting\n" \
+       "       -p FILE Load sysctl settings from FILE (default /etc/sysctl.conf)\n" \
+       "       -a      Display all values\n" \
+       "       -A      Display all values in table form"
 #define sysctl_example_usage \
-       "sysctl [-n] variable ...\n" \
-       "sysctl [-n] -w variable=value ...\n" \
-       "sysctl [-n] -a\n" \
-       "sysctl [-n] -p file    (default /etc/sysctl.conf)\n" \
-       "sysctl [-n] -A\n"
+       "sysctl [-n] [-e] variable...\n" \
+       "sysctl [-n] [-e] -w variable=value...\n" \
+       "sysctl [-n] [-e] -a\n" \
+       "sysctl [-n] [-e] -p file       (default /etc/sysctl.conf)\n" \
+       "sysctl [-n] [-e] -A\n"
 
 #define syslogd_trivial_usage \
        "[OPTION]..."
@@ -3416,7 +3570,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n   -l      Prints names of all matching files even when
        USE_FEATURE_TAR_BZIP2("j") USE_FEATURE_TAR_LZMA("a") \
        USE_FEATURE_TAR_COMPRESS("Z") "xtvO] " \
        USE_FEATURE_TAR_FROM("[-X FILE] ") \
-       "[-f TARFILE] [-C DIR] [FILE(s)] ..."
+       "[-f TARFILE] [-C DIR] [FILE(s)]..."
 #define tar_full_usage \
        "Create, extract, or list files from a tar file" \
        "\n\nOptions:\n" \
@@ -3501,6 +3655,8 @@ USE_FEATURE_RUN_PARTS_FANCY("\n   -l      Prints names of all matching files even when
        "\n\nOptions:" \
        "\n     -l LOGIN        Exec LOGIN on connect" \
        "\n     -f issue_file   Display issue_file instead of /etc/issue" \
+       "\n     -K              Close connection as soon as login exits" \
+       "\n                     (normally wait until all programs close slave pty)" \
        USE_FEATURE_TELNETD_STANDALONE( \
        "\n     -p PORT         Port to listen to" \
        "\n     -b ADDR         Address to bind to" \
@@ -3598,7 +3754,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n   -l      Prints names of all matching files even when
        "and show the status for however many processes will fit on the screen."
 
 #define touch_trivial_usage \
-       "[-c] FILE [FILE ...]"
+       "[-c] FILE [FILE...]"
 #define touch_full_usage \
        "Update the last-modified date on the given FILE[s]" \
        "\n\nOptions:\n" \
@@ -3684,24 +3840,54 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l      Prints names of all matching files even when
 
 #define udhcpc_trivial_usage \
        "[-Cfbnqtv] [-c CID] [-V VCLS] [-H HOSTNAME] [-i INTERFACE]\n" \
-       "       [-p pidfile] [-r IP] [-s script]"
+       "       [-p pidfile] [-r IP] [-s script] [-O dhcp-option]..."
 #define udhcpc_full_usage \
-       "       -V,--vendorclass=CLASSID        Set vendor class identifier" \
-       "\n     -i,--interface=INTERFACE        Interface to use (default: eth0)" \
+       USE_GETOPT_LONG( \
+       "       -V,--vendorclass=CLASSID        Vendor class identifier" \
+       "\n     -i,--interface=INTERFACE        Interface to use (default eth0)" \
        "\n     -H,-h,--hostname=HOSTNAME       Client hostname" \
-       "\n     -c,--clientid=CLIENTID  Set client identifier" \
+       "\n     -c,--clientid=CLIENTID  Client identifier" \
        "\n     -C,--clientid-none      Suppress default client identifier" \
-       "\n     -p,--pidfile=file       Store process ID of daemon in file" \
+       "\n     -p,--pidfile=file       Create pidfile" \
        "\n     -r,--request=IP         IP address to request" \
-       "\n     -s,--script=file        Run file at dhcp events (default: /usr/share/udhcpc/default.script)" \
-       "\n     -t,--retries=N          Send up to N request packets"\
+       "\n     -s,--script=file        Run file at dhcp events (default /usr/share/udhcpc/default.script)" \
+       "\n     -t,--retries=N          Send up to N request packets" \
+       "\n     -T,--timeout=N          Try to get a lease for N seconds (default 3)" \
+       "\n     -A,--tryagain=N         Wait N seconds (default 20) after failure" \
        "\n     -f,--foreground Run in foreground" \
-       "\n     -b,--background Background if lease cannot be immediately negotiated" \
+       "\n     -b,--background Background if lease is not immediately obtained" \
        "\n     -S,--syslog     Log to syslog too" \
-       "\n     -n,--now        Exit with failure if lease cannot be immediately negotiated" \
+       "\n     -n,--now        Exit with failure if lease is not immediately obtained" \
        "\n     -q,--quit       Quit after obtaining lease" \
        "\n     -R,--release    Release IP on quit" \
-       "\n     -v,--version    Display version" \
+       "\n     -O,--request-option=OPT Request DHCP option OPT from server" \
+       USE_FEATURE_UDHCPC_ARPING( \
+       "\n     -a,--arping     Use arping to validate offered address" \
+       ) \
+       ) \
+       SKIP_GETOPT_LONG( \
+       "       -V CLASSID      Vendor class identifier" \
+       "\n     -i INTERFACE    Interface to use (default: eth0)" \
+       "\n     -H,-h HOSTNAME  Client hostname" \
+       "\n     -c CLIENTID     Client identifier" \
+       "\n     -C              Suppress default client identifier" \
+       "\n     -p file         Create pidfile" \
+       "\n     -r IP           IP address to request" \
+       "\n     -s file         Run file at dhcp events (default /usr/share/udhcpc/default.script)" \
+       "\n     -t N            Send up to N request packets" \
+       "\n     -T N            Try to get a lease for N seconds (default 3)" \
+       "\n     -A N            Wait N seconds (default 20) after failure" \
+       "\n     -f              Run in foreground" \
+       "\n     -b              Background if lease is not immediately obtained" \
+       "\n     -S              Log to syslog too" \
+       "\n     -n              Exit with failure if lease is not immediately obtained" \
+       "\n     -q              Quit after obtaining lease" \
+       "\n     -R              Release IP on quit" \
+       "\n     -O OPT          Request DHCP option OPT from server" \
+       USE_FEATURE_UDHCPC_ARPING( \
+       "\n     -a              Use arping to validate offered address" \
+       ) \
+       )
 
 #define udhcpd_trivial_usage \
        "[-fS] [configfile]" \
@@ -3729,17 +3915,17 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l      Prints names of all matching files even when
        "$ umount /dev/hdc1\n"
 
 #define uname_trivial_usage \
-       "[OPTION]..."
+       "[-amnrspv]"
 #define uname_full_usage \
-       "Print certain system information. With no OPTION, same as -s." \
+       "Print system information." \
        "\n\nOptions:\n" \
-       "       -a      Print all information\n" \
+       "       -a      Print all\n" \
        "       -m      The machine (hardware) type\n" \
-       "       -n      Print machine's hostname\n" \
-       "       -r      Print OS release\n" \
-       "       -s      Print OS name\n" \
-       "       -p      Print host processor type\n" \
-       "       -v      Print OS version"
+       "       -n      Hostname\n" \
+       "       -r      OS release\n" \
+       "       -s      OS name (default)\n" \
+       "       -p      Processor type\n" \
+       "       -v      OS version"
 #define uname_example_usage \
        "$ uname -a\n" \
        "Linux debian 2.4.23 #2 Tue Dec 23 17:09:10 MST 2003 i686 GNU/Linux\n"
@@ -3750,19 +3936,23 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l      Prints names of all matching files even when
        "Uncompress .Z file[s]" \
        "\n\nOptions:\n" \
        "       -c      Extract to stdout\n" \
-       "       -f      Force overwrite an existing file"
+       "       -f      Overwrite an existing file"
 
 #define unexpand_trivial_usage \
        "[-f][-a][-t NUM] [FILE|-]"
 #define unexpand_full_usage \
        "Convert spaces to tabs, writing to standard output." \
        "\n\nOptions:" \
-       "\n     -a" USE_FEATURE_UNEXPAND_LONG_OPTIONS(",--all") \
-       "       Convert all blanks" \
-       "\n     -f" USE_FEATURE_UNEXPAND_LONG_OPTIONS(",--first-only") \
-       "       Convert only leading sequences of blanks" \
-       "\n     -t" USE_FEATURE_UNEXPAND_LONG_OPTIONS(",--tabs=N") \
-       "       Tabstops every N chars"
+       USE_FEATURE_UNEXPAND_LONG_OPTIONS( \
+       "\n     -a,--all        Convert all blanks" \
+       "\n     -f,--first-only Convert only leading blanks" \
+       "\n     -t,--tabs=N     Tabstops every N chars" \
+       ) \
+       SKIP_FEATURE_UNEXPAND_LONG_OPTIONS( \
+       "\n     -a      Convert all blanks" \
+       "\n     -f      Convert only leading blanks" \
+       "\n     -t N    Tabstops every N chars" \
+       )
 
 #define uniq_trivial_usage \
        "[-fscdu]... [INPUT [OUTPUT]]"
@@ -3844,7 +4034,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n   -l      Prints names of all matching files even when
        "$\n"
 
 #define vconfig_trivial_usage \
-       "COMMAND [OPTIONS] ..."
+       "COMMAND [OPTIONS]..."
 #define vconfig_full_usage \
        "Create and remove virtual ethernet devices" \
        "\n\nOptions:\n" \
@@ -3907,9 +4097,14 @@ USE_FEATURE_RUN_PARTS_FANCY("\n  -l      Prints names of all matching files even when
        "     31      46    1365 /etc/passwd\n"
 
 #define wget_trivial_usage \
+       USE_GETOPT_LONG( \
        "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document file]\n" \
-       "               [--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \
-       "               [-U|--user-agent agent] url"
+       "       [--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \
+       "       [-U|--user-agent agent] url" \
+       ) \
+       SKIP_GETOPT_LONG( \
+       "[-csq] [-O file] [-Y on/off] [-P DIR] [-U agent] url" \
+       )
 #define wget_full_usage \
        "Retrieve files via HTTP or FTP" \
        "\n\nOptions:\n" \
@@ -3922,7 +4117,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n   -l      Prints names of all matching files even when
        "       -Y      Use proxy ('on' or 'off')"
 
 #define which_trivial_usage \
-       "[COMMAND ...]"
+       "[COMMAND...]"
 #define which_full_usage \
        "Locate a COMMAND"
 #define which_example_usage \
@@ -3930,9 +4125,11 @@ USE_FEATURE_RUN_PARTS_FANCY("\n  -l      Prints names of all matching files even when
        "/bin/login\n"
 
 #define who_trivial_usage \
-       " "
+       "[-a]"
 #define who_full_usage \
-       "Print the current user names and related information"
+       "Show who is logged on" \
+       "\n\nOptions:\n" \
+       "       -a      show all"
 
 #define whoami_trivial_usage \
        ""