/[magellan-source]/trunk/mkinitrd-magellan/busybox/include/usage.h

Diff of /trunk/mkinitrd-magellan/busybox/include/usage.h

Parent Directory | Revision Log | View Patch Patch

-revision 815 by niro,
Sat Sep  1 22:45:15 2007 UTC
+revision 816 by niro,
Fri Apr 24 18:33:46 2009 UTC
 Line 6
   * 2. Do not use \t in messages, use real tab character.
   * 3. Start each source line with message as follows:
   *    |<7 spaces>"text with tabs"....
+  * or
+  *    |<5 spaces>"\ntext with tabs"....
   */
  #ifndef __BB_USAGE_H__
  #define __BB_USAGE_H__
+ #define NOUSAGE_STR "\b"
  #define addgroup_trivial_usage \
-        "[-g GID] group_name [user_name]"
+        "[-g GID] " USE_FEATURE_ADDUSER_TO_GROUP("[user_name] ") "group_name"
- #define addgroup_full_usage \
+ #define addgroup_full_usage "\n\n" \
-        "Add a group to the system" \
+        "Add a group " USE_FEATURE_ADDUSER_TO_GROUP("or add an user to a group") "\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-g GID	Specify gid"
+      "\n	-g GID	Group id" \
  #define adduser_trivial_usage \
         "[OPTIONS] user_name"
- #define adduser_full_usage \
+ #define adduser_full_usage "\n\n" \
-        "Add a user to the system" \
+        "Add an user\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-h DIR		Assign home directory DIR\n" \
+      "\n	-h DIR		Home directory" \
-        "	-g GECOS	Assign gecos field GECOS\n" \
+      "\n	-g GECOS	GECOS field" \
-        "	-s SHELL	Assign login shell SHELL\n" \
+      "\n	-s SHELL	Login shell" \
-        "	-G		Add the user to existing group GROUP\n" \
+      "\n	-G GROUP	Add user to existing group" \
-        "	-S		Create a system user (ignored)\n" \
+      "\n	-S		Create a system user" \
-        "	-D		Do not assign a password (logins still possible via ssh)\n" \
+      "\n	-D		Do not assign a password" \
-        "	-H		Do not create the home directory"
+      "\n	-H		Do not create home directory" \
  #define adjtimex_trivial_usage \
         "[-q] [-o offset] [-f frequency] [-p timeconstant] [-t tick]"
- #define adjtimex_full_usage \
+ #define adjtimex_full_usage "\n\n" \
-        "Read and optionally set system timebase parameters.\n" \
+        "Read and optionally set system timebase parameters. See adjtimex(2).\n" \
-        "See adjtimex(2)." \
+      "\nOptions:" \
-        "\n\nOptions:\n" \
+      "\n	-q		Quiet" \
-        "	-q		Quiet mode - do not print\n" \
+      "\n	-o offset	Time offset, microseconds" \
-        "	-o offset	Time offset, microseconds\n" \
+      "\n	-f frequency	Frequency adjust, integer kernel units (65536 is 1ppm)" \
-        "	-f frequency	Frequency adjust, integer kernel units (65536 is 1ppm)\n" \
+      "\n			(positive values make clock run faster)" \
-        "			(positive values make the system clock run fast)\n" \
+      "\n	-t tick		Microseconds per tick, usually 10000" \
-        "	-t tick		Microseconds per tick, usually 10000\n" \
+      "\n	-p timeconstant" \
-        "	-p timeconstant"
  #define ar_trivial_usage \
         "[-o] [-v] [-p] [-t] [-x] ARCHIVE FILES"
- #define ar_full_usage \
+ #define ar_full_usage "\n\n" \
-        "Extract or list FILES from an ar archive" \
+        "Extract or list FILES from an ar archive\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-o	Preserve original dates\n" \
+      "\n	-o	Preserve original dates" \
-        "	-p	Extract to stdout\n" \
+      "\n	-p	Extract to stdout" \
-        "	-t	List\n" \
+      "\n	-t	List" \
-        "	-x	Extract\n" \
+      "\n	-x	Extract" \
-        "	-v	Verbosely list files processed"
+      "\n	-v	Verbose" \
  #define arp_trivial_usage \
         "\n" \
         "[-vn]	[-H type] [-i if] -a [hostname]\n" \
         "[-v]		  [-i if] -d hostname [pub]\n" \
         "[-v]	[-H type] [-i if] -s hostname hw_addr [temp]\n" \
-        "[-v] 	[-H type] [-i if] -s hostname hw_addr [netmask nm] pub\n" \
+        "[-v]	[-H type] [-i if] -s hostname hw_addr [netmask nm] pub\n" \
         "[-v]	[-H type] [-i if] -Ds hostname ifa [netmask nm] pub\n"
- #define arp_full_usage \
+ #define arp_full_usage "\n\n" \
-        "Manipulate the system ARP cache" \
+        "Manipulate ARP cache\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
         "\n	-a		Display (all) hosts" \
-        "\n	-s		Set a new ARP entry" \
+        "\n	-s		Set new ARP entry" \
         "\n	-d		Delete a specified entry" \
         "\n	-v		Verbose" \
         "\n	-n		Don't resolve names" \
-        "\n	-i if		Specify network interface (e.g. eth0)" \
+        "\n	-i IF		Network interface" \
         "\n	-D		Read <hwaddr> from given device" \
-        "\n	-A, -p		Specify protocol family" \
+        "\n	-A, -p AF	Protocol family" \
-        "\n	-H hwtype	Specify hardware address type"
+        "\n	-H HWTYPE	Hardware address type" \
  #define arping_trivial_usage \
-        "[-fqbDUA] [-c count] [-w timeout] [-i device] [-s sender] target"
+        "[-fqbDUA] [-c count] [-w timeout] [-I dev] [-s sender] target"
- #define arping_full_usage \
+ #define arping_full_usage "\n\n" \
-        "Ping hosts by ARP requests/replies" \
+        "Send ARP requests/replies\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-f		Quit on first ARP reply\n" \
+      "\n	-f		Quit on first ARP reply" \
-        "	-q		Be quiet\n" \
+      "\n	-q		Quiet" \
-        "	-b		Keep broadcasting, don't go unicast\n" \
+      "\n	-b		Keep broadcasting, don't go unicast" \
-        "	-D		Duplicated address detection mode\n" \
+      "\n	-D		Duplicated address detection mode" \
-        "	-U		Unsolicited ARP mode, update your neighbours\n" \
+      "\n	-U		Unsolicited ARP mode, update your neighbors" \
-        "	-A		ARP answer mode, update your neighbours\n" \
+      "\n	-A		ARP answer mode, update your neighbors" \
-        "	-c count	Stop after sending count ARP request packets\n" \
+      "\n	-c N		Stop after sending N ARP requests" \
-        "	-w timeout	Time to wait for ARP reply, in seconds\n" \
+      "\n	-w timeout	Time to wait for ARP reply, in seconds" \
-        "	-i device	Outgoing interface name, default is eth0\n" \
+      "\n	-I dev		Interface to use (default eth0)" \
-        "	-s sender	Set specific sender IP address\n" \
+      "\n	-s sender	Sender IP address" \
-        "	target		Target IP address of ARP request"
+      "\n	target		Target IP address" \
- #define ash_trivial_usage \
+ #define sh_trivial_usage NOUSAGE_STR
-        "[FILE]...\n" \
+ #define sh_full_usage ""
-        "or: ash -c command [args]..."
+ #define ash_trivial_usage NOUSAGE_STR
- #define ash_full_usage \
+ #define ash_full_usage ""
-        "The ash shell (command interpreter)"
+ #define hush_trivial_usage NOUSAGE_STR
+ #define hush_full_usage ""
+ #define msh_trivial_usage NOUSAGE_STR
+ #define msh_full_usage ""
  #define awk_trivial_usage \
-        "[OPTION]... [program-text] [FILE ...]"
+        "[OPTION]... [program-text] [FILE...]"
- #define awk_full_usage \
+ #define awk_full_usage "\n\n" \
-        "Options:\n" \
+        "Options:" \
-        "	-v var=val	Assign value 'val' to variable 'var'\n" \
+      "\n	-v var=val	Set variable" \
-        "	-F sep		Use 'sep' as field separator\n" \
+      "\n	-F sep		Use sep as field separator" \
-        "	-f progname	Read program source from file 'progname'"
+      "\n	-f file		Read program from file" \
  #define basename_trivial_usage \
         "FILE [SUFFIX]"
- #define basename_full_usage \
+ #define basename_full_usage "\n\n" \
         "Strip directory path and suffixes from FILE.\n" \
         "If specified, also remove any trailing SUFFIX."
  #define basename_example_usage \
-Line 119
+Line 127
         "$ basename /foo/bar.txt .txt\n" \
         "bar"
+ #define fbsplash_trivial_usage \
+        "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]"
+ #define fbsplash_full_usage "\n\n" \
+        "Options:\n" \
+      "\n	-s	Image" \
+      "\n	-c	Hide cursor" \
+      "\n	-d	Framebuffer device (default /dev/fb0)" \
+      "\n	-i	Config file (var=value):" \
+      "\n			BAR_LEFT,BAR_TOP,BAR_WIDTH,BAR_HEIGHT" \
+      "\n			BAR_R,BAR_G,BAR_B" \
+      "\n	-f	Control pipe (else exit after drawing image)" \
+      "\n			commands: 'NN' (% for progress bar) or 'exit'" \
+ #define brctl_trivial_usage \
+        "COMMAND [BRIDGE [INTERFACE]]"
+ #define brctl_full_usage "\n\n" \
+        "Manage ethernet bridges.\n" \
+      "\nCommands:" \
+ 	USE_FEATURE_BRCTL_SHOW( \
+      "\n	show			Show a list of bridges" \
+ 	) \
+      "\n	addbr BRIDGE		Create BRIDGE" \
+      "\n	delbr BRIDGE		Delete BRIDGE" \
+      "\n	addif BRIDGE IFACE	Add IFACE to BRIDGE" \
+      "\n	delif BRIDGE IFACE	Delete IFACE from BRIDGE" \
+ 	USE_FEATURE_BRCTL_FANCY( \
+      "\n	setageing BRIDGE TIME		Set ageing time" \
+      "\n	setfd BRIDGE TIME		Set bridge forward delay" \
+      "\n	sethello BRIDGE TIME		Set hello time" \
+      "\n	setmaxage BRIDGE TIME		Set max message age" \
+      "\n	setpathcost BRIDGE COST		Set path cost" \
+      "\n	setportprio BRIDGE PRIO		Set port priority" \
+      "\n	setbridgeprio BRIDGE PRIO	Set bridge priority" \
+      "\n	stp BRIDGE [1|0]		STP on/off" \
+ 	) \
  #define bunzip2_trivial_usage \
         "[OPTION]... [FILE]"
- #define bunzip2_full_usage \
+ #define bunzip2_full_usage "\n\n" \
-        "Uncompress FILE (or standard input if FILE is '-' or omitted)" \
+        "Uncompress FILE (or standard input if FILE is '-' or omitted)\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c	Write output to standard output\n" \
+      "\n	-c	Write to standard output" \
-        "	-f	Force"
+      "\n	-f	Force" \
+ #define bzip2_trivial_usage \
+        "[OPTION]... [FILE]..."
+ #define bzip2_full_usage "\n\n" \
+        "Compress FILE(s) with bzip2 algorithm.\n" \
+        "When FILE is '-' or unspecified, reads standard input. Implies -c.\n" \
+      "\nOptions:" \
+      "\n	-c	Write to standard output" \
+      "\n	-d	Decompress" \
+      "\n	-f	Force" \
+      "\n	-1..-9	Compression level" \
  #define busybox_notes_usage \
         "Hello world!\n"
  #define bzcat_trivial_usage \
         "FILE"
- #define bzcat_full_usage \
+ #define bzcat_full_usage "\n\n" \
         "Uncompress to stdout"
  #define unlzma_trivial_usage \
         "[OPTION]... [FILE]"
- #define unlzma_full_usage \
+ #define unlzma_full_usage "\n\n" \
-        "Uncompress FILE (or standard input if FILE is '-' or omitted)" \
+        "Uncompress FILE (or standard input if FILE is '-' or omitted)\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c	Write output to standard output\n" \
+      "\n	-c	Write to standard output" \
-        "	-f	Force"
+      "\n	-f	Force" \
  #define lzmacat_trivial_usage \
         "FILE"
- #define lzmacat_full_usage \
+ #define lzmacat_full_usage "\n\n" \
         "Uncompress to stdout"
  #define cal_trivial_usage \
         "[-jy] [[month] year]"
- #define cal_full_usage \
+ #define cal_full_usage "\n\n" \
-        "Display a calendar" \
+        "Display a calendar\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-j	Use julian dates\n" \
+      "\n	-j	Use julian dates" \
-        "	-y	Display the entire year"
+      "\n	-y	Display the entire year" \
  #define cat_trivial_usage \
         "[-u] [FILE]..."
- #define cat_full_usage \
+ #define cat_full_usage "\n\n" \
-        "Concatenate FILE(s) and print them to stdout" \
+        "Concatenate FILE(s) and print them to stdout\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-u	Ignored since unbuffered i/o is always used"
+      "\n	-u	Use unbuffered i/o (ignored)" \
  #define cat_example_usage \
         "$ cat /proc/uptime\n" \
         "110716.72 17.67"
  #define catv_trivial_usage \
         "[-etv] [FILE]..."
- #define catv_full_usage \
+ #define catv_full_usage "\n\n" \
-        "Display nonprinting characters as ^x or M-x" \
+        "Display nonprinting characters as ^x or M-x\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-e	End each line with $\n" \
+      "\n	-e	End each line with $" \
-        "	-t	Show tabs as ^I\n" \
+      "\n	-t	Show tabs as ^I" \
-        "	-v	Don't use ^x or M-x escapes"
+      "\n	-v	Don't use ^x or M-x escapes" \
+ #define chat_trivial_usage \
+        "EXPECT [SEND [EXPECT [SEND...]]]"
+ #define chat_full_usage "\n\n" \
+        "Useful for interacting with a modem connected to stdin/stdout.\n" \
+        "A script consists of one or more \"expect-send\" pairs of strings,\n" \
+        "each pair is a pair of arguments. Example:\n" \
+        "chat '' ATZ OK ATD123456 CONNECT '' ogin: pppuser word: ppppass '~'" \
  #define chattr_trivial_usage \
         "[-R] [-+=AacDdijsStTu] [-v version] files..."
- #define chattr_full_usage \
+ #define chattr_full_usage "\n\n" \
-        "Change file attributes on an ext2 fs\n\n" \
+        "Change file attributes on an ext2 fs\n" \
-        "Modifiers:\n" \
+      "\nModifiers:" \
-        "	-	Remove attributes\n" \
+      "\n	-	Remove attributes" \
-        "	+	Add attributes\n" \
+      "\n	+	Add attributes" \
-        "	=	Set attributes\n" \
+      "\n	=	Set attributes" \
-        "Attributes:\n" \
+      "\nAttributes:" \
-        "	A	Don't track atime\n" \
+      "\n	A	Don't track atime" \
-        "	a	Append mode only\n" \
+      "\n	a	Append mode only" \
-        "	c	Enable compress\n" \
+      "\n	c	Enable compress" \
-        "	D	Write dir contents synchronously\n" \
+      "\n	D	Write dir contents synchronously" \
-        "	d	Do not backup with dump\n" \
+      "\n	d	Do not backup with dump" \
-        "	i	Cannot be modified (immutable)\n" \
+      "\n	i	Cannot be modified (immutable)" \
-        "	j	Write all data to journal first\n" \
+      "\n	j	Write all data to journal first" \
-        "	s	Zero disk storage when deleted\n" \
+      "\n	s	Zero disk storage when deleted" \
-        "	S	Write file contents synchronously\n" \
+      "\n	S	Write file contents synchronously" \
-        "	t	Disable tail-merging of partial blocks with other files\n" \
+      "\n	t	Disable tail-merging of partial blocks with other files" \
-        "	u	Allow file to be undeleted\n" \
+      "\n	u	Allow file to be undeleted" \
-        "Options:\n" \
+      "\nOptions:" \
-        "	-R	Recursively list subdirectories\n" \
+      "\n	-R	Recursively list subdirectories" \
-        "	-v	Set the file's version/generation number"
+      "\n	-v	Set the file's version/generation number" \
- #define chgrp_trivial_usage \
+ #define chcon_trivial_usage \
-        "[-Rh"USE_DESKTOP("cvf")"]... GROUP FILE..."
+        "[OPTIONS] CONTEXT FILE..." \
- #define chgrp_full_usage \
+        "\n	chcon [OPTIONS] [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE..." \
-        "Change the group membership of each FILE to GROUP" \
+ 	USE_FEATURE_CHCON_LONG_OPTIONS( \
-        "\n\nOptions:\n" \
+        "\n	chcon [OPTIONS] --reference=RFILE FILE..." \
-        "	-R	Changes files and directories recursively\n" \
+ 	)
-        "	-h	Do not dereference symbolic links" \
+ #define chcon_full_usage "\n\n" \
- 	USE_DESKTOP( \
+        "Change the security context of each FILE to CONTEXT\n" \
-        "\n	-c	List changed files" \
+ 	USE_FEATURE_CHCON_LONG_OPTIONS( \
-        "\n	-v	List all files" \
+      "\n	-v,--verbose		Verbose" \
-        "\n	-f	Hide errors" \
+      "\n	-c,--changes		Report changes made" \
+      "\n	-h,--no-dereference	Affect symlinks instead of their targets" \
+      "\n	-f,--silent,--quiet	Suppress most error messages" \
+      "\n	--reference=RFILE	Use RFILE's group instead of using a CONTEXT value" \
+      "\n	-u,--user=USER		Set user/role/type/range in the target" \
+      "\n	-r,--role=ROLE		security context" \
+      "\n	-t,--type=TYPE" \
+      "\n	-l,--range=RANGE" \
+      "\n	-R,--recursive		Recurse subdirectories" \
+ 	) \
+ 	SKIP_FEATURE_CHCON_LONG_OPTIONS( \
+      "\n	-v	Verbose" \
+      "\n	-c	Report changes made" \
+      "\n	-h	Affect symlinks instead of their targets" \
+      "\n	-f	Suppress most error messages" \
+      "\n	-u USER	Set user/role/type/range in the target security context" \
+      "\n	-r ROLE" \
+      "\n	-t TYPE" \
+      "\n	-l RNG" \
+      "\n	-R	Recurse subdirectories" \
  	)
- #define chgrp_example_usage \
-        "$ ls -l /tmp/foo\n" \
-        "-r--r--r--    1 andersen andersen        0 Apr 12 18:25 /tmp/foo\n" \
-        "$ chgrp root /tmp/foo\n" \
-        "$ ls -l /tmp/foo\n" \
-        "-r--r--r--    1 andersen root            0 Apr 12 18:25 /tmp/foo\n"
  #define chmod_trivial_usage \
         "[-R"USE_DESKTOP("cvf")"] MODE[,MODE]... FILE..."
- #define chmod_full_usage \
+ #define chmod_full_usage "\n\n" \
         "Each MODE is one or more of the letters ugoa, one of the\n" \
-        "symbols +-= and one or more of the letters rwxst" \
+        "symbols +-= and one or more of the letters rwxst\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
-        "\n	-R	Changes files and directories recursively" \
+      "\n	-R	Recurse directories" \
  	USE_DESKTOP( \
-        "\n	-c	List changed files" \
+      "\n	-c	List changed files" \
-        "\n	-v	List all files" \
+      "\n	-v	List all files" \
-        "\n	-f	Hide errors" \
+      "\n	-f	Hide errors" \
  	)
  #define chmod_example_usage \
         "$ ls -l /tmp/foo\n" \
-Line 239
+Line 317
         "$ ls -l /tmp/foo\n" \
         "-r--r--r--    1 root     root            0 Apr 12 18:25 /tmp/foo\n"
+ #define chgrp_trivial_usage \
+        "[-RhLHP"USE_DESKTOP("cvf")"]... GROUP FILE..."
+ #define chgrp_full_usage "\n\n" \
+        "Change the group membership of each FILE to GROUP\n" \
+      "\nOptions:" \
+      "\n	-R	Recurse directories" \
+      "\n	-h	Affect symlinks instead of symlink targets" \
+      "\n	-L	Traverse all symlinks to directories" \
+      "\n	-H	Traverse symlinks on command line only" \
+      "\n	-P	Do not traverse symlinks (default)" \
+ 	USE_DESKTOP( \
+      "\n	-c	List changed files" \
+      "\n	-v	Verbose" \
+      "\n	-f	Hide errors" \
+ 	)
+ #define chgrp_example_usage \
+        "$ ls -l /tmp/foo\n" \
+        "-r--r--r--    1 andersen andersen        0 Apr 12 18:25 /tmp/foo\n" \
+        "$ chgrp root /tmp/foo\n" \
+        "$ ls -l /tmp/foo\n" \
+        "-r--r--r--    1 andersen root            0 Apr 12 18:25 /tmp/foo\n"
  #define chown_trivial_usage \
-        "[-Rh"USE_DESKTOP("cvf")"]...  OWNER[<.|:>[GROUP]] FILE..."
+        "[-RhLHP"USE_DESKTOP("cvf")"]... OWNER[<.|:>[GROUP]] FILE..."
- #define chown_full_usage \
+ #define chown_full_usage "\n\n" \
-        "Change the owner and/or group of each FILE to OWNER and/or GROUP" \
+        "Change the owner and/or group of each FILE to OWNER and/or GROUP\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
-        "\n	-R	Changes files and directories recursively" \
+      "\n	-R	Recurse directories" \
-        "\n	-h	Do not dereference symbolic links" \
+      "\n	-h	Affect symlinks instead of symlink targets" \
+      "\n	-L	Traverse all symlinks to directories" \
+      "\n	-H	Traverse symlinks on command line only" \
+      "\n	-P	Do not traverse symlinks (default)" \
  	USE_DESKTOP( \
-        "\n	-c	List changed files" \
+      "\n	-c	List changed files" \
-        "\n	-v	List all files" \
+      "\n	-v	List all files" \
-        "\n	-f	Hide errors" \
+      "\n	-f	Hide errors" \
  	)
  #define chown_example_usage \
         "$ ls -l /tmp/foo\n" \
-Line 262
+Line 365
         "-r--r--r--    1 root     root            0 Apr 12 18:25 /tmp/foo\n"
  #define chpst_trivial_usage \
-        "[-vP012] [-u user[:group]] [-U user[:group]] [-e dir] " \
+        "[-vP012] [-u USER[:GRP]] [-U USER[:GRP]] [-e DIR]\n" \
-        "[-/ dir] [-n nice] [-m bytes] [-d bytes] [-o files] " \
+        "	[-/ DIR] [-n NICE] [-m BYTES] [-d BYTES] [-o N]\n" \
-        "[-p processes] [-f bytes] [-c bytes] prog args"
+        "	[-p N] [-f BYTES] [-c BYTES] PROG ARGS"
- #define chpst_full_usage \
+ #define chpst_full_usage "\n\n" \
-        "Change the process state and run specified program" \
+        "Change the process state and run PROG\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-u user[:grp]	Set uid and gid\n" \
+      "\n	-u USER[:GRP]	Set uid and gid" \
-        "	-U user[:grp] 	Set environment variables UID and GID\n" \
+      "\n	-U USER[:GRP]	Set $UID and $GID in environment" \
-        "	-e dir		Set environment variables as specified by files\n" \
+      "\n	-e DIR		Set environment variables as specified by files" \
-        "			in the directory: file=1st_line_of_file\n" \
+      "\n			in DIR: file=1st_line_of_file" \
-        "	-/ dir		Chroot to dir\n" \
+      "\n	-/ DIR		Chroot to DIR" \
-        "	-n inc		Add inc to nice value\n" \
+      "\n	-n NICE		Add NICE to nice value" \
-        "	-m bytes	Limit data segment, stack segment, locked physical pages,\n" \
+      "\n	-m BYTES	Same as -d BYTES -s BYTES -l BYTES" \
-        "			and total of all segment per process to bytes bytes each\n" \
+      "\n	-d BYTES	Limit data segment" \
-        "	-d bytes	Limit data segment\n" \
+      "\n	-o N		Limit number of open files per process" \
-        "	-o n		Limit the number of open file descriptors per process to n\n" \
+      "\n	-p N		Limit number of processes per uid" \
-        "	-p n		Limit number of processes per uid to n\n" \
+      "\n	-f BYTES	Limit output file sizes" \
-        "	-f bytes	Limit output file size to bytes bytes\n" \
+      "\n	-c BYTES	Limit core file size" \
-        "	-c bytes	Limit core file size to bytes bytes\n" \
+      "\n	-v		Verbose" \
-        "	-v		Verbose\n" \
+      "\n	-P		Create new process group" \
-        "	-P		Run prog in a new process group\n" \
+      "\n	-0		Close standard input" \
-        "	-0		Close standard input\n" \
+      "\n	-1		Close standard output" \
-        "	-1		Close standard output\n" \
+      "\n	-2		Close standard error" \
-        "	-2		Close standard error"
  #define setuidgid_trivial_usage \
         "account prog args"
- #define setuidgid_full_usage \
+ #define setuidgid_full_usage "\n\n" \
         "Set uid and gid to account's uid and gid, removing all supplementary\n" \
-        "groups, then run prog"
+        "groups and run PROG"
  #define envuidgid_trivial_usage \
         "account prog args"
- #define envuidgid_full_usage \
+ #define envuidgid_full_usage "\n\n" \
-        "Set $UID to account's uid and $GID to account's gid, then run prog"
+        "Set $UID to account's uid and $GID to account's gid and run PROG"
  #define envdir_trivial_usage \
         "dir prog args"
- #define envdir_full_usage \
+ #define envdir_full_usage "\n\n" \
         "Set various environment variables as specified by files\n" \
-        "in the directory dir, then run prog"
+        "in the directory dir and run PROG"
  #define softlimit_trivial_usage \
-        "[-a allbytes] [-c corebytes] [-d databytes] [-f filebytes] " \
+        "[-a BYTES] [-m BYTES] [-d BYTES] [-s BYTES] [-l BYTES]\n" \
-        "[-l lockbytes] [-m membytes] [-o openfiles] [-p processes] " \
+        "	[-f BYTES] [-c BYTES] [-r BYTES] [-o N] [-p N] [-t N]\n" \
-        "[-r residentbytes] [-s stackbytes] [-t cpusecs] prog args"
+        "	PROG ARGS"
- #define softlimit_full_usage \
+ #define softlimit_full_usage "\n\n" \
-        "Set soft resource limits, then run prog" \
+        "Set soft resource limits, then run PROG\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-m n	Same as -d n -s n -l n -a n\n" \
+      "\n	-a BYTES	Limit total size of all segments" \
-        "	-d n	Limit the data segment per process to n bytes\n" \
+      "\n	-m BYTES	Same as -d BYTES -s BYTES -l BYTES -a BYTES" \
-        "	-s n	Limit the stack segment per process to n bytes\n" \
+      "\n	-d BYTES	Limit data segment" \
-        "	-l n	Limit the locked physical pages per process to n bytes\n" \
+      "\n	-s BYTES	Limit stack segment" \
-        "	-a n	Limit the total of all segments per process to n bytes\n" \
+      "\n	-l BYTES	Limit locked memory size" \
-        "	-o n	Limit  the number of open file descriptors per process to n\n" \
+      "\n	-o N		Limit number of open files per process" \
-        "	-p n	Limit the number of processes per uid to n\n" \
+      "\n	-p N		Limit number of processes per uid" \
-        "Options controlling file sizes:\n" \
+      "\nOptions controlling file sizes:" \
-        "	-f n	Limit output file sizes to n bytes\n" \
+      "\n	-f BYTES	Limit output file sizes" \
-        "	-c n	Limit core file sizes to n bytes\n" \
+      "\n	-c BYTES	Limit core file size" \
-        "Efficiency opts:\n" \
+      "\nEfficiency opts:" \
-        "	-r n	Limit the resident set size to n bytes. This limit is not\n" \
+      "\n	-r BYTES	Limit resident set size" \
-        "		enforced unless physical memory is full\n" \
+      "\n	-t N		Limit CPU time, process receives" \
-        "	-t n	Limit the CPU time to n seconds. This limit is not enforced\n" \
+      "\n			a SIGXCPU after N seconds" \
-        "		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 chroot_trivial_usage \
         "NEWROOT [COMMAND...]"
- #define chroot_full_usage \
+ #define chroot_full_usage "\n\n" \
         "Run COMMAND with root directory set to NEWROOT"
  #define chroot_example_usage \
         "$ ls -l /bin/ls\n" \
-Line 340
+Line 439
  #define chvt_trivial_usage \
         "N"
- #define chvt_full_usage \
+ #define chvt_full_usage "\n\n" \
         "Change the foreground virtual terminal to /dev/ttyN"
  #define cksum_trivial_usage \
         "FILES..."
- #define cksum_full_usage \
+ #define cksum_full_usage "\n\n" \
         "Calculate the CRC32 checksums of FILES"
  #define clear_trivial_usage \
         ""
- #define clear_full_usage \
+ #define clear_full_usage "\n\n" \
         "Clear screen"
  #define cmp_trivial_usage \
-        "[-l] [-s] FILE1 [FILE2]"
+        "[-l] [-s] FILE1 [FILE2" USE_DESKTOP(" [SKIP1 [SKIP2]") "]]"
- #define cmp_full_usage \
+ #define cmp_full_usage "\n\n" \
-        "Compares FILE1 vs stdin if FILE2 is not specified" \
+        "Compares FILE1 vs stdin if FILE2 is not specified\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-l	Write the byte numbers (decimal) and values (octal)\n" \
+      "\n	-l	Write the byte numbers (decimal) and values (octal)" \
-        "		for all differing bytes\n" \
+      "\n		for all differing bytes" \
-        "	-s	Quiet mode - do not print"
+      "\n	-s	Quiet" \
  #define comm_trivial_usage \
         "[-123] FILE1 FILE2"
- #define comm_full_usage \
+ #define comm_full_usage "\n\n" \
-        "Compare FILE1 to FILE2, or to stdin if - is specified" \
+        "Compare FILE1 to FILE2, or to stdin if - is specified\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-1	Suppress lines unique to FILE1\n" \
+      "\n	-1	Suppress lines unique to FILE1" \
-        "	-2	Suppress lines unique to FILE2\n" \
+      "\n	-2	Suppress lines unique to FILE2" \
-        "	-3	Suppress lines common to both files"
+      "\n	-3	Suppress lines common to both files" \
  #define bbconfig_trivial_usage \
         ""
- #define bbconfig_full_usage \
+ #define bbconfig_full_usage "\n\n" \
         "Print the config file which built busybox"
  #define bbsh_trivial_usage \
         "[FILE]...\n" \
         "or: bbsh -c command [args]..."
- #define bbsh_full_usage \
+ #define bbsh_full_usage "\n\n" \
         "The bbsh shell (command interpreter)"
+ #define chrt_trivial_usage \
+        "[OPTION]... [prio] [pid | command [arg]...]"
+ #define chrt_full_usage "\n\n" \
+        "Manipulate real-time attributes of a process\n" \
+      "\nOptions:" \
+      "\n	-p	Operate on pid" \
+      "\n	-r	Set scheduling policy to SCHED_RR" \
+      "\n	-f	Set scheduling policy to SCHED_FIFO" \
+      "\n	-o	Set scheduling policy to SCHED_OTHER" \
+      "\n	-m	Show min and max priorities" \
+ #define chrt_example_usage \
+        "$ chrt -r 4 sleep 900; x=$!\n" \
+        "$ chrt -f -p 3 $x\n" \
+        "You need CAP_SYS_NICE privileges to set scheduling attributes of a process"
  #define cp_trivial_usage \
         "[OPTION]... SOURCE DEST"
- #define cp_full_usage \
+ #define cp_full_usage "\n\n" \
-        "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY" \
+        "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-a	Same as -dpR\n" \
+      "\n	-a	Same as -dpR" \
-        "	-d,-P	Preserve links\n" \
+ 	USE_SELINUX( \
-        "	-H,-L	Dereference all symlinks (implied by default)\n" \
+      "\n	-c	Preserve security context" \
-        "	-p	Preserve file attributes if possible\n" \
+ 	) \
-        "	-f	Force, overwrite\n" \
+      "\n	-d,-P	Preserve links" \
-        "	-i	Interactive, prompt before overwrite\n" \
+      "\n	-H,-L	Dereference all symlinks (default)" \
-        "	-R,-r	Copy directories recursively\n" \
+      "\n	-p	Preserve file attributes if possible" \
-        "	-l,-s	Create (sym)links"
+      "\n	-f	Force overwrite" \
+      "\n	-i	Prompt before overwrite" \
+      "\n	-R,-r	Recurse directories" \
+      "\n	-l,-s	Create (sym)links" \
  #define cpio_trivial_usage \
-        "-[dimtuv][F cpiofile]"
+        "-[dim" USE_FEATURE_CPIO_O("o") "tuv][F cpiofile]" \
- #define cpio_full_usage \
+        USE_FEATURE_CPIO_O( "[H newc]" )
-        "Extract or list files from a cpio archive\n" \
+ #define cpio_full_usage "\n\n" \
-        "Main operation mode:\n" \
+        "Extract or list files from a cpio archive" \
-        "	d	Make leading directories\n" \
+ 	USE_FEATURE_CPIO_O( ", or create a cpio archive" ) \
-        "	i	Extract\n" \
+      "\n" \
-        "	m	Preserve mtime\n" \
+        "Main operation mode:" \
-        "	t	List\n" \
+      "\n	d	Make leading directories" \
-        "	v	Verbose\n" \
+      "\n	i	Extract" \
-        "	u	Unconditional overwrite\n" \
+      "\n	m	Preserve mtime" \
-        "	F	Input from file"
+ 	USE_FEATURE_CPIO_O( \
+      "\n	o	Create" \
+      "\n	H newc	Define format" \
+ 	) \
+      "\n	t	List" \
+      "\n	v	Verbose" \
+      "\n	u	Unconditional overwrite" \
+      "\n	F	Input from file" \
  #define crond_trivial_usage \
-        "-d[#] -c <crondir> -f -b"
+        "-fbS -l N " USE_FEATURE_CROND_D("-d N ") "-L LOGFILE -c DIR"
- #define crond_full_usage \
+ #define crond_full_usage "\n\n" \
-        "	-d [#] -l [#] -S -L logfile -f -b -c dir\n" \
+        "	-f	Foreground" \
-        "	-d num	Debug level\n" \
+      "\n	-b	Background (default)" \
-        "	-l num	Log level (8 - default)\n" \
+      "\n	-S	Log to syslog (default)" \
-        "	-S	Log to syslogd (default)\n" \
+      "\n	-l	Set log level. 0 is the most verbose, default 8" \
-        "	-L file	Log to file\n" \
+ 	USE_FEATURE_CROND_D( \
-        "	-f	Run in foreground\n" \
+      "\n	-d	Set log level, log to stderr" \
-        "	-b	Run in background (default)\n" \
+ 	) \
-        "	-c dir	Working dir"
+      "\n	-L	Log to file" \
+      "\n	-c	Working dir" \
  #define crontab_trivial_usage \
-        "[-c dir] {file|-}|[-u|-l|-e|-d user]"
+        "[-c DIR] [-u USER] [-ler]|[FILE]"
- #define crontab_full_usage \
+ #define crontab_full_usage "\n\n" \
-        "	File <opts>  replace crontab from file\n" \
+        "	-c	Crontab directory" \
-        "	-    <opts>  replace crontab from stdin\n" \
+      "\n	-u	User" \
-        "	-u user      specify user\n" \
+      "\n	-l	List crontab" \
-        "	-l [user]    list crontab for user\n" \
+      "\n	-e	Edit crontab" \
-        "	-e [user]    edit crontab for user\n" \
+      "\n	-r	Delete crontab" \
-        "	-d [user]    delete crontab for user\n" \
+      "\n	FILE	Replace crontab by FILE ('-': stdin)" \
-        "	-c dir       specify crontab directory"
+ #define cryptpw_trivial_usage \
+        "[-a des|md5] [string]"
+ #define cryptpw_full_usage "\n\n" \
+        "Output crypted string.\n" \
+        "If string isn't supplied on cmdline, read it from stdin.\n" \
+      "\nOptions:" \
+      "\n	-a	Algorithm to use (default: md5)" \
+ #define cttyhack_trivial_usage NOUSAGE_STR
+ #define cttyhack_full_usage ""
  #define cut_trivial_usage \
         "[OPTION]... [FILE]..."
- #define cut_full_usage \
+ #define cut_full_usage "\n\n" \
-        "Print selected fields from each input FILE to standard output" \
+        "Print selected fields from each input FILE to standard output\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-b LIST	Output only bytes from LIST\n" \
+      "\n	-b LIST	Output only bytes from LIST" \
-        "	-c LIST	Output only characters from LIST\n" \
+      "\n	-c LIST	Output only characters from LIST" \
-        "	-d CHAR	Use CHAR instead of tab as the field delimiter\n" \
+      "\n	-d CHAR	Use CHAR instead of tab as the field delimiter" \
-        "	-s	Output only the lines containing delimiter\n" \
+      "\n	-s	Output only the lines containing delimiter" \
-        "	-f N	Print only these fields\n" \
+      "\n	-f N	Print only these fields" \
-        "	-n	Ignored"
+      "\n	-n	Ignored" \
  #define cut_example_usage \
         "$ echo \"Hello world\" | cut -f 1 -d ' '\n" \
         "Hello\n" \
-Line 451
+Line 587
         "world\n"
  #define date_trivial_usage \
-        "[OPTION]... [MMDDhhmm[[CC]YY][.ss]] [+FORMAT]"
+        "[OPTION]... [+FMT] [TIME]"
- #define date_full_usage \
+ #define date_full_usage "\n\n" \
-        "Display current time in the given FORMAT, or set system date" \
+        "Display time (using +FMT), or set time\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-R		Outputs RFC-822 compliant date string\n" \
+      "\n	-u		Work in UTC (don't convert to local time)" \
-        "	-d STRING	Displays time described by STRING, not 'now'\n" \
+      "\n	-R		Output RFC-822 compliant date string" \
+ 	USE_FEATURE_DATE_ISOFMT( \
+      "\n	-I[SPEC]	Output ISO-8601 compliant date string" \
+      "\n			SPEC='date' (default) for date only," \
+      "\n			'hours', 'minutes', or 'seconds' for date and" \
+      "\n			time to the indicated precision" \
+ 	) \
+      "\n	-d TIME		Display TIME, not 'now'" \
+      "\n	-r FILE		Display last modification time of FILE" \
+      "\n	[-s] TIME	Set time to TIME" \
  	USE_FEATURE_DATE_ISOFMT( \
-        "	-I[TIMESPEC]	Outputs an ISO-8601 compliant date/time string\n" \
+      "\n	-D FMT		Use FMT for str->date conversion" \
-        "			TIMESPEC='date' (or missing) for date only,\n" \
+ 	) \
-        "			'hours', 'minutes', or 'seconds' for date and,\n" \
+      "\n" \
-        "			time to the indicated precision\n" \
+      "\nRecognized formats for TIME:" \
-        "	-D hint		Use 'hint' as date format, via strptime()\n" \
+      "\n	hh:mm[:ss]" \
- 	) \
+      "\n	[YYYY.]MM.DD-hh:mm[:ss]" \
-        "	-s		Sets time described by STRING\n" \
+      "\n	YYYY-MM-DD hh:mm[:ss]" \
-        "	-r FILE		Displays the last modification time of FILE\n" \
+      "\n	MMDDhhmm[[YY]YY][.ss]" \
-        "	-u		Prints or sets Coordinated Universal Time"
  #define date_example_usage \
         "$ date\n" \
         "Wed Apr 12 18:52:41 MDT 2000\n"
  #define dc_trivial_usage \
