Cleanup usage messages (-200 bytes).
[oweals/busybox.git] / include / usage.h
index 5a1715a9d69770d8ab91f7d575ee1aca68738686..a9718d72d920b82b806e2cdb0e19e4e8d298c063 100644 (file)
 #define addgroup_trivial_usage \
        "[-g GID] group_name [user_name]"
 #define addgroup_full_usage \
-       "Adds a group to the system\n\n" \
-       "Options:\n" \
-       "       -g GID          specify gid"
+       "Adds a group to the system" \
+       "\n\nOptions:\n" \
+       "       -g GID  specify gid"
 
 #define adduser_trivial_usage \
        "[OPTIONS] user_name"
 #define adduser_full_usage \
-       "Adds a user to the system\n\n" \
-       "Options:\n" \
+       "Adds a user to the system" \
+       "\n\nOptions:\n" \
        "       -h DIR          Assign home directory DIR\n" \
        "       -g GECOS        Assign gecos field GECOS\n" \
        "       -s SHELL        Assign login shell SHELL\n" \
@@ -35,8 +35,8 @@
        "[-q] [-o offset] [-f frequency] [-p timeconstant] [-t tick]"
 #define adjtimex_full_usage \
        "Reads and optionally sets system timebase parameters.\n" \
-       "See adjtimex(2).\n\n" \
-       "Options:\n" \
+       "See adjtimex(2)." \
+       "\n\nOptions:\n" \
        "       -q              quiet mode - do not print\n" \
        "       -o offset       time offset, microseconds\n" \
        "       -f frequency    frequency adjust, integer kernel units (65536 is 1ppm)\n" \
 #define ar_trivial_usage \
        "[-o] [-v] [-p] [-t] [-x] ARCHIVE FILES"
 #define ar_full_usage \
-       "Extract or list FILES from an ar archive.\n\n" \
-       "Options:\n" \
-       "       -o              preserve original dates\n" \
-       "       -p              extract to stdout\n" \
-       "       -t              list\n" \
-       "       -x              extract\n" \
-       "       -v              verbosely list files processed"
+       "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      verbosely list files processed"
 
 #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\n" \
-       "Options:\n" \
+       "Ping hosts by ARP requests/replies" \
+       "\n\nOptions:\n" \
        "       -f              Quit on first ARP reply\n" \
        "       -q              Be quiet\n" \
        "       -b              Keep broadcasting, don't go unicast\n" \
 #define bunzip2_trivial_usage \
        "[OPTION]... [FILE]"
 #define bunzip2_full_usage \
-       "Uncompress FILE (or standard input if FILE is '-' or omitted).\n\n" \
-       "Options:\n" \
+       "Uncompress FILE (or standard input if FILE is '-' or omitted)" \
+       "\n\nOptions:\n" \
        "       -c      Write output to standard output\n" \
        "       -f      Force"
 
 #define unlzma_trivial_usage \
        "[OPTION]... [FILE]"
 #define unlzma_full_usage \
-       "Uncompress FILE (or standard input if FILE is '-' or omitted).\n\n" \
-       "Options:\n" \
+       "Uncompress FILE (or standard input if FILE is '-' or omitted)" \
+       "\n\nOptions:\n" \
        "       -c      Write output to standard output\n" \
        "       -f      Force"
 
 #define cal_trivial_usage \
        "[-jy] [[month] year]"
 #define cal_full_usage \
-       "Display a calendar.\n" \
-       "\nOptions:\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 \
-       "Concatenates FILE(s) and prints them to stdout.\n\n" \
-       "Options:\n" \
+       "Concatenates FILE(s) and prints them to stdout" \
+       "\n\nOptions:\n" \
        "       -u      ignored since unbuffered i/o is always used"
 #define cat_example_usage \
        "$ cat /proc/uptime\n" \
 #define catv_trivial_usage \
        "[-etv] [FILE]..."
 #define catv_full_usage \
-       "Display nonprinting characters as ^x or M-x.\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."
        "       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" \
+       " Options:\n" \
        "       -R      recursively list subdirectories\n" \
        "       -v      set the file's version/generation number"
 
 #define chgrp_trivial_usage \
        "[-Rh"USE_DESKTOP("cvf")"]... GROUP FILE..."
 #define chgrp_full_usage \
