Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/include/usage.h

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/include/usage.h (modified) (88 diffs)

branches/2.2.9/mindi-busybox/include/usage.h

@@ +1 @@
+/* DO NOT EDIT. This file is generated from usage.src.h */
 /* vi: set sw=8 ts=8: */
 /*
@@ -7 +8 @@
  * 3. Start each source line with message as follows:
  *    |<7 spaces>"text with tabs"....
+ * or
+ *    |<5 spaces>"\ntext with tabs"....
  */
-
-#ifndef __BB_USAGE_H__
-#define __BB_USAGE_H__
+#ifndef BB_USAGE_H
+#define BB_USAGE_H 1
+
+
+#define NOUSAGE_STR "\b"
+
+
+#define bunzip2_trivial_usage \
+       "[-cf] [FILE]..." \
+
+#define bunzip2_full_usage "\n\n" \
+       "Decompress FILEs (or stdin)\n" \
+     "\nOptions:" \
+     "\n    -c  Write to stdout" \
+     "\n    -f  Force" \
+
+#define bzcat_trivial_usage \
+       "FILE" \
+
+#define bzcat_full_usage "\n\n" \
+       "Decompress to stdout" \
+
+#define tar_trivial_usage \
+       "-[" IF_FEATURE_TAR_CREATE("c") "xt" IF_FEATURE_SEAMLESS_GZ("z") \
+    IF_FEATURE_SEAMLESS_BZ2("j") IF_FEATURE_SEAMLESS_LZMA("a") \
+    IF_FEATURE_SEAMLESS_Z("Z") IF_FEATURE_TAR_NOPRESERVE_TIME("m") "vO] " \
+    IF_FEATURE_TAR_FROM("[-X FILE] ") \
+       "[-f TARFILE] [-C DIR] [FILE]..." \
+
+#define tar_full_usage "\n\n" \
+    IF_FEATURE_TAR_CREATE("Create, extract, ") \
+    IF_NOT_FEATURE_TAR_CREATE("Extract ") \
+    "or list files from a tar file\n" \
+     "\nOperation:" \
+    IF_FEATURE_TAR_CREATE( \
+     "\n    c   Create" \
+    ) \
+     "\n    x   Extract" \
+     "\n    t   List" \
+     "\nOptions:" \
+     "\n    f   Name of TARFILE ('-' for stdin/out)" \
+     "\n    C   Change to DIR before operation" \
+     "\n    v   Verbose" \
+    IF_FEATURE_SEAMLESS_GZ( \
+     "\n    z   (De)compress using gzip" \
+    ) \
+    IF_FEATURE_SEAMLESS_BZ2( \
+     "\n    j   (De)compress using bzip2" \
+    ) \
+    IF_FEATURE_SEAMLESS_LZMA( \
+     "\n    a   (De)compress using lzma" \
+    ) \
+    IF_FEATURE_SEAMLESS_Z( \
+     "\n    Z   (De)compress using compress" \
+    ) \
+     "\n    O   Extract to stdout" \
+    IF_FEATURE_TAR_CREATE( \
+     "\n    h   Follow symlinks" \
+    ) \
+    IF_FEATURE_TAR_NOPRESERVE_TIME( \
+     "\n    m   Don't restore mtime" \
+    ) \
+    IF_FEATURE_TAR_FROM( \
+    IF_FEATURE_TAR_LONG_OPTIONS( \
+     "\n    exclude File to exclude" \
+    ) \
+     "\n    X   File with names to exclude" \
+     "\n    T   File with names to include" \
+    ) \
+
+#define tar_example_usage \
+       "$ zcat /tmp/tarball.tar.gz | tar -xf -\n" \
+       "$ tar -cf /tmp/tarball.tar /usr/local\n" \
+
+#define date_trivial_usage \
+       "[OPTIONS] [+FMT] [TIME]" \
+
+#define date_full_usage "\n\n" \
+       "Display time (using +FMT), or set time\n" \
+     "\nOptions:" \
+    IF_NOT_LONG_OPTS( \
+     "\n    [-s] TIME   Set time to TIME" \
+     "\n    -u      Work in UTC (don't convert to local time)" \
+     "\n    -R      Output RFC-2822 compliant date string" \
+    ) IF_LONG_OPTS( \
+     "\n    [-s,--set] TIME Set time to TIME" \
+     "\n    -u,--utc    Work in UTC (don't convert to local time)" \
+     "\n    -R,--rfc-2822   Output RFC-2822 compliant date string" \
+    ) \
+    IF_FEATURE_DATE_ISOFMT( \
+     "\n    -I[SPEC]    Output ISO-8601 compliant date string" \
+     "\n            SPEC='date' (default) for date only," \
+     "\n            'hours', 'minutes', or 'seconds' for date and" \
+     "\n            time to the indicated precision" \
+    ) \
+    IF_NOT_LONG_OPTS( \
+     "\n    -r FILE     Display last modification time of FILE" \
+     "\n    -d TIME     Display TIME, not 'now'" \
+    ) IF_LONG_OPTS( \
+     "\n    -r,--reference FILE Display last modification time of FILE" \
+     "\n    -d,--date TIME  Display TIME, not 'now'" \
+    ) \
+    IF_FEATURE_DATE_ISOFMT( \
+     "\n    -D FMT      Use FMT for -d TIME conversion" \
+    ) \
+     "\n" \
+     "\nRecognized TIME formats:" \
+     "\n    hh:mm[:ss]" \
+     "\n    [YYYY.]MM.DD-hh:mm[:ss]" \
+     "\n    YYYY-MM-DD hh:mm[:ss]" \
+     "\n    [[[[[YY]YY]MM]DD]hh]mm[.ss]" \
+
+#define date_example_usage \
+       "$ date\n" \
+       "Wed Apr 12 18:52:41 MDT 2000\n" \
+
+#define mv_trivial_usage \
+       "[-fin] SOURCE DEST\n" \
+       "or: mv [-fin] SOURCE... DIRECTORY" \
+
+#define mv_full_usage "\n\n" \
+       "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY\n" \
+     "\nOptions:" \
+     "\n    -f  Don't prompt before overwriting" \
+     "\n    -i  Interactive, prompt before overwrite" \
+     "\n    -n  Don't overwrite an existing file" \
+
+#define mv_example_usage \
+       "$ mv /tmp/foo /bin/bar\n" \
+
+#define base64_trivial_usage \
+    "[-d] [FILE]" \
+
+#define base64_full_usage "\n\n" \
+       "Base64 encode or decode FILE to standard output" \
+     "\nOptions:" \
+     "\n    -d  Decode data" \
+
+#define wc_trivial_usage \
+       "[-c"IF_UNICODE_SUPPORT("m")"lwL] [FILE]..." \
+
+#define wc_full_usage "\n\n" \
+       "Count lines, words, and bytes for each FILE (or stdin)\n" \
+     "\nOptions:" \
+     "\n    -c  Count bytes" \
+    IF_UNICODE_SUPPORT( \
+     "\n    -m  Count characters" \
+    ) \
+     "\n    -l  Count newlines" \
+     "\n    -w  Count words" \
+     "\n    -L  Print longest line length" \
+
+#define wc_example_usage \
+       "$ wc /etc/passwd\n" \
+       "     31      46    1365 /etc/passwd\n" \
+
+#define yes_trivial_usage \
+       "[STRING]" \
+
+#define yes_full_usage "\n\n" \
+       "Repeatedly output a line with STRING, or 'y'" \
+
+#define tune2fs_trivial_usage \
+       "[-c MOUNT_CNT] " \
+       "[-i DAYS] " \
+       "[-L LABEL] " \
+       "BLOCKDEV" \
+
+#define tune2fs_full_usage "\n\n" \
+       "Adjust filesystem options on ext[23] filesystems" \
+
+#define patch_trivial_usage \
+       "[OPTIONS] [ORIGFILE [PATCHFILE]]" \
+
+#define patch_full_usage "\n\n" \
+    IF_LONG_OPTS( \
+       "    -p,--strip N        Strip N leading components from file names" \
+     "\n    -i,--input DIFF     Read DIFF instead of stdin" \
+     "\n    -R,--reverse        Reverse patch" \
+     "\n    -N,--forward        Ignore already applied patches" \
+     "\n    --dry-run       Don't actually change files" \
+     "\n    -E,--remove-empty-files Remove output files if they become empty" \
+    ) \
+    IF_NOT_LONG_OPTS( \
+       "    -p N    Strip N leading components from file names" \
+     "\n    -i DIFF Read DIFF instead of stdin" \
+     "\n    -R  Reverse patch" \
+     "\n    -N  Ignore already applied patches" \
+     "\n    -E  Remove output files if they become empty" \
+    ) \
+
+#define patch_example_usage \
+       "$ patch -p1 < example.diff\n" \
+       "$ patch -p0 -i example.diff" \
+
+#define find_trivial_usage \
+       "[PATH]... [EXPRESSION]" \
+
+#define find_full_usage "\n\n" \
+       "Search for files. The default PATH is the current directory,\n" \
+       "default EXPRESSION is '-print'\n" \
+     "\nEXPRESSION may consist of:" \
+     "\n    -follow     Follow symlinks" \
+    IF_FEATURE_FIND_XDEV( \
+     "\n    -xdev       Don't descend directories on other filesystems" \
+    ) \
+    IF_FEATURE_FIND_MAXDEPTH( \
+     "\n    -maxdepth N Descend at most N levels. -maxdepth 0 applies" \
+     "\n            tests/actions to command line arguments only" \
+    ) \
+     "\n    -mindepth N Don't act on first N levels" \
+     "\n    -name PATTERN   File name (w/o directory name) matches PATTERN" \
+     "\n    -iname PATTERN  Case insensitive -name" \
+    IF_FEATURE_FIND_PATH( \
+     "\n    -path PATTERN   Path matches PATTERN" \
+    ) \
+    IF_FEATURE_FIND_REGEX( \
+     "\n    -regex PATTERN  Path matches regex PATTERN" \
+    ) \
+    IF_FEATURE_FIND_TYPE( \
+     "\n    -type X     File type is X (X is one of: f,d,l,b,c,...)" \
+    ) \
+    IF_FEATURE_FIND_PERM( \
+     "\n    -perm NNN   Permissions match any of (+NNN), all of (-NNN)," \
+     "\n            or exactly NNN" \
+    ) \
+    IF_FEATURE_FIND_MTIME( \
+     "\n    -mtime DAYS Modified time is greater than (+N), less than (-N)," \
+     "\n            or exactly N days" \
+    ) \
+    IF_FEATURE_FIND_MMIN( \
+     "\n    -mmin MINS  Modified time is greater than (+N), less than (-N)," \
+     "\n            or exactly N minutes" \
+    ) \
+    IF_FEATURE_FIND_NEWER( \
+     "\n    -newer FILE Modified time is more recent than FILE's" \
+    ) \
+    IF_FEATURE_FIND_INUM( \
+     "\n    -inum N     File has inode number N" \
+    ) \
+    IF_FEATURE_FIND_USER( \
+     "\n    -user NAME  File is owned by user NAME (numeric user ID allowed)" \
+    ) \
+    IF_FEATURE_FIND_GROUP( \
+     "\n    -group NAME File belongs to group NAME (numeric group ID allowed)" \
+    ) \
+    IF_FEATURE_FIND_DEPTH( \
+     "\n    -depth      Process directory name after traversing it" \
+    ) \
+    IF_FEATURE_FIND_SIZE( \
+     "\n    -size N[bck]    File size is N (c:bytes,k:kbytes,b:512 bytes(def.))" \
+     "\n            +/-N: file size is bigger/smaller than N" \
+    ) \
+    IF_FEATURE_FIND_LINKS( \
+     "\n    -links N    Number of links is greater than (+N), less than (-N)," \
+     "\n            or exactly N" \
+    ) \
+     "\n    -print      Print (default and assumed)" \
+    IF_FEATURE_FIND_PRINT0( \
+     "\n    -print0     Delimit output with null characters rather than" \
+     "\n            newlines" \
+    ) \
+    IF_FEATURE_FIND_CONTEXT( \
+     "\n    -context    File has specified security context" \
+    ) \
+    IF_FEATURE_FIND_EXEC( \
+     "\n    -exec CMD ARG ; Run CMD with all instances of {} replaced by the" \
+     "\n            matching files" \
+    ) \
+    IF_FEATURE_FIND_PRUNE( \
+     "\n    -prune      Stop traversing current subtree" \
+    ) \
+    IF_FEATURE_FIND_DELETE( \
+     "\n    -delete     Delete files, turns on -depth option" \
+    ) \
+    IF_FEATURE_FIND_PAREN( \
+     "\n    (EXPR)      Group an expression" \
+    ) \
+
+#define find_example_usage \
+       "$ find / -name passwd\n" \
+       "/etc/passwd\n" \
+
+#define grep_trivial_usage \
+       "[-HhnlLoqvsriw" \
+       "F" \
+    IF_FEATURE_GREP_EGREP_ALIAS("E") \
+    IF_EXTRA_COMPAT("z") \
+       "] [-m N] " \
+    IF_FEATURE_GREP_CONTEXT("[-A/B/C N] ") \
+       "PATTERN/-e PATTERN.../-f FILE [FILE]..." \
+
+#define grep_full_usage "\n\n" \
+       "Search for PATTERN in FILEs (or stdin)\n" \
+     "\nOptions:" \
+     "\n    -H  Add 'filename:' prefix" \
+     "\n    -h  Do not add 'filename:' prefix" \
+     "\n    -n  Add 'line_no:' prefix" \
+     "\n    -l  Show only names of files that match" \
+     "\n    -L  Show only names of files that don't match" \
+     "\n    -c  Show only count of matching lines" \
+     "\n    -o  Show only the matching part of line" \
+     "\n    -q  Quiet. Return 0 if PATTERN is found, 1 otherwise" \
+     "\n    -v  Select non-matching lines" \
+     "\n    -s  Suppress open and read errors" \
+     "\n    -r  Recurse" \
+     "\n    -i  Ignore case" \
+     "\n    -w  Match whole words only" \
+     "\n    -F  PATTERN is a literal (not regexp)" \
+    IF_FEATURE_GREP_EGREP_ALIAS( \
+     "\n    -E  PATTERN is an extended regexp" \
+    ) \
+    IF_EXTRA_COMPAT( \
+     "\n    -z  Input is NUL terminated" \
+    ) \
+     "\n    -m N    Match up to N times per file" \
+    IF_FEATURE_GREP_CONTEXT( \
+     "\n    -A N    Print N lines of trailing context" \
+     "\n    -B N    Print N lines of leading context" \
+     "\n    -C N    Same as '-A N -B N'" \
+    ) \
+     "\n    -e PTRN Pattern to match" \
+     "\n    -f FILE Read pattern from file" \
+
+#define grep_example_usage \
+       "$ grep root /etc/passwd\n" \
+       "root:x:0:0:root:/root:/bin/bash\n" \
+       "$ grep ^[rR]oo. /etc/passwd\n" \
+       "root:x:0:0:root:/root:/bin/bash\n" \
+
+#define egrep_trivial_usage NOUSAGE_STR \
+
+#define egrep_full_usage "" \
+
+#define fgrep_trivial_usage NOUSAGE_STR \
+
+#define fgrep_full_usage "" \
+
+#define xargs_trivial_usage \
+       "[OPTIONS] [PROG ARGS]" \
+
+#define xargs_full_usage "\n\n" \
+       "Run PROG on every item given by stdin\n" \
+     "\nOptions:" \
+    IF_FEATURE_XARGS_SUPPORT_CONFIRMATION( \
+     "\n    -p  Ask user whether to run each command" \
+    ) \
+     "\n    -r  Don't run command if input is empty" \
+    IF_FEATURE_XARGS_SUPPORT_ZERO_TERM( \
+     "\n    -0  Input is separated by NUL characters" \
+    ) \
+     "\n    -t  Print the command on stderr before execution" \
+     "\n    -e[STR] STR stops input processing" \
+     "\n    -n N    Pass no more than N args to PROG" \
+     "\n    -s N    Pass command line of no more than N bytes" \
+    IF_FEATURE_XARGS_SUPPORT_TERMOPT( \
+     "\n    -x  Exit if size is exceeded" \
+    ) \
+
+#define xargs_example_usage \
+       "$ ls | xargs gzip\n" \
+       "$ find . -name '*.c' -print | xargs rm\n" \
+
+#define bootchartd_trivial_usage \
+       "start [PROG ARGS]|stop|init" \
+
+#define bootchartd_full_usage "\n\n" \
+       "Create /var/log/bootchart.tgz with boot chart data\n" \
+     "\nOptions:" \
+     "\nstart: start background logging; with PROG, run PROG, then kill logging with USR1" \
+     "\nstop: send USR1 to all bootchartd processes" \
+     "\ninit: start background logging; stop when getty/xdm is seen (for init scripts)" \
+     "\nUnder PID 1: as init, then exec $bootchart_init, /init, /sbin/init" \
+
+#define halt_trivial_usage \
+       "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]") \
+
+#define halt_full_usage "\n\n" \
+       "Halt the system\n" \
+     "\nOptions:" \
+     "\n    -d SEC  Delay interval" \
+     "\n    -n  Do not sync" \
+     "\n    -f  Force (don't go through init)" \
+    IF_FEATURE_WTMP( \
+     "\n    -w  Only write a wtmp record" \
+    ) \
+
+#define poweroff_trivial_usage \
+       "[-d DELAY] [-n] [-f]" \
+
+#define poweroff_full_usage "\n\n" \
+       "Halt and shut off power\n" \
+     "\nOptions:" \
+     "\n    -d SEC  Delay interval" \
+     "\n    -n  Do not sync" \
+     "\n    -f  Force (don't go through init)" \
+
+#define reboot_trivial_usage \
+       "[-d DELAY] [-n] [-f]" \
+
+#define reboot_full_usage "\n\n" \
+       "Reboot the system\n" \
+     "\nOptions:" \
+     "\n    -d SEC  Delay interval" \
+     "\n    -n  Do not sync" \
+     "\n    -f  Force (don't go through init)" \
+
+#define linuxrc_trivial_usage NOUSAGE_STR \
+
+#define linuxrc_full_usage "" \
+
+#define init_trivial_usage \
+       "" \
+
+#define init_full_usage "\n\n" \
+       "Init is the parent of all processes" \
+
+#define init_notes_usage \
+    "This version of init is designed to be run only by the kernel.\n" \
+    "\n" \
+    "BusyBox init doesn't support multiple runlevels. The runlevels field of\n" \
+    "the /etc/inittab file is completely ignored by BusyBox init. If you want\n" \
+    "runlevels, use sysvinit.\n" \
+    "\n" \
+    "BusyBox init works just fine without an inittab. If no inittab is found,\n" \
+    "it has the following default behavior:\n" \
+    "\n" \
+    "   ::sysinit:/etc/init.d/rcS\n" \
+    "   ::askfirst:/bin/sh\n" \
+    "   ::ctrlaltdel:/sbin/reboot\n" \
+    "   ::shutdown:/sbin/swapoff -a\n" \
+    "   ::shutdown:/bin/umount -a -r\n" \
+    "   ::restart:/sbin/init\n" \
+    "\n" \
+    "if it detects that /dev/console is _not_ a serial console, it will also run:\n" \
+    "\n" \
+    "   tty2::askfirst:/bin/sh\n" \
+    "   tty3::askfirst:/bin/sh\n" \
+    "   tty4::askfirst:/bin/sh\n" \
+    "\n" \
+    "If you choose to use an /etc/inittab file, the inittab entry format is as follows:\n" \
+    "\n" \
+    "   <id>:<runlevels>:<action>:<process>\n" \
+    "\n" \
+    "   <id>:\n" \
+    "\n" \
+    "       WARNING: This field has a non-traditional meaning for BusyBox init!\n" \
+    "       The id field is used by BusyBox init to specify the controlling tty for\n" \
+    "       the specified process to run on. The contents of this field are\n" \
+    "       appended to \"/dev/\" and used as-is. There is no need for this field to\n" \
+    "       be unique, although if it isn't you may have strange results. If this\n" \
+    "       field is left blank, the controlling tty is set to the console. Also\n" \
+    "       note that if BusyBox detects that a serial console is in use, then only\n" \
+    "       entries whose controlling tty is either the serial console or /dev/null\n" \
+    "       will be run. BusyBox init does nothing with utmp. We don't need no\n" \
+    "       stinkin' utmp.\n" \
+    "\n" \
+    "   <runlevels>:\n" \
+    "\n" \
+    "       The runlevels field is completely ignored.\n" \
+    "\n" \
+    "   <action>:\n" \
+    "\n" \
+    "       Valid actions include: sysinit, respawn, askfirst, wait,\n" \
+    "       once, restart, ctrlaltdel, and shutdown.\n" \
+    "\n" \
+    "       The available actions can be classified into two groups: actions\n" \
+    "       that are run only once, and actions that are re-run when the specified\n" \
+    "       process exits.\n" \
+    "\n" \
+    "       Run only-once actions:\n" \
+    "\n" \
+    "           'sysinit' is the first item run on boot. init waits until all\n" \
+    "           sysinit actions are completed before continuing. Following the\n" \
+    "           completion of all sysinit actions, all 'wait' actions are run.\n" \
+    "           'wait' actions, like 'sysinit' actions, cause init to wait until\n" \
+    "           the specified task completes. 'once' actions are asynchronous,\n" \
+    "           therefore, init does not wait for them to complete. 'restart' is\n" \
+    "           the action taken to restart the init process. By default this should\n" \
+    "           simply run /sbin/init, but can be a script which runs pivot_root or it\n" \
+    "           can do all sorts of other interesting things. The 'ctrlaltdel' init\n" \
+    "           actions are run when the system detects that someone on the system\n" \
+    "           console has pressed the CTRL-ALT-DEL key combination. Typically one\n" \
+    "           wants to run 'reboot' at this point to cause the system to reboot.\n" \
+    "           Finally the 'shutdown' action specifies the actions to taken when\n" \
+    "           init is told to reboot. Unmounting filesystems and disabling swap\n" \
+    "           is a very good here.\n" \
+    "\n" \
+    "       Run repeatedly actions:\n" \
+    "\n" \
+    "           'respawn' actions are run after the 'once' actions. When a process\n" \
+    "           started with a 'respawn' action exits, init automatically restarts\n" \
+    "           it. Unlike sysvinit, BusyBox init does not stop processes from\n" \
+    "           respawning out of control. The 'askfirst' actions acts just like\n" \
+    "           respawn, except that before running the specified process it\n" \
+    "           displays the line \"Please press Enter to activate this console.\"\n" \
+    "           and then waits for the user to press enter before starting the\n" \
+    "           specified process.\n" \
+    "\n" \
+    "       Unrecognized actions (like initdefault) will cause init to emit an\n" \
+    "       error message, and then go along with its business. All actions are\n" \
+    "       run in the order they appear in /etc/inittab.\n" \
+    "\n" \
+    "   <process>:\n" \
+    "\n" \
+    "       Specifies the process to be executed and its command line.\n" \
+    "\n" \
+    "Example /etc/inittab file:\n" \
+    "\n" \
+    "   # This is run first except when booting in single-user mode\n" \
+    "   #\n" \
+    "   ::sysinit:/etc/init.d/rcS\n" \
+    "   \n" \
+    "   # /bin/sh invocations on selected ttys\n" \
+    "   #\n" \
+    "   # Start an \"askfirst\" shell on the console (whatever that may be)\n" \
+    "   ::askfirst:-/bin/sh\n" \
+    "   # Start an \"askfirst\" shell on /dev/tty2-4\n" \
+    "   tty2::askfirst:-/bin/sh\n" \
+    "   tty3::askfirst:-/bin/sh\n" \
+    "   tty4::askfirst:-/bin/sh\n" \
+    "   \n" \
+    "   # /sbin/getty invocations for selected ttys\n" \
+    "   #\n" \
+    "   tty4::respawn:/sbin/getty 38400 tty4\n" \
+    "   tty5::respawn:/sbin/getty 38400 tty5\n" \
+    "   \n" \
+    "   \n" \
+    "   # Example of how to put a getty on a serial line (for a terminal)\n" \
+    "   #\n" \
+    "   #::respawn:/sbin/getty -L ttyS0 9600 vt100\n" \
+    "   #::respawn:/sbin/getty -L ttyS1 9600 vt100\n" \
+    "   #\n" \
+    "   # Example how to put a getty on a modem line\n" \
+    "   #::respawn:/sbin/getty 57600 ttyS2\n" \
+    "   \n" \
+    "   # Stuff to do when restarting the init process\n" \
+    "   ::restart:/sbin/init\n" \
+    "   \n" \
+    "   # Stuff to do before rebooting\n" \
+    "   ::ctrlaltdel:/sbin/reboot\n" \
+    "   ::shutdown:/bin/umount -a -r\n" \
+    "   ::shutdown:/sbin/swapoff -a\n" \
+
+#define mesg_trivial_usage \
+       "[y|n]" \
+
+#define mesg_full_usage "\n\n" \
+       "Control write access to your terminal\n" \
+       "    y   Allow write access to your terminal\n" \
+       "    n   Disallow write access to your terminal" \
+
+#define add_shell_trivial_usage \
+       "SHELL..." \
+
+#define add_shell_full_usage "\n\n" \
+       "Add SHELLs to /etc/shells" \
+
+#define remove_shell_trivial_usage \
+       "SHELL..." \
+
+#define remove_shell_full_usage "\n\n" \
+       "Remove SHELLs from /etc/shells" \
+
+#define conspy_trivial_usage \
+    "[-vcsndf] [-x COL] [-y LINE] [CONSOLE_NO]" \
+
+#define conspy_full_usage "\n\n" \
+     "A text-mode VNC like program for Linux virtual consoles." \
+     "\nTo exit, quickly press ESC 3 times." \
+     "\n" \
+     "\nOptions:" \
+     "\n    -v  Don't send keystrokes to the console" \
+     "\n    -c  Create missing devices in /dev" \
+     "\n    -s  Open a SHELL session" \
+     "\n    -n  Black & white" \
+     "\n    -d  Dump console to stdout" \
+     "\n    -f  Follow cursor" \
+     "\n    -x COL  Starting column" \
+     "\n    -y LINE Starting line" \
+
+#define dc_trivial_usage \
+       "EXPRESSION..." \
+
+#define dc_full_usage "\n\n" \
+       "Tiny RPN calculator. Operations:\n" \
+       "+, add, -, sub, *, mul, /, div, %, mod, **, exp, and, or, not, eor,\n" \
+       "p - print top of the stack (without popping),\n" \
+       "f - print entire stack,\n" \
+       "o - pop the value and set output radix (must be 10, 16, 8 or 2).\n" \
+       "Examples: 'dc 2 2 add' -> 4, 'dc 8 8 * 2 2 + /' -> 16" \
+
+#define dc_example_usage \
+       "$ dc 2 2 + p\n" \
+       "4\n" \
+       "$ dc 8 8 \\* 2 2 + / p\n" \
+       "16\n" \
+       "$ dc 0 1 and p\n" \
+       "0\n" \
+       "$ dc 0 1 or p\n" \
+       "1\n" \
+       "$ echo 72 9 div 8 mul p | dc\n" \
+       "64\n" \
+
+#define nandwrite_trivial_usage \
+    "[-p] [-s ADDR] MTD_DEVICE [FILE]" \
+
+#define nandwrite_full_usage "\n\n" \
+    "Write to the specified MTD device\n" \
+     "\nOptions:" \
+     "\n    -p  Pad to page size" \
+     "\n    -s ADDR Start address" \
+
+#define nanddump_trivial_usage \
+    "[-o] [-b] [-s ADDR] [-f FILE] MTD_DEVICE" \
+
+#define nanddump_full_usage "\n\n" \
+    "Dump the sepcified MTD device\n" \
+     "\nOptions:" \
+     "\n    -o  Omit oob data" \
+     "\n    -b  Omit bad block from the dump" \
+     "\n    -s ADDR Start address" \
+     "\n    -l LEN  Length" \
+     "\n    -f FILE Dump to file ('-' for stdout)" \
+
+#define ubiattach_trivial_usage \
+       "-m MTD_NUM [-d UBI_NUM] UBI_CTRL_DEV" \
+
+#define ubiattach_full_usage "\n\n" \
+       "Attach MTD device to UBI\n" \
+     "\nOptions:" \
+     "\n    -m MTD_NUM  MTD device number to attach" \
+     "\n    -d UBI_NUM  UBI device number to assign" \
+
+#define ubidetach_trivial_usage \
+       "-d UBI_NUM UBI_CTRL_DEV" \
+
+#define ubidetach_full_usage "\n\n" \
+       "Detach MTD device from UBI\n" \
+     "\nOptions:" \
+     "\n    -d UBI_NUM  UBI device number" \
+
+#if !ENABLE_MODPROBE_SMALL \
+
+#define depmod_trivial_usage NOUSAGE_STR \
+
+#define depmod_full_usage "" \
+
+#endif \
+
+#if !ENABLE_MODPROBE_SMALL \
+
+#define insmod_trivial_usage \
+    IF_FEATURE_2_4_MODULES("[OPTIONS] MODULE ") \
+    IF_NOT_FEATURE_2_4_MODULES("FILE ") \
+    "[SYMBOL=VALUE]..." \
+
+#define insmod_full_usage "\n\n" \
+       "Load the specified kernel modules into the kernel" \
+    IF_FEATURE_2_4_MODULES( "\n" \
+     "\nOptions:" \
+     "\n    -f  Force module to load into the wrong kernel version" \
+     "\n    -k  Make module autoclean-able" \
+     "\n    -v  Verbose" \
+     "\n    -q  Quiet" \
+     "\n    -L  Lock: prevent simultaneous loads" \
+    IF_FEATURE_INSMOD_LOAD_MAP( \
+     "\n    -m  Output load map to stdout" \
+    ) \
+     "\n    -x  Don't export externs" \
+    ) \
+
+#endif \
+
+#if !ENABLE_MODPROBE_SMALL \
+
+#define lsmod_trivial_usage \
+       "" \
+
+#define lsmod_full_usage "\n\n" \
+       "List the currently loaded kernel modules" \
+
+#endif \
+
+#define modinfo_trivial_usage \
+       "[-adlp0] [-F keyword] MODULE" \
+
+#define modinfo_full_usage "\n\n" \
+       "Options:" \
+     "\n    -a      Shortcut for '-F author'" \
+     "\n    -d      Shortcut for '-F description'" \
+     "\n    -l      Shortcut for '-F license'" \
+     "\n    -p      Shortcut for '-F parm'" \
+     "\n    -F keyword  Keyword to look for" \
+     "\n    -0      Separate output with NULs" \
+
+#define modinfo_example_usage \
+       "$ modinfo -F vermagic loop\n" \
+
+#if !ENABLE_MODPROBE_SMALL \
+
+#define modprobe_notes_usage \
+    "modprobe can (un)load a stack of modules, passing each module options (when\n" \
+    "loading). modprobe uses a configuration file to determine what option(s) to\n" \
+    "pass each module it loads.\n" \
+    "\n" \
+    "The configuration file is searched (in this order):\n" \
+    "\n" \
+    "    /etc/modprobe.conf (2.6 only)\n" \
+    "    /etc/modules.conf\n" \
+    "    /etc/conf.modules (deprecated)\n" \
+    "\n" \
+    "They all have the same syntax (see below). If none is present, it is\n" \
+    "_not_ an error; each loaded module is then expected to load without\n" \
+    "options. Once a file is found, the others are tested for.\n" \
+    "\n" \
+    "/etc/modules.conf entry format:\n" \
+    "\n" \
+    "  alias <alias_name> <mod_name>\n" \
+    "    Makes it possible to modprobe alias_name, when there is no such module.\n" \
+    "    It makes sense if your mod_name is long, or you want a more representative\n" \
+    "    name for that module (eg. 'scsi' in place of 'aha7xxx').\n" \
+    "    This makes it also possible to use a different set of options (below) for\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" \
+    "    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" \
+    "Sample /etc/modules.conf file:\n" \
+    "\n" \
+    "  options tulip irq=3\n" \
+    "  alias tulip tulip2\n" \
+    "  options tulip2 irq=4 io=0x308\n" \
+    "\n" \
+    "Other functionality offered by 'classic' modprobe is not available in\n" \
+    "this implementation.\n" \
+    "\n" \
+    "If module options are present both in the config file, and on the command line,\n" \
+    "then the options from the command line will be passed to the module _after_\n" \
+    "the options from the config file. That way, you can have defaults in the config\n" \
+    "file, and override them for a specific usage from the command line.\n" \
+
+#define modprobe_example_usage \
+       "(with the above /etc/modules.conf):\n\n" \
+       "$ modprobe tulip\n" \
+       "   will load the module 'tulip' with default option 'irq=3'\n\n" \
+       "$ modprobe tulip irq=5\n" \
+       "   will load the module 'tulip' with option 'irq=5', thus overriding the default\n\n" \
+       "$ modprobe tulip2\n" \
+       "   will load the module 'tulip' with default options 'irq=4 io=0x308',\n" \
+       "   which are the default for alias 'tulip2'\n\n" \
+       "$ modprobe tulip2 irq=8\n" \
+       "   will load the module 'tulip' with default options 'irq=4 io=0x308 irq=8',\n" \
+       "   which are the default for alias 'tulip2' overridden by the option 'irq=8'\n\n" \
+       "   from the command line\n\n" \
+       "$ modprobe tulip2 irq=2 io=0x210\n" \
+       "   will load the module 'tulip' with default options 'irq=4 io=0x308 irq=4 io=0x210',\n" \
+       "   which are the default for alias 'tulip2' overridden by the options 'irq=2 io=0x210'\n\n" \
+       "   from the command line\n" \
+
+#define modprobe_trivial_usage \
+    "[-alrqvs" \
+    IF_FEATURE_MODPROBE_BLACKLIST("b") \
+    "] MODULE [symbol=value]..." \
+
+#define modprobe_full_usage "\n\n" \
+       "Options:" \
+     "\n    -a  Load multiple MODULEs" \
+     "\n    -l  List (MODULE is a pattern)" \
+     "\n    -r  Remove MODULE (stacks) or do autoclean" \
+     "\n    -q  Quiet" \
+     "\n    -v  Verbose" \
+     "\n    -s  Log to syslog" \
+    IF_FEATURE_MODPROBE_BLACKLIST( \
+     "\n    -b  Apply blacklist to module names too" \
+    ) \
+
+#endif /* !ENABLE_MODPROBE_SMALL */ \
+
+#if ENABLE_MODPROBE_SMALL \
+
+#define depmod_trivial_usage NOUSAGE_STR \
+
+#define depmod_full_usage "" \
+
+#define lsmod_trivial_usage \
+       "" \
+
+#define lsmod_full_usage "\n\n" \
+       "List the currently loaded kernel modules" \
+
+#define insmod_trivial_usage \
+    IF_FEATURE_2_4_MODULES("[OPTIONS] MODULE ") \
+    IF_NOT_FEATURE_2_4_MODULES("FILE ") \
+    "[SYMBOL=VALUE]..." \
+
+#define insmod_full_usage "\n\n" \
+       "Load the specified kernel modules into the kernel" \
+    IF_FEATURE_2_4_MODULES( "\n" \
+     "\nOptions:" \
+     "\n    -f  Force module to load into the wrong kernel version" \
+     "\n    -k  Make module autoclean-able" \
+     "\n    -v  Verbose" \
+     "\n    -q  Quiet" \
+     "\n    -L  Lock: prevent simultaneous loads" \
+    IF_FEATURE_INSMOD_LOAD_MAP( \
+     "\n    -m  Output load map to stdout" \
+    ) \
+     "\n    -x  Don't export externs" \
+    ) \
+
+#define rmmod_trivial_usage \
+       "[-wfa] [MODULE]..." \
+
+#define rmmod_full_usage "\n\n" \
+       "Unload kernel modules\n" \
+     "\nOptions:" \
+     "\n    -w  Wait until the module is no longer used" \
+     "\n    -f  Force unload" \
+     "\n    -a  Remove all unused modules (recursively)" \
+
+#define rmmod_example_usage \
+       "$ rmmod tulip\n" \
+
+#define modprobe_trivial_usage \
+    "[-qfwrsv] MODULE [symbol=value]..." \
+
+#define modprobe_full_usage "\n\n" \
+       "Options:" \
+     "\n    -r  Remove MODULE (stacks) or do autoclean" \
+     "\n    -q  Quiet" \
+     "\n    -v  Verbose" \
+     "\n    -f  Force" \
+     "\n    -w  Wait for unload" \
+     "\n    -s  Report via syslog instead of stderr" \
+
+#endif \
+
+#if !ENABLE_MODPROBE_SMALL \
+
+#define rmmod_trivial_usage \
+       "[-wfa] [MODULE]..." \
+
+#define rmmod_full_usage "\n\n" \
+       "Unload kernel modules\n" \
+     "\nOptions:" \
+     "\n    -w  Wait until the module is no longer used" \
+     "\n    -f  Force unload" \
+     "\n    -a  Remove all unused modules (recursively)" \
+
+#define rmmod_example_usage \
+       "$ rmmod tulip\n" \
+
+#endif \
+
+#define nbdclient_trivial_usage \
+       "HOST PORT BLOCKDEV" \
+
+#define nbdclient_full_usage "\n\n" \
+       "Connect to HOST and provide a network block device on BLOCKDEV" \
+
+#if ENABLE_NC_110_COMPAT \
+
+#define nc_trivial_usage \
+       "[OPTIONS] HOST PORT  - connect" \
+    IF_NC_SERVER("\n" \
+       "nc [OPTIONS] -l -p PORT [HOST] [PORT]  - listen" \
+    ) \
+
+#define nc_full_usage "\n\n" \
+       "Options:" \
+     "\n    -e PROG Run PROG after connect (must be last)" \
+    IF_NC_SERVER( \
+     "\n    -l  Listen mode, for inbound connects" \
+    ) \
+     "\n    -p PORT Local port" \
+     "\n    -s ADDR Local address" \
+     "\n    -w SEC  Timeout for connects and final net reads" \
+    IF_NC_EXTRA( \
+     "\n    -i SEC  Delay interval for lines sent" /* ", ports scanned" */ \
+    ) \
+     "\n    -n  Don't do DNS resolution" \
+     "\n    -u  UDP mode" \
+     "\n    -v  Verbose" \
+    IF_NC_EXTRA( \
+     "\n    -o FILE Hex dump traffic" \
+     "\n    -z  Zero-I/O mode (scanning)" \
+    ) \
+
+#endif \
+
+#if !ENABLE_NC_110_COMPAT \
+
+#if ENABLE_NC_SERVER || ENABLE_NC_EXTRA \
+
+#define NC_OPTIONS_STR "\n\nOptions:" \
+
+#else \
+
+#define NC_OPTIONS_STR \
+
+#endif \
+
+#define nc_trivial_usage \
+    IF_NC_EXTRA("[-iN] [-wN] ")IF_NC_SERVER("[-l] [-p PORT] ") \
+       "["IF_NC_EXTRA("-f FILE|")"IPADDR PORT]"IF_NC_EXTRA(" [-e PROG]") \
+
+#define nc_full_usage "\n\n" \
+       "Open a pipe to IP:PORT" IF_NC_EXTRA(" or FILE") \
+    NC_OPTIONS_STR \
+    IF_NC_EXTRA( \
+     "\n    -e PROG Run PROG after connect" \
+    IF_NC_SERVER( \
+     "\n    -l  Listen mode, for inbound connects" \
+    IF_NC_EXTRA( \
+     "\n        (use -l twice with -e for persistent server)") \
+     "\n    -p PORT Local port" \
+    ) \
+     "\n    -w SEC  Timeout for connect" \
+     "\n    -i SEC  Delay interval for lines sent" \
+     "\n    -f FILE Use file (ala /dev/ttyS0) instead of network" \
+    ) \
+
+#define nc_notes_usage "" \
+    IF_NC_EXTRA( \
+       "To use netcat as a terminal emulator on a serial port:\n\n" \
+       "$ stty 115200 -F /dev/ttyS0\n" \
+       "$ stty raw -echo -ctlecho && nc -f /dev/ttyS0\n" \
+    ) \
+
+#define nc_example_usage \
+       "$ nc foobar.somedomain.com 25\n" \
+       "220 foobar ESMTP Exim 3.12 #1 Sat, 15 Apr 2000 00:03:02 -0600\n" \
+       "help\n" \
+       "214-Commands supported:\n" \
+       "214-    HELO EHLO MAIL RCPT DATA AUTH\n" \
+       "214     NOOP QUIT RSET HELP\n" \
+       "quit\n" \
+       "221 foobar closing connection\n" \
+
+#endif \
+
+#define netstat_trivial_usage \
+       "[-"IF_ROUTE("r")"al] [-tuwx] [-en"IF_FEATURE_NETSTAT_WIDE("W")IF_FEATURE_NETSTAT_PRG("p")"]" \
+
+#define netstat_full_usage "\n\n" \
+       "Display networking information\n" \
+     "\nOptions:" \
+    IF_ROUTE( \
+     "\n    -r  Routing table" \
+    ) \
+     "\n    -a  All sockets" \
+     "\n    -l  Listening sockets" \
+     "\n        Else: connected sockets" \
+     "\n    -t  TCP sockets" \
+     "\n    -u  UDP sockets" \
+     "\n    -w  Raw sockets" \
+     "\n    -x  Unix sockets" \
+     "\n        Else: all socket types" \
+     "\n    -e  Other/more information" \
+     "\n    -n  Don't resolve names" \
+    IF_FEATURE_NETSTAT_WIDE( \
+     "\n    -W  Wide display" \
+    ) \
+    IF_FEATURE_NETSTAT_PRG( \
+     "\n    -p  Show PID/program name for sockets" \
+    ) \
+
+#define iostat_trivial_usage \
+       "[-c] [-d] [-t] [-z] [-k|-m] [ALL|BLOCKDEV...] [INTERVAL [COUNT]]" \
+
+#define iostat_full_usage "\n\n" \
+       "Report CPU and I/O statistics\n" \
+     "\nOptions:" \
+     "\n    -c  Show CPU utilization" \
+     "\n    -d  Show device utilization" \
+     "\n    -t  Print current time" \
+     "\n    -z  Omit devices with no activity" \
+     "\n    -k  Use kb/s" \
+     "\n    -m  Use Mb/s" \
+
+#define mpstat_trivial_usage \
+       "[-A] [-I SUM|CPU|ALL|SCPU] [-u] [-P num|ALL] [INTERVAL [COUNT]]" \
+
+#define mpstat_full_usage "\n\n" \
+       "Per-processor statistics\n" \
+     "\nOptions:" \
+     "\n    -A          Same as -I ALL -u -P ALL" \
+     "\n    -I SUM|CPU|ALL|SCPU Report interrupt statistics" \
+     "\n    -P num|ALL      Processor to monitor" \
+     "\n    -u          Report CPU utilization" \
+
+#define pmap_trivial_usage \
+       "[-x][-q] PID" \
+
+#define pmap_full_usage "\n\n" \
+       "Display detailed precesses' memory usage\n" \
+       "\nOptions:" \
+       "\n     -x              show details" \
+       "\n     -q              quiet" \
+
+#define powertop_trivial_usage \
+       "" \
+
+#define powertop_full_usage "\n\n" \
+       "Analyze power consumption on Intel-based laptops\n" \
+
+#define smemcap_trivial_usage ">SMEMDATA.TAR" \
+
+#define smemcap_full_usage "\n\n" \
+       "Collect memory usage data in /proc and write it to stdout" \
+
+#define ash_trivial_usage NOUSAGE_STR \
+
+#define ash_full_usage "" \
+
+#define sh_trivial_usage NOUSAGE_STR \
+
+#define sh_full_usage "" \
+
+#define bash_trivial_usage NOUSAGE_STR \
+
+#define bash_full_usage "" \
+
+#define cttyhack_trivial_usage \
+       "PROG ARGS" \
+
+#define cttyhack_full_usage "\n\n" \
+       "Give PROG a controlling tty if possible." \
+     "\nExample for /etc/inittab (for busybox init):" \
+     "\n    ::respawn:/bin/cttyhack /bin/sh" \
+     "\nGiving controlling tty to shell running with PID 1:" \
+     "\n    $ exec cttyhack sh" \
+     "\nStarting interactive shell from boot shell script:" \
+     "\n    setsid cttyhack sh" \
+
+#define hush_trivial_usage NOUSAGE_STR \
+
+#define hush_full_usage "" \
+
+#define msh_trivial_usage NOUSAGE_STR \
+
+#define msh_full_usage "" \
+
+#define sh_trivial_usage NOUSAGE_STR \
+
+#define sh_full_usage "" \
+
+#define bash_trivial_usage NOUSAGE_STR \
+
+#define bash_full_usage "" \
+
+#define blockdev_trivial_usage \
+    "OPTION BLOCKDEV" \
+
+#define blockdev_full_usage "\n\n" \
+       "Options:" \
+     "\n    --setro     Set ro" \
+     "\n    --setrw     Set rw" \
+     "\n    --getro     Get ro" \
+     "\n    --getss     Get sector size" \
+     "\n    --getbsz    Get block size" \
+     "\n    --setbsz BYTES  Set block size" \
+     "\n    --getsize   Get device size in 512-byte sectors" \
+     "\n    --getsize64 Get device size in bytes" \
+     "\n    --flushbufs Flush buffers" \
+     "\n    --rereadpt  Reread partition table" \
+
+#define rev_trivial_usage \
+    "[FILE]..." \
+
+#define rev_full_usage "\n\n" \
+    "Reverse lines of FILE" \
+
+#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 1 \
+
+# define IF_UDHCP_VERBOSE(...) __VA_ARGS__ \
+
+#else \
+
+# define IF_UDHCP_VERBOSE(...) \
+
+#endif \
+
+#define udhcpc_trivial_usage \
+       "[-fbnq"IF_UDHCP_VERBOSE("v")"oCR] [-i IFACE] [-r IP] [-s PROG] [-p PIDFILE]\n" \
+       "    [-H HOSTNAME] [-V VENDOR] [-x OPT:VAL]... [-O OPT]..." IF_FEATURE_UDHCP_PORT(" [-P N]") \
+
+#define udhcpc_full_usage "\n" \
+    IF_LONG_OPTS( \
+     "\n    -i,--interface IFACE    Interface to use (default eth0)" \
+     "\n    -p,--pidfile FILE   Create pidfile" \
+     "\n    -s,--script PROG    Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")" \
+     "\n    -t,--retries N      Send up to N discover packets" \
+     "\n    -T,--timeout N      Pause between packets (default 3 seconds)" \
+     "\n    -A,--tryagain N     Wait N seconds after failure (default 20)" \
+     "\n    -f,--foreground     Run in foreground" \
+    USE_FOR_MMU( \
+     "\n    -b,--background     Background if lease is not obtained" \
+    ) \
+     "\n    -n,--now        Exit if lease is not obtained" \
+     "\n    -q,--quit       Exit after obtaining lease" \
+     "\n    -R,--release        Release IP on exit" \
+     "\n    -S,--syslog     Log to syslog too" \
+    IF_FEATURE_UDHCP_PORT( \
+     "\n    -P,--client-port N  Use port N (default 68)" \
+    ) \
+    IF_FEATURE_UDHCPC_ARPING( \
+     "\n    -a,--arping     Use arping to validate offered address" \
+    ) \
+     "\n    -O,--request-option OPT Request option OPT from server (cumulative)" \
+     "\n    -o,--no-default-options Don't request any options (unless -O is given)" \
+     "\n    -r,--request IP     Request this IP address" \
+     "\n    -x OPT:VAL      Include option OPT in sent packets (cumulative)" \
+     "\n                Examples of string, numeric, and hex byte opts:" \
+     "\n                -x hostname:bbox - option 12" \
+     "\n                -x lease:3600 - option 51 (lease time)" \
+     "\n                -x 0x3d:0100BEEFC0FFEE - option 61 (client id)" \
+     "\n    -F,--fqdn NAME      Ask server to update DNS mapping for NAME" \
+     "\n    -H,-h,--hostname NAME   Send NAME as client hostname (default none)" \
+     "\n    -V,--vendorclass VENDOR Vendor identifier (default 'udhcp VERSION')" \
+     "\n    -C,--clientid-none  Don't send MAC as client identifier" \
+    IF_UDHCP_VERBOSE( \
+     "\n    -v          Verbose" \
+    ) \
+    ) \
+    IF_NOT_LONG_OPTS( \
+     "\n    -i IFACE    Interface to use (default eth0)" \
+     "\n    -p FILE     Create pidfile" \
+     "\n    -s PROG     Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")" \
+     "\n    -t N        Send up to N discover packets" \
+     "\n    -T N        Pause between packets (default 3 seconds)" \
+     "\n    -A N        Wait N seconds (default 20) after failure" \
+     "\n    -f      Run in foreground" \
+    USE_FOR_MMU( \
+     "\n    -b      Background if lease is not obtained" \
+    ) \
+     "\n    -n      Exit if lease is not obtained" \
+     "\n    -q      Exit after obtaining lease" \
+     "\n    -R      Release IP on exit" \
+     "\n    -S      Log to syslog too" \
+    IF_FEATURE_UDHCP_PORT( \
+     "\n    -P N        Use port N (default 68)" \
+    ) \
+    IF_FEATURE_UDHCPC_ARPING( \
+     "\n    -a      Use arping to validate offered address" \
+    ) \
+     "\n    -O OPT      Request option OPT from server (cumulative)" \
+     "\n    -o      Don't request any options (unless -O is given)" \
+     "\n    -r IP       Request this IP address" \
+     "\n    -x OPT:VAL  Include option OPT in sent packets (cumulative)" \
+     "\n            Examples of string, numeric, and hex byte opts:" \
+     "\n            -x hostname:bbox - option 12" \
+     "\n            -x lease:3600 - option 51 (lease time)" \
+     "\n            -x 0x3d:0100BEEFC0FFEE - option 61 (client id)" \
+     "\n    -F NAME     Ask server to update DNS mapping for NAME" \
+     "\n    -H,-h NAME  Send NAME as client hostname (default none)" \
+     "\n    -V VENDOR   Vendor identifier (default 'udhcp VERSION')" \
+     "\n    -C      Don't send MAC as client identifier" \
+    IF_UDHCP_VERBOSE( \
+     "\n    -v      Verbose" \
+    ) \
+    ) \
+
+#define acpid_trivial_usage \
+       "[-d] [-c CONFDIR] [-l LOGFILE] [-a ACTIONFILE] [-M MAPFILE] [-e PROC_EVENT_FILE] [-p PIDFILE]"
+#define acpid_full_usage "\n\n" \
+       "Listen to ACPI events and spawn specific helpers on event arrival\n" \
+     "\nOptions:" \
+     "\n    -c DIR  Config directory [/etc/acpi]" \
+     "\n    -d  Don't daemonize, (implies -f)" \
+     "\n    -e FILE /proc event file [/proc/acpi/event]" \
+     "\n    -f  Run in foreground" \
+     "\n    -l FILE Log file [/var/log/acpid.log]" \
+     "\n    -p FILE Pid file [/var/run/acpid.pid]" \
+     "\n    -a FILE Action file [/etc/acpid.conf]" \
+     "\n    -M FILE Map file [/etc/acpi.map]" \
+    IF_FEATURE_ACPID_COMPAT( \
+     "\n\nAccept and ignore compatibility options -g -m -s -S -v" \
+    )
+
+#define acpid_example_usage \
+       "Without -e option, acpid uses all /dev/input/event* files\n" \
+       "# acpid\n" \
+       "# acpid -l /var/log/my-acpi-log\n" \
+       "# acpid -e /proc/acpi/event\n"
 
 #define addgroup_trivial_usage \
-       "[-g GID]"USE_FEATURE_ADDUSER_TO_GROUP(" [user_name]")" group_name"
-#define addgroup_full_usage \
-       "Add a group to the system"USE_FEATURE_ADDUSER_TO_GROUP(" or add an user to a group") \
-       "\n\nOptions:\n" \
-       "    -g GID  Specify gid"
+       "[-g GID] " IF_FEATURE_ADDUSER_TO_GROUP("[USER] ") "GROUP"
+#define addgroup_full_usage "\n\n" \
+       "Add a group " IF_FEATURE_ADDUSER_TO_GROUP("or add a user to a group") "\n" \
+     "\nOptions:" \
+     "\n    -g GID  Group id" \
+     "\n    -S  Create a system group" \
 
 #define adduser_trivial_usage \
-       "[OPTIONS] user_name"
-#define adduser_full_usage \
-       "Add a user to the system" \
-       "\n\nOptions:\n" \
-       "    -h DIR      Home directory\n" \
-       "    -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" \
-       "    -D      Do not assign a password (logins still possible via ssh)\n" \
-       "    -H      Do not create home directory"
+       "[OPTIONS] USER"
+#define adduser_full_usage "\n\n" \
+       "Add a user\n" \
+     "\nOptions:" \
+     "\n    -h DIR      Home directory" \
+     "\n    -g GECOS    GECOS field" \
+     "\n    -s SHELL    Login shell" \
+     "\n    -G GRP      Add user to existing group" \
+     "\n    -S      Create a system user" \
+     "\n    -D      Don't assign a password" \
+     "\n    -H      Don't create home directory" \
+     "\n    -u UID      User id" \
 
 #define adjtimex_trivial_usage \
-       "[-q] [-o offset] [-f frequency] [-p timeconstant] [-t tick]"
-#define adjtimex_full_usage \
-       "Read and optionally set system timebase parameters.\n" \
-       "See adjtimex(2)." \
-       "\n\nOptions:\n" \
-       "    -q      Quiet\n" \
-       "    -o offset   Time offset, microseconds\n" \
-       "    -f frequency    Frequency adjust, integer kernel units (65536 is 1ppm)\n" \
-       "            (positive values make the system clock run faster)\n" \
-       "    -t tick     Microseconds per tick, usually 10000\n" \
-       "    -p timeconstant"
+       "[-q] [-o OFF] [-f FREQ] [-p TCONST] [-t TICK]"
+#define adjtimex_full_usage "\n\n" \
+       "Read and optionally set system timebase parameters. See adjtimex(2)\n" \
+     "\nOptions:" \
+     "\n    -q  Quiet" \
+     "\n    -o OFF  Time offset, microseconds" \
+     "\n    -f FREQ Frequency adjust, integer kernel units (65536 is 1ppm)" \
+     "\n        (positive values make clock run faster)" \
+     "\n    -t TICK Microseconds per tick, usually 10000" \
+     "\n    -p TCONST" \
 
 #define ar_trivial_usage \
        "[-o] [-v] [-p] [-t] [-x] ARCHIVE FILES"
-#define ar_full_usage \
-       "Extract or list FILES from an ar archive" \
-       "\n\nOptions:\n" \
-       "    -o  Preserve original dates\n" \
-       "    -p  Extract to stdout\n" \
-       "    -t  List\n" \
-       "    -x  Extract\n" \
-       "    -v  Verbose"
+#define ar_full_usage "\n\n" \
+       "Extract or list FILES from an ar archive\n" \
+     "\nOptions:" \
+     "\n    -o  Preserve original dates" \
+     "\n    -p  Extract to stdout" \
+     "\n    -t  List" \
+     "\n    -x  Extract" \
+     "\n    -v  Verbose" \
 
 #define arp_trivial_usage \
-       "\n" \
-       "[-vn]   [-H type] [-i if] -a [hostname]\n" \
-       "[-v]          [-i if] -d hostname [pub]\n" \
-       "[-v]    [-H type] [-i if] -s hostname hw_addr [temp]\n" \
-       "[-v]    [-H type] [-i if] -s hostname hw_addr [netmask nm] pub\n" \
-       "[-v]    [-H type] [-i if] -Ds hostname ifa [netmask nm] pub\n"
-#define arp_full_usage \
-       "Manipulate the system ARP cache" \
-       "\n\nOptions:" \
+     "\n[-vn]   [-H HWTYPE] [-i IF] -a [HOSTNAME]" \
+     "\n[-v]            [-i IF] -d HOSTNAME [pub]" \
+     "\n[-v]    [-H HWTYPE] [-i IF] -s HOSTNAME HWADDR [temp]" \
+     "\n[-v]    [-H HWTYPE] [-i IF] -s HOSTNAME HWADDR [netmask MASK] pub" \
+     "\n[-v]    [-H HWTYPE] [-i IF] -Ds HOSTNAME IFACE [netmask MASK] pub"
+#define arp_full_usage "\n\n" \
+       "Manipulate ARP cache\n" \
+     "\nOptions:" \
        "\n  -a      Display (all) hosts" \
-       "\n  -s      Set a new ARP entry" \
+       "\n  -s      Set new ARP entry" \
        "\n  -d      Delete a specified entry" \
        "\n  -v      Verbose" \
        "\n  -n      Don't resolve names" \
-       "\n  -i if       Specify network interface (e.g. eth0)" \
+       "\n  -i IF       Network interface" \
        "\n  -D      Read <hwaddr> from given device" \
-       "\n  -A, -p      Specify protocol family" \
-       "\n  -H hwtype   Specify hardware address type"
+       "\n  -A,-p AF    Protocol family" \
+       "\n  -H HWTYPE   Hardware address type" \
 
 #define arping_trivial_usage \
-       "[-fqbDUA] [-c count] [-w timeout] [-i device] [-s sender] target"
-#define arping_full_usage \
-       "Ping hosts by ARP requests/replies" \
-       "\n\nOptions:\n" \
-       "    -f      Quit on first ARP reply\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" \
-       "    -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"
-
-#define ash_trivial_usage \
-       "[FILE]...\n" \
-       "or: ash -c command [args]..."
-#define ash_full_usage \
-       "The ash shell (command interpreter)"
+       "[-fqbDUA] [-c CNT] [-w TIMEOUT] [-I IFACE] [-s SRC_IP] DST_IP"
+#define arping_full_usage "\n\n" \
+       "Send ARP requests/replies\n" \
+     "\nOptions:" \
+     "\n    -f      Quit on first ARP reply" \
+     "\n    -q      Quiet" \
+     "\n    -b      Keep broadcasting, don't go unicast" \
+     "\n    -D      Duplicated address detection mode" \
+     "\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, seconds" \
+     "\n    -I IFACE    Interface to use (default eth0)" \
+     "\n    -s SRC_IP   Sender IP address" \
+     "\n    DST_IP      Target IP address" \
 
 #define awk_trivial_usage \
-       "[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"
+       "[OPTIONS] [AWK_PROGRAM] [FILE]..."
+#define awk_full_usage "\n\n" \
+       "Options:" \
+     "\n    -v VAR=VAL  Set variable" \
+     "\n    -F SEP      Use SEP as field separator" \
+     "\n    -f FILE     Read program from FILE" \
 
 #define basename_trivial_usage \
        "FILE [SUFFIX]"
-#define basename_full_usage \
-       "Strip directory path and suffixes from FILE.\n" \
-       "If specified, also remove any trailing SUFFIX."
+#define basename_full_usage "\n\n" \
+       "Strip directory path and .SUFFIX from FILE\n"
 #define basename_example_usage \
        "$ basename /usr/local/bin/foo\n" \
@@ -120 +1301 @@
        "bar"
 
-#define bunzip2_trivial_usage \
-       "[OPTION]... [FILE]"
-#define bunzip2_full_usage \
-       "Uncompress FILE (or standard input if FILE is '-' or omitted)" \
-       "\n\nOptions:\n" \
-       "    -c  Write output to standard output\n" \
-       "    -f  Force"
+#define beep_trivial_usage \
+       "-f FREQ -l LEN -d DELAY -r COUNT -n"
+#define beep_full_usage "\n\n" \
+       "Options:" \
+     "\n    -f  Frequency in Hz" \
+     "\n    -l  Length in ms" \
+     "\n    -d  Delay in ms" \
+     "\n    -r  Repetitions" \
+     "\n    -n  Start new tone" \
+
+#define blkid_trivial_usage \
+       ""
+#define blkid_full_usage "\n\n" \
+       "Print UUIDs of all filesystems"
+
+#define brctl_trivial_usage \
+       "COMMAND [BRIDGE [INTERFACE]]"
+#define brctl_full_usage "\n\n" \
+       "Manage ethernet bridges\n" \
+     "\nCommands:" \
+    IF_FEATURE_BRCTL_SHOW( \
+     "\n    show            Show a list of bridges" \
+    ) \
+     "\n    addbr BRIDGE        Create BRIDGE" \
+     "\n    delbr BRIDGE        Delete BRIDGE" \
+     "\n    addif BRIDGE IFACE  Add IFACE to BRIDGE" \
+     "\n    delif BRIDGE IFACE  Delete IFACE from BRIDGE" \
+    IF_FEATURE_BRCTL_FANCY( \
+     "\n    setageing BRIDGE TIME       Set ageing time" \
+     "\n    setfd BRIDGE TIME       Set bridge forward delay" \
+     "\n    sethello BRIDGE TIME        Set hello time" \
+     "\n    setmaxage BRIDGE TIME       Set max message age" \
+     "\n    setpathcost BRIDGE COST     Set path cost" \
+     "\n    setportprio BRIDGE PRIO     Set port priority" \
+     "\n    setbridgeprio BRIDGE PRIO   Set bridge priority" \
+     "\n    stp BRIDGE [1/yes/on|0/no/off]  STP on/off" \
+    ) \
+
+#define bzip2_trivial_usage \
+       "[OPTIONS] [FILE]..."
+#define bzip2_full_usage "\n\n" \
+       "Compress FILEs (or stdin) with bzip2 algorithm\n" \
+     "\nOptions:" \
+     "\n    -1..9   Compression level" \
+     "\n    -d  Decompress" \
+     "\n    -c  Write to stdout" \
+     "\n    -f  Force" \
 
 #define busybox_notes_usage \
        "Hello world!\n"
 
-#define bzcat_trivial_usage \
+#define lzop_trivial_usage \
+       "[-cfvd123456789CF] [FILE]..."
+#define lzop_full_usage "\n\n" \
+       "Options:" \
+     "\n    -1..9   Compression level" \
+     "\n    -d  Decompress" \
+     "\n    -c  Write to stdout" \
+     "\n    -f  Force" \
+     "\n    -v  Verbose" \
+     "\n    -F  Don't store or verify checksum" \
+     "\n    -C  Also write checksum of compressed block" \
+
+#define lzopcat_trivial_usage \
+       "[-vCF] [FILE]..."
+#define lzopcat_full_usage "\n\n" \
+       "    -v  Verbose" \
+     "\n    -F  Don't store or verify checksum" \
+
+#define unlzop_trivial_usage \
+       "[-cfvCF] [FILE]..."
+#define unlzop_full_usage "\n\n" \
+       "Options:" \
+     "\n    -c  Write to stdout" \
+     "\n    -f  Force" \
+     "\n    -v  Verbose" \
+     "\n    -F  Don't store or verify checksum" \
+
+#define unlzma_trivial_usage \
+       "[-cf] [FILE]..."
+#define unlzma_full_usage "\n\n" \
+       "Decompress FILE (or stdin)\n" \
+     "\nOptions:" \
+     "\n    -c  Write to stdout" \
+     "\n    -f  Force" \
+
+#define lzma_trivial_usage \
+       "-d [-cf] [FILE]..."
+#define lzma_full_usage "\n\n" \
+       "Decompress FILE (or stdin)\n" \
+     "\nOptions:" \
+     "\n    -d  Decompress" \
+     "\n    -c  Write to stdout" \
+     "\n    -f  Force" \
+
+#define lzcat_trivial_usage \
        "FILE"
-#define bzcat_full_usage \
-       "Uncompress to stdout"
-
-#define unlzma_trivial_usage \
-       "[OPTION]... [FILE]"
-#define unlzma_full_usage \
-       "Uncompress FILE (or standard input if FILE is '-' or omitted)" \
-       "\n\nOptions:\n" \
-       "    -c  Write output to standard output\n" \
-       "    -f  Force"
-
-#define lzmacat_trivial_usage \
+#define lzcat_full_usage "\n\n" \
+       "Decompress to stdout"
+
+#define unxz_trivial_usage \
+       "[-cf] [FILE]..."
+#define unxz_full_usage "\n\n" \
+       "Decompress FILE (or stdin)\n" \
+     "\nOptions:" \
+     "\n    -c  Write to stdout" \
+     "\n    -f  Force" \
+
+#define xz_trivial_usage \
+       "-d [-cf] [FILE]..."
+#define xz_full_usage "\n\n" \
+       "Decompress FILE (or stdin)\n" \
+     "\nOptions:" \
+     "\n    -d  Decompress" \
+     "\n    -c  Write to stdout" \
+     "\n    -f  Force" \
+
+#define xzcat_trivial_usage \
        "FILE"
-#define lzmacat_full_usage \
-       "Uncompress to stdout"
+#define xzcat_full_usage "\n\n" \
+       "Decompress to stdout"
 
 #define cal_trivial_usage \
-       "[-jy] [[month] year]"
-#define cal_full_usage \
-       "Display a calendar" \
-       "\n\nOptions:" \
-       "\n  -j  Use julian dates" \
-       "\n  -y  Display the entire year"
+       "[-jy] [[MONTH] YEAR]"
+#define cal_full_usage "\n\n" \
+       "Display a calendar\n" \
+     "\nOptions:" \
+     "\n    -j  Use julian dates" \
+     "\n    -y  Display the entire year" \
 
 #define cat_trivial_usage \
-       "[-u] [FILE]..."
-#define cat_full_usage \
-       "Concatenate FILE(s) and print them to stdout" \
-       "\n\nOptions:" \
-       "\n  -u  Use unbuffered i/o (ignored)"
+       "[FILE]..."
+#define cat_full_usage "\n\n" \
+       "Concatenate FILEs and print them to stdout" \
+
 #define cat_example_usage \
        "$ cat /proc/uptime\n" \
@@ -169 +1442 @@
 #define catv_trivial_usage \
        "[-etv] [FILE]..."
-#define catv_full_usage \
-       "Display nonprinting characters as ^x or M-x" \
-       "\n\nOptions:\n" \
-       "    -e  End each line with $\n" \
-       "    -t  Show tabs as ^I\n" \
-       "    -v  Don't use ^x or M-x escapes"
+#define catv_full_usage "\n\n" \
+       "Display nonprinting characters as ^x or M-x\n" \
+     "\nOptions:" \
+     "\n    -e  End each line with $" \
+     "\n    -t  Show tabs as ^I" \
+     "\n    -v  Don't use ^x or M-x escapes" \
+
+#define chat_trivial_usage \
+       "EXPECT [SEND [EXPECT [SEND...]]]"
+#define chat_full_usage "\n\n" \
+       "Useful for interacting with a modem connected to stdin/stdout.\n" \
+       "A script consists of one or more \"expect-send\" pairs of strings,\n" \
+       "each pair is a pair of arguments. Example:\n" \
+       "chat '' ATZ OK ATD123456 CONNECT '' ogin: pppuser word: ppppass '~'" \
+
 #define chattr_trivial_usage \
-       "[-R] [-+=AacDdijsStTu] [-v version] files..."
-#define chattr_full_usage \
-       "Change file attributes on an ext2 fs\n\n" \
-       "Modifiers:\n" \
-       "    -   Remove attributes\n" \
-       "    +   Add attributes\n" \
-       "    =   Set attributes\n" \
-       "Attributes:\n" \
-       "    A   Don't track atime\n" \
-       "    a   Append mode only\n" \
-       "    c   Enable compress\n" \
-       "    D   Write dir contents synchronously\n" \
-       "    d   Do not backup with dump\n" \
-       "    i   Cannot be modified (immutable)\n" \
-       "    j   Write all data to journal first\n" \
-       "    s   Zero disk storage when deleted\n" \
-       "    S   Write file contents synchronously\n" \
-       "    t   Disable tail-merging of partial blocks with other files\n" \
-       "    u   Allow file to be undeleted\n" \
-       "Options:\n" \
-       "    -R  Recursively list subdirectories\n" \
-       "    -v  Set the file's version/generation number"
+       "[-R] [-+=AacDdijsStTu] [-v VERSION] [FILE]..."
+#define chattr_full_usage "\n\n" \
+       "Change file attributes on an ext2 fs\n" \
+     "\nModifiers:" \
+     "\n    -   Remove attributes" \
+     "\n    +   Add attributes" \
+     "\n    =   Set attributes" \
+     "\nAttributes:" \
+     "\n    A   Don't track atime" \
+     "\n    a   Append mode only" \
+     "\n    c   Enable compress" \
+     "\n    D   Write dir contents synchronously" \
+     "\n    d   Don't backup with dump" \
+     "\n    i   Cannot be modified (immutable)" \
+     "\n    j   Write all data to journal first" \
+     "\n    s   Zero disk storage when deleted" \
+     "\n    S   Write file contents synchronously" \
+     "\n    t   Disable tail-merging of partial blocks with other files" \
+     "\n    u   Allow file to be undeleted" \
+     "\nOptions:" \
+     "\n    -R  Recurse" \
+     "\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"
-#define chcon_full_usage \
+       "[OPTIONS] CONTEXT FILE..." \
+       "\n  chcon [OPTIONS] [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE..." \
+    IF_FEATURE_CHCON_LONG_OPTIONS( \
+       "\n  chcon [OPTIONS] --reference=RFILE FILE..." \
+    )
+#define chcon_full_usage "\n\n" \
        "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" \
-       "\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" \
+    IF_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/role/type/range in the target" \
+     "\n    -r,--role=ROLE      security context" \
+     "\n    -t,--type=TYPE" \
+     "\n    -l,--range=RANGE" \
+     "\n    -R,--recursive      Recurse" \
+    ) \
+    IF_NOT_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/role/type/range in the target security context" \
+     "\n    -r ROLE" \
+     "\n    -t TYPE" \
+     "\n    -l RNG" \
+     "\n    -R  Recurse" \
+    )
 
 #define chmod_trivial_usage \
-       "[-R"USE_DESKTOP("cvf")"] MODE[,MODE]... FILE..."
-#define chmod_full_usage \
+       "[-R"IF_DESKTOP("cvf")"] MODE[,MODE]... FILE..."
+#define chmod_full_usage "\n\n" \
        "Each MODE is one or more of the letters ugoa, one of the\n" \
-       "symbols +-= and one or more of the letters rwxst" \
-       "\n\nOptions:" \
-       "\n  -R  Recurse directories" \
-    USE_DESKTOP( \
-       "\n  -c  List changed files" \
-       "\n  -v  List all files" \
-       "\n  -f  Hide errors" \
+       "symbols +-= and one or more of the letters rwxst\n" \
+     "\nOptions:" \
+     "\n    -R  Recurse" \
+    IF_DESKTOP( \
+     "\n    -c  List changed files" \
+     "\n    -v  List all files" \
+     "\n    -f  Hide errors" \
     )
 #define chmod_example_usage \
@@ -239 +1536 @@
 
 #define chgrp_trivial_usage \
-       "[-RhLHP"USE_DESKTOP("cvf")"]... GROUP FILE..."
-#define chgrp_full_usage \
-       "Change the group membership of each FILE to GROUP" \
-       "\n\nOptions:" \
-       "\n  -R  Recurse directories" \
-       "\n  -h  Affect symlinks instead of symlink targets" \
-       "\n  -L  Traverse all symlinks to directories" \
-       "\n  -H  Traverse symlinks on command line only" \
-       "\n  -P  Do not traverse symlinks (default)" \
-    USE_DESKTOP( \
-       "\n  -c  List changed files" \
-       "\n  -v  Verbose" \
-       "\n  -f  Hide errors" \
+       "[-RhLHP"IF_DESKTOP("cvf")"]... GROUP FILE..."
+#define chgrp_full_usage "\n\n" \
+       "Change the group membership of each FILE to GROUP\n" \
+     "\nOptions:" \
+     "\n    -R  Recurse" \
+     "\n    -h  Affect symlinks instead of symlink targets" \
+     "\n    -L  Traverse all symlinks to directories" \
+     "\n    -H  Traverse symlinks on command line only" \
+     "\n    -P  Don't traverse symlinks (default)" \
+    IF_DESKTOP( \
+     "\n    -c  List changed files" \
+     "\n    -v  Verbose" \
+     "\n    -f  Hide errors" \
     )
 #define chgrp_example_usage \
@@ -261 +1558 @@
 
 #define chown_trivial_usage \
-       "[-RhLHP"USE_DESKTOP("cvf")"]... OWNER[<.|:>[GROUP]] FILE..."
-#define chown_full_usage \
-       "Change the owner and/or group of each FILE to OWNER and/or GROUP" \
-       "\n\nOptions:" \
-       "\n  -R  Recurse directories" \
-       "\n  -h  Affect symlinks instead of symlink targets" \
-       "\n  -L  Traverse all symlinks to directories" \
-       "\n  -H  Traverse symlinks on command line only" \
-       "\n  -P  Do not traverse symlinks (default)" \
-    USE_DESKTOP( \
-       "\n  -c  List changed files" \
-       "\n  -v  List all files" \
-       "\n  -f  Hide errors" \
+       "[-RhLHP"IF_DESKTOP("cvf")"]... OWNER[<.|:>[GROUP]] FILE..."
+#define chown_full_usage "\n\n" \
+       "Change the owner and/or group of each FILE to OWNER and/or GROUP\n" \
+     "\nOptions:" \
+     "\n    -R  Recurse" \
+     "\n    -h  Affect symlinks instead of symlink targets" \
+     "\n    -L  Traverse all symlinks to directories" \
+     "\n    -H  Traverse symlinks on command line only" \
+     "\n    -P  Don't traverse symlinks (default)" \
+    IF_DESKTOP( \
+     "\n    -c  List changed files" \
+     "\n    -v  List all files" \
+     "\n    -f  Hide errors" \
     )
 #define chown_example_usage \
@@ -286 +1583 @@
 
 #define chpst_trivial_usage \
-       "[-vP012] [-u user[:group]] [-U user[:group]] [-e dir] " \
-       "[-/ dir] [-n nice] [-m bytes] [-d bytes] [-o files] " \
-       "[-p processes] [-f bytes] [-c bytes] prog args"
-#define chpst_full_usage \
-       "Change the process state and run specified program" \
-       "\n\nOptions:\n" \
-       "    -u user[:grp]   Set uid and gid\n" \
-       "    -U user[:grp]   Set environment variables UID and GID\n" \
-       "    -e dir      Set environment variables as specified by files\n" \
-       "            in the directory: file=1st_line_of_file\n" \
-       "    -/ dir      Chroot to dir\n" \
-       "    -n inc      Add inc to nice value\n" \
-       "    -m bytes    Limit data segment, stack segment, locked physical pages,\n" \
-       "            and total of all segment per process to bytes bytes each\n" \
-       "    -d bytes    Limit data segment\n" \
-       "    -o n        Limit the number of open file descriptors per process to n\n" \
-       "    -p n        Limit number of processes per uid to n\n" \
-       "    -f bytes    Limit output file size to bytes bytes\n" \
-       "    -c bytes    Limit core file size to bytes bytes\n" \
-       "    -v      Verbose\n" \
-       "    -P      Run prog in a new process group\n" \
-       "    -0      Close standard input\n" \
-       "    -1      Close standard output\n" \
-       "    -2      Close standard error"
+       "[-vP012] [-u USER[:GRP]] [-U USER[:GRP]] [-e DIR]\n" \
+       "    [-/ DIR] [-n NICE] [-m BYTES] [-d BYTES] [-o N]\n" \
+       "    [-p N] [-f BYTES] [-c BYTES] PROG ARGS"
+#define chpst_full_usage "\n\n" \
+       "Change the process state, run PROG\n" \
+     "\nOptions:" \
+     "\n    -u USER[:GRP]   Set uid and gid" \
+     "\n    -U USER[:GRP]   Set $UID and $GID in environment" \
+     "\n    -e DIR      Set environment variables as specified by files" \
+     "\n            in DIR: file=1st_line_of_file" \
+     "\n    -/ DIR      Chroot to DIR" \
+     "\n    -n NICE     Add NICE to nice value" \
+     "\n    -m BYTES    Same as -d BYTES -s BYTES -l BYTES" \
+     "\n    -d BYTES    Limit data segment" \
+     "\n    -o N        Limit number of open files per process" \
+     "\n    -p N        Limit number of processes per uid" \
+     "\n    -f BYTES    Limit output file sizes" \
+     "\n    -c BYTES    Limit core file size" \
+     "\n    -v      Verbose" \
+     "\n    -P      Create new process group" \
+     "\n    -0      Close stdin" \
+     "\n    -1      Close stdout" \
+     "\n    -2      Close stderr" \
+
 #define setuidgid_trivial_usage \
-       "account prog args"
-#define setuidgid_full_usage \
-       "Set uid and gid to account's uid and gid, removing all supplementary\n" \
-       "groups, then run prog"
+       "USER PROG ARGS"
+#define setuidgid_full_usage "\n\n" \
+       "Set uid and gid to USER's uid and gid, drop supplementary group ids,\n" \
+       "run PROG"
 #define envuidgid_trivial_usage \
-       "account prog args"
-#define envuidgid_full_usage \
-       "Set $UID to account's uid and $GID to account's gid, then run prog"
+       "USER PROG ARGS"
+#define envuidgid_full_usage "\n\n" \
+       "Set $UID to USER's uid and $GID to USER's gid, run PROG"
 #define envdir_trivial_usage \
-       "dir prog args"
-#define envdir_full_usage \
+       "DIR PROG ARGS"
+#define envdir_full_usage "\n\n" \
        "Set various environment variables as specified by files\n" \
-       "in the directory dir, then run prog"
+       "in the directory DIR, run PROG"
 #define softlimit_trivial_usage \
-       "[-a allbytes] [-c corebytes] [-d databytes] [-f filebytes] " \
-       "[-l lockbytes] [-m membytes] [-o openfiles] [-p processes] " \
-       "[-r residentbytes] [-s stackbytes] [-t cpusecs] prog args"
-#define softlimit_full_usage \
-       "Set soft resource limits, then run prog" \
-       "\n\nOptions:\n" \
-       "    -m n    Same as -d n -s n -l n -a n\n" \
-       "    -d n    Limit the data segment per process to n bytes\n" \
-       "    -s n    Limit the stack segment per process to n bytes\n" \
-       "    -l n    Limit the locked physical pages per process to n bytes\n" \
-       "    -a n    Limit the total of all segments per process to n bytes\n" \
-       "    -o n    Limit the number of open file descriptors per process to n\n" \
-       "    -p n    Limit the number of processes per uid to n\n" \
-       "Options controlling file sizes:\n" \
-       "    -f n    Limit output file sizes to n bytes\n" \
-       "    -c n    Limit core file sizes to n bytes\n" \
-       "Efficiency opts:\n" \
-       "    -r n    Limit the resident set size to n bytes. This limit is not\n" \
-       "        enforced unless physical memory is full\n" \
-       "    -t n    Limit the CPU time to n seconds. This limit is not enforced\n" \
-       "        except that the process receives a SIGXCPU signal after n seconds\n" \
-       "\n" \
-       "Some options may have no effect on some operating systems\n" \
-       "n may be =, indicating that soft limit should be set equal to hard limit"
+       "[-a BYTES] [-m BYTES] [-d BYTES] [-s BYTES] [-l BYTES]\n" \
+       "    [-f BYTES] [-c BYTES] [-r BYTES] [-o N] [-p N] [-t N]\n" \
+       "    PROG ARGS"
+#define softlimit_full_usage "\n\n" \
+       "Set soft resource limits, then run PROG\n" \
+     "\nOptions:" \
+     "\n    -a BYTES    Limit total size of all segments" \
+     "\n    -m BYTES    Same as -d BYTES -s BYTES -l BYTES -a BYTES" \
+     "\n    -d BYTES    Limit data segment" \
+     "\n    -s BYTES    Limit stack segment" \
+     "\n    -l BYTES    Limit locked memory size" \
+     "\n    -o N        Limit number of open files per process" \
+     "\n    -p N        Limit number of processes per uid" \
+     "\nOptions controlling file sizes:" \
+     "\n    -f BYTES    Limit output file sizes" \
+     "\n    -c BYTES    Limit core file size" \
+     "\nEfficiency opts:" \
+     "\n    -r BYTES    Limit resident set size" \
+     "\n    -t N        Limit CPU time, process receives" \
+     "\n            a SIGXCPU after N seconds" \
 
 #define chroot_trivial_usage \
-       "NEWROOT [COMMAND...]"
-#define chroot_full_usage \
-       "Run COMMAND with root directory set to NEWROOT"
+       "NEWROOT [PROG ARGS]"
+#define chroot_full_usage "\n\n" \
+       "Run PROG with root directory set to NEWROOT"
 #define chroot_example_usage \
        "$ ls -l /bin/ls\n" \
@@ -364 +1657 @@
 #define chvt_trivial_usage \
        "N"
-#define chvt_full_usage \
+#define chvt_full_usage "\n\n" \
        "Change the foreground virtual terminal to /dev/ttyN"
 
 #define cksum_trivial_usage \
        "FILES..."
-#define cksum_full_usage \
+#define cksum_full_usage "\n\n" \
        "Calculate the CRC32 checksums of FILES"
 
 #define clear_trivial_usage \
        ""
-#define clear_full_usage \
+#define clear_full_usage "\n\n" \
        "Clear screen"
 
 #define cmp_trivial_usage \
-       "[-l] [-s] FILE1 [FILE2" USE_DESKTOP(" [SKIP1 [SKIP2]") "]]"
-#define cmp_full_usage \
-       "Compares FILE1 vs stdin if FILE2 is not specified" \
-       "\n\nOptions:\n" \
-       "    -l  Write the byte numbers (decimal) and values (octal)\n" \
-       "        for all differing bytes\n" \
-       "    -s  Quiet"
+       "[-l] [-s] FILE1 [FILE2" IF_DESKTOP(" [SKIP1 [SKIP2]]") "]"
+#define cmp_full_usage "\n\n" \
+       "Compare FILE1 with FILE2 (or stdin)\n" \
+     "\nOptions:" \
+     "\n    -l  Write the byte numbers (decimal) and values (octal)" \
+     "\n        for all differing bytes" \
+     "\n    -s  Quiet" \
 
 #define comm_trivial_usage \
        "[-123] FILE1 FILE2"
-#define comm_full_usage \
-       "Compare FILE1 to FILE2, or to stdin if - is specified" \
-       "\n\nOptions:\n" \
-       "    -1  Suppress lines unique to FILE1\n" \
-       "    -2  Suppress lines unique to FILE2\n" \
-       "    -3  Suppress lines common to both files"
+#define comm_full_usage "\n\n" \
+       "Compare FILE1 with FILE2\n" \
+     "\nOptions:" \
+     "\n    -1  Suppress lines unique to FILE1" \
+     "\n    -2  Suppress lines unique to FILE2" \
+     "\n    -3  Suppress lines common to both files" \
 
 #define bbconfig_trivial_usage \
        ""
-#define bbconfig_full_usage \
-       "Print the config file which built busybox"
-
-#define bbsh_trivial_usage \
-       "[FILE]...\n" \
-       "or: bbsh -c command [args]..."
-#define bbsh_full_usage \
-       "The bbsh shell (command interpreter)"
+#define bbconfig_full_usage "\n\n" \
+       "Print the config file used by busybox build"
 
 #define chrt_trivial_usage \
-       "[OPTION]... [prio] [pid | command [arg]...]"
-#define chrt_full_usage \
-       "manipulate real-time attributes of a process" \
-       "\n\nOptions:\n" \
-       "    -p  operate on pid\n" \
-       "    -r  set scheduling policy to SCHED_RR\n" \
-       "    -f  set scheduling policy to SCHED_FIFO\n" \
-       "    -o  set scheduling policy to SCHED_OTHER\n" \
-       "    -m  show min and max priorities"
+       "[-prfom] [PRIO] [PID | PROG ARGS]"
+#define chrt_full_usage "\n\n" \
+       "Change scheduling priority and class for a process\n" \
+     "\nOptions:" \
+     "\n    -p  Operate on PID" \
+     "\n    -r  Set SCHED_RR class" \
+     "\n    -f  Set SCHED_FIFO class" \
+     "\n    -o  Set SCHED_OTHER class" \
+     "\n    -m  Show min/max priorities" \
 
 #define chrt_example_usage \
@@ -422 +1709 @@
        "You need CAP_SYS_NICE privileges to set scheduling attributes of a process"
 
+#define nice_trivial_usage \
+       "[-n ADJUST] [PROG ARGS]"
+#define nice_full_usage "\n\n" \
+       "Change scheduling priority, run PROG\n" \
+     "\nOptions:" \
+     "\n    -n ADJUST   Adjust priority by ADJUST" \
+
+#define renice_trivial_usage \
+       "{{-n INCREMENT} | PRIORITY} [[-p | -g | -u] ID...]"
+#define renice_full_usage "\n\n" \
+       "Change scheduling priority for a running process\n" \
+     "\nOptions:" \
+     "\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 ionice_trivial_usage \
+    "[-c 1-3] [-n 0-7] [-p PID] [PROG]"
+#define ionice_full_usage "\n\n" \
+       "Change I/O priority and class\n" \
+     "\nOptions:" \
+     "\n    -c  Class. 1:realtime 2:best-effort 3:idle" \
+     "\n    -n  Priority" \
+
 #define cp_trivial_usage \
-       "[OPTION]... SOURCE DEST"
-#define cp_full_usage \
-       "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY" \
-       "\n\nOptions:" \
-       "\n  -a  Same as -dpR" \
-    USE_SELINUX( \
-       "\n  -c  Preserves security context" \
-    ) \
-       "\n  -d,-P   Preserve links" \
-       "\n  -H,-L   Dereference all symlinks (default)" \
-       "\n  -p  Preserve file attributes if possible" \
-       "\n  -f  Force overwrite" \
-       "\n  -i  Prompt before overwrite" \
-       "\n  -R,-r   Recurse directories" \
-       "\n  -l,-s   Create (sym)links"
+       "[OPTIONS] SOURCE DEST"
+#define cp_full_usage "\n\n" \
+       "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY\n" \
+     "\nOptions:" \
+     "\n    -a  Same as -dpR" \
+    IF_SELINUX( \
+     "\n    -c  Preserve security context" \
+    ) \
+     "\n    -R,-r   Recurse" \
+     "\n    -d,-P   Preserve symlinks (default if -R)" \
+     "\n    -L  Follow all symlinks" \
+     "\n    -H  Follow symlinks on command line" \
+     "\n    -p  Preserve file attributes if possible" \
+     "\n    -f  Overwrite" \
+     "\n    -i  Prompt before overwrite" \
+     "\n    -l,-s   Create (sym)links" \
 
 #define cpio_trivial_usage \
-       "-[dimtuv][F cpiofile]"
-#define cpio_full_usage \
-       "Extract or list files from a cpio archive\n" \
-       "Main operation mode:\n" \
-       "    d   Make leading directories\n" \
-       "    i   Extract\n" \
-       "    m   Preserve mtime\n" \
-       "    t   List\n" \
-       "    v   Verbose\n" \
-       "    u   Unconditional overwrite\n" \
-       "    F   Input from file"
+       "[-dmvu] [-F FILE]" IF_FEATURE_CPIO_O(" [-H newc]") \
+       " [-ti"IF_FEATURE_CPIO_O("o")"]" IF_FEATURE_CPIO_P(" [-p DIR]")
+#define cpio_full_usage "\n\n" \
+       "Extract or list files from a cpio archive" \
+    IF_FEATURE_CPIO_O(", or" \
+     "\ncreate an archive" IF_FEATURE_CPIO_P(" (-o) or copy files (-p)") \
+        " using file list on stdin" \
+    ) \
+     "\n" \
+     "\nMain operation mode:" \
+     "\n    -t  List" \
+     "\n    -i  Extract" \
+    IF_FEATURE_CPIO_O( \
+     "\n    -o  Create (requires -H newc)" \
+    ) \
+    IF_FEATURE_CPIO_P( \
+     "\n    -p DIR  Copy files to DIR" \
+    ) \
+     "\nOptions:" \
+     "\n    -d  Make leading directories" \
+     "\n    -m  Preserve mtime" \
+     "\n    -v  Verbose" \
+     "\n    -u  Overwrite" \
+     "\n    -F FILE Input (-t,-i,-p) or output (-o) file" \
+    IF_FEATURE_CPIO_O( \
+     "\n    -H newc Archive format" \
+    ) \
 
 #define crond_trivial_usage \
-       "-d[#] -c crondir -f -b"
-#define crond_full_usage \
-       "    -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" \
-       "    -L file Log to file\n" \
-       "    -f  Run in foreground\n" \
-       "    -b  Run in background (default)\n" \
-       "    -c dir  Working dir"
+       "-fbS -l N " IF_FEATURE_CROND_D("-d N ") "-L LOGFILE -c DIR"
+#define crond_full_usage "\n\n" \
+       "    -f  Foreground" \
+     "\n    -b  Background (default)" \
+     "\n    -S  Log to syslog (default)" \
+     "\n    -l  Set log level. 0 is the most verbose, default 8" \
+    IF_FEATURE_CROND_D( \
+     "\n    -d  Set log level, log to stderr" \
+    ) \
+     "\n    -L  Log to file" \
+     "\n    -c  Working dir" \
 
 #define crontab_trivial_usage \
-       "[-c dir] {file|-}|[-u|-l|-e|-d user]"
-#define crontab_full_usage \
-       "    file [opts] Replace crontab from file\n" \
-       "    - [opts]    Replace crontab from stdin\n" \
-       "    -u user     Specify user\n" \
-       "    -l [user]   List crontab for user\n" \
-       "    -e [user]   Edit crontab for user\n" \
-       "    -d [user]   Delete crontab for user\n" \
-       "    -c dir      Specify crontab directory"
+       "[-c DIR] [-u USER] [-ler]|[FILE]"
+#define crontab_full_usage "\n\n" \
+       "    -c  Crontab directory" \
+     "\n    -u  User" \
+     "\n    -l  List crontab" \
+     "\n    -e  Edit crontab" \
+     "\n    -r  Delete crontab" \
+     "\n    FILE    Replace crontab by FILE ('-': stdin)" \
 
 #define cryptpw_trivial_usage \
-       "[-a des|md5] [string]"
-#define cryptpw_full_usage \
-       "Outputs crypted string.\n" \
-       "If string isn't supplied on cmdline, reads it from stdin.\n" \
-       "\nOptions:" \
-       "\n  -a  Algorithm to use (default: md5)"
+       "[OPTIONS] [PASSWORD] [SALT]"
+/* We do support -s, we just don't mention it */
+#define cryptpw_full_usage "\n\n" \
+       "Crypt the PASSWORD using crypt(3)\n" \
+     "\nOptions:" \
+    IF_LONG_OPTS( \
+     "\n    -P,--password-fd=N  Read password from fd N" \
+/*   "\n    -s,--stdin      Use stdin; like -P0" */ \
+     "\n    -m,--method=TYPE    Encryption method TYPE" \
+     "\n    -S,--salt=SALT" \
+    ) \
+    IF_NOT_LONG_OPTS( \
+     "\n    -P N    Read password from fd N" \
+/*   "\n    -s  Use stdin; like -P0" */ \
+     "\n    -m TYPE Encryption method TYPE" \
+     "\n    -S SALT" \
+    ) \
+
+/* mkpasswd is an alias to cryptpw */
+
+#define mkpasswd_trivial_usage \
+       "[OPTIONS] [PASSWORD] [SALT]"
+/* We do support -s, we just don't mention it */
+#define mkpasswd_full_usage "\n\n" \
+       "Crypt the PASSWORD using crypt(3)\n" \
+     "\nOptions:" \
+    IF_LONG_OPTS( \
+     "\n    -P,--password-fd=N  Read password from fd N" \
+/*   "\n    -s,--stdin      Use stdin; like -P0" */ \
+     "\n    -m,--method=TYPE    Encryption method TYPE" \
+     "\n    -S,--salt=SALT" \
+    ) \
+    IF_NOT_LONG_OPTS( \
+     "\n    -P N    Read password from fd N" \
+/*   "\n    -s  Use stdin; like -P0" */ \
+     "\n    -m TYPE Encryption method TYPE" \
+     "\n    -S SALT" \
+    ) \
 
 #define cut_trivial_usage \
-       "[OPTION]... [FILE]..."
-#define cut_full_usage \
-       "Print selected fields from each input FILE to standard output" \
-       "\n\nOptions:\n" \
-       "    -b LIST Output only bytes from LIST\n" \
-       "    -c LIST Output only characters from LIST\n" \
-       "    -d CHAR Use CHAR instead of tab as the field delimiter\n" \
-       "    -s  Output only the lines containing delimiter\n" \
-       "    -f N    Print only these fields\n" \
-       "    -n  Ignored"
+       "[OPTIONS] [FILE]..."
+#define cut_full_usage "\n\n" \
+       "Print selected fields from each input FILE to stdout\n" \
+     "\nOptions:" \
+     "\n    -b LIST Output only bytes from LIST" \
+     "\n    -c LIST Output only characters from LIST" \
+     "\n    -d CHAR Use CHAR instead of tab as the field delimiter" \
+     "\n    -s  Output only the lines containing delimiter" \
+     "\n    -f N    Print only these fields" \
+     "\n    -n  Ignored" \
+
 #define cut_example_usage \
        "$ echo \"Hello world\" | cut -f 1 -d ' '\n" \
@@ -500 +1862 @@
        "world\n"
 
-#define date_trivial_usage \
-       "[OPTION]... [MMDDhhmm[[CC]YY][.ss]] [+FORMAT]"
-#define date_full_usage \
-       "Display current time in the given FORMAT, or set system date" \
-       "\n\nOptions:\n" \
-       "    -R      Outputs RFC-822 compliant date string\n" \
-       "    -d STRING   Displays time described by STRING, not 'now'\n" \
-    USE_FEATURE_DATE_ISOFMT( \
-       "    -I[TIMESPEC]    Outputs an ISO-8601 compliant date/time string\n" \
-       "            TIMESPEC='date' (or missing) for date only,\n" \
-       "            'hours', 'minutes', or 'seconds' for date and,\n" \
-       "            time to the indicated precision\n" \
-       "    -D hint     Use 'hint' as date format, via strptime()\n" \
-    ) \
-       "    -s      Sets time described by STRING\n" \
-       "    -r FILE     Displays the last modification time of FILE\n" \
-       "    -u      Prints or sets Coordinated Universal Time"
-#define date_example_usage \
-       "$ date\n" \
-       "Wed Apr 12 18:52:41 MDT 2000\n"
-
-#define dc_trivial_usage \
-       "expression ..."
-#define dc_full_usage \
-       "This is a Tiny RPN calculator that understands the\n" \
-       "following operations: +, add, -, sub, *, mul, /, div, %, mod, " \
-       "**, exp, and, or, not, eor.\n" \
-       "For example: 'dc 2 2 add' -> 4, and 'dc 8 8 \\* 2 2 + /' -> 16." \
-       "\n\nOptions:\n" \
-       "p - Prints the value on the top of the stack, without altering the stack\n" \
-       "f - Prints the entire contents of the stack without altering anything\n" \
-       "o - Pops the value off the top of the stack and uses it to set the output radix\n" \
-       "    Only 10 and 16 are supported"
-#define dc_example_usage \
-       "$ dc 2 2 + p\n" \
-       "4\n" \
-       "$ dc 8 8 \\* 2 2 + / p\n" \
-       "16\n" \
-       "$ dc 0 1 and p\n" \
-       "0\n" \
-       "$ dc 0 1 or p\n" \
-       "1\n" \
-       "$ echo 72 9 div 8 mul p | dc\n" \
-       "64\n"
-
 #define dd_trivial_usage \
-       "[if=FILE] [of=FILE] " USE_FEATURE_DD_IBS_OBS("[ibs=N] [obs=N] ") "[bs=N] [count=N] [skip=N]\n" \
-       "    [seek=N]" USE_FEATURE_DD_IBS_OBS(" [conv=notrunc|noerror|sync]")
-#define dd_full_usage \
-       "Copy a file with converting and formatting" \
-       "\n\nOptions:\n" \
-       "    if=FILE     Read from FILE instead of stdin\n" \
-       "    of=FILE     Write to FILE instead of stdout\n" \
-       "    bs=N        Read and write N bytes at a time\n" \
-    USE_FEATURE_DD_IBS_OBS( \
-       "    ibs=N       Read N bytes at a time\n") \
-    USE_FEATURE_DD_IBS_OBS( \
-       "    obs=N       Write N bytes at a time\n") \
-       "    count=N     Copy only N input blocks\n" \
-       "    skip=N      Skip N input blocks\n" \
-       "    seek=N      Skip N output blocks\n" \
-    USE_FEATURE_DD_IBS_OBS( \
-       "    conv=notrunc    Don't truncate output file\n" \
-       "    conv=noerror    Continue after read errors\n" \
-       "    conv=sync   Pad blocks with zeros\n") \
-       "\n" \
-       "Numbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024),\n" \
-       "MD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824)"
+       "[if=FILE] [of=FILE] " IF_FEATURE_DD_IBS_OBS("[ibs=N] [obs=N] ") "[bs=N] [count=N] [skip=N]\n" \
+       "    [seek=N]" IF_FEATURE_DD_IBS_OBS(" [conv=notrunc|noerror|sync|fsync]")
+#define dd_full_usage "\n\n" \
+       "Copy a file with converting and formatting\n" \
+     "\nOptions:" \
+     "\n    if=FILE     Read from FILE instead of stdin" \
+     "\n    of=FILE     Write to FILE instead of stdout" \
+     "\n    bs=N        Read and write N bytes at a time" \
+    IF_FEATURE_DD_IBS_OBS( \
+     "\n    ibs=N       Read N bytes at a time" \
+    ) \
+    IF_FEATURE_DD_IBS_OBS( \
+     "\n    obs=N       Write N bytes at a time" \
+    ) \
+     "\n    count=N     Copy only N input blocks" \
+     "\n    skip=N      Skip N input blocks" \
+     "\n    seek=N      Skip N output blocks" \
+    IF_FEATURE_DD_IBS_OBS( \
+     "\n    conv=notrunc    Don't truncate output file" \
+     "\n    conv=noerror    Continue after read errors" \
+     "\n    conv=sync   Pad blocks with zeros" \
+     "\n    conv=fsync  Physically write data out before finishing" \
+    ) \
+     "\n" \
+     "\nNumbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024)," \
+     "\nMD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824)" \
+
 #define dd_example_usage \
        "$ dd if=/dev/zero of=/dev/ram1 bs=1M count=4\n" \
@@ -575 +1897 @@
 #define deallocvt_trivial_usage \
        "[N]"
-#define deallocvt_full_usage \
+#define deallocvt_full_usage "\n\n" \
        "Deallocate unused virtual terminal /dev/ttyN"
 
 #define delgroup_trivial_usage \
-    USE_FEATURE_DEL_USER_FROM_GROUP("[USER] ")"GROUP"
-#define delgroup_full_usage \
+    IF_FEATURE_DEL_USER_FROM_GROUP("[USER] ")"GROUP"
+#define delgroup_full_usage "\n\n" \
        "Delete group GROUP from the system" \
-    USE_FEATURE_DEL_USER_FROM_GROUP(" or user USER from group GROUP")
+    IF_FEATURE_DEL_USER_FROM_GROUP(" or user USER from group GROUP")
 
 #define deluser_trivial_usage \
        "USER"
-#define deluser_full_usage \
-       "Delete user USER from the system"
+#define deluser_full_usage "\n\n" \
+       "Delete USER from the system"
+
+#define devmem_trivial_usage \
+    "ADDRESS [WIDTH [VALUE]]"
+
+#define devmem_full_usage "\n\n" \
+       "Read/write from physical address\n" \
+     "\n    ADDRESS Address to act upon" \
+     "\n    WIDTH   Width (8/16/...)" \
+     "\n    VALUE   Data to be written" \
 
 #define devfsd_trivial_usage \
-       "mntpnt [-v]" \
-    USE_DEVFSD_FG_NP("[-fg][-np]" )
-#define devfsd_full_usage \
-       "Manage devfs permissions and old device name symlinks" \
-       "\n\nOptions:" \
-       "\n  mntpnt  The mount point where devfs is mounted" \
-       "\n  -v  Print the protocol version numbers for devfsd" \
-       "\n      and the kernel-side protocol version and exits" \
-    USE_DEVFSD_FG_NP( \
-       "\n  -fg Run the daemon in the foreground" \
-       "\n  -np Exit after parsing the configuration file" \
-       "\n      and processing synthetic REGISTER events," \
-       "\n      do not poll for events")
+       "mntpnt [-v]" IF_DEVFSD_FG_NP("[-fg][-np]")
+#define devfsd_full_usage "\n\n" \
+       "Manage devfs permissions and old device name symlinks\n" \
+     "\nOptions:" \
+     "\n    mntpnt  The mount point where devfs is mounted" \
+     "\n    -v  Print the protocol version numbers for devfsd" \
+     "\n        and the kernel-side protocol version and exit" \
+    IF_DEVFSD_FG_NP( \
+     "\n    -fg Run in foreground" \
+     "\n    -np Exit after parsing the configuration file" \
+     "\n        and processing synthetic REGISTER events," \
+     "\n        don't poll for events" \
+    )
 
 #define df_trivial_usage \
-       "[-" USE_FEATURE_HUMAN_READABLE("hm") "k] [FILESYSTEM ...]"
-#define df_full_usage \
-       "Print the filesystem space used and space available" \
-    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")
+    "[-Pk" \
+    IF_FEATURE_HUMAN_READABLE("mh") \
+    IF_FEATURE_DF_FANCY("ai] [-B SIZE") \
+    "] [FILESYSTEM]..."
+#define df_full_usage "\n\n" \
+       "Print filesystem usage statistics\n" \
+     "\nOptions:" \
+     "\n    -P  POSIX output format" \
+     "\n    -k  1024-byte blocks (default)" \
+    IF_FEATURE_HUMAN_READABLE( \
+     "\n    -m  1M-byte blocks" \
+     "\n    -h  Human readable (e.g. 1K 243M 2G)" \
+    ) \
+    IF_FEATURE_DF_FANCY( \
+     "\n    -a  Show all filesystems" \
+     "\n    -i  Inodes" \
+     "\n    -B SIZE Blocksize" \
+    ) \
+
 #define df_example_usage \
        "$ df\n" \
-       "Filesystem           1k-blocks      Used Available Use% Mounted on\n" \
+       "Filesystem           1K-blocks      Used Available Use% Mounted on\n" \
        "/dev/sda3              8690864   8553540    137324  98% /\n" \
        "/dev/sda1                64216     36364     27852  57% /boot\n" \
        "$ df /dev/sda3\n" \
-       "Filesystem           1k-blocks      Used Available Use% Mounted on\n" \
-       "/dev/sda3              8690864   8553540    137324  98% /\n"
+       "Filesystem           1K-blocks      Used Available Use% Mounted on\n" \
+       "/dev/sda3              8690864   8553540    137324  98% /\n" \
+       "$ POSIXLY_CORRECT=sure df /dev/sda3\n" \
+       "Filesystem         512B-blocks      Used Available Use% Mounted on\n" \
+       "/dev/sda3             17381728  17107080    274648  98% /\n" \
+       "$ POSIXLY_CORRECT=yep df -P /dev/sda3\n" \
+       "Filesystem          512-blocks      Used Available Capacity Mounted on\n" \
+       "/dev/sda3             17381728  17107080    274648      98% /\n"
 
 #define dhcprelay_trivial_usage \
-       "[client_device_list] [server_device]"
-#define dhcprelay_full_usage \
-       "Relay dhcp requests from client devices to server device"
-
-#define dhcprelay_trivial_usage \
-       "[client_device_list] [server_device]"
-#define dhcprelay_full_usage \
-       "Relay dhcp requests from client devices to server device"
+       "CLIENT_IFACE[,CLIENT_IFACE2]... SERVER_IFACE [SERVER_IP]"
+#define dhcprelay_full_usage "\n\n" \
+       "Relay DHCP requests between clients and server" \
 
 #define diff_trivial_usage \
-       "[-abdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2"
-#define diff_full_usage \
+       "[-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2"
+#define diff_full_usage "\n\n" \
        "Compare files line by line and output the differences between them.\n" \
-       "This diff implementation only supports unified diffs." \
-       "\n\nOptions:\n" \
-       "    -a  Treat all files as text\n" \
-       "    -b  Ignore changes in the amount of whitespace\n" \
-       "    -d  Try hard to find a smaller set of changes\n" \
-       "    -i  Ignore case differences\n" \
-       "    -L  Use LABEL instead of the filename in the unified header\n" \
-       "    -N  Treat absent files as empty\n" \
-       "    -q  Output only whether files differ\n" \
-       "    -r  Recursively compare subdirectories\n" \
-       "    -S  Start with FILE when comparing directories\n" \
-       "    -T  Make tabs line up by prefixing a tab when necessary\n" \
-       "    -s  Report when two files are the same\n" \
-       "    -t  Expand tabs to spaces in output\n" \
-       "    -U  Output LINES lines of context\n" \
-       "    -w  Ignore all whitespace"
+       "This implementation supports unified diffs only.\n" \
+     "\nOptions:" \
+     "\n    -a  Treat all files as text" \
+     "\n    -b  Ignore changes in the amount of whitespace" \
+     "\n    -B  Ignore changes whose lines are all blank" \
+     "\n    -d  Try hard to find a smaller set of changes" \
+     "\n    -i  Ignore case differences" \
+     "\n    -L  Use LABEL instead of the filename in the unified header" \
+     "\n    -N  Treat absent files as empty" \
+     "\n    -q  Output only whether files differ" \
+     "\n    -r  Recurse" \
+     "\n    -S  Start with FILE when comparing directories" \
+     "\n    -T  Make tabs line up by prefixing a tab when necessary" \
+     "\n    -s  Report when two files are the same" \
+     "\n    -t  Expand tabs to spaces in output" \
+     "\n    -U  Output LINES lines of context" \
+     "\n    -w  Ignore all whitespace" \
 
 #define dirname_trivial_usage \
        "FILENAME"
-#define dirname_full_usage \
+#define dirname_full_usage "\n\n" \
        "Strip non-directory suffix from FILENAME"
 #define dirname_example_usage \
@@ -668 +2009 @@
 #define dmesg_trivial_usage \
        "[-c] [-n LEVEL] [-s SIZE]"
-#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"
+#define dmesg_full_usage "\n\n" \
+       "Print or control the kernel ring buffer\n" \
+     "\nOptions:" \
+     "\n    -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 dnsd_full_usage \
-       "Small and static DNS server daemon" \
-       "\n\nOptions:\n" \
-       "    -c  Config filename\n" \
-       "    -t  TTL in seconds\n" \
-       "    -p  Listening port\n" \
-       "    -i  Listening ip (default all)\n" \
-       "    -d  Daemonize"
+       "[-dvs] [-c CONFFILE] [-t TTL_SEC] [-p PORT] [-i ADDR]"
+#define dnsd_full_usage "\n\n" \
+       "Small static DNS server daemon\n" \
+     "\nOptions:" \
+     "\n    -c FILE Config file" \
+     "\n    -t SEC  TTL" \
+     "\n    -p PORT Listen on PORT" \
+     "\n    -i ADDR Listen on ADDR" \
+     "\n    -d  Daemonize" \
+     "\n    -v  Verbose" \
+     "\n    -s  Send successful replies only. Use this if you want" \
+     "\n        to use /etc/resolv.conf with two nameserver lines:" \
+     "\n            nameserver DNSD_SERVER" \
+     "\n            nameserver NORNAL_DNS_SERVER" \
 
 #define dos2unix_trivial_usage \
-       "[option] [FILE]"
-#define dos2unix_full_usage \
-       "Convert FILE from dos format to unix format. When no option\n" \
-       "is given, the input is converted to the opposite output format.\n" \
-       "When no file is given, use stdin for input and stdout for output." \
-       "\n\nOptions:\n" \
-       "    -u  Output will be in UNIX format\n" \
-       "    -d  Output will be in DOS format"
+       "[-ud] [FILE]"
+#define dos2unix_full_usage "\n\n" \
+       "Convert FILE in-place from DOS to Unix format.\n" \
+       "When no file is given, use stdin/stdout.\n" \
+     "\nOptions:" \
+     "\n    -u  dos2unix" \
+     "\n    -d  unix2dos" \
+
+#define unix2dos_trivial_usage \
+       "[-ud] [FILE]"
+#define unix2dos_full_usage "\n\n" \
+       "Convert FILE in-place from Unix to DOS format.\n" \
+       "When no file is given, use stdin/stdout.\n" \
+     "\nOptions:" \
+     "\n    -u  dos2unix" \
+     "\n    -d  unix2dos" \
 
 #define dpkg_trivial_usage \
-       "[-ilCPru] [-F option] package_name"
-#define dpkg_full_usage \
-       "Install, remove and manage Debian packages" \
-       "\n\nOptions:\n" \
-       "    -i      Install the package\n" \
-       "    -l      List of installed packages\n" \
-       "    -C      Configure an unpackaged package\n" \
-       "    -F depends  Ignore dependency problems\n" \
-       "    -P      Purge all files of a package\n" \
-       "    -r      Remove all but the configuration files for a package\n" \
-       "    -u      Unpack a package, but don't configure it"
+       "[-ilCPru] [-F OPT] PACKAGE"
+#define dpkg_full_usage "\n\n" \
+       "Install, remove and manage Debian packages\n" \
+     "\nOptions:" \
+    IF_LONG_OPTS( \
+     "\n    -i,--install    Install the package" \
+     "\n    -l,--list   List of installed packages" \
+     "\n    --configure Configure an unpackaged package" \
+     "\n    -P,--purge  Purge all files of a package" \
+     "\n    -r,--remove Remove all but the configuration files for a package" \
+     "\n    --unpack    Unpack a package, but don't configure it" \
+     "\n    --force-depends Ignore dependency problems" \
+     "\n    --force-confnew Overwrite existing config files when installing" \
+     "\n    --force-confold Keep old config files when installing" \
+    ) \
+    IF_NOT_LONG_OPTS( \
+     "\n    -i      Install the package" \
+     "\n    -l      List of installed packages" \
+     "\n    -C      Configure an unpackaged package" \
+     "\n    -P      Purge all files of a package" \
+     "\n    -r      Remove all but the configuration files for a package" \
+     "\n    -u      Unpack a package, but don't configure it" \
+     "\n    -F depends  Ignore dependency problems" \
+     "\n    -F confnew  Overwrite existing config files when installing" \
+     "\n    -F confold  Keep old config files when installing" \
+    )
 
 #define dpkg_deb_trivial_usage \
        "[-cefxX] FILE [argument]"
-#define dpkg_deb_full_usage \
-       "Perform actions on Debian packages (.debs)" \
-       "\n\nOptions:\n" \
-       "    -c  List contents of filesystem tree\n" \
-       "    -e  Extract control files to [argument] directory\n" \
-       "    -f  Display control field name starting with [argument]\n" \
-       "    -x  Extract packages filesystem tree to directory\n" \
-       "    -X  Verbose extract"
+#define dpkg_deb_full_usage "\n\n" \
+       "Perform actions on Debian packages (.debs)\n" \
+     "\nOptions:" \
+     "\n    -c  List contents of filesystem tree" \
+     "\n    -e  Extract control files to [argument] directory" \
+     "\n    -f  Display control field name starting with [argument]" \
+     "\n    -x  Extract packages filesystem tree to directory" \
+     "\n    -X  Verbose extract" \
+
 #define dpkg_deb_example_usage \
        "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
 
 #define du_trivial_usage \
-       "[-aHLdclsx" USE_FEATURE_HUMAN_READABLE("hm") "k] [FILE]..."
-#define du_full_usage \
+       "[-aHLdclsx" IF_FEATURE_HUMAN_READABLE("hm") "k] [FILE]..."
+#define du_full_usage "\n\n" \
        "Summarize disk space used for each FILE and/or directory.\n" \
        "Disk space is printed in units of " \
-    USE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("1024") \
-    SKIP_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("512") \
-       " bytes." \
-       "\n\nOptions:\n" \
-       "    -a  Show sizes of files in addition to directories\n" \
-       "    -H  Follow symlinks that are FILE command line args\n" \
-       "    -L  Follow all symlinks encountered\n" \
-       "    -d N    Limit output to directories (and files with -a) of depth < N\n" \
-       "    -c  Output a grand total\n" \
-       "    -l  Count sizes many times if hard linked\n" \
-       "    -s  Display only a total for each argument\n" \
-       "    -x  Skip directories on different filesystems\n" \
-    USE_FEATURE_HUMAN_READABLE( \
-       "    -h  Print sizes in human readable format (e.g., 1K 243M 2G )\n" \
-       "    -m  Print sizes in megabytes\n" \
-    ) \
-       "    -k  Print sizes in kilobytes" \
-    USE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("(default)")
+    IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("1024") \
+    IF_NOT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("512") \
+       " bytes.\n" \
+     "\nOptions:" \
+     "\n    -a  Show file sizes too" \
+     "\n    -L  Follow all symlinks" \
+     "\n    -H  Follow symlinks on command line" \
+     "\n    -d N    Limit output to directories (and files with -a) of depth < N" \
+     "\n    -c  Show grand total" \
+     "\n    -l  Count sizes many times if hard linked" \
+     "\n    -s  Display only a total for each argument" \
+     "\n    -x  Skip directories on different filesystems" \
+    IF_FEATURE_HUMAN_READABLE( \
+     "\n    -h  Sizes in human readable format (e.g., 1K 243M 2G )" \
+     "\n    -m  Sizes in megabytes" \
+    ) \
+     "\n    -k  Sizes in kilobytes" \
+            IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(" (default)") \
+
 #define du_example_usage \
        "$ du\n" \
@@ -760 +2131 @@
 #define dumpkmap_trivial_usage \
        "> keymap"
-#define dumpkmap_full_usage \
-       "Print out a binary keyboard translation table to standard output"
+#define dumpkmap_full_usage "\n\n" \
+       "Print a binary keyboard translation table to stdout"
 #define dumpkmap_example_usage \
        "$ dumpkmap > keymap\n"
@@ -767 +2138 @@
 #define dumpleases_trivial_usage \
        "[-r|-a] [-f LEASEFILE]"
-#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"
-
+#define dumpleases_full_usage "\n\n" \
+       "Display DHCP leases granted by udhcpd\n" \
+     "\nOptions:" \
+    IF_LONG_OPTS( \
+     "\n    -f,--file=FILE  Lease file" \
+     "\n    -r,--remaining  Show remaining time" \
+     "\n    -a,--absolute   Show expiration time" \
+    ) \
+    IF_NOT_LONG_OPTS( \
+     "\n    -f FILE Lease file" \
+     "\n    -r  Show remaining time" \
+     "\n    -a  Show expiration time" \
+    )
+
+/*
 #define e2fsck_trivial_usage \
        "[-panyrcdfvstDFSV] [-b superblock] [-B blocksize] " \
@@ -779 +2158 @@
        "[-l|-L bad_blocks_file] [-C fd] [-j external_journal] " \
        "[-E extended-options] device"
-#define e2fsck_full_usage \
-       "Check ext2/ext3 file system" \
-       "\n\nOptions:\n" \
-       "    -p      Automatic repair (no questions)\n" \
-       "    -n      Make no changes to the filesystem\n" \
-       "    -y      Assume 'yes' to all questions\n" \
-       "    -c      Check for bad blocks and add them to the badblock list\n" \
-       "    -f      Force checking even if filesystem is marked clean\n" \
-       "    -v      Verbose\n" \
-       "    -b superblock   Use alternative superblock\n" \
-       "    -B blocksize    Force blocksize when looking for superblock\n" \
-       "    -j journal  Set location of the external journal\n" \
-       "    -l file     Add to badblocks list\n" \
-       "    -L file     Set badblocks list"
+#define e2fsck_full_usage "\n\n" \
+       "Check ext2/ext3 file system\n" \
+     "\nOptions:" \
+     "\n    -p      Automatic repair (no questions)" \
+     "\n    -n      Make no changes to the filesystem" \
+     "\n    -y      Assume 'yes' to all questions" \
+     "\n    -c      Check for bad blocks and add them to the badblock list" \
+     "\n    -f      Force checking even if filesystem is marked clean" \
+     "\n    -v      Verbose" \
+     "\n    -b superblock   Use alternative superblock" \
+     "\n    -B blocksize    Force blocksize when looking for superblock" \
+     "\n    -j journal  Set location of the external journal" \
+     "\n    -l file     Add to badblocks list" \
+     "\n    -L file     Set badblocks list" \
+*/
 
 #define echo_trivial_usage \
-    USE_FEATURE_FANCY_ECHO("[-neE] ") "[ARG ...]"
-#define echo_full_usage \
+    IF_FEATURE_FANCY_ECHO("[-neE] ") "[ARG]..."
+#define echo_full_usage "\n\n" \
        "Print the specified ARGs to stdout" \
-    USE_FEATURE_FANCY_ECHO( \
-       "\n\nOptions:\n" \
-       "    -n  Suppress trailing newline\n" \
-       "    -e  Interpret backslash-escaped characters (i.e., \\t=tab)\n" \
-       "    -E  Disable interpretation of backslash-escaped characters" \
+    IF_FEATURE_FANCY_ECHO( "\n" \
+     "\nOptions:" \
+     "\n    -n  Suppress trailing newline" \
+     "\n    -e  Interpret backslash escapes (i.e., \\t=tab)" \
+     "\n    -E  Don't interpret backslash escapes (default)" \
     )
 #define echo_example_usage \
        "$ echo \"Erik is cool\"\n" \
        "Erik is cool\n" \
-    USE_FEATURE_FANCY_ECHO("$ echo -e \"Erik\\nis\\ncool\"\n" \
+    IF_FEATURE_FANCY_ECHO("$ echo -e \"Erik\\nis\\ncool\"\n" \
        "Erik\n" \
        "is\n" \
@@ -816 +2196 @@
 #define eject_trivial_usage \
        "[-t] [-T] [DEVICE]"
-#define eject_full_usage \
-       "Eject specified DEVICE (or default /dev/cdrom)" \
-       "\n\nOptions:\n" \
-       "    -t  Close tray\n" \
-       "    -T  Open/close tray (toggle)"
+#define eject_full_usage "\n\n" \
+       "Eject DEVICE or default /dev/cdrom\n" \
+     "\nOptions:" \
+    IF_FEATURE_EJECT_SCSI( \
+     "\n    -s  SCSI device" \
+    ) \
+     "\n    -t  Close tray" \
+     "\n    -T  Open/close tray (toggle)" \
 
 #define ed_trivial_usage ""
@@ -826 +2209 @@
 
 #define env_trivial_usage \
-       "[-iu] [-] [name=value]... [command]"
-#define env_full_usage \
-       "Print the current environment or run a program after setting\n" \
-       "up the specified environment" \
-       "\n\nOptions:\n" \
-       "    -, -i   Start with an empty environment\n" \
-       "    -u  Remove variable from the environment"
+       "[-iu] [-] [name=value]... [PROG ARGS]"
+#define env_full_usage "\n\n" \
+       "Print the current environment or run PROG after setting up\n" \
+       "the specified environment\n" \
+     "\nOptions:" \
+     "\n    -, -i   Start with an empty environment" \
+     "\n    -u  Remove variable from the environment" \
 
 #define ether_wake_trivial_usage \
        "[-b] [-i iface] [-p aa:bb:cc:dd[:ee:ff]] MAC"
-#define ether_wake_full_usage \
+#define ether_wake_full_usage "\n\n" \
        "Send a magic packet to wake up sleeping machines.\n" \
        "MAC must be a station address (00:11:22:33:44:55) or\n" \
-       "a hostname with a known 'ethers' entry." \
-       "\n\nOptions:\n" \
-       "    -b      Send wake-up packet to the broadcast address\n" \
-       "    -i iface    Use interface ifname instead of the default \"eth0\"\n" \
-       "    -p pass     Append the four or six byte password PW to the packet"
+       "a hostname with a known 'ethers' entry.\n" \
+     "\nOptions:" \
+     "\n    -b      Send wake-up packet to the broadcast address" \
+     "\n    -i iface    Interface to use (default eth0)" \
+     "\n    -p pass     Append four or six byte password PW to the packet" \
 
 #define expand_trivial_usage \
-       "[-i] [-t NUM] [FILE|-]"
-#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"
+       "[-i] [-t N] [FILE]..."
+#define expand_full_usage "\n\n" \
+       "Convert tabs to spaces, writing to stdout\n" \
+     "\nOptions:" \
+    IF_FEATURE_EXPAND_LONG_OPTIONS( \
+     "\n    -i,--initial    Don't convert tabs after non blanks" \
+     "\n    -t,--tabs=N Tabstops every N chars" \
+    ) \
+    IF_NOT_FEATURE_EXPAND_LONG_OPTIONS( \
+     "\n    -i  Don't 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" \
+#define expr_full_usage "\n\n" \
+       "Print the value of EXPRESSION to stdout\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" \
@@ -881 +2269 @@
        "                it is a keyword like 'match' or an\n" \
        "                operator like '/'\n" \
-       "    (EXPRESSION)        Value of EXPRESSION\n\n" \
+       "    (EXPRESSION)        Value of EXPRESSION\n" \
+       "\n" \
        "Beware that many operators need to be escaped or quoted for shells.\n" \
        "Comparisons are arithmetic if both ARGs are numbers, else\n" \
@@ -890 +2279 @@
 #define fakeidentd_trivial_usage \
        "[-fiw] [-b ADDR] [STRING]"
-#define fakeidentd_full_usage \
-       "Provide fake ident (auth) service" \
-       "\n\nOptions:" \
-       "\n  -f  Run in foreground" \
-       "\n  -i  Inetd mode" \
-       "\n  -w  Inetd 'wait' mode" \
-       "\n  -b ADDR Bind to specified address" \
-       "\n  STRING  Ident answer string (default is 'nobody')"
+#define fakeidentd_full_usage "\n\n" \
+       "Provide fake ident (auth) service\n" \
+     "\nOptions:" \
+     "\n    -f  Run in foreground" \
+     "\n    -i  Inetd mode" \
+     "\n    -w  Inetd 'wait' mode" \
+     "\n    -b ADDR Bind to specified address" \
+     "\n    STRING  Ident answer string (default: nobody)" \
 
 #define false_trivial_usage \
        ""
-#define false_full_usage \
+#define false_full_usage "\n\n" \
        "Return an exit code of FALSE (1)"
+
 #define false_example_usage \
        "$ false\n" \
@@ -908 +2298 @@
        "1\n"
 
+#define fbsplash_trivial_usage \
+       "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]"
+#define fbsplash_full_usage "\n\n" \
+       "Options:" \
+     "\n    -s  Image" \
+     "\n    -c  Hide cursor" \
+     "\n    -d  Framebuffer device (default /dev/fb0)" \
+     "\n    -i  Config file (var=value):" \
+     "\n            BAR_LEFT,BAR_TOP,BAR_WIDTH,BAR_HEIGHT" \
+     "\n            BAR_R,BAR_G,BAR_B" \
+     "\n    -f  Control pipe (else exit after drawing image)" \
+     "\n            commands: 'NN' (% for progress bar) or 'exit'" \
+
 #define fbset_trivial_usage \
-       "[options] [mode]"
-#define fbset_full_usage \
+       "[OPTIONS] [MODE]"
+#define fbset_full_usage "\n\n" \
        "Show and modify frame buffer settings"
+
 #define fbset_example_usage \
        "$ fbset\n" \
@@ -924 +2328 @@
 #define fdflush_trivial_usage \
        "DEVICE"
-#define fdflush_full_usage \
+#define fdflush_full_usage "\n\n" \
        "Force floppy disk drive to detect disk change"
 
 #define fdformat_trivial_usage \
        "[-n] DEVICE"
-#define fdformat_full_usage \
-       "Format floppy disk" \
-       "\n\nOptions:\n" \
-       "    -n  Don't verify after format"
+#define fdformat_full_usage "\n\n" \
+       "Format floppy disk\n" \
+     "\nOptions:" \
+     "\n    -n  Don't verify after format" \
+
+/* Looks like someone forgot to add this to config system */
+#ifndef ENABLE_FEATURE_FDISK_BLKSIZE
+# define ENABLE_FEATURE_FDISK_BLKSIZE 0
+# define IF_FEATURE_FDISK_BLKSIZE(a)
+#endif
 
 #define fdisk_trivial_usage \
-       "[-luv] [-C CYLINDERS] [-H HEADS] [-S SECTORS] [-b SSZ] DISK"
-#define fdisk_full_usage \
-       "Change partition table" \
-       "\n\nOptions:\n" \
-       "    -l      List partition table(s)\n" \
-       "    -u      Give Start and End in sector (instead of cylinder) units\n" \
-       "    -s PARTITION    Give partition size(s) in blocks\n" \
-       "    -b 2048     (for certain MO disks) use 2048-byte sectors\n" \
-       "    -C CYLINDERS    Set the number of cylinders\n" \
-       "    -H HEADS    Set the number of heads\n" \
-       "    -S SECTORS  Set the number of sectors\n" \
-       "    -v      Give fdisk version"
-
-#define find_trivial_usage \
-       "[PATH...] [EXPRESSION]"
-#define find_full_usage \
-       "Search for files in a directory hierarchy. The default PATH is\n" \
-       "the current directory, default EXPRESSION is '-print'\n" \
-     "\nEXPRESSION may consist of:" \
-     "\n    -follow     Dereference symlinks" \
-    USE_FEATURE_FIND_XDEV( \
-     "\n    -xdev       Don't descend directories on other filesystems") \
-    USE_FEATURE_FIND_MAXDEPTH( \
-     "\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" \
-    USE_FEATURE_FIND_PATH( \
-     "\n    -path PATTERN   Path matches PATTERN") \
-    USE_FEATURE_FIND_REGEX( \
-     "\n    -regex PATTERN  Path matches regex PATTERN") \
-    USE_FEATURE_FIND_TYPE( \
-     "\n    -type X     File type is X (X is one of: f,d,l,b,c,...)") \
-    USE_FEATURE_FIND_PERM( \
-     "\n    -perm NNN   Permissions match any of (+NNN), all of (-NNN)," \
-     "\n            or exactly (NNN)") \
-    USE_FEATURE_FIND_MTIME( \
-     "\n    -mtime DAYS Modified time is greater than (+N), less than (-N)," \
-     "\n            or exactly (N) days") \
-    USE_FEATURE_FIND_MMIN( \
-     "\n    -mmin MINS  Modified time is greater than (+N), less than (-N)," \
-     "\n            or exactly (N) minutes") \
-    USE_FEATURE_FIND_NEWER( \
-     "\n    -newer FILE Modified time is more recent than FILE's") \
-    USE_FEATURE_FIND_INUM( \
-     "\n    -inum N     File has inode number N") \
-    USE_FEATURE_FIND_USER( \
-     "\n    -user NAME  File is owned by user NAME (numeric user ID allowed)") \
-    USE_FEATURE_FIND_GROUP( \
-     "\n    -group NAME File belongs to group NAME (numeric group ID allowed)") \
-    USE_FEATURE_FIND_DEPTH( \
-     "\n    -depth      Process directory name after traversing it") \
-    USE_FEATURE_FIND_SIZE( \
-     "\n    -size N[bck]    File size is N (c:bytes,k:kbytes,b:512 bytes(def.))." \
-     "\n            +/-N: file size is bigger/smaller than N") \
-     "\n    -print      Print (default and assumed)" \
-    USE_FEATURE_FIND_PRINT0( \
-     "\n    -print0     Delimit output with null characters rather than" \
-     "\n            newlines") \
-    USE_FEATURE_FIND_CONTEXT ( \
-     "\n    -context    File has specified security context") \
-    USE_FEATURE_FIND_EXEC( \
-     "\n    -exec CMD ARG ; Execute CMD with all instances of {} replaced by the" \
-     "\n            matching files") \
-    USE_FEATURE_FIND_PRUNE( \
-     "\n    -prune      Stop traversing current subtree") \
-    USE_FEATURE_FIND_DELETE( \
-     "\n    -delete     Delete files, turns on -depth option") \
-    USE_FEATURE_FIND_PAREN( \
-     "\n    (EXPR)      Group an expression") \
-
-#define find_example_usage \
-       "$ find / -name passwd\n" \
-       "/etc/passwd\n"
+       "[-ul" IF_FEATURE_FDISK_BLKSIZE("s") "] " \
+       "[-C CYLINDERS] [-H HEADS] [-S SECTORS] [-b SSZ] DISK"
+#define fdisk_full_usage "\n\n" \
+       "Change partition table\n" \
+     "\nOptions:" \
+     "\n    -u      Start and End are in sectors (instead of cylinders)" \
+     "\n    -l      Show partition table for each DISK, then exit" \
+    IF_FEATURE_FDISK_BLKSIZE( \
+     "\n    -s      Show partition sizes in kb for each DISK, then exit" \
+    ) \
+     "\n    -b 2048     (for certain MO disks) use 2048-byte sectors" \
+     "\n    -C CYLINDERS    Set number of cylinders/heads/sectors" \
+     "\n    -H HEADS" \
+     "\n    -S SECTORS" \
+
+#define fgconsole_trivial_usage \
+    ""
+#define fgconsole_full_usage "\n\n" \
+    "Get active console"
+
+#define findfs_trivial_usage \
+       "LABEL=label or UUID=uuid"
+#define findfs_full_usage "\n\n" \
+       "Find a filesystem device based on a label or UUID"
+#define findfs_example_usage \
+       "$ findfs LABEL=MyDevice"
+
+#define flash_lock_trivial_usage \
+       "MTD_DEVICE OFFSET SECTORS"
+#define flash_lock_full_usage "\n\n" \
+       "Lock part or all of an MTD device. If SECTORS is -1, then all sectors\n" \
+       "will be locked, regardless of the value of OFFSET"
+
+#define flash_unlock_trivial_usage \
+       "MTD_DEVICE"
+#define flash_unlock_full_usage "\n\n" \
+       "Unlock an MTD device"
+
+#define flash_eraseall_trivial_usage \
+       "[-jq] MTD_DEVICE"
+#define flash_eraseall_full_usage "\n\n" \
+       "Erase an MTD device\n" \
+     "\nOptions:" \
+     "\n    -j  Format the device for jffs2" \
+     "\n    -q  Don't display progress messages" \
+
+#define flashcp_trivial_usage \
+       "-v FILE MTD_DEVICE"
+#define flashcp_full_usage "\n\n" \
+       "Copy an image to MTD device\n" \
+     "\nOptions:" \
+     "\n    -v  Verbose" \
+
+#define flock_trivial_usage \
+       "[-sxun] FD|{FILE [-c] PROG ARGS}"
+#define flock_full_usage "\n\n" \
+       "[Un]lock file descriptor, or lock FILE, run PROG\n" \
+     "\nOptions:" \
+     "\n    -s  Shared lock" \
+     "\n    -x  Exclusive lock (default)" \
+     "\n    -u  Unlock FD" \
+     "\n    -n  Fail rather than wait" \
 
 #define fold_trivial_usage \
-       "[-bs] [-w WIDTH] [FILE]"
-#define fold_full_usage \
-       "Wrap input lines in each FILE (standard input by default), writing to\n" \
-       "standard output" \
-       "\n\nOptions:\n" \
-       "    -b  Count bytes rather than columns\n" \
-       "    -s  Break at spaces\n" \
-       "    -w  Use WIDTH columns instead of 80"
+       "[-bs] [-w WIDTH] [FILE]..."
+#define fold_full_usage "\n\n" \
+       "Wrap input lines in each FILE (or stdin), writing to stdout\n" \
+     "\nOptions:" \
+     "\n    -b  Count bytes rather than columns" \
+     "\n    -s  Break at spaces" \
+     "\n    -w  Use WIDTH columns instead of 80" \
 
 #define free_trivial_usage \
-       ""
-#define free_full_usage \
+       "" IF_DESKTOP("[-b/k/m/g]")
+#define free_full_usage "\n\n" \
        "Display the amount of free and used system memory"
 #define free_example_usage \
@@ -1032 +2430 @@
 #define freeramdisk_trivial_usage \
        "DEVICE"
-#define freeramdisk_full_usage \
+#define freeramdisk_full_usage "\n\n" \
        "Free all memory used by the specified ramdisk"
 #define freeramdisk_example_usage \
@@ -1038 +2436 @@
 
 #define fsck_trivial_usage \
-       "[-ANPRTV] [-C fd] [-t fstype] [fs-options] [filesys ...]"
-#define fsck_full_usage \
-       "Check and repair filesystems" \
-       "\n\nOptions:\n" \
-       "    -A  Walk /etc/fstab and check all filesystems\n" \
-       "    -N  Don't execute, just show what would be done\n" \
-       "    -P  When using -A, check filesystems in parallel\n" \
-       "    -R  When using -A, skip the root filesystem\n" \
-       "    -T  Don't show title on startup\n" \
-       "    -V  Verbose\n" \
-       "    -C n    Write status information to specified filedescriptor\n" \
-       "    -t type List of filesystem types to check"
+       "[-ANPRTV] [-C FD] [-t FSTYPE] [FS_OPTS] [BLOCKDEV]..."
+#define fsck_full_usage "\n\n" \
+       "Check and repair filesystems\n" \
+     "\nOptions:" \
+     "\n    -A  Walk /etc/fstab and check all filesystems" \
+     "\n    -N  Don't execute, just show what would be done" \
+     "\n    -P  With -A, check filesystems in parallel" \
+     "\n    -R  With -A, skip the root filesystem" \
+     "\n    -T  Don't show title on startup" \
+     "\n    -V  Verbose" \
+     "\n    -C n    Write status information to specified filedescriptor" \
+     "\n    -t TYPE List of filesystem types to check" \
 
 #define fsck_minix_trivial_usage \
-       "[-larvsmf] /dev/name"
-#define fsck_minix_full_usage \
-       "Perform a consistency check for MINIX filesystems" \
-       "\n\nOptions:\n" \
-       "    -l  Lists 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" \
-       "    -f  Force file system check"
+       "[-larvsmf] BLOCKDEV"
+#define fsck_minix_full_usage "\n\n" \
+       "Check MINIX filesystem\n" \
+     "\nOptions:" \
+     "\n    -l  List all filenames" \
+     "\n    -r  Perform interactive repairs" \
+     "\n    -a  Perform automatic repairs" \
+     "\n    -v  Verbose" \
+     "\n    -s  Output superblock information" \
+     "\n    -m  Show \"mode not cleared\" warnings" \
+     "\n    -f  Force file system check" \
+
+#define ftpd_trivial_usage \
+       "[-wvS] [-t N] [-T N] [DIR]"
+#define ftpd_full_usage "\n\n" \
+       "Anonymous FTP server\n" \
+       "\n" \
+       "ftpd should be used as an inetd service.\n" \
+       "ftpd's line for inetd.conf:\n" \
+       "    21 stream tcp nowait root ftpd ftpd /files/to/serve\n" \
+       "It also can be ran from tcpsvd:\n" \
+       "    tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve\n" \
+     "\nOptions:" \
+     "\n    -w  Allow upload" \
+     "\n    -v  Log to stderr" \
+     "\n    -S  Log to syslog" \
+     "\n    -t,-T   Idle and absolute timeouts" \
+     "\n    DIR Change root to this directory" \
 
 #define ftpget_trivial_usage \
-       "[options] remote-host local-file remote-file"
-#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"
+       "[OPTIONS] HOST [LOCAL_FILE] REMOTE_FILE"
+#define ftpget_full_usage "\n\n" \
+       "Retrieve a remote file via FTP\n" \
+     "\nOptions:" \
+    IF_FEATURE_FTPGETPUT_LONG_OPTIONS( \
+     "\n    -c,--continue   Continue previous transfer" \
+     "\n    -v,--verbose    Verbose" \
+     "\n    -u,--username   Username" \
+     "\n    -p,--password   Password" \
+     "\n    -P,--port   Port number" \
+    ) \
+    IF_NOT_FEATURE_FTPGETPUT_LONG_OPTIONS( \
+     "\n    -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"
+       "[OPTIONS] HOST [REMOTE_FILE] LOCAL_FILE"
+#define ftpput_full_usage "\n\n" \
+       "Store a local file on a remote machine via FTP\n" \
+     "\nOptions:" \
+    IF_FEATURE_FTPGETPUT_LONG_OPTIONS( \
+     "\n    -v,--verbose    Verbose" \
+     "\n    -u,--username   Username" \
+     "\n    -p,--password   Password" \
+     "\n    -P,--port   Port number" \
+    ) \
+    IF_NOT_FEATURE_FTPGETPUT_LONG_OPTIONS( \
+     "\n    -v  Verbose" \
+     "\n    -u  Username" \
+     "\n    -p  Password" \
+     "\n    -P  Port number" \
+    )
 
 #define fuser_trivial_usage \
-       "[options] file OR port/proto"
-#define fuser_full_usage \
-       "Options:\n" \
-       "    -m  Show all processes on the same mounted fs\n" \
-       "    -k  Kill all processes that match\n" \
-       "    -s  Don't print or kill anything\n" \
-       "    -4  When using port/proto only search IPv4 space\n" \
-       "    -6  When using port/proto only search IPv6 space\n" \
-       "    -SIGNAL When used with -k, this signal will be used to kill"
-
-#define getenforce_trivial_usage
-#define getenforce_full_usage
+       "[OPTIONS] FILE or PORT/PROTO"
+#define fuser_full_usage "\n\n" \
+       "Find processes which use FILEs or PORTs\n" \
+     "\nOptions:" \
+     "\n    -m  Find processes which use same fs as FILEs" \
+     "\n    -4,-6   Search only IPv4/IPv6 space" \
+     "\n    -s  Don't display PIDs" \
+     "\n    -k  Kill found processes" \
+     "\n    -SIGNAL Signal to send (default: KILL)" \
+
+#define getenforce_trivial_usage NOUSAGE_STR
+#define getenforce_full_usage ""
 
 #define getopt_trivial_usage \
-       "[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"
+       "[OPTIONS]"
+#define getopt_full_usage "\n\n" \
+       "Options:" \
+    IF_LONG_OPTS( \
+     "\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           Don't quote the output" \
+    ) \
+    IF_NOT_LONG_OPTS( \
+     "\n    -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" \
@@ -1117 +2562 @@
        "GETOPT=`getopt -o ab:c:: --long a-long,b-long:,c-long:: \\\n" \
        "       -n 'example.busybox' -- \"$@\"`\n" \
-       "if [ $? != 0 ]; then  exit 1; fi\n" \
+       "if [ $? != 0 ]; then exit 1; fi\n" \
        "eval set -- \"$GETOPT\"\n" \
        "while true; do\n" \
@@ -1135 +2580 @@
 #define getsebool_trivial_usage \
        "-a or getsebool boolean..."
-#define getsebool_full_usage \
-       "    -a  Show all SELinux booleans"
+#define getsebool_full_usage "\n\n" \
+       "    -a  Show all selinux booleans"
 
 #define getty_trivial_usage \
-       "[OPTIONS]... baud_rate,... line [termtype]"
-#define getty_full_usage \
-       "Open a tty, prompt for a login name, then invoke /bin/login" \
-       "\n\nOptions:\n" \
-       "    -h      Enable hardware (RTS/CTS) flow control\n" \
-       "    -i      Do not display /etc/issue before running login\n" \
-       "    -L      Local line, so do not do carrier detect\n" \
-       "    -m      Get baud rate from modem's CONNECT status message\n" \
-       "    -w      Wait for a CR or LF before sending /etc/issue\n" \
-       "    -n      Do not prompt the user for a login name\n" \
-       "    -f issue_file   Display issue_file instead of /etc/issue\n" \
-       "    -l login_app    Invoke login_app instead of /bin/login\n" \
-       "    -t timeout  Terminate after timeout if no username is read\n" \
-       "    -I initstring   Sets the init string to send before anything else\n" \
-       "    -H login_host   Log login_host into the utmp file as the hostname"
-
-#define grep_trivial_usage \
-       "[-HhrilLnqvso" \
-    USE_DESKTOP("w") \
-       "eF" \
-    USE_FEATURE_GREP_EGREP_ALIAS("E") \
-    USE_FEATURE_GREP_CONTEXT("ABC") \
-       "] PATTERN [FILEs...]"
-#define grep_full_usage \
-       "Search for PATTERN in each FILE or standard input" \
-       "\n\nOptions:" \
-       "\n  -H  Prefix output lines with filename where match was found" \
-       "\n  -h  Suppress the prefixing filename on output" \
-       "\n  -r  Recurse subdirectories" \
-       "\n  -i  Ignore case distinctions" \
-       "\n  -l  List names of files that match" \
-       "\n  -L  List names of files that do not match" \
-       "\n  -n  Print line number with output lines" \
-       "\n  -q  Quiet. Returns 0 if PATTERN was found, 1 otherwise" \
-       "\n  -v  Select non-matching lines" \
-       "\n  -s  Suppress file open/read error messages" \
-       "\n  -c  Only print count of matching lines" \
-       "\n  -o  Show only the part of a line that matches PATTERN" \
-       "\n  -m MAX  Match up to MAX times per file" \
-    USE_DESKTOP( \
-       "\n  -w  Match whole words only") \
-       "\n  -F  PATTERN is a set of newline-separated strings" \
-    USE_FEATURE_GREP_EGREP_ALIAS( \
-       "\n  -E  PATTERN is an extended regular expression") \
-       "\n  -e PTRN Pattern to match" \
-       "\n  -f FILE Read pattern from file" \
-    USE_FEATURE_GREP_CONTEXT( \
-       "\n  -A  Print NUM lines of trailing context" \
-       "\n  -B  Print NUM lines of leading context" \
-       "\n  -C  Print NUM lines of output context") \
-
-#define grep_example_usage \
-       "$ grep root /etc/passwd\n" \
-       "root:x:0:0:root:/root:/bin/bash\n" \
-       "$ grep ^[rR]oo. /etc/passwd\n" \
-       "root:x:0:0:root:/root:/bin/bash\n"
+       "[OPTIONS] BAUD_RATE TTY [TERMTYPE]"
+#define getty_full_usage "\n\n" \
+       "Open a tty, prompt for a login name, then invoke /bin/login\n" \
+     "\nOptions:" \
+     "\n    -h      Enable hardware (RTS/CTS) flow control" \
+     "\n    -i      Don't display /etc/issue before running login" \
+     "\n    -L      Local line, don't do carrier detect" \
+     "\n    -m      Get baud rate from modem's CONNECT status message" \
+     "\n    -w      Wait for a CR or LF before sending /etc/issue" \
+     "\n    -n      Don't prompt the user for a login name" \
+     "\n    -f ISSUE_FILE   Display ISSUE_FILE instead of /etc/issue" \
+     "\n    -l LOGIN    Invoke LOGIN instead of /bin/login" \
+     "\n    -t SEC      Terminate after SEC if no username is read" \
+     "\n    -I INITSTR  Send INITSTR before anything else" \
+     "\n    -H HOST     Log HOST into the utmp file as the hostname" \
 
 #define gunzip_trivial_usage \
-       "[OPTION]... FILE"
-#define gunzip_full_usage \
-       "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" \
-       "    -t  Test compressed file integrity"
+       "[-cft] [FILE]..."
+#define gunzip_full_usage "\n\n" \
+       "Decompress FILEs (or stdin)\n" \
+     "\nOptions:" \
+     "\n    -c  Write to stdout" \
+     "\n    -f  Force" \
+     "\n    -t  Test file integrity" \
+
 #define gunzip_example_usage \
        "$ ls -la /tmp/BusyBox*\n" \
@@ -1212 +2617 @@
 
 #define gzip_trivial_usage \
-       "[OPTION]... [FILE]..."
-#define gzip_full_usage \
-       "Compress FILE(s) with maximum compression.\n" \
-       "When FILE is '-' or unspecified, reads standard input. Implies -c." \
-       "\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"
+       "[-cfd] [FILE]..."
+#define gzip_full_usage "\n\n" \
+       "Compress FILEs (or stdin)\n" \
+     "\nOptions:" \
+     "\n    -d  Decompress" \
+     "\n    -c  Write to stdout" \
+     "\n    -f  Force" \
+
 #define gzip_example_usage \
        "$ ls -la /tmp/busybox*\n" \
@@ -1227 +2632 @@
        "-rw-rw-r--    1 andersen andersen   554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
 
-#define halt_trivial_usage \
-       "[-d delay] [-n] [-f]"
-#define halt_full_usage \
-       "Halt the system" \
-       "\n\nOptions:\n" \
-       "    -d  Delay interval for halting\n" \
-       "    -n  No call to sync()\n" \
-       "    -f  Force halt (don't go through init)"
-
 #define hdparm_trivial_usage \
-       "[options] [device] .."
-#define hdparm_full_usage \
-    USE_FEATURE_HDPARM_GET_IDENTITY( \
-       "If no device name is specified try to read from stdin.\n\n") \
-       "Options:\n" \
-       "    -a  Get/set fs readahead\n" \
-       "    -A  Set drive read-lookahead flag (0/1)\n" \
-       "    -b  Get/set bus state (0 == off, 1 == on, 2 == tristate)\n" \
-       "    -B  Set Advanced Power Management setting (1-255)\n" \
-       "    -c  Get/set IDE 32-bit IO setting\n" \
-       "    -C  Check IDE power mode status\n" \
-    USE_FEATURE_HDPARM_HDIO_GETSET_DMA( \
-       "    -d  Get/set using_dma flag\n") \
-       "    -D  Enable/disable drive defect-mgmt\n" \
-       "    -f  Flush buffer cache for device on exit\n" \
-       "    -g  Display drive geometry\n" \
-       "    -h  Display terse usage information\n" \
-    USE_FEATURE_HDPARM_GET_IDENTITY( \
-       "    -i  Display drive identification\n") \
-    USE_FEATURE_HDPARM_GET_IDENTITY( \
-       "    -I  Detailed/current information directly from drive\n") \
-       "    -k  Get/set keep_settings_over_reset flag (0/1)\n" \
-       "    -K  Set drive keep_features_over_reset flag (0/1)\n" \
-       "    -L  Set drive doorlock (0/1) (removable harddisks only)\n" \
-       "    -m  Get/set multiple sector count\n" \
-       "    -n  Get/set ignore-write-errors flag (0/1)\n" \
-       "    -p  Set PIO mode on IDE interface chipset (0,1,2,3,4,...)\n" \
-       "    -P  Set drive prefetch count\n" \
-       "    -q  Change next setting quietly\n" \
-       "    -Q  Get/set DMA tagged-queuing depth (if supported)\n" \
-       "    -r  Get/set readonly flag (DANGEROUS to set)\n" \
-    USE_FEATURE_HDPARM_HDIO_SCAN_HWIF( \
-       "    -R  Register an IDE interface (DANGEROUS)\n") \
-       "    -S  Set standby (spindown) timeout\n" \
-       "    -t  Perform device read timings\n" \
-       "    -T  Perform cache read timings\n" \
-       "    -u  Get/set unmaskirq flag (0/1)\n" \
-    USE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF( \
-       "    -U  Un-register an IDE interface (DANGEROUS)\n") \
-       "    -v  Defaults; same as -mcudkrag for IDE drives\n" \
-       "    -V  Display program version and exit immediately\n" \
-    USE_FEATURE_HDPARM_HDIO_DRIVE_RESET( \
-       "    -w  Perform device reset (DANGEROUS)\n") \
-       "    -W  Set drive write-caching flag (0/1) (DANGEROUS)\n" \
-    USE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF( \
-       "    -x  Tristate device for hotswap (0/1) (DANGEROUS)\n") \
-       "    -X  Set IDE xfer mode (DANGEROUS)\n" \
-       "    -y  Put IDE drive in standby mode\n" \
-       "    -Y  Put IDE drive to sleep\n" \
-       "    -Z  Disable Seagate auto-powersaving mode\n" \
-       "    -z  Re-read partition table"
+       "[OPTIONS] [DEVICE]"
+#define hdparm_full_usage "\n\n" \
+       "Options:" \
+     "\n    -a  Get/set fs readahead" \
+     "\n    -A  Set drive read-lookahead flag (0/1)" \
+     "\n    -b  Get/set bus state (0 == off, 1 == on, 2 == tristate)" \
+     "\n    -B  Set Advanced Power Management setting (1-255)" \
+     "\n    -c  Get/set IDE 32-bit IO setting" \
+     "\n    -C  Check IDE power mode status" \
+    IF_FEATURE_HDPARM_HDIO_GETSET_DMA( \
+     "\n    -d  Get/set using_dma flag") \
+     "\n    -D  Enable/disable drive defect-mgmt" \
+     "\n    -f  Flush buffer cache for device on exit" \
+     "\n    -g  Display drive geometry" \
+     "\n    -h  Display terse usage information" \
+    IF_FEATURE_HDPARM_GET_IDENTITY( \
+     "\n    -i  Display drive identification") \
+    IF_FEATURE_HDPARM_GET_IDENTITY( \
+     "\n    -I  Detailed/current information directly from drive") \
+     "\n    -k  Get/set keep_settings_over_reset flag (0/1)" \
+     "\n    -K  Set drive keep_features_over_reset flag (0/1)" \
+     "\n    -L  Set drive doorlock (0/1) (removable harddisks only)" \
+     "\n    -m  Get/set multiple sector count" \
+     "\n    -n  Get/set ignore-write-errors flag (0/1)" \
+     "\n    -p  Set PIO mode on IDE interface chipset (0,1,2,3,4,...)" \
+     "\n    -P  Set drive prefetch count" \
+/*   "\n    -q  Change next setting quietly" - not supported ib bbox */ \
+     "\n    -Q  Get/set DMA tagged-queuing depth (if supported)" \
+     "\n    -r  Get/set readonly flag (DANGEROUS to set)" \
+    IF_FEATURE_HDPARM_HDIO_SCAN_HWIF( \
+     "\n    -R  Register an IDE interface (DANGEROUS)") \
+     "\n    -S  Set standby (spindown) timeout" \
+     "\n    -t  Perform device read timings" \
+     "\n    -T  Perform cache read timings" \
+     "\n    -u  Get/set unmaskirq flag (0/1)" \
+    IF_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF( \
+     "\n    -U  Unregister an IDE interface (DANGEROUS)") \
+     "\n    -v  Defaults; same as -mcudkrag for IDE drives" \
+     "\n    -V  Display program version and exit immediately" \
+    IF_FEATURE_HDPARM_HDIO_DRIVE_RESET( \
+     "\n    -w  Perform device reset (DANGEROUS)") \
+     "\n    -W  Set drive write-caching flag (0/1) (DANGEROUS)" \
+    IF_FEATURE_HDPARM_HDIO_TRISTATE_HWIF( \
+     "\n    -x  Tristate device for hotswap (0/1) (DANGEROUS)") \
+     "\n    -X  Set IDE xfer mode (DANGEROUS)" \
+     "\n    -y  Put IDE drive in standby mode" \
+     "\n    -Y  Put IDE drive to sleep" \
+     "\n    -Z  Disable Seagate auto-powersaving mode" \
+     "\n    -z  Reread partition table" \
 
 #define head_trivial_usage \
-       "[OPTION]... [FILE]..."
-#define head_full_usage \
-       "Print first 10 lines of each FILE to standard output.\n" \
-       "With more than one FILE, precede each with a header giving the\n" \
-       "file name. With no FILE, or when FILE is -, read standard input." \
-       "\n\nOptions:" \
-       "\n  -n NUM  Print first NUM lines instead of first 10" \
-    USE_FEATURE_FANCY_HEAD( \
-       "\n  -c NUM  Output the first NUM bytes" \
-       "\n  -q  Never output headers giving file names" \
-       "\n  -v  Always output headers giving file names")
+       "[OPTIONS] [FILE]..."
+#define head_full_usage "\n\n" \
+       "Print first 10 lines of each FILE (or stdin) to stdout.\n" \
+       "With more than one FILE, precede each with a filename header.\n" \
+     "\nOptions:" \
+     "\n    -n N[kbm]   Print first N lines" \
+    IF_FEATURE_FANCY_HEAD( \
+     "\n    -c N[kbm]   Print first N bytes" \
+     "\n    -q      Never print headers" \
+     "\n    -v      Always print headers" \
+    ) \
+     "\n" \
+     "\nN may be suffixed by k (x1024), b (x512), or m (x1024^2)." \
+
 #define head_example_usage \
        "$ head -n 2 /etc/passwd\n" \
@@ -1306 +2703 @@
        "daemon:x:1:1:daemon:/usr/sbin:/bin/sh\n"
 
+#define tail_trivial_usage \
+       "[OPTIONS] [FILE]..."
+#define tail_full_usage "\n\n" \
+       "Print last 10 lines of each FILE (or stdin) to stdout.\n" \
+       "With more than one FILE, precede each with a filename header.\n" \
+     "\nOptions:" \
+     "\n    -f      Print data as file grows" \
+    IF_FEATURE_FANCY_TAIL( \
+     "\n    -s SECONDS  Wait SECONDS between reads with -f" \
+    ) \
+     "\n    -n N[kbm]   Print last N lines" \
+    IF_FEATURE_FANCY_TAIL( \
+     "\n    -c N[kbm]   Print last N bytes" \
+     "\n    -q      Never print headers" \
+     "\n    -v      Always print headers" \
+     "\n" \
+     "\nN may be suffixed by k (x1024), b (x512), or m (x1024^2)." \
+     "\nIf N starts with a '+', output begins with the Nth item from the start" \
+     "\nof each file, not from the end." \
+    ) \
+
+#define tail_example_usage \
+       "$ tail -n 1 /etc/resolv.conf\n" \
+       "nameserver 10.0.0.1\n"
+
 #define hexdump_trivial_usage \
-       "[-[bcCdefnosvx]] [OPTION] 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"
+       "[-bcCdefnosvx" IF_FEATURE_HEXDUMP_REVERSE("R") "] [FILE]..."
+#define hexdump_full_usage "\n\n" \
+       "Display FILEs (or stdin) 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" \
+    IF_FEATURE_HEXDUMP_REVERSE( \
+     "\n    -R      Reverse of 'hexdump -Cv'") \
+
+#define hd_trivial_usage \
+       "FILE..."
+#define hd_full_usage "\n\n" \
+       "hd is an alias for hexdump -C"
 
 #define hostid_trivial_usage \
        ""
-#define hostid_full_usage \
+#define hostid_full_usage "\n\n" \
        "Print out a unique 32-bit identifier for the machine"
 
 #define hostname_trivial_usage \
-       "[OPTION] {hostname | -F FILE}"
-#define hostname_full_usage \
-       "Get or set the hostname or DNS domain name. If a hostname is given\n" \
-       "(or FILE with the -F parameter), the host name will be set." \
-       "\n\nOptions:\n" \
-       "    -s  Short\n" \
-       "    -i  Addresses for the hostname\n" \
-       "    -d  DNS domain name\n" \
-       "    -f  Fully qualified domain name\n" \
-       "    -F FILE Use the contents of FILE to specify the hostname"
+       "[OPTIONS] [HOSTNAME | -F FILE]"
+#define hostname_full_usage "\n\n" \
+       "Get or set hostname or DNS domain name\n" \
+     "\nOptions:" \
+     "\n    -s  Short" \
+     "\n    -i  Addresses for the hostname" \
+     "\n    -d  DNS domain name" \
+     "\n    -f  Fully qualified domain name" \
+     "\n    -F FILE Use FILE's content as hostname" \
+
 #define hostname_example_usage \
        "$ hostname\n" \
        "sage\n"
 
+#define dnsdomainname_trivial_usage NOUSAGE_STR
+#define dnsdomainname_full_usage ""
+
 #define httpd_trivial_usage \
-       "[-c conffile]" \
-       " [-p [ip:]port]" \
-       " [-i] [-f] [-v[v]]" \
-    USE_FEATURE_HTTPD_SETUID(" [-u user[:grp]]") \
-    USE_FEATURE_HTTPD_BASIC_AUTH(" [-r realm]") \
-    USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \
-       " [-h home]" \
-       " [-d/-e string]"
-#define httpd_full_usage \
-       "Listen for incoming HTTP requests" \
-       "\n\nOptions:" \
-       "\n  -c FILE     Configuration file (default httpd.conf)" \
-       "\n  -p [IP:]PORT    Bind to ip:port (default *:80)" \
-       "\n  -i      Inetd mode" \
-       "\n  -f      Do not daemonize" \
-       "\n  -v[v]       Verbose" \
-    USE_FEATURE_HTTPD_SETUID( \
-       "\n  -u USER[:GRP]   Set uid/gid after binding to port") \
-    USE_FEATURE_HTTPD_BASIC_AUTH( \
-       "\n  -r REALM    Authentication Realm for Basic Authentication") \
-    USE_FEATURE_HTTPD_AUTH_MD5( \
-       "\n  -m PASS     Crypt PASS with md5 algorithm") \
-       "\n  -h HOME     Home directory (default .)" \
-       "\n  -e STRING   HTML encode STRING" \
-       "\n  -d STRING   URL decode STRING" \
+       "[-ifv[v]]" \
+       " [-c CONFFILE]" \
+       " [-p [IP:]PORT]" \
+    IF_FEATURE_HTTPD_SETUID(" [-u USER[:GRP]]") \
+    IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") \
+       " [-h HOME]\n" \
+       "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING"
+#define httpd_full_usage "\n\n" \
+       "Listen for incoming HTTP requests\n" \
+     "\nOptions:" \
+     "\n    -i      Inetd mode" \
+     "\n    -f      Don't daemonize" \
+     "\n    -v[v]       Verbose" \
+     "\n    -p [IP:]PORT    Bind to IP:PORT (default *:80)" \
+    IF_FEATURE_HTTPD_SETUID( \
+     "\n    -u USER[:GRP]   Set uid/gid after binding to port") \
+    IF_FEATURE_HTTPD_BASIC_AUTH( \
+     "\n    -r REALM    Authentication Realm for Basic Authentication") \
+     "\n    -h HOME     Home directory (default .)" \
+     "\n    -c FILE     Configuration file (default {/etc,HOME}/httpd.conf)" \
+    IF_FEATURE_HTTPD_AUTH_MD5( \
+     "\n    -m STRING   MD5 crypt STRING") \
+     "\n    -e STRING   HTML encode STRING" \
+     "\n    -d STRING   URL decode STRING" \
 
 #define hwclock_trivial_usage \
+    IF_FEATURE_HWCLOCK_LONG_OPTIONS( \
        "[-r|--show] [-s|--hctosys] [-w|--systohc]" \
        " [-l|--localtime] [-u|--utc]" \
-       " [-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" \
-       "    -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)"
+       " [-f FILE]" \
+    ) \
+    IF_NOT_FEATURE_HWCLOCK_LONG_OPTIONS( \
+       "[-r] [-s] [-w] [-l] [-u] [-f FILE]" \
+    )
+#define hwclock_full_usage "\n\n" \
+       "Query and set hardware clock (RTC)\n" \
+     "\nOptions:" \
+     "\n    -r  Show hardware clock time" \
+     "\n    -s  Set system time from hardware clock" \
+     "\n    -w  Set hardware clock to system time" \
+     "\n    -u  Hardware clock is in UTC" \
+     "\n    -l  Hardware clock is in local time" \
+     "\n    -f FILE Use specified device (e.g. /dev/rtc2)" \
 
 #define id_trivial_usage \
-       "[OPTIONS]... [USERNAME]"
-#define id_full_usage \
-       "Print information for USERNAME or the current user" \
-       "\n\nOptions:\n" \
-    USE_SELINUX( \
-       "    -Z  prints only the security context\n" \
-    ) \
-       "    -g  Prints only the group ID\n" \
-       "    -u  Prints only the user ID\n" \
-       "    -n  Print a name instead of a number\n" \
-       "    -r  Prints the real user ID instead of the effective ID"
+       "[OPTIONS] [USER]"
+#define id_full_usage "\n\n" \
+       "Print information about USER or the current user\n" \
+     "\nOptions:" \
+    IF_SELINUX( \
+     "\n    -Z  Security context" \
+    ) \
+     "\n    -u  User ID" \
+     "\n    -g  Group ID" \
+     "\n    -G  Supplementary group IDs" \
+     "\n    -n  Print names instead of numbers" \
+     "\n    -r  Print real ID instead of effective ID" \
+
 #define id_example_usage \
        "$ id\n" \
@@ -1401 +2839 @@
 
 #define ifconfig_trivial_usage \
-    USE_FEATURE_IFCONFIG_STATUS("[-a]") " interface [address]"
-#define ifconfig_full_usage \
-       "Configure a network interface" \
-       "\n\nOptions:\n" \
-    USE_FEATURE_IPV6( \
+    IF_FEATURE_IFCONFIG_STATUS("[-a]") " interface [address]"
+#define ifconfig_full_usage "\n\n" \
+       "Configure a network interface\n" \
+     "\nOptions:" \
+     "\n" \
+    IF_FEATURE_IPV6( \
        "    [add ADDRESS[/PREFIXLEN]]\n") \
-    USE_FEATURE_IPV6( \
+    IF_FEATURE_IPV6( \
        "    [del ADDRESS[/PREFIXLEN]]\n") \
        "    [[-]broadcast [ADDRESS]] [[-]pointopoint [ADDRESS]]\n" \
        "    [netmask ADDRESS] [dstaddr ADDRESS]\n" \
-    USE_FEATURE_IFCONFIG_SLIP( \
+    IF_FEATURE_IFCONFIG_SLIP( \
        "    [outfill NN] [keepalive NN]\n") \
-       "    " USE_FEATURE_IFCONFIG_HW("[hw ether ADDRESS] ") "[metric NN] [mtu NN]\n" \
+       "    " IF_FEATURE_IFCONFIG_HW("[hw ether" IF_FEATURE_HWIB("|infiniband")" ADDRESS] ") "[metric NN] [mtu NN]\n" \
        "    [[-]trailers] [[-]arp] [[-]allmulti]\n" \
        "    [multicast] [[-]promisc] [txqueuelen NN] [[-]dynamic]\n" \
-    USE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ( \
+    IF_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ( \
        "    [mem_start NN] [io_addr NN] [irq NN]\n") \
        "    [up|down] ..."
 
+#define ifenslave_trivial_usage \
+       "[-cdf] MASTER_IFACE SLAVE_IFACE..."
+#define ifenslave_full_usage "\n\n" \
+       "Configure network interfaces for parallel routing\n" \
+     "\nOptions:" \
+     "\n    -c,--change-active  Change active slave" \
+     "\n    -d,--detach     Remove slave interface from bonding device" \
+     "\n    -f,--force      Force, even if interface is not Ethernet" \
+/*   "\n    -r,--receive-slave  Create a receive-only slave" */
+
+#define ifenslave_example_usage \
+       "To create a bond device, simply follow these three steps:\n" \
+       "- ensure that the required drivers are properly loaded:\n" \
+       "  # modprobe bonding ; modprobe <3c59x|eepro100|pcnet32|tulip|...>\n" \
+       "- assign an IP address to the bond device:\n" \
+       "  # ifconfig bond0 <addr> netmask <mask> broadcast <bcast>\n" \
+       "- attach all the interfaces you need to the bond device:\n" \
+       "  # ifenslave bond0 eth0 eth1 eth2\n" \
+       "  If bond0 didn't have a MAC address, it will take eth0's. Then, all\n" \
+       "  interfaces attached AFTER this assignment will get the same MAC addr.\n\n" \
+       "  To detach a dead interface without setting the bond device down:\n" \
+       "  # ifenslave -d bond0 eth1\n\n" \
+       "  To set the bond device down and automatically release all the slaves:\n" \
+       "  # ifconfig bond0 down\n\n" \
+       "  To change active slave:\n" \
+       "  # ifenslave -c bond0 eth0\n" \
+
+#define ifplugd_trivial_usage \
+       "[OPTIONS]"
+#define ifplugd_full_usage "\n\n" \
+       "Network interface plug detection daemon\n" \
+     "\nOptions:" \
+     "\n    -n      Don't daemonize" \
+     "\n    -s      Don't log to syslog" \
+     "\n    -i IFACE    Interface" \
+     "\n    -f/-F       Treat link detection error as link down/link up" \
+     "\n            (otherwise exit on error)" \
+     "\n    -a      Don't up interface at each link probe" \
+     "\n    -M      Monitor creation/destruction of interface" \
+     "\n            (otherwise it must exist)" \
+     "\n    -r PROG     Script to run" \
+     "\n    -x ARG      Extra argument for script" \
+     "\n    -I      Don't exit on nonzero exit code from script" \
+     "\n    -p      Don't run script on daemon startup" \
+     "\n    -q      Don't run script on daemon quit" \
+     "\n    -l      Run script on startup even if no cable is detected" \
+     "\n    -t SECS     Poll time in seconds" \
+     "\n    -u SECS     Delay before running script after link up" \
+     "\n    -d SECS     Delay after link down" \
+     "\n    -m MODE     API mode (mii, priv, ethtool, wlan, iff, auto)" \
+     "\n    -k      Kill running daemon" \
+
 #define ifup_trivial_usage \
-       "[-ahinv] ifaces..."
-#define ifup_full_usage \
-       "Options:\n" \
-       "    -a  De/configure all interfaces automatically\n" \
-       "    -i FILE Use FILE for interface definitions\n" \
-       "    -n  Print out what would happen, but don't do it\n" \
-       "        (note that this option doesn't disable mappings)\n" \
-       "    -v  Print out what would happen before doing it\n" \
-       "    -m  Don't run any mappings\n" \
-       "    -f  Force de/configuration"
+       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
+#define ifup_full_usage "\n\n" \
+       "Options:" \
+     "\n    -a  De/configure all interfaces automatically" \
+     "\n    -i FILE Use FILE for interface definitions" \
+     "\n    -n  Print out what would happen, but don't do it" \
+    IF_FEATURE_IFUPDOWN_MAPPING( \
+     "\n        (note: doesn't disable mappings)" \
+     "\n    -m  Don't run any mappings" \
+    ) \
+     "\n    -v  Print out what would happen before doing it" \
+     "\n    -f  Force de/configuration" \
 
 #define ifdown_trivial_usage \
-       "[-ahinv] ifaces..."
-#define ifdown_full_usage \
-       "Options:\n" \
-       "    -a  De/configure all interfaces automatically\n" \
-       "    -i FILE Use FILE for interface definitions\n" \
-       "    -n  Print out what would happen, but don't do it\n" \
-       "        (note that this option doesn't disable mappings)\n" \
-       "    -v  Print out what would happen before doing it\n" \
-       "    -m  Don't run any mappings\n" \
-       "    -f  Force de/configuration"
+       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
+#define ifdown_full_usage "\n\n" \
+       "Options:" \
+     "\n    -a  De/configure all interfaces automatically" \
+     "\n    -i FILE Use FILE for interface definitions" \
+     "\n    -n  Print out what would happen, but don't do it" \
+    IF_FEATURE_IFUPDOWN_MAPPING( \
+     "\n        (note: doesn't disable mappings)" \
+     "\n    -m  Don't run any mappings" \
+    ) \
+     "\n    -v  Print out what would happen before doing it" \
+     "\n    -f  Force de/configuration" \
 
 #define inetd_trivial_usage \
-       "[-f] [-q len] [conf]"
-#define inetd_full_usage \
-       "Listen for network connections and launch programs" \
-       "\n\nOptions:\n" \
-       "    -f  Run in foreground\n" \
-       "    -q N    Set the size of the socket listen queue to N\n" \
-       "        (default: 128)"
-
-#define init_trivial_usage \
-       ""
-#define init_full_usage \
-       "Init is the parent of all processes"
-#define init_notes_usage \
-"This version of init is designed to be run only by the kernel.\n" \
-"\n" \
-"BusyBox init doesn't support multiple runlevels. The runlevels field of\n" \
-"the /etc/inittab file is completely ignored by BusyBox init. If you want\n" \
-"runlevels, use sysvinit.\n" \
-"\n" \
-"BusyBox init works just fine without an inittab. If no inittab is found,\n" \
-"it has the following default behavior:\n" \
-"\n" \
-"   ::sysinit:/etc/init.d/rcS\n" \
-"   ::askfirst:/bin/sh\n" \
-"   ::ctrlaltdel:/sbin/reboot\n" \
-"   ::shutdown:/sbin/swapoff -a\n" \
-"   ::shutdown:/bin/umount -a -r\n" \
-"   ::restart:/sbin/init\n" \
-"\n" \
-"if it detects that /dev/console is _not_ a serial console, it will also run:\n" \
-"\n" \
-"   tty2::askfirst:/bin/sh\n" \
-"   tty3::askfirst:/bin/sh\n" \
-"   tty4::askfirst:/bin/sh\n" \
-"\n" \
-"If you choose to use an /etc/inittab file, the inittab entry format is as follows:\n" \
-"\n" \
-"   <id>:<runlevels>:<action>:<process>\n" \
-"\n" \
-"   <id>:\n" \
-"\n" \
-"       WARNING: This field has a non-traditional meaning for BusyBox init!\n" \
-"       The id field is used by BusyBox init to specify the controlling tty for\n" \
-"       the specified process to run on. The contents of this field are\n" \
-"       appended to \"/dev/\" and used as-is. There is no need for this field to\n" \
-"       be unique, although if it isn't you may have strange results. If this\n" \
-"       field is left blank, the controlling tty is set to the console. Also\n" \
-"       note that if BusyBox detects that a serial console is in use, then only\n" \
-"       entries whose controlling tty is either the serial console or /dev/null\n" \
-"       will be run. BusyBox init does nothing with utmp. We don't need no\n" \
-"       stinkin' utmp.\n" \
-"\n" \
-"   <runlevels>:\n" \
-"\n" \
-"       The runlevels field is completely ignored.\n" \
-"\n" \
-"   <action>:\n" \
-"\n" \
-"       Valid actions include: sysinit, respawn, askfirst, wait,\n" \
-"       once, restart, ctrlaltdel, and shutdown.\n" \
-"\n" \
-"       The available actions can be classified into two groups: actions\n" \
-"       that are run only once, and actions that are re-run when the specified\n" \
-"       process exits.\n" \
-"\n" \
-"       Run only-once actions:\n" \
-"\n" \
-"           'sysinit' is the first item run on boot. init waits until all\n" \
-"           sysinit actions are completed before continuing. Following the\n" \
-"           completion of all sysinit actions, all 'wait' actions are run.\n" \
-"           'wait' actions, like 'sysinit' actions, cause init to wait until\n" \
-"           the specified task completes. 'once' actions are asynchronous,\n" \
-"           therefore, init does not wait for them to complete. 'restart' is\n" \
-"           the action taken to restart the init process. By default this should\n" \
-"           simply run /sbin/init, but can be a script which runs pivot_root or it\n" \
-"           can do all sorts of other interesting things. The 'ctrlaltdel' init\n" \
-"           actions are run when the system detects that someone on the system\n" \
-"           console has pressed the CTRL-ALT-DEL key combination. Typically one\n" \
-"           wants to run 'reboot' at this point to cause the system to reboot.\n" \
-"           Finally the 'shutdown' action specifies the actions to taken when\n" \
-"           init is told to reboot. Unmounting filesystems and disabling swap\n" \
-"           is a very good here.\n" \
-"\n" \
-"       Run repeatedly actions:\n" \
-"\n" \
-"           'respawn' actions are run after the 'once' actions. When a process\n" \
-"           started with a 'respawn' action exits, init automatically restarts\n" \
-"           it. Unlike sysvinit, BusyBox init does not stop processes from\n" \
-"           respawning out of control. The 'askfirst' actions acts just like\n" \
-"           respawn, except that before running the specified process it\n" \
-"           displays the line \"Please press Enter to activate this console.\"\n" \
-"           and then waits for the user to press enter before starting the\n" \
-"           specified process.\n" \
-"\n" \
-"       Unrecognized actions (like initdefault) will cause init to emit an\n" \
-"       error message, and then go along with its business. All actions are\n" \
-"       run in the order they appear in /etc/inittab.\n" \
-"\n" \
-"   <process>:\n" \
-"\n" \
-"       Specifies the process to be executed and its command line.\n" \
-"\n" \
-"Example /etc/inittab file:\n" \
-"\n" \
-"   # This is run first except when booting in single-user mode\n" \
-"   #\n" \
-"   ::sysinit:/etc/init.d/rcS\n" \
-"   \n" \
-"   # /bin/sh invocations on selected ttys\n" \
-"   #\n" \
-"   # Start an \"askfirst\" shell on the console (whatever that may be)\n" \
-"   ::askfirst:-/bin/sh\n" \
-"   # Start an \"askfirst\" shell on /dev/tty2-4\n" \
-"   tty2::askfirst:-/bin/sh\n" \
-"   tty3::askfirst:-/bin/sh\n" \
-"   tty4::askfirst:-/bin/sh\n" \
-"   \n" \
-"   # /sbin/getty invocations for selected ttys\n" \
-"   #\n" \
-"   tty4::respawn:/sbin/getty 38400 tty4\n" \
-"   tty5::respawn:/sbin/getty 38400 tty5\n" \
-"   \n" \
-"   \n" \
-"   # Example of how to put a getty on a serial line (for a terminal)\n" \
-"   #\n" \
-"   #::respawn:/sbin/getty -L ttyS0 9600 vt100\n" \
-"   #::respawn:/sbin/getty -L ttyS1 9600 vt100\n" \
-"   #\n" \
-"   # Example how to put a getty on a modem line\n" \
-"   #::respawn:/sbin/getty 57600 ttyS2\n" \
-"   \n" \
-"   # Stuff to do when restarting the init process\n" \
-"   ::restart:/sbin/init\n" \
-"   \n" \
-"   # Stuff to do before rebooting\n" \
-"   ::ctrlaltdel:/sbin/reboot\n" \
-"   ::shutdown:/bin/umount -a -r\n" \
-"   ::shutdown:/sbin/swapoff -a\n"
-
-#define insmod_trivial_usage \
-       "[OPTION]... MODULE [symbol=value]..."
-#define insmod_full_usage \
-       "Load the specified kernel modules into the kernel" \
-       "\n\nOptions:\n" \
-       "    -f  Force module to load into the wrong kernel version\n" \
-       "    -k  Make module autoclean-able\n" \
-       "    -v  Verbose\n" \
-       "    -q  Quiet\n" \
-       "    -L  Lock to prevent simultaneous loads of a module\n" \
-    USE_FEATURE_INSMOD_LOAD_MAP( \
-       "    -m  Output load map to stdout\n") \
-       "    -o NAME Set internal module name to NAME\n" \
-       "    -x  Do not export externs"
-
+       "[-fe] [-q N] [-R N] [CONFFILE]"
+#define inetd_full_usage "\n\n" \
+       "Listen for network connections and launch programs\n" \
+     "\nOptions:" \
+     "\n    -f  Run in foreground" \
+     "\n    -e  Log to stderr" \
+     "\n    -q N    Socket listen queue (default: 128)" \
+     "\n    -R N    Pause services after N connects/min" \
+     "\n        (default: 0 - disabled)" \
+
+#define inotifyd_trivial_usage \
+    "PROG FILE1[:MASK]..."
+#define inotifyd_full_usage "\n\n" \
+       "Run PROG on filesystem changes." \
+     "\nWhen a filesystem event matching MASK occurs on FILEn," \
+     "\nPROG ACTUAL_EVENTS FILEn [SUBFILE] is run." \
+     "\nEvents:" \
+     "\n    a   File is accessed" \
+     "\n    c   File is modified" \
+     "\n    e   Metadata changed" \
+     "\n    w   Writable file is closed" \
+     "\n    0   Unwritable file is closed" \
+     "\n    r   File is opened" \
+     "\n    D   File is deleted" \
+     "\n    M   File is moved" \
+     "\n    u   Backing fs is unmounted" \
+     "\n    o   Event queue overflowed" \
+     "\n    x   File can't be watched anymore" \
+     "\nIf watching a directory:" \
+     "\n    m   Subfile is moved into dir" \
+     "\n    y   Subfile is moved out of dir" \
+     "\n    n   Subfile is created" \
+     "\n    d   Subfile is deleted" \
+     "\n" \
+     "\ninotifyd waits for PROG to exit." \
+     "\nWhen x event happens for all FILEs, inotifyd exits." \
+
+/* -v, -b, -c are ignored */
 #define install_trivial_usage \
-       "[-cgmops] [sources] dest|directory"
-#define install_full_usage \
-       "Copy files and set attributes" \
-       "\n\nOptions:\n" \
-       "    -c  Copy the file, default\n" \
-       "    -d  Create directories\n" \
-       "    -g  Set group ownership\n" \
-       "    -m  Set permission modes\n" \
-       "    -o  Set ownership\n" \
-       "    -p  Preserve date\n" \
-       "    -s  Strip symbol tables" \
-    USE_SELINUX( \
-       "\n  -Z  Set security context of copy" \
+    "[-cdDsp] [-o USER] [-g GRP] [-m MODE] [SOURCE]... DEST"
+#define install_full_usage "\n\n" \
+       "Copy files and set attributes\n" \
+     "\nOptions:" \
+     "\n    -c  Just copy (default)" \
+     "\n    -d  Create directories" \
+     "\n    -D  Create leading target directories" \
+     "\n    -s  Strip symbol table" \
+     "\n    -p  Preserve date" \
+     "\n    -o USER Set ownership" \
+     "\n    -g GRP  Set group ownership" \
+     "\n    -m MODE Set permissions" \
+    IF_SELINUX( \
+     "\n    -Z  Set security context" \
     )
-/* would need to make the " | " optional depending on more than one selected */
+
+/* would need to make the " | " optional depending on more than one selected: */
 #define ip_trivial_usage \
        "[OPTIONS] {" \
-    USE_FEATURE_IP_ADDRESS("address | ") \
-    USE_FEATURE_IP_ROUTE("route | ") \
-    USE_FEATURE_IP_LINK("link | ") \
-    USE_FEATURE_IP_TUNNEL("tunnel | ") \
-    USE_FEATURE_IP_RULE("rule") \
+    IF_FEATURE_IP_ADDRESS("address | ") \
+    IF_FEATURE_IP_ROUTE("route | ") \
+    IF_FEATURE_IP_LINK("link | ") \
+    IF_FEATURE_IP_TUNNEL("tunnel | ") \
+    IF_FEATURE_IP_RULE("rule") \
        "} {COMMAND}"
-#define ip_full_usage \
+#define ip_full_usage "\n\n" \
        "ip [OPTIONS] OBJECT {COMMAND}\n" \
        "where OBJECT := {" \
-    USE_FEATURE_IP_ADDRESS("address | ") \
-    USE_FEATURE_IP_ROUTE("route | ") \
-    USE_FEATURE_IP_LINK("link | ") \
-    USE_FEATURE_IP_TUNNEL("tunnel | ") \
-    USE_FEATURE_IP_RULE("rule") \
+    IF_FEATURE_IP_ADDRESS("address | ") \
+    IF_FEATURE_IP_ROUTE("route | ") \
+    IF_FEATURE_IP_LINK("link | ") \
+    IF_FEATURE_IP_TUNNEL("tunnel | ") \
+    IF_FEATURE_IP_RULE("rule") \
        "}\n" \
-       "OPTIONS := { -f[amily] { inet | inet6 | link } | -o[neline] }"
+       "OPTIONS := { -f[amily] { inet | inet6 | link } | -o[neline] }" \
 
 #define ipaddr_trivial_usage \
        "{ {add|del} IFADDR dev STRING | {show|flush}\n" \
        "        [dev STRING] [to PREFIX] }"
-#define ipaddr_full_usage \
+#define ipaddr_full_usage "\n\n" \
        "ipaddr {add|delete} IFADDR dev STRING\n" \
        "ipaddr {show|flush} [dev STRING] [scope SCOPE-ID]\n" \
@@ -1644 +3025 @@
        "    [broadcast ADDR] [anycast ADDR]\n" \
        "    [label STRING] [scope SCOPE-ID]\n" \
-       "    SCOPE-ID := [host | link | global | NUMBER]"
+       "    SCOPE-ID := [host | link | global | NUMBER]" \
 
 #define ipcalc_trivial_usage \
-       "[OPTION]... ADDRESS[[/]NETMASK] [NETMASK]"
-#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_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")
+       "[OPTIONS] ADDRESS[[/]NETMASK] [NETMASK]"
+#define ipcalc_full_usage "\n\n" \
+       "Calculate IP network settings from a IP address\n" \
+     "\nOptions:" \
+    IF_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" \
+    IF_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" \
+    ) \
+    ) \
+    IF_NOT_FEATURE_IPCALC_LONG_OPTIONS( \
+     "\n    -b  Display calculated broadcast address" \
+     "\n    -n  Display calculated network address" \
+     "\n    -m  Display default netmask for IP" \
+    IF_FEATURE_IPCALC_FANCY( \
+     "\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]"
-#define ipcrm_full_usage \
-       "The upper-case options MQS are used to remove a shared memory segment by a\n" \
-       "segment by a shmkey value. The lower-case options mqs are used\n" \
-       "to remove a segment by shmid value.\n" \
-       "\n\nOptions:\n" \
-       "    -[mM]   Remove the memory segment after the last detach\n" \
-       "    -[qQ]   Remove the message queue\n" \
-       "    -[sS]   Remove the semaphore"
+       "[-MQS key] [-mqs id]"
+#define ipcrm_full_usage "\n\n" \
+       "Upper-case options MQS remove an object by shmkey value.\n" \
+       "Lower-case options remove an object by shmid value.\n" \
+     "\nOptions:" \
+     "\n    -mM Remove memory segment after last detach" \
+     "\n    -qQ Remove message queue" \
+     "\n    -sS Remove semaphore" \
 
 #define ipcs_trivial_usage \
        "[[-smq] -i shmid] | [[-asmq] [-tcplu]]"
-#define ipcs_full_usage \
-       "    -i  Specify a specific resource id\n" \
-       "Resource specification:\n" \
-       "    -m  Shared memory segments\n" \
-       "    -q  Message queues\n" \
-       "    -s  Semaphore arrays\n" \
-       "    -a  All (default)\n" \
-       "Output format:\n" \
-       "    -t  Time\n" \
-       "    -c  Creator\n" \
-       "    -p  Pid\n" \
-       "    -l  Limits\n" \
-       "    -u  Summary"
+#define ipcs_full_usage "\n\n" \
+       "    -i  Show specific resource" \
+     "\nResource specification:" \
+     "\n    -m  Shared memory segments" \
+     "\n    -q  Message queues" \
+     "\n    -s  Semaphore arrays" \
+     "\n    -a  All (default)" \
+     "\nOutput format:" \
+     "\n    -t  Time" \
+     "\n    -c  Creator" \
+     "\n    -p  Pid" \
+     "\n    -l  Limits" \
+     "\n    -u  Summary" \
 
 #define iplink_trivial_usage \
        "{ set DEVICE { up | down | arp { on | off } | show [DEVICE] }"
-#define iplink_full_usage \
+#define iplink_full_usage "\n\n" \
        "iplink set DEVICE { up | down | arp | multicast { on | off } |\n" \
        "            dynamic { on | off } |\n" \
        "            mtu MTU }\n" \
-       "iplink show [DEVICE]"
+       "iplink show [DEVICE]" \
 
 #define iproute_trivial_usage \
        "{ list | flush | { add | del | change | append |\n" \
        "        replace | monitor } ROUTE }"
-#define iproute_full_usage \
+#define iproute_full_usage "\n\n" \
        "iproute { list | flush } SELECTOR\n" \
        "iproute get ADDRESS [from ADDRESS iif STRING]\n" \
@@ -1703 +3096 @@
        "iproute { add | del | change | append | replace | monitor } ROUTE\n" \
        "            SELECTOR := [root PREFIX] [match PREFIX] [proto RTPROTO]\n" \
-       "            ROUTE := [TYPE] PREFIX [tos TOS] [proto RTPROTO]"
+       "            ROUTE := [TYPE] PREFIX [tos TOS] [proto RTPROTO]\n" \
+       "                [metric METRIC]" \
 
 #define iprule_trivial_usage \
        "{[list | add | del] RULE}"
-#define iprule_full_usage \
+#define iprule_full_usage "\n\n" \
        "iprule [list | add | del] SELECTOR ACTION\n" \
        "    SELECTOR := [from PREFIX] [to PREFIX] [tos TOS] [fwmark FWMARK]\n" \
@@ -1714 +3108 @@
        "            [prohibit | reject | unreachable]\n" \
        "            [realms [SRCREALM/]DSTREALM]\n" \
-       "    TABLE_ID := [local | main | default | NUMBER]"
+       "    TABLE_ID := [local | main | default | NUMBER]" \
 
 #define iptunnel_trivial_usage \
@@ -1720 +3114 @@
        "    [mode { ipip | gre | sit }]\n" \
        "    [remote ADDR] [local ADDR] [ttl TTL]"
-#define iptunnel_full_usage \
+#define iptunnel_full_usage "\n\n" \
        "iptunnel { add | change | del | show } [NAME]\n" \
        "    [mode { ipip | gre | sit }] [remote ADDR] [local ADDR]\n" \
        "    [[i|o]seq] [[i|o]key KEY] [[i|o]csum]\n" \
-       "    [ttl TTL] [tos TOS] [[no]pmtudisc] [dev PHYS_DEV]"
+       "    [ttl TTL] [tos TOS] [[no]pmtudisc] [dev PHYS_DEV]" \
+
+#define kbd_mode_trivial_usage \
+       "[-a|k|s|u] [-C TTY]"
+#define kbd_mode_full_usage "\n\n" \
+       "Report or set the keyboard mode\n" \
+     "\nOptions:" \
+     "\n    -a  Default (ASCII)" \
+     "\n    -k  Medium-raw (keyboard)" \
+     "\n    -s  Raw (scancode)" \
+     "\n    -u  Unicode (utf-8)" \
+     "\n    -C TTY  Affect TTY instead of /dev/tty" \
 
 #define kill_trivial_usage \
-       "[-l] [-signal] process-id [process-id ...]"
-#define kill_full_usage \
-       "Send a signal (default is TERM) to the specified process(es)" \
-       "\n\nOptions:\n" \
-       "    -l  List all signal names and numbers"
+       "[-l] [-SIG] PID..."
+#define kill_full_usage "\n\n" \
+       "Send a signal (default: TERM) to given PIDs\n" \
+     "\nOptions:" \
+     "\n    -l  List all signal names and numbers" \
+/*   "\n    -s SIG  Yet another way of specifying SIG" */ \
+
 #define kill_example_usage \
        "$ ps | grep apache\n" \
@@ -1743 +3150 @@
 
 #define killall_trivial_usage \
-       "[-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" \
-       "    -l  List all signal names and numbers\n" \
-       "    -q  Do not complain if no processes were killed"
+       "[-l] [-q] [-SIG] PROCESS_NAME..."
+#define killall_full_usage "\n\n" \
+       "Send a signal (default: TERM) to given processes\n" \
+     "\nOptions:" \
+     "\n    -l  List all signal names and numbers" \
+/*   "\n    -s SIG  Yet another way of specifying SIG" */ \
+     "\n    -q  Don't complain if no processes were killed" \
+
 #define killall_example_usage \
        "$ killall apache\n"
 
 #define killall5_trivial_usage \
-       "[-l] [-signal]"
-#define killall5_full_usage \
-       "Send a signal (default is TERM) to all processes outside current session" \
-       "\n\nOptions:\n" \
-       "    -l  List all signal names and numbers\n" \
+       "[-l] [-SIG] [-o PID]..."
+#define killall5_full_usage "\n\n" \
+       "Send a signal (default: TERM) to all processes outside current session\n" \
+     "\nOptions:" \
+     "\n    -l  List all signal names and numbers" \
+     "\n    -o PID  Don't signal this PID" \
+/*   "\n    -s SIG  Yet another way of specifying SIG" */ \
 
 #define klogd_trivial_usage \
-       "[-c n] [-n]"
-#define klogd_full_usage \
-       "Kernel logger" \
-       "\n\nOptions:\n" \
-       "    -c n    Sets the default log level of console messages to n\n" \
-       "    -n  Run as foreground process"
+       "[-c N] [-n]"
+#define klogd_full_usage "\n\n" \
+       "Kernel logger\n" \
+     "\nOptions:" \
+     "\n    -c N    Only messages with level < N are printed to console" \
+     "\n    -n  Run in foreground" \
 
 #define length_trivial_usage \
        "STRING"
-#define length_full_usage \
-       "Print out the length of the specified STRING"
+#define length_full_usage "\n\n" \
+       "Print STRING's length"
+
 #define length_example_usage \
        "$ length Hello\n" \
@@ -1776 +3188 @@
 
 #define less_trivial_usage \
-       "[-EMNmh~?] FILE1 FILE2..."
-#define less_full_usage \
-       "View a file or list of files. The position within files can be\n" \
-       "changed, and files can be manipulated in various ways." \
-       "\n\nOptions:\n" \
-       "    -E  Quit once the end of a file is reached\n" \
-       "    -M  Display a status line containing the current line numbers\n" \
-       "        and the percentage through the file\n" \
-       "    -N  Prefix line numbers to each line\n" \
-       "    -m  Display a status line containing the percentage through the\n" \
-       "        file\n" \
-       "    -~  Suppress ~s displayed when input past the end of the file is\n" \
-       "        reached"
+       "[-EMNmh~I?] [FILE]..."
+#define less_full_usage "\n\n" \
+       "View FILE (or stdin) one screenful at a time\n" \
+     "\nOptions:" \
+     "\n    -E  Quit once the end of a file is reached" \
+     "\n    -M,-m   Display status line with line numbers" \
+     "\n        and percentage through the file" \
+     "\n    -N  Prefix line number to each line" \
+     "\n    -I  Ignore case in all searches" \
+     "\n    -~  Suppress ~s displayed past the end of the file" \
+
+#define linux32_trivial_usage NOUSAGE_STR
+#define linux32_full_usage ""
+#define linux64_trivial_usage NOUSAGE_STR
+#define linux64_full_usage ""
 
 #define setarch_trivial_usage \
-       "personality program [args ...]"
-#define setarch_full_usage \
+       "personality PROG ARGS"
+#define setarch_full_usage "\n\n" \
        "Personality may be:\n" \
        "    linux32     Set 32bit uname emulation\n" \
-       "    linux64     Set 64bit uname emulation"
+       "    linux64     Set 64bit uname emulation" \
 
 #define ln_trivial_usage \
-       "[OPTION] TARGET... LINK_NAME|DIRECTORY"
-#define ln_full_usage \
-       "Create a link named LINK_NAME or DIRECTORY to the specified TARGET.\n" \
-       "You may use '--' to indicate that all following arguments are non-options." \
-       "\n\nOptions:\n" \
-       "    -s  Make symlinks instead of hardlinks\n" \
-       "    -f  Remove existing destination files\n" \
-       "    -n  No dereference symlinks - treat like normal file\n" \
-       "    -b  Make a backup of the target (if exists) before link operation\n" \
-       "    -S suf  Use suffix instead of ~ when making backup files"
+       "[OPTIONS] TARGET... LINK|DIR"
+#define ln_full_usage "\n\n" \
+       "Create a link LINK or DIR/TARGET to the specified TARGET(s)\n" \
+     "\nOptions:" \
+     "\n    -s  Make symlinks instead of hardlinks" \
+     "\n    -f  Remove existing destinations" \
+     "\n    -n  Don't dereference symlinks - treat like normal file" \
+     "\n    -b  Make a backup of the target (if exists) before link operation" \
+     "\n    -S suf  Use suffix instead of ~ when making backup files" \
+
 #define ln_example_usage \
        "$ ln -s BusyBox /tmp/ls\n" \
@@ -1813 +3227 @@
        "lrwxrwxrwx    1 root     root            7 Apr 12 18:39 ls -> BusyBox*\n"
 
-#define load_policy_trivial_usage \
-       "[FILE]"
-#define load_policy_full_usage
+#define load_policy_trivial_usage NOUSAGE_STR
+#define load_policy_full_usage ""
 
 #define loadfont_trivial_usage \
        "< font"
-#define loadfont_full_usage \
-       "Load a console font from standard input"
+#define loadfont_full_usage "\n\n" \
+       "Load a console font from stdin" \
+/*   "\n    -C TTY  Affect TTY instead of /dev/tty" */ \
+
 #define loadfont_example_usage \
        "$ loadfont < /etc/i18n/fontname\n"
@@ -1826 +3241 @@
 #define loadkmap_trivial_usage \
        "< keymap"
-#define loadkmap_full_usage \
-       "Load a binary keyboard translation table from standard input"
+#define loadkmap_full_usage "\n\n" \
+       "Load a binary keyboard translation table from stdin\n" \
+/*   "\n    -C TTY  Affect TTY instead of /dev/tty" */ \
+
 #define loadkmap_example_usage \
        "$ loadkmap < /etc/i18n/lang-keymap\n"
 
 #define logger_trivial_usage \
-       "[OPTION]... [MESSAGE]"
-#define logger_full_usage \
-       "Write MESSAGE to the system log. If MESSAGE is omitted, log stdin." \
-       "\n\nOptions:\n" \
-       "    -s  Log to stderr as well as the system log\n" \
-       "    -t TAG  Log using the specified tag (defaults to user name)\n" \
-       "    -p PRIO Enter the message with the specified priority.\n" \
-       "        This may be numerical or a 'facility.level' pair."
+       "[OPTIONS] [MESSAGE]"
+#define logger_full_usage "\n\n" \
+       "Write MESSAGE (or stdin) to syslog\n" \
+     "\nOptions:" \
+     "\n    -s  Log to stderr as well as the system log" \
+     "\n    -t TAG  Log using the specified tag (defaults to user name)" \
+     "\n    -p PRIO Priority (numeric or facility.level pair)" \
+
 #define logger_example_usage \
        "$ logger \"hello\"\n"
 
 #define login_trivial_usage \
-       "[OPTION]... [username] [ENV=VAR ...]"
-#define login_full_usage \
-       "Begin a new session on the system" \
-       "\n\nOptions:\n" \
-       "    -f  Do not authenticate (user already authenticated)\n" \
-       "    -h  Name of the remote host for this login\n" \
-       "    -p  Preserve environment"
+       "[-p] [-h HOST] [[-f] USER]"
+#define login_full_usage "\n\n" \
+       "Begin a new session on the system\n" \
+     "\nOptions:" \
+     "\n    -f  Don't authenticate (user already authenticated)" \
+     "\n    -h  Name of the remote host" \
+     "\n    -p  Preserve environment" \
 
 #define logname_trivial_usage \
        ""
-#define logname_full_usage \
+#define logname_full_usage "\n\n" \
        "Print the name of the current user"
 #define logname_example_usage \
@@ -1861 +3278 @@
 
 #define logread_trivial_usage \
-       "[OPTION]..."
-#define logread_full_usage \
-       "Show the messages from syslogd (using circular buffer)" \
-       "\n\nOptions:\n" \
-       "    -f  Output data as the log grows"
+       "[-f]"
+#define logread_full_usage "\n\n" \
+       "Show messages in syslogd's circular buffer\n" \
+     "\nOptions:" \
+     "\n    -f  Output data as log grows" \
 
 #define losetup_trivial_usage \
-       "[-o OFFSET] [-d] LOOPDEVICE [FILE]]"
-#define losetup_full_usage \
-       "(Dis)associate LOOPDEVICE with FILE, or display current associations" \
-       "\n\nOptions:\n" \
-       "    -d      Disassociate LOOPDEVICE\n" \
-       "    -o OFFSET   Start OFFSET bytes into FILE"
+       "[-o OFS] LOOPDEV FILE - associate loop devices\n" \
+       "    losetup -d LOOPDEV - disassociate\n" \
+       "    losetup [-f] - show"
+#define losetup_full_usage "\n\n" \
+       "Options:" \
+     "\n    -o OFS  Start OFS bytes into FILE" \
+     "\n    -f  Show first free loop device" \
+
 #define losetup_notes_usage \
        "No arguments will display all current associations.\n" \
@@ -1880 +3299 @@
        "and filename of the file the loop device is currently bound to.\n\n" \
        "Two arguments (losetup /dev/loop1 file.img) create a new association,\n" \
-       "with an optional offset (-o 12345). Encryption is not yet supported.\n\n"
+       "with an optional offset (-o 12345). Encryption is not yet supported.\n" \
+       "losetup -f will show the first loop free loop device\n\n"
+
+#define lpd_trivial_usage \
+       "SPOOLDIR [HELPER [ARGS]]"
+#define lpd_full_usage "\n\n" \
+       "SPOOLDIR must contain (symlinks to) device nodes or directories" \
+     "\nwith names matching print queue names. In the first case, jobs are" \
+     "\nsent directly to the device. Otherwise each job is stored in queue" \
+     "\ndirectory and HELPER program is called. Name of file to print" \
+     "\nis passed in $DATAFILE variable." \
+     "\nExample:" \
+     "\n    tcpsvd -E 0 515 softlimit -m 999999 lpd /var/spool ./print" \
+
+#define lpq_trivial_usage \
+       "[-P queue[@host[:port]]] [-U USERNAME] [-d JOBID]... [-fs]"
+#define lpq_full_usage "\n\n" \
+       "Options:" \
+     "\n    -P  lp service to connect to (else uses $PRINTER)" \
+     "\n    -d  Delete jobs" \
+     "\n    -f  Force any waiting job to be printed" \
+     "\n    -s  Short display" \
+
+#define lpr_trivial_usage \
+       "-P queue[@host[:port]] -U USERNAME -J TITLE -Vmh [FILE]..."
+/* -C CLASS exists too, not shown.
+ * CLASS is supposed to be printed on banner page, if one is requested */
+#define lpr_full_usage "\n\n" \
+       "Options:" \
+     "\n    -P  lp service to connect to (else uses $PRINTER)"\
+     "\n    -m  Send mail on completion" \
+     "\n    -h  Print banner page too" \
+     "\n    -V  Verbose" \
 
 #define ls_trivial_usage \
-       "[-1Aa" USE_FEATURE_LS_TIMESTAMPS("c") "Cd" \
-    USE_FEATURE_LS_TIMESTAMPS("e") USE_FEATURE_LS_FILETYPES("F") "iln" \
-    USE_FEATURE_LS_FILETYPES("p") USE_FEATURE_LS_FOLLOWLINKS("L") \
-    USE_FEATURE_LS_RECURSIVE("R") USE_FEATURE_LS_SORTFILES("rS") "s" \
-    USE_FEATURE_AUTOWIDTH("T") USE_FEATURE_LS_TIMESTAMPS("tu") \
-    USE_FEATURE_LS_SORTFILES("v") USE_FEATURE_AUTOWIDTH("w") "x" \
-    USE_FEATURE_LS_SORTFILES("X") USE_FEATURE_HUMAN_READABLE("h") "k" \
-    USE_SELINUX("K") "] [filenames...]"
-#define ls_full_usage \
-       "List directory contents" \
-       "\n\nOptions:" \
-       "\n  -1  List files in a single column" \
-       "\n  -A  Do not list implied . and .." \
-       "\n  -a  Do not hide entries starting with ." \
-       "\n  -C  List entries by columns" \
-    USE_FEATURE_LS_TIMESTAMPS( \
-       "\n  -c  With -l: show ctime") \
-    USE_FEATURE_LS_COLOR( \
-       "\n  --color[={always,never,auto}]   Control coloring") \
-       "\n  -d  List directory entries instead of contents" \
-    USE_FEATURE_LS_TIMESTAMPS( \
-       "\n  -e  List both full date and full time") \
-    USE_FEATURE_LS_FILETYPES( \
-       "\n  -F  Append indicator (one of */=@|) to entries") \
-       "\n  -i  List the i-node for each file" \
-       "\n  -l  Use a long listing format" \
-       "\n  -n  List numeric UIDs and GIDs instead of names" \
-    USE_FEATURE_LS_FILETYPES( \
-       "\n  -p  Append indicator (one of /=@|) to entries") \
-    USE_FEATURE_LS_FOLLOWLINKS( \
-       "\n  -L  List entries pointed to by symlinks") \
-    USE_FEATURE_LS_RECURSIVE( \
-       "\n  -R  List subdirectories recursively") \
-    USE_FEATURE_LS_SORTFILES( \
-       "\n  -r  Sort the listing in reverse order") \
-    USE_FEATURE_LS_SORTFILES( \
-       "\n  -S  Sort the listing by file size") \
-       "\n  -s  List the size of each file, in blocks" \
-    USE_FEATURE_AUTOWIDTH( \
-       "\n  -T NUM  Assume Tabstop every NUM columns") \
-    USE_FEATURE_LS_TIMESTAMPS( \
-       "\n  -t  With -l: show modification time") \
-    USE_FEATURE_LS_TIMESTAMPS( \
-       "\n  -u  With -l: show access time") \
-    USE_FEATURE_LS_SORTFILES( \
-       "\n  -v  Sort the listing by version") \
-    USE_FEATURE_AUTOWIDTH( \
-       "\n  -w NUM  Assume the terminal is NUM columns wide") \
-       "\n  -x  List entries by lines instead of by columns" \
-    USE_FEATURE_LS_SORTFILES( \
-       "\n  -X  Sort the listing by extension") \
-    USE_FEATURE_HUMAN_READABLE( \
-       "\n  -h  Print sizes in human readable format (e.g., 1K 243M 2G)") \
-    USE_SELINUX( \
-       "\n  -k  Print security context") \
-    USE_SELINUX( \
-       "\n  -K  Print security context in long format") \
-    USE_SELINUX( \
-       "\n  -Z  Print security context and permission")
+       "[-1Aa" IF_FEATURE_LS_TIMESTAMPS("c") "Cd" \
+    IF_FEATURE_LS_TIMESTAMPS("e") IF_FEATURE_LS_FILETYPES("F") "iln" \
+    IF_FEATURE_LS_FILETYPES("p") IF_FEATURE_LS_FOLLOWLINKS("L") \
+    IF_FEATURE_LS_RECURSIVE("R") IF_FEATURE_LS_SORTFILES("rS") "s" \
+    IF_FEATURE_AUTOWIDTH("T") IF_FEATURE_LS_TIMESTAMPS("tu") \
+    IF_FEATURE_LS_SORTFILES("v") IF_FEATURE_AUTOWIDTH("w") "x" \
+    IF_FEATURE_LS_SORTFILES("X") IF_FEATURE_HUMAN_READABLE("h") "k" \
+    IF_SELINUX("K") "] [FILE]..."
+#define ls_full_usage "\n\n" \
+       "List directory contents\n" \
+     "\nOptions:" \
+     "\n    -1  List in a single column" \
+     "\n    -A  Don't list . and .." \
+     "\n    -a  Don't hide entries starting with ." \
+     "\n    -C  List by columns" \
+    IF_FEATURE_LS_TIMESTAMPS( \
+     "\n    -c  With -l: sort by ctime") \
+    IF_FEATURE_LS_COLOR( \
+     "\n    --color[={always,never,auto}]   Control coloring") \
+     "\n    -d  List directory entries instead of contents" \
+    IF_FEATURE_LS_TIMESTAMPS( \
+     "\n    -e  List full date and time") \
+    IF_FEATURE_LS_FILETYPES( \
+     "\n    -F  Append indicator (one of */=@|) to entries") \
+     "\n    -i  List inode numbers" \
+     "\n    -l  Long listing format" \
+     "\n    -n  List numeric UIDs and GIDs instead of names" \
+    IF_FEATURE_LS_FILETYPES( \
+     "\n    -p  Append indicator (one of /=@|) to entries") \
+    IF_FEATURE_LS_FOLLOWLINKS( \
+     "\n    -L  List entries pointed to by symlinks") \
+    IF_FEATURE_LS_RECURSIVE( \
+     "\n    -R  Recurse") \
+    IF_FEATURE_LS_SORTFILES( \
+     "\n    -r  Sort in reverse order") \
+    IF_FEATURE_LS_SORTFILES( \
+     "\n    -S  Sort by file size") \
+     "\n    -s  List the size of each file, in blocks" \
+    IF_FEATURE_AUTOWIDTH( \
+     "\n    -T N    Assume tabstop every N columns") \
+    IF_FEATURE_LS_TIMESTAMPS( \
+     "\n    -t  With -l: sort by modification time") \
+    IF_FEATURE_LS_TIMESTAMPS( \
+     "\n    -u  With -l: sort by access time") \
+    IF_FEATURE_LS_SORTFILES( \
+     "\n    -v  Sort by version") \
+    IF_FEATURE_AUTOWIDTH( \
+     "\n    -w N    Assume the terminal is N columns wide") \
+     "\n    -x  List by lines" \
+    IF_FEATURE_LS_SORTFILES( \
+     "\n    -X  Sort by extension") \
+    IF_FEATURE_HUMAN_READABLE( \
+     "\n    -h  List sizes in human readable format (1K 243M 2G)") \
+    IF_SELINUX( \
+     "\n    -k  List security context") \
+    IF_SELINUX( \
+     "\n    -K  List security context in long format") \
+    IF_SELINUX( \
+     "\n    -Z  List security context and permission") \
 
 #define lsattr_trivial_usage \
-       "[-Radlv] [files...]"
-#define lsattr_full_usage \
-       "List file attributes on an ext2 fs" \
-       "\n\nOptions:\n" \
-       "    -R  Recursively list subdirectories\n" \
-       "    -a  Do not hide entries starting with .\n" \
-       "    -d  List directory entries instead of contents\n" \
-       "    -l  Print long flag names\n" \
-       "    -v  List the file's version/generation number"
-
-#define lsmod_trivial_usage \
-       ""
-#define lsmod_full_usage \
-       "List the currently loaded kernel modules"
+       "[-Radlv] [FILE]..."
+#define lsattr_full_usage "\n\n" \
+       "List file attributes on an ext2 fs\n" \
+     "\nOptions:" \
+     "\n    -R  Recurse" \
+     "\n    -a  Don't hide entries starting with ." \
+     "\n    -d  List directory entries instead of contents" \
+     "\n    -l  List long flag names" \
+     "\n    -v  List the file's version/generation number" \
+
+#define lspci_trivial_usage \
+       "[-mk]"
+#define lspci_full_usage "\n\n" \
+       "List all PCI devices" \
+     "\n" \
+     "\n    -m  Parseable output" \
+     "\n    -k  Show driver" \
+
+#define lsusb_trivial_usage NOUSAGE_STR
+#define lsusb_full_usage ""
 
 #if ENABLE_FEATURE_MAKEDEVS_LEAF
 #define makedevs_trivial_usage \
        "NAME TYPE MAJOR MINOR FIRST LAST [s]"
-#define makedevs_full_usage \
-       "Create a range of block or character special files\n\n" \
-       "TYPEs include:\n" \
-       "    b:  Make a block (buffered) device\n" \
-       "    c or u: Make a character (un-buffered) device\n" \
-       "    p:  Make a named pipe. MAJOR and MINOR are ignored for named pipes\n" \
-       "\n" \
-       "FIRST specifies the number appended to NAME to create the first device.\n" \
-       "LAST specifies the number of the last item that should be created\n" \
-       "If 's' is the last argument, the base device is created as well.\n\n" \
-       "For example:\n" \
-       "    makedevs /dev/ttyS c 4 66 2 63   ->  ttyS2-ttyS63\n" \
-       "    makedevs /dev/hda b 3 0 0 8 s    ->  hda,hda1-hda8"
+#define makedevs_full_usage "\n\n" \
+       "Create a range of block or character special files" \
+     "\n" \
+     "\nTYPE is:" \
+     "\n    b   Block device" \
+     "\n    c   Character device" \
+     "\n    f   FIFO, MAJOR and MINOR are ignored" \
+     "\n" \
+     "\nFIRST..LAST specify numbers appended to NAME." \
+     "\nIf 's' is the last argument, the base device is created as well." \
+     "\n" \
+     "\nExamples:" \
+     "\n    makedevs /dev/ttyS c 4 66 2 63   ->  ttyS2-ttyS63" \
+     "\n    makedevs /dev/hda b 3 0 0 8 s    ->  hda,hda1-hda8"
 #define makedevs_example_usage \
        "# makedevs /dev/ttyS c 4 66 2 63\n" \
@@ -1985 +3443 @@
 #define makedevs_trivial_usage \
        "[-d device_table] rootdir"
-#define makedevs_full_usage \
+#define makedevs_full_usage "\n\n" \
        "Create a range of special files as specified in a device table.\n" \
        "Device table entries take the form of:\n" \
        "<type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>\n" \
        "Where name is the file name, type can be one of:\n" \
-       "    f   A regular file\n" \
+       "    f   Regular file\n" \
        "    d   Directory\n" \
-       "    c   Character special device file\n" \
-       "    b   Block special device file\n" \
+       "    c   Character device\n" \
+       "    b   Block device\n" \
        "    p   Fifo (named pipe)\n" \
        "uid is the user id for the target file, gid is the group id for the\n" \
@@ -2016 +3474 @@
 #endif
 
+#define makemime_trivial_usage \
+       "[OPTIONS] [FILE]..."
+#define makemime_full_usage "\n\n" \
+       "Create multipart MIME-encoded message from FILEs\n" \
+/*     "Transfer encoding is base64, disposition is inline (not attachment)\n" */ \
+     "\nOptions:" \
+     "\n    -o FILE Output. Default: stdout" \
+     "\n    -a HDR  Add header. Examples:" \
+     "\n        \"From: user@host.org\", \"Date: `date -R`\"" \
+     "\n    -c CT   Content type. Default: text/plain" \
+     "\n    -C CS   Charset. Default: " CONFIG_FEATURE_MIME_CHARSET \
+/*   "\n    -e ENC  Transfer encoding. Ignored. base64 is assumed" */ \
+     "\n" \
+     "\nOther options are silently ignored" \
+
+#define man_trivial_usage \
+       "[-aw] [MANPAGE]..."
+#define man_full_usage "\n\n" \
+       "Format and display manual page\n" \
+     "\nOptions:" \
+     "\n    -a      Display all pages" \
+     "\n    -w  Show page locations" \
+
 #define matchpathcon_trivial_usage \
        "[-n] [-N] [-f file_contexts_file] [-p prefix] [-V]"
-#define matchpathcon_full_usage \
-       "    -n  Do not display path" \
-       "\n  -N  Do not use translations" \
-       "\n  -f  Use alternate file_context file" \
-       "\n  -p  Use prefix to speed translations" \
-       "\n  -V  Verify file context on disk matches defaults"
+#define matchpathcon_full_usage "\n\n" \
+       "    -n  Don't display path" \
+     "\n    -N  Don't use translations" \
+     "\n    -f  Use alternate file_context file" \
+     "\n    -p  Use prefix to speed translations" \
+     "\n    -V  Verify file context on disk matches defaults" \
 
 #define md5sum_trivial_usage \
-       "[OPTION] [FILEs...]" \
-    USE_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: md5sum [OPTION] -c [FILE]")
-#define md5sum_full_usage \
-       "Print" USE_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " MD5 checksums" \
-       "\n\nOptions:\n" \
-       "With no FILE, or when FILE is -, read standard input." \
-    USE_FEATURE_MD5_SHA1_SUM_CHECK("\n\n" \
-       "    -c  Check MD5 sums against given list\n" \
-       "\nThe following two options are useful only when verifying checksums:\n" \
-       "    -s  Don't output anything, status code shows success\n" \
-       "    -w  Warn about improperly formatted MD5 checksum lines")
+       "[FILE]..." \
+    IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: md5sum -c [-sw] [FILE]")
+#define md5sum_full_usage "\n\n" \
+       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " MD5 checksums" \
+    IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
+     "\nOptions:" \
+     "\n    -c  Check sums against given list" \
+     "\n    -s  Don't output anything, status code shows success" \
+     "\n    -w  Warn about improperly formatted checksum lines" \
+    )
+
 #define md5sum_example_usage \
        "$ md5sum < busybox\n" \
@@ -2047 +3528 @@
        "^D\n"
 
+#define sha1sum_trivial_usage \
+       "[FILE]..." \
+    IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha1sum -c [-sw] [FILE]")
+#define sha1sum_full_usage "\n\n" \
+       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums" \
+    IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
+     "\nOptions:" \
+     "\n    -c  Check sums against given list" \
+     "\n    -s  Don't output anything, status code shows success" \
+     "\n    -w  Warn about improperly formatted checksum lines" \
+    )
+
+#define sha256sum_trivial_usage \
+       "[FILE]..." \
+    IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha256sum -c [-sw] [FILE]")
+#define sha256sum_full_usage "\n\n" \
+       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA256 checksums" \
+    IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
+     "\nOptions:" \
+     "\n    -c  Check sums against given list" \
+     "\n    -s  Don't output anything, status code shows success" \
+     "\n    -w  Warn about improperly formatted checksum lines" \
+    )
+
+#define sha512sum_trivial_usage \
+       "[FILE]..." \
+    IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha512sum -c [-sw] [FILE]")
+#define sha512sum_full_usage "\n\n" \
+       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA512 checksums" \
+    IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
+     "\nOptions:" \
+     "\n    -c  Check sums against given list" \
+     "\n    -s  Don't output anything, status code shows success" \
+     "\n    -w  Warn about improperly formatted checksum lines" \
+    )
+
 #define mdev_trivial_usage \
        "[-s]"
-#define mdev_full_usage \
-       "    -s  Scan /sys and populate /dev during system boot\n\n" \
-       "Called with no options (via hotplug) it uses environment variables\n" \
-       "to determine which device to add/remove."
+#define mdev_full_usage "\n\n" \
+       "    -s  Scan /sys and populate /dev during system boot\n" \
+       "\n" \
+       "It can be run by kernel as a hotplug helper. To activate it:\n" \
+       " echo /sbin/mdev > /proc/sys/kernel/hotplug\n" \
+    IF_FEATURE_MDEV_CONF( \
+       "It uses /etc/mdev.conf with lines\n" \
+       "[-]DEVNAME UID:GID PERM" \
+            IF_FEATURE_MDEV_RENAME(" [>|=PATH]") \
+            IF_FEATURE_MDEV_EXEC(" [@|$|*PROG]") \
+    ) \
+
 #define mdev_notes_usage "" \
-    USE_FEATURE_MDEV_CONFIG( \
+    IF_FEATURE_MDEV_CONFIG( \
        "The mdev config file contains lines that look like:\n" \
        "  hd[a-z][0-9]* 0:3 660\n\n" \
        "That's device name (with regex match), uid:gid, and permissions.\n\n" \
-    USE_FEATURE_MDEV_EXEC( \
+    IF_FEATURE_MDEV_EXEC( \
        "Optionally, that can be followed (on the same line) by a special character\n" \
        "and a command line to run after creating/before deleting the corresponding\n" \
@@ -2068 +3593 @@
        "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" \
     )
 
-#define mesg_trivial_usage \
-       "[y|n]"
-#define mesg_full_usage \
-       "Control write access to your terminal\n" \
-       "    y   Allow write access to your terminal\n" \
-       "    n   Disallow write access to your terminal"
+#define microcom_trivial_usage \
+       "[-d DELAY] [-t TIMEOUT] [-s SPEED] [-X] TTY"
+#define microcom_full_usage "\n\n" \
+       "Copy bytes for stdin to TTY and from TTY to stdout\n" \
+     "\nOptions:" \
+     "\n    -d  Wait up to DELAY ms for TTY output before sending every" \
+     "\n        next byte to it" \
+     "\n    -t  Exit if both stdin and TTY are silent for TIMEOUT ms" \
+     "\n    -s  Set serial line to SPEED" \
+     "\n    -X  Disable special meaning of NUL and Ctrl-X from stdin" \
 
 #define mkdir_trivial_usage \
-       "[OPTION] DIRECTORY..."
-#define mkdir_full_usage \
-       "Create the DIRECTORY(ies) if they do not already exist" \
-       "\n\nOptions:\n" \
-       "    -m  Set permission mode (as in chmod), not rwxrwxrwx - umask\n" \
-       "    -p  No error if existing, make parent directories as needed" \
-    USE_SELINUX( \
-       "\n  -Z  Set security context" \
+       "[OPTIONS] DIRECTORY..."
+#define mkdir_full_usage "\n\n" \
+       "Create DIRECTORY\n" \
+     "\nOptions:" \
+     "\n    -m MODE Mode" \
+     "\n    -p  No error if exists; make parent directories as needed" \
+    IF_SELINUX( \
+     "\n    -Z  Set security context" \
     )
 
@@ -2099 +3628 @@
        "$ mkdir -p /tmp/foo/bar/baz\n"
 
-#define mke2fs_trivial_usage \
-       "[-c|-l filename] [-b block-size] [-f fragment-size] [-g blocks-per-group] " \
-       "[-i bytes-per-inode] [-j] [-J journal-options] [-N number-of-inodes] [-n] " \
-       "[-m reserved-blocks-percentage] [-o creator-os] [-O feature[,...]] [-q] " \
-       "[r fs-revision-level] [-E extended-options] [-v] [-F] [-L volume-label] " \
-       "[-M last-mounted-directory] [-S] [-T filesystem-type] " \
-       "device [blocks-count]"
-#define mke2fs_full_usage \
-       "    -b size     Block size in bytes\n" \
-       "    -c      Check for bad blocks before creating\n" \
-       "    -E opts     Set extended options\n" \
-       "    -f size     Fragment size in bytes\n" \
-       "    -F      Force (ignore sanity checks)\n" \
-       "    -g num      Number of blocks in a block group\n" \
-       "    -i ratio    The bytes/inode ratio\n" \
-       "    -j      Create a journal (ext3)\n" \
-       "    -J opts     Set journal options (size/device)\n" \
-       "    -l file     Read bad blocks list from file\n" \
-       "    -L lbl      Set the volume label\n" \
-       "    -m percent  Percent of fs blocks to reserve for admin\n" \
-       "    -M dir      Set last mounted directory\n" \
-       "    -n      Do not actually create anything\n" \
-       "    -N num      Number of inodes to create\n" \
-       "    -o os       Set the 'creator os' field\n" \
-       "    -O features Dir_index/filetype/has_journal/journal_dev/sparse_super\n" \
-       "    -q      Quiet\n" \
-       "    -r rev      Set filesystem revision\n" \
-       "    -S      Write superblock and group descriptors only\n" \
-       "    -T fs-type  Set usage type (news/largefile/largefile4)\n" \
-       "    -v      Verbose"
-
 #define mkfifo_trivial_usage \
-       "[OPTIONS] name"
-#define mkfifo_full_usage \
-       "Create a named pipe (identical to 'mknod name p')" \
-       "\n\nOptions:\n" \
-       "    -m  Create the pipe using the specified mode (default a=rw)" \
-    USE_SELINUX( \
-       "\n  -Z  Set security context" \
+       "[-m MODE] " IF_SELINUX("[-Z] ") "NAME"
+#define mkfifo_full_usage "\n\n" \
+       "Create named pipe\n" \
+     "\nOptions:" \
+     "\n    -m MODE Mode (default a=rw)" \
+    IF_SELINUX( \
+     "\n    -Z  Set security context" \
     )
 
+#define mkfs_ext2_trivial_usage \
+       "[-Fn] " \
+       /* "[-c|-l filename] " */ \
+       "[-b BLK_SIZE] " \
+       /* "[-f fragment-size] [-g blocks-per-group] " */ \
+       "[-i INODE_RATIO] [-I INODE_SIZE] " \
+       /* "[-j] [-J journal-options] [-N number-of-inodes] " */ \
+       "[-m RESERVED_PERCENT] " \
+       /* "[-o creator-os] [-O feature[,...]] [-q] " */ \
+       /* "[r fs-revision-level] [-E extended-options] [-v] [-F] " */ \
+       "[-L LABEL] " \
+       /* "[-M last-mounted-directory] [-S] [-T filesystem-type] " */ \
+       "BLOCKDEV [KBYTES]"
+#define mkfs_ext2_full_usage "\n\n" \
+       "    -b BLK_SIZE Block size, bytes" \
+/*   "\n    -c      Check device for bad blocks" */ \
+/*   "\n    -E opts     Set extended options" */ \
+/*   "\n    -f size     Fragment size in bytes" */ \
+     "\n    -F      Force" \
+/*   "\n    -g N        Number of blocks in a block group" */ \
+     "\n    -i RATIO    Max number of files is filesystem_size / RATIO" \
+     "\n    -I BYTES    Inode size (min 128)" \
+/*   "\n    -j      Create a journal (ext3)" */ \
+/*   "\n    -J opts     Set journal options (size/device)" */ \
+/*   "\n    -l file     Read bad blocks list from file" */ \
+     "\n    -L LBL      Volume label" \
+     "\n    -m PERCENT  Percent of blocks to reserve for admin" \
+/*   "\n    -M dir      Set last mounted directory" */ \
+     "\n    -n      Dry run" \
+/*   "\n    -N N        Number of inodes to create" */ \
+/*   "\n    -o os       Set the 'creator os' field" */ \
+/*   "\n    -O features Dir_index/filetype/has_journal/journal_dev/sparse_super" */ \
+/*   "\n    -q      Quiet" */ \
+/*   "\n    -r rev      Set filesystem revision" */ \
+/*   "\n    -S      Write superblock and group descriptors only" */ \
+/*   "\n    -T fs-type  Set usage type (news/largefile/largefile4)" */ \
+/*   "\n    -v      Verbose" */ \
+
 #define mkfs_minix_trivial_usage \
-       "[-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
-#define mkfs_minix_full_usage \
-       "Make a MINIX filesystem" \
-       "\n\nOptions:\n" \
-       "    -c      Check the device for bad blocks\n" \
-       "    -n [14|30]  Specify the maximum length of filenames\n" \
-       "    -i INODES   Specify the number of inodes for the filesystem\n" \
-       "    -l FILENAME Read the bad blocks list from FILENAME\n" \
-       "    -v      Make a Minix version 2 filesystem"
+       "[-c | -l FILE] [-nXX] [-iXX] BLOCKDEV [KBYTES]"
+#define mkfs_minix_full_usage "\n\n" \
+       "Make a MINIX filesystem\n" \
+     "\nOptions:" \
+     "\n    -c      Check device for bad blocks" \
+     "\n    -n [14|30]  Maximum length of filenames" \
+     "\n    -i INODES   Number of inodes for the filesystem" \
+     "\n    -l FILE     Read bad blocks list from FILE" \
+     "\n    -v      Make version 2 filesystem" \
+
+#define mkfs_reiser_trivial_usage \
+       "[-f] [-l LABEL] BLOCKDEV [4K-BLOCKS]"
+
+#define mkfs_reiser_full_usage "\n\n" \
+       "Make a ReiserFS V3 filesystem\n" \
+     "\nOptions:" \
+     "\n    -f  Force" \
+     "\n    -l LBL  Volume label" \
+
+#define mkfs_vfat_trivial_usage \
+       "[-v] [-n LABEL] BLOCKDEV [KBYTES]"
+/* Accepted but ignored:
+       "[-c] [-C] [-I] [-l bad-block-file] [-b backup-boot-sector] "
+       "[-m boot-msg-file] [-i volume-id] "
+       "[-s sectors-per-cluster] [-S logical-sector-size] [-f number-of-FATs] "
+       "[-h hidden-sectors] [-F fat-size] [-r root-dir-entries] [-R reserved-sectors] "
+*/
+#define mkfs_vfat_full_usage "\n\n" \
+       "Make a FAT32 filesystem\n" \
+     "\nOptions:" \
+/*   "\n    -c  Check device for bad blocks" */ \
+     "\n    -v  Verbose" \
+/*   "\n    -I  Allow to use entire disk device (e.g. /dev/hda)" */ \
+     "\n    -n LBL  Volume label" \
 
 #define mknod_trivial_usage \
-       "[OPTIONS] NAME TYPE MAJOR MINOR"
-#define mknod_full_usage \
-       "Create a special file (block, character, or pipe)" \
-       "\n\nOptions:\n" \
-       "    -m  Create the special file using the specified mode (default a=rw)" \
-       "\n\nTYPEs include:\n" \
-       "    b:  Make a block (buffered) device\n" \
-       "    c or u: Make a character (un-buffered) device\n" \
-       "    p:  Make a named pipe. MAJOR and MINOR are ignored for named pipes" \
-    USE_SELINUX( \
-       "\n  -Z  Set security context" \
-    )
+       "[-m MODE] " IF_SELINUX("[-Z] ") "NAME TYPE MAJOR MINOR"
+#define mknod_full_usage "\n\n" \
+       "Create a special file (block, character, or pipe)\n" \
+     "\nOptions:" \
+     "\n    -m MODE Creation mode (default a=rw)" \
+    IF_SELINUX( \
+     "\n    -Z  Set security context" \
+    ) \
+     "\nTYPE:" \
+     "\n    b   Block device" \
+     "\n    c or u  Character device" \
+     "\n    p   Named pipe (MAJOR and MINOR are ignored)" \
 
 #define mknod_example_usage \
@@ -2170 +3731 @@
 
 #define mkswap_trivial_usage \
-       "[-c] [-v0|-v1] device [block-count]"
-#define mkswap_full_usage \
-       "Prepare a disk partition to be used as swap partition" \
-       "\n\nOptions:\n" \
-       "    -c      Check for read-ability\n" \
-       "    -v0     Make version 0 swap [max 128 Megs]\n" \
-       "    -v1     Make version 1 swap [big!] (default for kernels > 2.1.117)\n" \
-       "    block-count Number of block to use (default is entire partition)"
+       "[-L LBL] BLOCKDEV [KBYTES]"
+#define mkswap_full_usage "\n\n" \
+       "Prepare BLOCKDEV to be used as swap partition\n" \
+     "\nOptions:" \
+     "\n    -L LBL  Label" \
 
 #define mktemp_trivial_usage \
-       "[-dq] TEMPLATE"
-#define mktemp_full_usage \
-       "Create a temporary file with its name based on TEMPLATE.\n" \
-       "TEMPLATE is any name with six 'Xs' (i.e., /tmp/temp.XXXXXX)." \
-       "\n\nOptions:\n" \
-       "    -d  Make a directory instead of a file\n" \
-       "    -q  Fail silently if an error occurs"
+       "[-dt] [-p DIR] [TEMPLATE]"
+#define mktemp_full_usage "\n\n" \
+       "Create a temporary file with name based on TEMPLATE and print its name.\n" \
+       "TEMPLATE must end with XXXXXX (e.g. [/dir/]nameXXXXXX).\n" \
+     "\nOptions:" \
+     "\n    -d  Make a directory instead of a file" \
+/*   "\n    -q  Fail silently if an error occurs" - we ignore it */ \
+     "\n    -t  Generate a path rooted in temporary directory" \
+     "\n    -p DIR  Use DIR as a temporary directory (implies -t)" \
+     "\n" \
+     "\nFor -t or -p, directory is chosen as follows:" \
+     "\n$TMPDIR if set, else -p DIR, else /tmp" \
+
 #define mktemp_example_usage \
        "$ mktemp /tmp/temp.XXXXXX\n" \
@@ -2193 +3757 @@
        "-rw-------    1 andersen andersen        0 Apr 25 17:10 /tmp/temp.mWiLjM\n"
 
-#define modprobe_trivial_usage \
-       "[-knqrsv] MODULE [symbol=value ...]"
-#define modprobe_full_usage \
-       "Options:\n" \
-       "    -k  Make module autoclean-able\n" \
-       "    -n  Just show what would be done\n" \
-       "    -q  Quiet\n" \
-       "    -r  Remove module (stacks) or do autoclean\n" \
-       "    -s  Report via syslog instead of stderr\n" \
-       "    -v  Verbose"
-#define modprobe_notes_usage \
-"modprobe can (un)load a stack of modules, passing each module options (when\n" \
-"loading). modprobe uses a configuration file to determine what option(s) to\n" \
-"pass each module it loads.\n" \
-"\n" \
-"The configuration file is searched (in order) amongst:\n" \
-"\n" \
-"    /etc/modprobe.conf (2.6 only)\n" \
-"    /etc/modules.conf\n" \
-"    /etc/conf.modules (deprecated)\n" \
-"\n" \
-"They all have the same syntax (see below). If none is present, it is\n" \
-"_not_ an error; each loaded module is then expected to load without\n" \
-"options. Once a file is found, the others are tested for.\n" \
-"\n" \
-"/etc/modules.conf entry format:\n" \
-"\n" \
-"  alias <alias_name> <mod_name>\n" \
-"    Makes it possible to modprobe alias_name, when there is no such module.\n" \
-"    It makes sense if your mod_name is long, or you want a more representative\n" \
-"    name for that module (eg. 'scsi' in place of 'aha7xxx').\n" \
-"    This makes it also possible to use a different set of options (below) for\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" \
-"    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" \
-"Sample /etc/modules.conf file:\n" \
-"\n" \
-"  options tulip irq=3\n" \
-"  alias tulip tulip2\n" \
-"  options tulip2 irq=4 io=0x308\n" \
-"\n" \
-"Other functionality offered by 'classic' modprobe is not available in\n" \
-"this implementation.\n" \
-"\n" \
-"If module options are present both in the config file, and on the command line,\n" \
-"then the options from the command line will be passed to the module _after_\n" \
-"the options from the config file. That way, you can have defaults in the config\n" \
-"file, and override them for a specific usage from the command line.\n"
-#define modprobe_example_usage \
-       "(with the above /etc/modules.conf):\n\n" \
-       "$ modprobe tulip\n" \
-       "   will load the module 'tulip' with default option 'irq=3'\n\n" \
-       "$ modprobe tulip irq=5\n" \
-       "   will load the module 'tulip' with option 'irq=5', thus overriding the default\n\n" \
-       "$ modprobe tulip2\n" \
-       "   will load the module 'tulip' with default options 'irq=4 io=0x308',\n" \
-       "   which are the default for alias 'tulip2'\n\n" \
-       "$ modprobe tulip2 irq=8\n" \
-       "   will load the module 'tulip' with default options 'irq=4 io=0x308 irq=8',\n" \
-       "   which are the default for alias 'tulip2' overridden by the option 'irq=8'\n\n" \
-       "   from the command line\n\n" \
-       "$ modprobe tulip2 irq=2 io=0x210\n" \
-       "   will load the module 'tulip' with default options 'irq=4 io=0x308 irq=4 io=0x210',\n" \
-       "   which are the default for alias 'tulip2' overridden by the options 'irq=2 io=0x210'\n\n" \
-       "   from the command line\n"
-
 #define more_trivial_usage \
-       "[FILE ...]"
-#define more_full_usage \
-       "View FILE or standard input one screenful at a time"
+       "[FILE]..."
+#define more_full_usage "\n\n" \
+       "View FILE (or stdin) one screenful at a time"
+
 #define more_example_usage \
        "$ dmesg | more\n"
 
 #define mount_trivial_usage \
-       "[flags] DEVICE NODE [-o options,more-options]"
-#define mount_full_usage \
-       "Mount a filesystem. Filesystem autodetection requires /proc be mounted." \
-       "\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" \
-    ) \
-       "    -o option   One of many filesystem options, listed below\n" \
-       "    -r      Mount the filesystem read-only\n" \
-       "    -t fs-type  Specify the filesystem type\n" \
-       "    -w      Mount for reading and writing (default)\n" \
-       "\n" \
-       "Options for use with the \"-o\" flag:\n" \
-    USE_FEATURE_MOUNT_LOOP( \
-       "    loop        Ignored (loop devices are autodetected)\n" \
-    ) \
-    USE_FEATURE_MOUNT_FLAGS( \
-       "    [a]sync     Writes are asynchronous / synchronous\n" \
-       "    [no]atime   Disable / enable updates to inode access times\n" \
-       "    [no]diratime    Disable / enable atime updates to directories\n" \
-       "    [no]dev     Allow use of special device files / disallow them\n" \
-       "    [no]exec    Allow use of executable files / disallow them\n" \
-       "    [no]suid    Allow set-user-id-root programs / disallow them\n" \
-       "    [r]shared   Convert [recursively] to a shared subtree\n" \
-       "    [r]slave    Convert [recursively] to a slave subtree\n" \
-       "    [r]private  Convert [recursively] to a private subtree\n" \
-       "    [un]bindable    Make mount point [un]able to be bind mounted\n" \
-       "    bind        Bind a directory to an additional location\n" \
-       "    move        Relocate an existing mount point\n" \
-    ) \
-       "    remount     Remount a mounted filesystem, changing its flags\n" \
-       "    ro/rw       Mount for read-only / read-write\n" \
-       "\n" \
-       "There are EVEN MORE flags that are specific to each filesystem\n" \
-       "You'll have to see the written documentation for those filesystems"
+       "[OPTIONS] [-o OPTS] DEVICE NODE"
+#define mount_full_usage "\n\n" \
+       "Mount a filesystem. Filesystem autodetection requires /proc.\n" \
+     "\nOptions:" \
+     "\n    -a      Mount all filesystems in fstab" \
+    IF_FEATURE_MOUNT_FAKE( \
+    IF_FEATURE_MTAB_SUPPORT( \
+     "\n    -f      Update /etc/mtab, but don't mount" \
+    ) \
+    IF_NOT_FEATURE_MTAB_SUPPORT( \
+     "\n    -f      Dry run" \
+    ) \
+    ) \
+    IF_FEATURE_MOUNT_HELPERS( \
+     "\n    -i      Don't run mount helper" \
+    ) \
+    IF_FEATURE_MTAB_SUPPORT( \
+     "\n    -n      Don't update /etc/mtab" \
+    ) \
+     "\n    -r      Read-only mount" \
+     "\n    -w      Read-write mount (default)" \
+     "\n    -t FSTYPE   Filesystem type" \
+     "\n    -O OPT      Mount only filesystems with option OPT (-a only)" \
+     "\n-o OPT:" \
+    IF_FEATURE_MOUNT_LOOP( \
+     "\n    loop        Ignored (loop devices are autodetected)" \
+    ) \
+    IF_FEATURE_MOUNT_FLAGS( \
+     "\n    [a]sync     Writes are [a]synchronous" \
+     "\n    [no]atime   Disable/enable updates to inode access times" \
+     "\n    [no]diratime    Disable/enable atime updates to directories" \
+     "\n    [no]relatime    Disable/enable atime updates relative to modification time" \
+     "\n    [no]dev     (Dis)allow use of special device files" \
+     "\n    [no]exec    (Dis)allow use of executable files" \
+     "\n    [no]suid    (Dis)allow set-user-id-root programs" \
+     "\n    [r]shared   Convert [recursively] to a shared subtree" \
+     "\n    [r]slave    Convert [recursively] to a slave subtree" \
+     "\n    [r]private  Convert [recursively] to a private subtree" \
+     "\n    [un]bindable    Make mount point [un]able to be bind mounted" \
+     "\n    bind        Bind a file or directory to another location" \
+     "\n    move        Relocate an existing mount point" \
+    ) \
+     "\n    remount     Remount a mounted filesystem, changing flags" \
+     "\n    ro/rw       Same as -r/-w" \
+     "\n" \
+     "\nThere are filesystem-specific -o flags." \
+
 #define mount_example_usage \
        "$ mount\n" \
@@ -2320 +3825 @@
 
 #define mountpoint_trivial_usage \
-       "[-q] <[-d] DIR | -x DEVICE>"
-#define mountpoint_full_usage \
-       "mountpoint checks if the directory is a mountpoint" \
-       "\n\nOptions:\n" \
-       "    -q  Quiet\n" \
-       "    -d  Print major/minor device number of the filesystem\n" \
-       "    -x  Print major/minor device number of the blockdevice"
+       "[-q] <[-dn] DIR | -x DEVICE>"
+#define mountpoint_full_usage "\n\n" \
+       "Check if the directory is a mountpoint\n" \
+     "\nOptions:" \
+     "\n    -q  Quiet" \
+     "\n    -d  Print major/minor device number of the filesystem" \
+     "\n    -n  Print device name of the filesystem" \
+     "\n    -x  Print major/minor device number of the blockdevice" \
+
 #define mountpoint_example_usage \
        "$ mountpoint /proc\n" \
@@ -2335 +3842 @@
 #define mt_trivial_usage \
        "[-f device] opcode value"
-#define mt_full_usage \
+#define mt_full_usage "\n\n" \
        "Control magnetic tape drive operation\n" \
-       "\nAvailable Opcodes:\n\n" \
+       "\n" \
+       "Available Opcodes:\n" \
+       "\n" \
        "bsf bsfm bsr bss datacompression drvbuffer eof eom erase\n" \
        "fsf fsfm fsr fss load lock mkpart nop offline ras1 ras2\n" \
        "ras3 reset retension rewind rewoffline seek setblk setdensity\n" \
-       "setpart tell unload unlock weof wset"
-
-#define mv_trivial_usage \
-       "[OPTION]... SOURCE DEST\n" \
-       "or: mv [OPTION]... SOURCE... DIRECTORY"
-#define mv_full_usage \
-       "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY" \
-       "\n\nOptions:\n" \
-       "    -f  Don't prompt before overwriting\n" \
-       "    -i  Interactive, prompt before overwrite"
-#define mv_example_usage \
-       "$ mv /tmp/foo /bin/bar\n"
+       "setpart tell unload unlock weof wset" \
 
 #define nameif_trivial_usage \
        "[-s] [-c FILE] [{IFNAME MACADDR}]"
-#define nameif_full_usage \
-       "Rename network interface while it in the down state" \
-       "\n\nOptions:\n" \
-       "    -c FILE     Use configuration file (default is /etc/mactab)\n" \
-       "    -s      Use syslog (LOCAL0 facility)\n" \
-       "    IFNAME MACADDR  new_interface_name interface_mac_address"
+#define nameif_full_usage "\n\n" \
+       "Rename network interface while it in the down state\n" \
+     "\nOptions:" \
+     "\n    -c FILE     Use configuration file (default: /etc/mactab)" \
+     "\n    -s      Use syslog (LOCAL0 facility)" \
+     "\n    IFNAME MACADDR  new_interface_name interface_mac_address" \
+
 #define nameif_example_usage \
        "$ nameif -s dmz0 00:A0:C9:8C:F6:3F\n" \
@@ -2367 +3866 @@
        "$ nameif -c /etc/my_mactab_file\n" \
 
-#if !ENABLE_DESKTOP
-
-#if ENABLE_NC_SERVER || ENABLE_NC_EXTRA
-#define NC_OPTIONS_STR "\n\nOptions:"
-#else
-#define NC_OPTIONS_STR
-#endif
-
-#define nc_trivial_usage \
-    USE_NC_EXTRA("[-iN] [-wN] ")USE_NC_SERVER("[-l] [-p PORT] ") \
-       "["USE_NC_EXTRA("-f FILENAME|")"IPADDR PORTNUM]"USE_NC_EXTRA(" [-e COMMAND]")
-#define nc_full_usage \
-       "Open a pipe to IP:port" USE_NC_EXTRA(" or file") \
-    NC_OPTIONS_STR \
-    USE_NC_EXTRA( \
-       "\n  -e  Exec rest of command line after connect" \
-       "\n  -i SECS Delay interval for lines sent" \
-       "\n  -w SECS Timeout for connect" \
-       "\n  -f FILE Use file (ala /dev/ttyS0) instead of network" \
-    ) \
-    USE_NC_SERVER( \
-       "\n  -l  Listen mode, for inbound connects" \
-    USE_NC_EXTRA( \
-       "\n      (use -l twice with -e for persistent server)") \
-       "\n  -p PORT Local port number" \
-    )
-
-#define nc_notes_usage "" \
-    USE_NC_EXTRA( \
-       "To use netcat as a terminal emulator on a serial port:\n\n" \
-       "$ stty 115200 -F /dev/ttyS0\n" \
-       "$ stty raw -echo -ctlecho && nc -f /dev/ttyS0\n" \
-    )
-
-#define nc_example_usage \
-       "$ nc foobar.somedomain.com 25\n" \
-       "220 foobar ESMTP Exim 3.12 #1 Sat, 15 Apr 2000 00:03:02 -0600\n" \
-       "help\n" \
-       "214-Commands supported:\n" \
-       "214-    HELO EHLO MAIL RCPT DATA AUTH\n" \
-       "214     NOOP QUIT RSET HELP\n" \
-       "quit\n" \
-       "221 foobar closing connection\n"
-
-#else /* DESKTOP nc - much more compatible with nc 1.10 */
-
-#define nc_trivial_usage \
-       "[-options] hostname port  - connect" \
-    USE_NC_SERVER("\nnc [-options] -l -p port [hostname] [port]  - listen")
-#define nc_full_usage \
-    USE_NC_SERVER( \
-       "-l      Listen mode, for inbound connects\n" \
-    ) \
-       "-n      Do not do DNS resolution" \
-     "\n-s addr     Local address" \
-     "\n-p port     Local port" \
-     "\n-u      UDP mode" \
-     "\n-v      Verbose (cumulative: -vv)" \
-     "\n-w secs     Timeout for connects and final net reads" \
-    USE_NC_EXTRA( \
-     "\n-i sec      Delay interval for lines sent" /* ", ports scanned" */ \
-     "\n-o file     Hex dump of traffic" \
-     "\n-z      Zero-I/O mode (scanning)" \
-    ) \
-     "\n-e prog [args]  Program to exec after connect (must be last)" \
-/*   "\n-r      Randomize local and remote ports" */
-/*   "\n-g gateway  Source-routing hop point[s], up to 8" */
-/*   "\n-G num      Source-routing pointer: 4, 8, 12, ..." */
-/*   "\nport numbers can be individual or ranges: lo-hi [inclusive]" */
-
-#endif
-
-#define netstat_trivial_usage \
-       "[-laentuwxr"USE_FEATURE_NETSTAT_WIDE("W")"]"
-#define netstat_full_usage \
-       "Display networking information" \
-     "\n\nOptions:" \
-     "\n    -l  Display listening server sockets" \
-     "\n    -a  Display all sockets (default: connected)" \
-     "\n    -e  Display other/more information" \
-     "\n    -n  Don't resolve names" \
-     "\n    -t  Tcp sockets" \
-     "\n    -u  Udp sockets" \
-     "\n    -w  Raw sockets" \
-     "\n    -x  Unix sockets" \
-     "\n    -r  Display routing table" \
-    USE_FEATURE_NETSTAT_WIDE( \
-     "\n    -W  Display with no column truncation" \
-    )
-
-#define nice_trivial_usage \
-       "[-n ADJUST] [COMMAND [ARG] ...]"
-#define nice_full_usage \
-       "Run a program with modified scheduling priority" \
-       "\n\nOptions:\n" \
-       "    -n ADJUST   Adjust the scheduling priority by ADJUST"
-
 #define nmeter_trivial_usage \
        "format_string"
-#define nmeter_full_usage \
+#define nmeter_full_usage "\n\n" \
        "Monitor system in real time\n\n" \
        "Format specifiers:\n" \
-       "%Nc or %[cN]    Monitor CPU. N - bar size, default 10\n" \
+       " %Nc or %[cN]   Monitor CPU. N - bar size, default 10\n" \
        "        (displays: S:system U:user N:niced D:iowait I:irq i:softirq)\n" \
-       "%[niface]   Monitor network interface 'iface'\n" \
-       "%m      Monitor allocated memory\n" \
-       "%[mf]       Monitor free memory\n" \
-       "%[mt]       Monitor total memory\n" \
-       "%s      Monitor allocated swap\n" \
-       "%f      Monitor number of used file descriptors\n" \
-       "%Ni     Monitor total/specific IRQ rate\n" \
-       "%x      Monitor context switch rate\n" \
-       "%p      Monitor forks\n" \
-       "%[pn]       Monitor # of processes\n" \
-       "%b      Monitor block io\n" \
-       "%Nt     Show time (with N decimal points)\n" \
-       "%Nd     Milliseconds between updates (default=1000)\n" \
-       "%r      Print <cr> instead of <lf> at EOL"
+       " %[niface]  Monitor network interface 'iface'\n" \
+       " %m     Monitor allocated memory\n" \
+       " %[mf]      Monitor free memory\n" \
+       " %[mt]      Monitor total memory\n" \
+       " %s     Monitor allocated swap\n" \
+       " %f     Monitor number of used file descriptors\n" \
+       " %Ni        Monitor total/specific IRQ rate\n" \
+       " %x     Monitor context switch rate\n" \
+       " %p     Monitor forks\n" \
+       " %[pn]      Monitor # of processes\n" \
+       " %b     Monitor block io\n" \
+       " %Nt        Show time (with N decimal points)\n" \
+       " %Nd        Milliseconds between updates (default:1000)\n" \
+       " %r     Print <cr> instead of <lf> at EOL" \
+
 #define nmeter_example_usage \
        "nmeter '%250d%t %20c int %i bio %b mem %m forks%p'"
 
 #define nohup_trivial_usage \
-       "COMMAND [ARGS]"
-#define nohup_full_usage \
-       "Run a command immune to hangups, with output to a non-tty"
+       "PROG ARGS"
+#define nohup_full_usage "\n\n" \
+       "Run PROG immune to hangups, with output to a non-tty"
 #define nohup_example_usage \
        "$ nohup make &"
@@ -2497 +3900 @@
 #define nslookup_trivial_usage \
        "[HOST] [SERVER]"
-#define nslookup_full_usage \
+#define nslookup_full_usage "\n\n" \
        "Query the nameserver for the IP address of the given HOST\n" \
        "optionally using a specified DNS server"
@@ -2508 +3911 @@
        "Address:    127.0.0.1\n"
 
+#define ntpd_trivial_usage \
+    "[-dnqNw"IF_FEATURE_NTPD_SERVER("l")"] [-S PROG] [-p PEER]..."
+#define ntpd_full_usage "\n\n" \
+       "NTP client/server\n" \
+     "\nOptions:" \
+     "\n    -d  Verbose" \
+     "\n    -n  Do not daemonize" \
+     "\n    -q  Quit after clock is set" \
+     "\n    -N  Run at high priority" \
+     "\n    -w  Do not set time (only query peers), implies -n" \
+    IF_FEATURE_NTPD_SERVER( \
+     "\n    -l  Run as server on port 123" \
+    ) \
+     "\n    -S PROG Run PROG after stepping time, stratum change, and every 11 mins" \
+     "\n    -p PEER Obtain time from PEER (may be repeated)" \
+
 #define od_trivial_usage \
-       "[-aBbcDdeFfHhIiLlOovXx] [FILE]"
-#define od_full_usage \
+       "[-aBbcDdeFfHhIiLlOovXx] " IF_DESKTOP("[-t TYPE] ") "[FILE]"
+#define od_full_usage "\n\n" \
        "Write an unambiguous representation, octal bytes by default, of FILE\n" \
-       "to standard output. With no FILE, or when FILE is -, read standard input."
+       "(or stdin) to stdout"
 
 #define openvt_trivial_usage \
-       "VTNUM COMMAND [ARGS...]"
-#define openvt_full_usage \
-       "Start a command on a new virtual terminal"
+       "[-c N] [-sw] [PROG ARGS]"
+#define openvt_full_usage "\n\n" \
+       "Start PROG on a new virtual terminal\n" \
+     "\nOptions:" \
+     "\n    -c N    Use specified VT" \
+     "\n    -s  Switch to the VT" \
+/*   "\n    -l  Run PROG as login shell (by prepending '-')" */ \
+     "\n    -w  Wait for PROG to exit" \
+
 #define openvt_example_usage \
        "openvt 2 /bin/ash\n"
 
+/*
+#define parse_trivial_usage \
+       "[-n MAXTOKENS] [-m MINTOKENS] [-d DELIMS] [-f FLAGS] FILE..."
+#define parse_full_usage ""
+*/
+
 #define passwd_trivial_usage \
-       "[OPTION] [name]"
-#define passwd_full_usage \
-       "Change a user password. If no name is specified,\n" \
-       "changes the password for the current user." \
-       "\n\nOptions:\n" \
-       "    -a  Define which algorithm shall be used for the password\n" \
-       "        (choices: des, md5)\n" /* ", sha1)" */ \
-       "    -d  Delete the password for the specified user account\n" \
-       "    -l  Locks (disables) the specified user account\n" \
-       "    -u  Unlocks (re-enables) the specified user account"
+       "[OPTIONS] [USER]"
+#define passwd_full_usage "\n\n" \
+       "Change USER's password. If no USER is specified,\n" \
+       "changes the password for the current user.\n" \
+     "\nOptions:" \
+     "\n    -a ALG  Algorithm to use for password (des, md5)" /* ", sha1)" */ \
+     "\n    -d  Delete password for the account" \
+     "\n    -l  Lock (disable) account" \
+     "\n    -u  Unlock (re-enable) account" \
 
 #define chpasswd_trivial_usage \
-       "[--md5|--encrypt]"
-#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"
-
-#define patch_trivial_usage \
-       "[-p num] [-i diff]"
-#define patch_full_usage \
-       "    -p NUM  Strip NUM leading components from file names\n" \
-       "    -i DIFF Read DIFF instead of stdin"
-#define patch_example_usage \
-       "$ patch -p1 < example.diff\n" \
-       "$ patch -p0 -i example.diff"
+    IF_LONG_OPTS("[--md5|--encrypted]") IF_NOT_LONG_OPTS("[-m|-e]")
+#define chpasswd_full_usage "\n\n" \
+       "Read user:password from stdin and update /etc/passwd\n" \
+     "\nOptions:" \
+    IF_LONG_OPTS( \
+     "\n    -e,--encrypted  Supplied passwords are in encrypted form" \
+     "\n    -m,--md5    Use MD5 encryption instead of DES" \
+    ) \
+    IF_NOT_LONG_OPTS( \
+     "\n    -e  Supplied passwords are in encrypted form" \
+     "\n    -m  Use MD5 encryption instead of DES" \
+    )
+
+#define pgrep_trivial_usage \
+       "[-flnovx] [-s SID|-P PPID|PATTERN]"
+#define pgrep_full_usage "\n\n" \
+       "Display process(es) selected by regex PATTERN\n" \
+     "\nOptions:" \
+     "\n    -l  Show command name too" \
+     "\n    -f  Match against entire command line" \
+     "\n    -n  Show the newest process only" \
+     "\n    -o  Show the oldest process only" \
+     "\n    -v  Negate the match" \
+     "\n    -x  Match whole name (not substring)" \
+     "\n    -s  Match session ID (0 for current)" \
+     "\n    -P  Match parent process ID" \
 
 #if (ENABLE_FEATURE_PIDOF_SINGLE || ENABLE_FEATURE_PIDOF_OMIT)
-#define USAGE_PIDOF "Options:"
+#define pidof_trivial_usage \
+       "[OPTIONS] [NAME]..."
+#define USAGE_PIDOF "\n\nOptions:"
 #else
-#define USAGE_PIDOF "\nThis version of pidof accepts no options."
+#define pidof_trivial_usage \
+       "[NAME]..."
+#define USAGE_PIDOF /* none */
 #endif
-
-#define pidof_trivial_usage \
-       "process-name [OPTION] [process-name ...]"
-
-#define pidof_full_usage \
-       "List the PIDs of all processes with names that match the\n" \
-       "names on the command line\n" \
+#define pidof_full_usage "\n\n" \
+       "List PIDs of all processes with names that match NAMEs" \
     USAGE_PIDOF \
-    USE_FEATURE_PIDOF_SINGLE( \
-       "\n  -s  Display only a single PID") \
-    USE_FEATURE_PIDOF_OMIT( \
-       "\n  -o PID  Omit given pid") \
-    USE_FEATURE_PIDOF_OMIT( \
-       "\n      Use %PPID to omit the parent pid of pidof itself")
+    IF_FEATURE_PIDOF_SINGLE( \
+     "\n    -s  Show only one PID" \
+    ) \
+    IF_FEATURE_PIDOF_OMIT( \
+     "\n    -o PID  Omit given pid" \
+     "\n        Use %PPID to omit pid of pidof's parent" \
+    ) \
+
 #define pidof_example_usage \
        "$ pidof init\n" \
        "1\n" \
-    USE_FEATURE_PIDOF_OMIT( \
+    IF_FEATURE_PIDOF_OMIT( \
        "$ pidof /bin/sh\n20351 5973 5950\n") \
-    USE_FEATURE_PIDOF_OMIT( \
+    IF_FEATURE_PIDOF_OMIT( \
        "$ pidof /bin/sh -o %PPID\n20351 5950")
 
@@ -2581 +4022 @@
 #define ping_trivial_usage \
        "host"
-#define ping_full_usage \
+#define ping_full_usage "\n\n" \
        "Send ICMP ECHO_REQUEST packets to network hosts"
 #define ping6_trivial_usage \
        "host"
-#define ping6_full_usage \
+#define ping6_full_usage "\n\n" \
        "Send ICMP ECHO_REQUEST packets to network hosts"
 #else
 #define ping_trivial_usage \
-       "[OPTION]... host"
-#define ping_full_usage \
-       "Send ICMP ECHO_REQUEST packets to network hosts" \
-       "\n\nOptions:\n" \
-       "    -4, -6      Force IPv4 or IPv6 hostname resolution\n" \
-       "    -c CNT      Send only CNT pings\n" \
-       "    -s SIZE     Send SIZE data bytes in packets (default=56)\n" \
-       "    -I iface/IP Use interface or IP address as source\n" \
-       "    -q      Quiet, only displays output at start\n" \
-       "            and when finished"
+       "[OPTIONS] HOST"
+#define ping_full_usage "\n\n" \
+       "Send ICMP ECHO_REQUEST packets to network hosts\n" \
+     "\nOptions:" \
+     "\n    -4,-6       Force IP or IPv6 name resolution" \
+     "\n    -c CNT      Send only CNT pings" \
+     "\n    -s SIZE     Send SIZE data bytes in packets (default:56)" \
+     "\n    -I IFACE/IP Use interface or IP address as source" \
+     "\n    -W SEC      Seconds to wait for the first response (default:10)" \
+     "\n            (after all -c CNT packets are sent)" \
+     "\n    -w SEC      Seconds until ping exits (default:infinite)" \
+     "\n            (can exit earlier with -c CNT)" \
+     "\n    -q      Quiet, only displays output at start" \
+     "\n            and when finished" \
+
 #define ping6_trivial_usage \
-       "[OPTION]... host"
-#define ping6_full_usage \
-       "Send ICMP ECHO_REQUEST packets to network hosts" \
-       "\n\nOptions:\n" \
-       "    -c CNT      Send only CNT pings\n" \
-       "    -s SIZE     Send SIZE data bytes in packets (default=56)\n" \
-       "    -I iface/IP Use interface or IP address as source\n" \
-       "    -q      Quiet, only displays output at start\n" \
-       "            and when finished"
+       "[OPTIONS] HOST"
+#define ping6_full_usage "\n\n" \
+       "Send ICMP ECHO_REQUEST packets to network hosts\n" \
+     "\nOptions:" \
+     "\n    -c CNT      Send only CNT pings" \
+     "\n    -s SIZE     Send SIZE data bytes in packets (default:56)" \
+     "\n    -I IFACE/IP Use interface or IP address as source" \
+     "\n    -q      Quiet, only displays output at start" \
+     "\n            and when finished" \
+
 #endif
 #define ping_example_usage \
@@ -2627 +4074 @@
        "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
 
+#define pipe_progress_trivial_usage NOUSAGE_STR
+#define pipe_progress_full_usage ""
+
 #define pivot_root_trivial_usage \
        "NEW_ROOT PUT_OLD"
-#define pivot_root_full_usage \
+#define pivot_root_full_usage "\n\n" \
        "Move the current root file system to PUT_OLD and make NEW_ROOT\n" \
        "the new root file system"
 
-#define poweroff_trivial_usage \
-       "[-d delay] [-n] [-f]"
-#define poweroff_full_usage \
-       "Halt and shut off power" \
-       "\n\nOptions:\n" \
-       "    -d  Delay interval for halting\n" \
-       "    -n  No call to sync()\n" \
-       "    -f  Force power off (don't go through init)"
+#define pkill_trivial_usage \
+       "[-l|-SIGNAL] [-fnovx] [-s SID|-P PPID|PATTERN]"
+#define pkill_full_usage "\n\n" \
+       "Send a signal to process(es) selected by regex PATTERN\n" \
+     "\nOptions:" \
+     "\n    -l  List all signals" \
+     "\n    -f  Match against entire command line" \
+     "\n    -n  Signal the newest process only" \
+     "\n    -o  Signal the oldest process only" \
+     "\n    -v  Negate the match" \
+     "\n    -x  Match whole name (not substring)" \
+     "\n    -s  Match session ID (0 for current)" \
+     "\n    -P  Match parent process ID" \
+
+#define popmaildir_trivial_usage \
+       "[OPTIONS] MAILDIR [CONN_HELPER ARGS]"
+#define popmaildir_full_usage "\n\n" \
+       "Fetch content of remote mailbox to local maildir\n" \
+     "\nOptions:" \
+/*   "\n    -b      Binary mode. Ignored" */ \
+/*   "\n    -d      Debug. Ignored" */ \
+/*   "\n    -m      Show used memory. Ignored" */ \
+/*   "\n    -V      Show version. Ignored" */ \
+/*   "\n    -c      Use tcpclient. Ignored" */ \
+/*   "\n    -a      Use APOP protocol. Implied. If server supports APOP -> use it" */ \
+     "\n    -s      Skip authorization" \
+     "\n    -T      Get messages with TOP instead of RETR" \
+     "\n    -k      Keep retrieved messages on the server" \
+     "\n    -t SEC      Network timeout" \
+    IF_FEATURE_POPMAILDIR_DELIVERY( \
+     "\n    -F \"PROG ARGS\"    Filter program (may be repeated)" \
+     "\n    -M \"PROG ARGS\"    Delivery program" \
+    ) \
+     "\n" \
+     "\nFetch from plain POP3 server:" \
+     "\npopmaildir -k DIR nc pop3.server.com 110 <user_and_pass.txt" \
+     "\nFetch from SSLed POP3 server and delete fetched emails:" \
+     "\npopmaildir DIR -- openssl s_client -quiet -connect pop3.server.com:995 <user_and_pass.txt"
+/*   "\n    -R BYTES    Remove old messages on the server >= BYTES. Ignored" */
+/*   "\n    -Z N1-N2    Remove messages from N1 to N2 (dangerous). Ignored" */
+/*   "\n    -L BYTES    Don't retrieve new messages >= BYTES. Ignored" */
+/*   "\n    -H LINES    Type first LINES of a message. Ignored" */
+#define popmaildir_example_usage \
+       "$ popmaildir -k ~/Maildir -- nc pop.drvv.ru 110 [<password_file]\n" \
+       "$ popmaildir ~/Maildir -- openssl s_client -quiet -connect pop.gmail.com:995 [<password_file]\n"
 
 #define printenv_trivial_usage \
-       "[VARIABLES...]"
-#define printenv_full_usage \
-       "Print all or part of environment.\n" \
-       "If no environment VARIABLE specified, print them all."
+       "[VARIABLE]..."
+#define printenv_full_usage "\n\n" \
+       "Print environment VARIABLEs.\n" \
+       "If no VARIABLE specified, print all."
 
 #define printf_trivial_usage \
-       "FORMAT [ARGUMENT...]"
-#define printf_full_usage \
+       "FORMAT [ARGUMENT]..."
+#define printf_full_usage "\n\n" \
        "Format and print ARGUMENT(s) according to FORMAT,\n" \
        "where FORMAT controls the output exactly as in C printf"
@@ -2661 +4148 @@
 
 #define ps_trivial_usage \
-       ""
-#define ps_full_usage \
-       "Report process status" \
-       "\n\nOptions:" \
-       "\n  -o col1,col2=header Select columns for display" \
+       "[-o COL1,COL2=HEADER]" IF_FEATURE_SHOW_THREADS(" [-T]")
+#define ps_full_usage "\n\n" \
+       "Show list of processes\n" \
+     "\nOptions:" \
+     "\n    -o COL1,COL2=HEADER Select columns for display" \
+    IF_FEATURE_SHOW_THREADS( \
+     "\n    -T          Show threads" \
+    )
 
 #else /* !ENABLE_DESKTOP */
 
-#if !defined CONFIG_SELINUX && !ENABLE_FEATURE_PS_WIDE
+#if !ENABLE_SELINUX && !ENABLE_FEATURE_PS_WIDE
 #define USAGE_PS "\nThis version of ps accepts no options"
 #else
@@ -2677 +4167 @@
 #define ps_trivial_usage \
        ""
-#define ps_full_usage \
-       "Report process status\n" \
+#define ps_full_usage "\n\n" \
+       "Show list of processes\n" \
     USAGE_PS \
-    USE_SELINUX( \
-       "\n  -Z  Show SE Linux context") \
-    USE_FEATURE_PS_WIDE( \
-       "\n  w   Wide output")
+    IF_SELINUX( \
+     "\n    -Z  Show selinux context" \
+    ) \
+    IF_FEATURE_PS_WIDE( \
+     "\n    w   Wide output" \
+    )
 
 #endif /* ENABLE_DESKTOP */
@@ -2698 +4190 @@
        "  743 andersen andersen S -bash\n" \
        "  745 root     root     S [getty]\n" \
-       " 2990 andersen andersen R ps\n"
+       " 2990 andersen andersen R ps\n" \
 
 #define pscan_trivial_usage \
-       "[-p MIN_PORT] [-P MAX_PORT] [-t TIMEOUT] [-T MIN_RTT] HOST"
-#define pscan_full_usage \
-       "Scan a host, print all open ports" \
-       "\n\nOptions:" \
+       "[-cb] [-p MIN_PORT] [-P MAX_PORT] [-t TIMEOUT] [-T MIN_RTT] HOST"
+#define pscan_full_usage "\n\n" \
+       "Scan a host, print all open ports\n" \
+     "\nOptions:" \
+     "\n    -c  Show closed ports too" \
+     "\n    -b  Show blocked ports too" \
      "\n    -p  Scan from this port (default 1)" \
      "\n    -P  Scan up to this port (default 1024)" \
@@ -2712 +4206 @@
 #define pwd_trivial_usage \
        ""
-#define pwd_full_usage \
+#define pwd_full_usage "\n\n" \
        "Print the full filename of the current working directory"
 #define pwd_example_usage \
@@ -2720 +4214 @@
 #define raidautorun_trivial_usage \
        "DEVICE"
-#define raidautorun_full_usage \
+#define raidautorun_full_usage "\n\n" \
        "Tell the kernel to automatically search and start RAID arrays"
 #define raidautorun_example_usage \
@@ -2727 +4221 @@
 #define rdate_trivial_usage \
        "[-sp] HOST"
-#define rdate_full_usage \
-       "Get and possibly set the system date and time from a remote HOST" \
-       "\n\nOptions:\n" \
-       "    -s  Set the system date and time (default)\n" \
-       "    -p  Print the date and time"
+#define rdate_full_usage "\n\n" \
+       "Get and possibly set the system date and time from a remote HOST\n" \
+     "\nOptions:" \
+     "\n    -s  Set the system date and time (default)" \
+     "\n    -p  Print the date and time" \
+
+#define rdev_trivial_usage \
+       ""
+#define rdev_full_usage "\n\n" \
+       "Print the device node associated with the filesystem mounted at '/'"
+#define rdev_example_usage \
+       "$ rdev\n" \
+       "/dev/mtdblock9 /\n"
 
 #define readahead_trivial_usage \
        "[FILE]..."
-#define readahead_full_usage \
-       "Preload FILE(s) in RAM cache so that subsequent reads for those" \
-       "files do not block on disk I/O"
+#define readahead_full_usage "\n\n" \
+       "Preload FILEs to RAM"
 
 #define readlink_trivial_usage \
-    USE_FEATURE_READLINK_FOLLOW("[-f] ") "FILE"
-#define readlink_full_usage \
+    IF_FEATURE_READLINK_FOLLOW("[-fnv] ") "FILE"
+#define readlink_full_usage "\n\n" \
        "Display the value of a symlink" \
-    USE_FEATURE_READLINK_FOLLOW( \
-       "\n\nOptions:\n" \
-       "    -f  Canonicalize by following all symlinks")
+    IF_FEATURE_READLINK_FOLLOW( "\n" \
+     "\nOptions:" \
+     "\n    -f  Canonicalize by following all symlinks" \
+     "\n    -n  Don't add newline" \
+     "\n    -v  Verbose" \
+    ) \
 
 #define readprofile_trivial_usage \
-       "[OPTIONS]..."
-#define readprofile_full_usage \
-       "Options:\n" \
-       "    -m mapfile  (Default: /boot/System.map)\n" \
-       "    -p profile  (Default: /proc/profile)\n" \
-       "    -M mult     Set the profiling multiplier to mult\n" \
-       "    -i      Print only info about the sampling step\n" \
-       "    -v      Verbose\n" \
-       "    -a      Print all symbols, even if count is 0\n" \
-       "    -b      Print individual histogram-bin counts\n" \
-       "    -s      Print individual counters within functions\n" \
-       "    -r      Reset all the counters (root only)\n" \
-       "    -n      Disable byte order auto-detection"
+       "[OPTIONS]"
+#define readprofile_full_usage "\n\n" \
+       "Options:" \
+     "\n    -m mapfile  (Default: /boot/System.map)" \
+     "\n    -p profile  (Default: /proc/profile)" \
+     "\n    -M NUM      Set the profiling multiplier to NUM" \
+     "\n    -i      Print only info about the sampling step" \
+     "\n    -v      Verbose" \
+     "\n    -a      Print all symbols, even if count is 0" \
+     "\n    -b      Print individual histogram-bin counts" \
+     "\n    -s      Print individual counters within functions" \
+     "\n    -r      Reset all the counters (root only)" \
+     "\n    -n      Disable byte order auto-detection" \
 
 #define realpath_trivial_usage \
-       "pathname ..."
-#define realpath_full_usage \
-       "Return the absolute pathnames of given argument"
-
-#define reboot_trivial_usage \
-       "[-d delay] [-n] [-f]"
-#define reboot_full_usage \
-       "Reboot the system" \
-       "\n\nOptions:\n" \
-       "    -d  Delay interval for rebooting\n" \
-       "    -n  No call to sync()\n" \
-       "    -f  Force reboot (don't go through init)"
-
-#define renice_trivial_usage \
-       "{{-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" \
-       "    -p  Process id(s) (default)\n" \
-       "    -g  Process group id(s)\n" \
-       "    -u  Process user name(s) and/or id(s)"
+       "FILE..."
+#define realpath_full_usage "\n\n" \
+       "Return the absolute pathnames of given FILE"
+
+#define reformime_trivial_usage \
+       "[OPTIONS] [FILE]..."
+#define reformime_full_usage "\n\n" \
+       "Parse MIME-encoded message\n" \
+     "\nOptions:" \
+     "\n    -x PREFIX   Extract content of MIME sections to files" \
+     "\n    -X PROG ARGS    Filter content of MIME sections through PROG" \
+     "\n            Must be the last option" \
+     "\n" \
+     "\nOther options are silently ignored" \
+
+#define scriptreplay_trivial_usage \
+       "timingfile [typescript [divisor]]"
+#define scriptreplay_full_usage "\n\n" \
+       "Play back typescripts, using timing information"
 
 #define reset_trivial_usage \
        ""
-#define reset_full_usage \
+#define reset_full_usage "\n\n" \
        "Reset the screen"
 
 #define resize_trivial_usage \
        ""
-#define resize_full_usage \
+#define resize_full_usage "\n\n" \
        "Resize the screen"
 
 #define restorecon_trivial_usage \
-       "[-iFnrRv] [-e excludedir]... [-o filename] [-f filename | pathname]"
-#define restorecon_full_usage \
+       "[-iFnRv] [-e EXCLUDEDIR]... [-o FILE] [-f FILE]"
+#define restorecon_full_usage "\n\n" \
        "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  -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  -v      Verbose" \
-       "\n  -vv     Show changed labels" \
-       "\n  -F      Force reset of context to match file_context" \
-       "\n          for customizable files, or the user section," \
-       "\n          if it has changed"
+     "\n    -i  Ignore files that don't exist" \
+     "\n    -f FILE File with list of files to process" \
+     "\n    -e DIR  Directory to exclude" \
+     "\n    -R,-r   Recurse" \
+     "\n    -n  Don't change any file labels" \
+     "\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" \
+     "\n        for customizable files, or the user section," \
+     "\n        if it has changed" \
+
+#define rfkill_trivial_usage \
+       "COMMAND [INDEX|TYPE]"
+#define rfkill_full_usage "\n\n" \
+       "Enable/disable wireless devices\n" \
+       "\nCommands:" \
+     "\n    list [INDEX|TYPE]   List current state" \
+     "\n    block INDEX|TYPE    Disable device" \
+     "\n    unblock INDEX|TYPE  Enable device" \
+     "\n" \
+     "\n    TYPE: all, wlan(wifi), bluetooth, uwb(ultrawideband)," \
+     "\n        wimax, wwan, gps, fm" \
 
 #define rm_trivial_usage \
-       "[OPTION]... FILE..."
-#define rm_full_usage \
-       "Remove (unlink) the FILE(s). You may use '--' to\n" \
-       "indicate that all following arguments are non-options." \
-       "\n\nOptions:\n" \
-       "    -i  Always prompt before removing each destination\n" \
-       "    -f  Remove existing destinations, never prompt\n" \
-       "    -r,-R   Remove the contents of directories recursively"
+       "[-irf] FILE..."
+#define rm_full_usage "\n\n" \
+       "Remove (unlink) FILEs\n" \
+     "\nOptions:" \
+     "\n    -i  Always prompt before removing" \
+     "\n    -f  Never prompt" \
+     "\n    -R,-r   Recurse" \
+
 #define rm_example_usage \
        "$ rm -rf /tmp/foo\n"
 
 #define rmdir_trivial_usage \
-       "[OPTION]... DIRECTORY..."
-#define rmdir_full_usage \
-       "Remove the DIRECTORY, if it is empty"
+       "[OPTIONS] DIRECTORY..."
+#define rmdir_full_usage "\n\n" \
+       "Remove DIRECTORY if it is empty\n" \
+     "\nOptions:" \
+    IF_FEATURE_RMDIR_LONG_OPTIONS( \
+     "\n    -p|--parents    Include parents" \
+     "\n    --ignore-fail-on-non-empty" \
+    ) \
+    IF_NOT_FEATURE_RMDIR_LONG_OPTIONS( \
+     "\n    -p  Include parents" \
+    )
+
 #define rmdir_example_usage \
        "# rmdir /tmp/foo\n"
 
-#define rmmod_trivial_usage \
-       "[OPTION]... [MODULE]..."
-#define rmmod_full_usage \
-       "Unload the specified kernel modules from the kernel" \
-       "\n\nOptions:\n" \
-       "    -a  Remove all unused modules (recursively)"
-#define rmmod_example_usage \
-       "$ rmmod tulip\n"
-
 #define route_trivial_usage \
        "[{add|del|delete}]"
-#define route_full_usage \
-       "Edit the kernel's routing tables" \
-       "\n\nOptions:\n" \
-       "    -n  Dont resolve names\n" \
-       "    -e  Display other/more information\n" \
-       "    -A inet" USE_FEATURE_IPV6("{6}") "  Select address family"
+#define route_full_usage "\n\n" \
+       "Edit kernel routing tables\n" \
+     "\nOptions:" \
+     "\n    -n  Don't resolve names" \
+     "\n    -e  Display other/more information" \
+     "\n    -A inet" IF_FEATURE_IPV6("{6}") "   Select address family" \
 
 #define rpm_trivial_usage \
-       "-i -q[ildc]p package.rpm"
-#define rpm_full_usage \
-       "Manipulate RPM packages" \
-       "\n\nOptions:" \
-       "\n  -i  Install package" \
-       "\n  -q  Query package" \
-       "\n  -p  Query uninstalled package" \
-       "\n  -i  Show information" \
-       "\n  -l  List contents" \
-       "\n  -d  List documents" \
-       "\n  -c  List config files"
+       "-i PACKAGE.rpm; rpm -qp[ildc] PACKAGE.rpm"
+#define rpm_full_usage "\n\n" \
+       "Manipulate RPM packages\n" \
+     "\nCommands:" \
+     "\n    -i  Install package" \
+     "\n    -qp Query package" \
+     "\nOptions:" \
+     "\n    -i  Show information" \
+     "\n    -l  List contents" \
+     "\n    -d  List documents" \
+     "\n    -c  List config files" \
 
 #define rpm2cpio_trivial_usage \
        "package.rpm"
-#define rpm2cpio_full_usage \
+#define rpm2cpio_full_usage "\n\n" \
        "Output a cpio archive of the rpm file"
 
+#define rtcwake_trivial_usage \
+       "[-a | -l | -u] [-d DEV] [-m MODE] [-s SEC | -t TIME]"
+#define rtcwake_full_usage "\n\n" \
+       "Enter a system sleep state until specified wakeup time\n" \
+    IF_LONG_OPTS( \
+     "\n    -a,--auto   Read clock mode from adjtime" \
+     "\n    -l,--local  Clock is set to local time" \
+     "\n    -u,--utc    Clock is set to UTC time" \
+     "\n    -d,--device=DEV Specify the RTC device" \
+     "\n    -m,--mode=MODE  Set the sleep state (default: standby)" \
+     "\n    -s,--seconds=SEC Set the timeout in SEC seconds from now" \
+     "\n    -t,--time=TIME  Set the timeout to TIME seconds from epoch" \
+    ) \
+    IF_NOT_LONG_OPTS( \
+     "\n    -a  Read clock mode from adjtime" \
+     "\n    -l  Clock is set to local time" \
+     "\n    -u  Clock is set to UTC time" \
+     "\n    -d DEV  Specify the RTC device" \
+     "\n    -m MODE Set the sleep state (default: standby)" \
+     "\n    -s SEC  Set the timeout in SEC seconds from now" \
+     "\n    -t TIME Set the timeout to TIME seconds from epoch" \
+    )
+
 #define runcon_trivial_usage \
-       "[-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" \
+       "[-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] PROG ARGS\n" \
+       "runcon CONTEXT PROG ARGS"
+#define runcon_full_usage "\n\n" \
+       "Run PROG in a different security context\n" \
+     "\n    CONTEXT     Complete security context\n" \
+    IF_FEATURE_RUNCON_LONG_OPTIONS( \
+     "\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" \
+    ) \
+    IF_NOT_FEATURE_RUNCON_LONG_OPTIONS( \
+     "\n    -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"
-#define run_parts_full_usage \
-       "Run a bunch of scripts in a directory" \
-       "\n\nOptions:\n" \
-       "    -t  Prints what would be run, but does not actually run anything\n" \
-       "    -a ARG  Pass ARG as an argument for every program invoked\n" \
-       "    -u MASK Set the umask to MASK before executing every program" \
-USE_FEATURE_RUN_PARTS_FANCY("\n -l  Prints names of all matching files even when they are not executable")
+       "[-t] "IF_FEATURE_RUN_PARTS_FANCY("[-l] ")"[-a ARG] [-u MASK] DIRECTORY"
+#define run_parts_full_usage "\n\n" \
+       "Run a bunch of scripts in DIRECTORY\n" \
+     "\nOptions:" \
+     "\n    -t  Print what would be run, but don't actually run anything" \
+     "\n    -a ARG  Pass ARG as argument for every program" \
+     "\n    -u MASK Set the umask to MASK before running every program" \
+    IF_FEATURE_RUN_PARTS_FANCY( \
+     "\n    -l  Print names of all matching files even if they are not executable" \
+    )
 
 #define run_parts_example_usage \
@@ -2906 +4451 @@
 
 #define runlevel_trivial_usage \
-       "[utmp]"
-#define runlevel_full_usage \
-       "Find the current and previous system runlevel.\n\n" \
-       "If no utmp file exists or if no runlevel record can be found,\n" \
+       "[FILE]"
+#define runlevel_full_usage "\n\n" \
+       "Find the current and previous system runlevel\n" \
+       "\n" \
+       "If no utmp FILE exists or if no runlevel record can be found,\n" \
        "print \"unknown\""
 #define runlevel_example_usage \
@@ -2916 +4462 @@
 
 #define runsv_trivial_usage \
-       "dir"
-#define runsv_full_usage \
+       "DIR"
+#define runsv_full_usage "\n\n" \
        "Start and monitor a service and optionally an appendant log service"
 
 #define runsvdir_trivial_usage \
-       "[-P] dir"
-#define runsvdir_full_usage \
-       "Start a runsv process for each subdirectory"
+       "[-P] [-s SCRIPT] DIR"
+#define runsvdir_full_usage "\n\n" \
+       "Start a runsv process for each subdirectory. If it exits, restart it.\n" \
+     "\n    -P      Put each runsv in a new session" \
+     "\n    -s SCRIPT   Run SCRIPT <signo> after signal is processed" \
 
 #define rx_trivial_usage \
        "FILE"
-#define rx_full_usage \
+#define rx_full_usage "\n\n" \
        "Receive a file using the xmodem protocol"
 #define rx_example_usage \
        "$ rx /tmp/foo\n"
 
+#define script_trivial_usage \
+       "[-afq" IF_SCRIPTREPLAY("t") "] [-c PROG] [OUTFILE]"
+#define script_full_usage "\n\n" \
+       "Options:" \
+     "\n    -a  Append output" \
+     "\n    -c PROG Run PROG, not shell" \
+     "\n    -f  Flush output after each write" \
+     "\n    -q  Quiet" \
+    IF_SCRIPTREPLAY( \
+     "\n    -t  Send timing to stderr" \
+    )
+
 #define sed_trivial_usage \
-       "[-efinr] pattern [files...]"
-#define sed_full_usage \
-       "Options:\n" \
-       "    -e script   Add the script to the commands to be executed\n" \
-       "    -f scriptfile   Add script-file contents to the\n" \
-       "            commands to be executed\n" \
-       "    -i      Edit files in-place\n" \
-       "    -n      Suppress automatic printing of pattern space\n" \
-       "    -r      Use extended regular expression syntax\n" \
-       "\n" \
-       "If no -e or -f is given, the first non-option argument is taken as the sed\n" \
-       "script to interpret. All remaining arguments are names of input files; if no\n" \
-       "input files are specified, then the standard input is read. Source files\n" \
-       "will not be modified unless -i option is given."
+       "[-efinr] SED_CMD [FILE]..."
+#define sed_full_usage "\n\n" \
+       "Options:" \
+     "\n    -e CMD  Add CMD to sed commands to be executed" \
+     "\n    -f FILE Add FILE contents to sed commands to be executed" \
+     "\n    -i  Edit files in-place (else sends result to stdout)" \
+     "\n    -n  Suppress automatic printing of pattern space" \
+     "\n    -r  Use extended regex syntax" \
+     "\n" \
+     "\nIf no -e or -f, the first non-option argument is the sed command string." \
+     "\nRemaining arguments are input files (stdin if none)."
 
 #define sed_example_usage \
@@ -2952 +4509 @@
        "bar\n"
 
-#define selinuxenabled_trivial_usage
-#define selinuxenabled_full_usage
+#define selinuxenabled_trivial_usage NOUSAGE_STR
+#define selinuxenabled_full_usage ""
+
+#define sendmail_trivial_usage \
+       "[OPTIONS] [RECIPIENT_EMAIL]..."
+#define sendmail_full_usage "\n\n" \
+       "Read email from stdin and send it\n" \
+     "\nStandard options:" \
+     "\n    -t      Read additional recipients from message body" \
+     "\n    -f sender   Sender (required)" \
+     "\n    -o options  Various options. -oi implied, others are ignored" \
+     "\n    -i      -oi synonym. implied and ignored" \
+     "\n" \
+     "\nBusybox specific options:" \
+     "\n    -w seconds  Network timeout" \
+     "\n    -H 'PROG ARGS'  Run connection helper" \
+     "\n            Examples:" \
+     "\n            -H 'exec openssl s_client -quiet -tls1 -starttls smtp" \
+     "\n                -connect smtp.gmail.com:25' <email.txt" \
+     "\n                [4<username_and_passwd.txt | -au<username> -ap<password>]" \
+     "\n            -H 'exec openssl s_client -quiet -tls1" \
+     "\n                -connect smtp.gmail.com:465' <email.txt" \
+     "\n                [4<username_and_passwd.txt | -au<username> -ap<password>]" \
+     "\n    -S server[:port] Server" \
+     "\n    -au<username>   Username for AUTH LOGIN" \
+     "\n    -ap<password>   Password for AUTH LOGIN" \
+     "\n    -am<method> Authentication method. Ignored. LOGIN is implied" \
+     "\n" \
+     "\nOther options are silently ignored; -oi -t is implied" \
+    IF_MAKEMIME( \
+     "\nUse makemime applet to create message with attachments" \
+    )
 
 #define seq_trivial_usage \
-       "[first [increment]] last"
-#define seq_full_usage \
-       "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" \
-       "FIRST, INCREMENT default to 1" \
-       "\n\nArguments:\n" \
-       "    LAST\n" \
-       "    FIRST LAST\n" \
-       "    FIRST INCREMENT LAST"
+       "[-w] [-s SEP] [FIRST [INC]] LAST"
+#define seq_full_usage "\n\n" \
+       "Print numbers from FIRST to LAST, in steps of INC.\n" \
+       "FIRST, INC default to 1.\n" \
+     "\nOptions:" \
+     "\n    -w  Pad to last with leading zeros" \
+     "\n    -s SEP  String separator" \
+
+#define sestatus_trivial_usage \
+       "[-vb]"
+#define sestatus_full_usage "\n\n" \
+       "    -v  Verbose" \
+     "\n    -b  Display current state of booleans" \
 
 #define setconsole_trivial_usage \
-       "[-r|--reset] [DEVICE]"
-#define setconsole_full_usage \
-       "Redirect system console output to DEVICE (default: /dev/tty)" \
-       "\n\nOptions:\n" \
-       "    -r  Reset output to /dev/console"
+       "[-r" IF_FEATURE_SETCONSOLE_LONG_OPTIONS("|--reset") "] [DEVICE]"
+#define setconsole_full_usage "\n\n" \
+       "Redirect system console output to DEVICE (default: /dev/tty)\n" \
+     "\nOptions:" \
+     "\n    -r  Reset output to /dev/console" \
 
 #define setenforce_trivial_usage \
        "[Enforcing | Permissive | 1 | 0]"
-#define setenforce_full_usage
+#define setenforce_full_usage ""
 
 #define setfiles_trivial_usage \
-       "[-dnpqsvW] [-e dir]... [-o filename] [-r alt_root_path]" \
-    USE_FEATURE_SETFILES_CHECK_OPTION( \
+       "[-dnpqsvW] [-e DIR]... [-o FILE] [-r alt_root_path]" \
+    IF_FEATURE_SETFILES_CHECK_OPTION( \
        " [-c policyfile] spec_file" \
     ) \
        " pathname"
-
-#define setfiles_full_usage \
-       "Reset file contexts under pathname according to spec_file" \
-    USE_FEATURE_SETFILES_CHECK_OPTION( \
-       "\n  -c file Check the validity of the contexts against the specified binary policy" \
-    ) \
-       "\n  -d  Show which specification matched each file" \
-       "\n  -l  Log changes in file labels to syslog" \
-       "\n  -n  Don't change any file labels" \
-       "\n  -q  Suppress warnings" \
-       "\n  -r dir  Use an altenate root path" \
-       "\n  -e dir  Exclude directory" \
-       "\n  -F  Force reset of context to match file_context for customizable files" \
-       "\n  -o file Save list of files with incorrect context" \
-       "\n  -s  Take a list of files from standard input (instead of command line)" \
-       "\n  -v  Show changes in file labels, if type or role are changing" \
-       "\n  -vv Show changes in file labels, if type, role, or user are changing" \
-       "\n  -W  Display warnings about entries that had no matching files"
+#define setfiles_full_usage "\n\n" \
+       "Reset file contexts under pathname according to spec_file\n" \
+    IF_FEATURE_SETFILES_CHECK_OPTION( \
+     "\n    -c FILE Check the validity of the contexts against the specified binary policy" \
+    ) \
+     "\n    -d  Show which specification matched each file" \
+     "\n    -l  Log changes in file labels to syslog" \
+     "\n    -n  Don't change any file labels" \
+     "\n    -q  Suppress warnings" \
+     "\n    -r DIR  Use an alternate root path" \
+     "\n    -e DIR  Exclude DIR" \
+     "\n    -F  Force reset of context to match file_context for customizable files" \
+     "\n    -o FILE Save list of files with incorrect context" \
+     "\n    -s  Take a list of files from stdin (instead of command line)" \
+     "\n    -v  Show changes in file labels, if type or role are changing" \
+     "\n    -vv Show changes in file labels, if type, role, or user are changing" \
+     "\n    -W  Display warnings about entries that had no matching files" \
+
+#define setfont_trivial_usage \
+       "FONT [-m MAPFILE] [-C TTY]"
+#define setfont_full_usage "\n\n" \
+       "Load a console font\n" \
+     "\nOptions:" \
+     "\n    -m MAPFILE  Load console screen map" \
+     "\n    -C TTY      Affect TTY instead of /dev/tty" \
+
+#define setfont_example_usage \
+       "$ setfont -m koi8-r /etc/i18n/fontname\n"
 
 #define setkeycodes_trivial_usage \
-       "SCANCODE KEYCODE ..."
-#define setkeycodes_full_usage \
+       "SCANCODE KEYCODE..."
+#define setkeycodes_full_usage "\n\n" \
        "Set entries into the kernel's scancode-to-keycode map,\n" \
        "allowing unusual keyboards to generate usable keycodes.\n\n" \
        "SCANCODE may be either xx or e0xx (hexadecimal),\n" \
-       "and KEYCODE is given in decimal"
+       "and KEYCODE is given in decimal." \
+
 #define setkeycodes_example_usage \
        "$ setkeycodes e030 127\n"
@@ -3013 +4616 @@
 #define setlogcons_trivial_usage \
        "N"
-#define setlogcons_full_usage \
+#define setlogcons_full_usage "\n\n" \
        "Redirect the kernel output to console N (0 for current)"
 
+#define setsebool_trivial_usage \
+       "boolean value"
+
+#define setsebool_full_usage "\n\n" \
+       "Change boolean setting"
+
 #define setsid_trivial_usage \
-       "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."
-
-#define lash_trivial_usage \
-       "[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."
+       "PROG ARGS"
+#define setsid_full_usage "\n\n" \
+       "Run PROG in a new session. PROG will have no controlling terminal\n" \
+       "and will not be affected by keyboard signals (Ctrl-C etc).\n" \
+       "See setsid(2) for details." \
 
 #define last_trivial_usage \
-       ""
-#define last_full_usage \
-       "Show listing of the last users that logged into the system"
-
-#define sha1sum_trivial_usage \
-       "[OPTION] [FILEs...]" \
-    USE_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha1sum [OPTION] -c [FILE]")
-#define sha1sum_full_usage \
-       "Print" USE_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums.\n" \
-       "With no FILE, or when FILE is -, read standard input." \
-       "\n\nOptions:\n" \
-    USE_FEATURE_MD5_SHA1_SUM_CHECK( \
-       "    -c  Check SHA1 sums against given list\n" \
-       "\nThe following two options are useful only when verifying checksums:\n" \
-       "    -s  Don't output anything, status code shows success\n" \
-       "    -w  Warn about improperly formatted SHA1 checksum lines")
+       ""IF_FEATURE_LAST_FANCY("[-HW] [-f FILE]")
+#define last_full_usage "\n\n" \
+       "Show listing of the last users that logged into the system" \
+    IF_FEATURE_LAST_FANCY( "\n" \
+     "\nOptions:" \
+/*   "\n    -H  Show header line" */ \
+     "\n    -W  Display with no host column truncation" \
+     "\n    -f FILE Read from FILE instead of /var/log/wtmp" \
+    )
+
+#define showkey_trivial_usage \
+       "[-a | -k | -s]"
+#define showkey_full_usage "\n\n" \
+       "Show keys pressed\n" \
+     "\nOptions:" \
+     "\n    -a  Display decimal/octal/hex values of the keys" \
+     "\n    -k  Display interpreted keycodes (default)" \
+     "\n    -s  Display raw scan-codes" \
 
 #define slattach_trivial_usage \
-       "[-cehmLF] [-s speed] [-p protocol] DEVICEs"
-#define slattach_full_usage \
+       "[-cehmLF] [-s SPEED] [-p PROTOCOL] DEVICE"
+#define slattach_full_usage "\n\n" \
        "Attach network interface(s) to serial line(s)\n" \
      "\nOptions:" \
-     "\n    -p  Set protocol (slip, cslip, slip6, clisp6 or adaptive)" \
-     "\n    -s  Set line speed" \
+     "\n    -p PROT Set protocol (slip, cslip, slip6, clisp6 or adaptive)" \
+     "\n    -s SPD  Set line speed" \
      "\n    -e  Exit after initializing device" \
      "\n    -h  Exit when the carrier is lost" \
-     "\n    -c  Execute a command when the line is hung up" \
+     "\n    -c PROG Run PROG when the line is hung up" \
      "\n    -m  Do NOT initialize the line in raw 8 bits mode" \
      "\n    -L  Enable 3-wire operation" \
@@ -3069 +4667 @@
 
 #define sleep_trivial_usage \
-    USE_FEATURE_FANCY_SLEEP("[") "N" USE_FEATURE_FANCY_SLEEP("]...")
-#define sleep_full_usage \
-    SKIP_FEATURE_FANCY_SLEEP("Pause for N seconds") \
-    USE_FEATURE_FANCY_SLEEP( \
+    IF_FEATURE_FANCY_SLEEP("[") "N" IF_FEATURE_FANCY_SLEEP("]...")
+#define sleep_full_usage "\n\n" \
+    IF_NOT_FEATURE_FANCY_SLEEP("Pause for N seconds") \
+    IF_FEATURE_FANCY_SLEEP( \
        "Pause for a time equal to the total of the args given, where each arg can\n" \
        "have an optional suffix of (s)econds, (m)inutes, (h)ours, or (d)ays")
@@ -3078 +4676 @@
        "$ sleep 2\n" \
        "[2 second delay results]\n" \
-    USE_FEATURE_FANCY_SLEEP( \
+    IF_FEATURE_FANCY_SLEEP( \
        "$ sleep 1d 3h 22m 8s\n" \
        "[98528 second delay results]\n")
@@ -3084 +4682 @@
 #define sort_trivial_usage \
        "[-nru" \
-    USE_FEATURE_SORT_BIG("gMcszbdfimSTokt] [-o outfile] [-k start[.offset][opts][,end[.offset][opts]] [-t char") \
+    IF_FEATURE_SORT_BIG("gMcszbdfimSTokt] [-o FILE] [-k start[.offset][opts][,end[.offset][opts]] [-t CHAR") \
        "] [FILE]..."
-#define sort_full_usage \
-       "Sort lines of text in the specified files" \
-       "\n\nOptions:\n" \
-    USE_FEATURE_SORT_BIG( \
-       "    -b  Ignore leading blanks\n" \
-       "    -c  Check whether input is sorted\n" \
-       "    -d  Dictionary order (blank or alphanumeric only)\n" \
-       "    -f  Ignore case\n" \
-       "    -g  General numerical sort\n" \
-       "    -i  Ignore unprintable characters\n" \
-       "    -k  Specify sort key\n" \
-       "    -M  Sort month\n") \
-       "    -n  Sort numbers\n" \
-    USE_FEATURE_SORT_BIG( \
-       "    -o  Output to file\n" \
-       "    -k  Sort by key\n" \
-       "    -t  Use key separator other than whitespace\n") \
-       "    -r  Reverse sort order\n" \
-    USE_FEATURE_SORT_BIG( \
-       "    -s  Stable (don't sort ties alphabetically)\n") \
-       "    -u  Suppress duplicate lines" \
-    USE_FEATURE_SORT_BIG( \
-       "\n  -z  Input terminated by nulls, not newlines\n") \
-    USE_FEATURE_SORT_BIG( \
-       "    -mST    Ignored for GNU compatibility") \
-       ""
+#define sort_full_usage "\n\n" \
+       "Sort lines of text\n" \
+     "\nOptions:" \
+    IF_FEATURE_SORT_BIG( \
+     "\n    -b  Ignore leading blanks" \
+     "\n    -c  Check whether input is sorted" \
+     "\n    -d  Dictionary order (blank or alphanumeric only)" \
+     "\n    -f  Ignore case" \
+     "\n    -g  General numerical sort" \
+     "\n    -i  Ignore unprintable characters" \
+     "\n    -k  Sort key" \
+     "\n    -M  Sort month" \
+    ) \
+     "\n    -n  Sort numbers" \
+    IF_FEATURE_SORT_BIG( \
+     "\n    -o  Output to file" \
+     "\n    -k  Sort by key" \
+     "\n    -t CHAR Key separator" \
+    ) \
+     "\n    -r  Reverse sort order" \
+    IF_FEATURE_SORT_BIG( \
+     "\n    -s  Stable (don't sort ties alphabetically)" \
+    ) \
+     "\n    -u  Suppress duplicate lines" \
+    IF_FEATURE_SORT_BIG( \
+     "\n    -z  Lines are terminated by NUL, not newline" \
+     "\n    -mST    Ignored for GNU compatibility") \
+
 #define sort_example_usage \
        "$ echo -e \"e\\nf\\nb\\nd\\nc\\na\" | sort\n" \
@@ -3120 +4720 @@
        "e\n" \
        "f\n" \
-    USE_FEATURE_SORT_BIG( \
+    IF_FEATURE_SORT_BIG( \
         "$ echo -e \"c 3\\nb 2\\nd 2\" | $SORT -k 2,2n -k 1,1r\n" \
         "d 2\n" \
@@ -3129 +4729 @@
 
 #define split_trivial_usage \
-       "[OPTION] [INPUT [PREFIX]]"
-#define split_full_usage \
+       "[OPTIONS] [INPUT [PREFIX]]"
+#define split_full_usage "\n\n" \
        "Options:" \
-       "\n  -b n[k|m]   Split by bytes" \
-       "\n  -l n        Split by lines" \
-       "\n  -a n        Use n letters as suffix"
+     "\n    -b N[k|m]   Split by N (kilo|mega)bytes" \
+     "\n    -l N        Split by N lines" \
+     "\n    -a N        Use N letters as suffix" \
+
 #define split_example_usage \
        "$ split TODO foo\n" \
@@ -3140 +4741 @@
 
 #define start_stop_daemon_trivial_usage \
-       "[OPTIONS] [--start|--stop] ... [-- 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         Force 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_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  -s|--signal signal      Signal to send (default TERM)" \
-       "\n  -c|--chuid user[:[group]]   Change to specified user/group"
+       "[OPTIONS] [-S|-K] ... [-- ARGS...]"
+#define start_stop_daemon_full_usage "\n\n" \
+       "Search for matching processes, and then\n" \
+       "-K: stop all matching processes.\n" \
+       "-S: start a process unless a matching process is found.\n" \
+    IF_FEATURE_START_STOP_DAEMON_LONG_OPTIONS( \
+     "\nProcess matching:" \
+     "\n    -u,--user USERNAME|UID  Match only this user's processes" \
+     "\n    -n,--name NAME      Match processes with NAME" \
+     "\n                in comm field in /proc/PID/stat" \
+     "\n    -x,--exec EXECUTABLE    Match processes with this command" \
+     "\n                in /proc/PID/cmdline" \
+     "\n    -p,--pidfile FILE   Match a process with PID from the file" \
+     "\n    All specified conditions must match" \
+     "\n-S only:" \
+     "\n    -x,--exec EXECUTABLE    Program to run" \
+     "\n    -a,--startas NAME   Zeroth argument" \
+     "\n    -b,--background     Background" \
+    IF_FEATURE_START_STOP_DAEMON_FANCY( \
+     "\n    -N,--nicelevel N    Change nice level" \
+    ) \
+     "\n    -c,--chuid USER[:[GRP]] Change to user/group" \
+     "\n    -m,--make-pidfile   Write PID to the pidfile specified by -p" \
+     "\n-K only:" \
+     "\n    -s,--signal SIG     Signal to send" \
+     "\n    -t,--test       Match only, exit with 0 if a process is found" \
+     "\nOther:" \
+    IF_FEATURE_START_STOP_DAEMON_FANCY( \
+     "\n    -o,--oknodo     Exit with status 0 if nothing is done" \
+     "\n    -v,--verbose        Verbose" \
+    ) \
+     "\n    -q,--quiet      Quiet" \
+    ) \
+    IF_NOT_FEATURE_START_STOP_DAEMON_LONG_OPTIONS( \
+     "\nProcess matching:" \
+     "\n    -u USERNAME|UID Match only this user's processes" \
+     "\n    -n NAME     Match processes with NAME" \
+     "\n            in comm field in /proc/PID/stat" \
+     "\n    -x EXECUTABLE   Match processes with this command" \
+     "\n            command in /proc/PID/cmdline" \
+     "\n    -p FILE     Match a process with PID from the file" \
+     "\n    All specified conditions must match" \
+     "\n-S only:" \
+     "\n    -x EXECUTABLE   Program to run" \
+     "\n    -a NAME     Zeroth argument" \
+     "\n    -b      Background" \
+    IF_FEATURE_START_STOP_DAEMON_FANCY( \
+     "\n    -N N        Change nice level" \
+    ) \
+     "\n    -c USER[:[GRP]] Change to user/group" \
+     "\n    -m      Write PID to the pidfile specified by -p" \
+     "\n-K only:" \
+     "\n    -s SIG      Signal to send" \
+     "\n    -t      Match only, exit with 0 if a process is found" \
+     "\nOther:" \
+    IF_FEATURE_START_STOP_DAEMON_FANCY( \
+     "\n    -o      Exit with status 0 if nothing is done" \
+     "\n    -v      Verbose" \
+    ) \
+     "\n    -q      Quiet" \
+    ) \
 
 #define stat_trivial_usage \
-       "[OPTION] FILE..."
-#define stat_full_usage \
-       "Display file (default) or filesystem status" \
-       "\n\nOptions:\n" \
-    USE_FEATURE_STAT_FORMAT( \
-       "    -c fmt  Use the specified format\n") \
-       "    -f  Display filesystem status\n" \
-       "    -L,-l   Dereference links\n" \
-       "    -t  Display info in terse form" \
-    USE_SELINUX( \
-       "\n  -Z  Print security context" \
-    ) \
-    USE_FEATURE_STAT_FORMAT( \
+       "[OPTIONS] FILE..."
+#define stat_full_usage "\n\n" \
+       "Display file (default) or filesystem status\n" \
+     "\nOptions:" \
+    IF_FEATURE_STAT_FORMAT( \
+     "\n    -c fmt  Use the specified format" \
+    ) \
+     "\n    -f  Display filesystem status" \
+     "\n    -L  Follow links" \
+     "\n    -t  Display info in terse form" \
+    IF_SELINUX( \
+     "\n    -Z  Print security context" \
+    ) \
+    IF_FEATURE_STAT_FORMAT( \
        "\n\nValid format sequences for files:\n" \
        " %a Access rights in octal\n" \
@@ -3190 +4832 @@
        " %i Inode number\n" \
        " %n File name\n" \
-       " %N Quoted file name with dereference if symlink\n" \
+       " %N File name, with -> TARGET if symlink\n" \
        " %o I/O block size\n" \
        " %s Total size, in bytes\n" \
@@ -3209 +4851 @@
        " %d Free file nodes in file system\n" \
        " %f Free blocks in file system\n" \
-    USE_SELINUX( \
-       " %C Security context in SELinux\n" \
+    IF_SELINUX( \
+       " %C Security context in selinux\n" \
     ) \
        " %i File System ID in hex\n" \
@@ -3219 +4861 @@
        " %t Type in hex\n" \
        " %T Type in human readable form" \
-    )
+    ) \
 
 #define strings_trivial_usage \
-       "[-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"
+       "[-afo] [-n LEN] [FILE]..."
+#define strings_full_usage "\n\n" \
+       "Display printable strings in a binary file\n" \
+     "\nOptions:" \
+     "\n    -a  Scan whole file (default)" \
+     "\n    -f  Precede strings with filenames" \
+     "\n    -n LEN  At least LEN characters form a string (default 4)" \
+     "\n    -o  Precede strings with decimal offsets" \
 
 #define stty_trivial_usage \
        "[-a|g] [-F DEVICE] [SETTING]..."
-#define stty_full_usage \
+#define stty_full_usage "\n\n" \
        "Without arguments, prints baud rate, line discipline,\n" \
-       "and deviations from stty sane" \
-       "\n\nOptions:" \
-       "\n  -F DEVICE   Open device instead of stdin" \
-       "\n  -a      Print all current settings in human-readable form" \
-       "\n  -g      Print in stty-readable form" \
-       "\n  [SETTING]   See manpage"
+       "and deviations from stty sane\n" \
+     "\nOptions:" \
+     "\n    -F DEVICE   Open device instead of stdin" \
+     "\n    -a      Print all current settings in human-readable form" \
+     "\n    -g      Print in stty-readable form" \
+     "\n    [SETTING]   See manpage" \
 
 #define su_trivial_usage \
-       "[OPTION]... [-] [username]"
-#define su_full_usage \
-       "Change user id or become root" \
-       "\n\nOptions:" \
-       "\n  -p, -m  Preserve environment" \
-       "\n  -c  Command to pass to 'sh -c'" \
-       "\n  -s  Shell to use instead of default shell"
+       "[OPTIONS] [-] [USERNAME]"
+#define su_full_usage "\n\n" \
+       "Change user id or become root\n" \
+     "\nOptions:" \
+     "\n    -p,-m   Preserve environment" \
+     "\n    -c CMD  Command to pass to 'sh -c'" \
+     "\n    -s SH   Shell to use instead of default shell" \
 
 #define sulogin_trivial_usage \
-       "[OPTION]... [tty-device]"
-#define sulogin_full_usage \
-       "Single user login" \
-       "\n\nOptions:" \
-       "\n  -t  Timeout"
+       "[-t N] [TTY]"
+#define sulogin_full_usage "\n\n" \
+       "Single user login\n" \
+     "\nOptions:" \
+     "\n    -t N    Timeout" \
 
 #define sum_trivial_usage \
-       "[rs] [files...]"
-#define sum_full_usage \
-       "Checksum and count the blocks in a file" \
-       "\n\nOptions:\n" \
-       "    -r  Use BSD sum algorithm (1K blocks)\n" \
-       "    -s  Use System V sum algorithm (512byte blocks)"
+       "[-rs] [FILE]..."
+#define sum_full_usage "\n\n" \
+       "Checksum and count the blocks in a file\n" \
+     "\nOptions:" \
+     "\n    -r  Use BSD sum algorithm (1K blocks)" \
+     "\n    -s  Use System V sum algorithm (512byte blocks)" \
 
 #define sv_trivial_usage \
-       "[-v] [-w sec] command service..."
-#define sv_full_usage \
+       "[-v] [-w SEC] CMD SERVICE_DIR..."
+#define sv_full_usage "\n\n" \
        "Control services monitored by runsv supervisor.\n" \
        "Commands (only first character is enough):\n" \
@@ -3276 +4918 @@
        "once: like 'up', but if service stops, don't restart it\n" \
        "down: send TERM and CONT signals. If ./run exits, start ./finish\n" \
-       "    if it exists. After it stops, do not restart service\n" \
+       "    if it exists. After it stops, don't restart service\n" \
        "exit: send TERM and CONT signals to service and log service. If they exit,\n" \
-       "    runsv exits too\n" \
+       "    runsv exits too\n" \
        "pause, cont, hup, alarm, interrupt, quit, 1, 2, term, kill: send\n" \
-       "STOP, CONT, HUP, ALRM, INT, QUIT, USR1, USR2, TERM, KILL signal to service"
+       "STOP, CONT, HUP, ALRM, INT, QUIT, USR1, USR2, TERM, KILL signal to service" \
 
 #define svlogd_trivial_usage \
-       "[-ttv] [-r c] [-R abc] [-l len] [-b buflen] dir..."
-#define svlogd_full_usage \
-       "Continuously read log data from standard input, optionally " \
-       "filter log messages, and write the data to one or more automatically " \
-       "rotated logs"
+       "[-ttv] [-r C] [-R CHARS] [-l MATCHLEN] [-b BUFLEN] DIR..."
+#define svlogd_full_usage "\n\n" \
+       "Continuously read log data from stdin, optionally\n" \
+       "filter log messages, and write the data to one or more automatically\n" \
+       "rotated logs" \
 
 #define swapoff_trivial_usage \
        "[-a] [DEVICE]"
-#define swapoff_full_usage \
-       "Stop swapping virtual memory pages on DEVICE" \
-       "\n\nOptions:\n" \
-       "    -a  Stop swapping on all swap devices"
+#define swapoff_full_usage "\n\n" \
+       "Stop swapping on DEVICE\n" \
+     "\nOptions:" \
+     "\n    -a  Stop swapping on all swap devices" \
 
 #define swapon_trivial_usage \
-       "[-a] [DEVICE]"
-#define swapon_full_usage \
-       "Start swapping virtual memory pages on DEVICE" \
-       "\n\nOptions:\n" \
-       "    -a  Start swapping on all swap devices"
+       "[-a]" IF_FEATURE_SWAPON_PRI(" [-p PRI]") " [DEVICE]"
+#define swapon_full_usage "\n\n" \
+       "Start swapping on DEVICE\n" \
+     "\nOptions:" \
+     "\n    -a  Start swapping on all swap devices" \
+    IF_FEATURE_SWAPON_PRI( \
+     "\n    -p PRI  Set swap device priority" \
+    ) \
 
 #define switch_root_trivial_usage \
-       "[-c /dev/console] NEW_ROOT NEW_INIT [ARGUMENTS_TO_INIT]"
-#define switch_root_full_usage \
-       "Use from PID 1 under initramfs to free initramfs, chroot to NEW_ROOT,\n" \
-       "and exec NEW_INIT" \
-       "\n\nOptions:\n" \
-       "    -c  Redirect console to device on new root"
+       "[-c /dev/console] NEW_ROOT NEW_INIT [ARGS]"
+#define switch_root_full_usage "\n\n" \
+       "Free initramfs and switch to another root fs:\n" \
+       "chroot to NEW_ROOT, delete all in /, move NEW_ROOT to /,\n" \
+       "execute NEW_INIT. PID must be 1. NEW_ROOT must be a mountpoint.\n" \
+     "\nOptions:" \
+     "\n    -c DEV  Reopen stdio to DEV after switch" \
 
 #define sync_trivial_usage \
        ""
-#define sync_full_usage \
-       "Write all buffered filesystem blocks to disk"
+#define sync_full_usage "\n\n" \
+       "Write all buffered blocks to disk"
+
+#define fsync_trivial_usage \
+       "[-d] FILE..."
+#define fsync_full_usage "\n\n" \
+       "Write files' buffered blocks to disk\n" \
+     "\nOptions:" \
+     "\n    -d  Avoid syncing metadata"
 
 #define sysctl_trivial_usage \
-       "[OPTIONS]... [VALUE]..."
-#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"
+       "[OPTIONS] [VALUE]..."
+#define sysctl_full_usage "\n\n" \
+       "Configure kernel parameters at runtime\n" \
+     "\nOptions:" \
+     "\n    -n  Don't print 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]..."
-#define syslogd_full_usage \
+       "[OPTIONS]"
+#define syslogd_full_usage "\n\n" \
        "System logging utility.\n" \
-       "Note that this version of syslogd ignores /etc/syslog.conf." \
-       "\n\nOptions:" \
-       "\n  -n      Run as foreground process" \
-       "\n  -O FILE     Log to given file (default=/var/log/messages)" \
-       "\n  -l n        Set local log level" \
-       "\n  -S      Smaller logging output" \
-    USE_FEATURE_ROTATE_LOGFILE( \
-       "\n  -s SIZE     Max size (KB) before rotate (default=200KB, 0=off)" \
-       "\n  -b NUM      Number of rotated logs to keep (default=1, max=99, 0=purge)") \
-    USE_FEATURE_REMOTE_LOG( \
-       "\n  -R HOST[:PORT]  Log to IP or hostname on PORT (default PORT=514/UDP)" \
-       "\n  -L      Log locally and via network (default is network only if -R)") \
-    USE_FEATURE_IPC_SYSLOG( \
-       "\n  -C[size(KiB)]   Log to shared mem buffer (read it using logread)")
+       "This version of syslogd ignores /etc/syslog.conf\n" \
+     "\nOptions:" \
+     "\n    -n      Run in foreground" \
+     "\n    -O FILE     Log to given file (default:/var/log/messages)" \
+     "\n    -l N        Set local log level" \
+     "\n    -S      Smaller logging output" \
+    IF_FEATURE_ROTATE_LOGFILE( \
+     "\n    -s SIZE     Max size (KB) before rotate (default:200KB, 0=off)" \
+     "\n    -b N        N rotated logs to keep (default:1, max=99, 0=purge)") \
+    IF_FEATURE_REMOTE_LOG( \
+     "\n    -R HOST[:PORT]  Log to IP or hostname on PORT (default PORT=514/UDP)" \
+     "\n    -L      Log locally and via network (default is network only if -R)") \
+    IF_FEATURE_SYSLOGD_DUP( \
+     "\n    -D      Drop duplicates") \
+    IF_FEATURE_IPC_SYSLOG( \
+     "\n    -C[size(KiB)]   Log to shared mem buffer (read it using logread)") \
     /* NB: -Csize shouldn't have space (because size is optional) */
-/*     "\n  -m MIN      Minutes between MARK lines (default=20, 0=off)" */
+/*   "\n    -m MIN      Minutes between MARK lines (default:20, 0=off)" */
+
 #define syslogd_example_usage \
        "$ syslogd -R masterlog:514\n" \
        "$ syslogd -R 192.168.1.1:601\n"
 
-#define tail_trivial_usage \
-       "[OPTION]... [FILE]..."
-#define tail_full_usage \
-       "Print last 10 lines of each FILE to standard output.\n" \
-       "With more than one FILE, precede each with a header giving the\n" \
-       "file name. With no FILE, or when FILE is -, read standard input." \
-       "\n\nOptions:" \
-    USE_FEATURE_FANCY_TAIL( \
-       "\n  -c N[kbm]   Output the last N bytes") \
-       "\n  -n N[kbm]   Print last N lines instead of last 10" \
-       "\n  -f      Output data as the file grows" \
-    USE_FEATURE_FANCY_TAIL( \
-       "\n  -q      Never output headers giving file names" \
-       "\n  -s SEC      Wait SEC seconds between reads with -f" \
-       "\n  -v      Always output headers giving file names" \
-       "\n\n" \
-       "If the first character of N (bytes or lines) is a '+', output begins with\n" \
-       "the Nth item from the start of each file, otherwise, print the last N items\n" \
-       "in the file. N bytes may be suffixed by k (x1024), b (x512), or m (1024^2)." )
-#define tail_example_usage \
-       "$ tail -n 1 /etc/resolv.conf\n" \
-       "nameserver 10.0.0.1\n"
-
-#define tar_trivial_usage \
-       "-[" USE_FEATURE_TAR_CREATE("c") USE_FEATURE_TAR_GZIP("z") \
-    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)] ..."
-#define tar_full_usage \
-       "Create, extract, or list files from a tar file" \
-       "\n\nOptions:\n" \
-    USE_FEATURE_TAR_CREATE( \
-       "    c   Create\n") \
-       "    x   Extract\n" \
-       "    t   List\n" \
-       "\nArchive format selection:\n" \
-    USE_FEATURE_TAR_GZIP( \
-       "    z   Filter the archive through gzip\n") \
-    USE_FEATURE_TAR_BZIP2( \
-       "    j   Filter the archive through bzip2\n") \
-    USE_FEATURE_TAR_LZMA( \
-       "    a   Filter the archive through lzma\n") \
-    USE_FEATURE_TAR_COMPRESS( \
-       "    Z   Filter the archive through compress\n") \
-       "\nFile selection:\n" \
-       "    f   Name of TARFILE or \"-\" for stdin\n" \
-       "    O   Extract to stdout\n" \
-    USE_FEATURE_TAR_FROM( \
-       "    exclude File to exclude\n" \
-       "    X   File with names to exclude\n") \
-       "    C   Change to directory DIR before operation\n" \
-       "    v   Verbose"
-#define tar_example_usage \
-       "$ zcat /tmp/tarball.tar.gz | tar -xf -\n" \
-       "$ tar -cf /tmp/tarball.tar /usr/local\n"
+#define tac_trivial_usage \
+    "[FILE]..."
+#define tac_full_usage "\n\n" \
+    "Concatenate FILEs and print them in reverse"
 
 #define taskset_trivial_usage \
-       "[OPTIONS] [mask] [pid | command [arg]...]"
-#define taskset_full_usage \
-       "Set or get CPU affinity" \
-       "\n\nOptions:\n" \
-       "    -p  Operate on an existing PID"
+       "[-p] [MASK] [PID | PROG ARGS]"
+#define taskset_full_usage "\n\n" \
+       "Set or get CPU affinity\n" \
+     "\nOptions:" \
+     "\n    -p  Operate on an existing PID" \
+
 #define taskset_example_usage \
        "$ taskset 0x7 ./dgemm_test&\n" \
@@ -3432 +5039 @@
 
 #define tee_trivial_usage \
-       "[OPTION]... [FILE]..."
-#define tee_full_usage \
-       "Copy standard input to each FILE, and also to standard output" \
-       "\n\nOptions:\n" \
-       "    -a  Append to the given FILEs, do not overwrite\n" \
-       "    -i  Ignore interrupt signals (SIGINT)"
+       "[-ai] [FILE]..."
+#define tee_full_usage "\n\n" \
+       "Copy stdin to each FILE, and also to stdout\n" \
+     "\nOptions:" \
+     "\n    -a  Append to the given FILEs, don't overwrite" \
+     "\n    -i  Ignore interrupt signals (SIGINT)" \
+
 #define tee_example_usage \
        "$ echo \"Hello\" | tee /tmp/foo\n" \
@@ -3446 +5054 @@
 #define telnet_trivial_usage \
        "[-a] [-l USER] HOST [PORT]"
-#define telnet_full_usage \
-       "Connect to remote telnet server" \
-       "\n\nOptions:\n" \
-       "    -a  Attempt an automatic login with the USER variable\n" \
-       "    -l USER Attempt an automatic login with the USER argument\n" \
-       "    HOST    The official name, alias or the IP address of the\n" \
-       "        remote host\n" \
-       "    PORT    The remote port number to connect to. If it is not\n" \
-       "        specified, the default telnet (23) port is used."
+#define telnet_full_usage "\n\n" \
+       "Connect to telnet server\n" \
+     "\nOptions:" \
+     "\n    -a  Automatic login with $USER variable" \
+     "\n    -l USER Automatic login as USER" \
+
 #else
 #define telnet_trivial_usage \
        "HOST [PORT]"
-#define telnet_full_usage \
-       "Connect to remote telnet server"
+#define telnet_full_usage "\n\n" \
+       "Connect to telnet server"
 #endif
 
 #define telnetd_trivial_usage \
-       "[OPTION]"
-#define telnetd_full_usage \
+       "[OPTIONS]"
+#define telnetd_full_usage "\n\n" \
        "Handle incoming telnet connections" \
-    SKIP_FEATURE_TELNETD_STANDALONE(" via inetd") \
-       "\n\nOptions:" \
-       "\n  -l LOGIN    Exec LOGIN on connect" \
-       "\n  -f issue_file   Display issue_file instead of /etc/issue" \
-    USE_FEATURE_TELNETD_STANDALONE( \
-       "\n  -p PORT     Port to listen to" \
-       "\n  -b ADDR     Address to bind to" \
-       "\n  -F      Stay in foreground" \
-       "\n  -i      Run as inetd subservice" \
+    IF_NOT_FEATURE_TELNETD_STANDALONE(" via inetd") "\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)" \
+    IF_FEATURE_TELNETD_STANDALONE( \
+     "\n    -p PORT     Port to listen on" \
+     "\n    -b ADDR[:PORT]  Address to bind to" \
+     "\n    -F      Run in foreground" \
+     "\n    -i      Inetd mode" \
+    IF_FEATURE_TELNETD_INETD_WAIT( \
+     "\n    -w SEC      Inetd 'wait' mode, linger time SEC" \
+     "\n    -S      Log to syslog (implied by -i or without -F and -w)" \
+    ) \
     )
 
+/* "test --help" does not print help (POSIX compat), only "[ --help" does.
+ * We display "<applet> EXPRESSION ]" here (not "<applet> EXPRESSION")
+ * Unfortunately, it screws up generated BusyBox.html. TODO. */
 #define test_trivial_usage \
-       "EXPRESSION\n  or   [ EXPRESSION ]"
-#define test_full_usage \
-       "Check file types and compares values returning an exit code\n" \
-       "determined by the value of EXPRESSION"
+       "EXPRESSION ]"
+#define test_full_usage "\n\n" \
+       "Check file types, compare values etc. Return a 0/1 exit code\n" \
+       "depending on logical value of EXPRESSION"
 #define test_example_usage \
        "$ test 1 -eq 2\n" \
@@ -3496 +5110 @@
        "1\n"
 
+#define tc_trivial_usage \
+    /*"[OPTIONS] "*/"OBJECT CMD [dev STRING]"
+#define tc_full_usage "\n\n" \
+    "OBJECT: {qdisc|class|filter}\n" \
+    "CMD: {add|del|change|replace|show}\n" \
+    "\n" \
+    "qdisc [ handle QHANDLE ] [ root |"IF_FEATURE_TC_INGRESS(" ingress |")" parent CLASSID ]\n" \
+    /* "[ estimator INTERVAL TIME_CONSTANT ]\n" */ \
+    "   [ [ QDISC_KIND ] [ help | OPTIONS ] ]\n" \
+    "   QDISC_KIND := { [p|b]fifo | tbf | prio | cbq | red | etc. }\n" \
+    "qdisc show [ dev STRING ]"IF_FEATURE_TC_INGRESS(" [ingress]")"\n" \
+    "class [ classid CLASSID ] [ root | parent CLASSID ]\n" \
+    "   [ [ QDISC_KIND ] [ help | OPTIONS ] ]\n" \
+    "class show [ dev STRING ] [ root | parent CLASSID ]\n" \
+    "filter [ pref PRIO ] [ protocol PROTO ]\n" \
+    /* "\t[ estimator INTERVAL TIME_CONSTANT ]\n" */ \
+    "   [ root | classid CLASSID ] [ handle FILTERID ]\n" \
+    "   [ [ FILTER_TYPE ] [ help | OPTIONS ] ]\n" \
+    "filter show [ dev STRING ] [ root | parent CLASSID ]"
+
 #define tcpsvd_trivial_usage \
-       "[-hEv] [-c n] [-C n:msg] [-b n] [-u user] [-l name] ip port prog..."
+       "[-hEv] [-c N] [-C N[:MSG]] [-b N] [-u USER] [-l NAME] IP PORT PROG"
 /* with not-implemented options: */
-/*     "[-hpEvv] [-c n] [-C n:msg] [-b n] [-u user] [-l name] [-i dir|-x cdb] [-t sec] ip port prog..." */
-#define tcpsvd_full_usage \
-       "Creates TCP socket, binds it to ip:port and listens on it\n" \
-       "for incoming connections. For each connection it runs prog." \
-     "\n" \
-     "\nip      IP to listen on. '0' = all" \
-     "\nport        Port to listen on" \
-     "\nprog [arg]  Program to run" \
-     "\n-l name     Local hostname (else looks up local hostname in DNS)" \
-     "\n-u user[:group] Change to user/group after bind" \
-     "\n-c n        Handle up to n connections simultaneously" \
-     "\n-b n        Allow a backlog of approximately n TCP SYNs" \
-     "\n-C n[:msg]  Allow only up to n connections from the same IP" \
-     "\n        New connections from this IP address are closed" \
-     "\n        immediately. 'msg' is written to the peer before close" \
-     "\n-h      Look up peer's hostname" \
-     "\n-E      Do not set up environment variables" \
-     "\n-v      Verbose"
+/*     "[-hpEvv] [-c N] [-C N[:MSG]] [-b N] [-u USER] [-l NAME] [-i DIR|-x CDB] [-t SEC] IP PORT PROG" */
+#define tcpsvd_full_usage "\n\n" \
+       "Create TCP socket, bind to IP:PORT and listen\n" \
+       "for incoming connection. Run PROG for each connection.\n" \
+     "\n    IP      IP to listen on. '0' = all" \
+     "\n    PORT        Port to listen on" \
+     "\n    PROG ARGS   Program to run" \
+     "\n    -l NAME     Local hostname (else looks up local hostname in DNS)" \
+     "\n    -u USER[:GRP]   Change to user/group after bind" \
+     "\n    -c N        Handle up to N connections simultaneously" \
+     "\n    -b N        Allow a backlog of approximately N TCP SYNs" \
+     "\n    -C N[:MSG]  Allow only up to N connections from the same IP." \
+     "\n            New connections from this IP address are closed" \
+     "\n            immediately. MSG is written to the peer before close" \
+     "\n    -h      Look up peer's hostname" \
+     "\n    -E      Don't set up environment variables" \
+     "\n    -v      Verbose" \
 
 #define udpsvd_trivial_usage \
-       "[-hEv] [-c n] [-u user] [-l name] ip port prog"
-#define udpsvd_full_usage \
-       "Creates UDP socket, binds it to ip:port and listens on it\n" \
-       "for incoming packets. For each packet it runs prog\n" \
-       "(redirecting all further packets with same peer ip:port to it)." \
-     "\n" \
-     "\nip      IP to listen on. '0' = all" \
-     "\nport        Port to listen on" \
-     "\nprog [arg]  Program to run" \
-     "\n-l name     Local hostname (else looks up local hostname in DNS)" \
-     "\n-u user[:group] Change to user/group after bind" \
-     "\n-c n        Handle up to n connections simultaneously" \
-     "\n-h      Look up peer's hostname" \
-     "\n-E      Do not set up environment variables" \
-     "\n-v      Verbose"
+       "[-hEv] [-c N] [-u USER] [-l NAME] IP PORT PROG"
+#define udpsvd_full_usage "\n\n" \
+       "Create UDP socket, bind to IP:PORT and wait\n" \
+       "for incoming packets. Run PROG for each packet,\n" \
+       "redirecting all further packets with same peer ip:port to it.\n" \
+     "\n    IP      IP to listen on. '0' = all" \
+     "\n    PORT        Port to listen on" \
+     "\n    PROG ARGS   Program to run" \
+     "\n    -l NAME     Local hostname (else looks up local hostname in DNS)" \
+     "\n    -u USER[:GRP]   Change to user/group after bind" \
+     "\n    -c N        Handle up to N connections simultaneously" \
+     "\n    -h      Look up peer's hostname" \
+     "\n    -E      Don't set up environment variables" \
+     "\n    -v      Verbose" \
 
 #define tftp_trivial_usage \
-       "[OPTION]... HOST [PORT]"
-#define tftp_full_usage \
-       "Transfer a file from/to tftp server using \"octet\" mode" \
-       "\n\nOptions:" \
-       "\n  -l FILE Local FILE" \
-       "\n  -r FILE Remote FILE" \
-    USE_FEATURE_TFTP_GET( \
-       "\n  -g  Get file" \
-    ) \
-    USE_FEATURE_TFTP_PUT( \
-       "\n  -p  Put file" \
-    ) \
-    USE_FEATURE_TFTP_BLOCKSIZE( \
-       "\n  -b SIZE Transfer blocks of SIZE octets" \
+       "[OPTIONS] HOST [PORT]"
+#define tftp_full_usage "\n\n" \
+       "Transfer a file from/to tftp server\n" \
+     "\nOptions:" \
+     "\n    -l FILE Local FILE" \
+     "\n    -r FILE Remote FILE" \
+    IF_FEATURE_TFTP_GET( \
+     "\n    -g  Get file" \
+    ) \
+    IF_FEATURE_TFTP_PUT( \
+     "\n    -p  Put file" \
+    ) \
+    IF_FEATURE_TFTP_BLOCKSIZE( \
+     "\n    -b SIZE Transfer blocks of SIZE octets" \
     )
+
+#define tftpd_trivial_usage \
+       "[-cr] [-u USER] [DIR]"
+#define tftpd_full_usage "\n\n" \
+       "Transfer a file on tftp client's request\n" \
+       "\n" \
+       "tftpd should be used as an inetd service.\n" \
+       "tftpd's line for inetd.conf:\n" \
+       "    69 dgram udp nowait root tftpd tftpd /files/to/serve\n" \
+       "It also can be ran from udpsvd:\n" \
+       "    udpsvd -vE 0.0.0.0 69 tftpd /files/to/serve\n" \
+     "\nOptions:" \
+     "\n    -r  Prohibit upload" \
+     "\n    -c  Allow file creation via upload" \
+     "\n    -u  Access files as USER" \
+
 #define time_trivial_usage \
-       "[OPTION]... COMMAND [ARGS...]"
-#define time_full_usage \
-       "Run the program COMMAND with arguments ARGS. When COMMAND finishes,\n" \
-       "COMMAND's resource usage information is displayed." \
-       "\n\nOptions:\n" \
-       "    -v  Verbose"
+       "[-v] PROG ARGS"
+#define time_full_usage "\n\n" \
+       "Run PROG, display resource usage when it exits\n" \
+     "\nOptions:" \
+     "\n    -v  Verbose" \
+
+#define timeout_trivial_usage \
+       "[-t SECS] [-s SIG] PROG ARGS"
+#define timeout_full_usage "\n\n" \
+       "Runs PROG. Sends SIG to it if it is not gone in SECS seconds.\n" \
+       "Defaults: SECS: 10, SIG: TERM." \
 
 #define top_trivial_usage \
-       "[-b] [-n count] [-d seconds]"
-#define top_full_usage \
+       "[-b] [-nCOUNT] [-dSECONDS]" IF_FEATURE_TOPMEM(" [-m]")
+#define top_full_usage "\n\n" \
        "Provide a view of process activity in real time.\n" \
-       "Read the status of all processes from /proc each <seconds>\n" \
-       "and show the status for however many processes will fit on the screen."
+       "Read the status of all processes from /proc each SECONDS\n" \
+       "and display a screenful of them." \
+//TODO: add options and keyboard commands
 
 #define touch_trivial_usage \
-       "[-c] FILE [FILE ...]"
-#define touch_full_usage \
-       "Update the last-modified date on the given FILE[s]" \
-       "\n\nOptions:\n" \
-       "    -c  Do not create any files"
+       "[-c] [-d DATE] [-r FILE] FILE [FILE]..."
+#define touch_full_usage "\n\n" \
+       "Update the last-modified date on the given FILE[s]\n" \
+     "\nOptions:" \
+     "\n    -c  Don't create files" \
+     "\n    -d DT   Date/time to use" \
+     "\n    -r FILE Use FILE's date/time" \
+
 #define touch_example_usage \
        "$ ls -l /tmp/foo\n" \
@@ -3581 +5238 @@
 #define tr_trivial_usage \
        "[-cds] STRING1 [STRING2]"
-#define tr_full_usage \
-       "Translate, squeeze, and/or delete characters from\n" \
-       "standard input, writing to standard output" \
-       "\n\nOptions:\n" \
-       "    -c  Take complement of STRING1\n" \
-       "    -d  Delete input characters coded STRING1\n" \
-       "    -s  Squeeze multiple output characters of STRING2 into one character"
+#define tr_full_usage "\n\n" \
+       "Translate, squeeze, or delete characters from stdin, writing to stdout\n" \
+     "\nOptions:" \
+     "\n    -c  Take complement of STRING1" \
+     "\n    -d  Delete input characters coded STRING1" \
+     "\n    -s  Squeeze multiple output characters of STRING2 into one character" \
+
 #define tr_example_usage \
        "$ echo \"gdkkn vnqkc\" | tr [a-y] [b-z]\n" \
@@ -3593 +5250 @@
 
 #define traceroute_trivial_usage \
-       "[-FIldnrv] [-f 1st_ttl] [-m max_ttl] [-p port#] [-q nqueries]\n" \
-       "    [-s src_addr] [-t tos] [-w wait] [-g gateway] [-i iface]\n" \
-       "    [-z pausemsecs] host [data size]"
-#define traceroute_full_usage \
-       "Trace the route ip packets follow going to \"host\"" \
-       "\n\nOptions:\n" \
-       "    -F  Set the don't fragment bit\n" \
-       "    -I  Use ICMP ECHO instead of UDP datagrams\n" \
-       "    -l  Display the ttl value of the returned packet\n" \
-       "    -d  Set SO_DEBUG options to socket\n" \
-       "    -n  Print hop addresses numerically rather than symbolically\n" \
-       "    -r  Bypass the normal routing tables and send directly to a host\n" \
-       "    -v  Verbose\n" \
-       "    -m max_ttl  Max time-to-live (max number of hops)\n" \
-       "    -p port#    Base UDP port number used in probes\n" \
-       "            (default is 33434)\n" \
-       "    -q nqueries Number of probes per 'ttl' (default 3)\n" \
-       "    -s src_addr IP address to use as the source address\n" \
-       "    -t tos      Type-of-service in probe packets (default 0)\n" \
-       "    -w wait     Time in seconds to wait for a response to a probe\n" \
-       "            (default 3 sec)\n" \
-       "    -g      Specify a loose source route gateway (8 max)"
-
+       "[-"IF_TRACEROUTE6("46")"FIldnrv] [-f 1ST_TTL] [-m MAXTTL] [-p PORT] [-q PROBES]\n" \
+       "    [-s SRC_IP] [-t TOS] [-w WAIT_SEC] [-g GATEWAY] [-i IFACE]\n" \
+       "    [-z PAUSE_MSEC] HOST [BYTES]"
+#define traceroute_full_usage "\n\n" \
+       "Trace the route to HOST\n" \
+     "\nOptions:" \
+    IF_TRACEROUTE6( \
+     "\n    -4,-6   Force IP or IPv6 name resolution" \
+    ) \
+     "\n    -F  Set the don't fragment bit" \
+     "\n    -I  Use ICMP ECHO instead of UDP datagrams" \
+     "\n    -l  Display the TTL value of the returned packet" \
+     "\n    -d  Set SO_DEBUG options to socket" \
+     "\n    -n  Print numeric addresses" \
+     "\n    -r  Bypass routing tables, send directly to HOST" \
+     "\n    -v  Verbose" \
+     "\n    -m  Max time-to-live (max number of hops)" \
+     "\n    -p  Base UDP port number used in probes" \
+     "\n        (default 33434)" \
+     "\n    -q  Number of probes per TTL (default 3)" \
+     "\n    -s  IP address to use as the source address" \
+     "\n    -t  Type-of-service in probe packets (default 0)" \
+     "\n    -w  Time in seconds to wait for a response (default 3)" \
+     "\n    -g  Loose source route gateway (8 max)" \
+
+#define traceroute6_trivial_usage \
+       "[-dnrv] [-m MAXTTL] [-p PORT] [-q PROBES]\n" \
+       "    [-s SRC_IP] [-t TOS] [-w WAIT_SEC] [-i IFACE]\n" \
+       "    HOST [BYTES]"
+#define traceroute6_full_usage "\n\n" \
+       "Trace the route to HOST\n" \
+     "\nOptions:" \
+     "\n    -d  Set SO_DEBUG options to socket" \
+     "\n    -n  Print numeric addresses" \
+     "\n    -r  Bypass routing tables, send directly to HOST" \
+     "\n    -v  Verbose" \
+     "\n    -m  Max time-to-live (max number of hops)" \
+     "\n    -p  Base UDP port number used in probes" \
+     "\n        (default is 33434)" \
+     "\n    -q  Number of probes per TTL (default 3)" \
+     "\n    -s  IP address to use as the source address" \
+     "\n    -t  Type-of-service in probe packets (default 0)" \
+     "\n    -w  Time in seconds to wait for a response (default 3)" \
 
 #define true_trivial_usage \
        ""
-#define true_full_usage \
+#define true_full_usage "\n\n" \
        "Return an exit code of TRUE (0)"
 #define true_example_usage \
@@ -3628 +5305 @@
 #define tty_trivial_usage \
        ""
-#define tty_full_usage \
-       "Print file name of standard input's terminal" \
-    USE_INCLUDE_SUSv2( \
-       "\n\nOptions:\n" \
-       "    -s  Print nothing, only return exit status")
+#define tty_full_usage "\n\n" \
+       "Print file name of stdin's terminal" \
+    IF_INCLUDE_SUSv2( "\n" \
+     "\nOptions:" \
+     "\n    -s  Print nothing, only return exit status" \
+    )
 #define tty_example_usage \
        "$ tty\n" \
@@ -3639 +5317 @@
 #define ttysize_trivial_usage \
        "[w] [h]"
-#define ttysize_full_usage \
-       "Print dimension(s) of standard input's terminal, on error return 80x25"
-
-#define tune2fs_trivial_usage \
-       "[-c max-mounts-count] [-e errors-behavior] [-g group] " \
-       "[-i interval[d|m|w]] [-j] [-J journal-options] [-l] [-s sparse-flag] " \
-       "[-m reserved-blocks-percent] [-o [^]mount-options[,...]] " \
-       "[-r reserved-blocks-count] [-u user] [-C mount-count] " \
-       "[-L volume-label] [-M last-mounted-dir] [-O [^]feature[,...]] " \
-       "[-T last-check-time] [-U UUID] device"
-#define tune2fs_full_usage \
-       "Adjust filesystem options on ext[23] filesystems"
-
-#define udhcpc_trivial_usage \
-       "[-Cfbnqtv] [-c CID] [-V VCLS] [-H HOSTNAME] [-i INTERFACE]\n" \
-       "    [-p pidfile] [-r IP] [-s script]"
-#define udhcpc_full_usage \
-       "    -V,--vendorclass=CLASSID    Set 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-none  Suppress default client identifier" \
-       "\n  -p,--pidfile=file   Store process ID of daemon in file" \
-       "\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  -f,--foreground Stay in foreground" \
-       "\n  -b,--background Background if lease cannot be immediately negotiated" \
-       "\n  -S,--syslog Log to syslog too" \
-       "\n  -n,--now    Exit with failure if lease cannot be immediately negotiated" \
-       "\n  -q,--quit   Quit after obtaining lease" \
-       "\n  -R,--release    Release IP on quit" \
-       "\n  -v,--version    Display version" \
+#define ttysize_full_usage "\n\n" \
+       "Print dimension(s) of stdin's terminal, on error return 80x25"
+
+#define tunctl_trivial_usage \
+       "[-f device] ([-t name] | -d name)" IF_FEATURE_TUNCTL_UG(" [-u owner] [-g group] [-b]")
+#define tunctl_full_usage "\n\n" \
+       "Create or delete tun interfaces\n" \
+     "\nOptions:" \
+     "\n    -f name     tun device (/dev/net/tun)" \
+     "\n    -t name     Create iface 'name'" \
+     "\n    -d name     Delete iface 'name'" \
+    IF_FEATURE_TUNCTL_UG( \
+     "\n    -u owner    Set iface owner" \
+     "\n    -g group    Set iface group" \
+     "\n    -b      Brief output" \
+    )
+#define tunctl_example_usage \
+       "# tunctl\n" \
+       "# tunctl -d tun0\n"
 
 #define udhcpd_trivial_usage \
-       "[-fS] [configfile]" \
-
-#define udhcpd_full_usage \
-       "DHCP server" \
-       "\n  -f  Stay in foreground" \
-       "\n  -S  Log to syslog too"
+       "[-fS]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [CONFFILE]" \
+
+#define udhcpd_full_usage "\n\n" \
+       "DHCP server\n" \
+     "\n    -f  Run in foreground" \
+     "\n    -S  Log to syslog too" \
+    IF_FEATURE_UDHCP_PORT( \
+     "\n    -P N    Use port N (default 67)" \
+    )
 
 #define umount_trivial_usage \
-       "[flags] FILESYSTEM|DIRECTORY"
-#define umount_full_usage \
-       "Unmount file systems" \
-       "\n\nOptions:\n" \
-    USE_FEATURE_UMOUNT_ALL( \
-       "\n  -a  Unmount all file systems" USE_FEATURE_MTAB_SUPPORT(" in /etc/mtab")) \
-    USE_FEATURE_MTAB_SUPPORT( \
-       "\n  -n  Don't erase /etc/mtab entries") \
-       "\n  -r  Try to remount devices as read-only if mount is busy" \
-       "\n  -l  Lazy umount (detach filesystem)" \
-       "\n  -f  Force umount (i.e., unreachable NFS server)" \
-    USE_FEATURE_MOUNT_LOOP( \
-       "\n  -D  Do not free loop device (if a loop device has been used)")
+       "[OPTIONS] FILESYSTEM|DIRECTORY"
+#define umount_full_usage "\n\n" \
+       "Unmount file systems\n" \
+     "\nOptions:" \
+    IF_FEATURE_UMOUNT_ALL( \
+     "\n    -a  Unmount all file systems" IF_FEATURE_MTAB_SUPPORT(" in /etc/mtab") \
+    ) \
+    IF_FEATURE_MTAB_SUPPORT( \
+     "\n    -n  Don't erase /etc/mtab entries" \
+    ) \
+     "\n    -r  Try to remount devices as read-only if mount is busy" \
+     "\n    -l  Lazy umount (detach filesystem)" \
+     "\n    -f  Force umount (i.e., unreachable NFS server)" \
+    IF_FEATURE_MOUNT_LOOP( \
+     "\n    -d  Free loop device if it has been used" \
+    )
+
 #define umount_example_usage \
        "$ umount /dev/hdc1\n"
 
 #define uname_trivial_usage \
-       "[OPTION]..."
-#define uname_full_usage \
-       "Print certain system information. With no OPTION, same as -s." \
-       "\n\nOptions:\n" \
-       "    -a  Print all information\n" \
-       "    -m  The machine (hardware) type\n" \
-       "    -n  Print the machine's network node hostname\n" \
-       "    -r  Print the operating system release\n" \
-       "    -s  Print the operating system name\n" \
-       "    -p  Print the host processor type\n" \
-       "    -v  Print the operating system version"
+       "[-amnrspv]"
+#define uname_full_usage "\n\n" \
+       "Print system information\n" \
+     "\nOptions:" \
+     "\n    -a  Print all" \
+     "\n    -m  The machine (hardware) type" \
+     "\n    -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" \
@@ -3715 +5387 @@
 
 #define uncompress_trivial_usage \
-       "[-c] [-f] [name...]"
-#define uncompress_full_usage \
-       "Uncompress .Z file[s]" \
-       "\n\nOptions:\n" \
-       "    -c  Extract to stdout\n" \
-       "    -f  Force overwrite an existing file"
+       "[-cf] [FILE]..."
+#define uncompress_full_usage "\n\n" \
+       "Decompress .Z file[s]\n" \
+     "\nOptions:" \
+     "\n    -c  Write to stdout" \
+     "\n    -f  Overwrite" \
 
 #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"
+       "[-fa][-t N] [FILE]..."
+#define unexpand_full_usage "\n\n" \
+       "Convert spaces to tabs, writing to stdout\n" \
+     "\nOptions:" \
+    IF_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" \
+    ) \
+    IF_NOT_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]]"
-#define uniq_full_usage \
-       "Discard all but one of successive identical lines from INPUT\n" \
-       "(or standard input), writing to OUTPUT (or standard output)" \
-       "\n\nOptions:\n" \
-       "    -c  Prefix lines by the number of occurrences\n" \
-       "    -d  Only print duplicate lines\n" \
-       "    -u  Only print unique lines\n" \
-       "    -f N    Skip the first N fields\n" \
-       "    -s N    Skip the first N chars (after any skipped fields)"
+       "[-cdu][-f,s,w N] [INPUT [OUTPUT]]"
+#define uniq_full_usage "\n\n" \
+       "Discard duplicate lines\n" \
+     "\nOptions:" \
+     "\n    -c  Prefix lines by the number of occurrences" \
+     "\n    -d  Only print duplicate lines" \
+     "\n    -u  Only print unique lines" \
+     "\n    -f N    Skip first N fields" \
+     "\n    -s N    Skip first N chars (after any skipped fields)" \
+     "\n    -w N    Compare N characters in line" \
+
 #define uniq_example_usage \
        "$ echo -e \"a\\na\\nb\\nc\\nc\\na\" | sort | uniq\n" \
@@ -3751 +5428 @@
        "c\n"
 
-#define unix2dos_trivial_usage \
-       "[option] [FILE]"
-#define unix2dos_full_usage \
-       "Convert FILE from unix format to dos format. When no option\n" \
-       "is given, the input is converted to the opposite output format.\n" \
-       "When no file is given, use stdin/stdout." \
-       "\n\nOptions:\n" \
-       "    -u  Output will be in UNIX format\n" \
-       "    -d  Output will be in DOS format"
-
 #define unzip_trivial_usage \
-       "[-opts[modifiers]] file[.zip] [list] [-x xlist] [-d exdir]"
-#define unzip_full_usage \
-       "Extract files from ZIP archives" \
-       "\n\nOptions:\n" \
-       "    -l  List archive contents (short form)\n" \
-       "    -n  Never overwrite existing files (default)\n" \
-       "    -o  Overwrite files without prompting\n" \
-       "    -p  Send output to stdout\n" \
-       "    -q  Quiet\n" \
-       "    -x  Exclude these files\n" \
-       "    -d  Extract files into this directory"
+       "[-opts[modifiers]] FILE[.zip] [LIST] [-x XLIST] [-d DIR]"
+#define unzip_full_usage "\n\n" \
+       "Extract files from ZIP archives\n" \
+     "\nOptions:" \
+     "\n    -l  List archive contents (with -q for short form)" \
+     "\n    -n  Never overwrite files (default)" \
+     "\n    -o  Overwrite" \
+     "\n    -p  Send output to stdout" \
+     "\n    -q  Quiet" \
+     "\n    -x XLST Exclude these files" \
+     "\n    -d DIR  Extract files into DIR" \
 
 #define uptime_trivial_usage \
        ""
-#define uptime_full_usage \
+#define uptime_full_usage "\n\n" \
        "Display the time since the last boot"
+
 #define uptime_example_usage \
        "$ uptime\n" \
@@ -3784 +5452 @@
 #define usleep_trivial_usage \
        "N"
-#define usleep_full_usage \
+#define usleep_full_usage "\n\n" \
        "Pause for N microseconds"
+
 #define usleep_example_usage \
        "$ usleep 1000000\n" \
@@ -3791 +5460 @@
 
 #define uudecode_trivial_usage \
-       "[-o outfile] [infile]"
-#define uudecode_full_usage \
+       "[-o OUTFILE] [INFILE]"
+#define uudecode_full_usage "\n\n" \
        "Uudecode a file\n" \
-       "NB: finds outfile name in uuencoded source unless -o is given"
+       "Finds outfile name in uuencoded source unless -o is given"
+
 #define uudecode_example_usage \
        "$ uudecode -o busybox busybox.uu\n" \
@@ -3801 +5471 @@
 
 #define uuencode_trivial_usage \
-       "[-m] [infile] stored_filename"
-#define uuencode_full_usage \
-       "Uuencode a file to stdout" \
-       "\n\nOptions:\n" \
-       "    -m  Use base64 encoding per RFC1521"
+       "[-m] [INFILE] STORED_FILENAME"
+#define uuencode_full_usage "\n\n" \
+       "Uuencode a file to stdout\n" \
+     "\nOptions:" \
+     "\n    -m  Use base64 encoding per RFC1521" \
+
 #define uuencode_example_usage \
        "$ uuencode busybox busybox\n" \
@@ -3814 +5485 @@
 
 #define vconfig_trivial_usage \
-       "COMMAND [OPTIONS] ..."
-#define vconfig_full_usage \
-       "Create and remove virtual ethernet devices" \
-       "\n\nOptions:\n" \
-       "    add     [interface-name] [vlan_id]\n" \
-       "    rem     [vlan-name]\n" \
-       "    set_flag    [interface-name] [flag-num] [0 | 1]\n" \
-       "    set_egress_map  [vlan-name] [skb_priority] [vlan_qos]\n" \
-       "    set_ingress_map [vlan-name] [skb_priority] [vlan_qos]\n" \
-       "    set_name_type   [name-type]"
+       "COMMAND [OPTIONS]"
+#define vconfig_full_usage "\n\n" \
+       "Create and remove virtual ethernet devices\n" \
+     "\nOptions:" \
+     "\n    add     [interface-name] [vlan_id]" \
+     "\n    rem     [vlan-name]" \
+     "\n    set_flag    [interface-name] [flag-num] [0 | 1]" \
+     "\n    set_egress_map  [vlan-name] [skb_priority] [vlan_qos]" \
+     "\n    set_ingress_map [vlan-name] [skb_priority] [vlan_qos]" \
+     "\n    set_name_type   [name-type]" \
 
 #define vi_trivial_usage \
-       "[OPTION] [FILE]..."
-#define vi_full_usage \
-       "Edit FILE" \
-       "\n\nOptions:\n" \
-       "    -R  Read-only - do not write to the file"
+       "[OPTIONS] [FILE]..."
+#define vi_full_usage "\n\n" \
+       "Edit FILE\n" \
+     "\nOptions:" \
+    IF_FEATURE_VI_COLON( \
+     "\n    -c  Initial command to run ($EXINIT also available)" \
+    ) \
+    IF_FEATURE_VI_READONLY( \
+     "\n    -R  Read-only" \
+    ) \
+     "\n    -H  Short help regarding available features" \
 
 #define vlock_trivial_usage \
-       "[OPTIONS]"
-#define vlock_full_usage \
-       "Lock a virtual terminal. A password is required to unlock." \
-       "\n\nOptions:\n" \
-       "    -a  Lock all VTs"
+       "[-a]"
+#define vlock_full_usage "\n\n" \
+       "Lock a virtual terminal. A password is required to unlock.\n" \
+     "\nOptions:" \
+     "\n    -a  Lock all VTs" \
+
+#define volname_trivial_usage \
+       "[DEVICE]"
+#define volname_full_usage "\n\n" \
+       "Show CD volume name of the DEVICE (default /dev/cdrom)"
+
+#define wall_trivial_usage \
+    "[FILE]"
+#define wall_full_usage "\n\n" \
+    "Write content of FILE or stdin to all logged-in users"
+#define wall_sample_usage \
+    "echo foo | wall\n" \
+    "wall ./mymessage"
 
 #define watch_trivial_usage \
-       "[-n seconds] [-t] COMMAND..."
-#define watch_full_usage \
-       "Execute a program periodically" \
-       "\n\nOptions:\n" \
-       "    -n  Loop period in seconds - default is 2\n" \
-       "    -t  Don't print header"
+       "[-n SEC] [-t] PROG ARGS"
+#define watch_full_usage "\n\n" \
+       "Run PROG periodically\n" \
+     "\nOptions:" \
+     "\n    -n  Loop period in seconds (default 2)" \
+     "\n    -t  Don't print header" \
+
 #define watch_example_usage \
        "$ watch date\n" \
@@ -3853 +5544 @@
 
 #define watchdog_trivial_usage \
-       "[-t seconds] [-F] DEV"
-#define watchdog_full_usage \
-       "Periodically write to watchdog device DEV" \
-       "\n\nOptions:\n" \
-       "    -t  Timer period in seconds - default is 30\n" \
-       "    -F  Stay in the foreground and don't fork"
-
-#define wc_trivial_usage \
-       "[OPTION]... [FILE]..."
-#define wc_full_usage \
-       "Print line, word, and byte counts for each FILE, and a total line if\n" \
-       "more than one FILE is specified. With no FILE, read standard input." \
-       "\n\nOptions:\n" \
-       "    -c  Print the byte counts\n" \
-       "    -l  Print the newline counts\n" \
-       "    -L  Print the length of the longest line\n" \
-       "    -w  Print the word counts"
-#define wc_example_usage \
-       "$ wc /etc/passwd\n" \
-       "     31      46    1365 /etc/passwd\n"
+       "[-t N[ms]] [-T N[ms]] [-F] DEV"
+#define watchdog_full_usage "\n\n" \
+       "Periodically write to watchdog device DEV\n" \
+     "\nOptions:" \
+     "\n    -T N    Reboot after N seconds if not reset (default 60)" \
+     "\n    -t N    Reset every N seconds (default 30)" \
+     "\n    -F  Run in foreground" \
+     "\n" \
+     "\nUse 500ms to specify period in milliseconds" \
 
 #define wget_trivial_usage \
-       "[-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"
-#define wget_full_usage \
-       "Retrieve files via HTTP or FTP" \
-       "\n\nOptions:\n" \
-       "    -s  Spider mode - only check file existence\n" \
-       "    -c  Continue retrieval of aborted transfer\n" \
-       "    -q  Quiet\n" \
-       "    -P  Set directory prefix to DIR\n" \
-       "    -O  Save to filename ('-' for stdout)\n" \
-       "    -U  Adjust 'User-Agent' field\n" \
-       "    -Y  Use proxy ('on' or 'off')"
+    IF_FEATURE_WGET_LONG_OPTIONS( \
+       "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document FILE]\n" \
+       "    [--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \
+       "    [--no-check-certificate] [-U|--user-agent AGENT]" \
+            IF_FEATURE_WGET_TIMEOUT("[-T SEC] ") " URL" \
+    ) \
+    IF_NOT_FEATURE_WGET_LONG_OPTIONS( \
+       "[-csq] [-O FILE] [-Y on/off] [-P DIR] [-U AGENT]" \
+            IF_FEATURE_WGET_TIMEOUT("[-T SEC] ") " URL" \
+    )
+#define wget_full_usage "\n\n" \
+       "Retrieve files via HTTP or FTP\n" \
+     "\nOptions:" \
+     "\n    -s  Spider mode - only check file existence" \
+     "\n    -c  Continue retrieval of aborted transfer" \
+     "\n    -q  Quiet" \
+     "\n    -P DIR  Save to DIR (default .)" \
+    IF_FEATURE_WGET_TIMEOUT( \
+     "\n    -T SEC  Network read timeout is SEC seconds" \
+    ) \
+     "\n    -O FILE Save to FILE ('-' for stdout)" \
+     "\n    -U STR  Use STR for User-Agent header" \
+     "\n    -Y  Use proxy ('on' or 'off')" \
 
 #define which_trivial_usage \
-       "[COMMAND ...]"
-#define which_full_usage \
+       "[COMMAND]..."
+#define which_full_usage "\n\n" \
        "Locate a COMMAND"
 #define which_example_usage \
@@ -3898 +5588 @@
 
 #define who_trivial_usage \
-       " "
-#define who_full_usage \
-       "Print the current user names and related information"
+       "[-a]"
+#define who_full_usage "\n\n" \
+       "Show who is logged on\n" \
+     "\nOptions:" \
+     "\n    -a  Show all" \
 
 #define whoami_trivial_usage \
        ""
-#define whoami_full_usage \
+#define whoami_full_usage "\n\n" \
        "Print the user name associated with the current effective user id"
-
-#define xargs_trivial_usage \
-       "[OPTIONS] [COMMAND] [ARGS...]"
-#define xargs_full_usage \
-       "Execute COMMAND on every item given by standard input" \
-       "\n\nOptions:\n" \
-    USE_FEATURE_XARGS_SUPPORT_CONFIRMATION( \
-       "    -p  Prompt the user about whether to run each command\n") \
-       "    -r  Do not run command for empty read lines\n" \
-    USE_FEATURE_XARGS_SUPPORT_TERMOPT( \
-       "    -x  Exit if the size is exceeded\n") \
-    USE_FEATURE_XARGS_SUPPORT_ZERO_TERM( \
-       "    -0  Input filenames are terminated by a null character\n") \
-       "    -t  Print the command line on stderr before executing it"
-#define xargs_example_usage \
-       "$ ls | xargs gzip\n" \
-       "$ find . -name '*.c' -print | xargs rm\n"
-
-#define yes_trivial_usage \
-       "[OPTION]... [STRING]..."
-#define yes_full_usage \
-       "Repeatedly output a line with all specified STRING(s), or 'y'"
 
 #define zcat_trivial_usage \
        "FILE"
-#define zcat_full_usage \
-       "Uncompress to stdout"
+#define zcat_full_usage "\n\n" \
+       "Decompress to stdout"
 
 #define zcip_trivial_usage \
-       "[OPTIONS] ifname script"
-#define zcip_full_usage \
-       "Manage a ZeroConf IPv4 link-local address" \
-       "\n\nOptions:\n" \
-       "    -f      Foreground mode\n" \
-       "    -q      Quit after address (no daemon)\n" \
-       "    -r 169.254.x.x  Request this address first\n" \
-       "    -v      Verbose"
-
-#endif /* __BB_USAGE_H__ */
+       "[OPTIONS] IFACE SCRIPT"
+#define zcip_full_usage "\n\n" \
+       "Manage a ZeroConf IPv4 link-local address\n" \
+     "\nOptions:" \
+     "\n    -f      Run in foreground" \
+     "\n    -q      Quit after obtaining address" \
+     "\n    -r 169.254.x.x  Request this address first" \
+     "\n    -v      Verbose" \
+     "\n" \
+     "\nWith no -q, runs continuously monitoring for ARP conflicts," \
+     "\nexits only on I/O errors (link down etc)" \
+
+
+#endif