-        "expression ..."
+        "expression..."
- #define dc_full_usage \
+ #define dc_full_usage "\n\n" \
-        "This is a Tiny RPN calculator that understands the\n" \
+        "Tiny RPN calculator. Operations:\n" \
-        "following operations: +, add, -, sub, *, mul, /, div, %, mod, " \
+        "+, add, -, sub, *, mul, /, div, %, mod, **, exp, and, or, not, eor,\n" \
-        "**, exp, and, or, not, eor.\n" \
+        "p - print top of the stack (without altering the stack),\n" \
-        "For example: 'dc 2 2 add' -> 4, and 'dc 8 8 \\* 2 2 + /' -> 16." \
+        "f - print entire stack, o - pop the value and set output radix\n" \
-        "\n\nOptions:\n" \
+        "(value must be 10 or 16).\n" \
-        "p - Prints the value on the top of the stack, without altering the stack\n" \
+        "Examples: 'dc 2 2 add' -> 4, 'dc 8 8 * 2 2 + /' -> 16.\n" \
-        "f - Prints the entire contents of the stack without altering anything\n" \
-        "o - Pops the value off the top of the stack and uses it to set the output radix\n" \
-        "    Only 10 and 16 are supported"
  #define dc_example_usage \
         "$ dc 2 2 + p\n" \
         "4\n" \
-Line 497
+Line 640
  #define dd_trivial_usage \
         "[if=FILE] [of=FILE] " USE_FEATURE_DD_IBS_OBS("[ibs=N] [obs=N] ") "[bs=N] [count=N] [skip=N]\n" \
-        "	  [seek=N]" USE_FEATURE_DD_IBS_OBS(" [conv=notrunc|noerror|sync]")
+        "	[seek=N]" USE_FEATURE_DD_IBS_OBS(" [conv=notrunc|noerror|sync|fsync]")
- #define dd_full_usage \
+ #define dd_full_usage "\n\n" \
-        "Copy a file with converting and formatting" \
+        "Copy a file with converting and formatting\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	if=FILE		Read from FILE instead of stdin\n" \
+      "\n	if=FILE		Read from FILE instead of stdin" \
-        "	of=FILE		Write to FILE instead of stdout\n" \
+      "\n	of=FILE		Write to FILE instead of stdout" \
-        "	bs=N		Read and write N bytes at a time\n" \
+      "\n	bs=N		Read and write N bytes at a time" \
  	USE_FEATURE_DD_IBS_OBS( \
-        "	ibs=N		Read N bytes at a time\n") \
+      "\n	ibs=N		Read N bytes at a time" \
+ 	) \
  	USE_FEATURE_DD_IBS_OBS( \
-        "	obs=N		Write N bytes at a time\n") \
+      "\n	obs=N		Write N bytes at a time" \
-        "	count=N		Copy only N input blocks\n" \
+ 	) \
-        "	skip=N		Skip N input blocks\n" \
+      "\n	count=N		Copy only N input blocks" \
-        "	seek=N		Skip N output blocks\n" \
+      "\n	skip=N		Skip N input blocks" \
+      "\n	seek=N		Skip N output blocks" \
  	USE_FEATURE_DD_IBS_OBS( \
-        "	conv=notrunc	Don't truncate output file\n" \
+      "\n	conv=notrunc	Don't truncate output file" \
-        "	conv=noerror	Continue after read errors\n" \
+      "\n	conv=noerror	Continue after read errors" \
-        "	conv=sync	Pad blocks with zeros\n") \
+      "\n	conv=sync	Pad blocks with zeros" \
-        "\n" \
+      "\n	conv=fsync	Physically write data out before finishing" \
-        "Numbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024),\n" \
+ 	) \
-        "MD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824)"
+      "\n" \
+      "\nNumbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024)," \
+      "\nMD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824)" \
  #define dd_example_usage \
         "$ dd if=/dev/zero of=/dev/ram1 bs=1M count=4\n" \
         "4+0 records in\n" \
-Line 525
+Line 673
  #define deallocvt_trivial_usage \
         "[N]"
- #define deallocvt_full_usage \
+ #define deallocvt_full_usage "\n\n" \
         "Deallocate unused virtual terminal /dev/ttyN"
  #define delgroup_trivial_usage \
-        "GROUP"
+ 	USE_FEATURE_DEL_USER_FROM_GROUP("[USER] ")"GROUP"
- #define delgroup_full_usage \
+ #define delgroup_full_usage "\n\n" \
-        "Delete group GROUP from the system"
+        "Delete group GROUP from the system" \
+ 	USE_FEATURE_DEL_USER_FROM_GROUP(" or user USER from group GROUP")
  #define deluser_trivial_usage \
         "USER"
- #define deluser_full_usage \
+ #define deluser_full_usage "\n\n" \
-        "Delete user USER from the system"
+        "Delete USER from the system"
+ #define depmod_trivial_usage NOUSAGE_STR
+ #define depmod_full_usage ""
+ #define devmem_trivial_usage \
+ 	"ADDRESS [WIDTH [VALUE]]"
+ #define devmem_full_usage "\n\n" \
+        "Read/write from physical address\n" \
+      "\n	ADDRESS	Address to act upon" \
+      "\n	WIDTH	Width (8/16/...)" \
+      "\n	VALUE	Data to be written" \
  #define devfsd_trivial_usage \
-        "mntpnt [-v]" \
+        "mntpnt [-v]" USE_DEVFSD_FG_NP("[-fg][-np]")
- 	USE_DEVFSD_FG_NP("[-fg][-np]" )
+ #define devfsd_full_usage "\n\n" \
- #define devfsd_full_usage \
+        "Manage devfs permissions and old device name symlinks\n" \
-        "Manage devfs permissions and old device name symlinks" \
+      "\nOptions:" \
-        "\n\nOptions:" \
+      "\n	mntpnt	The mount point where devfs is mounted" \
-        "\n	mntpnt	The mount point where devfs is mounted" \
+      "\n	-v	Print the protocol version numbers for devfsd" \
-        "\n	-v	Print the protocol version numbers for devfsd" \
+      "\n		and the kernel-side protocol version and exit" \
-        "\n		and the kernel-side protocol version and exits" \
  	USE_DEVFSD_FG_NP( \
-        "\n	-fg	Run the daemon in the foreground" \
+      "\n	-fg	Run in foreground" \
-        "\n	-np	Exit after parsing the configuration file" \
+      "\n	-np	Exit after parsing the configuration file" \
-        "\n		and processing synthetic REGISTER events," \
+      "\n		and processing synthetic REGISTER events," \
-        "\n		do not poll for events")
+      "\n		do not poll for events" \
+ 	)
  #define df_trivial_usage \
-        "[-" USE_FEATURE_HUMAN_READABLE("hm") "k] [FILESYSTEM ...]"
+ 	"[-Pk" \
- #define df_full_usage \
+ 	USE_FEATURE_HUMAN_READABLE("mh") \
-        "Print the filesystem space used and space available" \
+ 	USE_FEATURE_DF_FANCY("ai] [-B SIZE") \
-        "\n\nOptions:\n" \
+ 	"] [FILESYSTEM...]"
+ #define df_full_usage "\n\n" \
+        "Print filesystem usage statistics\n" \
+      "\nOptions:" \
+      "\n	-P	POSIX output format" \
+      "\n	-k	1024-byte blocks (default)" \
  	USE_FEATURE_HUMAN_READABLE( \
-        "\n	-h	Print sizes in human readable format (e.g., 1K 243M 2G )\n" \
+      "\n	-m	1M-byte blocks" \
-        "	-m	Print sizes in megabytes\n" \
+      "\n	-h	Human readable (e.g. 1K 243M 2G)" \
-        "	-k	Print sizes in kilobytes(default)") \
+ 	) \
- 	SKIP_FEATURE_HUMAN_READABLE( \
+ 	USE_FEATURE_DF_FANCY( \
-        "\n	-k	Ignored")
+      "\n	-a	Show all filesystems" \
+      "\n	-i	Inodes" \
+      "\n	-B SIZE	Blocksize" \
+ 	) \
  #define df_example_usage \
         "$ df\n" \
-        "Filesystem           1k-blocks      Used Available Use% Mounted on\n" \
+        "Filesystem           1K-blocks      Used Available Use% Mounted on\n" \
         "/dev/sda3              8690864   8553540    137324  98% /\n" \
         "/dev/sda1                64216     36364     27852  57% /boot\n" \
         "$ df /dev/sda3\n" \
-        "Filesystem           1k-blocks      Used Available Use% Mounted on\n" \
+        "Filesystem           1K-blocks      Used Available Use% Mounted on\n" \
-        "/dev/sda3              8690864   8553540    137324  98% /\n"
+        "/dev/sda3              8690864   8553540    137324  98% /\n" \
+        "$ POSIXLY_CORRECT=sure df /dev/sda3\n" \
- #define dhcprelay_trivial_usage \
+        "Filesystem         512B-blocks      Used Available Use% Mounted on\n" \
-        "[client_device_list] [server_device]"
+        "/dev/sda3             17381728  17107080    274648  98% /\n" \
- #define dhcprelay_full_usage \
+        "$ POSIXLY_CORRECT=yep df -P /dev/sda3\n" \
-        "Relay dhcp requests from client devices to server device"
+        "Filesystem          512-blocks      Used Available Capacity Mounted on\n" \
+        "/dev/sda3             17381728  17107080    274648      98% /\n"
  #define dhcprelay_trivial_usage \
-        "[client_device_list] [server_device]"
+        "[client1,client2,...] [server_device]"
- #define dhcprelay_full_usage \
+ #define dhcprelay_full_usage "\n\n" \
-        "Relay dhcp requests from client devices to server device"
+        "Relay dhcp requests from client devices to server device.\n" \
+        "Pass clients as CSV"
  #define diff_trivial_usage \
         "[-abdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2"
- #define diff_full_usage \
+ #define diff_full_usage "\n\n" \
         "Compare files line by line and output the differences between them.\n" \
-        "This diff implementation only supports unified diffs." \
+        "This implementation supports unified diffs only.\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-a	Treat all files as text\n" \
+      "\n	-a	Treat all files as text" \
-        "	-b	Ignore changes in the amount of whitespace\n" \
+      "\n	-b	Ignore changes in the amount of whitespace" \
-        "	-d	Try hard to find a smaller set of changes\n" \
+      "\n	-d	Try hard to find a smaller set of changes" \
-        "	-i	Ignore case differences\n" \
+      "\n	-i	Ignore case differences" \
-        "	-L	Use LABEL instead of the filename in the unified header\n" \
+      "\n	-L	Use LABEL instead of the filename in the unified header" \
-        "	-N	Treat absent files as empty\n" \
+      "\n	-N	Treat absent files as empty" \
-        "	-q	Output only whether files differ\n" \
+      "\n	-q	Output only whether files differ" \
-        "	-r	Recursively compare subdirectories\n" \
+      "\n	-r	Recursively compare subdirectories" \
-        "	-S	Start with FILE when comparing directories\n" \
+      "\n	-S	Start with FILE when comparing directories" \
-        "	-T	Make tabs line up by prefixing a tab when necessary\n" \
+      "\n	-T	Make tabs line up by prefixing a tab when necessary" \
-        "	-s	Report when two files are the same\n" \
+      "\n	-s	Report when two files are the same" \
-        "	-t	Expand tabs to spaces in output\n" \
+      "\n	-t	Expand tabs to spaces in output" \
-        "	-U	Output LINES lines of context\n" \
+      "\n	-U	Output LINES lines of context" \
-        "	-w	Ignore all whitespace"
+      "\n	-w	Ignore all whitespace" \
  #define dirname_trivial_usage \
         "FILENAME"
- #define dirname_full_usage \
+ #define dirname_full_usage "\n\n" \
         "Strip non-directory suffix from FILENAME"
  #define dirname_example_usage \
         "$ dirname /tmp/foo\n" \
-Line 616
+Line 788
  #define dmesg_trivial_usage \
         "[-c] [-n LEVEL] [-s SIZE]"
- #define dmesg_full_usage \
+ #define dmesg_full_usage "\n\n" \
-        "Print or control the kernel ring buffer" \
+        "Print or control the kernel ring buffer\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c		Clears the ring buffer's contents after printing\n" \
+      "\n	-c		Clear ring buffer after printing" \
-        "	-n LEVEL	Sets console logging level\n" \
+      "\n	-n LEVEL	Set console logging level" \
-        "	-s SIZE		Use a buffer of size SIZE"
+      "\n	-s SIZE		Buffer size" \
  #define dnsd_trivial_usage \
         "[-c config] [-t seconds] [-p port] [-i iface-ip] [-d]"
- #define dnsd_full_usage \
+ #define dnsd_full_usage "\n\n" \
-        "Small and static DNS server daemon" \
+        "Small static DNS server daemon\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c	Config filename\n" \
+      "\n	-c	Config filename" \
-        "	-t	TTL in seconds\n" \
+      "\n	-t	TTL in seconds" \
-        "	-p	Listening port\n" \
+      "\n	-p	Listening port" \
-        "	-i	Listening iface ip (default all)\n" \
+      "\n	-i	Listening ip (default all)" \
-        "	-d	Daemonize"
+      "\n	-d	Daemonize" \
  #define dos2unix_trivial_usage \
         "[option] [FILE]"
- #define dos2unix_full_usage \
+ #define dos2unix_full_usage "\n\n" \
-        "Convert FILE from dos format to unix format.  When no option\n" \
+        "Convert FILE from dos to unix format.\n" \
-        "is given, the input is converted to the opposite output format.\n" \
+        "When no file is given, use stdin/stdout.\n" \
-        "When no file is given, use stdin for input and stdout for output." \
+      "\nOptions:" \
-        "\n\nOptions:\n" \
+      "\n	-u	dos2unix" \
-        "	-u	Output will be in UNIX format\n" \
+      "\n	-d	unix2dos" \
-        "	-d	Output will be in DOS format"
  #define dpkg_trivial_usage \
         "[-ilCPru] [-F option] package_name"
- #define dpkg_full_usage \
+ #define dpkg_full_usage "\n\n" \
-        "Install, remove and manage Debian packages" \
+        "Install, remove and manage Debian packages\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-i		Install the package\n" \
+      "\n	-i		Install the package" \
-        "	-l		List of installed packages\n" \
+      "\n	-l		List of installed packages" \
-        "	-C		Configure an unpackaged package\n" \
+      "\n	-C		Configure an unpackaged package" \
-        "	-F depends	Ignore dependency problems\n" \
+      "\n	-F depends	Ignore dependency problems" \
-        "	-P		Purge all files of a package\n" \
+      "\n	-P		Purge all files of a package" \
-        "	-r		Remove all but the configuration files for a package\n" \
+      "\n	-r		Remove all but the configuration files for a package" \
-        "	-u		Unpack a package, but don't configure it"
+      "\n	-u		Unpack a package, but don't configure it" \
  #define dpkg_deb_trivial_usage \
         "[-cefxX] FILE [argument]"
- #define dpkg_deb_full_usage \
+ #define dpkg_deb_full_usage "\n\n" \
-        "Perform actions on Debian packages (.debs)" \
+        "Perform actions on Debian packages (.debs)\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c	List contents of filesystem tree\n" \
+      "\n	-c	List contents of filesystem tree" \
-        "	-e	Extract control files to [argument] directory\n" \
+      "\n	-e	Extract control files to [argument] directory" \
-        "	-f	Display control field name starting with [argument]\n" \
+      "\n	-f	Display control field name starting with [argument]" \
-        "	-x	Extract packages filesystem tree to directory\n" \
+      "\n	-x	Extract packages filesystem tree to directory" \
-        "	-X	Verbose extract"
+      "\n	-X	Verbose extract" \
  #define dpkg_deb_example_usage \
         "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
  #define du_trivial_usage \
         "[-aHLdclsx" USE_FEATURE_HUMAN_READABLE("hm") "k] [FILE]..."
- #define du_full_usage \
+ #define du_full_usage "\n\n" \
         "Summarize disk space used for each FILE and/or directory.\n" \
         "Disk space is printed in units of " \
  	USE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("1024") \
  	SKIP_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("512") \
-        " bytes." \
+        " bytes.\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-a	Show sizes of files in addition to directories\n" \
+      "\n	-a	Show file sizes too" \
-        "	-H	Follow symbolic links that are FILE command line args\n" \
+      "\n	-H	Follow symlinks on command line" \
-        "	-L	Follow all symbolic links encountered\n" \
+      "\n	-L	Follow all symlinks" \
-        "	-d N	Limit output to directories (and files with -a) of depth < N\n" \
+      "\n	-d N	Limit output to directories (and files with -a) of depth < N" \
-        "	-c	Output a grand total\n" \
+      "\n	-c	Show grand total" \
-        "	-l	Count sizes many times if hard linked\n" \
+      "\n	-l	Count sizes many times if hard linked" \
-        "	-s	Display only a total for each argument\n" \
+      "\n	-s	Display only a total for each argument" \
-        "	-x	Skip directories on different filesystems\n" \
+      "\n	-x	Skip directories on different filesystems" \
  	USE_FEATURE_HUMAN_READABLE( \
-        "	-h	Print sizes in human readable format (e.g., 1K 243M 2G )\n" \
+      "\n	-h	Sizes in human readable format (e.g., 1K 243M 2G )" \
-        "	-m	Print sizes in megabytes\n" \
+      "\n	-m	Sizes in megabytes" \
  	) \
-        "	-k	Print sizes in kilobytes" \
+      "\n	-k	Sizes in kilobytes" \
- 	USE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("(default)")
+ 			USE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(" (default)") \
  #define du_example_usage \
         "$ du\n" \
         "16      ./CVS\n" \
-Line 708
+Line 881
  #define dumpkmap_trivial_usage \
         "> keymap"
- #define dumpkmap_full_usage \
+ #define dumpkmap_full_usage "\n\n" \
-        "Print out a binary keyboard translation table to standard output"
+        "Print a binary keyboard translation table to standard output"
  #define dumpkmap_example_usage \
         "$ dumpkmap > keymap\n"
  #define dumpleases_trivial_usage \
         "[-r|-a] [-f LEASEFILE]"
- #define dumpleases_full_usage \
+ #define dumpleases_full_usage "\n\n" \
-        "Display DHCP leases granted by udhcpd" \
+        "Display DHCP leases granted by udhcpd\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-f, --file=FILENAME	Leases file to load\n" \
+ 	USE_GETOPT_LONG( \
-        "	-r, --remaining		Interpret lease times as time remaining\n" \
+      "\n	-f,--file=FILE	Leases file to load" \
-        "	-a, --absolute		Interpret lease times as expire time"
+      "\n	-r,--remaining	Interpret lease times as time remaining" \
+      "\n	-a,--absolute	Interpret lease times as expire time" \
+ 	) \
+ 	SKIP_GETOPT_LONG( \
+      "\n	-f FILE	Leases file to load" \
+      "\n	-r	Interpret lease times as time remaining" \
+      "\n	-a	Interpret lease times as expire time" \
+ 	)
  #define e2fsck_trivial_usage \
         "[-panyrcdfvstDFSV] [-b superblock] [-B blocksize] " \
         "[-I inode_buffer_blocks] [-P process_inode_size] " \
         "[-l|-L bad_blocks_file] [-C fd] [-j external_journal] " \
         "[-E extended-options] device"
- #define e2fsck_full_usage \
+ #define e2fsck_full_usage "\n\n" \
-        "Check ext2/ext3 file system" \
+        "Check ext2/ext3 file system\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-p		Automatic repair (no questions)\n" \
+      "\n	-p		Automatic repair (no questions)" \
-        "	-n		Make no changes to the filesystem\n" \
+      "\n	-n		Make no changes to the filesystem" \
-        "	-y		Assume 'yes' to all questions\n" \
+      "\n	-y		Assume 'yes' to all questions" \
-        "	-c		Check for bad blocks and add them to the badblock list\n" \
+      "\n	-c		Check for bad blocks and add them to the badblock list" \
-        "	-f		Force checking even if filesystem is marked clean\n" \
+      "\n	-f		Force checking even if filesystem is marked clean" \
-        "	-v		Be verbose\n" \
+      "\n	-v		Verbose" \
-        "	-b superblock	Use alternative superblock\n" \
+      "\n	-b superblock	Use alternative superblock" \
-        "	-B blocksize	Force blocksize when looking for superblock\n" \
+      "\n	-B blocksize	Force blocksize when looking for superblock" \
-        "	-j journal	Set location of the external journal\n" \
+      "\n	-j journal	Set location of the external journal" \
-        "	-l file		Add to badblocks list\n" \
+      "\n	-l file		Add to badblocks list" \
-        "	-L file		Set badblocks list"
+      "\n	-L file		Set badblocks list" \
  #define echo_trivial_usage \
- 	USE_FEATURE_FANCY_ECHO("[-neE] ") "[ARG ...]"
+ 	USE_FEATURE_FANCY_ECHO("[-neE] ") "[ARG...]"
- #define echo_full_usage \
+ #define echo_full_usage "\n\n" \
         "Print the specified ARGs to stdout" \