-       "Change the group membership of each FILE to GROUP.\n" \
-       "\nOptions:\n" \
+       "Change the group membership of each FILE to GROUP" \
+       "\n\nOptions:\n" \
        "       -R      Changes files and directories recursively\n" \
        "       -h      Do not dereference symbolic links" \
        USE_DESKTOP( \
        "[-R"USE_DESKTOP("cvf")"] MODE[,MODE]... FILE..."
 #define chmod_full_usage \
        "Each MODE is one or more of the letters ugoa, one of the\n" \
-       "symbols +-= and one or more of the letters rwxst.\n\n" \
-       "Options:\n" \
-       "       -R      Changes files and directories recursively" \
+       "symbols +-= and one or more of the letters rwxst" \
+       "\n\nOptions:" \
+       "\n     -R      Changes files and directories recursively" \
        USE_DESKTOP( \
        "\n     -c      List changed files" \
        "\n     -v      List all files" \
 #define chown_trivial_usage \
        "[-Rh"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      Changes files and directories recursively\n" \
-       "       -h      Do not dereference symbolic links" \
+       "Change the owner and/or group of each FILE to OWNER and/or GROUP" \
+       "\n\nOptions:" \
+       "\n     -R      Changes files and directories recursively" \
+       "\n     -h      Do not dereference symbolic links" \
        USE_DESKTOP( \
        "\n     -c      List changed files" \
        "\n     -v      List all files" \
        "[-/ 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\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"
+       "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"
 #define setuidgid_trivial_usage \
        "account prog args"
 #define setuidgid_full_usage \
 #define softlimit_full_usage \
        "Sets soft resource limits as specified by options, then runs prog\n" \
        "\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" \
+       "       -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" \
+       "       -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" \
+       "       -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"
 #define cmp_trivial_usage \
        "[-l] [-s] FILE1 [FILE2]"
 #define cmp_full_usage \
-       "Compares FILE1 vs stdin if FILE2 is not specified.\n\n" \
-       "Options:\n" \
+       "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 mode - do not print"
 #define comm_trivial_usage \
        "[-123] FILE1 FILE2"
 #define comm_full_usage \
-       "Compares FILE1 to FILE2, or to stdin if = is specified.\n\n" \
-       "Options:\n" \
+       "Compares 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 cut_trivial_usage \
        "[OPTION]... [FILE]..."
 #define cut_full_usage \
-       "Prints selected fields from each input FILE to standard output.\n\n" \
-       "Options:\n" \
+       "Prints 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" \
 #define date_trivial_usage \
        "[OPTION]... [MMDDhhmm[[CC]YY][.ss]] [+FORMAT]"
 #define date_full_usage \
-       "Displays the current time in the given FORMAT, or sets the system date.\n" \
-       "\nOptions:\n" \
+       "Displays the current time in the given FORMAT, or sets the 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( \
+       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"
@@ -455,8 +457,8 @@ USE_FEATURE_DATE_ISOFMT( \
        "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" \
+       "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" \
@@ -477,7 +479,8 @@ USE_FEATURE_DATE_ISOFMT( \
        "[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, converting and formatting according to options\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\n" \
@@ -519,26 +522,28 @@ USE_FEATURE_DATE_ISOFMT( \
        "mntpnt [-v]" \
        USE_DEVFSD_FG_NP("[-fg][-np]" )
 #define devfsd_full_usage \
-       "Optional daemon for managing devfs permissions and old device name symlinks.\n" \
-       "\nOptions:\n" \
-       "       mntpnt  The mount point where devfs is mounted.\n\n" \
-       "       -v      Print the protocol version numbers for devfsd\n" \
-       "               and the kernel-side protocol version and exits." \
-       USE_DEVFSD_FG_NP( "\n\n -fg     Run the daemon in the foreground.\n\n" \
-       "       -np     Exit  after  parsing  the configuration file\n" \
-       "               and processing synthetic REGISTER events.\n" \
-       "               Do not poll for events.")
+       "Optional daemon for managing 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.")
 
 #define df_trivial_usage \
        "[-" USE_FEATURE_HUMAN_READABLE("hm") "k] [FILESYSTEM ...]"
 #define df_full_usage \
-       "Print the filesystem space used and space available.\n\n" \
-       "Options:\n" \
+       "Print the filesystem space used and space available" \
+       "\n\nOptions:\n" \
        USE_FEATURE_HUMAN_READABLE( \
        "\n     -h      print sizes in human readable format (e.g., 1K 243M 2G )\n" \
        "       -m      print sizes in megabytes\n" \
        "       -k      print sizes in kilobytes(default)") \
-       SKIP_FEATURE_HUMAN_READABLE("\n -k      ignored")
+       SKIP_FEATURE_HUMAN_READABLE( \
+       "\n     -k      ignored")
 #define df_example_usage \
        "$ df\n" \
        "Filesystem           1k-blocks      Used Available Use% Mounted on\n" \
@@ -562,8 +567,8 @@ USE_FEATURE_DATE_ISOFMT( \
        "[-abdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2"
 #define diff_full_usage \
        "Compare files line by line and output the differences between them.\n" \
-       "This diff implementation only supports unified diffs.\n\n" \
-       "Options:\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" \
@@ -592,8 +597,8 @@ USE_FEATURE_DATE_ISOFMT( \
 #define dmesg_trivial_usage \
        "[-c] [-n LEVEL] [-s SIZE]"
 #define dmesg_full_usage \
-       "Prints or controls the kernel ring buffer\n\n" \
-       "Options:\n" \
+       "Prints or controls 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"
@@ -601,29 +606,29 @@ USE_FEATURE_DATE_ISOFMT( \
 #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\n" \
-       "Options:\n" \
-       "       -c              config filename\n" \
-       "       -t              TTL in seconds\n" \
-       "       -p              listening port\n" \
-       "       -i              listening iface ip (default all)\n" \
-       "       -d              daemonize"
+       "Small and static DNS server daemon" \
+       "\n\nOptions:\n" \
+       "       -c      config filename\n" \
+       "       -t      TTL in seconds\n" \
+       "       -p      listening port\n" \
+       "       -i      listening iface ip (default all)\n" \
+       "       -d      daemonize"
 
 #define dos2unix_trivial_usage \
        "[option] [FILE]"
 #define dos2unix_full_usage \
        "Converts 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, uses stdin for input and stdout for output.\n\n" \
-       "Options:\n" \
+       "When no file is given, uses 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"
 
 #define dpkg_trivial_usage \
        "[-ilCPru] [-F option] package_name"
 #define dpkg_full_usage \
-       "dpkg is a utility to install, remove and manage Debian packages.\n\n" \
-       "Options:\n" \
+       "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" \
@@ -635,8 +640,8 @@ USE_FEATURE_DATE_ISOFMT( \
 #define dpkg_deb_trivial_usage \
        "[-cefxX] FILE [argument]"
 #define dpkg_deb_full_usage \
-       "Perform actions on Debian packages (.debs)\n\n" \
-       "Options:\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" \
@@ -652,8 +657,8 @@ USE_FEATURE_DATE_ISOFMT( \
        "Disk space is printed in units of " \
        USE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("1024") \
        SKIP_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("512") \
-       " bytes.\n\n" \
-       "Options:\n" \
+       " bytes." \
+       "\n\nOptions:\n" \
        "       -a      show sizes of files in addition to directories\n" \
        "       -H      follow symbolic links that are FILE command line args\n" \
        "       -L      follow all symbolic links encountered\n" \
@@ -691,11 +696,11 @@ USE_FEATURE_DATE_ISOFMT( \
 #define dumpleases_trivial_usage \
        "[-r|-a] [-f LEASEFILE]"
 #define dumpleases_full_usage \
-       "Displays the DHCP leases granted by udhcpd.\n\n" \
-       "Options:\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"
+       "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 e2fsck_trivial_usage \
        "[-panyrcdfvstDFSV] [-b superblock] [-B blocksize] " \
@@ -703,29 +708,29 @@ USE_FEATURE_DATE_ISOFMT( \
        "[-l|-L bad_blocks_file] [-C fd] [-j external_journal] " \
        "[-E extended-options] device"
 #define e2fsck_full_usage \
-       "Check a Linux ext2/ext3 file system.\n\n" \
-       "Options:\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      Be verbose\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              Be 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"
+       "       -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 \
-       "Prints the specified ARGs to stdout\n\n" \
+       "Print the specified ARGs to stdout" \
        USE_FEATURE_FANCY_ECHO( \
-               "Options:\n" \
-               "       -n      suppress trailing newline\n" \
-               "       -e      interpret backslash-escaped characters (i.e., \\t=tab)\n" \
-               "       -E      disable interpretation of backslash-escaped characters" \
+       "\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" \
        )
 #define echo_example_usage \
        "$ echo \"Erik is cool\"\n" \
@@ -740,8 +745,8 @@ USE_FEATURE_DATE_ISOFMT( \
 #define eject_trivial_usage \
        "[-t] [-T] [DEVICE]"
 #define eject_full_usage \
-       "Eject specified DEVICE (or default /dev/cdrom).\n\n" \
-       "Options:\n" \
+       "Eject specified DEVICE (or default /dev/cdrom)" \
+       "\n\nOptions:\n" \
        "       -t      close tray\n" \
        "       -T      open/close tray (toggle)"
 
@@ -751,9 +756,9 @@ USE_FEATURE_DATE_ISOFMT( \
 #define env_trivial_usage \
        "[-iu] [-] [name=value]... [command]"
 #define env_full_usage \
-       "Prints the current environment or runs a program after setting\n" \
-       "up the specified environment.\n\n" \
-       "Options:\n" \
+       "Print the current environment or runs 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"
 
@@ -762,11 +767,11 @@ USE_FEATURE_DATE_ISOFMT( \
 #define ether_wake_full_usage \
        "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\n" \
-       "Options:\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"
+       "       -p pass         Append the four or six byte password PW to the packet"
 
 #define expr_trivial_usage \
        "EXPRESSION"
@@ -786,16 +791,15 @@ USE_FEATURE_DATE_ISOFMT( \
        "       ARG1 *  ARG2    arithmetic product of ARG1 and ARG2\n" \
        "       ARG1 /  ARG2    arithmetic quotient of ARG1 divided by ARG2\n" \
        "       ARG1 %  ARG2    arithmetic remainder of ARG1 divided by ARG2\n" \
-       "       STRING : REGEXP             anchored pattern match of REGEXP in STRING\n" \
-       "       match STRING REGEXP         same as STRING : REGEXP\n" \
-       "       substr STRING POS LENGTH    substring of STRING, POS counted from 1\n" \
-       "       index STRING CHARS          index in STRING where any CHARS is found,\n" \
-       "                                   or 0\n" \
-       "       length STRING               length of STRING\n" \
-       "       quote TOKEN                 interpret TOKEN as a string, even if\n" \
-       "                                   it is a keyword like 'match' or an\n" \
-       "                                   operator like '/'\n" \
-       "       ( EXPRESSION )              value of EXPRESSION\n\n" \
+       "       STRING : REGEXP         anchored pattern match of REGEXP in STRING\n" \
+       "       match STRING REGEXP     same as STRING : REGEXP\n" \
+       "       substr STRING POS LENGTH substring of STRING, POS counted from 1\n" \
+       "       index STRING CHARS      index in STRING where any CHARS is found, or 0\n" \
+       "       length STRING           length of STRING\n" \
+       "       quote TOKEN             interpret TOKEN as a string, even if\n" \
+       "                               it is a keyword like 'match' or an\n" \
+       "                               operator like '/'\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" \
        "lexicographical.  Pattern matches return the string matched between\n" \
@@ -805,7 +809,8 @@ USE_FEATURE_DATE_ISOFMT( \
 #define fakeidentd_trivial_usage \
        "[-b ip] [STRING]"
 #define fakeidentd_full_usage \
-       "Returns a set string to auth requests\n\n" \
+       "Returns a set string to auth requests" \
+       "\n\nOptions:\n" \
        "       -b      Bind to ip address\n" \
        "       STRING  The ident answer string (default is nobody)"
 
@@ -840,23 +845,23 @@ USE_FEATURE_DATE_ISOFMT( \
 #define fdformat_trivial_usage \
        "[-n] DEVICE"
 #define fdformat_full_usage \
-       "Low-level formats a floppy disk\n\n" \
-       "Options:\n" \
+       "Low-level formats a floppy disk" \
+       "\n\nOptions:\n" \
        "       -n      Don't verify after format"
 
 #define fdisk_trivial_usage \
        "[-luv] [-C CYLINDERS] [-H HEADS] [-S SECTORS] [-b SSZ] DISK"
 #define fdisk_full_usage \
-       "Change partition table\n" \
-       "Options:\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"
+       "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]"
@@ -866,24 +871,33 @@ USE_FEATURE_DATE_ISOFMT( \
        "\nEXPRESSION may consist of:\n" \
        "       -follow         Dereference symbolic links\n" \
        "       -name PATTERN   File name (leading directories removed) matches PATTERN\n" \
-       "       -print          Print (default and assumed)\n" \
+       "       -print          Print (default and assumed)" \
        USE_FEATURE_FIND_PRINT0( \
-       "       -print0         Delimit output with null characters rather than\n                       newlines" \
-) USE_FEATURE_FIND_TYPE( \
+       "\n     -print0         Delimit output with null characters rather than" \
+       "\n                     newlines" \
+       ) USE_FEATURE_FIND_TYPE( \
        "\n     -type X         Filetype matches X (where X is one of: f,d,l,b,c,...)" \
-) USE_FEATURE_FIND_PERM( \
-       "\n     -perm PERMS     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( \
+       ) USE_FEATURE_FIND_PERM( \
+       "\n     -perm PERMS     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( \
+       ) USE_FEATURE_FIND_INUM( \
        "\n     -inum N         File has inode number N" \
-) USE_FEATURE_FIND_EXEC( \
+       ) USE_FEATURE_FIND_EXEC( \
        "\n     -exec CMD       Execute CMD with all instances of {} replaced by the" \
-       "\n                     files matching EXPRESSION")
+       "\n                     files matching EXPRESSION" \
+       ) USE_DESKTOP( \
+       "\n     -size N         File size is N" \
+       "\n     -prune          Stop traversing current subtree" \
+       "\n     (expr)          Group" \
+       )
 
 #define find_example_usage \
        "$ find / -name passwd\n" \
@@ -893,8 +907,8 @@ USE_FEATURE_DATE_ISOFMT( \
        "[-bs] [-w WIDTH] [FILE]"
 #define fold_full_usage \
        "Wrap input lines in each FILE (standard input by default), writing to\n" \
-       "standard output.\n\n" \
-       "Options:\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"
@@ -920,8 +934,8 @@ USE_FEATURE_DATE_ISOFMT( \
 #define fsck_trivial_usage \
        "[-ANPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]"
 #define fsck_full_usage \
-       "Check and repair filesystems.\n\n" \
-       "Options:\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      When using -A, check filesystems in parallel\n" \
@@ -934,8 +948,8 @@ USE_FEATURE_DATE_ISOFMT( \
 #define fsck_minix_trivial_usage \
        "[-larvsmf] /dev/name"
 #define fsck_minix_full_usage \
-       "Performs a consistency check for MINIX filesystems.\n\n" \
-       "Options:\n" \
+       "Performs a consistency check for MINIX filesystems" \
+       "\n\nOptions:\n" \
        "       -l      Lists all filenames\n" \
        "       -r      Perform interactive repairs\n" \
        "       -a      Perform automatic repairs\n" \
@@ -947,34 +961,34 @@ USE_FEATURE_DATE_ISOFMT( \
 #define ftpget_trivial_usage \
        "[options] remote-host local-file remote-file"
 #define ftpget_full_usage \
-       "Retrieve a remote file via FTP.\n\n" \
-       "Options:\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"
+       "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"
 
 #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\n" \
-       "Options:\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"
+       "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"
 
 #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"
+       "       -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 getopt_trivial_usage \
        "[OPTIONS]..."
@@ -983,12 +997,12 @@ USE_FEATURE_DATE_ISOFMT( \
        "       -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" \
+       "       -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"
+       "       -u, --unquoted                  Do not quote the output"
 #define getopt_example_usage \
        "$ cat getopt.test\n" \
        "#!/bin/sh\n" \
@@ -1013,8 +1027,8 @@ USE_FEATURE_DATE_ISOFMT( \
 #define getty_trivial_usage \
        "[OPTIONS]... baud_rate,... line [termtype]"
 #define getty_full_usage \
-       "Opens a tty, prompts for a login name, then invokes /bin/login\n\n" \
-       "Options:\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              Do not display /etc/issue before running login\n" \
        "       -L              Local line, so do not do carrier detect\n" \
@@ -1033,8 +1047,8 @@ USE_FEATURE_DATE_ISOFMT( \
        USE_FEATURE_GREP_CONTEXT("ABC") \
        "] PATTERN [FILEs...]"
 #define grep_full_usage \
-       "Search for PATTERN in each FILE or standard input.\n\n" \
-       "Options:\n" \
+       "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" \
@@ -1050,10 +1064,14 @@ USE_FEATURE_DATE_ISOFMT( \
        "       -o      show only the part of a line that matches PATTERN\n" \
        "       -e      PATTERN is a regular expression\n" \
        "       -F      PATTERN is a set of newline-separated strings" \
-       USE_FEATURE_GREP_EGREP_ALIAS("\n        -E      PATTERN is an extended regular expression") \
-       USE_FEATURE_GREP_CONTEXT("\n    -A      print NUM lines of trailing context") \
-       USE_FEATURE_GREP_CONTEXT("\n    -B      print NUM lines of leading context") \
-       USE_FEATURE_GREP_CONTEXT("\n    -C      print NUM lines of output context")
+       USE_FEATURE_GREP_EGREP_ALIAS( \
+       "\n     -E      PATTERN is an extended regular expression") \
+       USE_FEATURE_GREP_CONTEXT( \
+       "\n     -A      print NUM lines of trailing context") \
+       USE_FEATURE_GREP_CONTEXT( \
+       "\n     -B      print NUM lines of leading context") \
+       USE_FEATURE_GREP_CONTEXT( \
+       "\n     -C      print NUM lines of output context")
 
 #define grep_example_usage \
        "$ grep root /etc/passwd\n" \
@@ -1064,8 +1082,8 @@ USE_FEATURE_DATE_ISOFMT( \
 #define gunzip_trivial_usage \
        "[OPTION]... FILE"
 #define gunzip_full_usage \
-       "Uncompress FILE (or standard input if FILE is '-').\n\n" \
-       "Options:\n" \
+       "Uncompress FILE (or standard input if FILE is '-')" \
+       "\n\nOptions:\n" \
        "       -c      Write output to standard output\n" \
        "       -f      Force read when source is a terminal\n" \
        "       -t      Test compressed file integrity"
@@ -1080,8 +1098,8 @@ USE_FEATURE_DATE_ISOFMT( \
        "[OPTION]... [FILE]..."
 #define gzip_full_usage \
        "Compress FILE(s) with maximum compression.\n" \
-       "When FILE is '-' or unspecified, reads standard input.  Implies -c.\n\n" \
-       "Options:\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"
@@ -1095,69 +1113,77 @@ USE_FEATURE_DATE_ISOFMT( \
 #define halt_trivial_usage \
        "[-d<delay>] [-n<nosync>] [-f<force>]"
 #define halt_full_usage \
-       "Halt the system.\n" \
-       "Options:\n" \
-       "       -d              delay interval for halting\n" \
-       "       -n              no call to sync()\n" \
-       "       -f              force halt (don't go through init)"
+       "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") \
-       "\nOptions:\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"
+       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"
 
 #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\n" \
-       "Options:\n" \
-       "       -n NUM          Print first NUM lines instead of first 10" \
+       "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" )
+       "\n     -c NUM  output the first NUM bytes" \
+       "\n     -q      never output headers giving file names" \
+       "\n     -v      always output headers giving file names")
 #define head_example_usage \
        "$ head -n 2 /etc/passwd\n" \
        "root:x:0:0:root:/root:/bin/bash\n" \
@@ -1168,7 +1194,8 @@ USE_FEATURE_DATE_ISOFMT( \
 #define hexdump_full_usage \
        "The hexdump utility is a filter which displays the specified files,\n" \
        "or the standard input, if no files are specified, in a user specified\n" \
-       "format\n" \
+       "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" \
@@ -1190,8 +1217,8 @@ USE_FEATURE_DATE_ISOFMT( \
        "[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\n" \
-       "Options:\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" \
@@ -1211,15 +1238,18 @@ USE_FEATURE_DATE_ISOFMT( \
        " [-h home]" \
        " [-d/-e <string>]"
 #define httpd_full_usage \
-       "Listens for incoming http server requests.\n\n" \
-       "Options:\n" \
+       "Listens for incoming http server requests" \
+       "\n\nOptions:\n" \
        "       -c FILE         Specifies configuration file. (default httpd.conf)\n" \
        "       -p PORT         Server port (default 80)\n" \
        "       -i              Assume that we are started from inetd\n" \
        "       -f              Do not daemonize\n" \
-       USE_FEATURE_HTTPD_SETUID("      -u USER[:GRP]   Set uid/gid after binding to port\n") \
-       USE_FEATURE_HTTPD_BASIC_AUTH("  -r REALM        Authentication Realm for Basic Authentication\n") \
-       USE_FEATURE_HTTPD_AUTH_MD5("    -m PASS         Crypt PASS with md5 algorithm\n") \
+       USE_FEATURE_HTTPD_SETUID( \
+       "       -u USER[:GRP]   Set uid/gid after binding to port\n") \
+       USE_FEATURE_HTTPD_BASIC_AUTH( \
+       "       -r REALM        Authentication Realm for Basic Authentication\n") \
+       USE_FEATURE_HTTPD_AUTH_MD5( \
+       "       -m PASS         Crypt PASS with md5 algorithm\n") \
        "       -h HOME         Specifies http HOME directory (default ./)\n" \
        "       -e STRING       HTML encode STRING\n" \
        "       -d STRING       URL decode STRING"
@@ -1227,8 +1257,8 @@ USE_FEATURE_DATE_ISOFMT( \
 #define hwclock_trivial_usage \
        "[-r|--show] [-s|--hctosys] [-w|--systohc] [-l|--localtime] [-u|--utc]"
 #define hwclock_full_usage \
-       "Query and set the hardware clock (RTC)\n\n" \
-       "Options:\n" \
+       "Query and set the 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" \
@@ -1238,9 +1268,10 @@ USE_FEATURE_DATE_ISOFMT( \
 #define id_trivial_usage \
        "[OPTIONS]... [USERNAME]"
 #define id_full_usage \
-       "Print information for USERNAME or the current user\n\n" \
-       "Options:\n" \
-       USE_SELINUX("   -c      prints only the security context\n") \
+       "Print information for USERNAME or the current user" \
+       "\n\nOptions:\n" \
+       USE_SELINUX( \
+       "       -c      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" \
@@ -1252,24 +1283,26 @@ USE_FEATURE_DATE_ISOFMT( \
 #define ifconfig_trivial_usage \
        USE_FEATURE_IFCONFIG_STATUS("[-a]") " <interface> [<address>]"
 #define ifconfig_full_usage \
-       "configure a network interface\n\n" \
-       "Options:\n" \
-       USE_FEATURE_IPV6("      [add <address>[/<prefixlen>]]\n") \
-       USE_FEATURE_IPV6("      [del <address>[/<prefixlen>]]\n") \
-       "       [[-]broadcast [<address>]]  [[-]pointopoint [<address>]]\n" \
-       "       [netmask <address>]  [dstaddr <address>]\n" \
-       USE_FEATURE_IFCONFIG_SLIP("     [outfill <NN>] [keepalive <NN>]\n") \
-       "       " USE_FEATURE_IFCONFIG_HW("[hw ether <address>]  ") \
-       "[metric <NN>]  [mtu <NN>]\n" \
-       "       [[-]trailers]  [[-]arp]  [[-]allmulti]\n" \
-       "       [multicast]  [[-]promisc]  [txqueuelen <NN>]  [[-]dynamic]\n" \
-       USE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ("      [mem_start <NN>]  [io_addr <NN>]  [irq <NN>]\n") \
+       "Configure a network interface" \
+       "\n\nOptions:\n" \
+       USE_FEATURE_IPV6( \
+       "       [add <address>[/<prefixlen>]]\n") \
+       USE_FEATURE_IPV6( \
+       "       [del <address>[/<prefixlen>]]\n") \
+       "       [[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" \
+       "       [netmask <address>] [dstaddr <address>]\n" \
+       USE_FEATURE_IFCONFIG_SLIP( \
+       "       [outfill <NN>] [keepalive <NN>]\n") \
+       "       " USE_FEATURE_IFCONFIG_HW("[hw ether <address>] ") "[metric <NN>] [mtu <NN>]\n" \
+       "       [[-]trailers] [[-]arp] [[-]allmulti]\n" \
+       "       [multicast] [[-]promisc] [txqueuelen <NN>] [[-]dynamic]\n" \
+       USE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ( \
+       "       [mem_start <NN>] [io_addr <NN>] [irq <NN>]\n") \
        "       [up|down] ..."
 
 #define ifup_trivial_usage \
        "<-ahinv> <ifaces...>"
 #define ifup_full_usage \
-       "ifup <options> <ifaces...>\n\n" \
        "Options:\n" \
        "       -h      this help\n" \
        "       -a      de/configure all interfaces automatically\n" \
@@ -1283,7 +1316,6 @@ USE_FEATURE_DATE_ISOFMT( \
 #define ifdown_trivial_usage \
        "<-ahinv> <ifaces...>"
 #define ifdown_full_usage \
-       "ifdown <options> <ifaces...>\n\n" \
        "Options:\n" \
        "       -h      this help\n" \
        "       -a      de/configure all interfaces automatically\n" \
@@ -1297,8 +1329,8 @@ USE_FEATURE_DATE_ISOFMT( \
 #define inetd_trivial_usage \
        "[-f] [-q len] [conf]"
 #define inetd_full_usage \
-       "Listens for network connections and launches programs\n\n" \
-       "Option:\n" \
+       "Listens for network connections and launches programs" \
+       "\n\nOptions:\n" \
        "       -f      Run as a foreground progress\n" \
        "       -q      Sets the size of the socket listen queue to\n" \
        "               the specified value. Default is 128"
@@ -1437,22 +1469,23 @@ USE_FEATURE_DATE_ISOFMT( \
 #define insmod_trivial_usage \
        "[OPTION]... MODULE [symbol=value]..."
 #define insmod_full_usage \
-       "Loads the specified kernel modules into the kernel.\n\n" \
-       "Options:\n" \
+       "Loads 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 output\n"  \
        "       -q      quiet output\n" \
        "       -L      Lock to prevent simultaneous loads of a module\n" \
-       USE_FEATURE_INSMOD_LOAD_MAP("   -m      Output load map to stdout\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"
 
 #define install_trivial_usage \
        "[-cgmops] [sources] <dest|directory>"
 #define install_full_usage \
-       "Copies files and set attributes\n\n" \
-       "Options:\n" \
+       "Copies files and set attributes" \
+       "\n\nOptions:\n" \
        "       -c      copy the file, default\n" \
        "       -d      create directories\n" \
        "       -g      set group ownership\n" \
@@ -1474,17 +1507,17 @@ USE_FEATURE_DATE_ISOFMT( \
 #define ipaddr_full_usage \
        "ipaddr {add|delete} IFADDR dev STRING\n" \
        "ipaddr {show|flush} [ dev STRING ] [ scope SCOPE-ID ]\n" \
-       "                       [ to PREFIX ] [ label PATTERN ]\n" \
-       "                       IFADDR := PREFIX | ADDR peer PREFIX\n" \
-       "                       [ broadcast ADDR ] [ anycast ADDR ]\n" \
-       "                       [ label STRING ] [ scope SCOPE-ID ]\n" \
-       "                       SCOPE-ID := [ host | link | global | NUMBER ]"
+       "       [ to PREFIX ] [ label PATTERN ]\n" \
+       "       IFADDR := PREFIX | ADDR peer PREFIX\n" \
+       "       [ broadcast ADDR ] [ anycast ADDR ]\n" \
+       "       [ label STRING ] [ scope SCOPE-ID ]\n" \
+       "       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\n" \
-       "Options:\n" \
+       "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" \
@@ -1551,19 +1584,19 @@ USE_FEATURE_DATE_ISOFMT( \
 
 #define iptunnel_trivial_usage \
        "{ add | change | del | show } [ NAME ]\n" \
-       "               [ mode { ipip | gre | sit } ]\n" \
-       "               [ remote ADDR ] [ local ADDR ] [ ttl TTL ]"
+       "       [ mode { ipip | gre | sit } ]\n" \
+       "       [ remote ADDR ] [ local ADDR ] [ ttl TTL ]"
 #define iptunnel_full_usage \
        "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 ]"
+       "       [ 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 ]"
 
 #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\n" \
-       "Options:\n" \
+       "Send a signal (default is TERM) to the specified process(es)" \
+       "\n\nOptions:\n" \
        "       -l      List all signal names and numbers"
 #define kill_example_usage \
        "$ ps | grep apache\n" \
@@ -1578,8 +1611,8 @@ USE_FEATURE_DATE_ISOFMT( \
 #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\n" \
-       "Options:\n" \
+       "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"
 #define killall_example_usage \
@@ -1588,15 +1621,15 @@ USE_FEATURE_DATE_ISOFMT( \
 #define killall5_trivial_usage \
        "[-l] [-signal]"
 #define killall5_full_usage \
-       "Send a signal (default is TERM) to all processes outside current session.\n\n" \
-       "Options:\n" \
+       "Send a signal (default is TERM) to all processes outside current session" \
+       "\n\nOptions:\n" \
        "       -l      List all signal names and numbers\n" \
 
 #define klogd_trivial_usage \
        "[-c n] [-n]"
 #define klogd_full_usage \
-       "Kernel logger.\n" \
-       "Options:\n" \
+       "Kernel logger" \
+       "\n\nOptions:\n" \
        "       -c n    Sets the default log level of console messages to n\n" \
        "       -n      Run as a foreground process"
 
@@ -1612,8 +1645,8 @@ USE_FEATURE_DATE_ISOFMT( \
        "[-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 with the\n" \
-       "following options:\n\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" \
@@ -1634,9 +1667,9 @@ USE_FEATURE_DATE_ISOFMT( \
 #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" \
-       "\nYou may use '--' to indicate that all following arguments are non-options.\n\n" \
-       "Options:\n" \
+       "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 symbolic links instead of hard links\n" \
        "       -f      remove existing destination files\n" \
        "       -n      no dereference symlinks - treat like normal file\n" \
@@ -1664,8 +1697,8 @@ USE_FEATURE_DATE_ISOFMT( \
 #define logger_trivial_usage \
        "[OPTION]... [MESSAGE]"
 #define logger_full_usage \
-       "Write MESSAGE to the system log.  If MESSAGE is omitted, log stdin.\n\n" \
-       "Options:\n" \
+       "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 PRIORITY     Enter the message with the specified priority\n" \
@@ -1676,8 +1709,8 @@ USE_FEATURE_DATE_ISOFMT( \
 #define login_trivial_usage \
        "[OPTION]... [username] [ENV=VAR ...]"
 #define login_full_usage \
-       "Begin a new session on the system\n\n" \
-       "Options:\n" \
+       "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"
@@ -1693,15 +1726,15 @@ USE_FEATURE_DATE_ISOFMT( \
 #define logread_trivial_usage \
        "[OPTION]..."
 #define logread_full_usage \
-       "Shows the messages from syslogd (using circular buffer).\n\n" \
-       "Options:\n" \
-       "       -f              output data as the log grows"
+       "Shows the messages from syslogd (using circular buffer)" \
+       "\n\nOptions:\n" \
+       "       -f      output data as the 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\n" \
-       "Options:\n" \
+       "(Dis)associate LOOPDEVICE with FILE, or display current associations" \
+       "\n\nOptions:\n" \
        "       -d              Disassociate LOOPDEVICE\n" \
        "       -o OFFSET       Start OFFSET bytes into FILE"
 #define losetup_notes_usage \
@@ -1722,43 +1755,60 @@ USE_FEATURE_DATE_ISOFMT( \
        USE_FEATURE_LS_SORTFILES("X") USE_FEATURE_HUMAN_READABLE("h") "k" \
        USE_SELINUX("K") "] [filenames...]"
 #define ls_full_usage \
-       "List directory contents\n\n" \
-       "Options:\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\n" \
-       USE_FEATURE_LS_TIMESTAMPS("     -c      with -l: show ctime\n") \
-       USE_FEATURE_LS_COLOR("  --color[={always,never,auto}]   to control coloring\n") \
-       "       -d      list directory entries instead of contents\n" \
-       USE_FEATURE_LS_TIMESTAMPS("     -e      list both full date and full time\n") \
-       USE_FEATURE_LS_FILETYPES("      -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\n" \
-       USE_FEATURE_LS_FILETYPES("      -p      append indicator (one of /=@|) to entries\n") \
-       USE_FEATURE_LS_FOLLOWLINKS("    -L      list entries pointed to by symbolic links\n") \
-       USE_FEATURE_LS_RECURSIVE("      -R      list subdirectories recursively\n") \
-       USE_FEATURE_LS_SORTFILES("      -r      sort the listing in reverse order\n") \
-       USE_FEATURE_LS_SORTFILES("      -S      sort the listing by file size\n") \
-       "       -s      list the size of each file, in blocks\n" \
-       USE_FEATURE_AUTOWIDTH(" -T NUM  assume Tabstop every NUM columns\n") \
-       USE_FEATURE_LS_TIMESTAMPS("     -t      with -l: show modification time\n") \
-       USE_FEATURE_LS_TIMESTAMPS("     -u      with -l: show access time\n") \
-       USE_FEATURE_LS_SORTFILES("      -v      sort the listing by version\n") \
-       USE_FEATURE_AUTOWIDTH(" -w NUM  assume the terminal is NUM columns wide\n") \
-       "       -x      list entries by lines instead of by columns\n" \
-       USE_FEATURE_LS_SORTFILES("      -X      sort the listing by extension\n") \
+       "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 symbolic links") \
+       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( \
-       "       -h      print sizes in human readable format (e.g., 1K 243M 2G )\n") \
-       USE_SELINUX("   -k      print security context\n") \
-       USE_SELINUX("   -K      print security context in long format\n")
+       "\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")
 
 #define lsattr_trivial_usage \
        "[-Radlv] [files...]"
 #define lsattr_full_usage \
-       "list file attributes on an ext2 fs\n\n" \
-       "Options:\n" \
+       "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" \
@@ -1830,8 +1880,8 @@ USE_FEATURE_DATE_ISOFMT( \
        "[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\n" \
-       "Options:\n" \
+       "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" \
@@ -1855,7 +1905,7 @@ USE_FEATURE_DATE_ISOFMT( \
        "Called with no options (via hotplug) it uses environment variables\n" \
        "to determine which device to add/remove."
 #define mdev_notes_usage "" \
-USE_FEATURE_MDEV_CONFIG( \
+       USE_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" \
@@ -1872,7 +1922,7 @@ USE_FEATURE_MDEV_CONFIG( \
        "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]"
@@ -1884,8 +1934,8 @@ USE_FEATURE_MDEV_CONFIG( \
 #define mkdir_trivial_usage \
        "[OPTION] DIRECTORY..."
 #define mkdir_full_usage \
-       "Create the DIRECTORY(ies) if they do not already exist\n\n" \
-       "Options:\n" \
+       "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"
 #define mkdir_example_usage \
@@ -1904,41 +1954,41 @@ USE_FEATURE_MDEV_CONFIG( \
        "[-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" \
+       "       -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" \
+       "       -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" \
+       "       -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 execution\n" \
-       "       -r rev  set filesystem revision\n" \
-       "       -S      write superblock and group descriptors only\n" \
+       "       -q              quiet execution\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 execution"
+       "       -v              verbose execution"
 
 #define mkfifo_trivial_usage \
        "[OPTIONS] name"
 #define mkfifo_full_usage \
-       "Creates a named pipe (identical to 'mknod name p')\n\n" \
-       "Options:\n" \
+       "Creates a named pipe (identical to 'mknod name p')" \
+       "\n\nOptions:\n" \
        "       -m      create the pipe using the specified mode (default a=rw)"
 
 #define mkfs_minix_trivial_usage \
        "[-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 #define mkfs_minix_full_usage \
-       "Make a MINIX filesystem.\n\n" \
-       "Options:\n" \
+       "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" \
@@ -1948,10 +1998,10 @@ USE_FEATURE_MDEV_CONFIG( \
 #define mknod_trivial_usage \
        "[OPTIONS] NAME TYPE MAJOR MINOR"
 #define mknod_full_usage \
-       "Create a special file (block, character, or pipe).\n\n" \
-       "Options:\n" \
-       "       -m      create the special file using the specified mode (default a=rw)\n\n" \
-       "TYPEs include:\n" \
+       "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"
@@ -1962,22 +2012,21 @@ USE_FEATURE_MDEV_CONFIG( \
 #define mkswap_trivial_usage \
        "[-c] [-v0|-v1] device [block-count]"
 #define mkswap_full_usage \
-       "Prepare a disk partition to be used as a swap partition.\n\n" \
-       "Options:\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 >\n" \
-       "                       2.1.117)\n" \
+       "Prepare a disk partition to be used as a 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)"
 
 #define mktemp_trivial_usage \
        "[-dq] TEMPLATE"
 #define mktemp_full_usage \
        "Creates a temporary file with its name based on TEMPLATE.\n" \
-       "TEMPLATE is any name with six 'Xs' (i.e., /tmp/temp.XXXXXX).\n\n" \
-       "Options:\n" \
-       "       -d              Make a directory instead of a file\n" \
-       "       -q              Fail silently if an error occurs"
+       "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"
 #define mktemp_example_usage \
        "$ mktemp /tmp/temp.XXXXXX\n" \
        "/tmp/temp.mWiLjM\n" \
@@ -2064,12 +2113,12 @@ USE_FEATURE_MDEV_CONFIG( \
 #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\n" \
-       "Flags:\n"  \
+       "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" \
+       "       -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" \
@@ -2078,21 +2127,21 @@ USE_FEATURE_MDEV_CONFIG( \
        "\n" \
        "Options for use with the \"-o\" flag:\n" \
        USE_FEATURE_MOUNT_LOOP( \
-               "       loop:           Ignored (loop devices are autodetected)\n" \
+       "       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" \
+       "       [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:        Re-mount a mounted filesystem, changing its flags\n" \
        "       ro/rw:          Mount for read-only / read-write\n" \
@@ -2112,11 +2161,11 @@ USE_FEATURE_MDEV_CONFIG( \
 #define mountpoint_trivial_usage \
        "[-q] <[-d] DIR | -x DEVICE>"
 #define mountpoint_full_usage \
-       "mountpoint checks if the directory is a mountpoint\n\n" \
-       "Options:\n"  \
-       "       -q:             Be more quiet\n" \
-       "       -d:             Print major/minor device number of the filesystem\n" \
-       "       -x:             Print major/minor device number of the blockdevice"
+       "mountpoint checks if the directory is a mountpoint" \
+       "\n\nOptions:\n"  \
+       "       -q      Be more quiet\n" \
+       "       -d      Print major/minor device number of the filesystem\n" \
+       "       -x      Print major/minor device number of the blockdevice"
 #define mountpoint_example_usage \
        "$ mountpoint /proc\n" \
        "/proc is not a mountpoint\n" \
@@ -2137,8 +2186,8 @@ USE_FEATURE_MDEV_CONFIG( \
        "[OPTION]... SOURCE DEST\n" \
        "or: mv [OPTION]... SOURCE... DIRECTORY"
 #define mv_full_usage \
-       "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n\n" \
-       "Options:\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"
 #define mv_example_usage \
@@ -2147,8 +2196,8 @@ USE_FEATURE_MDEV_CONFIG( \
 #define nameif_trivial_usage \
        "[-s] [-c FILE] [{IFNAME MACADDR}]"
 #define nameif_full_usage \
-       "Nameif renames network interface while it in the down state.\n\n" \
-       "Options:\n" \
+       "Renames 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"
@@ -2170,23 +2219,24 @@ USE_FEATURE_MDEV_CONFIG( \
        "Netcat opens 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" \
+       "\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\n" \
-               USE_NC_EXTRA("          (use -l twice with -e for persistent server)\n") \
-               "       -p PORT local port number" \
+       "\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" \
-       ) ""
+       "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" \
@@ -2201,23 +2251,23 @@ USE_FEATURE_MDEV_CONFIG( \
 #define netstat_trivial_usage \
        "[-laenrtuwx]"
 #define netstat_full_usage \
-       "Netstat displays Linux networking information.\n\n" \
-       "Options:\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" \
-       "       -r display routing table\n" \
-       "       -t tcp sockets\n" \
-       "       -u udp sockets\n" \
-       "       -w raw sockets\n" \
-       "       -x unix sockets"
+       "Displays Linux 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" \
+       "       -r      display routing table\n" \
+       "       -t      tcp sockets\n" \
+       "       -u      udp sockets\n" \
+       "       -w      raw sockets\n" \
+       "       -x      unix sockets"
 
 #define nice_trivial_usage \
        "[-n ADJUST] [COMMAND [ARG] ...]"
 #define nice_full_usage \
-       "Nice runs a program with modified scheduling priority.\n\n" \
-       "Options:\n" \
+       "Runs a program with modified scheduling priority" \
+       "\n\nOptions:\n" \
        "       -n ADJUST       Adjust the scheduling priority by ADJUST"
 
 #define nmeter_trivial_usage \
@@ -2281,10 +2331,10 @@ USE_FEATURE_MDEV_CONFIG( \
        "[OPTION] [name]"
 #define passwd_full_usage \
        "Change a user password. If no name is specified,\n" \
-       "changes the password for the current user.\n" \
-       "Options:\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, sha1)\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"
@@ -2301,7 +2351,7 @@ USE_FEATURE_MDEV_CONFIG( \
 #if (ENABLE_FEATURE_PIDOF_SINGLE || ENABLE_FEATURE_PIDOF_OMIT)
 #define USAGE_PIDOF "Options:"
 #else
-#define USAGE_PIDOF "\n        This version of pidof accepts no options."
+#define USAGE_PIDOF "\nThis version of pidof accepts no options."
 #endif
 
 #define pidof_trivial_usage \
@@ -2311,14 +2361,19 @@ USE_FEATURE_MDEV_CONFIG( \
        "Lists the PIDs of all processes with names that match the\n" \
        "names on the command line.\n" \
        USAGE_PIDOF \
-       USE_FEATURE_PIDOF_SINGLE("\n    -s              display only a single PID") \
-       USE_FEATURE_PIDOF_OMIT("\n      -o              omit given pid.") \
-       USE_FEATURE_PIDOF_OMIT("\n                      Use %PPID to omit the parent pid of pidof itself")
+       USE_FEATURE_PIDOF_SINGLE( \
+       "\n     -s              display only a single PID") \
+       USE_FEATURE_PIDOF_OMIT( \
+       "\n     -o              omit given pid.") \
+       USE_FEATURE_PIDOF_OMIT( \
+       "\n                     Use %PPID to omit the parent pid of pidof itself")
 #define pidof_example_usage \
        "$ pidof init\n" \
        "1\n" \
-       USE_FEATURE_PIDOF_OMIT("$ pidof /bin/sh\n20351 5973 5950\n") \
-       USE_FEATURE_PIDOF_OMIT("$ pidof /bin/sh -o %PPID\n20351 5950")
+       USE_FEATURE_PIDOF_OMIT( \
+       "$ pidof /bin/sh\n20351 5973 5950\n") \
+       USE_FEATURE_PIDOF_OMIT( \
+       "$ pidof /bin/sh -o %PPID\n20351 5950")
 
 #ifndef CONFIG_FEATURE_FANCY_PING
 #define ping_trivial_usage "host"
@@ -2327,13 +2382,13 @@ USE_FEATURE_MDEV_CONFIG( \
 #define ping_trivial_usage \
        "[OPTION]... host"
 #define ping_full_usage \
-       "Send ICMP ECHO_REQUEST packets to network hosts.\n\n" \
-       "Options:\n" \
-       "       -c COUNT        Send only COUNT pings\n" \
-       "       -s SIZE         Send SIZE data bytes in packets (default=56)\n" \
-       "       -I IPADDR       Use IPADDR as source address\n" \
-       "       -q              Quiet mode, only displays output at start\n" \
-       "                       and when finished"
+       "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 IP   Use IP as source address\n" \
+       "       -q      Quiet mode, only displays output at start\n" \
+       "               and when finished"
 #endif
 #define ping_example_usage \
        "$ ping localhost\n" \
@@ -2351,12 +2406,12 @@ USE_FEATURE_MDEV_CONFIG( \
 #define ping6_trivial_usage \
        "[OPTION]... host"
 #define ping6_full_usage \
-       "Send ICMP ECHO_REQUEST packets to network hosts.\n\n" \
-       "Options:\n" \
-       "       -c COUNT        Send only COUNT pings\n" \
-       "       -s SIZE         Send SIZE data bytes in packets (default=56)\n" \
-       "       -q              Quiet mode, only displays output at start\n" \
-       "                       and when finished"
+       "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" \
+       "       -q      Quiet mode, only displays output at start\n" \
+       "               and when finished"
 #endif
 #define ping6_example_usage \
        "$ ping6 ip6-localhost\n" \
@@ -2376,11 +2431,11 @@ USE_FEATURE_MDEV_CONFIG( \
 #define poweroff_trivial_usage \
        "[-d<delay>] [-n<nosync>] [-f<force>]"
 #define poweroff_full_usage \
-       "Halt and shut off power.\n" \
-       "Options:\n" \
-       "       -d              delay interval for halting\n" \
-       "       -n              no call to sync()\n" \
-       "       -f              force power off (don't go through init)"
+       "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 printenv_trivial_usage \
        "[VARIABLES...]"
@@ -2403,8 +2458,8 @@ USE_FEATURE_MDEV_CONFIG( \
 #define ps_trivial_usage \
        ""
 #define ps_full_usage \
-       "Report process status\n" \
-       "\nOptions:" \
+       "Report process status" \
+       "\n\nOptions:" \
        "\n     -o col1,col2=header     Select columns for display" \
 
 #else /* !ENABLE_DESKTOP */
@@ -2420,8 +2475,10 @@ USE_FEATURE_MDEV_CONFIG( \
 #define ps_full_usage \
        "Report process status\n" \
        USAGE_PS \
-       USE_SELINUX("\n -c      show SE Linux context") \
-       USE_FEATURE_PS_WIDE("\n w       wide output")
+       USE_SELINUX( \
+       "\n     -c      show SE Linux context") \
+       USE_FEATURE_PS_WIDE( \
+       "\n     w       wide output")
 
 #endif /* ENABLE_DESKTOP */
 
@@ -2457,8 +2514,8 @@ USE_FEATURE_MDEV_CONFIG( \
 #define rdate_trivial_usage \
        "[-sp] HOST"
 #define rdate_full_usage \
-       "Get and possibly set the system date and time from a remote HOST.\n\n" \
-       "Options:\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"
 
@@ -2472,7 +2529,8 @@ USE_FEATURE_MDEV_CONFIG( \
        USE_FEATURE_READLINK_FOLLOW("[-f] ") "FILE"
 #define readlink_full_usage \
        "Displays the value of a symbolic link." \
-       USE_FEATURE_READLINK_FOLLOW("\n\nOptions:\n" \
+       USE_FEATURE_READLINK_FOLLOW( \
+       "\n\nOptions:\n" \
        "       -f      canonicalize by following all symlinks")
 
 #define readprofile_trivial_usage \
@@ -2498,17 +2556,17 @@ USE_FEATURE_MDEV_CONFIG( \
 #define reboot_trivial_usage \
        "[-d<delay>] [-n<nosync>] [-f<force>]"
 #define reboot_full_usage \
-       "Reboot the system.\n" \
-       "Options:\n" \
-       "       -d              delay interval for rebooting\n" \
-       "       -n              no call to sync()\n" \
-       "       -f              force reboot (don't go through init)"
+       "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 \
-       "Changes priority of running processes.\n\n" \
-       "Options:\n" \
+       "Changes 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" \
@@ -2528,11 +2586,11 @@ USE_FEATURE_MDEV_CONFIG( \
        "[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\n" \
-       "Options:\n" \
-       "       -i              always prompt before removing each destination\n" \
-       "       -f              remove existing destinations, never prompt\n" \
-       "       -r or -R        remove the contents of directories recursively"
+       "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"
 #define rm_example_usage \
        "$ rm -rf /tmp/foo\n"
 
@@ -2546,8 +2604,8 @@ USE_FEATURE_MDEV_CONFIG( \
 #define rmmod_trivial_usage \
        "[OPTION]... [MODULE]..."
 #define rmmod_full_usage \
-       "Unloads the specified kernel modules from the kernel.\n\n" \
-       "Options:\n" \
+       "Unloads the specified kernel modules from the kernel" \
+       "\n\nOptions:\n" \
        "       -a      Remove all unused modules (recursively)"
 #define rmmod_example_usage \
        "$ rmmod tulip\n"
@@ -2555,8 +2613,8 @@ USE_FEATURE_MDEV_CONFIG( \
 #define route_trivial_usage \
        "[{add|del|delete}]"
 #define route_full_usage \
-       "Edit the kernel's routing tables.\n\n" \
-       "Options:\n" \
+       "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"
@@ -2566,13 +2624,13 @@ USE_FEATURE_MDEV_CONFIG( \
 #define rpm_full_usage \
        "Manipulates 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"
+       "\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"
 
 #define rpm2cpio_trivial_usage \
        "package.rpm"
@@ -2582,8 +2640,8 @@ USE_FEATURE_MDEV_CONFIG( \
 #define run_parts_trivial_usage \
        "[-t] [-a ARG] [-u MASK] DIRECTORY"
 #define run_parts_full_usage \
-       "Run a bunch of scripts in a directory.\n\n" \
-       "Options:\n" \
+       "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"
@@ -2648,8 +2706,8 @@ USE_FEATURE_MDEV_CONFIG( \
 #define setconsole_trivial_usage \
        "[-r|--reset] [DEVICE]"
 #define setconsole_full_usage \
-       "Redirects system console output to DEVICE (default: /dev/tty).\n\n" \
-       "Options:\n" \
+       "Redirects system console output to DEVICE (default: /dev/tty)" \
+       "\n\nOptions:\n" \
        "       -r      Reset output to /dev/console."
 
 #define setkeycodes_trivial_usage \
@@ -2696,10 +2754,10 @@ USE_FEATURE_MDEV_CONFIG( \
        "[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\n" \
-       "Options:\n" \
+       "Print" USE_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums.\n" \
        "With no FILE, or when FILE is -, read standard input." \
-       USE_FEATURE_MD5_SHA1_SUM_CHECK("\n\n" \
+       "\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" \
@@ -2711,39 +2769,43 @@ USE_FEATURE_MDEV_CONFIG( \
        SKIP_FEATURE_FANCY_SLEEP("Pause for N seconds.") \
        USE_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.")
+       "have an optional suffix of (s)econds, (m)inutes, (h)ours, or (d)ays.")
 #define sleep_example_usage \
        "$ sleep 2\n" \
        "[2 second delay results]\n" \
-       USE_FEATURE_FANCY_SLEEP("$ sleep 1d 3h 22m 8s\n" \
+       USE_FEATURE_FANCY_SLEEP( \
+       "$ sleep 1d 3h 22m 8s\n" \
        "[98528 second delay results]\n")
 
 #define sort_trivial_usage \
-       "[-nru" USE_FEATURE_SORT_BIG("gMcszbdfimSTokt] [-o outfile] [-k start[.offset][opts][,end[.offset][opts]] [-t char") "] [FILE]..."
+       "[-nru" \
+       USE_FEATURE_SORT_BIG("gMcszbdfimSTokt] [-o outfile] [-k start[.offset][opts][,end[.offset][opts]] [-t char") \
+       "] [FILE]..."
 #define sort_full_usage \
-       "Sorts lines of text in the specified files\n\n" \
-       "Options:\n" \
+       "Sorts 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" \
-       ) \
+       "       -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" \
-       ) \
+       "       -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") \
+       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") \
+       USE_FEATURE_SORT_BIG( \
+       "\n     -z      input terminated by nulls, not newlines\n") \
+       USE_FEATURE_SORT_BIG( \
+       "       -mST    ignored for GNU compatibility") \
        ""
 #define sort_example_usage \
        "$ echo -e \"e\\nf\\nb\\nd\\nc\\na\" | sort\n" \
@@ -2772,68 +2834,69 @@ USE_FEATURE_MDEV_CONFIG( \
        "\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     -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                      be quiet" \
-USE_FEATURE_START_STOP_DAEMON_FANCY( \
+       USE_FEATURE_START_STOP_DAEMON_FANCY( \
        "\n     -o|--oknodo                     exit status 0 if nothing done" \
        "\n     -v|--verbose                    be verbose" \
        "\n     -N|--nicelevel <N>              add N to process's nice level" \
-) \
+       ) \
        "\n     -s|--signal <signal>            signal to send (default TERM)" \
        "\n     -U|--chuid <username>|<uid>     start process with this name"
 
 #define stat_trivial_usage \
        "[OPTION] FILE..."
 #define stat_full_usage \
-       "display file (default) or filesystem status.\n\n" \
-       "Options:\n" \
-       USE_FEATURE_STAT_FORMAT("       -c fmt  use the specified format\n") \
+       "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\n" \
+       "       -t      display info in terse form" \
        USE_FEATURE_STAT_FORMAT( \
-       "\nValid format sequences for files:\n" \
-       "  %a   Access rights in octal\n" \
-       "  %A   Access rights in human readable form\n" \
-       "  %b   Number of blocks allocated (see %B)\n" \
-       "  %B   The size in bytes of each block reported by %b\n" \
-       "  %d   Device number in decimal\n" \
-       "  %D   Device number in hex\n" \
-       "  %f   Raw mode in hex\n" \
-       "  %F   File type\n" \
-       "  %g   Group ID of owner\n" \
-       "  %G   Group name of owner\n" \
-       "  %h   Number of hard links\n" \
-       "  %i   Inode number\n" \
-       "  %n   File name\n" \
-       "  %N   Quoted file name with dereference if symbolic link\n" \
-       "  %o   I/O block size\n" \
-       "  %s   Total size, in bytes\n" \
-       "  %t   Major device type in hex\n" \
-       "  %T   Minor device type in hex\n" \
-       "  %u   User ID of owner\n" \
-       "  %U   User name of owner\n" \
-       "  %x   Time of last access\n" \
-       "  %X   Time of last access as seconds since Epoch\n" \
-       "  %y   Time of last modification\n" \
-       "  %Y   Time of last modification as seconds since Epoch\n" \
-       "  %z   Time of last change\n" \
-       "  %Z   Time of last change as seconds since Epoch\n" \
+       "\n\nValid format sequences for files:\n" \
+       " %a    Access rights in octal\n" \
+       " %A    Access rights in human readable form\n" \
+       " %b    Number of blocks allocated (see %B)\n" \
+       " %B    The size in bytes of each block reported by %b\n" \
+       " %d    Device number in decimal\n" \
+       " %D    Device number in hex\n" \
+       " %f    Raw mode in hex\n" \
+       " %F    File type\n" \
+       " %g    Group ID of owner\n" \
+       " %G    Group name of owner\n" \
+       " %h    Number of hard links\n" \
+       " %i    Inode number\n" \
+       " %n    File name\n" \
+       " %N    Quoted file name with dereference if symbolic link\n" \
+       " %o    I/O block size\n" \
+       " %s    Total size, in bytes\n" \
+       " %t    Major device type in hex\n" \
+       " %T    Minor device type in hex\n" \
+       " %u    User ID of owner\n" \
+       " %U    User name of owner\n" \
+       " %x    Time of last access\n" \
+       " %X    Time of last access as seconds since Epoch\n" \
+       " %y    Time of last modification\n" \
+       " %Y    Time of last modification as seconds since Epoch\n" \
+       " %z    Time of last change\n" \
+       " %Z    Time of last change as seconds since Epoch\n" \
        "\nValid format sequences for file systems:\n" \
-       "  %a   Free blocks available to non-superuser\n" \
-       "  %b   Total data blocks in file system\n" \
-       "  %c   Total file nodes in file system\n" \
-       "  %d   Free file nodes in file system\n" \
-       "  %f   Free blocks in file system\n" \
-       "  %i   File System ID in hex\n" \
-       "  %l   Maximum length of filenames\n" \
-       "  %n   File name\n" \
-       "  %s   Block size (for faster transfers)\n" \
-       "  %S   Fundamental block size (for block counts)\n" \
-       "  %t   Type in hex\n" \
-       "  %T   Type in human readable form\n" \
+       " %a    Free blocks available to non-superuser\n" \
+       " %b    Total data blocks in file system\n" \
+       " %c    Total file nodes in file system\n" \
+       " %d    Free file nodes in file system\n" \
+       " %f    Free blocks in file system\n" \
+       " %i    File System ID in hex\n" \
+       " %l    Maximum length of filenames\n" \
+       " %n    File name\n" \
+       " %s    Block size (for faster transfers)\n" \
+       " %S    Fundamental block size (for block counts)\n" \
+       " %t    Type in hex\n" \
+       " %T    Type in human readable form" \
        )
 
 #define strings_trivial_usage \
@@ -2860,24 +2923,24 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define su_trivial_usage \
        "[OPTION]... [-] [username]"
 #define su_full_usage \
-       "Change user id or become root.\n" \
-       "Options:\n" \
-       "       -p, -m  Preserve environment" \
+       "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"
 
 #define sulogin_trivial_usage \
        "[OPTION]... [tty-device]"
 #define sulogin_full_usage \
-       "Single user login\n" \
-       "Options:\n" \
-       "       -t      Timeout"
+       "Single user login" \
+       "\n\nOptions:" \
+       "\n     -t      Timeout"
 
 #define sum_trivial_usage \
        "[rs] [files...]"
 #define sum_full_usage \
-       "checksum and count the blocks in a file\n\n" \
-       "Options:\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)"
 
@@ -2897,23 +2960,23 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define swapoff_trivial_usage \
        "[-a] [DEVICE]"
 #define swapoff_full_usage \
-       "Stop swapping virtual memory pages on DEVICE.\n\n" \
-       "Options:\n" \
+       "Stop swapping virtual memory pages 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\n" \
-       "Options:\n" \
+       "Start swapping virtual memory pages on DEVICE" \
+       "\n\nOptions:\n" \
        "       -a      Start swapping on all swap devices"
 
 #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\n" \
-       "Options:\n" \
+       "and exec NEW_INIT" \
+       "\n\nOptions:\n" \
        "       -c      Redirect console to device on new root"
 
 #define sync_trivial_usage \
@@ -2924,8 +2987,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define sysctl_trivial_usage \
        "[OPTIONS]... [VALUE]..."
 #define sysctl_full_usage \
-       "configure kernel parameters at runtime\n\n" \
-       "Options:\n" \
+       "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" \
@@ -2942,19 +3005,19 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
        "[OPTION]..."
 #define syslogd_full_usage \
        "Linux system and kernel logging utility.\n" \
-       "Note that this version of syslogd ignores /etc/syslog.conf.\n\n" \
-       "Options:\n" \
-       "       -m MIN          Minutes between MARK lines (default=20, 0=off)\n" \
-       "       -n              Run as a foreground process\n" \
-       "       -O FILE         Use an alternate log file (default=/var/log/messages)\n" \
-       "       -l n    Sets the local log level of messages to n\n" \
-       "       -S              Make logging output smaller" \
+       "Note that this version of syslogd ignores /etc/syslog.conf." \
+       "\n\nOptions:" \
+       "\n     -m MIN  Minutes between MARK lines (default=20, 0=off)" \
+       "\n     -n      Run as a foreground process" \
+       "\n     -O FILE Use an alternate log file (default=/var/log/messages)" \
+       "\n     -l n    Sets the local log level of messages to n" \
+       "\n     -S      Make logging output smaller" \
        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)") \
+       "\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 logging (default is network only)") \
+       "\n     -R HOST[:PORT]  Log to IP or hostname on PORT (default PORT=514/UDP)" \
+       "\n     -L      Log locally and via network logging (default is network only)") \
        USE_FEATURE_IPC_SYSLOG( \
        "\n     -C [size(KiB)]  Log to a circular buffer (read the buffer using logread)")
 #define syslogd_example_usage \
@@ -2966,14 +3029,17 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #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\n" \
-       "Options:\n" \
-       USE_FEATURE_FANCY_TAIL("        -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" \
+       "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)." )
@@ -2988,51 +3054,55 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
        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\n" \
-       "Options:\n" \
-       USE_FEATURE_TAR_CREATE("        c               create\n") \
-       "       x               extract\n" \
-       "       t               list\n" \
+       "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") \
+       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" \
+       "       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               verbosely list files processed"
+       "       exclude file to exclude\n" \
+       "       X       file with names to exclude\n") \
+       "       C       change to directory DIR before operation\n" \
+       "       v       verbosely list files processed"
 #define tar_example_usage \
        "$ zcat /tmp/tarball.tar.gz | tar -xf -\n" \
        "$ tar -cf /tmp/tarball.tar /usr/local\n"
 
 #define taskset_trivial_usage \
-               "[OPTIONS] [mask] [pid | command [arg]...]"
+       "[OPTIONS] [mask] [pid | command [arg]...]"
 #define taskset_full_usage \
-               "Set or get CPU affinity.\n\n" \
-        "Options:\n" \
-        "      -p      operate on an existing PID"
+       "Set or get CPU affinity" \
+       "\n\nOptions:\n" \
+             -p      operate on an existing PID"
 #define taskset_example_usage \
-               "$ taskset 0x7 ./dgemm_test&\n" \
-        "$ taskset -p 0x1 $!\n" \
-        "pid 4790's current affinity mask: 7\n" \
-        "pid 4790's new affinity mask: 1\n" \
-        "$ taskset 0x7 /bin/sh -c './taskset -p 0x1 $$'\n" \
-        "pid 6671's current affinity mask: 1\n" \
-        "pid 6671's new affinity mask: 1\n" \
-        "$ taskset -p 1\n"
-        "pid 1's current affinity mask: 3\n"
+       "$ taskset 0x7 ./dgemm_test&\n" \
+       "$ taskset -p 0x1 $!\n" \
+       "pid 4790's current affinity mask: 7\n" \
+       "pid 4790's new affinity mask: 1\n" \
+       "$ taskset 0x7 /bin/sh -c './taskset -p 0x1 $$'\n" \
+       "pid 6671's current affinity mask: 1\n" \
+       "pid 6671's new affinity mask: 1\n" \
+       "$ taskset -p 1\n" \
+       "pid 1's current affinity mask: 3\n"
 
 #define tee_trivial_usage \
        "[OPTION]... [FILE]..."
 #define tee_full_usage \
-       "Copy standard input to each FILE, and also to standard output.\n\n" \
-       "Options:\n" \
+       "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)"
 #define tee_example_usage \
@@ -3045,8 +3115,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
        "[-a] [-l USER] HOST [PORT]"
 #define telnet_full_usage \
        "Telnet is used to establish interactive communication with another\n" \
-       "computer over a network using the TELNET protocol.\n\n" \
-       "Options:\n" \
+       "computer over a network using the TELNET protocol" \
+       "\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" \
@@ -3065,8 +3135,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define telnetd_trivial_usage \
        "[OPTION]"
 #define telnetd_full_usage \
-       "Telnetd listens for incoming TELNET connections on PORT.\n" \
-       "Options:\n" \
+       "Telnetd listens for incoming TELNET connections on PORT" \
+       "\n\nOptions:\n" \
        "       -p PORT         listen for connections on PORT (default 23)\n" \
        "       -l LOGIN        exec LOGIN on connect\n" \
        "       -f issue_file   Display issue_file instead of /etc/issue\n" \
@@ -3076,10 +3146,17 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define telnetd_trivial_usage \
        "[OPTION]"
 #define telnetd_full_usage \
-       "Telnetd uses incoming TELNET connections via inetd.\n" \
-       "Options:\n" \
-       "       -l LOGIN        exec LOGIN on connect\n" \
-       "       -f issue_file   Display issue_file instead of /etc/issue"
+       "Telnetd uses 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              inetd subservice" \
+       )
 #endif
 
 #define test_trivial_usage \
@@ -3104,10 +3181,10 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define tftp_trivial_usage \
        "[OPTION]... HOST [PORT]"
 #define tftp_full_usage \
-       "Transfers a file from/to a tftp server using \"octet\" mode.\n\n" \
-       "Options:\n" \
-       "       -l FILE Local FILE\n" \
-       "       -r FILE Remote FILE" \
+       "Transfers a file from/to a 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" \
        ) \
@@ -3121,8 +3198,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
        "[OPTION]... COMMAND [ARGS...]"
 #define time_full_usage \
        "Runs the program COMMAND with arguments ARGS.  When COMMAND finishes,\n" \
-       "COMMAND's resource usage information is displayed\n\n" \
-       "Options:\n" \
+       "COMMAND's resource usage information is displayed." \
+       "\n\nOptions:\n" \
        "       -v      Displays verbose resource usage information"
 
 #define top_trivial_usage \
@@ -3135,8 +3212,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define touch_trivial_usage \
        "[-c] FILE [FILE ...]"
 #define touch_full_usage \
-       "Update the last-modified date on the given FILE[s].\n\n" \
-       "Options:\n" \
+       "Update the last-modified date on the given FILE[s]" \
+       "\n\nOptions:\n" \
        "       -c      Do not create any files"
 #define touch_example_usage \
        "$ ls -l /tmp/foo\n" \
@@ -3149,8 +3226,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
        "[-cds] STRING1 [STRING2]"
 #define tr_full_usage \
        "Translate, squeeze, and/or delete characters from\n" \
-       "standard input, writing to standard output.\n\n" \
-       "Options:\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"
@@ -3163,8 +3240,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
        "       [-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" \
-       "Options:\n" \
+       "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" \
@@ -3197,8 +3274,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define tty_trivial_usage \
        ""
 #define tty_full_usage \
-       "Print the file name of the terminal connected to standard input.\n\n" \
-       "Options:\n" \
+       "Print the file name of the terminal connected to standard input" \
+       "\n\nOptions:\n" \
        "       -s      print nothing, only return an exit status"
 #define tty_example_usage \
        "$ tty\n" \
@@ -3243,20 +3320,23 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
        "[flags] FILESYSTEM|DIRECTORY"
 #define umount_full_usage \
        "Unmount file systems\n" \
-       "\nFlags:\n" "  -a      Unmount all file systems" \
-       USE_FEATURE_MTAB_SUPPORT(" in /etc/mtab\n       -n      Don't erase /etc/mtab entries") \
+       "\nFlags:" \
+       "\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)")
+       USE_FEATURE_MOUNT_LOOP( \
+       "\n     -D      Do not free loop device (if a loop device 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\n" \
-       "Options:\n" \
+       "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" \
@@ -3271,8 +3351,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define uncompress_trivial_usage \
        "[-c] [-f] [ name ... ]"
 #define uncompress_full_usage \
-       "Uncompress .Z file[s]\n" \
-       "Options:\n" \
+       "Uncompress .Z file[s]" \
+       "\n\nOptions:\n" \
        "       -c      extract to stdout\n" \
        "       -f      force overwrite an existing file"
 
@@ -3280,8 +3360,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
        "[-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\n" \
-       "Options:\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" \
@@ -3298,16 +3378,16 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define unix2dos_full_usage \
        "Converts 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, uses stdin for input and stdout for output.\n" \
-       "Options:\n" \
+       "When no file is given, uses 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"
 
 #define unzip_trivial_usage \
        "[-opts[modifiers]] file[.zip] [list] [-x xlist] [-d exdir]"
 #define unzip_full_usage \
-       "Extracts files from ZIP archives.\n\n" \
-       "Options:\n" \
+       "Extracts 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" \
@@ -3335,8 +3415,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define uudecode_trivial_usage \
        "[FILE]..."
 #define uudecode_full_usage \
-       "Uudecode a file that is uuencoded.\n\n" \
-       "Options:\n" \
+       "Uudecode a file" \
+       "\n\nOptions:\n" \
        "       -o FILE direct output to FILE"
 #define uudecode_example_usage \
        "$ uudecode -o busybox busybox.uu\n" \
@@ -3346,8 +3426,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define uuencode_trivial_usage \
        "[OPTION] [INFILE] REMOTEFILE"
 #define uuencode_full_usage \
-       "Uuencode a file.\n\n" \
-       "Options:\n" \
+       "Uuencode a file" \
+       "\n\nOptions:\n" \
        "       -m      use base64 encoding per RFC1521"
 #define uuencode_example_usage \
        "$ uuencode busybox busybox\n" \
@@ -3359,8 +3439,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define vconfig_trivial_usage \
        "COMMAND [OPTIONS] ..."
 #define vconfig_full_usage \
-       "vconfig lets you create and remove virtual ethernet devices.\n\n" \
-       "Options:\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" \
@@ -3371,23 +3451,23 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define vi_trivial_usage \
        "[OPTION] [FILE]..."
 #define vi_full_usage \
-       "edit FILE.\n\n" \
-       "Options:\n" \
+       "Edit FILE" \
+       "\n\nOptions:\n" \
        "       -R      Read-only- do not write to the file"
 
 #define vlock_trivial_usage \
        "[OPTIONS]"
 #define vlock_full_usage \
-       "Lock a virtual terminal.  A password is required to unlock\n" \
-       "Options:\n" \
+       "Lock a virtual terminal.  A password is required to unlock." \
+       "\n\nOptions:\n" \
        "       -a      Lock all VTs"
 
 #define watch_trivial_usage \
        "[-n <seconds>] [-t] COMMAND..."
 #define watch_full_usage \
-       "Executes a program periodically\n\n" \
-       "Options:\n" \
-       "       -n      Loop period in seconds - default is 2\n"
+       "Executes a program periodically" \
+       "\n\nOptions:\n" \
+       "       -n      Loop period in seconds - default is 2\n" \
        "       -t      Don't print header"
 #define watch_example_usage \
        "$ watch date\n" \
@@ -3398,8 +3478,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define watchdog_trivial_usage \
        "[-t <seconds>] [-F] DEV"
 #define watchdog_full_usage \
-       "Periodically write to watchdog device DEV.\n" \
-       "Options:\n" \
+       "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"
 
@@ -3407,8 +3487,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
        "[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\n" \
-       "Options:\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" \
@@ -3422,8 +3502,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
        "               [--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \
        "               [-U|--user-agent agent] url"
 #define wget_full_usage \
-       "wget retrieves files via HTTP or FTP\n\n" \
-       "Options:\n" \
+       "Retrieve files via HTTP or FTP" \
+       "\n\nOptions:\n" \
        "       -c      continue retrieval of aborted transfers\n" \
        "       -q      quiet mode - do not print\n" \
        "       -P      Set directory prefix to DIR\n" \
@@ -3452,12 +3532,15 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define xargs_trivial_usage \
        "[OPTIONS] [COMMAND] [ARGS...]"
 #define xargs_full_usage \
-       "Executes COMMAND on every item given by standard input.\n\n" \
-       "Options:\n" \
-       USE_FEATURE_XARGS_SUPPORT_CONFIRMATION("        -p      Prompt the user about whether to run each command\n") \
+       "Executes 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") \
+       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" \
@@ -3476,8 +3559,8 @@ USE_FEATURE_START_STOP_DAEMON_FANCY( \
 #define zcip_trivial_usage \
        "[OPTIONS] ifname script"
 #define zcip_full_usage \
-       "zcip manages a ZeroConf IPv4 link-local address.\n" \
-       "Options:\n" \
+       "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" \