- 	USE_FEATURE_FANCY_ECHO( \
+ 	USE_FEATURE_FANCY_ECHO( "\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-n	Suppress trailing newline\n" \
+      "\n	-n	Suppress trailing newline" \
-        "	-e	Interpret backslash-escaped characters (i.e., \\t=tab)\n" \
+      "\n	-e	Interpret backslash-escaped characters (i.e., \\t=tab)" \
-        "	-E	Disable interpretation of backslash-escaped characters" \
+      "\n	-E	Disable interpretation of backslash-escaped characters" \
  	)
  #define echo_example_usage \
         "$ echo \"Erik is cool\"\n" \
         "Erik is cool\n" \
- 	USE_FEATURE_FANCY_ECHO("$  echo -e \"Erik\\nis\\ncool\"\n" \
+ 	USE_FEATURE_FANCY_ECHO("$ echo -e \"Erik\\nis\\ncool\"\n" \
         "Erik\n" \
         "is\n" \
         "cool\n" \
-Line 764
+Line 944
  #define eject_trivial_usage \
         "[-t] [-T] [DEVICE]"
- #define eject_full_usage \
+ #define eject_full_usage "\n\n" \
-        "Eject specified DEVICE (or default /dev/cdrom)" \
+        "Eject specified DEVICE (or default /dev/cdrom)\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-t	Close tray\n" \
+ 	USE_FEATURE_EJECT_SCSI( \
-        "	-T	Open/close tray (toggle)"
+      "\n	-s	SCSI device" \
+ 	) \
+      "\n	-t	Close tray" \
+      "\n	-T	Open/close tray (toggle)" \
  #define ed_trivial_usage ""
  #define ed_full_usage ""
  #define env_trivial_usage \
         "[-iu] [-] [name=value]... [command]"
- #define env_full_usage \
+ #define env_full_usage "\n\n" \
         "Print the current environment or run a program after setting\n" \
-        "up the specified environment" \
+        "up the specified environment\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-, -i	Start with an empty environment\n" \
+      "\n	-, -i	Start with an empty environment" \
-        "	-u	Remove variable from the environment"
+      "\n	-u	Remove variable from the environment" \
  #define ether_wake_trivial_usage \
         "[-b] [-i iface] [-p aa:bb:cc:dd[:ee:ff]] MAC"
- #define ether_wake_full_usage \
+ #define ether_wake_full_usage "\n\n" \
         "Send a magic packet to wake up sleeping machines.\n" \
         "MAC must be a station address (00:11:22:33:44:55) or\n" \
-        "a hostname with a known 'ethers' entry." \
+        "a hostname with a known 'ethers' entry.\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-b		Send wake-up packet to the broadcast address\n" \
+      "\n	-b		Send wake-up packet to the broadcast address" \
-        "	-i iface	Use interface ifname instead of the default \"eth0\"\n" \
+      "\n	-i iface	Interface to use (default eth0)" \
-        "	-p pass		Append the four or six byte password PW to the packet"
+      "\n	-p pass		Append four or six byte password PW to the packet" \
+ #define expand_trivial_usage \
+        "[-i] [-t NUM] [FILE|-]"
+ #define expand_full_usage "\n\n" \
+        "Convert tabs to spaces, writing to standard output.\n" \
+      "\nOptions:" \
+ 	USE_FEATURE_EXPAND_LONG_OPTIONS( \
+      "\n	-i,--initial	Do not convert tabs after non blanks" \
+      "\n	-t,--tabs=N	Tabstops every N chars" \
+ 	) \
+ 	SKIP_FEATURE_EXPAND_LONG_OPTIONS( \
+      "\n	-i	Do not convert tabs after non blanks" \
+      "\n	-t	Tabstops every N chars" \
+ 	)
  #define expr_trivial_usage \
         "EXPRESSION"
- #define expr_full_usage \
+ #define expr_full_usage "\n\n" \
-        "Print the value of EXPRESSION to standard output.\n\n" \
+        "Print the value of EXPRESSION to standard output.\n" \
+        "\n" \
         "EXPRESSION may be:\n" \
-        "	ARG1 |  ARG2	ARG1 if it is neither null nor 0, otherwise ARG2\n" \
+        "	ARG1 | ARG2	ARG1 if it is neither null nor 0, otherwise ARG2\n" \
-        "	ARG1 &  ARG2	ARG1 if neither argument is null or 0, otherwise 0\n" \
+        "	ARG1 & ARG2	ARG1 if neither argument is null or 0, otherwise 0\n" \
-        "	ARG1 <  ARG2	ARG1 is less than ARG2\n" \
+        "	ARG1 < ARG2	1 if ARG1 is less than ARG2, else 0. Similarly:\n" \
-        "	ARG1 <= ARG2	ARG1 is less than or equal to ARG2\n" \
+        "	ARG1 <= ARG2\n" \
-        "	ARG1 =  ARG2	ARG1 is equal to ARG2\n" \
+        "	ARG1 = ARG2\n" \
-        "	ARG1 != ARG2	ARG1 is unequal to ARG2\n" \
+        "	ARG1 != ARG2\n" \
-        "	ARG1 >= ARG2	ARG1 is greater than or equal to ARG2\n" \
+        "	ARG1 >= ARG2\n" \
-        "	ARG1 >  ARG2	ARG1 is greater than ARG2\n" \
+        "	ARG1 > ARG2\n" \
-        "	ARG1 +  ARG2	Sum of ARG1 and ARG2\n" \
+        "	ARG1 + ARG2	Sum of ARG1 and ARG2. Similarly:\n" \
-        "	ARG1 -  ARG2	Difference of ARG1 and ARG2\n" \
+        "	ARG1 - ARG2\n" \
-        "	ARG1 *  ARG2	Product of ARG1 and ARG2\n" \
+        "	ARG1 * ARG2\n" \
-        "	ARG1 /  ARG2	Quotient of ARG1 divided by ARG2\n" \
+        "	ARG1 / ARG2\n" \
-        "	ARG1 %  ARG2	Remainder of ARG1 divided by ARG2\n" \
+        "	ARG1 % ARG2\n" \
         "	STRING : REGEXP		Anchored pattern match of REGEXP in STRING\n" \
         "	match STRING REGEXP	Same as STRING : REGEXP\n" \
         "	substr STRING POS LENGTH Substring of STRING, POS counted from 1\n" \
-Line 819
+Line 1017
         "	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" \
+        "	(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" \
+        "lexicographical. Pattern matches return the string matched between\n" \
         "\\( and \\) or null; if \\( and \\) are not used, they return the number\n" \
         "of characters matched or 0."
  #define fakeidentd_trivial_usage \
         "[-fiw] [-b ADDR] [STRING]"
- #define fakeidentd_full_usage \
+ #define fakeidentd_full_usage "\n\n" \
-        "Provide fake ident (auth) service" \
+        "Provide fake ident (auth) service\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
-        "\n	-f	Run in foreground" \
+      "\n	-f	Run in foreground" \
-        "\n	-i	Inetd mode" \
+      "\n	-i	Inetd mode" \
-        "\n	-w	Inetd 'wait' mode" \
+      "\n	-w	Inetd 'wait' mode" \
-        "\n	-b ADDR	Bind to specified address" \
+      "\n	-b ADDR	Bind to specified address" \
-        "\n	STRING	Ident answer string (default is 'nobody')"
+      "\n	STRING	Ident answer string (default is 'nobody')" \
  #define false_trivial_usage \
         ""
- #define false_full_usage \
+ #define false_full_usage "\n\n" \
         "Return an exit code of FALSE (1)"
  #define false_example_usage \
         "$ false\n" \
         "$ echo $?\n" \
-Line 848
+Line 1048
  #define fbset_trivial_usage \
         "[options] [mode]"
- #define fbset_full_usage \
+ #define fbset_full_usage "\n\n" \
         "Show and modify frame buffer settings"
  #define fbset_example_usage \
         "$ fbset\n" \
         "mode \"1024x768-76\"\n" \
-Line 862
+Line 1063
  #define fdflush_trivial_usage \
         "DEVICE"
- #define fdflush_full_usage \
+ #define fdflush_full_usage "\n\n" \
         "Force floppy disk drive to detect disk change"
  #define fdformat_trivial_usage \
         "[-n] DEVICE"
- #define fdformat_full_usage \
+ #define fdformat_full_usage "\n\n" \
-        "Format floppy disk" \
+        "Format floppy disk\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-n	Don't verify after format"
+      "\n	-n	Don't verify after format" \
+ /* Looks like someone forgot to add this to config system */
+ #ifndef ENABLE_FEATURE_FDISK_BLKSIZE
+ # define ENABLE_FEATURE_FDISK_BLKSIZE 0
+ # define USE_FEATURE_FDISK_BLKSIZE(a)
+ #endif
  #define fdisk_trivial_usage \
-        "[-luv] [-C CYLINDERS] [-H HEADS] [-S SECTORS] [-b SSZ] DISK"
+        "[-ul" USE_FEATURE_FDISK_BLKSIZE("s") "] " \
- #define fdisk_full_usage \
+        "[-C CYLINDERS] [-H HEADS] [-S SECTORS] [-b SSZ] DISK"
-        "Change partition table" \
+ #define fdisk_full_usage "\n\n" \
-        "\n\nOptions:\n" \
+        "Change partition table\n" \
-        "	-l		List partition table(s)\n" \
+      "\nOptions:" \
-        "	-u		Give Start and End in sector (instead of cylinder) units\n" \
+      "\n	-u		Start and End are in sectors (instead of cylinders)" \
-        "	-s PARTITION	Give partition size(s) in blocks\n" \
+      "\n	-l		Show partition table for each DISK, then exit" \
-        "	-b 2048		(for certain MO disks) use 2048-byte sectors\n" \
+ 	USE_FEATURE_FDISK_BLKSIZE( \
-        "	-C CYLINDERS	Set the number of cylinders\n" \
+      "\n	-s		Show partition sizes in kb for each DISK, then exit" \
-        "	-H HEADS	Set the number of heads\n" \
+ 	) \
-        "	-S SECTORS	Set the number of sectors\n" \
+      "\n	-b 2048		(for certain MO disks) use 2048-byte sectors" \
-        "	-v		Give fdisk version"
+      "\n	-C CYLINDERS	Set number of cylinders/heads/sectors" \
+      "\n	-H HEADS\n" \
+      "\n	-S SECTORS" \
+ #define blkid_trivial_usage \
+        ""
+ #define blkid_full_usage "\n\n" \
+        "Print UUIDs of all filesystems."
+ #define findfs_trivial_usage \
+        "LABEL=label or UUID=uuid"
+ #define findfs_full_usage "\n\n" \
+        "Find a filesystem device based on a label or UUID."
+ #define findfs_example_usage \
+        "$ findfs LABEL=MyDevice"
  #define find_trivial_usage \
         "[PATH...] [EXPRESSION]"
- #define find_full_usage \
+ #define find_full_usage "\n\n" \
-        "Search for files in a directory hierarchy.  The default PATH is\n" \
+        "Search for files. The default PATH is the current directory,\n" \
-        "the current directory; default EXPRESSION is '-print'\n" \
+        "default EXPRESSION is '-print'\n" \
-        "\nEXPRESSION may consist of:\n" \
+      "\nEXPRESSION may consist of:" \
-        "	-follow		Dereference symbolic links\n" \
+      "\n	-follow		Dereference symlinks" \
-        "	-name PATTERN	File name (leading directories removed) matches PATTERN\n" \
+ 	USE_FEATURE_FIND_XDEV( \
-        "	-print		Print (default and assumed)" \
+      "\n	-xdev		Don't descend directories on other filesystems") \
+ 	USE_FEATURE_FIND_MAXDEPTH( \
+      "\n	-maxdepth N	Descend at most N levels. -maxdepth 0 applies" \
+      "\n			tests/actions to command line arguments only") \
+      "\n	-name PATTERN	File name (w/o directory name) matches PATTERN" \
+      "\n	-iname PATTERN	Case insensitive -name" \
+ 	USE_FEATURE_FIND_PATH( \
+      "\n	-path PATTERN	Path matches PATTERN") \
+ 	USE_FEATURE_FIND_REGEX( \
+      "\n	-regex PATTERN	Path matches regex PATTERN") \
+ 	USE_FEATURE_FIND_TYPE( \
+      "\n	-type X		File type is X (X is one of: f,d,l,b,c,...)") \
+ 	USE_FEATURE_FIND_PERM( \
+      "\n	-perm NNN	Permissions match any of (+NNN), all of (-NNN)," \
+      "\n			or exactly (NNN)") \
+ 	USE_FEATURE_FIND_MTIME( \
+      "\n	-mtime DAYS	Modified time is greater than (+N), less than (-N)," \
+      "\n			or exactly (N) days") \
+ 	USE_FEATURE_FIND_MMIN( \
+      "\n	-mmin MINS	Modified time is greater than (+N), less than (-N)," \
+      "\n			or exactly (N) minutes") \
+ 	USE_FEATURE_FIND_NEWER( \
+      "\n	-newer FILE	Modified time is more recent than FILE's") \
+ 	USE_FEATURE_FIND_INUM( \
+      "\n	-inum N		File has inode number N") \
+ 	USE_FEATURE_FIND_USER( \
+      "\n	-user NAME	File is owned by user NAME (numeric user ID allowed)") \
+ 	USE_FEATURE_FIND_GROUP( \
+      "\n	-group NAME	File belongs to group NAME (numeric group ID allowed)") \
+ 	USE_FEATURE_FIND_DEPTH( \
+      "\n	-depth		Process directory name after traversing it") \
+ 	USE_FEATURE_FIND_SIZE( \
+      "\n	-size N[bck]	File size is N (c:bytes,k:kbytes,b:512 bytes(def.))." \
+      "\n			+/-N: file size is bigger/smaller than N") \
+      "\n	-print		Print (default and assumed)" \
  	USE_FEATURE_FIND_PRINT0( \
-        "\n	-print0		Delimit output with null characters rather than" \
+      "\n	-print0		Delimit output with null characters rather than" \
-        "\n			newlines" \
+      "\n			newlines") \
- 	) USE_FEATURE_FIND_TYPE( \
+ 	USE_FEATURE_FIND_CONTEXT ( \
-        "\n	-type X		Filetype matches X (where X is one of: f,d,l,b,c,...)" \
+      "\n	-context	File has specified security context") \
- 	) USE_FEATURE_FIND_PERM( \
+ 	USE_FEATURE_FIND_EXEC( \
-        "\n	-perm PERMS	Permissions match any of (+NNN); all of (-NNN);" \
+      "\n	-exec CMD ARG ;	Execute CMD with all instances of {} replaced by the" \
-        "\n			or exactly (NNN)" \
+      "\n			matching files") \
- 	) USE_FEATURE_FIND_MTIME( \
+ 	USE_FEATURE_FIND_PRUNE( \
-        "\n	-mtime DAYS	Modified time is greater than (+N); less than (-N);" \
+      "\n	-prune		Stop traversing current subtree") \
-        "\n			Or exactly (N) days" \
+ 	USE_FEATURE_FIND_DELETE( \
- 	) USE_FEATURE_FIND_MMIN( \
+      "\n	-delete		Delete files, turns on -depth option") \
-        "\n	-mmin MINS	Modified time is greater than (+N); less than (-N);" \
+ 	USE_FEATURE_FIND_PAREN( \
-        "\n			or exactly (N) minutes" \
+      "\n	(EXPR)		Group an expression") \
- 	) USE_FEATURE_FIND_NEWER( \
-        "\n	-newer FILE	Modified time is more recent than FILE's" \
- 	) USE_FEATURE_FIND_INUM( \
-        "\n	-inum N		File has inode number N" \
- 	) USE_FEATURE_FIND_EXEC( \
-        "\n	-exec CMD	Execute CMD with all instances of {} replaced by the" \
-        "\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" \
-Line 928
+Line 1171
  #define fold_trivial_usage \
         "[-bs] [-w WIDTH] [FILE]"
- #define fold_full_usage \
+ #define fold_full_usage "\n\n" \
         "Wrap input lines in each FILE (standard input by default), writing to\n" \
-        "standard output" \
+        "standard output\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-b	Count bytes rather than columns\n" \
+      "\n	-b	Count bytes rather than columns" \
-        "	-s	Break at spaces\n" \
+      "\n	-s	Break at spaces" \
-        "	-w	Use WIDTH columns instead of 80"
+      "\n	-w	Use WIDTH columns instead of 80" \
  #define free_trivial_usage \
         ""
- #define free_full_usage \
+ #define free_full_usage "\n\n" \
         "Display the amount of free and used system memory"
  #define free_example_usage \
         "$ free\n" \
-Line 949
+Line 1192
  #define freeramdisk_trivial_usage \
         "DEVICE"
- #define freeramdisk_full_usage \
+ #define freeramdisk_full_usage "\n\n" \
         "Free all memory used by the specified ramdisk"
  #define freeramdisk_example_usage \
         "$ freeramdisk /dev/ram2\n"
  #define fsck_trivial_usage \
-        "[-ANPRTV] [ -C fd ] [-t fstype] [fs-options] [filesys ...]"
+        "[-ANPRTV] [-C fd] [-t fstype] [fs-options] [filesys...]"
- #define fsck_full_usage \
+ #define fsck_full_usage "\n\n" \
-        "Check and repair filesystems" \
+        "Check and repair filesystems\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-A	Walk /etc/fstab and check all filesystems\n" \
+      "\n	-A	Walk /etc/fstab and check all filesystems" \
-        "	-N	Don't execute, just show what would be done\n" \
+      "\n	-N	Don't execute, just show what would be done" \
-        "	-P	When using -A, check filesystems in parallel\n" \
+      "\n	-P	With -A, check filesystems in parallel" \
-        "	-R	When using -A, skip the root filesystem\n" \
+      "\n	-R	With -A, skip the root filesystem" \
-        "	-T	Don't show title on startup\n" \
+      "\n	-T	Don't show title on startup" \
-        "	-V	Verbose\n" \
+      "\n	-V	Verbose" \
-        "	-C n	Write status information to specified filedescriptor\n" \
+      "\n	-C n	Write status information to specified filedescriptor" \
-        "	-t type	List of filesystem types to check"
+      "\n	-t type	List of filesystem types to check" \
  #define fsck_minix_trivial_usage \
         "[-larvsmf] /dev/name"
- #define fsck_minix_full_usage \
+ #define fsck_minix_full_usage "\n\n" \
-        "Perform a consistency check for MINIX filesystems" \
+        "Check MINIX filesystem\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-l	Lists all filenames\n" \
+      "\n	-l	List all filenames" \
-        "	-r	Perform interactive repairs\n" \
+      "\n	-r	Perform interactive repairs" \
-        "	-a	Perform automatic repairs\n" \
+      "\n	-a	Perform automatic repairs" \
-        "	-v	Verbose\n" \
+      "\n	-v	Verbose" \
-        "	-s	Outputs super-block information\n" \
+      "\n	-s	Output superblock information" \
-        "	-m	Activates MINIX-like \"mode not cleared\" warnings\n" \
+      "\n	-m	Show \"mode not cleared\" warnings" \
-        "	-f	Force file system check"
+      "\n	-f	Force file system check" \
  #define ftpget_trivial_usage \
         "[options] remote-host local-file remote-file"
- #define ftpget_full_usage \
+ #define ftpget_full_usage "\n\n" \
-        "Retrieve a remote file via FTP" \
+        "Retrieve a remote file via FTP\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c, --continue	Continue a previous transfer\n" \
+ 	USE_FEATURE_FTPGETPUT_LONG_OPTIONS( \
-        "	-v, --verbose	Verbose\n" \
+      "\n	-c,--continue	Continue previous transfer" \
-        "	-u, --username	Username to be used\n" \
+      "\n	-v,--verbose	Verbose" \
-        "	-p, --password	Password to be used\n" \
+      "\n	-u,--username	Username" \
-        "	-P, --port	Port number to be used"
+      "\n	-p,--password	Password" \
+      "\n	-P,--port	Port number" \
+ 	) \
+ 	SKIP_FEATURE_FTPGETPUT_LONG_OPTIONS( \
+      "\n	-c	Continue previous transfer" \
+      "\n	-v	Verbose" \
+      "\n	-u	Username" \
+      "\n	-p	Password" \
+      "\n	-P	Port number" \
+ 	)
  #define ftpput_trivial_usage \
         "[options] remote-host remote-file local-file"
- #define ftpput_full_usage \
+ #define ftpput_full_usage "\n\n" \
-        "Store a local file on a remote machine via FTP" \
+        "Store a local file on a remote machine via FTP\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-v, --verbose	Verbose\n" \
+ 	USE_FEATURE_FTPGETPUT_LONG_OPTIONS( \
-        "	-u, --username	Username to be used\n" \
+      "\n	-v,--verbose	Verbose" \
-        "	-p, --password	Password to be used\n" \
+      "\n	-u,--username	Username" \
-        "	-P, --port	Port number to be used"
+      "\n	-p,--password	Password" \
+      "\n	-P,--port	Port number" \
+ 	) \
+ 	SKIP_FEATURE_FTPGETPUT_LONG_OPTIONS( \
+      "\n	-v	Verbose" \
+      "\n	-u	Username" \
+      "\n	-p	Password" \
+      "\n	-P	Port number" \
+ 	)
  #define fuser_trivial_usage \
-        "[options] file OR port/proto"
+        "[options] FILE or PORT/PROTO"
- #define fuser_full_usage \
+ #define fuser_full_usage "\n\n" \
-        "Options:\n" \
+        "Find processes which use FILEs or PORTs\n" \
-        "	-m	Show all processes on the same mounted fs\n" \
+      "\nOptions:" \
-        "	-k	Kill all processes that match\n" \
+      "\n	-m	Find processes which use same fs as FILEs" \
-        "	-s	Don't print or kill anything\n" \
+      "\n	-4	Search only IPv4 space" \
-        "	-4	When using port/proto only search IPv4 space\n" \
+      "\n	-6	Search only IPv6 space" \
-        "	-6	When using port/proto only search IPv6 space\n" \
+      "\n	-s	Silent: just exit with 0 if any processes are found" \
-        "	-SIGNAL	When used with -k, this signal will be used to kill"
+      "\n	-k	Kill found processes (otherwise display PIDs)" \
+      "\n	-SIGNAL	Signal to send (default: TERM)" \
+ #define getenforce_trivial_usage NOUSAGE_STR
+ #define getenforce_full_usage ""
  #define getopt_trivial_usage \
         "[OPTIONS]..."
- #define getopt_full_usage \
+ #define getopt_full_usage "\n\n" \
         "Parse command options\n" \
-        "	-a, --alternative		Allow long options starting with single -\n" \
+ 	USE_GETOPT_LONG( \
-        "	-l, --longoptions=longopts	Long options to be recognized\n" \
+      "\n	-a,--alternative		Allow long options starting with single -" \
-        "	-n, --name=progname		The name under which errors are reported\n" \
+      "\n	-l,--longoptions=longopts	Long options to be recognized" \
-        "	-o, --options=optstring		Short options to be recognized\n" \
+      "\n	-n,--name=progname		The name under which errors are reported" \
-        "	-q, --quiet			Disable error reporting by getopt(3)\n" \
+      "\n	-o,--options=optstring		Short options to be recognized" \
-        "	-Q, --quiet-output		No normal output\n" \
+      "\n	-q,--quiet			Disable error reporting by getopt(3)" \
-        "	-s, --shell=shell		Set shell quoting conventions\n" \
+      "\n	-Q,--quiet-output		No normal output" \
-        "	-T, --test			Test for getopt(1) version\n" \
+      "\n	-s,--shell=shell		Set shell quoting conventions" \
-        "	-u, --unquoted			Do not quote the output"
+      "\n	-T,--test			Test for getopt(1) version" \
+      "\n	-u,--unquoted			Don't quote the output" \
+ 	) \
+ 	SKIP_GETOPT_LONG( \
+      "\n	-a		Allow long options starting with single -" \
+      "\n	-l longopts	Long options to be recognized" \
+      "\n	-n progname	The name under which errors are reported" \
+      "\n	-o optstring	Short options to be recognized" \
+      "\n	-q		Disable error reporting by getopt(3)" \
+      "\n	-Q		No normal output" \
+      "\n	-s shell	Set shell quoting conventions" \
+      "\n	-T		Test for getopt(1) version" \
+      "\n	-u		Don't quote the output" \
+ 	)
  #define getopt_example_usage \
         "$ cat getopt.test\n" \
         "#!/bin/sh\n" \
         "GETOPT=`getopt -o ab:c:: --long a-long,b-long:,c-long:: \\\n" \
         "       -n 'example.busybox' -- \"$@\"`\n" \
-        "if [ $? != 0 ] ; then  exit 1 ; fi\n" \
+        "if [ $? != 0 ]; then  exit 1; fi\n" \
         "eval set -- \"$GETOPT\"\n" \
-        "while true ; do\n" \
+        "while true; do\n" \
         " case $1 in\n" \
-        "   -a|--a-long) echo \"Option a\" ; shift ;;\n" \
+        "   -a|--a-long) echo \"Option a\"; shift;;\n" \
-        "   -b|--b-long) echo \"Option b, argument '$2'\" ; shift 2 ;;\n" \
+        "   -b|--b-long) echo \"Option b, argument '$2'\"; shift 2;;\n" \
         "   -c|--c-long)\n" \
         "     case \"$2\" in\n" \
-        "       \"\") echo \"Option c, no argument\"; shift 2 ;;\n" \
+        "       \"\") echo \"Option c, no argument\"; shift 2;;\n" \
-        "       *)  echo \"Option c, argument '$2'\" ; shift 2 ;;\n" \
+        "       *)  echo \"Option c, argument '$2'\"; shift 2;;\n" \
-        "     esac ;;\n" \
+        "     esac;;\n" \
-        "   --) shift ; break ;;\n" \
+        "   --) shift; break;;\n" \
-        "   *) echo \"Internal error!\" ; exit 1 ;;\n" \
+        "   *) echo \"Internal error!\"; exit 1;;\n" \
         " esac\n" \
         "done\n"
+ #define getsebool_trivial_usage \
+        "-a or getsebool boolean..."
+ #define getsebool_full_usage "\n\n" \
+        "	-a	Show all SELinux booleans"
  #define getty_trivial_usage \
-        "[OPTIONS]... baud_rate,... line [termtype]"
+        "[OPTIONS] BAUD_RATE TTY [TERMTYPE]"
- #define getty_full_usage \
+ #define getty_full_usage "\n\n" \
-        "Open a tty, prompt for a login name, then invoke /bin/login" \
+        "Open a tty, prompt for a login name, then invoke /bin/login\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-h		Enable hardware (RTS/CTS) flow control\n" \
+      "\n	-h		Enable hardware (RTS/CTS) flow control" \
-        "	-i		Do not display /etc/issue before running login\n" \
+      "\n	-i		Do not display /etc/issue before running login" \
-        "	-L		Local line, so do not do carrier detect\n" \
+      "\n	-L		Local line, do not do carrier detect" \
-        "	-m		Get baud rate from modem's CONNECT status message\n" \
+      "\n	-m		Get baud rate from modem's CONNECT status message" \
-        "	-w		Wait for a CR or LF before sending /etc/issue\n" \
+      "\n	-w		Wait for a CR or LF before sending /etc/issue" \
-        "	-n		Do not prompt the user for a login name\n" \
+      "\n	-n		Do not prompt the user for a login name" \
-        "	-f issue_file	Display issue_file instead of /etc/issue\n" \
+      "\n	-f issue_file	Display issue_file instead of /etc/issue" \
-        "	-l login_app	Invoke login_app instead of /bin/login\n" \
+      "\n	-l login_app	Invoke login_app instead of /bin/login" \
-        "	-t timeout	Terminate after timeout if no username is read\n" \
+      "\n	-t timeout	Terminate after timeout if no username is read" \
-        "	-I initstring	Sets the init string to send before anything else\n" \
+      "\n	-I initstring	Init string to send before anything else" \
-        "	-H login_host	Log login_host into the utmp file as the hostname"
+      "\n	-H login_host	Log login_host into the utmp file as the hostname" \
  #define grep_trivial_usage \
-        "[-rihHnqvso" \
+        "[-HhrilLnqvso" \
+ 	USE_DESKTOP("w") \
+        "eF" \
  	USE_FEATURE_GREP_EGREP_ALIAS("E") \
  	USE_FEATURE_GREP_CONTEXT("ABC") \
         "] PATTERN [FILEs...]"
- #define grep_full_usage \
+ #define grep_full_usage "\n\n" \
-        "Search for PATTERN in each FILE or standard input" \
+        "Search for PATTERN in each FILE or standard input\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-H	Prefix output lines with filename where match was found\n" \
+      "\n	-H	Prefix output lines with filename where match was found" \
-        "	-h	Suppress the prefixing filename on output\n" \
+      "\n	-h	Suppress the prefixing filename on output" \
-        "	-r	Recurse subdirectories\n" \
+      "\n	-r	Recurse subdirectories" \
-        "	-i	Ignore case distinctions\n" \
+      "\n	-i	Ignore case distinctions" \
-        "	-l	List names of files that match\n" \
+      "\n	-l	List names of files that match" \
-        "	-L	List names of files that do not match\n" \
+      "\n	-L	List names of files that do not match" \
-        "	-n	Print line number with output lines\n" \
+      "\n	-n	Print line number with output lines" \
-        "	-q	Be quiet. Returns 0 if PATTERN was found, 1 otherwise\n" \
+      "\n	-q	Quiet. Return 0 if PATTERN is found, 1 otherwise" \
-        "	-v	Select non-matching lines\n" \
+      "\n	-v	Select non-matching lines" \
-        "	-s	Suppress file open/read error messages\n" \
+      "\n	-s	Suppress file open/read error messages" \
-        "	-c	Only print count of matching lines\n" \
+      "\n	-c	Only print count of matching lines" \
-        "	-f	Read PATTERN from file\n" \
+      "\n	-o	Show only the part of a line that matches PATTERN" \
-        "	-o	Show only the part of a line that matches PATTERN\n" \
+      "\n	-m MAX	Match up to MAX times per file" \
-        "	-e	PATTERN is a regular expression\n" \
+ 	USE_DESKTOP( \
-        "	-F	PATTERN is a set of newline-separated strings" \
+      "\n	-w	Match whole words only") \
+      "\n	-F	PATTERN is a set of newline-separated strings" \
  	USE_FEATURE_GREP_EGREP_ALIAS( \
-        "\n	-E	PATTERN is an extended regular expression") \
+      "\n	-E	PATTERN is an extended regular expression") \
+      "\n	-e PTRN	Pattern to match" \
+      "\n	-f FILE	Read pattern from file" \
  	USE_FEATURE_GREP_CONTEXT( \
-        "\n	-A	Print NUM lines of trailing context") \
+      "\n	-A	Print NUM lines of trailing context" \
- 	USE_FEATURE_GREP_CONTEXT( \
+      "\n	-B	Print NUM lines of leading context" \
-        "\n	-B	Print NUM lines of leading context") \
+      "\n	-C	Print NUM lines of output context") \
- 	USE_FEATURE_GREP_CONTEXT( \
-        "\n	-C	Print NUM lines of output context")
  #define grep_example_usage \
         "$ grep root /etc/passwd\n" \
-Line 1102
+Line 1387
         "$ grep ^[rR]oo. /etc/passwd\n" \
         "root:x:0:0:root:/root:/bin/bash\n"
+ #define egrep_trivial_usage NOUSAGE_STR
+ #define egrep_full_usage ""
+ #define fgrep_trivial_usage NOUSAGE_STR
+ #define fgrep_full_usage ""
  #define gunzip_trivial_usage \
-        "[OPTION]... FILE"
+        "[OPTION]... [FILE]..."
- #define gunzip_full_usage \
+ #define gunzip_full_usage "\n\n" \
-        "Uncompress FILE (or standard input if FILE is '-')" \
+        "Uncompress FILEs (or standard input)\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c	Write output to standard output\n" \
+      "\n	-c	Write to standard output" \
-        "	-f	Force read when source is a terminal\n" \
+      "\n	-f	Force" \
-        "	-t	Test compressed file integrity"
+      "\n	-t	Test file integrity" \
  #define gunzip_example_usage \
         "$ ls -la /tmp/BusyBox*\n" \
         "-rw-rw-r--    1 andersen andersen   557009 Apr 11 10:55 /tmp/BusyBox-0.43.tar.gz\n" \
-Line 1119
+Line 1411
  #define gzip_trivial_usage \
         "[OPTION]... [FILE]..."
- #define gzip_full_usage \
+ #define gzip_full_usage "\n\n" \
-        "Compress FILE(s) with maximum compression.\n" \
+        "Compress FILEs (or standard input)\n" \
-        "When FILE is '-' or unspecified, reads standard input.  Implies -c." \
+      "\nOptions:" \
-        "\n\nOptions:\n" \
+      "\n	-c	Write to standard output" \
-        "	-c	Write output to standard output instead of FILE.gz\n" \
+      "\n	-d	Decompress" \
-        "	-d	Decompress\n" \
+      "\n	-f	Force" \
-        "	-f	Force write when destination is a terminal"
  #define gzip_example_usage \
         "$ ls -la /tmp/busybox*\n" \
         "-rw-rw-r--    1 andersen andersen  1761280 Apr 14 17:47 /tmp/busybox.tar\n" \
-Line 1134
+Line 1426
         "-rw-rw-r--    1 andersen andersen   554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
  #define halt_trivial_usage \
-        "[-d<delay>] [-n<nosync>] [-f<force>]"
+        "[-d delay] [-n] [-f]" USE_FEATURE_WTMP(" [-w]")
- #define halt_full_usage \
+ #define halt_full_usage "\n\n" \
-        "Halt the system" \
+        "Halt the system\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-d	Delay interval for halting\n" \
+      "\n	-d	Delay interval for halting" \
-        "	-n	No call to sync()\n" \
+      "\n	-n	No call to sync()" \
-        "	-f	Force halt (don't go through init)"
+      "\n	-f	Force halt (don't go through init)" \
+ 	USE_FEATURE_WTMP( \
+      "\n	-w	Only write a wtmp record" \
+ 	)
  #define hdparm_trivial_usage \
         "[options] [device] .."
- #define hdparm_full_usage \
+ #define hdparm_full_usage "\n\n" \
- 	USE_FEATURE_HDPARM_GET_IDENTITY( \
+        "Options:" \
-        "If no device name is specified try to read from stdin.\n\n") \
+      "\n	-a	Get/set fs readahead" \
-        "Options:\n" \
+      "\n	-A	Set drive read-lookahead flag (0/1)" \
-        "	-a	Get/set fs readahead\n" \
+      "\n	-b	Get/set bus state (0 == off, 1 == on, 2 == tristate)" \
-        "	-A	Set drive read-lookahead flag (0/1)\n" \
+      "\n	-B	Set Advanced Power Management setting (1-255)" \
-        "	-b	Get/set bus state (0 == off, 1 == on, 2 == tristate)\n" \
+      "\n	-c	Get/set IDE 32-bit IO setting" \
-        "	-B	Set Advanced Power Management setting (1-255)\n" \
+      "\n	-C	Check IDE power mode status" \
-        "	-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") \
+      "\n	-d	Get/set using_dma flag") \
-        "	-D	Enable/disable drive defect-mgmt\n" \
+      "\n	-D	Enable/disable drive defect-mgmt" \
-        "	-f	Flush buffer cache for device on exit\n" \
+      "\n	-f	Flush buffer cache for device on exit" \
-        "	-g	Display drive geometry\n" \
+      "\n	-g	Display drive geometry" \
-        "	-h	Display terse usage information\n" \
+      "\n	-h	Display terse usage information" \
  	USE_FEATURE_HDPARM_GET_IDENTITY( \
-        "	-i	Display drive identification\n") \
+      "\n	-i	Display drive identification") \
  	USE_FEATURE_HDPARM_GET_IDENTITY( \
-        "	-I	Detailed/current information directly from drive\n") \
+      "\n	-I	Detailed/current information directly from drive") \
-        "	-k	Get/set keep_settings_over_reset flag (0/1)\n" \
+      "\n	-k	Get/set keep_settings_over_reset flag (0/1)" \
-        "	-K	Set drive keep_features_over_reset flag (0/1)\n" \
+      "\n	-K	Set drive keep_features_over_reset flag (0/1)" \
-        "	-L	Set drive doorlock (0/1) (removable harddisks only)\n" \
+      "\n	-L	Set drive doorlock (0/1) (removable harddisks only)" \
-        "	-m	Get/set multiple sector count\n" \
+      "\n	-m	Get/set multiple sector count" \
-        "	-n	Get/set ignore-write-errors flag (0/1)\n" \
+      "\n	-n	Get/set ignore-write-errors flag (0/1)" \
-        "	-p	Set PIO mode on IDE interface chipset (0,1,2,3,4,...)\n" \
+      "\n	-p	Set PIO mode on IDE interface chipset (0,1,2,3,4,...)" \
-        "	-P	Set drive prefetch count\n" \
+      "\n	-P	Set drive prefetch count" \
-        "	-q	Change next setting quietly\n" \
+ /*   "\n	-q	Change next setting quietly" - not supported ib bbox */ \
-        "	-Q	Get/set DMA tagged-queuing depth (if supported)\n" \
+      "\n	-Q	Get/set DMA tagged-queuing depth (if supported)" \
-        "	-r	Get/set readonly flag (DANGEROUS to set)\n" \
+      "\n	-r	Get/set readonly flag (DANGEROUS to set)" \
  	USE_FEATURE_HDPARM_HDIO_SCAN_HWIF( \
-        "	-R	Register an IDE interface (DANGEROUS)\n") \
+      "\n	-R	Register an IDE interface (DANGEROUS)") \
-        "	-S	Set standby (spindown) timeout\n" \
+      "\n	-S	Set standby (spindown) timeout" \
-        "	-t	Perform device read timings\n" \
+      "\n	-t	Perform device read timings" \
-        "	-T	Perform cache read timings\n" \
+      "\n	-T	Perform cache read timings" \
-        "	-u	Get/set unmaskirq flag (0/1)\n" \
+      "\n	-u	Get/set unmaskirq flag (0/1)" \
  	USE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF( \
-        "	-U	Un-register an IDE interface (DANGEROUS)\n") \
+      "\n	-U	Un-register an IDE interface (DANGEROUS)") \
-        "	-v	Defaults; same as -mcudkrag for IDE drives\n" \
+      "\n	-v	Defaults; same as -mcudkrag for IDE drives" \
-        "	-V	Display program version and exit immediately\n" \
+      "\n	-V	Display program version and exit immediately" \
  	USE_FEATURE_HDPARM_HDIO_DRIVE_RESET( \
-        "	-w	Perform device reset (DANGEROUS)\n") \
+      "\n	-w	Perform device reset (DANGEROUS)") \
-        "	-W	Set drive write-caching flag (0/1) (DANGEROUS)\n" \
+      "\n	-W	Set drive write-caching flag (0/1) (DANGEROUS)" \
  	USE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF( \
-        "	-x	Tristate device for hotswap (0/1) (DANGEROUS)\n") \
+      "\n	-x	Tristate device for hotswap (0/1) (DANGEROUS)") \
-        "	-X	Set IDE xfer mode (DANGEROUS)\n" \
+      "\n	-X	Set IDE xfer mode (DANGEROUS)" \
-        "	-y	Put IDE drive in standby mode\n" \
+      "\n	-y	Put IDE drive in standby mode" \
-        "	-Y	Put IDE drive to sleep\n" \
+      "\n	-Y	Put IDE drive to sleep" \
-        "	-Z	Disable Seagate auto-powersaving mode\n" \
+      "\n	-Z	Disable Seagate auto-powersaving mode" \
-        "	-z	Re-read partition table"
+      "\n	-z	Re-read partition table" \
  #define head_trivial_usage \
         "[OPTION]... [FILE]..."
- #define head_full_usage \
+ #define head_full_usage "\n\n" \
         "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." \
+        "file name. With no FILE, or when FILE is -, read standard input.\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
-        "\n	-n NUM	Print first NUM lines instead of first 10" \
+      "\n	-n NUM	Print first NUM lines instead of first 10" \
  	USE_FEATURE_FANCY_HEAD( \
-        "\n	-c NUM	Output the first NUM bytes" \
+      "\n	-c NUM	Output the first NUM bytes" \
-        "\n	-q	Never output headers giving file names" \
+      "\n	-q	Never output headers giving file names" \
-        "\n	-v	Always 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" \
         "daemon:x:1:1:daemon:/usr/sbin:/bin/sh\n"
  #define hexdump_trivial_usage \
-        "[-[bcCdefnosvx]] [OPTION] FILE"
+        "[-bcCdefnosvx" USE_FEATURE_HEXDUMP_REVERSE("R") "] FILE..."
- #define hexdump_full_usage \
+ #define hexdump_full_usage "\n\n" \
-        "Display file(s) or standard input in a user specified format" \
+        "Display file(s) or standard input in a user specified format\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-b		One-byte octal display\n" \
+      "\n	-b		One-byte octal display" \
-        "	-c		One-byte character display\n" \
+      "\n	-c		One-byte character display" \
-        "	-C		Canonical hex+ASCII, 16 bytes per line\n" \
+      "\n	-C		Canonical hex+ASCII, 16 bytes per line" \
-        "	-d		Two-byte decimal display\n" \
+      "\n	-d		Two-byte decimal display" \
-        "	-e FORMAT STRING\n" \
+      "\n	-e FORMAT STRING" \
-        "	-f FORMAT FILE\n" \
+      "\n	-f FORMAT FILE" \
-        "	-n LENGTH	Interpret only length bytes of input\n" \
+      "\n	-n LENGTH	Interpret only LENGTH bytes of input" \
-        "	-o		Two-byte octal display\n" \
+      "\n	-o		Two-byte octal display" \
-        "	-s OFFSET	Skip offset bytes\n" \
+      "\n	-s OFFSET	Skip OFFSET bytes" \
-        "	-v		Display all input data\n" \
+      "\n	-v		Display all input data" \
-        "	-x		Two-byte hexadecimal display"
+      "\n	-x		Two-byte hexadecimal display" \
+ 	USE_FEATURE_HEXDUMP_REVERSE( \
+      "\n	-R		Reverse of 'hexdump -Cv'") \
+ #define hd_trivial_usage \
+        "FILE..."
+ #define hd_full_usage "\n\n" \
+        "hd is an alias for hexdump -C"
  #define hostid_trivial_usage \
         ""
- #define hostid_full_usage \
+ #define hostid_full_usage "\n\n" \
         "Print out a unique 32-bit identifier for the machine"
  #define hostname_trivial_usage \
-        "[OPTION] {hostname | -F FILE}"
+        "[OPTION] [hostname | -F FILE]"
- #define hostname_full_usage \
+ #define hostname_full_usage "\n\n" \
-        "Get or set the hostname or DNS domain name. If a hostname is given\n" \
+        "Get or set hostname or DNS domain name\n" \
-        "(or FILE with the -F parameter), the host name will be set." \
+      "\nOptions:" \
-        "\n\nOptions:\n" \
+      "\n	-s	Short" \
-        "	-s	Short\n" \
+      "\n	-i	Addresses for the hostname" \
-        "	-i	Addresses for the hostname\n" \
+      "\n	-d	DNS domain name" \
-        "	-d	DNS domain name\n" \
+      "\n	-f	Fully qualified domain name" \
-        "	-f	Fully qualified domain name\n" \
+      "\n	-F FILE	Use the contents of FILE to specify the hostname" \
-        "	-F FILE	Use the contents of FILE to specify the hostname"
  #define hostname_example_usage \
         "$ hostname\n" \
         "sage\n"
  #define httpd_trivial_usage \
-        "[-c <conf file>]" \
+        "[-c conffile]" \
-        " [-p <port>]" \
+        " [-p [ip:]port]" \
-        " [-i] [-f]" \
+        " [-i] [-f] [-v[v]]" \
  	USE_FEATURE_HTTPD_SETUID(" [-u user[:grp]]") \
- 	USE_FEATURE_HTTPD_BASIC_AUTH(" [-r <realm>]") \
+ 	USE_FEATURE_HTTPD_BASIC_AUTH(" [-r realm]") \
  	USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \
         " [-h home]" \
-        " [-d/-e <string>]"
+        " [-d/-e string]"
- #define httpd_full_usage \
+ #define httpd_full_usage "\n\n" \
-        "Listen for incoming http server requests" \
+        "Listen for incoming HTTP requests\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c FILE		Specifies configuration file. (default httpd.conf)\n" \
+      "\n	-c FILE		Configuration file (default httpd.conf)" \
-        "	-p PORT		Server port (default 80)\n" \
+      "\n	-p [IP:]PORT	Bind to ip:port (default *:80)" \
-        "	-i		Assume that we are started from inetd\n" \
+      "\n	-i		Inetd mode" \
-        "	-f		Do not daemonize\n" \
+      "\n	-f		Do not daemonize" \
+      "\n	-v[v]		Verbose" \
  	USE_FEATURE_HTTPD_SETUID( \
-        "	-u USER[:GRP]	Set uid/gid after binding to port\n") \
+      "\n	-u USER[:GRP]	Set uid/gid after binding to port") \
  	USE_FEATURE_HTTPD_BASIC_AUTH( \
-        "	-r REALM	Authentication Realm for Basic Authentication\n") \
+      "\n	-r REALM	Authentication Realm for Basic Authentication") \
  	USE_FEATURE_HTTPD_AUTH_MD5( \
-        "	-m PASS		Crypt PASS with md5 algorithm\n") \
+      "\n	-m PASS		Crypt PASS with md5 algorithm") \
-        "	-h HOME		Specifies http HOME directory (default ./)\n" \
+      "\n	-h HOME		Home directory (default .)" \
-        "	-e STRING	HTML encode STRING\n" \
+      "\n	-e STRING	HTML encode STRING" \
-        "	-d STRING	URL decode STRING"
+      "\n	-d STRING	URL decode STRING" \
  #define hwclock_trivial_usage \
-        "[-r|--show] [-s|--hctosys] [-w|--systohc] [-l|--localtime] [-u|--utc]"
+ 	USE_FEATURE_HWCLOCK_LONG_OPTIONS( \
- #define hwclock_full_usage \
+        "[-r|--show] [-s|--hctosys] [-w|--systohc]" \
-        "Query and set the hardware clock (RTC)" \
+        " [-l|--localtime] [-u|--utc]" \
-        "\n\nOptions:\n" \
+        " [-f FILE]" \
-        "	-r	Read hardware clock and print result\n" \
+ 	) \
-        "	-s	Set the system time from the hardware clock\n" \
+ 	SKIP_FEATURE_HWCLOCK_LONG_OPTIONS( \
-        "	-w	Set the hardware clock to the current system time\n" \
+        "[-r] [-s] [-w] [-l] [-u] [-f FILE]" \
-        "	-u	The hardware clock is kept in coordinated universal time\n" \
+ 	)
-        "	-l	The hardware clock is kept in local time"
+ #define hwclock_full_usage "\n\n" \
+        "Query and set hardware clock (RTC)\n" \
+      "\nOptions:" \
+      "\n	-r	Show hardware clock time" \
+      "\n	-s	Set system time from hardware clock" \
+      "\n	-w	Set hardware clock to system time" \
+      "\n	-u	Hardware clock is in UTC" \
+      "\n	-l	Hardware clock is in local time" \
+      "\n	-f FILE	Use specified device (e.g. /dev/rtc2)" \
  #define id_trivial_usage \
-        "[OPTIONS]... [USERNAME]"
+        "[OPTIONS]... [USER]"
- #define id_full_usage \
+ #define id_full_usage "\n\n" \
-        "Print information for USERNAME or the current user" \
+        "Print information about USER or the current user\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
  	USE_SELINUX( \
-        "	-c	Prints only the security context\n") \
+      "\n	-Z	Print the security context" \
-        "	-g	Prints only the group ID\n" \
+ 	) \
-        "	-u	Prints only the user ID\n" \
+      "\n	-u	Print user ID" \
-        "	-n	Print a name instead of a number\n" \
+      "\n	-g	Print group ID" \
-        "	-r	Prints the real user ID instead of the effective ID"
+      "\n	-G	Print supplementary group IDs" \
+      "\n	-n	Print name instead of a number" \
+      "\n	-r	Print real user ID instead of effective ID" \
  #define id_example_usage \
         "$ id\n" \
         "uid=1000(andersen) gid=1000(andersen)\n"
  #define ifconfig_trivial_usage \
- 	USE_FEATURE_IFCONFIG_STATUS("[-a]") " <interface> [<address>]"
+ 	USE_FEATURE_IFCONFIG_STATUS("[-a]") " interface [address]"
- #define ifconfig_full_usage \
+ #define ifconfig_full_usage "\n\n" \
-        "Configure a network interface" \
+        "Configure a network interface\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
+      "\n" \
  	USE_FEATURE_IPV6( \
-        "	[add <address>[/<prefixlen>]]\n") \
+        "	[add ADDRESS[/PREFIXLEN]]\n") \
  	USE_FEATURE_IPV6( \
-        "	[del <address>[/<prefixlen>]]\n") \
+        "	[del ADDRESS[/PREFIXLEN]]\n") \
-        "	[[-]broadcast [<address>]] [[-]pointopoint [<address>]]\n" \
+        "	[[-]broadcast [ADDRESS]] [[-]pointopoint [ADDRESS]]\n" \
-        "	[netmask <address>] [dstaddr <address>]\n" \
+        "	[netmask ADDRESS] [dstaddr ADDRESS]\n" \
  	USE_FEATURE_IFCONFIG_SLIP( \
-        "	[outfill <NN>] [keepalive <NN>]\n") \
+        "	[outfill NN] [keepalive NN]\n") \
-        "	" USE_FEATURE_IFCONFIG_HW("[hw ether <address>] ") "[metric <NN>] [mtu <NN>]\n" \
+        "	" USE_FEATURE_IFCONFIG_HW("[hw ether" USE_FEATURE_HWIB("|infiniband")" ADDRESS] ") "[metric NN] [mtu NN]\n" \
         "	[[-]trailers] [[-]arp] [[-]allmulti]\n" \
-        "	[multicast] [[-]promisc] [txqueuelen <NN>] [[-]dynamic]\n" \
+        "	[multicast] [[-]promisc] [txqueuelen NN] [[-]dynamic]\n" \
  	USE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ( \
-        "	[mem_start <NN>] [io_addr <NN>] [irq <NN>]\n") \
+        "	[mem_start NN] [io_addr NN] [irq NN]\n") \
         "	[up|down] ..."
+ #define ifenslave_trivial_usage \
+        "[-cdf] master-iface <slave-iface...>"
+ #define ifenslave_full_usage "\n\n" \
+        "Configure network interfaces for parallel routing\n" \
+      "\nOptions:" \
+      "\n	-c, --change-active	Change active slave" \
+      "\n	-d, --detach		Remove slave interface from bonding device" \
+      "\n	-f, --force		Force, even if interface is not Ethernet" \
+ /*   "\n	-r, --receive-slave	Create a receive-only slave" */
+ #define ifenslave_example_usage \
+        "To create a bond device, simply follow these three steps :\n" \
+        "- ensure that the required drivers are properly loaded :\n" \
+        "  # modprobe bonding ; modprobe <3c59x|eepro100|pcnet32|tulip|...>\n" \
+        "- assign an IP address to the bond device :\n" \
+        "  # ifconfig bond0 <addr> netmask <mask> broadcast <bcast>\n" \
+        "- attach all the interfaces you need to the bond device :\n" \
+        "  # ifenslave bond0 eth0 eth1 eth2\n" \
+        "  If bond0 didn't have a MAC address, it will take eth0's. Then, all\n" \
+        "  interfaces attached AFTER this assignment will get the same MAC addr.\n\n" \
+        "  To detach a dead interface without setting the bond device down :\n" \
+        "   # ifenslave -d bond0 eth1\n\n" \
+        "  To set the bond device down and automatically release all the slaves :\n" \
+        "   # ifconfig bond0 down\n\n" \
+        "  To change active slave :\n" \
+        "   # ifenslave -c bond0 eth0\n" \
  #define ifup_trivial_usage \
-        "<-ahinv> <ifaces...>"
+        "[-ain"USE_FEATURE_IFUPDOWN_MAPPING("m")"vf] ifaces..."
- #define ifup_full_usage \
+ #define ifup_full_usage "\n\n" \
-        "Options:\n" \
+        "Options:" \
-        "	-a	De/configure all interfaces automatically\n" \
+      "\n	-a	De/configure all interfaces automatically" \
-        "	-i FILE	Use FILE for interface definitions\n" \
+      "\n	-i FILE	Use FILE for interface definitions" \
-        "	-n	Print out what would happen, but don't do it\n" \
+      "\n	-n	Print out what would happen, but don't do it" \
-        "		(note that this option doesn't disable mappings)\n" \
+ 	USE_FEATURE_IFUPDOWN_MAPPING( \
-        "	-v	Print out what would happen before doing it\n" \
+      "\n		(note: doesn't disable mappings)" \
-        "	-m	Don't run any mappings\n" \
+      "\n	-m	Don't run any mappings" \
-        "	-f	Force de/configuration"
+ 	) \
+      "\n	-v	Print out what would happen before doing it" \
+      "\n	-f	Force de/configuration" \
  #define ifdown_trivial_usage \
-        "<-ahinv> <ifaces...>"
+        "[-ain"USE_FEATURE_IFUPDOWN_MAPPING("m")"vf] ifaces..."
- #define ifdown_full_usage \
+ #define ifdown_full_usage "\n\n" \
-        "Options:\n" \
+        "Options:" \
-        "	-a	De/configure all interfaces automatically\n" \
+      "\n	-a	De/configure all interfaces automatically" \
-        "	-i FILE	Use FILE for interface definitions\n" \
+      "\n	-i FILE	Use FILE for interface definitions" \
-        "	-n	Print out what would happen, but don't do it\n" \
+      "\n	-n	Print out what would happen, but don't do it" \
-        "		(note that this option doesn't disable mappings)\n" \
+ 	USE_FEATURE_IFUPDOWN_MAPPING( \
-        "	-v	Print out what would happen before doing it\n" \
+      "\n		(note: doesn't disable mappings)" \
-        "	-m	Don't run any mappings\n" \
+      "\n	-m	Don't run any mappings" \
-        "	-f	Force de/configuration"
+ 	) \
+      "\n	-v	Print out what would happen before doing it" \
+      "\n	-f	Force de/configuration" \
  #define inetd_trivial_usage \
-        "[-f] [-q len] [conf]"
+        "[-fe] [-q N] [-R N] [CONFFILE]"
- #define inetd_full_usage \
+ #define inetd_full_usage "\n\n" \
-        "Listen for network connections and launch programs" \
+        "Listen for network connections and launch programs\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-f	Run in foreground\n" \
+      "\n	-f	Run in foreground" \
-        "	-q N	Set the size of the socket listen queue to N\n" \
+      "\n	-e	Log to stderr" \
-        "		(default: 128)"
+      "\n	-q N    Socket listen queue (default: 128)" \
+      "\n	-R N	Pause services after N connects/min" \
+      "\n		(default: 0 - disabled)" \
  #define init_trivial_usage \
         ""
- #define init_full_usage \
+ #define init_full_usage "\n\n" \
         "Init is the parent of all processes"
  #define init_notes_usage \
  "This version of init is designed to be run only by the kernel.\n" \
  "\n" \
- "BusyBox init doesn't support multiple runlevels.  The runlevels field of\n" \
+ "BusyBox init doesn't support multiple runlevels. The runlevels field of\n" \
  "the /etc/inittab file is completely ignored by BusyBox init. If you want\n" \
  "runlevels, use sysvinit.\n" \
  "\n" \
- "BusyBox init works just fine without an inittab.  If no inittab is found,\n" \
+ "BusyBox init works just fine without an inittab. If no inittab is found,\n" \
  "it has the following default behavior:\n" \
  "\n" \
  "	::sysinit:/etc/init.d/rcS\n" \
-Line 1389
+Line 1737
  "\n" \
  "		WARNING: This field has a non-traditional meaning for BusyBox init!\n" \
  "		The id field is used by BusyBox init to specify the controlling tty for\n" \
- "		the specified process to run on.  The contents of this field are\n" \
+ "		the specified process to run on. The contents of this field are\n" \
- "		appended to \"/dev/\" and used as-is.  There is no need for this field to\n" \
+ "		appended to \"/dev/\" and used as-is. There is no need for this field to\n" \
- "		be unique, although if it isn't you may have strange results.  If this\n" \
+ "		be unique, although if it isn't you may have strange results. If this\n" \
- "		field is left blank, the controlling tty is set to the console.  Also\n" \
+ "		field is left blank, the controlling tty is set to the console. Also\n" \
  "		note that if BusyBox detects that a serial console is in use, then only\n" \
  "		entries whose controlling tty is either the serial console or /dev/null\n" \
- "		will be run.  BusyBox init does nothing with utmp.  We don't need no\n" \
+ "		will be run. BusyBox init does nothing with utmp. We don't need no\n" \
  "		stinkin' utmp.\n" \
  "\n" \
  "	<runlevels>:\n" \
-Line 1413
+Line 1761
  "\n" \
  "		Run only-once actions:\n" \
  "\n" \
- "			'sysinit' is the first item run on boot.  init waits until all\n" \
+ "			'sysinit' is the first item run on boot. init waits until all\n" \
- "			sysinit actions are completed before continuing.  Following the\n" \
+ "			sysinit actions are completed before continuing. Following the\n" \
  "			completion of all sysinit actions, all 'wait' actions are run.\n" \
  "			'wait' actions, like 'sysinit' actions, cause init to wait until\n" \
- "			the specified task completes.  'once' actions are asynchronous,\n" \
+ "			the specified task completes. 'once' actions are asynchronous,\n" \
- "			therefore, init does not wait for them to complete.  'restart' is\n" \
+ "			therefore, init does not wait for them to complete. 'restart' is\n" \
- "			the action taken to restart the init process.  By default this should\n" \
+ "			the action taken to restart the init process. By default this should\n" \
  "			simply run /sbin/init, but can be a script which runs pivot_root or it\n" \
- "			can do all sorts of other interesting things.  The 'ctrlaltdel' init\n" \
+ "			can do all sorts of other interesting things. The 'ctrlaltdel' init\n" \
  "			actions are run when the system detects that someone on the system\n" \
- "			console has pressed the CTRL-ALT-DEL key combination.  Typically one\n" \
+ "			console has pressed the CTRL-ALT-DEL key combination. Typically one\n" \
  "			wants to run 'reboot' at this point to cause the system to reboot.\n" \
  "			Finally the 'shutdown' action specifies the actions to taken when\n" \
- "			init is told to reboot.  Unmounting filesystems and disabling swap\n" \
+ "			init is told to reboot. Unmounting filesystems and disabling swap\n" \
  "			is a very good here.\n" \
  "\n" \
  "		Run repeatedly actions:\n" \
  "\n" \
- "			'respawn' actions are run after the 'once' actions.  When a process\n" \
+ "			'respawn' actions are run after the 'once' actions. When a process\n" \
  "			started with a 'respawn' action exits, init automatically restarts\n" \
- "			it.  Unlike sysvinit, BusyBox init does not stop processes from\n" \
+ "			it. Unlike sysvinit, BusyBox init does not stop processes from\n" \
- "			respawning out of control.  The 'askfirst' actions acts just like\n" \
+ "			respawning out of control. The 'askfirst' actions acts just like\n" \
  "			respawn, except that before running the specified process it\n" \
  "			displays the line \"Please press Enter to activate this console.\"\n" \
  "			and then waits for the user to press enter before starting the\n" \
  "			specified process.\n" \
  "\n" \
  "		Unrecognized actions (like initdefault) will cause init to emit an\n" \
- "		error message, and then go along with its business.  All actions are\n" \
+ "		error message, and then go along with its business. All actions are\n" \
  "		run in the order they appear in /etc/inittab.\n" \
  "\n" \
  "	<process>:\n" \
-Line 1485
+Line 1833
  "	::shutdown:/bin/umount -a -r\n" \
  "	::shutdown:/sbin/swapoff -a\n"
+ #define inotifyd_trivial_usage \
+ 	"/user/space/agent dir/or/file/being/watched[:mask] ..."
+ #define inotifyd_full_usage "\n\n" \
+        "Spawn userspace agent on filesystem changes." \
+      "\nWhen a filesystem event matching the mask occurs" \
+      "\non specified file/directory an userspace agent is spawned" \
+      "\nwith the parameters:" \
+      "\n1. actual event(s)" \
+      "\n2. file/directory name" \
+      "\n3. name of subfile (if any), in case of watching a directory" \
+      "\n" \
+      "\n	a	File is accessed" \
+      "\n	c	File is modified" \
+      "\n	e	Metadata changed" \
+      "\n	w	Writtable file is closed" \
+      "\n	0	Unwrittable file is closed" \
+      "\n	r	File is opened" \
+      "\n	m	File is moved from X" \
+      "\n	y	File is moved to Y" \
+      "\n	n	Subfile is created" \
+      "\n	d	Subfile is deleted" \
+      "\n	D	Self is deleted" \
+      "\n	M	Self is moved" \
  #define insmod_trivial_usage \
-        "[OPTION]... MODULE [symbol=value]..."
+ 	USE_FEATURE_2_4_MODULES("[OPTION]... ") "MODULE [symbol=value]..."
- #define insmod_full_usage \
+ #define insmod_full_usage "\n\n" \
         "Load the specified kernel modules into the kernel" \
-        "\n\nOptions:\n" \
+ 	USE_FEATURE_2_4_MODULES( "\n" \
-        "	-f	Force module to load into the wrong kernel version\n" \
+      "\nOptions:" \
-        "	-k	Make module autoclean-able\n" \
+      "\n	-f	Force module to load into the wrong kernel version" \
-        "	-v	Verbose output\n"  \
+      "\n	-k	Make module autoclean-able" \
-        "	-q	Quiet output\n" \
+      "\n	-v	Verbose" \
-        "	-L	Lock to prevent simultaneous loads of a module\n" \
+      "\n	-q	Quiet" \
+      "\n	-L	Lock to prevent simultaneous loads of a module" \
  	USE_FEATURE_INSMOD_LOAD_MAP( \
-        "	-m	Output load map to stdout\n") \
+      "\n	-m	Output load map to stdout" \
-        "	-o NAME	Set internal module name to NAME\n" \
+ 	) \
-        "	-x	Do not export externs"
+      "\n	-o NAME	Set internal module name to NAME" \
+      "\n	-x	Do not export externs" \
+ 	)
+ /* -v, -b, -c are ignored */
  #define install_trivial_usage \
-        "[-cgmops] [sources] <dest|directory>"
+        "[-cdDsp] [-o USER] [-g GRP] [-m MODE] [source] dest|directory"
- #define install_full_usage \
+ #define install_full_usage "\n\n" \
-        "Copy files and set attributes" \
+        "Copy files and set attributes\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c	Copy the file, default\n" \
+      "\n	-c	Just copy (default)" \
-        "	-d	Create directories\n" \
+      "\n	-d	Create directories" \
-        "	-g	Set group ownership\n" \
+      "\n	-D	Create leading target directories" \
-        "	-m	Set permission modes\n" \
+      "\n	-s	Strip symbol table" \
-        "	-o	Set ownership\n" \
+      "\n	-p	Preserve date" \
-        "	-p	Preserve date\n" \
+      "\n	-o USER	Set ownership" \
-        "	-s	Strip symbol tables"
+      "\n	-g GRP	Set group ownership" \
+      "\n	-m MODE	Set permissions" \
+ 	USE_SELINUX( \
+      "\n	-Z	Set security context" \
+ 	)
+ /* would need to make the " | " optional depending on more than one selected: */
  #define ip_trivial_usage \
-        "[OPTIONS] {address | link | route | tunnel | rule} {COMMAND}"
+        "[OPTIONS] {" \
- #define ip_full_usage \
+ 	USE_FEATURE_IP_ADDRESS("address | ") \
+ 	USE_FEATURE_IP_ROUTE("route | ") \
+ 	USE_FEATURE_IP_LINK("link | ") \
+ 	USE_FEATURE_IP_TUNNEL("tunnel | ") \
+ 	USE_FEATURE_IP_RULE("rule") \
+        "} {COMMAND}"
+ #define ip_full_usage "\n\n" \
         "ip [OPTIONS] OBJECT {COMMAND}\n" \
-        "where  OBJECT := {link | addr | route | tunnel |rule}\n" \
+        "where OBJECT := {" \
-        "OPTIONS := { -f[amily] { inet | inet6 | link } | -o[neline] }"
+ 	USE_FEATURE_IP_ADDRESS("address | ") \
+ 	USE_FEATURE_IP_ROUTE("route | ") \
+ 	USE_FEATURE_IP_LINK("link | ") \
+ 	USE_FEATURE_IP_TUNNEL("tunnel | ") \
+ 	USE_FEATURE_IP_RULE("rule") \
+        "}\n" \
+        "OPTIONS := { -f[amily] { inet | inet6 | link } | -o[neline] }" \
  #define ipaddr_trivial_usage \
         "{ {add|del} IFADDR dev STRING | {show|flush}\n" \
-        "		[ dev STRING ] [ to PREFIX ] }"
+        "		[dev STRING] [to PREFIX] }"
- #define ipaddr_full_usage \
+ #define ipaddr_full_usage "\n\n" \
         "ipaddr {add|delete} IFADDR dev STRING\n" \
-        "ipaddr {show|flush} [ dev STRING ] [ scope SCOPE-ID ]\n" \
+        "ipaddr {show|flush} [dev STRING] [scope SCOPE-ID]\n" \
-        "	[ to PREFIX ] [ label PATTERN ]\n" \
+        "	[to PREFIX] [label PATTERN]\n" \
         "	IFADDR := PREFIX | ADDR peer PREFIX\n" \
-        "	[ broadcast ADDR ] [ anycast ADDR ]\n" \
+        "	[broadcast ADDR] [anycast ADDR]\n" \
-        "	[ label STRING ] [ scope SCOPE-ID ]\n" \
+        "	[label STRING] [scope SCOPE-ID]\n" \
-        "	SCOPE-ID := [ host | link | global | NUMBER ]"
+        "	SCOPE-ID := [host | link | global | NUMBER]" \
  #define ipcalc_trivial_usage \
-        "[OPTION]... <ADDRESS>[[/]<NETMASK>] [NETMASK]"
+        "[OPTION]... ADDRESS[[/]NETMASK] [NETMASK]"
- #define ipcalc_full_usage \
+ #define ipcalc_full_usage "\n\n" \
-        "Calculate IP network settings from a IP address" \
+        "Calculate IP network settings from a IP address\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
-        "\n	-b	--broadcast	Display calculated broadcast address" \
+ 	USE_FEATURE_IPCALC_LONG_OPTIONS( \
-        "\n	-n	--network	Display calculated network address" \
+      "\n	-b,--broadcast	Display calculated broadcast address" \
-        "\n	-m	--netmask	Display default netmask for IP" \
+      "\n	-n,--network	Display calculated network address" \
+      "\n	-m,--netmask	Display default netmask for IP" \
+ 	USE_FEATURE_IPCALC_FANCY( \
+      "\n	-p,--prefix	Display the prefix for IP/NETMASK" \
+      "\n	-h,--hostname	Display first resolved host name" \
+      "\n	-s,--silent	Don't ever display error messages" \
+ 	) \
+ 	) \
+ 	SKIP_FEATURE_IPCALC_LONG_OPTIONS( \
+      "\n	-b	Display calculated broadcast address" \
+      "\n	-n	Display calculated network address" \
+      "\n	-m	Display default netmask for IP" \
  	USE_FEATURE_IPCALC_FANCY( \
-        "\n	-p	--prefix	Display the prefix for IP/NETMASK" \
+      "\n	-p	Display the prefix for IP/NETMASK" \
-        "\n	-h	--hostname	Display first resolved host name" \
+      "\n	-h	Display first resolved host name" \
-        "\n	-s	--silent	Don't ever display error messages")
+      "\n	-s	Don't ever display error messages" \
+ 	) \
+ 	)
  #define ipcrm_trivial_usage \
-        "[-[MQS] key] [-[mqs] id]"
+        "[-MQS key] [-mqs id]"
- #define ipcrm_full_usage \
+ #define ipcrm_full_usage "\n\n" \
-        "The upper-case options MQS are used to remove a shared memory segment by a\n" \
+        "Upper-case options MQS remove an object by shmkey value.\n" \
-        "segment by a shmkey value. The lower-case options mqs are used\n" \
+        "Lower-case options remove an object by shmid value.\n" \
-        "to remove a segment by shmid value.\n" \
+      "\nOptions:" \
-        "\n\nOptions:\n" \
+      "\n	-mM	Remove memory segment after last detach" \
-        "	-[mM]	Remove the memory segment after the last detach\n" \
+      "\n	-qQ	Remove message queue" \
-        "	-[qQ]	Remove the message queue\n" \
+      "\n	-sS	Remove semaphore" \
-        "	-[sS]	Remove the semaphore"
  #define ipcs_trivial_usage \
         "[[-smq] -i shmid] | [[-asmq] [-tcplu]]"
- #define ipcs_full_usage \
+ #define ipcs_full_usage "\n\n" \
-        "	-i	Specify a specific resource id\n" \
+        "	-i	Show specific resource" \
-        "Resource specification:\n" \
+      "\nResource specification:" \
-        "	-m	Shared memory segments\n" \
+      "\n	-m	Shared memory segments" \
-        "	-q	Message queues\n" \
+      "\n	-q	Message queues" \
-        "	-s	Semaphore arrays\n" \
+      "\n	-s	Semaphore arrays" \
-        "	-a	All (default)\n" \
+      "\n	-a	All (default)" \
-        "Output format:\n" \
+      "\nOutput format:" \
-        "	-t	Time\n" \
+      "\n	-t	Time" \
-        "	-c	Creator\n" \
+      "\n	-c	Creator" \
-        "	-p	Pid\n" \
+      "\n	-p	Pid" \
-        "	-l	Limits\n" \
+      "\n	-l	Limits" \
-        "	-u	Summary"
+      "\n	-u	Summary" \
  #define iplink_trivial_usage \
-        "{ set DEVICE { up | down | arp { on | off } | show [ DEVICE ] }"
+        "{ set DEVICE { up | down | arp { on | off } | show [DEVICE] }"
- #define iplink_full_usage \
+ #define iplink_full_usage "\n\n" \
-        "iplink set DEVICE { up | down | arp { on | off } |\n" \
+        "iplink set DEVICE { up | down | arp | multicast { on | off } |\n" \
         "			dynamic { on | off } |\n" \
         "			mtu MTU }\n" \
-        "iplink show [ DEVICE ]"
+        "iplink show [DEVICE]" \
  #define iproute_trivial_usage \
         "{ list | flush | { add | del | change | append |\n" \
         "		replace | monitor } ROUTE }"
- #define iproute_full_usage \
+ #define iproute_full_usage "\n\n" \
         "iproute { list | flush } SELECTOR\n" \
-        "iproute get ADDRESS [ from ADDRESS iif STRING ]\n" \
+        "iproute get ADDRESS [from ADDRESS iif STRING]\n" \
-        "			[ oif STRING ]  [ tos TOS ]\n" \
+        "			[oif STRING]  [tos TOS]\n" \
         "iproute { add | del | change | append | replace | monitor } ROUTE\n" \
-        "			SELECTOR := [ root PREFIX ] [ match PREFIX ] [ proto RTPROTO ]\n" \
+        "			SELECTOR := [root PREFIX] [match PREFIX] [proto RTPROTO]\n" \
-        "			ROUTE := [ TYPE ] PREFIX [ tos TOS ] [ proto RTPROTO ]"
+        "			ROUTE := [TYPE] PREFIX [tos TOS] [proto RTPROTO]\n" \
+        "				[metric METRIC]" \
  #define iprule_trivial_usage \
-        "{[ list | add | del ] RULE}"
+        "{[list | add | del] RULE}"
- #define iprule_full_usage \
+ #define iprule_full_usage "\n\n" \
-        "iprule [ list | add | del ] SELECTOR ACTION\n" \
+        "iprule [list | add | del] SELECTOR ACTION\n" \
-        "	SELECTOR := [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK ]\n" \
+        "	SELECTOR := [from PREFIX] [to PREFIX] [tos TOS] [fwmark FWMARK]\n" \
-        "			[ dev STRING ] [ pref NUMBER ]\n" \
+        "			[dev STRING] [pref NUMBER]\n" \
-        "	ACTION := [ table TABLE_ID ] [ nat ADDRESS ]\n" \
+        "	ACTION := [table TABLE_ID] [nat ADDRESS]\n" \
-        "			[ prohibit | reject | unreachable ]\n" \
+        "			[prohibit | reject | unreachable]\n" \
-        "			[ realms [SRCREALM/]DSTREALM ]\n" \
+        "			[realms [SRCREALM/]DSTREALM]\n" \
-        "	TABLE_ID := [ local | main | default | NUMBER ]"
+        "	TABLE_ID := [local | main | default | NUMBER]" \
  #define iptunnel_trivial_usage \
-        "{ add | change | del | show } [ NAME ]\n" \
+        "{ add | change | del | show } [NAME]\n" \
-        "	[ mode { ipip | gre | sit } ]\n" \
+        "	[mode { ipip | gre | sit }]\n" \
-        "	[ remote ADDR ] [ local ADDR ] [ ttl TTL ]"
+        "	[remote ADDR] [local ADDR] [ttl TTL]"
- #define iptunnel_full_usage \
+ #define iptunnel_full_usage "\n\n" \
-        "iptunnel { add | change | del | show } [ NAME ]\n" \
+        "iptunnel { add | change | del | show } [NAME]\n" \
-        "	[ mode { ipip | gre | sit } ] [ remote ADDR ] [ local ADDR ]\n" \
+        "	[mode { ipip | gre | sit }] [remote ADDR] [local ADDR]\n" \
-        "	[ [i|o]seq ] [ [i|o]key KEY ] [ [i|o]csum ]\n" \
+        "	[[i|o]seq] [[i|o]key KEY] [[i|o]csum]\n" \
-        "	[ ttl TTL ] [ tos TOS ] [ [no]pmtudisc ] [ dev PHYS_DEV ]"
+        "	[ttl TTL] [tos TOS] [[no]pmtudisc] [dev PHYS_DEV]" \
+ #define kbd_mode_trivial_usage \
+        "[-a|k|s|u] [-C TTY]"
+ #define kbd_mode_full_usage "\n\n" \
+        "Report or set the keyboard mode\n" \
+      "\nOptions set mode:" \
+      "\n	-a	Default (ASCII)" \
+      "\n	-k	Medium-raw (keyboard)" \
+      "\n	-s	Raw (scancode)" \
+      "\n	-u	Unicode (utf-8)" \
+      "\n	-C TTY	Affect TTY instead of /dev/tty" \
  #define kill_trivial_usage \
-        "[-l] [-signal] process-id [process-id ...]"
+        "[-l] [-SIG] PID..."
- #define kill_full_usage \
+ #define kill_full_usage "\n\n" \
-        "Send a signal (default is TERM) to the specified process(es)" \
+        "Send a signal (default is TERM) to given PIDs\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-l	List all signal names and numbers"
+      "\n	-l	List all signal names and numbers" \
+ /*   "\n	-s SIG	Yet another way of specifying SIG" */ \
  #define kill_example_usage \
         "$ ps | grep apache\n" \
         "252 root     root     S [apache]\n" \
-Line 1629
+Line 2048
         "$ kill 252\n"
  #define killall_trivial_usage \
-        "[-l] [-q] [-signal] process-name [process-name ...]"
+        "[-l] [-q] [-SIG] process-name..."
- #define killall_full_usage \
+ #define killall_full_usage "\n\n" \
-        "Send a signal (default is TERM) to the specified process(es)" \
+        "Send a signal (default is TERM) to given processes\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-l	List all signal names and numbers\n" \
+      "\n	-l	List all signal names and numbers" \
-        "	-q	Do not complain if no processes were killed"
+ /*   "\n	-s SIG	Yet another way of specifying SIG" */ \
+      "\n	-q	Do not complain if no processes were killed" \
  #define killall_example_usage \
         "$ killall apache\n"
  #define killall5_trivial_usage \
-        "[-l] [-signal]"
+        "[-l] [-SIG]"
- #define killall5_full_usage \
+ #define killall5_full_usage "\n\n" \
-        "Send a signal (default is TERM) to all processes outside current session" \
+        "Send a signal (default is TERM) to all processes outside current session\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-l	List all signal names and numbers\n" \
+      "\n	-l	List all signal names and numbers" \
+ /*   "\n	-s SIG	Yet another way of specifying SIG" */ \
  #define klogd_trivial_usage \
-        "[-c n] [-n]"
+        "[-c N] [-n]"
- #define klogd_full_usage \
+ #define klogd_full_usage "\n\n" \
-        "Kernel logger" \
+        "Kernel logger\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c n	Sets the default log level of console messages to n\n" \
+      "\n	-c N	Only messages with level < N are printed to console" \
-        "	-n	Run as foreground process"
+      "\n	-n	Run in foreground" \
  #define length_trivial_usage \
         "STRING"
- #define length_full_usage \
+ #define length_full_usage "\n\n" \
-        "Print out the length of the specified STRING"
+        "Print STRING's length"
  #define length_example_usage \
         "$ length Hello\n" \
         "5\n"
  #define less_trivial_usage \
-        "[-EMNmh~?] FILE1 FILE2..."
+        "[-EMNmh~I?] [FILE...]"
- #define less_full_usage \
+ #define less_full_usage "\n\n" \
         "View a file or list of files. The position within files can be\n" \
-        "changed, and files can be manipulated in various ways." \
+        "changed, and files can be manipulated in various ways.\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-E	Quit once the end of a file is reached\n" \
+      "\n	-E	Quit once the end of a file is reached" \
-        "	-M	Display a status line containing the current line numbers\n" \
+      "\n	-M,-m	Display a status line containing the line numbers" \
-        "		and the percentage through the file\n" \
+      "\n		and percentage through the file" \
-        "	-N	Prefix line numbers to each line\n" \
+      "\n	-N	Prefix line numbers to each line" \
-        "	-m	Display a status line containing the percentage through the\n" \
+      "\n	-I	Ignore case in all searches" \
-        "		file\n" \
+      "\n	-~	Suppress ~s displayed past the end of the file" \
-        "	-~	Suppress ~s displayed when input past the end of the file is\n" \
-        "		reached"
+ #define linux32_trivial_usage NOUSAGE_STR
+ #define linux32_full_usage ""
+ #define linux64_trivial_usage NOUSAGE_STR
+ #define linux64_full_usage ""
+ #define linuxrc_trivial_usage NOUSAGE_STR
+ #define linuxrc_full_usage ""
  #define setarch_trivial_usage \
-        "<personality> <program> [args ...]"
+        "personality program [args...]"
- #define setarch_full_usage \
+ #define setarch_full_usage "\n\n" \
         "Personality may be:\n" \
         "	linux32		Set 32bit uname emulation\n" \
-        "	linux64		Set 64bit uname emulation"
+        "	linux64		Set 64bit uname emulation" \
  #define ln_trivial_usage \
         "[OPTION] TARGET... LINK_NAME|DIRECTORY"
- #define ln_full_usage \
+ #define ln_full_usage "\n\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." \
+        "Use '--' to indicate that all following arguments are non-options.\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-s	Make symbolic links instead of hard links\n" \
+      "\n	-s	Make symlinks instead of hardlinks" \
-        "	-f	Remove existing destination files\n" \
+      "\n	-f	Remove existing destination files" \
-        "	-n	No dereference symlinks - treat like normal file\n" \
+      "\n	-n	Don't dereference symlinks - treat like normal file" \
-        "	-b	Make a backup of the target (if exists) before link operation\n" \
+      "\n	-b	Make a backup of the target (if exists) before link operation" \
-        "	-S suf	Use suffix instead of ~ when making backup files"
+      "\n	-S suf	Use suffix instead of ~ when making backup files" \
  #define ln_example_usage \
         "$ ln -s BusyBox /tmp/ls\n" \
         "$ ls -l /tmp/ls\n" \
         "lrwxrwxrwx    1 root     root            7 Apr 12 18:39 ls -> BusyBox*\n"
+ #define load_policy_trivial_usage NOUSAGE_STR
+ #define load_policy_full_usage ""
  #define loadfont_trivial_usage \
         "< font"
- #define loadfont_full_usage \
+ #define loadfont_full_usage "\n\n" \
-        "Load a console font from standard input"
+        "Load a console font from standard input" \
+ /*   "\n	-C TTY	Affect TTY instead of /dev/tty" */ \
  #define loadfont_example_usage \
         "$ loadfont < /etc/i18n/fontname\n"
  #define loadkmap_trivial_usage \
         "< keymap"
- #define loadkmap_full_usage \
+ #define loadkmap_full_usage "\n\n" \
-        "Load a binary keyboard translation table from standard input"
+        "Load a binary keyboard translation table from standard input\n" \
+ /*   "\n	-C TTY	Affect TTY instead of /dev/tty" */ \
  #define loadkmap_example_usage \
         "$ loadkmap < /etc/i18n/lang-keymap\n"
  #define logger_trivial_usage \
         "[OPTION]... [MESSAGE]"
- #define logger_full_usage \
+ #define logger_full_usage "\n\n" \
-        "Write MESSAGE to the system log.  If MESSAGE is omitted, log stdin." \
+        "Write MESSAGE to the system log. If MESSAGE is omitted, log stdin.\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-s	Log to stderr as well as the system log\n" \
+      "\n	-s	Log to stderr as well as the system log" \
-        "	-t TAG	Log using the specified tag (defaults to user name)\n" \
+      "\n	-t TAG	Log using the specified tag (defaults to user name)" \
-        "	-p PRIO	Enter the message with the specified priority.\n" \
+      "\n	-p PRIO	Priority (numeric or facility.level pair)" \
-        "		This may be numerical or a 'facility.level' pair."
  #define logger_example_usage \
         "$ logger \"hello\"\n"
  #define login_trivial_usage \
-        "[OPTION]... [username] [ENV=VAR ...]"
+        "[-p] [-h HOST] [[-f] USER]"
- #define login_full_usage \
+ #define login_full_usage "\n\n" \
-        "Begin a new session on the system" \
+        "Begin a new session on the system\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-f	Do not authenticate (user already authenticated)\n" \
+      "\n	-f	Do not authenticate (user already authenticated)" \
-        "	-h	Name of the remote host for this login\n" \
+      "\n	-h	Name of the remote host" \
-        "	-p	Preserve environment"
+      "\n	-p	Preserve environment" \
  #define logname_trivial_usage \
         ""
- #define logname_full_usage \
+ #define logname_full_usage "\n\n" \
         "Print the name of the current user"
  #define logname_example_usage \
         "$ logname\n" \
-Line 1744
+Line 2181
  #define logread_trivial_usage \
         "[OPTION]..."
- #define logread_full_usage \
+ #define logread_full_usage "\n\n" \
-        "Show the messages from syslogd (using circular buffer)" \
+        "Show messages in syslogd's circular buffer\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-f	Output data as the log grows"
+      "\n	-f	Output data as log grows" \
  #define losetup_trivial_usage \
-        "[-o OFFSET] [-d] LOOPDEVICE [FILE]]"
+        "[-o OFS] LOOPDEV FILE - associate loop devices\n" \
- #define losetup_full_usage \
+        "	losetup -d LOOPDEV - disassociate\n" \
-        "(Dis)associate LOOPDEVICE with FILE, or display current associations" \
+        "	losetup [-f] - show"
-        "\n\nOptions:\n" \
+ #define losetup_full_usage "\n\n" \
-        "	-d		Disassociate LOOPDEVICE\n" \
+        "Options:" \
-        "	-o OFFSET	Start OFFSET bytes into FILE"
+      "\n	-o OFS	Start OFS bytes into FILE" \
+      "\n	-f	Show first free loop device" \
  #define losetup_notes_usage \
         "No arguments will display all current associations.\n" \
         "One argument (losetup /dev/loop1) will display the current association\n" \
-        "(if any), or disassociate it (with -d).  The display shows the offset\n" \
+        "(if any), or disassociate it (with -d). The display shows the offset\n" \
         "and filename of the file the loop device is currently bound to.\n\n" \
         "Two arguments (losetup /dev/loop1 file.img) create a new association,\n" \
-        "with an optional offset (-o 12345).  Encryption is not yet supported.\n\n"
+        "with an optional offset (-o 12345). Encryption is not yet supported.\n" \
+        "losetup -f will show the first loop free loop device\n\n"
+ #define lpd_trivial_usage \
+        "SPOOLDIR [HELPER [ARGS...]]"
+ #define lpd_full_usage "\n\n" \
+        "SPOOLDIR must contain (symlinks to) device nodes or directories" \
+      "\nwith names matching print queue names. In the first case, jobs are" \
+      "\nsent directly to the device. Otherwise each job is stored in queue" \
+      "\ndirectory and HELPER program is called. Name of file to print" \
+      "\nis passed in $DATAFILE variable." \
+      "\nExample:" \
+      "\n	tcpsvd -E 0 515 softlimit -m 999999 lpd /var/spool ./print" \
+ #define lpq_trivial_usage \
+        "[-P queue[@host[:port]]] [-U USERNAME] [-d JOBID...] [-fs]"
+ #define lpq_full_usage "\n\n" \
+        "Options:" \
+      "\n	-P	lp service to connect to (else uses $PRINTER)" \
+      "\n	-d	Delete jobs" \
+      "\n	-f	Force any waiting job to be printed" \
+      "\n	-s	Short display" \
+ #define lpr_trivial_usage \
+        "-P queue[@host[:port]] -U USERNAME -J TITLE -Vmh [FILE...]"
+ /* -C CLASS exists too, not shown.
+  * CLASS is supposed to be printed on banner page, if one is requested */
+ #define lpr_full_usage "\n\n" \
+        "Options:" \
+      "\n	-P	lp service to connect to (else uses $PRINTER)"\
+      "\n	-m	Send mail on completion" \
+      "\n	-h	Print banner page too" \
+      "\n	-V	Verbose" \
  #define ls_trivial_usage \
         "[-1Aa" USE_FEATURE_LS_TIMESTAMPS("c") "Cd" \
- 	USE_FEATURE_LS_TIMESTAMPS("e") 	USE_FEATURE_LS_FILETYPES("F") "iln" \
+ 	USE_FEATURE_LS_TIMESTAMPS("e") USE_FEATURE_LS_FILETYPES("F") "iln" \
  	USE_FEATURE_LS_FILETYPES("p") USE_FEATURE_LS_FOLLOWLINKS("L") \
  	USE_FEATURE_LS_RECURSIVE("R") USE_FEATURE_LS_SORTFILES("rS") "s" \
  	USE_FEATURE_AUTOWIDTH("T") USE_FEATURE_LS_TIMESTAMPS("tu") \
  	USE_FEATURE_LS_SORTFILES("v") USE_FEATURE_AUTOWIDTH("w") "x" \
  	USE_FEATURE_LS_SORTFILES("X") USE_FEATURE_HUMAN_READABLE("h") "k" \
  	USE_SELINUX("K") "] [filenames...]"
- #define ls_full_usage \
+ #define ls_full_usage "\n\n" \
-        "List directory contents" \
+        "List directory contents\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
-        "\n	-1	List files in a single column" \
+      "\n	-1	List in a single column" \
-        "\n	-A	Do not list implied . and .." \
+      "\n	-A	Don't list . and .." \
-        "\n	-a	Do not hide entries starting with ." \
+      "\n	-a	Don't hide entries starting with ." \
-        "\n	-C	List entries by columns" \
+      "\n	-C	List by columns" \
  	USE_FEATURE_LS_TIMESTAMPS( \
-        "\n	-c	With -l: show ctime") \
+      "\n	-c	With -l: sort by ctime") \
  	USE_FEATURE_LS_COLOR( \
-        "\n	--color[={always,never,auto}]	Control coloring") \
+      "\n	--color[={always,never,auto}]	Control coloring") \
-        "\n	-d	List directory entries instead of contents" \
+      "\n	-d	List directory entries instead of contents" \
  	USE_FEATURE_LS_TIMESTAMPS( \
-        "\n	-e	List both full date and full time") \
+      "\n	-e	List full date and time") \
  	USE_FEATURE_LS_FILETYPES( \
-        "\n	-F	Append indicator (one of */=@|) to entries") \
+      "\n	-F	Append indicator (one of */=@|) to entries") \
-        "\n	-i	List the i-node for each file" \
+      "\n	-i	List inode numbers" \
-        "\n	-l	Use a long listing format" \
+      "\n	-l	Long listing format" \
-        "\n	-n	List numeric UIDs and GIDs instead of names" \
+      "\n	-n	List numeric UIDs and GIDs instead of names" \
  	USE_FEATURE_LS_FILETYPES( \
-        "\n	-p	Append indicator (one of /=@|) to entries") \
+      "\n	-p	Append indicator (one of /=@|) to entries") \
  	USE_FEATURE_LS_FOLLOWLINKS( \
-        "\n	-L	List entries pointed to by symbolic links") \
+      "\n	-L	List entries pointed to by symlinks") \
  	USE_FEATURE_LS_RECURSIVE( \
-        "\n	-R	List subdirectories recursively") \
+      "\n	-R	List subdirectories recursively") \
  	USE_FEATURE_LS_SORTFILES( \
-        "\n	-r	Sort the listing in reverse order") \
+      "\n	-r	Sort in reverse order") \
  	USE_FEATURE_LS_SORTFILES( \
-        "\n	-S	Sort the listing by file size") \
+      "\n	-S	Sort by file size") \
-        "\n	-s	List the size of each file, in blocks" \
+      "\n	-s	List the size of each file, in blocks" \
  	USE_FEATURE_AUTOWIDTH( \
-        "\n	-T NUM	Assume Tabstop every NUM columns") \
+      "\n	-T NUM	Assume tabstop every NUM columns") \
  	USE_FEATURE_LS_TIMESTAMPS( \
-        "\n	-t	With -l: show modification time") \
+      "\n	-t	With -l: sort by modification time") \
  	USE_FEATURE_LS_TIMESTAMPS( \
-        "\n	-u	With -l: show access time") \
+      "\n	-u	With -l: sort by access time") \
  	USE_FEATURE_LS_SORTFILES( \
-        "\n	-v	Sort the listing by version") \
+      "\n	-v	Sort by version") \
  	USE_FEATURE_AUTOWIDTH( \
-        "\n	-w NUM	Assume the terminal is NUM columns wide") \
+      "\n	-w NUM	Assume the terminal is NUM columns wide") \
-        "\n	-x	List entries by lines instead of by columns" \
+      "\n	-x	List by lines" \
  	USE_FEATURE_LS_SORTFILES( \
-        "\n	-X	Sort the listing by extension") \
+      "\n	-X	Sort by extension") \
  	USE_FEATURE_HUMAN_READABLE( \
-        "\n	-h	Print sizes in human readable format (e.g., 1K 243M 2G)") \
+      "\n	-h	List sizes in human readable format (1K 243M 2G)") \
  	USE_SELINUX( \
-        "\n	-k	Print security context") \
+      "\n	-k	List security context") \
  	USE_SELINUX( \
-        "\n	-K	Print security context in long format")
+      "\n	-K	List security context in long format") \
+ 	USE_SELINUX( \
+      "\n	-Z	List security context and permission") \
  #define lsattr_trivial_usage \
         "[-Radlv] [files...]"
- #define lsattr_full_usage \
+ #define lsattr_full_usage "\n\n" \
-        "List file attributes on an ext2 fs" \
+        "List file attributes on an ext2 fs\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-R	Recursively list subdirectories\n" \
+      "\n	-R	Recursively list subdirectories" \
-        "	-a	Do not hide entries starting with .\n" \
+      "\n	-a	Do not hide entries starting with ." \
-        "	-d	List directory entries instead of contents\n" \
+      "\n	-d	List directory entries instead of contents" \
-        "	-l	Print long flag names\n" \
+      "\n	-l	List long flag names" \
-        "	-v	List the file's version/generation number"
+      "\n	-v	List the file's version/generation number" \
  #define lsmod_trivial_usage \
         ""
- #define lsmod_full_usage \
+ #define lsmod_full_usage "\n\n" \
         "List the currently loaded kernel modules"
- #ifdef CONFIG_FEATURE_MAKEDEVS_LEAF
+ #if ENABLE_FEATURE_MAKEDEVS_LEAF
  #define makedevs_trivial_usage \
         "NAME TYPE MAJOR MINOR FIRST LAST [s]"
- #define makedevs_full_usage \
+ #define makedevs_full_usage "\n\n" \
-        "Create a range of block or character special files\n\n" \
+        "Create a range of block or character special files" \
-        "TYPEs include:\n" \
+      "\n" \
-        "	b:	Make a block (buffered) device\n" \
+      "\nTYPE is:" \
-        "	c or u:	Make a character (un-buffered) device\n" \
+      "\n	b	Block device" \
-        "	p:	Make a named pipe. MAJOR and MINOR are ignored for named pipes\n" \
+      "\n	c	Character device" \
-        "\n" \
+      "\n	f	FIFO, MAJOR and MINOR are ignored" \
-        "FIRST specifies the number appended to NAME to create the first device.\n" \
+      "\n" \
-        "LAST specifies the number of the last item that should be created\n" \
+      "\nFIRST..LAST specify numbers appended to NAME." \
-        "If 's' is the last argument, the base device is created as well.\n\n" \
+      "\nIf 's' is the last argument, the base device is created as well." \
-        "For example:\n" \
+      "\n" \
-        "	makedevs /dev/ttyS c 4 66 2 63   ->  ttyS2-ttyS63\n" \
+      "\nExamples:" \
-        "	makedevs /dev/hda b 3 0 0 8 s    ->  hda,hda1-hda8"
+      "\n	makedevs /dev/ttyS c 4 66 2 63   ->  ttyS2-ttyS63" \
+      "\n	makedevs /dev/hda b 3 0 0 8 s    ->  hda,hda1-hda8"
  #define makedevs_example_usage \
         "# makedevs /dev/ttyS c 4 66 2 63\n" \
         "[creates ttyS2-ttyS63]\n" \
-Line 1862
+Line 2336
         "[creates hda,hda1-hda8]\n"
  #endif
- #ifdef CONFIG_FEATURE_MAKEDEVS_TABLE
+ #if ENABLE_FEATURE_MAKEDEVS_TABLE
  #define makedevs_trivial_usage \
         "[-d device_table] rootdir"
- #define makedevs_full_usage \
+ #define makedevs_full_usage "\n\n" \
         "Create a range of special files as specified in a device table.\n" \
         "Device table entries take the form of:\n" \
         "<type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>\n" \
         "Where name is the file name, type can be one of:\n" \
-        "	f	A regular file\n" \
+        "	f	Regular file\n" \
         "	d	Directory\n" \
-        "	c	Character special device file\n" \
+        "	c	Character device\n" \
-        "	b	Block special device file\n" \
+        "	b	Block device\n" \
         "	p	Fifo (named pipe)\n" \
         "uid is the user id for the target file, gid is the group id for the\n" \
-        "target file.  The rest of the entries (major, minor, etc) apply to\n" \
+        "target file. The rest of the entries (major, minor, etc) apply to\n" \
-        "to device special files.  A '-' may be used for blank entries."
+        "to device special files. A '-' may be used for blank entries."
  #define makedevs_example_usage \
         "For example:\n" \
         "<name>    <type> <mode><uid><gid><major><minor><start><inc><count>\n" \
-Line 1896
+Line 2370
         "/dev/hda[0-15]\n"
  #endif
+ #define makemime_trivial_usage \
+        "[OPTION]... [FILE]..."
+ #define makemime_full_usage "\n\n" \
+        "Create MIME-encoded message\n" \
+      "\nOptions:" \
+      "\n	-C      Charset" \
+      "\n	-e	Tranfer encoding. Ignored. base64 is assumed" \
+      "\n" \
+      "\nOther options are silently ignored." \
+ #define man_trivial_usage \
+        "[OPTION]... [MANPAGE]..."
+ #define man_full_usage "\n\n" \
+        "Format and display manual page\n" \
+      "\nOptions:" \
+      "\n	-a      Display all pages" \
+      "\n	-w	Show page locations" \
+ #define matchpathcon_trivial_usage \
+        "[-n] [-N] [-f file_contexts_file] [-p prefix] [-V]"
+ #define matchpathcon_full_usage "\n\n" \
+        "	-n	Do not display path" \
+      "\n	-N	Do not use translations" \
+      "\n	-f	Use alternate file_context file" \
+      "\n	-p	Use prefix to speed translations" \
+      "\n	-V	Verify file context on disk matches defaults" \
  #define md5sum_trivial_usage \
         "[OPTION] [FILEs...]" \
  	USE_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: md5sum [OPTION] -c [FILE]")
- #define md5sum_full_usage \
+ #define md5sum_full_usage "\n\n" \
         "Print" USE_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " MD5 checksums" \
-        "\n\nOptions:\n" \
+ 	USE_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
-        "With no FILE, or when FILE is -, read standard input." \
+      "\nOptions:" \
- 	USE_FEATURE_MD5_SHA1_SUM_CHECK("\n\n" \
+      "\n	-c	Check MD5 sums against given list" \
-        "	-c	Check MD5 sums against given list\n" \
+      "\n	-s	Don't output anything, status code shows success" \
-        "\nThe following two options are useful only when verifying checksums:\n" \
+      "\n	-w	Warn about improperly formatted MD5 checksum lines") \
-        "	-s	Don't output anything, status code shows success\n" \
-        "	-w	Warn about improperly formatted MD5 checksum lines")
  #define md5sum_example_usage \
         "$ md5sum < busybox\n" \
         "6fd11e98b98a58f64ff3398d7b324003\n" \
-Line 1920
+Line 2420
  #define mdev_trivial_usage \
         "[-s]"
- #define mdev_full_usage \
+ #define mdev_full_usage "\n\n" \
-        "	-s	Scan /sys and populate /dev during system boot\n\n" \
+        "	-s	Scan /sys and populate /dev during system boot\n" \
+        "\n" \
         "Called with no options (via hotplug) it uses environment variables\n" \
         "to determine which device to add/remove."
  #define mdev_notes_usage "" \
  	USE_FEATURE_MDEV_CONFIG( \
         "The mdev config file contains lines that look like:\n" \
-Line 1932
+Line 2434
  	USE_FEATURE_MDEV_EXEC( \
         "Optionally, that can be followed (on the same line) by a special character\n" \
         "and a command line to run after creating/before deleting the corresponding\n" \
-        "device(s).  The environment variable $MDEV indicates the active device node\n" \
+        "device(s). The environment variable $MDEV indicates the active device node\n" \
-        "(which is useful if it's a regex match).  For example:\n\n" \
+        "(which is useful if it's a regex match). For example:\n\n" \
         "  hdc root:cdrom 660  *ln -s $MDEV cdrom\n\n" \
         "The special characters are @ (run after creating), $ (run before deleting),\n" \
-        "and * (run both after creating and before deleting).  The commands run in\n" \
+        "and * (run both after creating and before deleting). The commands run in\n" \
         "the /dev directory, and use system() which calls /bin/sh.\n\n" \
  	) \
-        "Config file parsing stops on the first matching line.  If no config\n"\
+        "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"\
+        "entry is matched, devices are created with default 0:0 660. (Make\n" \
         "the last line match .* to override this.)\n\n" \
  	)
  #define mesg_trivial_usage \
         "[y|n]"
- #define mesg_full_usage \
+ #define mesg_full_usage "\n\n" \
         "Control write access to your terminal\n" \
         "	y	Allow write access to your terminal\n" \
         "	n	Disallow write access to your terminal"
+ #define microcom_trivial_usage \
+        "[-d DELAY] [-t TIMEOUT] [-s SPEED] [-X] TTY"
+ #define microcom_full_usage "\n\n" \
+        "Copy bytes for stdin to TTY and from TTY to stdout\n" \
+      "\nOptions:" \
+      "\n	-d	Wait up to DELAY ms for TTY output before sending every" \
+      "\n		next byte to it" \
+      "\n	-t	Exit if both stdin and TTY are silent for TIMEOUT ms" \
+      "\n	-s	Set serial line to SPEED" \
+      "\n	-X	Disable special meaning of NUL and Ctrl-X from stdin" \
  #define mkdir_trivial_usage \
         "[OPTION] DIRECTORY..."
- #define mkdir_full_usage \
+ #define mkdir_full_usage "\n\n" \
-        "Create the DIRECTORY(ies) if they do not already exist" \
+        "Create DIRECTORY\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-m	Set permission mode (as in chmod), not rwxrwxrwx - umask\n" \
+      "\n	-m	Set permission mode (as in chmod), not rwxrwxrwx - umask" \
-        "	-p	No error if existing, make parent directories as needed"
+      "\n	-p	No error if existing, make parent directories as needed" \
+ 	USE_SELINUX( \
+      "\n	-Z	Set security context" \
+ 	)
  #define mkdir_example_usage \
         "$ mkdir /tmp/foo\n" \
         "$ mkdir /tmp/foo\n" \
-Line 1973
+Line 2490
         "[r fs-revision-level] [-E extended-options] [-v] [-F] [-L volume-label] " \
         "[-M last-mounted-directory] [-S] [-T filesystem-type] " \
         "device [blocks-count]"
- #define mke2fs_full_usage \
+ #define mke2fs_full_usage "\n\n" \
-        "	-b size		Block size in bytes\n" \
+        "	-b size		Block size in bytes" \
-        "	-c		Check for bad blocks before creating\n" \
+      "\n	-c		Check for bad blocks before creating" \
-        "	-E opts		Set extended options\n" \
+      "\n	-E opts		Set extended options" \
-        "	-f size		Fragment size in bytes\n" \
+      "\n	-f size		Fragment size in bytes" \
-        "	-F		Force (ignore sanity checks)\n" \
+      "\n	-F		Force (ignore sanity checks)" \
-        "	-g num		Number of blocks in a block group\n" \
+      "\n	-g num		Number of blocks in a block group" \
-        "	-i ratio	The bytes/inode ratio\n" \
+      "\n	-i ratio	The bytes/inode ratio" \
-        "	-j		Create a journal (ext3)\n" \
+      "\n	-j		Create a journal (ext3)" \
-        "	-J opts		Set journal options (size/device)\n" \
+      "\n	-J opts		Set journal options (size/device)" \
-        "	-l file		Read bad blocks list from file\n" \
+      "\n	-l file		Read bad blocks list from file" \
-        "	-L lbl		Set the volume label\n" \
+      "\n	-L lbl		Set the volume label" \
-        "	-m percent	Percent of fs blocks to reserve for admin\n" \
+      "\n	-m percent	Percent of fs blocks to reserve for admin" \
-        "	-M dir		Set last mounted directory\n" \
+      "\n	-M dir		Set last mounted directory" \
-        "	-n		Do not actually create anything\n" \
+      "\n	-n		Do not actually create anything" \
-        "	-N num		Number of inodes to create\n" \
+      "\n	-N num		Number of inodes to create" \
-        "	-o os		Set the 'creator os' field\n" \
+      "\n	-o os		Set the 'creator os' field" \
-        "	-O features	Dir_index/filetype/has_journal/journal_dev/sparse_super\n" \
+      "\n	-O features	Dir_index/filetype/has_journal/journal_dev/sparse_super" \
-        "	-q		Quiet execution\n" \
+      "\n	-q		Quiet" \
-        "	-r rev		Set filesystem revision\n" \
+      "\n	-r rev		Set filesystem revision" \
-        "	-S		Write superblock and group descriptors only\n" \
+      "\n	-S		Write superblock and group descriptors only" \
-        "	-T fs-type	Set usage type (news/largefile/largefile4)\n" \
+      "\n	-T fs-type	Set usage type (news/largefile/largefile4)" \
-        "	-v		Verbose execution"
+      "\n	-v		Verbose" \
  #define mkfifo_trivial_usage \
         "[OPTIONS] name"
- #define mkfifo_full_usage \
+ #define mkfifo_full_usage "\n\n" \
-        "Create a named pipe (identical to 'mknod name p')" \
+        "Create named pipe (identical to 'mknod name p')\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-m	Create the pipe using the specified mode (default a=rw)"
+      "\n	-m MODE	Mode (default a=rw)" \
+ 	USE_SELINUX( \
+      "\n	-Z	Set security context" \
+ 	)
  #define mkfs_minix_trivial_usage \
         "[-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
- #define mkfs_minix_full_usage \
+ #define mkfs_minix_full_usage "\n\n" \
-        "Make a MINIX filesystem" \
+        "Make a MINIX filesystem\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c		Check the device for bad blocks\n" \
+      "\n	-c		Check device for bad blocks" \
-        "	-n [14|30]	Specify the maximum length of filenames\n" \
+      "\n	-n [14|30]	Maximum length of filenames" \
-        "	-i INODES	Specify the number of inodes for the filesystem\n" \
+      "\n	-i INODES	Number of inodes for the filesystem" \
-        "	-l FILENAME	Read the bad blocks list from FILENAME\n" \
+      "\n	-l FILENAME	Read bad blocks list from FILENAME" \
-        "	-v		Make a Minix version 2 filesystem"
+      "\n	-v		Make version 2 filesystem" \
  #define mknod_trivial_usage \
         "[OPTIONS] NAME TYPE MAJOR MINOR"
- #define mknod_full_usage \
+ #define mknod_full_usage "\n\n" \
-        "Create a special file (block, character, or pipe)" \
+        "Create a special file (block, character, or pipe)\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-m	Create the special file using the specified mode (default a=rw)" \
+      "\n	-m	Create the special file using the specified mode (default a=rw)" \
-        "\n\nTYPEs include:\n" \
+      "\nTYPEs include:" \
-        "	b:	Make a block (buffered) device\n" \
+      "\n	b:	Make a block device" \
-        "	c or u:	Make a character (un-buffered) device\n" \
+      "\n	c or u:	Make a character device" \
-        "	p:	Make a named pipe. MAJOR and MINOR are ignored for named pipes"
+      "\n	p:	Make a named pipe (MAJOR and MINOR are ignored)" \
+ 	USE_SELINUX( \
+      "\n	-Z	Set security context" \
+ 	)
  #define mknod_example_usage \
         "$ mknod /dev/fd0 b 2 0\n" \
         "$ mknod -m 644 /tmp/pipe p\n"
  #define mkswap_trivial_usage \
-        "[-c] [-v0|-v1] device [block-count]"
+        "DEVICE"
- #define mkswap_full_usage \
+ #define mkswap_full_usage "\n\n" \
-        "Prepare a disk partition to be used as swap partition" \
+        "Prepare block device to be used as swap partition"
-        "\n\nOptions:\n" \
+ #if 0
-        "	-c		Check for read-ability\n" \
+        "[-c] [-v0|-v1] DEVICE [BLOCKS]"
-        "	-v0		Make version 0 swap [max 128 Megs]\n" \
+      "\nOptions:"
-        "	-v1		Make version 1 swap [big!] (default for kernels > 2.1.117)\n" \
+      "\n	-c	Check for readability"
-        "	block-count	Number of block to use (default is entire partition)"
+      "\n	-v0	Make swap version 0 (max 128M)"
+      "\n	-v1	Make swap version 1 (default for kernels > 2.1.117)"
+      "\n	BLOCKS	Number of blocks to use (default is entire partition)"
+ #endif
  #define mktemp_trivial_usage \
-        "[-dq] TEMPLATE"
+        "[-dt] [-p DIR] [TEMPLATE]"
- #define mktemp_full_usage \
+ #define mktemp_full_usage "\n\n" \
-        "Create a temporary file with its name based on TEMPLATE.\n" \
+        "Create a temporary file with name based on TEMPLATE and print its name.\n" \
-        "TEMPLATE is any name with six 'Xs' (i.e., /tmp/temp.XXXXXX)." \
+        "TEMPLATE must end with XXXXXX (e.g. [/dir/]nameXXXXXX).\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-d	Make a directory instead of a file\n" \
+      "\n	-d	Make a directory instead of a file" \
-        "	-q	Fail silently if an error occurs"
+ /*   "\n	-q	Fail silently if an error occurs" - we ignore it */ \
+      "\n	-t	Generate a path rooted in temporary directory" \
+      "\n	-p DIR	Use DIR as a temporary directory (implies -t)" \
+      "\n" \
+      "\nFor -t or -p, directory is chosen as follows:" \
+      "\n$TMPDIR if set, else -p DIR, else /tmp" \
  #define mktemp_example_usage \
         "$ mktemp /tmp/temp.XXXXXX\n" \
         "/tmp/temp.mWiLjM\n" \
-Line 2054
+Line 2587
         "-rw-------    1 andersen andersen        0 Apr 25 17:10 /tmp/temp.mWiLjM\n"
  #define modprobe_trivial_usage \
-        "[-knqrsv] MODULE [symbol=value ...]"
+        "[-knqrsv] MODULE [symbol=value...]"
- #define modprobe_full_usage \
+ #define modprobe_full_usage "\n\n" \
-        "Options:\n" \
+        "Options:" \
-        "	-k	Make module autoclean-able\n" \
+ 	USE_FEATURE_2_4_MODULES( \
-        "	-n	Just show what would be done\n" \
+      "\n	-k	Make module autoclean-able" \
-        "	-q	Quiet output\n" \
+ 	) \
-        "	-r	Remove module (stacks) or do autoclean\n" \
+      "\n	-n	Dry run" \
-        "	-s	Report via syslog instead of stderr\n" \
+      "\n	-q	Quiet" \
-        "	-v	Verbose output"
+      "\n	-r	Remove module (stacks) or do autoclean" \
+      "\n	-s	Report via syslog instead of stderr" \
+      "\n	-v	Verbose" \
+ 	USE_FEATURE_MODPROBE_BLACKLIST( \
+      "\n	-b	Apply blacklist to module names too" \
+         )
  #define modprobe_notes_usage \
  "modprobe can (un)load a stack of modules, passing each module options (when\n" \
  "loading). modprobe uses a configuration file to determine what option(s) to\n" \
-Line 2088
+Line 2627
  "    the module and the alias.\n" \
  "    A module can be aliased more than once.\n" \
  "\n" \
- "  options <mod_name|alias_name> <symbol=value ...>\n" \
+ "  options <mod_name|alias_name> <symbol=value...>\n" \
  "    When loading module mod_name (or the module aliased by alias_name), pass\n" \
  "    the \"symbol=value\" pairs as option to that module.\n" \
  "\n" \
-Line 2124
+Line 2663
         "   from the command line\n"
  #define more_trivial_usage \
-        "[FILE ...]"
+        "[FILE...]"
- #define more_full_usage \
+ #define more_full_usage "\n\n" \
         "View FILE or standard input one screenful at a time"
  #define more_example_usage \
         "$ dmesg | more\n"
  #define mount_trivial_usage \
         "[flags] DEVICE NODE [-o options,more-options]"
- #define mount_full_usage \
+ #define mount_full_usage "\n\n" \
-        "Mount a filesystem.  Filesystem autodetection requires /proc be mounted." \
+        "Mount a filesystem. Filesystem autodetection requires /proc be mounted.\n" \
-        "\n\nOptions:\n"  \
+      "\nOptions:" \
-        "	-a		Mount all filesystems in fstab\n" \
+      "\n	-a		Mount all filesystems in fstab" \
+ 	USE_FEATURE_MOUNT_FAKE( \
+      "\n	-f		"USE_FEATURE_MTAB_SUPPORT("Update /etc/mtab, but ")"don't mount" \
+ 	) \
  	USE_FEATURE_MTAB_SUPPORT( \
-        "	-f		\"Fake\" Add entry to mount table but don't mount it\n" \
+      "\n	-n		Don't update /etc/mtab" \
-        "	-n		Don't write a mount table entry\n" \
  	) \
-        "	-o option	One of many filesystem options, listed below\n" \
+      "\n	-r		Read-only mount" \
-        "	-r		Mount the filesystem read-only\n" \
+      "\n	-t fs-type	Filesystem type" \
-        "	-t fs-type	Specify the filesystem type\n" \
+      "\n	-w		Read-write mount (default)" \
-        "	-w		Mount for reading and writing (default)\n" \
         "\n" \
-        "Options for use with the \"-o\" flag:\n" \
+        "-o option:\n" \
  	USE_FEATURE_MOUNT_LOOP( \
         "	loop		Ignored (loop devices are autodetected)\n" \
  	) \
-Line 2153
+Line 2694
         "	[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]relatime	Disable / enable atime updates relative to modification time\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" \
-Line 2167
+Line 2709
         "	ro/rw		Mount for read-only / read-write\n" \
         "\n" \
         "There are EVEN MORE flags that are specific to each filesystem\n" \
-        "You'll have to see the written documentation for those filesystems"
+        "You'll have to see the written documentation for those filesystems" \
  #define mount_example_usage \
         "$ mount\n" \
         "/dev/hda3 on / type minix (rw)\n" \
-Line 2181
+Line 2724
  #define mountpoint_trivial_usage \
         "[-q] <[-d] DIR | -x DEVICE>"
- #define mountpoint_full_usage \
+ #define mountpoint_full_usage "\n\n" \
-        "mountpoint checks if the directory is a mountpoint" \
+        "mountpoint checks if the directory is a mountpoint\n" \
-        "\n\nOptions:\n"  \
+      "\nOptions:" \
-        "	-q	Be more quiet\n" \
+      "\n	-q	Quiet" \
-        "	-d	Print major/minor device number of the filesystem\n" \
+      "\n	-d	Print major/minor device number of the filesystem" \
-        "	-x	Print major/minor device number of the blockdevice"
+      "\n	-x	Print major/minor device number of the blockdevice" \
  #define mountpoint_example_usage \
         "$ mountpoint /proc\n" \
         "/proc is not a mountpoint\n" \
-Line 2195
+Line 2739
  #define mt_trivial_usage \
         "[-f device] opcode value"
- #define mt_full_usage \
+ #define mt_full_usage "\n\n" \
         "Control magnetic tape drive operation\n" \
-        "\nAvailable Opcodes:\n\n" \
+        "\n" \
+        "Available Opcodes:\n" \
+        "\n" \
         "bsf bsfm bsr bss datacompression drvbuffer eof eom erase\n" \
         "fsf fsfm fsr fss load lock mkpart nop offline ras1 ras2\n" \
         "ras3 reset retension rewind rewoffline seek setblk setdensity\n" \
-        "setpart tell unload unlock weof wset"
+        "setpart tell unload unlock weof wset" \
  #define mv_trivial_usage \
         "[OPTION]... SOURCE DEST\n" \
         "or: mv [OPTION]... SOURCE... DIRECTORY"
- #define mv_full_usage \
+ #define mv_full_usage "\n\n" \
-        "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY" \
+        "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-f	Don't prompt before overwriting\n" \
+      "\n	-f	Don't prompt before overwriting" \
-        "	-i	Interactive, prompt before overwrite"
+      "\n	-i	Interactive, prompt before overwrite" \
  #define mv_example_usage \
         "$ mv /tmp/foo /bin/bar\n"
  #define nameif_trivial_usage \
         "[-s] [-c FILE] [{IFNAME MACADDR}]"
- #define nameif_full_usage \
+ #define nameif_full_usage "\n\n" \
-        "Rename network interface while it in the down state" \
+        "Rename network interface while it in the down state\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c FILE		Use configuration file (default is /etc/mactab)\n" \
+      "\n	-c FILE		Use configuration file (default is /etc/mactab)" \
-        "	-s		Use syslog (LOCAL0 facility)\n" \
+      "\n	-s		Use syslog (LOCAL0 facility)" \
-        "	IFNAME MACADDR	new_interface_name interface_mac_address"
+      "\n	IFNAME MACADDR	new_interface_name interface_mac_address" \
  #define nameif_example_usage \
         "$ nameif -s dmz0 00:A0:C9:8C:F6:3F\n" \
         " or\n" \
         "$ nameif -c /etc/my_mactab_file\n" \
+ #if !ENABLE_DESKTOP
  #if ENABLE_NC_SERVER || ENABLE_NC_EXTRA
  #define NC_OPTIONS_STR "\n\nOptions:"
  #else
-Line 2236
+Line 2786
  #define nc_trivial_usage \
  	USE_NC_EXTRA("[-iN] [-wN] ")USE_NC_SERVER("[-l] [-p PORT] ") \
         "["USE_NC_EXTRA("-f FILENAME|")"IPADDR PORTNUM]"USE_NC_EXTRA(" [-e COMMAND]")
- #define nc_full_usage \
+ #define nc_full_usage "\n\n" \
         "Open a pipe to IP:port" USE_NC_EXTRA(" or file") \
  	NC_OPTIONS_STR \
  	USE_NC_EXTRA( \
-        "\n	-e	Exec rest of command line after connect" \
+      "\n	-e	Exec rest of command line after connect" \
-        "\n	-i SECS	Delay interval for lines sent" \
+      "\n	-i SECS	Delay interval for lines sent" \
-        "\n	-w SECS	Timeout for connect" \
+      "\n	-w SECS	Timeout for connect" \
-        "\n	-f FILE	Use file (ala /dev/ttyS0) instead of network" \
+      "\n	-f FILE	Use file (ala /dev/ttyS0) instead of network" \
  	) \
  	USE_NC_SERVER( \
-        "\n	-l	Listen mode, for inbound connects" \
+      "\n	-l	Listen mode, for inbound connects" \
  	USE_NC_EXTRA( \
-        "\n		(use -l twice with -e for persistent server)") \
+      "\n		(use -l twice with -e for persistent server)") \
-        "\n	-p PORT	Local port number" \
+      "\n	-p PORT	Local port number" \
  	)
  #define nc_notes_usage "" \
-Line 2269
+Line 2819
         "quit\n" \
         "221 foobar closing connection\n"
+ #else /* DESKTOP nc - much more compatible with nc 1.10 */
+ #define nc_trivial_usage \
+        "[-options] hostname port  - connect" \
+ 	USE_NC_SERVER("\n" \
+        "nc [-options] -l -p port [hostname] [port]  - listen")
+ #define nc_full_usage "\n\n" \
+        "Options:" \
+      "\n	-e prog [args]	Program to exec after connect (must be last)" \
+ 	USE_NC_SERVER( \
+      "\n	-l		Listen mode, for inbound connects" \
+ 	) \
+      "\n	-n		Don't do DNS resolution" \
+      "\n	-s addr		Local address" \
+      "\n	-p port		Local port" \
+      "\n	-u		UDP mode" \
+      "\n	-v		Verbose (cumulative: -vv)" \
+      "\n	-w secs		Timeout for connects and final net reads" \
+ 	USE_NC_EXTRA( \
+      "\n	-i sec		Delay interval for lines sent" /* ", ports scanned" */ \
+      "\n	-o file		Hex dump of traffic" \
+      "\n	-z		Zero-I/O mode (scanning)" \
+ 	) \
+ /*   "\n	-r		Randomize local and remote ports" */
+ /*   "\n	-g gateway	Source-routing hop point[s], up to 8" */
+ /*   "\n	-G num		Source-routing pointer: 4, 8, 12, ..." */
+ /*   "\nport numbers can be individual or ranges: lo-hi [inclusive]" */
+ #endif
  #define netstat_trivial_usage \
-        "[-laenrtuwx]"
+        "[-laentuwxr"USE_FEATURE_NETSTAT_WIDE("W")USE_FEATURE_NETSTAT_PRG("p")"]"
- #define netstat_full_usage \
+ #define netstat_full_usage "\n\n" \
-        "Display networking information" \
+        "Display networking information\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-l	Display listening server sockets\n" \
+      "\n	-l	Display listening server sockets" \
-        "	-a	Display all sockets (default: connected)\n" \
+      "\n	-a	Display all sockets (default: connected)" \
-        "	-e	Display other/more information\n" \
+      "\n	-e	Display other/more information" \
-        "	-n	Don't resolve names\n" \
+      "\n	-n	Don't resolve names" \
-        "	-r	Display routing table\n" \
+      "\n	-t	Tcp sockets" \
-        "	-t	Tcp sockets\n" \
+      "\n	-u	Udp sockets" \
-        "	-u	Udp sockets\n" \
+      "\n	-w	Raw sockets" \
-        "	-w	Raw sockets\n" \
+      "\n	-x	Unix sockets" \
-        "	-x	Unix sockets"
+      "\n	-r	Display routing table" \
+ 	USE_FEATURE_NETSTAT_WIDE( \
+      "\n	-W	Display with no column truncation" \
+ 	) \
+ 	USE_FEATURE_NETSTAT_PRG( \
+      "\n	-p	Display PID/Program name for sockets" \
+ 	)
  #define nice_trivial_usage \
-        "[-n ADJUST] [COMMAND [ARG] ...]"
+        "[-n ADJUST] [COMMAND [ARG]...]"
- #define nice_full_usage \
+ #define nice_full_usage "\n\n" \
-        "Run a program with modified scheduling priority" \
+        "Run a program with modified scheduling priority\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-n ADJUST	Adjust the scheduling priority by ADJUST"
+      "\n	-n ADJUST	Adjust the scheduling priority by ADJUST" \
  #define nmeter_trivial_usage \
         "format_string"
- #define nmeter_full_usage \
+ #define nmeter_full_usage "\n\n" \
         "Monitor system in real time\n\n" \
         "Format specifiers:\n" \
         "%Nc or %[cN]	Monitor CPU. N - bar size, default 10\n" \
-Line 2311
+Line 2897
         "%b		Monitor block io\n" \
         "%Nt		Show time (with N decimal points)\n" \
         "%Nd		Milliseconds between updates (default=1000)\n" \
-        "%r		Print <cr> instead of <lf> at EOL"
+        "%r		Print <cr> instead of <lf> at EOL" \
  #define nmeter_example_usage \
         "nmeter '%250d%t %20c int %i bio %b mem %m forks%p'"
  #define nohup_trivial_usage \
         "COMMAND [ARGS]"
- #define nohup_full_usage \
+ #define nohup_full_usage "\n\n" \
         "Run a command immune to hangups, with output to a non-tty"
  #define nohup_example_usage \
         "$ nohup make &"
  #define nslookup_trivial_usage \
         "[HOST] [SERVER]"
- #define nslookup_full_usage \
+ #define nslookup_full_usage "\n\n" \
         "Query the nameserver for the IP address of the given HOST\n" \
         "optionally using a specified DNS server"
  #define nslookup_example_usage \
-Line 2336
+Line 2923
         "Address:    127.0.0.1\n"
  #define od_trivial_usage \
-        "[-aBbcDdeFfHhIiLlOovXx] [FILE]"
+        "[-aBbcDdeFfHhIiLlOovXx] " USE_DESKTOP("[-t TYPE] ") "[FILE]"
- #define od_full_usage \
+ #define od_full_usage "\n\n" \
         "Write an unambiguous representation, octal bytes by default, of FILE\n" \
-        "to standard output.  With no FILE, or when FILE is -, read standard input."
+        "to standard output. With no FILE or when FILE is -, read standard input."
  #define openvt_trivial_usage \
-        "<vtnum> <COMMAND> [ARGS...]"
+        "[-c NUM] [-sw] [COMMAND [ARGS]]"
- #define openvt_full_usage \
+ #define openvt_full_usage "\n\n" \
-        "Start a command on a new virtual terminal"
+        "Start COMMAND on a new virtual terminal\n" \
+      "\nOptions:" \
+      "\n	-c	Use specified VT" \
+      "\n	-s	Switch to the VT" \
+ /*   "\n	-l	Run COMMAND as login shell (by prepending '-')" */ \
+      "\n	-w	Wait for COMMAND to exit" \
  #define openvt_example_usage \
         "openvt 2 /bin/ash\n"
+ #define parse_trivial_usage \
+        "[-n maxtokens] [-m mintokens] [-d delims] [-f flags] file ..."
+ #define parse_full_usage "\n\n" \
+        "[-n maxtokens] [-m mintokens] [-d delims] [-f flags] file ..."
  #define passwd_trivial_usage \
         "[OPTION] [name]"
- #define passwd_full_usage \
+ #define passwd_full_usage "\n\n" \
-        "Change a user password. If no name is specified,\n" \
+        "Change user's password. If no name is specified,\n" \
-        "changes the password for the current user." \
+        "changes the password for the current user.\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-a	Define which algorithm shall be used for the password\n" \
+      "\n	-a	Algorithm to use for password (choices: des, md5)" /* ", sha1)" */ \
-        "		(choices: des, md5)\n" /* ", sha1)" */ \
+      "\n	-d	Delete password for the account" \
-        "	-d	Delete the password for the specified user account\n" \
+      "\n	-l	Lock (disable) account" \
-        "	-l	Locks (disables) the specified user account\n" \
+      "\n	-u	Unlock (re-enable) account" \
-        "	-u	Unlocks (re-enables) the specified user account"
+ #define chpasswd_trivial_usage \
+ 	USE_GETOPT_LONG("[--md5|--encrypted]") SKIP_GETOPT_LONG("[-m|-e]")
+ #define chpasswd_full_usage "\n\n" \
+        "Read user:password information from stdin " \
+        "and update /etc/passwd accordingly.\n" \
+      "\nOptions:" \
+ 	USE_GETOPT_LONG( \
+      "\n	-e,--encrypted	Supplied passwords are in encrypted form" \
+      "\n	-m,--md5	Use MD5 encryption instead of DES" \
+ 	) \
+ 	SKIP_GETOPT_LONG( \
+      "\n	-e	Supplied passwords are in encrypted form" \
+      "\n	-m	Use MD5 encryption instead of DES" \
+ 	)
  #define patch_trivial_usage \
-        "[-p<num>] [-i <diff>]"
+        "[-p NUM] [-i DIFF] [-R]"
- #define patch_full_usage \
+ #define patch_full_usage "\n\n" \
-        "	-p NUM	Strip NUM leading components from file names\n" \
+        "	-p NUM	Strip NUM leading components from file names" \
-        "	-i DIFF	Read DIFF instead of stdin"
+      "\n	-i DIFF	Read DIFF instead of stdin" \
+      "\n	-R	Reverse patch" \
  #define patch_example_usage \
         "$ patch -p1 < example.diff\n" \
         "$ patch -p0 -i example.diff"
+ #define pgrep_trivial_usage \
+        "[-flnovx] pattern"
+ #define pgrep_full_usage "\n\n" \
+        "Display process(es) selected by regex pattern\n" \
+      "\nOptions:" \
+      "\n	-l	Show command name too" \
+      "\n	-f	Match against entire command line" \
+      "\n	-n	Show the newest process only" \
+      "\n	-o	Show the oldest process only" \
+      "\n	-v	Negate the matching" \
+      "\n	-x	Match whole name (not substring)" \
  #if (ENABLE_FEATURE_PIDOF_SINGLE || ENABLE_FEATURE_PIDOF_OMIT)
- #define USAGE_PIDOF "Options:"
+ #define pidof_trivial_usage \
+        "[OPTION] [NAME...]"
+ #define USAGE_PIDOF "\n\nOptions:"
  #else
- #define USAGE_PIDOF "\nThis version of pidof accepts no options."
- #endif
  #define pidof_trivial_usage \
-        "process-name [OPTION] [process-name ...]"
+        "[NAME...]"
+ #define USAGE_PIDOF /* none */
- #define pidof_full_usage \
+ #endif
-        "List the PIDs of all processes with names that match the\n" \
+ #define pidof_full_usage "\n\n" \
-        "names on the command line\n" \
+        "List PIDs of all processes with names that match NAMEs" \
  	USAGE_PIDOF \
  	USE_FEATURE_PIDOF_SINGLE( \
-        "\n	-s	Display only a single PID") \
+      "\n	-s	Show only one 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")
+      "\n	-o PID	Omit given pid" \
+      "\n		Use %PPID to omit pid of pidof's parent") \
  #define pidof_example_usage \
         "$ pidof init\n" \
         "1\n" \
-Line 2396
+Line 3021
  	USE_FEATURE_PIDOF_OMIT( \
         "$ pidof /bin/sh -o %PPID\n20351 5950")
- #ifndef CONFIG_FEATURE_FANCY_PING
+ #if !ENABLE_FEATURE_FANCY_PING
  #define ping_trivial_usage \
         "host"
- #define ping_full_usage \
+ #define ping_full_usage "\n\n" \
+        "Send ICMP ECHO_REQUEST packets to network hosts"
+ #define ping6_trivial_usage \
+        "host"
+ #define ping6_full_usage "\n\n" \
         "Send ICMP ECHO_REQUEST packets to network hosts"
  #else
  #define ping_trivial_usage \
         "[OPTION]... host"
- #define ping_full_usage \
+ #define ping_full_usage "\n\n" \
-        "Send ICMP ECHO_REQUEST packets to network hosts" \
+        "Send ICMP ECHO_REQUEST packets to network hosts\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c CNT	Send only CNT pings\n" \
+      "\n	-4, -6		Force IPv4 or IPv6 hostname resolution" \
-        "	-s SIZE	Send SIZE data bytes in packets (default=56)\n" \
+      "\n	-c CNT		Send only CNT pings" \
-        "	-I IP	Use IP as source address\n" \
+      "\n	-s SIZE		Send SIZE data bytes in packets (default=56)" \
-        "	-q	Quiet mode, only displays output at start\n" \
+      "\n	-I iface/IP	Use interface or IP address as source" \
-        "		and when finished"
+      "\n	-W timeout	Seconds to wait for the first response (default:10)" \
+      "\n			(after all -c CNT packets are sent)" \
+      "\n	-w deadline	Seconds until ping exits (default:infinite)" \
+      "\n			(can exit earlier with -c CNT)" \
+      "\n	-q		Quiet, only displays output at start" \
+      "\n			and when finished" \
+ #define ping6_trivial_usage \
+        "[OPTION]... host"
+ #define ping6_full_usage "\n\n" \
+        "Send ICMP ECHO_REQUEST packets to network hosts\n" \
+      "\nOptions:" \
+      "\n	-c CNT		Send only CNT pings" \
+      "\n	-s SIZE		Send SIZE data bytes in packets (default=56)" \
+      "\n	-I iface/IP	Use interface or IP address as source" \
+      "\n	-q		Quiet, only displays output at start" \
+      "\n			and when finished" \
  #endif
  #define ping_example_usage \
         "$ ping localhost\n" \
-Line 2421
+Line 3067
         "--- debian ping statistics ---\n" \
         "1 packets transmitted, 1 packets received, 0% packet loss\n" \
         "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
- #ifndef CONFIG_FEATURE_FANCY_PING6
- #define ping6_trivial_usage \
-        "host"
- #define ping6_full_usage \
-        "Send ICMP ECHO_REQUEST packets to network hosts"
- #else
- #define ping6_trivial_usage \
-        "[OPTION]... host"
- #define ping6_full_usage \
-        "Send ICMP ECHO_REQUEST packets to network hosts" \
-        "\n\nOptions:\n" \
-        "	-c CNT	Send only CNT pings\n" \
-        "	-s SIZE	Send SIZE data bytes in packets (default=56)\n" \
-        "	-q	Quiet mode, only displays output at start\n" \
-        "		and when finished"
- #endif
  #define ping6_example_usage \
         "$ ping6 ip6-localhost\n" \
         "PING ip6-localhost (::1): 56 data bytes\n" \
-Line 2447
+Line 3076
         "1 packets transmitted, 1 packets received, 0% packet loss\n" \
         "round-trip min/avg/max = 20.1/20.1/20.1 ms\n"
+ #define pipe_progress_trivial_usage NOUSAGE_STR
+ #define pipe_progress_full_usage ""
  #define pivot_root_trivial_usage \
         "NEW_ROOT PUT_OLD"
- #define pivot_root_full_usage \
+ #define pivot_root_full_usage "\n\n" \
         "Move the current root file system to PUT_OLD and make NEW_ROOT\n" \
         "the new root file system"
+ #define pkill_trivial_usage \
+        "[-l] | [-fnovx] [-signal] pattern"
+ #define pkill_full_usage "\n\n" \
+        "Send a signal to process(es) selected by regex pattern\n" \
+      "\nOptions:" \
+      "\n	-l	List all signals" \
+      "\n	-f	Match against entire command line" \
+      "\n	-n	Signal the newest process only" \
+      "\n	-o	Signal the oldest process only" \
+      "\n	-v	Negate the matching" \
+      "\n	-x	Match whole name (not substring)" \
+ #define popmaildir_trivial_usage \
+        "[OPTIONS] Maildir [connection-helper ...]"
+ #define popmaildir_full_usage "\n\n" \
+        "Fetch content of remote mailbox to local maildir\n" \
+      "\nOptions:" \
+      "\n	-b		Binary mode. Ignored" \
+      "\n	-d		Debug. Ignored" \
+      "\n	-m		Show used memory. Ignored" \
+      "\n	-V		Show version. Ignored" \
+      "\n	-c		Use tcpclient. Ignored" \
+      "\n	-a		Use APOP protocol. Implied. If server supports APOP -> use it" \
+      "\n	-s		Skip authorization" \
+      "\n	-T		Get messages with TOP instead with RETR" \
+      "\n	-k		Keep retrieved messages on the server" \
+      "\n	-t timeout	Set network timeout" \
+      USE_FEATURE_POPMAILDIR_DELIVERY( \
+      "\n	-F \"program arg1 arg2 ...\"	Filter by program. May be multiple" \
+      "\n	-M \"program arg1 arg2 ...\"	Deliver by program" \
+      ) \
+      "\n	-R size		Remove old messages on the server >= size (in bytes). Ignored" \
+      "\n	-Z N1-N2	Remove messages from N1 to N2 (dangerous). Ignored" \
+      "\n	-L size		Do not retrieve new messages >= size (in bytes). Ignored" \
+      "\n	-H lines	Type specified number of lines of a message. Ignored"
+ #define popmaildir_example_usage \
+        "$ popmaildir -k ~/Maildir -- nc pop.drvv.ru 110 [<password_file]\n" \
+        "$ popmaildir ~/Maildir -- openssl s_client -quiet -connect pop.gmail.com:995 [<password_file]\n"
  #define poweroff_trivial_usage \
-        "[-d<delay>] [-n<nosync>] [-f<force>]"
+        "[-d delay] [-n] [-f]"
- #define poweroff_full_usage \
+ #define poweroff_full_usage "\n\n" \
-        "Halt and shut off power" \
+        "Halt and shut off power\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-d	Delay interval for halting\n" \
+      "\n	-d	Delay interval for halting" \
-        "	-n	No call to sync()\n" \
+      "\n	-n	No call to sync()" \
-        "	-f	Force power off (don't go through init)"
+      "\n	-f	Force power off (don't go through init)" \
  #define printenv_trivial_usage \
         "[VARIABLES...]"
- #define printenv_full_usage \
+ #define printenv_full_usage "\n\n" \
         "Print all or part of environment.\n" \
         "If no environment VARIABLE specified, print them all."
  #define printf_trivial_usage \
         "FORMAT [ARGUMENT...]"
- #define printf_full_usage \
+ #define printf_full_usage "\n\n" \
         "Format and print ARGUMENT(s) according to FORMAT,\n" \
         "where FORMAT controls the output exactly as in C printf"
  #define printf_example_usage \
-Line 2482
+Line 3153
  #define ps_trivial_usage \
         ""
- #define ps_full_usage \
+ #define ps_full_usage "\n\n" \
-        "Report process status" \
+        "Report process status\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
-        "\n	-o col1,col2=header	Select columns for display" \
+      "\n	-o col1,col2=header	Select columns for display" \
  #else /* !ENABLE_DESKTOP */
- #if !defined CONFIG_SELINUX && !ENABLE_FEATURE_PS_WIDE
+ #if !ENABLE_SELINUX && !ENABLE_FEATURE_PS_WIDE
  #define USAGE_PS "\nThis version of ps accepts no options"
  #else
  #define USAGE_PS "\nOptions:"
-Line 2497
+Line 3168
  #define ps_trivial_usage \
         ""
- #define ps_full_usage \
+ #define ps_full_usage "\n\n" \
         "Report process status\n" \
  	USAGE_PS \
  	USE_SELINUX( \
-        "\n	-c	Show SE Linux context") \
+      "\n	-Z	Show SE Linux context" \
+ 	) \
  	USE_FEATURE_PS_WIDE( \
-        "\n	w	Wide output")
+      "\n	w	Wide output" \
+ 	)
  #endif /* ENABLE_DESKTOP */
-Line 2518
+Line 3191
         "  742 andersen andersen S [bash]\n" \
         "  743 andersen andersen S -bash\n" \
         "  745 root     root     S [getty]\n" \
-        " 2990 andersen andersen R ps\n"
+        " 2990 andersen andersen R ps\n" \
+ #define pscan_trivial_usage \
+        "[-cb] [-p MIN_PORT] [-P MAX_PORT] [-t TIMEOUT] [-T MIN_RTT] HOST"
+ #define pscan_full_usage "\n\n" \
+        "Scan a host, print all open ports\n" \
+      "\nOptions:" \
+      "\n	-c	Show closed ports too" \
+      "\n	-b	Show blocked ports too" \
+      "\n	-p	Scan from this port (default 1)" \
+      "\n	-P	Scan up to this port (default 1024)" \
+      "\n	-t	Timeout (default 5000 ms)" \
+      "\n	-T	Minimum rtt (default 5 ms, increase for congested hosts)" \
  #define pwd_trivial_usage \
         ""
- #define pwd_full_usage \
+ #define pwd_full_usage "\n\n" \
         "Print the full filename of the current working directory"
  #define pwd_example_usage \
         "$ pwd\n" \
-Line 2531
+Line 3215
  #define raidautorun_trivial_usage \
         "DEVICE"
- #define raidautorun_full_usage \
+ #define raidautorun_full_usage "\n\n" \
         "Tell the kernel to automatically search and start RAID arrays"
  #define raidautorun_example_usage \
         "$ raidautorun /dev/md0"
  #define rdate_trivial_usage \
         "[-sp] HOST"
- #define rdate_full_usage \
+ #define rdate_full_usage "\n\n" \
-        "Get and possibly set the system date and time from a remote HOST" \
+        "Get and possibly set the system date and time from a remote HOST\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-s	Set the system date and time (default)\n" \
+      "\n	-s	Set the system date and time (default)" \
-        "	-p	Print the date and time"
+      "\n	-p	Print the date and time" \
+ #define rdev_trivial_usage \
+        ""
+ #define rdev_full_usage "\n\n" \
+        "Print the device node associated with the filesystem mounted at '/'"
+ #define rdev_example_usage \
+        "$ rdev\n" \
+        "/dev/mtdblock9 /\n"
  #define readahead_trivial_usage \
         "[FILE]..."
- #define readahead_full_usage \
+ #define readahead_full_usage "\n\n" \
         "Preload FILE(s) in RAM cache so that subsequent reads for those" \
         "files do not block on disk I/O"
  #define readlink_trivial_usage \
  	USE_FEATURE_READLINK_FOLLOW("[-f] ") "FILE"
- #define readlink_full_usage \
+ #define readlink_full_usage "\n\n" \
-        "Display the value of a symbolic link" \
+        "Display the value of a symlink" \
- 	USE_FEATURE_READLINK_FOLLOW( \
+ 	USE_FEATURE_READLINK_FOLLOW( "\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-f	Canonicalize by following all symlinks")
+      "\n	-f	Canonicalize by following all symlinks") \
  #define readprofile_trivial_usage \
         "[OPTIONS]..."
- #define readprofile_full_usage \
+ #define readprofile_full_usage "\n\n" \
-        "Options:\n" \
+        "Options:" \
-        "	-m <mapfile>	(Default: /boot/System.map)\n" \
+      "\n	-m mapfile	(Default: /boot/System.map)" \
-        "	-p <profile>	(Default: /proc/profile)\n" \
+      "\n	-p profile	(Default: /proc/profile)" \
-        "	-M <mult>	Set the profiling multiplier to <mult>\n" \
+      "\n	-M mult		Set the profiling multiplier to mult" \
-        "	-i		Print only info about the sampling step\n" \
+      "\n	-i		Print only info about the sampling step" \
-        "	-v		Print verbose data\n" \
+      "\n	-v		Verbose" \
-        "	-a		Print all symbols, even if count is 0\n" \
+      "\n	-a		Print all symbols, even if count is 0" \
-        "	-b		Print individual histogram-bin counts\n" \
+      "\n	-b		Print individual histogram-bin counts" \
-        "	-s		Print individual counters within functions\n" \
+      "\n	-s		Print individual counters within functions" \
-        "	-r		Reset all the counters (root only)\n" \
+      "\n	-r		Reset all the counters (root only)" \
-        "	-n		Disable byte order auto-detection"
+      "\n	-n		Disable byte order auto-detection" \
  #define realpath_trivial_usage \
-        "pathname  ..."
+        "pathname..."
- #define realpath_full_usage \
+ #define realpath_full_usage "\n\n" \
         "Return the absolute pathnames of given argument"
  #define reboot_trivial_usage \
-        "[-d<delay>] [-n<nosync>] [-f<force>]"
+        "[-d delay] [-n] [-f]"
- #define reboot_full_usage \
+ #define reboot_full_usage "\n\n" \
-        "Reboot the system" \
+        "Reboot the system\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-d	Delay interval for rebooting\n" \
+      "\n	-d	Delay interval for rebooting" \
-        "	-n	No call to sync()\n" \
+      "\n	-n	No call to sync()" \
-        "	-f	Force reboot (don't go through init)"
+      "\n	-f	Force reboot (don't go through init)" \
+ #define reformime_trivial_usage \
+        "[OPTION]... [FILE]..."
+ #define reformime_full_usage "\n\n" \
+        "Parse MIME-encoded message\n" \
+      "\nOptions:" \
+      "\n	-x prefix	Extract content of MIME sections to files" \
+      "\n	-X prog [args]	Filter content of MIME sections through prog." \
+      "\n			Must be the last option" \
+      "\n" \
+      "\nOther options are silently ignored." \
  #define renice_trivial_usage \
-        "{{-n INCREMENT} | PRIORITY} [[ -p | -g | -u ] ID ...]"
+        "{{-n INCREMENT} | PRIORITY} [[-p | -g | -u] ID...]"
- #define renice_full_usage \
+ #define renice_full_usage "\n\n" \
-        "Change priority of running processes" \
+        "Change priority of running processes\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-n	Adjusts current nice value (smaller is faster)\n" \
+      "\n	-n	Adjust current nice value (smaller is faster)" \
-        "	-p	Process id(s) (default)\n" \
+      "\n	-p	Process id(s) (default)" \
-        "	-g	Process group id(s)\n" \
+      "\n	-g	Process group id(s)" \
-        "	-u	Process user name(s) and/or id(s)"
+      "\n	-u	Process user name(s) and/or id(s)" \
  #define reset_trivial_usage \
         ""
- #define reset_full_usage \
+ #define reset_full_usage "\n\n" \
         "Reset the screen"
  #define resize_trivial_usage \
         ""
- #define resize_full_usage \
+ #define resize_full_usage "\n\n" \
         "Resize the screen"
+ #define restorecon_trivial_usage \
+        "[-iFnrRv] [-e excludedir]... [-o filename] [-f filename | pathname]"
+ #define restorecon_full_usage "\n\n" \
+        "Reset security contexts of files in pathname\n" \
+      "\n	-i		Ignore files that do not exist" \
+      "\n	-f file		File with list of files to process. Use - for stdin" \
+      "\n	-e directory	Directory to exclude" \
+      "\n	-R,-r		Recurse directories" \
+      "\n	-n		Don't change any file labels" \
+      "\n	-o file		Save list of files with incorrect context" \
+      "\n	-v		Verbose" \
+      "\n	-vv		Show changed labels" \
+      "\n	-F		Force reset of context to match file_context" \
+      "\n			for customizable files, or the user section," \
+      "\n			if it has changed" \
  #define rm_trivial_usage \
         "[OPTION]... FILE..."
- #define rm_full_usage \
+ #define rm_full_usage "\n\n" \
-        "Remove (unlink) the FILE(s).  You may use '--' to\n" \
+        "Remove (unlink) the FILE(s). Use '--' to\n" \
-        "indicate that all following arguments are non-options." \
+        "indicate that all following arguments are non-options.\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-i	Always prompt before removing each destination\n" \
+      "\n	-i	Always prompt before removing" \
-        "	-f	Remove existing destinations, never prompt\n" \
+      "\n	-f	Never prompt" \
-        "	-r,-R	Remove the contents of directories recursively"
+      "\n	-r,-R	Remove directories recursively" \
  #define rm_example_usage \
         "$ rm -rf /tmp/foo\n"
  #define rmdir_trivial_usage \
         "[OPTION]... DIRECTORY..."
- #define rmdir_full_usage \
+ #define rmdir_full_usage "\n\n" \
-        "Remove the DIRECTORY, if it is empty"
+        "Remove the DIRECTORY, if it is empty.\n" \
+      "\nOptions:" \
+      USE_FEATURE_RMDIR_LONG_OPTIONS( \
+      "\n	-p|--parents	Include parents" \
+      "\n	-ignore-fail-on-non-empty" \
+      ) \
+      SKIP_FEATURE_RMDIR_LONG_OPTIONS( \
+      "\n	-p	Include parents" \
+      )
  #define rmdir_example_usage \
         "# rmdir /tmp/foo\n"
  #define rmmod_trivial_usage \
         "[OPTION]... [MODULE]..."
- #define rmmod_full_usage \
+ #define rmmod_full_usage "\n\n" \
-        "Unload the specified kernel modules from the kernel" \
+        "Unload the specified kernel modules from the kernel\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-a	Remove all unused modules (recursively)"
+      "\n	-w	Wait until the module is no longer used" \
+      "\n	-f	Force unloading" \
+      "\n	-a	Remove all unused modules (recursively)" \
  #define rmmod_example_usage \
         "$ rmmod tulip\n"
  #define route_trivial_usage \
         "[{add|del|delete}]"
- #define route_full_usage \
+ #define route_full_usage "\n\n" \
-        "Edit the kernel's routing tables" \
+        "Edit kernel routing tables\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-n	Dont resolve names\n" \
+      "\n	-n	Don't resolve names" \
-        "	-e	Display other/more information\n" \
+      "\n	-e	Display other/more information" \
-        "	-A inet" USE_FEATURE_IPV6("{6}") "	Select address family"
+      "\n	-A inet" USE_FEATURE_IPV6("{6}") "	Select address family" \
  #define rpm_trivial_usage \
         "-i -q[ildc]p package.rpm"
- #define rpm_full_usage \
+ #define rpm_full_usage "\n\n" \
-        "Manipulate RPM packages" \
+        "Manipulate RPM packages\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
-        "\n	-i	Install package" \
+      "\n	-i	Install package" \
-        "\n	-q	Query package" \
+      "\n	-q	Query package" \
-        "\n	-p	Query uninstalled package" \
+      "\n	-p	Query uninstalled package" \
-        "\n	-i	Show information" \
+      "\n	-i	Show information" \
-        "\n	-l	List contents" \
+      "\n	-l	List contents" \
-        "\n	-d	List documents" \
+      "\n	-d	List documents" \
-        "\n	-c	List config files"
+      "\n	-c	List config files" \
  #define rpm2cpio_trivial_usage \
         "package.rpm"
- #define rpm2cpio_full_usage \
+ #define rpm2cpio_full_usage "\n\n" \
         "Output a cpio archive of the rpm file"
+ #define rtcwake_trivial_usage \
+        "[-a | -l | -u] [-d DEV] [-m MODE] [-s SECS | -t TIME]"
+ #define rtcwake_full_usage "\n\n" \
+        "Enter a system sleep state until specified wakeup time\n" \
+ 	USE_GETOPT_LONG( \
+      "\n	-a,--auto	 Read clock mode from adjtime" \
+      "\n	-l,--local	 Clock is set to local time" \
+      "\n	-u,--utc	 Clock is set to UTC time" \
+      "\n	-d,--device=DEV	 Specify the RTC device" \
+      "\n	-m,--mode=MODE	 Set the sleep state (default: standby)" \
+      "\n	-s,--seconds=SEC Set the timeout in SEC seconds from now" \
+      "\n	-t,--time=TIME	 Set the timeout to TIME seconds from epoch" \
+ 	) \
+ 	SKIP_GETOPT_LONG( \
+      "\n	-a	Read clock mode from adjtime" \
+      "\n	-l	Clock is set to local time" \
+      "\n	-u	Clock is set to UTC time" \
+      "\n	-d DEV	Specify the RTC device" \
+      "\n	-m MODE	Set the sleep state (default: standby)" \
+      "\n	-s SEC	Set the timeout in SEC seconds from now" \
+      "\n	-t TIME	Set the timeout to TIME seconds from epoch" \
+ 	)
+ #define runcon_trivial_usage \
+        "[-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n" \
+        "	runcon CONTEXT COMMAND [args]"
+ #define runcon_full_usage "\n\n" \
+        "Run a program in a different security context\n" \
+      "\n	CONTEXT		Complete security context\n" \
+ 	USE_FEATURE_RUNCON_LONG_OPTIONS( \
+      "\n	-c,--compute	Compute process transition context before modifying" \
+      "\n	-t,--type=TYPE	Type (for same role as parent)" \
+      "\n	-u,--user=USER	User identity" \
+      "\n	-r,--role=ROLE	Role" \
+      "\n	-l,--range=RNG	Levelrange" \
+ 	) \
+ 	SKIP_FEATURE_RUNCON_LONG_OPTIONS( \
+      "\n	-c	Compute process transition context before modifying" \
+      "\n	-t TYPE	Type (for same role as parent)" \
+      "\n	-u USER	User identity" \
+      "\n	-r ROLE	Role" \
+      "\n	-l RNG	Levelrange" \
+ 	)
  #define run_parts_trivial_usage \
-        "[-t] [-a ARG] [-u MASK] DIRECTORY"
+        "[-t] "USE_FEATURE_RUN_PARTS_FANCY("[-l] ")"[-a ARG] [-u MASK] DIRECTORY"
- #define run_parts_full_usage \
+ #define run_parts_full_usage "\n\n" \
-        "Run a bunch of scripts in a directory" \
+        "Run a bunch of scripts in a directory\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-t	Prints what would be run, but does not actually run anything\n" \
+      "\n	-t	Print what would be run, but don't actually run anything" \
-        "	-a ARG	Pass ARG as an argument for every program invoked\n" \
+      "\n	-a ARG	Pass ARG as argument for every program" \
-        "	-u MASK	Set the umask to MASK before executing every program"
+      "\n	-u MASK	Set the umask to MASK before running every program" \
+ 	USE_FEATURE_RUN_PARTS_FANCY( \
+      "\n	-l	Print names of all matching files even if they are not executable" \
+ 	)
+ #define run_parts_example_usage \
+        "$ run-parts -a start /etc/init.d\n" \
+        "$ run-parts -a stop=now /etc/init.d\n\n" \
+        "Let's assume you have a script foo/dosomething:\n" \
+        "#!/bin/sh\n" \
+        "for i in $*; do eval $i; done; unset i\n" \
+        "case \"$1\" in\n" \
+        "start*) echo starting something;;\n" \
+        "stop*) set -x; shutdown -h $stop;;\n" \
+        "esac\n\n" \
+        "Running this yields:\n" \
+        "$run-parts -a stop=+4m foo/\n" \
+        "+ shutdown -h +4m"
  #define runlevel_trivial_usage \
         "[utmp]"
- #define runlevel_full_usage \
+ #define runlevel_full_usage "\n\n" \
         "Find the current and previous system runlevel.\n\n" \
         "If no utmp file exists or if no runlevel record can be found,\n" \
         "print \"unknown\""
-Line 2683
+Line 3476
  #define runsv_trivial_usage \
         "dir"
- #define runsv_full_usage \
+ #define runsv_full_usage "\n\n" \
         "Start and monitor a service and optionally an appendant log service"
  #define runsvdir_trivial_usage \
-        "[-P] dir"
+        "[-P] [-s SCRIPT] dir"
- #define runsvdir_full_usage \
+ #define runsvdir_full_usage "\n\n" \
-        "Start a runsv process for each subdirectory"
+        "Start a runsv process for each subdirectory. If it exits, restart it.\n" \
+      "\n	-P		Put each runsv in a new session" \
+      "\n	-s SCRIPT	Run SCRIPT <signo> after signal is processed" \
  #define rx_trivial_usage \
         "FILE"
- #define rx_full_usage \
+ #define rx_full_usage "\n\n" \
         "Receive a file using the xmodem protocol"
  #define rx_example_usage \
         "$ rx /tmp/foo\n"
+ #define script_trivial_usage \
+        "[-afq] [-c COMMAND] [OUTFILE]"
+ #define script_full_usage "\n\n" \
+        "Options:" \
+      "\n	-a	Append output" \
+      "\n	-c	Run COMMAND, not shell" \
+      "\n	-f	Flush output after each write" \
+      "\n	-q	Quiet" \
  #define sed_trivial_usage \
         "[-efinr] pattern [files...]"
- #define sed_full_usage \
+ #define sed_full_usage "\n\n" \
-        "Options:\n" \
+        "Options:" \
-        "	-e script	Add the script to the commands to be executed\n" \
+      "\n	-e script	Add the script to the commands to be executed" \
-        "	-f scriptfile	Add script-file contents to the\n" \
+      "\n	-f scriptfile	Add scriptfile contents to the" \
-        "			commands to be executed\n" \
+      "\n			commands to be executed" \
-        "	-i		Edit files in-place\n" \
+      "\n	-i		Edit files in-place" \
-        "	-n		Suppress automatic printing of pattern space\n" \
+      "\n	-n		Suppress automatic printing of pattern space" \
-        "	-r		Use extended regular expression syntax\n" \
+      "\n	-r		Use extended regular expression syntax" \
-        "\n" \
+      "\n" \
-        "If no -e or -f is given, the first non-option argument is taken as the sed\n" \
+      "\nIf no -e or -f is given, the first non-option argument is taken as the sed" \
-        "script to interpret. All remaining arguments are names of input files; if no\n" \
+      "\nscript to interpret. All remaining arguments are names of input files; if no" \
-        "input files are specified, then the standard input is read.  Source files\n" \
+      "\ninput files are specified, then the standard input is read. Source files" \
-        "will not be modified unless -i option is given."
+      "\nwill not be modified unless -i option is given." \
  #define sed_example_usage \
         "$ echo \"foo\" | sed -e 's/f[a-zA-Z]o/bar/g'\n" \
         "bar\n"
+ #define selinuxenabled_trivial_usage NOUSAGE_STR
+ #define selinuxenabled_full_usage ""
+ #define sendmail_trivial_usage \
+        "[OPTIONS] [rcpt]..."
+ #define sendmail_full_usage "\n\n" \
+        "Send an email\n" \
+      "\nOptions:" \
+      "\n	-w timeout	Network timeout" \
+      "\n	-H [user:pass@]server[:port] Server" \
+      "\n	-S		Use openssl connection helper for secure servers" \
+      "\n	-N type		Request delivery notification. Type is ignored" \
+      "\n	-f sender	Sender" \
+      "\n	-F fullname	Sender full name. Overrides $NAME" \
+ 	USE_FEATURE_SENDMAIL_MAILX( \
+      "\n	-s subject	Subject" \
+      "\n	-j charset	Assume charset for body and subject (" CONFIG_FEATURE_MIME_CHARSET ")" \
+      "\n	-a file		File to attach. May be multiple" \
+      "\n	-H \"prog args...\" Use external connection helper. E.g. openssl for secure servers" \
+      "\n	-S server[:port] Server" \
+      	) \
+ 	USE_FEATURE_SENDMAIL_MAILXX( \
+      "\n	-c rcpt		Cc: recipient. May be multiple" \
+      "\n	-e rcpt		Errors-To: recipient" \
+        	)
+      "\n	-t		Read recipients and subject from body" \
+      "\n" \
+      "\nOther options are silently ignored; -oi is implied" \
  #define seq_trivial_usage \
         "[first [increment]] last"
- #define seq_full_usage \
+ #define seq_full_usage "\n\n" \
         "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" \
-        "FIRST, INCREMENT default to 1" \
+        "FIRST, INCREMENT default to 1\n" \
-        "\n\nArguments:\n" \
+      "\nArguments:" \
-        "	LAST\n" \
+      "\n	LAST" \
-        "	FIRST LAST\n" \
+      "\n	FIRST LAST" \
-        "	FIRST INCREMENT LAST"
+      "\n	FIRST INCREMENT LAST" \
+ #define sestatus_trivial_usage \
+        "[-vb]"
+ #define sestatus_full_usage "\n\n" \
+        "	-v	Verbose" \
+      "\n	-b	Display current state of booleans" \
  #define setconsole_trivial_usage \
-        "[-r|--reset] [DEVICE]"
+        "[-r" USE_FEATURE_SETCONSOLE_LONG_OPTIONS("|--reset") "] [DEVICE]"
- #define setconsole_full_usage \
+ #define setconsole_full_usage "\n\n" \
-        "Redirect system console output to DEVICE (default: /dev/tty)" \
+        "Redirect system console output to DEVICE (default: /dev/tty)\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-r	Reset output to /dev/console"
+      "\n	-r	Reset output to /dev/console" \
+ #define setenforce_trivial_usage \
+        "[Enforcing | Permissive | 1 | 0]"
+ #define setenforce_full_usage ""
+ #define setfiles_trivial_usage \
+        "[-dnpqsvW] [-e dir]... [-o file] [-r alt_root_path]" \
+ 	USE_FEATURE_SETFILES_CHECK_OPTION( \
+        " [-c policyfile] spec_file" \
+ 	) \
+        " pathname"
+ #define setfiles_full_usage "\n\n" \
+        "Reset file contexts under pathname according to spec_file\n" \
+ 	USE_FEATURE_SETFILES_CHECK_OPTION( \
+      "\n	-c file	Check the validity of the contexts against the specified binary policy" \
+ 	) \
+      "\n	-d	Show which specification matched each file" \
+      "\n	-l	Log changes in file labels to syslog" \
+      "\n	-n	Don't change any file labels" \
+      "\n	-q	Suppress warnings" \
+      "\n	-r dir	Use an altenate root path" \
+      "\n	-e dir	Exclude directory" \
+      "\n	-F	Force reset of context to match file_context for customizable files" \
+      "\n	-o file	Save list of files with incorrect context" \
+      "\n	-s	Take a list of files from standard input (instead of command line)" \
+      "\n	-v	Show changes in file labels, if type or role are changing" \
+      "\n	-vv	Show changes in file labels, if type, role, or user are changing" \
+      "\n	-W	Display warnings about entries that had no matching files" \
+ #define setfont_trivial_usage \
+        "FONT [-m MAPFILE] [-C TTY]"
+ #define setfont_full_usage "\n\n" \
+        "Load a console font\n" \
+      "\nOptions:" \
+      "\n	-m MAPFILE	Load console screen map" \
+      "\n	-C TTY		Affect TTY instead of /dev/tty" \
+ #define setfont_example_usage \
+        "$ setfont -m koi8-r /etc/i18n/fontname\n"
  #define setkeycodes_trivial_usage \
-        "SCANCODE KEYCODE ..."
+        "SCANCODE KEYCODE..."
- #define setkeycodes_full_usage \
+ #define setkeycodes_full_usage "\n\n" \
         "Set entries into the kernel's scancode-to-keycode map,\n" \
         "allowing unusual keyboards to generate usable keycodes.\n\n" \
         "SCANCODE may be either xx or e0xx (hexadecimal),\n" \
-        "and KEYCODE is given in decimal"
+        "and KEYCODE is given in decimal" \
  #define setkeycodes_example_usage \
         "$ setkeycodes e030 127\n"
  #define setlogcons_trivial_usage \
         "N"
- #define setlogcons_full_usage \
+ #define setlogcons_full_usage "\n\n" \
         "Redirect the kernel output to console N (0 for current)"
+ #define setsebool_trivial_usage \
+        "boolean value"
+ #define setsebool_full_usage "\n\n" \
+        "Change boolean setting"
  #define setsid_trivial_usage \
-        "program [arg ...]"
+        "PROG [ARG...]"
- #define setsid_full_usage \
+ #define setsid_full_usage "\n\n" \
-        "Run any program in a new session by calling setsid() before\n" \
+        "Run PROG in a new session. PROG will have no controlling terminal\n" \
-        "exec'ing the rest of its arguments.  See setsid(2) for details."
+        "and will not be affected by keyboard signals (Ctrl-C etc).\n" \
+        "See setsid(2) for details." \
  #define lash_trivial_usage \
         "[FILE]...\n" \
         "or: sh -c command [args]..."
- #define lash_full_usage \
+ #define lash_full_usage "\n\n" \
-        "The BusyBox LAme SHell (command interpreter)"
+        "lash is deprecated, please use hush"
- #define lash_notes_usage \
-        "This command does not yet have proper documentation.\n\n" \
-        "Use lash just as you would use any other shell.  It properly handles pipes,\n" \
-        "redirects, job control, can be used as the shell for scripts, and has a\n" \
-        "sufficient set of builtins to do what is needed.  It does not (yet) support\n" \
-        "Bourne Shell syntax.  If you need things like \"if-then-else\", \"while\", and such\n" \
-        "use ash or bash.  If you just need a very simple and extremely small shell,\n" \
-        "this will do the job."
  #define last_trivial_usage \
-        ""
+        ""USE_FEATURE_LAST_FANCY("[-HW] [-f file]")
- #define last_full_usage \
+ #define last_full_usage "\n\n" \
-        "Show listing of the last users that logged into the system"
+        "Show listing of the last users that logged into the system" \
+ 	USE_FEATURE_LAST_FANCY( "\n" \
+      "\nOptions:" \
+ /*   "\n	-H	Show header line" */ \
+      "\n	-W	Display with no host column truncation" \
+      "\n	-f file Read from file instead of /var/log/wtmp" \
+ 	)
  #define sha1sum_trivial_usage \
         "[OPTION] [FILEs...]" \
  	USE_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha1sum [OPTION] -c [FILE]")
- #define sha1sum_full_usage \
+ #define sha1sum_full_usage "\n\n" \
-        "Print" USE_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums.\n" \
+        "Print" USE_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums." \
-        "With no FILE, or when FILE is -, read standard input." \
+ 	USE_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
- 	USE_FEATURE_MD5_SHA1_SUM_CHECK( \
+      "\n	-c	Check SHA1 sums against given list" \
-        "	-c	Check SHA1 sums against given list\n" \
+      "\n	-s	Don't output anything, status code shows success" \
-        "\nThe following two options are useful only when verifying checksums:\n" \
+      "\n	-w	Warn about improperly formatted SHA1 checksum lines" \
-        "	-s	Don't output anything, status code shows success\n" \
+ 	)
-        "	-w	Warn about improperly formatted SHA1 checksum lines")
+ #define showkey_trivial_usage \
+        "[-a | -k | -s]"
+ #define showkey_full_usage "\n\n" \
+        "Show keys pressed\n" \
+      "\nOptions:" \
+      "\n	-a	Display decimal/octal/hex values of the keys" \
+      "\n	-k	Display interpreted keycodes (default)" \
+      "\n	-s	Display raw scan-codes" \
+ #define slattach_trivial_usage \
+        "[-cehmLF] [-s speed] [-p protocol] DEVICEs"
+ #define slattach_full_usage "\n\n" \
+        "Attach network interface(s) to serial line(s)\n" \
+      "\nOptions:" \
+      "\n	-p	Set protocol (slip, cslip, slip6, clisp6 or adaptive)" \
+      "\n	-s	Set line speed" \
+      "\n	-e	Exit after initializing device" \
+      "\n	-h	Exit when the carrier is lost" \
+      "\n	-c	Execute a command when the line is hung up" \
+      "\n	-m	Do NOT initialize the line in raw 8 bits mode" \
+      "\n	-L	Enable 3-wire operation" \
+      "\n	-F	Disable RTS/CTS flow control" \
  #define sleep_trivial_usage \
  	USE_FEATURE_FANCY_SLEEP("[") "N" USE_FEATURE_FANCY_SLEEP("]...")
- #define sleep_full_usage \
+ #define sleep_full_usage "\n\n" \
  	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" \
-Line 2804
+Line 3710
  #define sort_trivial_usage \
         "[-nru" \
- 	USE_FEATURE_SORT_BIG("gMcszbdfimSTokt] [-o outfile] [-k start[.offset][opts][,end[.offset][opts]] [-t char") \
+ 	USE_FEATURE_SORT_BIG("gMcszbdfimSTokt] [-o FILE] [-k start[.offset][opts][,end[.offset][opts]] [-t CHAR") \
         "] [FILE]..."
- #define sort_full_usage \
+ #define sort_full_usage "\n\n" \
-        "Sort lines of text in the specified files" \
+        "Sort lines of text\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
- 	USE_FEATURE_SORT_BIG( \
-        "	-b	Ignore leading blanks\n" \
-        "	-c	Check whether input is sorted\n" \
-        "	-d	Dictionary order (blank or alphanumeric only)\n" \
-        "	-f	Ignore case\n" \
-        "	-g	General numerical sort\n" \
-        "	-i	Ignore unprintable characters\n" \
-        "	-k	Specify sort key\n" \
-        "	-M	Sort month\n") \
-        "	-n	Sort numbers\n" \
  	USE_FEATURE_SORT_BIG( \
-        "	-o	Output to file\n" \
+      "\n	-b	Ignore leading blanks" \
-        "	-k	Sort by key\n" \
+      "\n	-c	Check whether input is sorted" \
-        "	-t	Use key separator other than whitespace\n") \
+      "\n	-d	Dictionary order (blank or alphanumeric only)" \
-        "	-r	Reverse sort order\n" \
+      "\n	-f	Ignore case" \
+      "\n	-g	General numerical sort" \
+      "\n	-i	Ignore unprintable characters" \
+      "\n	-k	Sort key" \
+      "\n	-M	Sort month" \
+ 	) \
+      "\n	-n	Sort numbers" \
  	USE_FEATURE_SORT_BIG( \
-        "	-s	Stable (don't sort ties alphabetically)\n") \
+      "\n	-o	Output to file" \
-        "	-u	Suppress duplicate lines" \
+      "\n	-k	Sort by key" \
+      "\n	-t CHAR	Key separator" \
+ 	) \
+      "\n	-r	Reverse sort order" \
  	USE_FEATURE_SORT_BIG( \
-        "\n	-z	Input terminated by nulls, not newlines\n") \
+      "\n	-s	Stable (don't sort ties alphabetically)" \
+ 	) \
+      "\n	-u	Suppress duplicate lines" \
  	USE_FEATURE_SORT_BIG( \
-        "	-mST	Ignored for GNU compatibility") \
+      "\n	-z	Lines are terminated by NUL, not newline" \
-        ""
+      "\n	-mST	Ignored for GNU compatibility") \
  #define sort_example_usage \
         "$ echo -e \"e\\nf\\nb\\nd\\nc\\na\" | sort\n" \
         "a\n" \
-Line 2848
+Line 3756
  	) \
         ""
+ #define split_trivial_usage \
+        "[OPTION] [INPUT [PREFIX]]"
+ #define split_full_usage "\n\n" \
+        "Options:" \
+      "\n	-b n[k|m]	Split by bytes" \
+      "\n	-l n		Split by lines" \
+      "\n	-a n		Use n letters as suffix" \
+ #define split_example_usage \
+        "$ split TODO foo\n" \
+        "$ cat TODO | split -a 2 -l 2 TODO_\n"
  #define start_stop_daemon_trivial_usage \
-        "[OPTIONS] [--start|--stop] ... [-- arguments...]"
+        "[OPTIONS] [-S|-K] ... [-- arguments...]"
- #define start_stop_daemon_full_usage \
+ #define start_stop_daemon_full_usage "\n\n" \
-        "Start and stop services" \
+        "Search for matching processes, and then\n" \
-        "\n\nOptions:" \
+        "-K: stop all matching processes.\n" \
-        "\n	-S|--start			Start" \
+        "-S: start a process unless a matching process is found.\n" \
-        "\n	-K|--stop			Stop" \
+ 	USE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS( \
-        "\n	-a|--startas <pathname>		Starts process specified by pathname" \
+      "\nProcess matching:" \
-        "\n	-b|--background			Force process into background" \
+      "\n	-u,--user USERNAME|UID	Match only this user's processes" \
-        "\n	-u|--user <username>|<uid>	Stop this user's processes" \
+      "\n	-n,--name NAME		Match processes with NAME" \
-        "\n	-x|--exec <executable>		Program to either start or check" \
+      "\n				in comm field in /proc/PID/stat" \
-        "\n	-m|--make-pidfile		Create the -p file and enter pid in it" \
+      "\n	-x,--exec EXECUTABLE	Match processes with this command" \
-        "\n	-n|--name <process-name>	Stop processes with this name" \
+      "\n				in /proc/PID/cmdline" \
-        "\n	-p|--pidfile <pid-file>		Save or load pid using a pid-file" \
+      "\n	-p,--pidfile FILE	Match a process with PID from the file" \
-        "\n	-q|--quiet			Be quiet" \
+      "\n	All specified conditions must match" \
+      "\n-S only:" \
+      "\n	-x,--exec EXECUTABLE	Program to run" \
+      "\n	-a,--startas NAME	Zeroth argument" \
+      "\n	-b,--background		Background" \
+ 	USE_FEATURE_START_STOP_DAEMON_FANCY( \
+      "\n	-N,--nicelevel N	Change nice level" \
+ 	) \
+      "\n	-c,--chuid USER[:[GRP]]	Change to user/group" \
+      "\n	-m,--make-pidfile	Write PID to the pidfile specified by -p" \
+      "\n-K only:" \
+      "\n	-s,--signal SIG		Signal to send" \
+      "\n	-t,--test		Match only, exit with 0 if a process is found" \
+      "\nOther:" \
+ 	USE_FEATURE_START_STOP_DAEMON_FANCY( \
+      "\n	-o,--oknodo		Exit with status 0 if nothing is done" \
+      "\n	-v,--verbose		Verbose" \
+ 	) \
+      "\n	-q,--quiet		Quiet" \
+ 	) \
+ 	SKIP_FEATURE_START_STOP_DAEMON_LONG_OPTIONS( \
+      "\nProcess matching:" \
+      "\n	-u USERNAME|UID	Match only this user's processes" \
+      "\n	-n NAME		Match processes with NAME" \
+      "\n			in comm field in /proc/PID/stat" \
+      "\n	-x EXECUTABLE	Match processes with this command" \
+      "\n			command in /proc/PID/cmdline" \
+      "\n	-p FILE		Match a process with PID from the file" \
+      "\n	All specified conditions must match" \
+      "\n-S only:" \
+      "\n	-x EXECUTABLE	Program to run" \
+      "\n	-a NAME		Zeroth argument" \
+      "\n	-b		Background" \
+ 	USE_FEATURE_START_STOP_DAEMON_FANCY( \
+      "\n	-N N		Change nice level" \
+ 	) \
+      "\n	-c USER[:[GRP]]	Change to user/group" \
+      "\n	-m		Write PID to the pidfile specified by -p" \
+      "\n-K only:" \
+      "\n	-s SIG		Signal to send" \
+      "\n	-t		Match only, exit with 0 if a process is found" \
+      "\nOther:" \
  	USE_FEATURE_START_STOP_DAEMON_FANCY( \
-        "\n	-o|--oknodo			Exit status 0 if nothing done" \
+      "\n	-o		Exit with status 0 if nothing is done" \
-        "\n	-v|--verbose			Be verbose" \
+      "\n	-v		Verbose" \
-        "\n	-N|--nicelevel <N>		Add N to process's nice level" \
+ 	) \
+      "\n	-q		Quiet" \
  	) \
-        "\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 \
+ #define stat_full_usage "\n\n" \
-        "Display file (default) or filesystem status" \
+        "Display file (default) or filesystem status\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
  	USE_FEATURE_STAT_FORMAT( \
-        "	-c fmt	Use the specified format\n") \
+      "\n	-c fmt	Use the specified format" \
-        "	-f	Display filesystem status\n" \
+ 	) \
-        "	-L,-l	Dereference links\n" \
+      "\n	-f	Display filesystem status" \
-        "	-t	Display info in terse form" \
+      "\n	-L	Dereference links" \
+      "\n	-t	Display info in terse form" \
+ 	USE_SELINUX( \
+      "\n	-Z	Print security context" \
+ 	) \
  	USE_FEATURE_STAT_FORMAT( \
         "\n\nValid format sequences for files:\n" \
         " %a	Access rights in octal\n" \
-Line 2896
+Line 3860
         " %h	Number of hard links\n" \
         " %i	Inode number\n" \
         " %n	File name\n" \
-        " %N	Quoted file name with dereference if symbolic link\n" \
+        " %N	Quoted file name with dereference if symlink\n" \
         " %o	I/O block size\n" \
         " %s	Total size, in bytes\n" \
         " %t	Major device type in hex\n" \
-Line 2915
+Line 3879
         " %c	Total file nodes in file system\n" \
         " %d	Free file nodes in file system\n" \
         " %f	Free blocks in file system\n" \
+ 	USE_SELINUX( \
+        " %C	Security context in SELinux\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	Block size (for faster transfer)\n" \
         " %S	Fundamental block size (for block counts)\n" \
         " %t	Type in hex\n" \
         " %T	Type in human readable form" \
- 	)
+ 	) \
  #define strings_trivial_usage \
-        "[-afo] [-n length] [file ... ]"
+        "[-afo] [-n length] [file...]"
- #define strings_full_usage \
+ #define strings_full_usage "\n\n" \
-        "Display printable strings in a binary file" \
+        "Display printable strings in a binary file\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
-        "\n	-a	Scan the whole files (this is the default)" \
+      "\n	-a	Scan whole file (default)" \
-        "\n	-f	Precede each string with the name of the file where it was found" \
+      "\n	-f	Precede strings with filenames" \
-        "\n	-n N	Specifies that at least N characters forms a sequence (default 4)" \
+      "\n	-n N	At least N characters form a string (default 4)" \
-        "\n	-o	Each string is preceded by its decimal offset in the file"
+      "\n	-o	Precede strings with decimal offsets" \
  #define stty_trivial_usage \
         "[-a|g] [-F DEVICE] [SETTING]..."
- #define stty_full_usage \
+ #define stty_full_usage "\n\n" \
         "Without arguments, prints baud rate, line discipline,\n" \
-        "and deviations from stty sane" \
+        "and deviations from stty sane\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
-        "\n	-F DEVICE	Open device instead of stdin" \
+      "\n	-F DEVICE	Open device instead of stdin" \
-        "\n	-a		Print all current settings in human-readable form" \
+      "\n	-a		Print all current settings in human-readable form" \
-        "\n	-g		Print in stty-readable form" \
+      "\n	-g		Print in stty-readable form" \
-        "\n	[SETTING]	See manpage"
+      "\n	[SETTING]	See manpage" \
  #define su_trivial_usage \
         "[OPTION]... [-] [username]"
- #define su_full_usage \
+ #define su_full_usage "\n\n" \
-        "Change user id or become root" \
+        "Change user id or become root\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
-        "\n	-p, -m	Preserve environment" \
+      "\n	-p, -m	Preserve environment" \
-        "\n	-c	Command to pass to 'sh -c'" \
+      "\n	-c	Command to pass to 'sh -c'" \
-        "\n	-s	Shell to use instead of default shell"
+      "\n	-s	Shell to use instead of default shell" \
  #define sulogin_trivial_usage \
         "[OPTION]... [tty-device]"
- #define sulogin_full_usage \
+ #define sulogin_full_usage "\n\n" \
-        "Single user login" \
+        "Single user login\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
-        "\n	-t	Timeout"
+      "\n	-t	Timeout" \
  #define sum_trivial_usage \
         "[rs] [files...]"
- #define sum_full_usage \
+ #define sum_full_usage "\n\n" \
-        "Checksum and count the blocks in a file" \
+        "Checksum and count the blocks in a file\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-r	Use BSD sum algorithm (1K blocks)\n" \
+      "\n	-r	Use BSD sum algorithm (1K blocks)" \
-        "	-s	Use System V sum algorithm (512byte blocks)"
+      "\n	-s	Use System V sum algorithm (512byte blocks)" \
  #define sv_trivial_usage \
         "[-v] [-w sec] command service..."
- #define sv_full_usage \
+ #define sv_full_usage "\n\n" \
-        "Report the current status and control the state of services " \
+        "Control services monitored by runsv supervisor.\n" \
-        "monitored by the runsv supervisor"
+        "Commands (only first character is enough):\n" \
+        "\n" \
+        "status: query service status\n" \
+        "up: if service isn't running, start it. If service stops, restart it\n" \
+        "once: like 'up', but if service stops, don't restart it\n" \
+        "down: send TERM and CONT signals. If ./run exits, start ./finish\n" \
+        "	if it exists. After it stops, do not restart service\n" \
+        "exit: send TERM and CONT signals to service and log service. If they exit,\n" \
+        "	runsv exits too\n" \
+        "pause, cont, hup, alarm, interrupt, quit, 1, 2, term, kill: send\n" \
+        "STOP, CONT, HUP, ALRM, INT, QUIT, USR1, USR2, TERM, KILL signal to service" \
  #define svlogd_trivial_usage \
         "[-ttv] [-r c] [-R abc] [-l len] [-b buflen] dir..."
- #define svlogd_full_usage \
+ #define svlogd_full_usage "\n\n" \
         "Continuously read log data from standard input, optionally " \
         "filter log messages, and write the data to one or more automatically " \
-        "rotated logs"
+        "rotated logs" \
  #define swapoff_trivial_usage \
         "[-a] [DEVICE]"
- #define swapoff_full_usage \
+ #define swapoff_full_usage "\n\n" \
-        "Stop swapping virtual memory pages on DEVICE" \
+        "Stop swapping on DEVICE\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-a	Stop swapping on all swap devices"
+      "\n	-a	Stop swapping on all swap devices" \
  #define swapon_trivial_usage \
-        "[-a] [DEVICE]"
+        "[-a]" USE_FEATURE_SWAPON_PRI(" [-p pri]") " [DEVICE]"
- #define swapon_full_usage \
+ #define swapon_full_usage "\n\n" \
-        "Start swapping virtual memory pages on DEVICE" \
+        "Start swapping on DEVICE\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-a	Start swapping on all swap devices"
+      "\n	-a	Start swapping on all swap devices" \
+ 	USE_FEATURE_SWAPON_PRI( \
+      "\n	-p pri	Set swap device priority" \
+ 	) \
  #define switch_root_trivial_usage \
         "[-c /dev/console] NEW_ROOT NEW_INIT [ARGUMENTS_TO_INIT]"
- #define switch_root_full_usage \
+ #define switch_root_full_usage "\n\n" \
         "Use from PID 1 under initramfs to free initramfs, chroot to NEW_ROOT,\n" \
-        "and exec NEW_INIT" \
+        "and exec NEW_INIT\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c	Redirect console to device on new root"
+      "\n	-c	Redirect console to device on new root" \
  #define sync_trivial_usage \
         ""
- #define sync_full_usage \
+ #define sync_full_usage "\n\n" \
         "Write all buffered filesystem blocks to disk"
  #define sysctl_trivial_usage \
         "[OPTIONS]... [VALUE]..."
- #define sysctl_full_usage \
+ #define sysctl_full_usage "\n\n" \
-        "Configure kernel parameters at runtime" \
+        "Configure kernel parameters at runtime\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-n	Use this option to disable printing of the key name when printing values\n" \
+      "\n	-n	Disable printing of key names" \
-        "	-w	Use this option when you want to change a sysctl setting\n" \
+      "\n	-e	Don't warn about unknown keys" \
-        "	-p	Load in sysctl settings from the file specified or /etc/sysctl.conf if none given\n" \
+      "\n	-w	Change sysctl setting" \
-        "	-a	Display all values currently available\n" \
+      "\n	-p FILE	Load sysctl settings from FILE (default /etc/sysctl.conf)" \
-        "	-A	Display all values currently available in table form"
+      "\n	-a	Display all values" \
+      "\n	-A	Display all values in table form" \
  #define sysctl_example_usage \
-        "sysctl [-n] variable ...\n" \
+        "sysctl [-n] [-e] variable...\n" \
-        "sysctl [-n] -w variable=value ...\n" \
+        "sysctl [-n] [-e] -w variable=value...\n" \
-        "sysctl [-n] -a\n" \
+        "sysctl [-n] [-e] -a\n" \
-        "sysctl [-n] -p <file>	(default /etc/sysctl.conf)\n" \
+        "sysctl [-n] [-e] -p file	(default /etc/sysctl.conf)\n" \
-        "sysctl [-n] -A\n"
+        "sysctl [-n] [-e] -A\n"
  #define syslogd_trivial_usage \
         "[OPTION]..."
- #define syslogd_full_usage \
+ #define syslogd_full_usage "\n\n" \
         "System logging utility.\n" \
-        "Note that this version of syslogd ignores /etc/syslog.conf." \
+        "Note that this version of syslogd ignores /etc/syslog.conf.\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
-        "\n	-m MIN		Minutes between MARK lines (default=20, 0=off)" \
+      "\n	-n		Run in foreground" \
-        "\n	-n		Run as foreground process" \
+      "\n	-O FILE		Log to given file (default=/var/log/messages)" \
-        "\n	-O FILE		Use an alternate log file (default=/var/log/messages)" \
+      "\n	-l n		Set local log level" \
-        "\n	-l n		Sets the local log level of messages to n" \
+      "\n	-S		Smaller logging output" \
-        "\n	-S		Make logging output smaller" \
  	USE_FEATURE_ROTATE_LOGFILE( \
-        "\n	-s SIZE		Max size (KB) before rotate (default=200KB, 0=off)" \
+      "\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	-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	-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	-L		Log locally and via network (default is network only if -R)") \
+ 	USE_FEATURE_SYSLOGD_DUP( \
+      "\n	-D		Drop duplicates") \
  	USE_FEATURE_IPC_SYSLOG( \
-        "\n	-C[size(KiB)]	Log to a shared mem buffer (read the buffer using logread)")
+      "\n	-C[size(KiB)]	Log to shared mem buffer (read it using logread)") \
  	/* NB: -Csize shouldn't have space (because size is optional) */
+ /*   "\n	-m MIN		Minutes between MARK lines (default=20, 0=off)" */
  #define syslogd_example_usage \
         "$ syslogd -R masterlog:514\n" \
         "$ syslogd -R 192.168.1.1:601\n"
+ #define tac_trivial_usage \
+ 	"[FILE]..."
+ #define tac_full_usage "\n\n" \
+ 	"Concatenate FILE(s) and print them in reverse"
  #define tail_trivial_usage \
         "[OPTION]... [FILE]..."
- #define tail_full_usage \
+ #define tail_full_usage "\n\n" \
         "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." \
+        "file name. With no FILE, or when FILE is -, read standard input.\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
  	USE_FEATURE_FANCY_TAIL( \
-        "\n	-c N[kbm]	Output the last N bytes") \
+      "\n	-c N[kbm]	Output the last N bytes") \
-        "\n	-n N[kbm]	Print last N lines instead of last 10" \
+      "\n	-n N[kbm]	Print last N lines instead of last 10" \
-        "\n	-f		Output data as the file grows" \
+      "\n	-f		Output data as the file grows" \
  	USE_FEATURE_FANCY_TAIL( \
-        "\n	-q		Never output headers giving file names" \
+      "\n	-q		Never output headers giving file names" \
-        "\n	-s SEC		Wait SEC seconds between reads with -f" \
+      "\n	-s SEC		Wait SEC seconds between reads with -f" \
-        "\n	-v		Always output headers giving file names" \
+      "\n	-v		Always output headers giving file names" \
-        "\n\n" \
+      "\n" \
-        "If the first character of N (bytes or lines) is a '+', output begins with\n" \
+      "\nIf the first character of N (bytes or lines) is a '+', output begins with" \
-        "the Nth item from the start of each file, otherwise, print the last N items\n" \
+      "\nthe Nth item from the start of each file, otherwise, print the last N items" \
-        "in the file. N bytes may be suffixed by k (x1024), b (x512), or m (1024^2)." )
+      "\nin the file. N bytes may be suffixed by k (x1024), b (x512), or m (1024^2)." ) \
  #define tail_example_usage \
         "$ tail -n 1 /etc/resolv.conf\n" \
         "nameserver 10.0.0.1\n"
  #define tar_trivial_usage \
-        "-[" USE_FEATURE_TAR_CREATE("c") USE_FEATURE_TAR_GZIP("z") \
+        "-[" USE_FEATURE_TAR_CREATE("c") USE_FEATURE_SEAMLESS_GZ("z") \
- 	USE_FEATURE_TAR_BZIP2("j") USE_FEATURE_TAR_LZMA("a") \
+ 	USE_FEATURE_SEAMLESS_BZ2("j") USE_FEATURE_SEAMLESS_LZMA("a") \
- 	USE_FEATURE_TAR_COMPRESS("Z") "xtvO] " \
+ 	USE_FEATURE_SEAMLESS_Z("Z") "xtvO] " \
  	USE_FEATURE_TAR_FROM("[-X FILE] ") \
-        "[-f TARFILE] [-C DIR] [FILE(s)] ..."
+        "[-f TARFILE] [-C DIR] [FILE(s)]..."
- #define tar_full_usage \
+ #define tar_full_usage "\n\n" \
-        "Create, extract, or list files from a tar file" \
+        "Create, extract, or list files from a tar file\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
  	USE_FEATURE_TAR_CREATE( \
-        "	c	Create\n") \
+      "\n	c	Create") \
-        "	x	Extract\n" \
+      "\n	x	Extract" \
-        "	t	List\n" \
+      "\n	t	List" \
-        "\nArchive format selection:\n" \
+      "\nArchive format selection:" \
- 	USE_FEATURE_TAR_GZIP( \
+ 	USE_FEATURE_SEAMLESS_GZ( \
-        "	z	Filter the archive through gzip\n") \
+      "\n	z	Filter the archive through gzip" \
- 	USE_FEATURE_TAR_BZIP2( \
+ 	) \
-        "	j	Filter the archive through bzip2\n") \
+ 	USE_FEATURE_SEAMLESS_BZ2( \
- 	USE_FEATURE_TAR_LZMA( \
+      "\n	j	Filter the archive through bzip2" \
-        "	a	Filter the archive through lzma\n") \
+ 	) \
- 	USE_FEATURE_TAR_COMPRESS( \
+ 	USE_FEATURE_SEAMLESS_LZMA( \
-        "	Z	Filter the archive through compress\n") \
+      "\n	a	Filter the archive through lzma" \
-        "\nFile selection:\n" \
+ 	) \
-        "	f	Name of TARFILE or \"-\" for stdin\n" \
+ 	USE_FEATURE_SEAMLESS_Z( \
-        "	O	Extract to stdout\n" \
+      "\n	Z	Filter the archive through compress" \
+ 	) \
+      "\nFile selection:" \
+      "\n	f	Name of TARFILE or \"-\" for stdin" \
+      "\n	O	Extract to stdout" \
  	USE_FEATURE_TAR_FROM( \
-        "	exclude	File to exclude\n" \
+      "\n	exclude	File to exclude" \
-        "	X	File with names to exclude\n") \
+      "\n	X	File with names to exclude" \
-        "	C	Change to directory DIR before operation\n" \
+ 	) \
-        "	v	Verbosely list files processed"
+      "\n	C	Change to directory DIR before operation" \
+      "\n	v	Verbose" \
  #define tar_example_usage \
         "$ zcat /tmp/tarball.tar.gz | tar -xf -\n" \
         "$ tar -cf /tmp/tarball.tar /usr/local\n"
  #define taskset_trivial_usage \
-        "[OPTIONS] [mask] [pid | command [arg]...]"
+        "[-p] [mask] [pid | command [arg]...]"
- #define taskset_full_usage \
+ #define taskset_full_usage "\n\n" \
-        "Set or get CPU affinity" \
+        "Set or get CPU affinity\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-p	Operate on an existing PID"
+      "\n	-p	Operate on an existing PID" \
  #define taskset_example_usage \
         "$ taskset 0x7 ./dgemm_test&\n" \
         "$ taskset -p 0x1 $!\n" \
-Line 3126
+Line 4124
  #define tee_trivial_usage \
         "[OPTION]... [FILE]..."
- #define tee_full_usage \
+ #define tee_full_usage "\n\n" \
-        "Copy standard input to each FILE, and also to standard output" \
+        "Copy standard input to each FILE, and also to standard output\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-a	Append to the given FILEs, do not overwrite\n" \
+      "\n	-a	Append to the given FILEs, do not overwrite" \
-        "	-i	Ignore interrupt signals (SIGINT)"
+      "\n	-i	Ignore interrupt signals (SIGINT)" \
  #define tee_example_usage \
         "$ echo \"Hello\" | tee /tmp/foo\n" \
         "$ cat /tmp/foo\n" \
         "Hello\n"
- #ifdef CONFIG_FEATURE_TELNET_AUTOLOGIN
+ #if ENABLE_FEATURE_TELNET_AUTOLOGIN
  #define telnet_trivial_usage \
         "[-a] [-l USER] HOST [PORT]"
- #define telnet_full_usage \
+ #define telnet_full_usage "\n\n" \
-        "Connect to remote telnet server" \
+        "Connect to telnet server\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-a	Attempt an automatic login with the USER variable\n" \
+      "\n	-a	Automatic login with $USER variable" \
-        "	-l USER	Attempt an automatic login with the USER argument\n" \
+      "\n	-l USER	Automatic login as USER" \
-        "	HOST	The official name, alias or the IP address of the\n" \
-        "		remote host\n" \
-        "	PORT	The remote port number to connect to.  If it is not\n" \
-        "		specified, the default telnet (23) port is used."
  #else
  #define telnet_trivial_usage \
         "HOST [PORT]"
- #define telnet_full_usage \
+ #define telnet_full_usage "\n\n" \
-        "Connect to remote telnet server"
+        "Connect to telnet server"
  #endif
  #define telnetd_trivial_usage \
         "[OPTION]"
- #define telnetd_full_usage \
+ #define telnetd_full_usage "\n\n" \
         "Handle incoming telnet connections" \
- 	SKIP_FEATURE_TELNETD_STANDALONE(" via inetd") \
+ 	SKIP_FEATURE_TELNETD_STANDALONE(" via inetd") "\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
-        "\n	-l LOGIN	Exec LOGIN on connect" \
+      "\n	-l LOGIN	Exec LOGIN on connect" \
-        "\n	-f issue_file	Display issue_file instead of /etc/issue" \
+      "\n	-f issue_file	Display issue_file instead of /etc/issue" \
+      "\n	-K		Close connection as soon as login exits" \
+      "\n			(normally wait until all programs close slave pty)" \
  	USE_FEATURE_TELNETD_STANDALONE( \
-        "\n	-p PORT		Port to listen to" \
+      "\n	-p PORT		Port to listen on" \
-        "\n	-b ADDR		Address to bind to" \
+      "\n	-b ADDR		Address to bind to" \
-        "\n	-F		Stay in foreground" \
+      "\n	-F		Run in foreground" \
-        "\n	-i		Run as inetd subservice" \
+      "\n	-i		Run as inetd subservice" \
  	)
+ /* "test --help" does not print help (POSIX compat), only "[ --help" does.
+  * We display "<applet> EXPRESSION ]" here (not "<applet> EXPRESSION") */
  #define test_trivial_usage \
-        "EXPRESSION\n  or   [ EXPRESSION ]"
+        "EXPRESSION ]"
- #define test_full_usage \
+ #define test_full_usage "\n\n" \
-        "Check file types and compares values returning an exit code\n" \
+        "Check file types, compare values etc. Return a 0/1 exit code\n" \
-        "determined by the value of EXPRESSION"
+        "depending on logical value of EXPRESSION"
  #define test_example_usage \
         "$ test 1 -eq 2\n" \
         "$ echo $?\n" \
-Line 3189
+Line 4189
         "$ echo $?\n" \
         "1\n"
+ #define tc_trivial_usage \
+ 	/*"[OPTIONS] "*/"OBJECT CMD [dev STRING]"
+ #define tc_full_usage "\n\n" \
+ 	"OBJECT: {qdisc|class|filter}\n" \
+ 	"CMD: {add|del|change|replace|show}\n" \
+ 	"\n" \
+ 	"qdisc [ handle QHANDLE ] [ root |"USE_FEATURE_TC_INGRESS(" ingress |")" parent CLASSID ]\n" \
+ 	/* "\t[ estimator INTERVAL TIME_CONSTANT ]\n" */ \
+ 	"\t[ [ QDISC_KIND ] [ help | OPTIONS ] ]\n" \
+ 	"\tQDISC_KIND := { [p|b]fifo | tbf | prio | cbq | red | etc. }\n" \
+ 	"qdisc show [ dev STRING ]"USE_FEATURE_TC_INGRESS(" [ingress]")"\n" \
+ 	"class [ classid CLASSID ] [ root | parent CLASSID ]\n" \
+ 	"\t[ [ QDISC_KIND ] [ help | OPTIONS ] ]\n" \
+ 	"class show [ dev STRING ] [ root | parent CLASSID ]\n" \
+ 	"filter [ pref PRIO ] [ protocol PROTO ]\n" \
+ 	/* "\t[ estimator INTERVAL TIME_CONSTANT ]\n" */ \
+ 	"\t[ root | classid CLASSID ] [ handle FILTERID ]\n" \
+ 	"\t[ [ FILTER_TYPE ] [ help | OPTIONS ] ]\n" \
+ 	"filter show [ dev STRING ] [ root | parent CLASSID ]"
+ #define tcpsvd_trivial_usage \
+        "[-hEv] [-c n] [-C n:msg] [-b n] [-u user] [-l name] ip port prog..."
+ /* with not-implemented options: */
+ /*     "[-hpEvv] [-c n] [-C n:msg] [-b n] [-u user] [-l name] [-i dir|-x cdb] [-t sec] ip port prog..." */
+ #define tcpsvd_full_usage "\n\n" \
+        "Create TCP socket, bind it to ip:port and listen\n" \
+        "for incoming connection. Run PROG for each connection.\n" \
+      "\nip		IP to listen on. '0' = all" \
+      "\nport		Port to listen on" \
+      "\nprog [arg]	Program to run" \
+      "\n-l name		Local hostname (else looks up local hostname in DNS)" \
+      "\n-u user[:group]	Change to user/group after bind" \
+      "\n-c n		Handle up to n connections simultaneously" \
+      "\n-b n		Allow a backlog of approximately n TCP SYNs" \
+      "\n-C n[:msg]	Allow only up to n connections from the same IP" \
+      "\n		New connections from this IP address are closed" \
+      "\n		immediately. 'msg' is written to the peer before close" \
+      "\n-h		Look up peer's hostname" \
+      "\n-E		Do not set up environment variables" \
+      "\n-v		Verbose" \
+ #define udpsvd_trivial_usage \
+        "[-hEv] [-c n] [-u user] [-l name] ip port prog"
+ #define udpsvd_full_usage "\n\n" \
+        "Create UDP socket, bind it to ip:port and wait\n" \
+        "for incoming packets. Run PROG for each packet,\n" \
+        "redirecting all further packets with same peer ip:port to it\n" \
+      "\nip		IP to listen on. '0' = all" \
+      "\nport		Port to listen on" \
+      "\nprog [arg]	Program to run" \
+      "\n-l name		Local hostname (else looks up local hostname in DNS)" \
+      "\n-u user[:group]	Change to user/group after bind" \
+      "\n-c n		Handle up to n connections simultaneously" \
+      "\n-h		Look up peer's hostname" \
+      "\n-E		Do not set up environment variables" \
+      "\n-v		Verbose" \
  #define tftp_trivial_usage \
         "[OPTION]... HOST [PORT]"
- #define tftp_full_usage \
+ #define tftp_full_usage "\n\n" \
-        "Transfer a file from/to tftp server using \"octet\" mode" \
+        "Transfer a file from/to tftp server\n" \
-        "\n\nOptions:" \
+      "\nOptions:" \
-        "\n	-l FILE	Local FILE" \
+      "\n	-l FILE	Local FILE" \
-        "\n	-r FILE	Remote FILE" \
+      "\n	-r FILE	Remote FILE" \
  	USE_FEATURE_TFTP_GET( \
-        "\n	-g	Get file" \
+      "\n	-g	Get file" \
  	) \
  	USE_FEATURE_TFTP_PUT( \
-        "\n	-p	Put file" \
+      "\n	-p	Put file" \
  	) \
  	USE_FEATURE_TFTP_BLOCKSIZE( \
-        "\n	-b SIZE	Transfer blocks of SIZE octets" \
+      "\n	-b SIZE	Transfer blocks of SIZE octets" \
  	)
+ #define tftpd_trivial_usage \
+        "[-cr] [-u USER] [DIR]"
+ #define tftpd_full_usage "\n\n" \
+        "Transfer a file on tftp client's request.\n" \
+        "\n" \
+        "tftpd should be used as an inetd service.\n" \
+        "tftpd's line for inetd.conf:\n" \
+        "	69 dgram udp nowait root tftpd tftpd /files/to/serve\n" \
+        "It also can be ran from udpsvd:\n" \
+        "	udpsvd -vE 0.0.0.0 69 tftpd /files/to/serve\n" \
+      "\nOptions:" \
+      "\n	-r	Prohibit upload" \
+      "\n	-c	Allow file creation via upload" \
+      "\n	-u	Access files as USER" \
  #define time_trivial_usage \
         "[OPTION]... COMMAND [ARGS...]"
- #define time_full_usage \
+ #define time_full_usage "\n\n" \
-        "Run the program COMMAND with arguments ARGS.  When COMMAND finishes,\n" \
+        "Run the program COMMAND with arguments ARGS. When COMMAND finishes,\n" \
-        "COMMAND's resource usage information is displayed." \
+        "COMMAND's resource usage information is displayed.\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-v	Display verbose resource usage information"
+      "\n	-v	Verbose" \
  #define top_trivial_usage \
-        "[-b] [-n count] [-d seconds]"
+        "[-b] [-nCOUNT] [-dSECONDS]"
- #define top_full_usage \
+ #define top_full_usage "\n\n" \
         "Provide a view of process activity in real time.\n" \
-        "Read the status of all processes from /proc each <seconds>\n" \
+        "Read the status of all processes from /proc each SECONDS\n" \
-        "and show the status for however many processes will fit on the screen."
+        "and show the status for however many processes will fit on the screen." \
  #define touch_trivial_usage \
-        "[-c] FILE [FILE ...]"
+        "[-c] FILE [FILE...]"
- #define touch_full_usage \
+ #define touch_full_usage "\n\n" \
-        "Update the last-modified date on the given FILE[s]" \
+        "Update the last-modified date on the given FILE[s]\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c	Do not create any files"
+      "\n	-c	Do not create any files" \
  #define touch_example_usage \
         "$ ls -l /tmp/foo\n" \
         "/bin/ls: /tmp/foo: No such file or directory\n" \
-Line 3235
+Line 4309
  #define tr_trivial_usage \
         "[-cds] STRING1 [STRING2]"
- #define tr_full_usage \
+ #define tr_full_usage "\n\n" \
         "Translate, squeeze, and/or delete characters from\n" \
-        "standard input, writing to standard output" \
+        "standard input, writing to standard output\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c	Take complement of STRING1\n" \
+      "\n	-c	Take complement of STRING1" \
-        "	-d	Delete input characters coded STRING1\n" \
+      "\n	-d	Delete input characters coded STRING1" \
-        "	-s	Squeeze multiple output characters of STRING2 into one character"
+      "\n	-s	Squeeze multiple output characters of STRING2 into one character" \
  #define tr_example_usage \
         "$ echo \"gdkkn vnqkc\" | tr [a-y] [b-z]\n" \
         "hello world\n"
-Line 3249
+Line 4324
  #define traceroute_trivial_usage \
         "[-FIldnrv] [-f 1st_ttl] [-m max_ttl] [-p port#] [-q nqueries]\n" \
         "	[-s src_addr] [-t tos] [-w wait] [-g gateway] [-i iface]\n" \
-        "	[-z pausemsecs] host [data size]"
+        "	[-z pausemsecs] HOST [data size]"
- #define traceroute_full_usage \
+ #define traceroute_full_usage "\n\n" \
-        "Trace the route ip packets follow going to \"host\"" \
+        "Trace the route to HOST\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-F	Set the don't fragment bit\n" \
+      "\n	-F	Set the don't fragment bit" \
-        "	-I	Use ICMP ECHO instead of UDP datagrams\n" \
+      "\n	-I	Use ICMP ECHO instead of UDP datagrams" \
-        "	-l	Display the ttl value of the returned packet\n" \
+      "\n	-l	Display the ttl value of the returned packet" \
-        "	-d	Set SO_DEBUG options to socket\n" \
+      "\n	-d	Set SO_DEBUG options to socket" \
-        "	-n	Print hop addresses numerically rather than symbolically\n" \
+      "\n	-n	Print hop addresses numerically rather than symbolically" \
-        "	-r	Bypass the normal routing tables and send directly to a host\n" \
+      "\n	-r	Bypass the normal routing tables and send directly to a host" \
-        "	-v	Verbose output\n" \
+      "\n	-v	Verbose" \
-        "	-m max_ttl	Set the max time-to-live (max number of hops)\n" \
+      "\n	-m max_ttl	Max time-to-live (max number of hops)" \
-        "	-p port#	Set the base UDP port number used in probes\n" \
+      "\n	-p port#	Base UDP port number used in probes" \
-        "			(default is 33434)\n" \
+      "\n			(default is 33434)" \
-        "	-q nqueries	Set the number of probes per 'ttl' to nqueries\n" \
+      "\n	-q nqueries	Number of probes per 'ttl' (default 3)" \
-        "			(default is 3)\n" \
+      "\n	-s src_addr	IP address to use as the source address" \
-        "	-s src_addr	Use the following IP address as the source address\n" \
+      "\n	-t tos		Type-of-service in probe packets (default 0)" \
-        "	-t tos		Set the type-of-service in probe packets to the following value\n" \
+      "\n	-w wait		Time in seconds to wait for a response" \
-        "			(default 0)\n" \
+      "\n			(default 3 sec)" \
-        "	-w wait		Set the time (in seconds) to wait for a response to a probe\n" \
+      "\n	-g		Loose source route gateway (8 max)" \
-        "			(default 3 sec)\n" \
-        "	-g		Specify a loose source route gateway (8 maximum)"
  #define true_trivial_usage \
         ""
- #define true_full_usage \
+ #define true_full_usage "\n\n" \
         "Return an exit code of TRUE (0)"
  #define true_example_usage \
         "$ true\n" \
-Line 3284
+Line 4356
  #define tty_trivial_usage \
         ""
- #define tty_full_usage \
+ #define tty_full_usage "\n\n" \
-        "Print the file name of the terminal connected to standard input" \
+        "Print file name of standard input's terminal" \
-        "\n\nOptions:\n" \
+ 	USE_INCLUDE_SUSv2( "\n" \
-        "	-s	Print nothing, only return an exit status"
+      "\nOptions:" \
+      "\n	-s	Print nothing, only return exit status" \
+ 	)
  #define tty_example_usage \
         "$ tty\n" \
         "/dev/tty2\n"
+ #define ttysize_trivial_usage \
+        "[w] [h]"
+ #define ttysize_full_usage "\n\n" \
+        "Print dimension(s) of standard input's terminal, on error return 80x25"
  #define tune2fs_trivial_usage \
         "[-c max-mounts-count] [-e errors-behavior] [-g group] " \
         "[-i interval[d|m|w]] [-j] [-J journal-options] [-l] [-s sparse-flag] " \
-Line 3299
+Line 4378
         "[-r reserved-blocks-count] [-u user] [-C mount-count] " \
         "[-L volume-label] [-M last-mounted-dir] [-O [^]feature[,...]] " \
         "[-T last-check-time] [-U UUID] device"
- #define tune2fs_full_usage \
+ #define tune2fs_full_usage "\n\n" \
         "Adjust filesystem options on ext[23] filesystems"
  #define udhcpc_trivial_usage \
-        "[-Cfbnqtv] [-c CID] [-V VCLS] [-H HOSTNAME] [-i INTERFACE]\n[-p pidfile] [-r IP] [-s script]"
+        "[-Cfbnqtvo] [-c CID] [-V VCLS] [-H HOSTNAME] [-i INTERFACE]\n" \
- #define udhcpc_full_usage \
+        "	[-p pidfile] [-r IP] [-s script] [-O dhcp-option]..." USE_FEATURE_UDHCP_PORT(" [-P N]")
-        "	-V,--vendorclass=CLASSID	Set vendor class identifier\n" \
+ #define udhcpc_full_usage "\n\n" \
-        "	-i,--interface=INTERFACE	Interface to use (default: eth0)\n" \
+ 	USE_GETOPT_LONG( \
-        "	-H,-h,--hostname=HOSTNAME	Client hostname\n" \
+        "	-V,--vendorclass=CLASSID	Vendor class identifier" \
-        "	-c,--clientid=CLIENTID	Set client identifier\n" \
+      "\n	-i,--interface=INTERFACE	Interface to use (default eth0)" \
-        "	-C,--clientid-none	Suppress default client identifier\n" \
+      "\n	-H,-h,--hostname=HOSTNAME	Client hostname" \
-        "	-p,--pidfile=file	Store process ID of daemon in file\n" \
+      "\n	-c,--clientid=CLIENTID	Client identifier" \
-        "	-r,--request=IP		IP address to request (default: none)\n" \
+      "\n	-C,--clientid-none	Suppress default client identifier" \
-        "	-s,--script=file	Run file at dhcp events (default: /usr/share/udhcpc/default.script)\n" \
+      "\n	-p,--pidfile=file	Create pidfile" \
-        "	-t,--retries=NUM	Send up to NUM request packets\n"\
+      "\n	-r,--request=IP		IP address to request" \
-        "	-f,--foreground	Do not fork after getting lease\n" \
+      "\n	-s,--script=file	Run file at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")" \
-        "	-b,--background	Fork to background if lease cannot be immediately negotiated\n" \
+      "\n	-t,--retries=N		Send up to N request packets" \
-        "	-n,--now	Exit with failure if lease cannot be immediately negotiated\n" \
+      "\n	-T,--timeout=N		Try to get a lease for N seconds (default 3)" \
-        "	-q,--quit	Quit after obtaining lease\n" \
+      "\n	-A,--tryagain=N		Wait N seconds (default 20) after failure" \
-        "	-R,--release	Release IP on quit\n" \
+      "\n	-O,--request-option=OPT	Request DHCP option OPT (cumulative)" \
-        "	-v,--version	Display version" \
+      "\n	-o,--no-default-options	Do not request any options (unless -O is also given)" \
+      "\n	-f,--foreground	Run in foreground" \
+ 	USE_FOR_MMU( \
+      "\n	-b,--background	Background if lease is not immediately obtained" \
+ 	) \
+      "\n	-S,--syslog	Log to syslog too" \
+      "\n	-n,--now	Exit with failure if lease is not immediately obtained" \
+      "\n	-q,--quit	Quit after obtaining lease" \
+      "\n	-R,--release	Release IP on quit" \
+ 	USE_FEATURE_UDHCP_PORT( \
+      "\n	-P,--client-port N  Use port N instead of default 68" \
+ 	) \
+ 	USE_FEATURE_UDHCPC_ARPING( \
+      "\n	-a,--arping	Use arping to validate offered address" \
+ 	) \
+ 	) \
+ 	SKIP_GETOPT_LONG( \
+        "	-V CLASSID	Vendor class identifier" \
+      "\n	-i INTERFACE	Interface to use (default: eth0)" \
+      "\n	-H,-h HOSTNAME	Client hostname" \
+      "\n	-c CLIENTID	Client identifier" \
+      "\n	-C		Suppress default client identifier" \
+      "\n	-p file		Create pidfile" \
+      "\n	-r IP		IP address to request" \
+      "\n	-s file		Run file at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")" \
+      "\n	-t N		Send up to N request packets" \
+      "\n	-T N		Try to get a lease for N seconds (default 3)" \
+      "\n	-A N		Wait N seconds (default 20) after failure" \
+      "\n	-O OPT		Request DHCP option OPT (cumulative)" \
+      "\n	-o		Do not request any options (unless -O is also given)" \
+      "\n	-f		Run in foreground" \
+ 	USE_FOR_MMU( \
+      "\n	-b		Background if lease is not immediately obtained" \
+ 	) \
+      "\n	-S		Log to syslog too" \
+      "\n	-n		Exit with failure if lease is not immediately obtained" \
+      "\n	-q		Quit after obtaining lease" \
+      "\n	-R		Release IP on quit" \
+ 	USE_FEATURE_UDHCP_PORT( \
+      "\n	-P N		Use port N instead of default 68" \
+ 	) \
+ 	USE_FEATURE_UDHCPC_ARPING( \
+      "\n	-a		Use arping to validate offered address" \
+ 	) \
+ 	)
  #define udhcpd_trivial_usage \
-        "[configfile]\n" \
+        "[-fS]" USE_FEATURE_UDHCP_PORT(" [-P N]") " [configfile]" \
- #define udhcpd_full_usage \
+ #define udhcpd_full_usage "\n\n" \
-        ""
+        "DHCP server\n" \
+      "\n	-f	Run in foreground" \
+      "\n	-S	Log to syslog too" \
+ 	USE_FEATURE_UDHCP_PORT( \
+      "\n	-P N	Use port N instead of default 67" \
+ 	)
  #define umount_trivial_usage \
         "[flags] FILESYSTEM|DIRECTORY"
- #define umount_full_usage \
+ #define umount_full_usage "\n\n" \
-        "Unmount file systems" \
+        "Unmount file systems\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "\n	-a	Unmount all file systems" USE_FEATURE_MTAB_SUPPORT(" in /etc/mtab") \
+ 	USE_FEATURE_UMOUNT_ALL( \
+      "\n	-a	Unmount all file systems" USE_FEATURE_MTAB_SUPPORT(" in /etc/mtab") \
+ 	) \
  	USE_FEATURE_MTAB_SUPPORT( \
-        "\n	-n	Don't erase /etc/mtab entries") \
+      "\n	-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	-r	Try to remount devices as read-only if mount is busy" \
-        "\n	-f	Force umount (i.e., unreachable NFS server)" \
+      "\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)")
+      "\n	-d	Free loop device if it has been used" \
+ 	)
  #define umount_example_usage \
         "$ umount /dev/hdc1\n"
  #define uname_trivial_usage \
-        "[OPTION]..."
+        "[-amnrspv]"
- #define uname_full_usage \
+ #define uname_full_usage "\n\n" \
-        "Print certain system information.  With no OPTION, same as -s." \
+        "Print system information.\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-a	Print all information\n" \
+      "\n	-a	Print all" \
-        "	-m	The machine (hardware) type\n" \
+      "\n	-m	The machine (hardware) type" \
-        "	-n	Print the machine's network node hostname\n" \
+      "\n	-n	Hostname" \
-        "	-r	Print the operating system release\n" \
+      "\n	-r	OS release" \
-        "	-s	Print the operating system name\n" \
+      "\n	-s	OS name (default)" \
-        "	-p	Print the host processor type\n" \
+      "\n	-p	Processor type" \
-        "	-v	Print the operating system version"
+      "\n	-v	OS version" \
  #define uname_example_usage \
         "$ uname -a\n" \
         "Linux debian 2.4.23 #2 Tue Dec 23 17:09:10 MST 2003 i686 GNU/Linux\n"
  #define uncompress_trivial_usage \
-        "[-c] [-f] [ name ... ]"
+        "[-c] [-f] [name...]"
- #define uncompress_full_usage \
+ #define uncompress_full_usage "\n\n" \
-        "Uncompress .Z file[s]" \
+        "Uncompress .Z file[s]\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c	Extract to stdout\n" \
+      "\n	-c	Extract to stdout" \
-        "	-f	Force overwrite an existing file"
+      "\n	-f	Overwrite an existing file" \
+ #define unexpand_trivial_usage \
+        "[-f][-a][-t NUM] [FILE|-]"
+ #define unexpand_full_usage "\n\n" \
+        "Convert spaces to tabs, writing to standard output.\n" \
+      "\nOptions:" \
+ 	USE_FEATURE_UNEXPAND_LONG_OPTIONS( \
+      "\n	-a,--all	Convert all blanks" \
+      "\n	-f,--first-only	Convert only leading blanks" \
+      "\n	-t,--tabs=N	Tabstops every N chars" \
+ 	) \
+ 	SKIP_FEATURE_UNEXPAND_LONG_OPTIONS( \
+      "\n	-a	Convert all blanks" \
+      "\n	-f	Convert only leading blanks" \
+      "\n	-t N	Tabstops every N chars" \
+ 	)
  #define uniq_trivial_usage \
-        "[-fscdu]... [INPUT [OUTPUT]]"
+        "[-fscduw]... [INPUT [OUTPUT]]"
- #define uniq_full_usage \
+ #define uniq_full_usage "\n\n" \
-        "Discard all but one of successive identical lines from INPUT\n" \
+        "Discard duplicate lines\n" \
-        "(or standard input), writing to OUTPUT (or standard output)" \
+      "\nOptions:" \
-        "\n\nOptions:\n" \
+      "\n	-c	Prefix lines by the number of occurrences" \
-        "	-c	Prefix lines by the number of occurrences\n" \
+      "\n	-d	Only print duplicate lines" \
-        "	-d	Only print duplicate lines\n" \
+      "\n	-u	Only print unique lines" \
-        "	-u	Only print unique lines\n" \
+      "\n	-f N	Skip first N fields" \
-        "	-f N	Skip the first N fields\n" \
+      "\n	-s N	Skip first N chars (after any skipped fields)" \
-        "	-s N	Skip the first N chars (after any skipped fields)"
+      "\n	-w N	Compare N characters in line" \
  #define uniq_example_usage \
         "$ echo -e \"a\\na\\nb\\nc\\nc\\na\" | sort | uniq\n" \
         "a\n" \
-Line 3386
+Line 4537
  #define unix2dos_trivial_usage \
         "[option] [FILE]"
- #define unix2dos_full_usage \
+ #define unix2dos_full_usage "\n\n" \
-        "Convert FILE from unix format to dos format.  When no option\n" \
+        "Convert FILE from unix to dos format.\n" \
-        "is given, the input is converted to the opposite output format.\n" \
+        "When no file is given, use stdin/stdout.\n" \
-        "When no file is given, use stdin for input and stdout for output." \
+      "\nOptions:" \
-        "\n\nOptions:\n" \
+      "\n	-u	dos2unix" \
-        "	-u	Output will be in UNIX format\n" \
+      "\n	-d	unix2dos" \
-        "	-d	Output will be in DOS format"
  #define unzip_trivial_usage \
         "[-opts[modifiers]] file[.zip] [list] [-x xlist] [-d exdir]"
- #define unzip_full_usage \
+ #define unzip_full_usage "\n\n" \
-        "Extract files from ZIP archives" \
+        "Extract files from ZIP archives\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-l	List archive contents (short form)\n" \
+      "\n	-l	List archive contents (with -q for short form)" \
-        "	-n	Never overwrite existing files (default)\n" \
+      "\n	-n	Never overwrite existing files (default)" \
-        "	-o	Overwrite files without prompting\n" \
+      "\n	-o	Overwrite files without prompting" \
-        "	-p	Send output to stdout\n" \
+      "\n	-p	Send output to stdout" \
-        "	-q	Be quiet\n" \
+      "\n	-q	Quiet" \
-        "	-x	Exclude these files\n" \
+      "\n	-x	Exclude these files" \
-        "	-d	Extract files into this directory"
+      "\n	-d	Extract files into this directory" \
  #define uptime_trivial_usage \
         ""
- #define uptime_full_usage \
+ #define uptime_full_usage "\n\n" \
         "Display the time since the last boot"
  #define uptime_example_usage \
         "$ uptime\n" \
         "  1:55pm  up  2:30, load average: 0.09, 0.04, 0.00\n"
  #define usleep_trivial_usage \
         "N"
- #define usleep_full_usage \
+ #define usleep_full_usage "\n\n" \
         "Pause for N microseconds"
  #define usleep_example_usage \
         "$ usleep 1000000\n" \
         "[pauses for 1 second]\n"
  #define uudecode_trivial_usage \
-        "[FILE]..."
+        "[-o outfile] [infile]"
- #define uudecode_full_usage \
+ #define uudecode_full_usage "\n\n" \
-        "Uudecode a file" \
+        "Uudecode a file\n" \
-        "\n\nOptions:\n" \
+        "Finds outfile name in uuencoded source unless -o is given"
-        "	-o FILE	Direct output to FILE"
  #define uudecode_example_usage \
         "$ uudecode -o busybox busybox.uu\n" \
         "$ ls -l busybox\n" \
         "-rwxr-xr-x   1 ams      ams        245264 Jun  7 21:35 busybox\n"
  #define uuencode_trivial_usage \
-        "[OPTION] [INFILE] REMOTEFILE"
+        "[-m] [infile] stored_filename"
- #define uuencode_full_usage \
+ #define uuencode_full_usage "\n\n" \
-        "Uuencode a file" \
+        "Uuencode a file to stdout\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-m	Use base64 encoding per RFC1521"
+      "\n	-m	Use base64 encoding per RFC1521" \
  #define uuencode_example_usage \
         "$ uuencode busybox busybox\n" \
         "begin 755 busybox\n" \
-Line 3448
+Line 4601
         "$\n"
  #define vconfig_trivial_usage \
-        "COMMAND [OPTIONS] ..."
+        "COMMAND [OPTIONS]..."
- #define vconfig_full_usage \
+ #define vconfig_full_usage "\n\n" \
-        "Create and remove virtual ethernet devices" \
+        "Create and remove virtual ethernet devices\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	add             [interface-name] [vlan_id]\n" \
+      "\n	add		[interface-name] [vlan_id]" \
-        "	rem             [vlan-name]\n" \
+      "\n	rem		[vlan-name]" \
-        "	set_flag        [interface-name] [flag-num]       [0 | 1]\n" \
+      "\n	set_flag	[interface-name] [flag-num] [0 | 1]" \
-        "	set_egress_map  [vlan-name]      [skb_priority]   [vlan_qos]\n" \
+      "\n	set_egress_map	[vlan-name] [skb_priority] [vlan_qos]" \
-        "	set_ingress_map [vlan-name]      [skb_priority]   [vlan_qos]\n" \
+      "\n	set_ingress_map	[vlan-name] [skb_priority] [vlan_qos]" \
-        "	set_name_type   [name-type]"
+      "\n	set_name_type	[name-type]" \
  #define vi_trivial_usage \
         "[OPTION] [FILE]..."
- #define vi_full_usage \
+ #define vi_full_usage "\n\n" \
-        "Edit FILE" \
+        "Edit FILE\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-R	Read-only - do not write to the file"
+ 	USE_FEATURE_VI_COLON( \
+      "\n	-c	Initial command to run ($EXINIT also available)") \
+ 	USE_FEATURE_VI_READONLY( \
+      "\n	-R	Read-only - do not write to the file") \
+      "\n	-H	Short help regarding available features" \
  #define vlock_trivial_usage \
         "[OPTIONS]"
- #define vlock_full_usage \
+ #define vlock_full_usage "\n\n" \
-        "Lock a virtual terminal.  A password is required to unlock." \
+        "Lock a virtual terminal. A password is required to unlock.\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-a	Lock all VTs"
+      "\n	-a	Lock all VTs" \
  #define watch_trivial_usage \
-        "[-n <seconds>] [-t] COMMAND..."
+        "[-n seconds] [-t] COMMAND..."
- #define watch_full_usage \
+ #define watch_full_usage "\n\n" \
-        "Execute a program periodically" \
+        "Execute a program periodically\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-n	Loop period in seconds - default is 2\n" \
+      "\n	-n	Loop period in seconds (default 2)" \
-        "	-t	Don't print header"
+      "\n	-t	Don't print header" \
  #define watch_example_usage \
         "$ watch date\n" \
         "Mon Dec 17 10:31:40 GMT 2000\n" \
-Line 3487
+Line 4645
         "Mon Dec 17 10:31:44 GMT 2000"
  #define watchdog_trivial_usage \
-        "[-t <seconds>] [-F] DEV"
+        "[-t N[ms]] [-T N[ms]] [-F] DEV"
- #define watchdog_full_usage \
+ #define watchdog_full_usage "\n\n" \
-        "Periodically write to watchdog device DEV" \
+        "Periodically write to watchdog device DEV\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-t	Timer period in seconds - default is 30\n" \
+      "\n	-T N	Reboot after N seconds if not reset (default 60)" \
-        "	-F	Stay in the foreground and don't fork"
+      "\n	-t N	Reset every N seconds (default 30)" \
+      "\n	-F	Run in foreground" \
+      "\n" \
+      "\nUse 500ms to specify period in milliseconds" \
  #define wc_trivial_usage \
         "[OPTION]... [FILE]..."
- #define wc_full_usage \
+ #define wc_full_usage "\n\n" \
         "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." \
+        "more than one FILE is specified. With no FILE, read standard input.\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-c	Print the byte counts\n" \
+      "\n	-c	Print the byte counts" \
-        "	-l	Print the newline counts\n" \
+      "\n	-l	Print the newline counts" \
-        "	-L	Print the length of the longest line\n" \
+      "\n	-L	Print the length of the longest line" \
-        "	-w	Print the word counts"
+      "\n	-w	Print the word counts" \
  #define wc_example_usage \
         "$ wc /etc/passwd\n" \
         "     31      46    1365 /etc/passwd\n"
  #define wget_trivial_usage \
-        "[-c|--continue] [-q|--quiet] [-O|--output-document file]\n" \
+ 	USE_FEATURE_WGET_LONG_OPTIONS( \
-        "		[--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \
+        "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document file]\n" \
-        "		[-U|--user-agent agent] url"
+        "	[--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \
- #define wget_full_usage \
+        "	[-U|--user-agent agent] url" \
-        "Retrieve files via HTTP or FTP" \
+ 	) \
-        "\n\nOptions:\n" \
+ 	SKIP_FEATURE_WGET_LONG_OPTIONS( \
-        "	-c	Continue retrieval of aborted transfers\n" \
+        "[-csq] [-O file] [-Y on/off] [-P DIR] [-U agent] url" \
-        "	-q	Quiet mode - do not print\n" \
+ 	)
-        "	-P	Set directory prefix to DIR\n" \
+ #define wget_full_usage "\n\n" \
-        "	-O	Save to filename ('-' for stdout)\n" \
+        "Retrieve files via HTTP or FTP\n" \
-        "	-U	Adjust 'User-Agent' field\n" \
+      "\nOptions:" \
-        "	-Y	Use proxy ('on' or 'off')"
+      "\n	-s	Spider mode - only check file existence" \
+      "\n	-c	Continue retrieval of aborted transfer" \
+      "\n	-q	Quiet" \
+      "\n	-P	Set directory prefix to DIR" \
+      "\n	-O	Save to filename ('-' for stdout)" \
+      "\n	-U	Adjust 'User-Agent' field" \
+      "\n	-Y	Use proxy ('on' or 'off')" \
  #define which_trivial_usage \
-        "[COMMAND ...]"
+        "[COMMAND...]"
- #define which_full_usage \
+ #define which_full_usage "\n\n" \
         "Locate a COMMAND"
  #define which_example_usage \
         "$ which login\n" \
         "/bin/login\n"
  #define who_trivial_usage \
-        " "
+        "[-a]"
- #define who_full_usage \
+ #define who_full_usage "\n\n" \
-        "Print the current user names and related information"
+        "Show who is logged on\n" \
+      "\nOptions:" \
+      "\n	-a	show all" \
  #define whoami_trivial_usage \
         ""
- #define whoami_full_usage \
+ #define whoami_full_usage "\n\n" \
         "Print the user name associated with the current effective user id"
  #define xargs_trivial_usage \
         "[OPTIONS] [COMMAND] [ARGS...]"
- #define xargs_full_usage \
+ #define xargs_full_usage "\n\n" \
-        "Execute COMMAND on every item given by standard input" \
+        "Execute COMMAND on every item given by standard input\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
  	USE_FEATURE_XARGS_SUPPORT_CONFIRMATION( \
-        "	-p	Prompt the user about whether to run each command\n") \
+      "\n	-p	Ask user whether to run each command") \
-        "	-r	Do not run command for empty read lines\n" \
+      "\n	-r	Do not run command if input is empty" \
- 	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") \
+      "\n	-0	Input is separated by NUL characters") \
-        "	-t	Print the command line on stderr before executing it"
+      "\n	-t	Print the command on stderr before execution" \
+      "\n	-e[STR]	STR stops input processing" \
+      "\n	-n N	Pass no more than N args to COMMAND" \
+      "\n	-s N	Pass command line of no more than N bytes" \
+ 	USE_FEATURE_XARGS_SUPPORT_TERMOPT( \
+      "\n	-x	Exit if size is exceeded") \
  #define xargs_example_usage \
         "$ ls | xargs gzip\n" \
         "$ find . -name '*.c' -print | xargs rm\n"
  #define yes_trivial_usage \
         "[OPTION]... [STRING]..."
- #define yes_full_usage \
+ #define yes_full_usage "\n\n" \
         "Repeatedly output a line with all specified STRING(s), or 'y'"
  #define zcat_trivial_usage \
         "FILE"
- #define zcat_full_usage \
+ #define zcat_full_usage "\n\n" \
         "Uncompress to stdout"
  #define zcip_trivial_usage \
         "[OPTIONS] ifname script"
- #define zcip_full_usage \
+ #define zcip_full_usage "\n\n" \
-        "Manage a ZeroConf IPv4 link-local address" \
+        "Manage a ZeroConf IPv4 link-local address\n" \
-        "\n\nOptions:\n" \
+      "\nOptions:" \
-        "	-f              foreground mode\n" \
+      "\n	-f		Run in foreground" \
-        "	-q              quit after address (no daemon)\n" \
+      "\n	-q		Quit after obtaining address" \
-        "	-r 169.254.x.x  request this address first\n" \
+      "\n	-r 169.254.x.x	Request this address first" \
-        "	-v              verbose"
+      "\n	-v		Verbose" \
+      "\n" \
+      "\nWith no -q, runs continuously monitoring for ARP conflicts," \
+      "\nexits only on I/O errors (link down etc)" \
  #endif /* __BB_USAGE_H__ */

 Legend:



Removed from v.815
 


changed lines


 
Added in v.816
 Legend:



Removed from v.815
 


changed lines


 
Added in v.816
-Removed from v.815
+Added in v.816