/[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 983 by niro,
Fri Apr 24 18:33:46 2009 UTC
+revision 984 by niro,
Sun May 30 11:32:42 2010 UTC
 Line 9
   * or
   *    |<5 spaces>"\ntext with tabs"....
   */
+ #ifndef BB_USAGE_H
- #ifndef __BB_USAGE_H__
+ #define BB_USAGE_H 1
- #define __BB_USAGE_H__
  #define NOUSAGE_STR "\b"
+ #define acpid_trivial_usage \
+        "[-d] [-c CONFDIR] [-l LOGFILE] [-e PROC_EVENT_FILE] [EVDEV_EVENT_FILE]..."
+ #define acpid_full_usage "\n\n" \
+        "Listen to ACPI events and spawn specific helpers on event arrival\n" \
+      "\nOptions:" \
+      "\n	-d	Don't daemonize, log to stderr" \
+      "\n	-c DIR	Config directory [/etc/acpi]" \
+      "\n	-e FILE	/proc event file [/proc/acpi/event]" \
+      "\n	-l FILE	Log file [/var/log/acpid]" \
+ 	IF_FEATURE_ACPID_COMPAT( \
+      "\n\nAccept and ignore compatibility options -g -m -s -S -v" \
+ 	)
+ #define acpid_example_usage \
+        "# acpid -l /var/log/my-acpi-log\n" \
+        "# acpid -d /dev/input/event*\n"
  #define addgroup_trivial_usage \
-        "[-g GID] " USE_FEATURE_ADDUSER_TO_GROUP("[user_name] ") "group_name"
+        "[-g GID] " IF_FEATURE_ADDUSER_TO_GROUP("[USER] ") "GROUP"
  #define addgroup_full_usage "\n\n" \
-        "Add a group " USE_FEATURE_ADDUSER_TO_GROUP("or add an user to a group") "\n" \
+        "Add a group " IF_FEATURE_ADDUSER_TO_GROUP("or add a user to a group") "\n" \
       "\nOptions:" \
       "\n	-g GID	Group id" \
+      "\n	-S	Create a system group" \
  #define adduser_trivial_usage \
-        "[OPTIONS] user_name"
+        "[OPTIONS] USER"
  #define adduser_full_usage "\n\n" \
-        "Add an user\n" \
+        "Add a user\n" \
       "\nOptions:" \
       "\n	-h DIR		Home directory" \
       "\n	-g GECOS	GECOS field" \
       "\n	-s SHELL	Login shell" \
-      "\n	-G GROUP	Add user to existing group" \
+      "\n	-G GRP		Add user to existing group" \
       "\n	-S		Create a system user" \
-      "\n	-D		Do not assign a password" \
+      "\n	-D		Don't assign a password" \
-      "\n	-H		Do not create home directory" \
+      "\n	-H		Don't create home directory" \
+      "\n	-u UID		User id" \
  #define adjtimex_trivial_usage \
-        "[-q] [-o offset] [-f frequency] [-p timeconstant] [-t tick]"
+        "[-q] [-o OFF] [-f FREQ] [-p TCONST] [-t TICK]"
  #define adjtimex_full_usage "\n\n" \
-        "Read and optionally set system timebase parameters. See adjtimex(2).\n" \
+        "Read and optionally set system timebase parameters. See adjtimex(2)\n" \
       "\nOptions:" \
-      "\n	-q		Quiet" \
+      "\n	-q	Quiet" \
-      "\n	-o offset	Time offset, microseconds" \
+      "\n	-o OFF	Time offset, microseconds" \
-      "\n	-f frequency	Frequency adjust, integer kernel units (65536 is 1ppm)" \
+      "\n	-f FREQ	Frequency adjust, integer kernel units (65536 is 1ppm)" \
-      "\n			(positive values make clock run faster)" \
+      "\n		(positive values make clock run faster)" \
-      "\n	-t tick		Microseconds per tick, usually 10000" \
+      "\n	-t TICK	Microseconds per tick, usually 10000" \
-      "\n	-p timeconstant" \
+      "\n	-p TCONST" \
  #define ar_trivial_usage \
         "[-o] [-v] [-p] [-t] [-x] ARCHIVE FILES"
-Line 61
+Line 78
       "\n	-v	Verbose" \
  #define arp_trivial_usage \
-        "\n" \
+      "\n[-vn]	[-H HWTYPE] [-i IF] -a [HOSTNAME]" \
-        "[-vn]	[-H type] [-i if] -a [hostname]\n" \
+      "\n[-v]		    [-i IF] -d HOSTNAME [pub]" \
-        "[-v]		  [-i if] -d hostname [pub]\n" \
+      "\n[-v]	[-H HWTYPE] [-i IF] -s HOSTNAME HWADDR [temp]" \
-        "[-v]	[-H type] [-i if] -s hostname hw_addr [temp]\n" \
+      "\n[-v]	[-H HWTYPE] [-i IF] -s HOSTNAME HWADDR [netmask MASK] pub" \
-        "[-v]	[-H type] [-i if] -s hostname hw_addr [netmask nm] pub\n" \
+      "\n[-v]	[-H HWTYPE] [-i IF] -Ds HOSTNAME IFACE [netmask MASK] pub"
-        "[-v]	[-H type] [-i if] -Ds hostname ifa [netmask nm] pub\n"
  #define arp_full_usage "\n\n" \
         "Manipulate ARP cache\n" \
       "\nOptions:" \
-Line 81
+Line 97
         "\n	-H HWTYPE	Hardware address type" \
  #define arping_trivial_usage \
-        "[-fqbDUA] [-c count] [-w timeout] [-I dev] [-s sender] target"
+        "[-fqbDUA] [-c CNT] [-w TIMEOUT] [-I IFACE] [-s SRC_IP] DST_IP"
  #define arping_full_usage "\n\n" \
         "Send ARP requests/replies\n" \
       "\nOptions:" \
-Line 92
+Line 108
       "\n	-U		Unsolicited ARP mode, update your neighbors" \
       "\n	-A		ARP answer mode, update your neighbors" \
       "\n	-c N		Stop after sending N ARP requests" \
-      "\n	-w timeout	Time to wait for ARP reply, in seconds" \
+      "\n	-w TIMEOUT	Time to wait for ARP reply, seconds" \
-      "\n	-I dev		Interface to use (default eth0)" \
+      "\n	-I IFACE	Interface to use (default eth0)" \
-      "\n	-s sender	Sender IP address" \
+      "\n	-s SRC_IP	Sender IP address" \
-      "\n	target		Target IP address" \
+      "\n	DST_IP		Target IP address" \
  #define sh_trivial_usage NOUSAGE_STR
  #define sh_full_usage ""
-Line 103
+Line 119
  #define ash_full_usage ""
  #define hush_trivial_usage NOUSAGE_STR
  #define hush_full_usage ""
+ #define lash_trivial_usage NOUSAGE_STR
+ #define lash_full_usage ""
  #define msh_trivial_usage NOUSAGE_STR
  #define msh_full_usage ""
  #define awk_trivial_usage \
-        "[OPTION]... [program-text] [FILE...]"
+        "[OPTIONS] [AWK_PROGRAM] [FILE]..."
  #define awk_full_usage "\n\n" \
         "Options:" \
-      "\n	-v var=val	Set variable" \
+      "\n	-v VAR=VAL	Set variable" \
-      "\n	-F sep		Use sep as field separator" \
+      "\n	-F SEP		Use SEP as field separator" \
-      "\n	-f file		Read program from file" \
+      "\n	-f FILE		Read program from FILE" \
  #define basename_trivial_usage \
         "FILE [SUFFIX]"
  #define basename_full_usage "\n\n" \
-        "Strip directory path and suffixes from FILE.\n" \
+        "Strip directory path and .SUFFIX from FILE\n"
-        "If specified, also remove any trailing SUFFIX."
  #define basename_example_usage \
         "$ basename /usr/local/bin/foo\n" \
         "foo\n" \
-Line 127
+Line 144
         "$ basename /foo/bar.txt .txt\n" \
         "bar"
+ #define beep_trivial_usage \
+        "-f FREQ -l LEN -d DELAY -r COUNT -n"
+ #define beep_full_usage "\n\n" \
+        "Options:" \
+      "\n	-f	Frequency in Hz" \
+      "\n	-l	Length in ms" \
+      "\n	-d	Delay in ms" \
+      "\n	-r	Repetitions" \
+      "\n	-n	Start new tone" \
  #define fbsplash_trivial_usage \
         "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]"
  #define fbsplash_full_usage "\n\n" \
-        "Options:\n" \
+        "Options:" \
       "\n	-s	Image" \
       "\n	-c	Hide cursor" \
       "\n	-d	Framebuffer device (default /dev/fb0)" \
-Line 143
+Line 170
  #define brctl_trivial_usage \
         "COMMAND [BRIDGE [INTERFACE]]"
  #define brctl_full_usage "\n\n" \
-        "Manage ethernet bridges.\n" \
+        "Manage ethernet bridges\n" \
       "\nCommands:" \
- 	USE_FEATURE_BRCTL_SHOW( \
+ 	IF_FEATURE_BRCTL_SHOW( \
       "\n	show			Show a list of bridges" \
  	) \
       "\n	addbr BRIDGE		Create BRIDGE" \
       "\n	delbr BRIDGE		Delete BRIDGE" \
       "\n	addif BRIDGE IFACE	Add IFACE to BRIDGE" \
       "\n	delif BRIDGE IFACE	Delete IFACE from BRIDGE" \
- 	USE_FEATURE_BRCTL_FANCY( \
+ 	IF_FEATURE_BRCTL_FANCY( \
       "\n	setageing BRIDGE TIME		Set ageing time" \
       "\n	setfd BRIDGE TIME		Set bridge forward delay" \
       "\n	sethello BRIDGE TIME		Set hello time" \
-Line 164
+Line 191
  	) \
  #define bunzip2_trivial_usage \
-        "[OPTION]... [FILE]"
+        "[OPTIONS] [FILE]..."
  #define bunzip2_full_usage "\n\n" \
-        "Uncompress FILE (or standard input if FILE is '-' or omitted)\n" \
+        "Uncompress FILEs (or stdin)\n" \
       "\nOptions:" \
-      "\n	-c	Write to standard output" \
+      "\n	-c	Write to stdout" \
       "\n	-f	Force" \
  #define bzip2_trivial_usage \
-        "[OPTION]... [FILE]..."
+        "[OPTIONS] [FILE]..."
  #define bzip2_full_usage "\n\n" \
-        "Compress FILE(s) with bzip2 algorithm.\n" \
+        "Compress FILEs (or stdin) with bzip2 algorithm\n" \
-        "When FILE is '-' or unspecified, reads standard input. Implies -c.\n" \
       "\nOptions:" \
-      "\n	-c	Write to standard output" \
+      "\n	-c	Write to stdout" \
       "\n	-d	Decompress" \
       "\n	-f	Force" \
       "\n	-1..-9	Compression level" \
-Line 185
+Line 211
  #define busybox_notes_usage \
         "Hello world!\n"
+ #define lzop_trivial_usage \
+        "[-cfvd123456789CF] [FILE]..."
+ #define lzop_full_usage "\n\n" \
+        "	-c	Write to stdout" \
+      "\n	-f	Force" \
+      "\n	-v	Verbose" \
+      "\n	-d	Decompress" \
+      "\n	-F	Don't store or verify checksum" \
+      "\n	-C	Also write checksum of compressed block" \
+      "\n	-1..9	Compression level" \
+ #define lzopcat_trivial_usage \
+        "[-vCF] [FILE]..."
+ #define lzopcat_full_usage "\n\n" \
+        "	-v	Verbose" \
+      "\n	-F	Don't store or verify checksum" \
+ #define unlzop_trivial_usage \
+        "[-cfvCF] [FILE]..."
+ #define unlzop_full_usage "\n\n" \
+        "	-c	Write to stdout" \
+      "\n	-f	Force" \
+      "\n	-v	Verbose" \
+      "\n	-F	Don't store or verify checksum" \
  #define bzcat_trivial_usage \
         "FILE"
  #define bzcat_full_usage "\n\n" \
         "Uncompress to stdout"
  #define unlzma_trivial_usage \
-        "[OPTION]... [FILE]"
+        "[OPTIONS] [FILE]..."
  #define unlzma_full_usage "\n\n" \
-        "Uncompress FILE (or standard input if FILE is '-' or omitted)\n" \
+        "Uncompress FILE (or stdin)\n" \
       "\nOptions:" \
-      "\n	-c	Write to standard output" \
+      "\n	-c	Write to stdout" \
       "\n	-f	Force" \
  #define lzmacat_trivial_usage \
-Line 204
+Line 255
         "Uncompress to stdout"
  #define cal_trivial_usage \
-        "[-jy] [[month] year]"
+        "[-jy] [[MONTH] YEAR]"
  #define cal_full_usage "\n\n" \
         "Display a calendar\n" \
       "\nOptions:" \
-Line 214
+Line 265
  #define cat_trivial_usage \
         "[-u] [FILE]..."
  #define cat_full_usage "\n\n" \
-        "Concatenate FILE(s) and print them to stdout\n" \
+        "Concatenate FILEs and print them to stdout\n" \
       "\nOptions:" \
       "\n	-u	Use unbuffered i/o (ignored)" \
-Line 240
+Line 291
         "chat '' ATZ OK ATD123456 CONNECT '' ogin: pppuser word: ppppass '~'" \
  #define chattr_trivial_usage \
-        "[-R] [-+=AacDdijsStTu] [-v version] files..."
+        "[-R] [-+=AacDdijsStTu] [-v VERSION] [FILE]..."
  #define chattr_full_usage "\n\n" \
         "Change file attributes on an ext2 fs\n" \
       "\nModifiers:" \
-Line 252
+Line 303
       "\n	a	Append mode only" \
       "\n	c	Enable compress" \
       "\n	D	Write dir contents synchronously" \
-      "\n	d	Do not backup with dump" \
+      "\n	d	Don't backup with dump" \
       "\n	i	Cannot be modified (immutable)" \
       "\n	j	Write all data to journal first" \
       "\n	s	Zero disk storage when deleted" \
-Line 260
+Line 311
       "\n	t	Disable tail-merging of partial blocks with other files" \
       "\n	u	Allow file to be undeleted" \
       "\nOptions:" \
-      "\n	-R	Recursively list subdirectories" \
+      "\n	-R	Recurse" \
       "\n	-v	Set the file's version/generation number" \
  #define chcon_trivial_usage \
         "[OPTIONS] CONTEXT FILE..." \
         "\n	chcon [OPTIONS] [-u USER] [-r ROLE] [-l RANGE] [-t TYPE] FILE..." \
- 	USE_FEATURE_CHCON_LONG_OPTIONS( \
+ 	IF_FEATURE_CHCON_LONG_OPTIONS( \
         "\n	chcon [OPTIONS] --reference=RFILE FILE..." \
  	)
  #define chcon_full_usage "\n\n" \
         "Change the security context of each FILE to CONTEXT\n" \
- 	USE_FEATURE_CHCON_LONG_OPTIONS( \
+ 	IF_FEATURE_CHCON_LONG_OPTIONS( \
       "\n	-v,--verbose		Verbose" \
       "\n	-c,--changes		Report changes made" \
       "\n	-h,--no-dereference	Affect symlinks instead of their targets" \
-Line 281
+Line 332
       "\n	-r,--role=ROLE		security context" \
       "\n	-t,--type=TYPE" \
       "\n	-l,--range=RANGE" \
-      "\n	-R,--recursive		Recurse subdirectories" \
+      "\n	-R,--recursive		Recurse" \
  	) \
- 	SKIP_FEATURE_CHCON_LONG_OPTIONS( \
+ 	IF_NOT_FEATURE_CHCON_LONG_OPTIONS( \
       "\n	-v	Verbose" \
       "\n	-c	Report changes made" \
       "\n	-h	Affect symlinks instead of their targets" \
-Line 292
+Line 343
       "\n	-r ROLE" \
       "\n	-t TYPE" \
       "\n	-l RNG" \
-      "\n	-R	Recurse subdirectories" \
+      "\n	-R	Recurse" \
  	)
  #define chmod_trivial_usage \
-        "[-R"USE_DESKTOP("cvf")"] MODE[,MODE]... FILE..."
+        "[-R"IF_DESKTOP("cvf")"] MODE[,MODE]... FILE..."
  #define chmod_full_usage "\n\n" \
         "Each MODE is one or more of the letters ugoa, one of the\n" \
         "symbols +-= and one or more of the letters rwxst\n" \
       "\nOptions:" \
-      "\n	-R	Recurse directories" \
+      "\n	-R	Recurse" \
- 	USE_DESKTOP( \
+ 	IF_DESKTOP( \
       "\n	-c	List changed files" \
       "\n	-v	List all files" \
       "\n	-f	Hide errors" \
-Line 318
+Line 369
         "-r--r--r--    1 root     root            0 Apr 12 18:25 /tmp/foo\n"
  #define chgrp_trivial_usage \
-        "[-RhLHP"USE_DESKTOP("cvf")"]... GROUP FILE..."
+        "[-RhLHP"IF_DESKTOP("cvf")"]... GROUP FILE..."
  #define chgrp_full_usage "\n\n" \
         "Change the group membership of each FILE to GROUP\n" \
       "\nOptions:" \
-      "\n	-R	Recurse directories" \
+      "\n	-R	Recurse" \
       "\n	-h	Affect symlinks instead of symlink targets" \
       "\n	-L	Traverse all symlinks to directories" \
       "\n	-H	Traverse symlinks on command line only" \
-      "\n	-P	Do not traverse symlinks (default)" \
+      "\n	-P	Don't traverse symlinks (default)" \
- 	USE_DESKTOP( \
+ 	IF_DESKTOP( \
       "\n	-c	List changed files" \
       "\n	-v	Verbose" \
       "\n	-f	Hide errors" \
-Line 340
+Line 391
         "-r--r--r--    1 andersen root            0 Apr 12 18:25 /tmp/foo\n"
  #define chown_trivial_usage \
-        "[-RhLHP"USE_DESKTOP("cvf")"]... OWNER[<.|:>[GROUP]] FILE..."
+        "[-RhLHP"IF_DESKTOP("cvf")"]... OWNER[<.|:>[GROUP]] FILE..."
  #define chown_full_usage "\n\n" \
         "Change the owner and/or group of each FILE to OWNER and/or GROUP\n" \
       "\nOptions:" \
-      "\n	-R	Recurse directories" \
+      "\n	-R	Recurse" \
       "\n	-h	Affect symlinks instead of symlink targets" \
       "\n	-L	Traverse all symlinks to directories" \
       "\n	-H	Traverse symlinks on command line only" \
-      "\n	-P	Do not traverse symlinks (default)" \
+      "\n	-P	Don't traverse symlinks (default)" \
- 	USE_DESKTOP( \
+ 	IF_DESKTOP( \
       "\n	-c	List changed files" \
       "\n	-v	List all files" \
       "\n	-f	Hide errors" \
-Line 385
+Line 436
       "\n	-c BYTES	Limit core file size" \
       "\n	-v		Verbose" \
       "\n	-P		Create new process group" \
-      "\n	-0		Close standard input" \
+      "\n	-0		Close stdin" \
-      "\n	-1		Close standard output" \
+      "\n	-1		Close stdout" \
-      "\n	-2		Close standard error" \
+      "\n	-2		Close stderr" \
  #define setuidgid_trivial_usage \
-        "account prog args"
+        "USER PROG ARGS"
  #define setuidgid_full_usage "\n\n" \
-        "Set uid and gid to account's uid and gid, removing all supplementary\n" \
+        "Set uid and gid to USER's uid and gid, removing all supplementary\n" \
         "groups and run PROG"
  #define envuidgid_trivial_usage \
-        "account prog args"
+        "USER PROG ARGS"
  #define envuidgid_full_usage "\n\n" \
-        "Set $UID to account's uid and $GID to account's gid and run PROG"
+        "Set $UID to USER's uid and $GID to USER's gid and run PROG"
  #define envdir_trivial_usage \
-        "dir prog args"
+        "DIR PROG ARGS"
  #define envdir_full_usage "\n\n" \
         "Set various environment variables as specified by files\n" \
         "in the directory dir and run PROG"
-Line 426
+Line 477
       "\n			a SIGXCPU after N seconds" \
  #define chroot_trivial_usage \
-        "NEWROOT [COMMAND...]"
+        "NEWROOT [PROG ARGS]"
  #define chroot_full_usage "\n\n" \
-        "Run COMMAND with root directory set to NEWROOT"
+        "Run PROG with root directory set to NEWROOT"
  #define chroot_example_usage \
         "$ ls -l /bin/ls\n" \
         "lrwxrwxrwx    1 root     root          12 Apr 13 00:46 /bin/ls -> /BusyBox\n" \
-Line 453
+Line 504
         "Clear screen"
  #define cmp_trivial_usage \
-        "[-l] [-s] FILE1 [FILE2" USE_DESKTOP(" [SKIP1 [SKIP2]") "]]"
+        "[-l] [-s] FILE1 [FILE2" IF_DESKTOP(" [SKIP1 [SKIP2]") "]]"
  #define cmp_full_usage "\n\n" \
         "Compares FILE1 vs stdin if FILE2 is not specified\n" \
       "\nOptions:" \
-Line 475
+Line 526
  #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 "\n\n" \
-        "The bbsh shell (command interpreter)"
  #define chrt_trivial_usage \
-        "[OPTION]... [prio] [pid | command [arg]...]"
+        "[OPTIONS] [PRIO] [PID | PROG ARGS]"
  #define chrt_full_usage "\n\n" \
         "Manipulate real-time attributes of a process\n" \
       "\nOptions:" \
-      "\n	-p	Operate on pid" \
+      "\n	-p	Operate on PID" \
-      "\n	-r	Set scheduling policy to SCHED_RR" \
+      "\n	-r	Set SCHED_RR scheduling" \
-      "\n	-f	Set scheduling policy to SCHED_FIFO" \
+      "\n	-f	Set SCHED_FIFO scheduling" \
-      "\n	-o	Set scheduling policy to SCHED_OTHER" \
+      "\n	-o	Set SCHED_OTHER scheduling" \
       "\n	-m	Show min and max priorities" \
  #define chrt_example_usage \
-Line 498
+Line 543
         "You need CAP_SYS_NICE privileges to set scheduling attributes of a process"
  #define cp_trivial_usage \
-        "[OPTION]... SOURCE DEST"
+        "[OPTIONS] SOURCE DEST"
  #define cp_full_usage "\n\n" \
         "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY\n" \
       "\nOptions:" \
       "\n	-a	Same as -dpR" \
- 	USE_SELINUX( \
+ 	IF_SELINUX( \
       "\n	-c	Preserve security context" \
  	) \
-      "\n	-d,-P	Preserve links" \
+      "\n	-R,-r	Recurse" \
-      "\n	-H,-L	Dereference all symlinks (default)" \
+      "\n	-d,-P	Preserve symlinks (default if -R)" \
+      "\n	-L	Follow all symlinks" \
+      "\n	-H	Follow symlinks on command line" \
       "\n	-p	Preserve file attributes if possible" \
       "\n	-f	Force overwrite" \
       "\n	-i	Prompt before overwrite" \
-      "\n	-R,-r	Recurse directories" \
       "\n	-l,-s	Create (sym)links" \
  #define cpio_trivial_usage \
-        "-[dim" USE_FEATURE_CPIO_O("o") "tuv][F cpiofile]" \
+        "[-dmvu] [-F FILE]" IF_FEATURE_CPIO_O(" [-H newc]") \
-        USE_FEATURE_CPIO_O( "[H newc]" )
+        " [-ti"IF_FEATURE_CPIO_O("o")"]" IF_FEATURE_CPIO_P(" [-p DIR]")
  #define cpio_full_usage "\n\n" \
         "Extract or list files from a cpio archive" \
- 	USE_FEATURE_CPIO_O( ", or create a cpio archive" ) \
+ 	IF_FEATURE_CPIO_O(", or" \
+      "\ncreate an archive" IF_FEATURE_CPIO_P(" (-o) or copy files (-p)") \
+ 		" using file list on stdin" \
+ 	) \
       "\n" \
-        "Main operation mode:" \
+      "\nMain operation mode:" \
-      "\n	d	Make leading directories" \
+      "\n	-t	List" \
-      "\n	i	Extract" \
+      "\n	-i	Extract" \
-      "\n	m	Preserve mtime" \
+ 	IF_FEATURE_CPIO_O( \
- 	USE_FEATURE_CPIO_O( \
+      "\n	-o	Create (requires -H newc)" \
-      "\n	o	Create" \
+ 	) \
-      "\n	H newc	Define format" \
+ 	IF_FEATURE_CPIO_P( \
+      "\n	-p DIR	Copy files to DIR" \
+ 	) \
+      "\nOptions:" \
+      "\n	-d	Make leading directories" \
+      "\n	-m	Preserve mtime" \
+      "\n	-v	Verbose" \
+      "\n	-u	Overwrite" \
+      "\n	-F FILE	Input (-t,-i,-p) or output (-o) file" \
+ 	IF_FEATURE_CPIO_O( \
+      "\n	-H newc	Archive format" \
  	) \
-      "\n	t	List" \
-      "\n	v	Verbose" \
-      "\n	u	Unconditional overwrite" \
-      "\n	F	Input from file" \
  #define crond_trivial_usage \
-        "-fbS -l N " USE_FEATURE_CROND_D("-d N ") "-L LOGFILE -c DIR"
+        "-fbS -l N " IF_FEATURE_CROND_D("-d N ") "-L LOGFILE -c DIR"
  #define crond_full_usage "\n\n" \
         "	-f	Foreground" \
       "\n	-b	Background (default)" \
       "\n	-S	Log to syslog (default)" \
       "\n	-l	Set log level. 0 is the most verbose, default 8" \
- 	USE_FEATURE_CROND_D( \
+ 	IF_FEATURE_CROND_D( \
       "\n	-d	Set log level, log to stderr" \
  	) \
       "\n	-L	Log to file" \
-Line 558
+Line 613
       "\n	FILE	Replace crontab by FILE ('-': stdin)" \
  #define cryptpw_trivial_usage \
-        "[-a des|md5] [string]"
+        "[OPTIONS] [PASSWORD] [SALT]"
+ /* We do support -s, we just don't mention it */
  #define cryptpw_full_usage "\n\n" \
-        "Output crypted string.\n" \
+        "Crypt the PASSWORD using crypt(3)\n" \
-        "If string isn't supplied on cmdline, read it from stdin.\n" \
       "\nOptions:" \
-      "\n	-a	Algorithm to use (default: md5)" \
+ 	IF_LONG_OPTS( \
+      "\n	-P,--password-fd=N	Read password from fd N" \
+ /*   "\n	-s,--stdin		Use stdin; like -P0" */ \
+      "\n	-m,--method=TYPE	Encryption method TYPE" \
+      "\n	-S,--salt=SALT" \
+ 	) \
+ 	IF_NOT_LONG_OPTS( \
+      "\n	-P N	Read password from fd N" \
+ /*   "\n	-s	Use stdin; like -P0" */ \
+      "\n	-m TYPE	Encryption method TYPE" \
+      "\n	-S SALT" \
+ 	) \
+ /* mkpasswd is an alias to cryptpw */
+ #define mkpasswd_trivial_usage \
+        "[OPTIONS] [PASSWORD] [SALT]"
+ /* We do support -s, we just don't mention it */
+ #define mkpasswd_full_usage "\n\n" \
+        "Crypt the PASSWORD using crypt(3)\n" \
+      "\nOptions:" \
+ 	IF_LONG_OPTS( \
+      "\n	-P,--password-fd=N	Read password from fd N" \
+ /*   "\n	-s,--stdin		Use stdin; like -P0" */ \
+      "\n	-m,--method=TYPE	Encryption method TYPE" \
+      "\n	-S,--salt=SALT" \
+ 	) \
+ 	IF_NOT_LONG_OPTS( \
+      "\n	-P N	Read password from fd N" \
+ /*   "\n	-s	Use stdin; like -P0" */ \
+      "\n	-m TYPE	Encryption method TYPE" \
+      "\n	-S SALT" \
+ 	) \
  #define cttyhack_trivial_usage NOUSAGE_STR
  #define cttyhack_full_usage ""
  #define cut_trivial_usage \
-        "[OPTION]... [FILE]..."
+        "[OPTIONS] [FILE]..."
  #define cut_full_usage "\n\n" \
-        "Print selected fields from each input FILE to standard output\n" \
+        "Print selected fields from each input FILE to stdout\n" \
       "\nOptions:" \
       "\n	-b LIST	Output only bytes from LIST" \
       "\n	-c LIST	Output only characters from LIST" \
-Line 587
+Line 674
         "world\n"
  #define date_trivial_usage \
-        "[OPTION]... [+FMT] [TIME]"
+        "[OPTIONS] [+FMT] [TIME]"
  #define date_full_usage "\n\n" \
         "Display time (using +FMT), or set time\n" \
       "\nOptions:" \
+ 	IF_NOT_LONG_OPTS( \
+      "\n	[-s] TIME	Set time to TIME" \
       "\n	-u		Work in UTC (don't convert to local time)" \
-      "\n	-R		Output RFC-822 compliant date string" \
+      "\n	-R		Output RFC-2822 compliant date string" \
- 	USE_FEATURE_DATE_ISOFMT( \
+ 	) IF_LONG_OPTS( \
+      "\n	[-s,--set] TIME	Set time to TIME" \
+      "\n	-u,--utc	Work in UTC (don't convert to local time)" \
+      "\n	-R,--rfc-2822	Output RFC-2822 compliant date string" \
+ 	) \
+ 	IF_FEATURE_DATE_ISOFMT( \
       "\n	-I[SPEC]	Output ISO-8601 compliant date string" \
       "\n			SPEC='date' (default) for date only," \
       "\n			'hours', 'minutes', or 'seconds' for date and" \
       "\n			time to the indicated precision" \
- 	) \
+ 	) IF_NOT_LONG_OPTS( \
-      "\n	-d TIME		Display TIME, not 'now'" \
       "\n	-r FILE		Display last modification time of FILE" \
-      "\n	[-s] TIME	Set time to TIME" \
+      "\n	-d TIME		Display TIME, not 'now'" \
- 	USE_FEATURE_DATE_ISOFMT( \
+ 	) IF_LONG_OPTS( \
-      "\n	-D FMT		Use FMT for str->date conversion" \
+      "\n	-r,--reference FILE	Display last modification time of FILE" \
+      "\n	-d,--date TIME	Display TIME, not 'now'" \
+ 	) \
+ 	IF_FEATURE_DATE_ISOFMT( \
+      "\n	-D FMT		Use FMT for -d TIME conversion" \
  	) \
       "\n" \
-      "\nRecognized formats for TIME:" \
+      "\nRecognized TIME formats:" \
       "\n	hh:mm[:ss]" \
       "\n	[YYYY.]MM.DD-hh:mm[:ss]" \
       "\n	YYYY-MM-DD hh:mm[:ss]" \
-      "\n	MMDDhhmm[[YY]YY][.ss]" \
+      "\n	[[[[[YY]YY]MM]DD]hh]mm[.ss]" \
  #define date_example_usage \
         "$ date\n" \
-Line 624
+Line 721
         "p - print top of the stack (without altering the stack),\n" \
         "f - print entire stack, o - pop the value and set output radix\n" \
         "(value must be 10 or 16).\n" \
-        "Examples: 'dc 2 2 add' -> 4, 'dc 8 8 * 2 2 + /' -> 16.\n" \
+        "Examples: 'dc 2 2 add' -> 4, 'dc 8 8 * 2 2 + /' -> 16\n" \
  #define dc_example_usage \
         "$ dc 2 2 + p\n" \
-Line 639
+Line 736
         "64\n"
  #define dd_trivial_usage \
-        "[if=FILE] [of=FILE] " USE_FEATURE_DD_IBS_OBS("[ibs=N] [obs=N] ") "[bs=N] [count=N] [skip=N]\n" \
+        "[if=FILE] [of=FILE] " IF_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|fsync]")
+        "	[seek=N]" IF_FEATURE_DD_IBS_OBS(" [conv=notrunc|noerror|sync|fsync]")
  #define dd_full_usage "\n\n" \
         "Copy a file with converting and formatting\n" \
       "\nOptions:" \
       "\n	if=FILE		Read from FILE instead of stdin" \
       "\n	of=FILE		Write to FILE instead of stdout" \
       "\n	bs=N		Read and write N bytes at a time" \
- 	USE_FEATURE_DD_IBS_OBS( \
+ 	IF_FEATURE_DD_IBS_OBS( \
       "\n	ibs=N		Read N bytes at a time" \
  	) \
- 	USE_FEATURE_DD_IBS_OBS( \
+ 	IF_FEATURE_DD_IBS_OBS( \
       "\n	obs=N		Write N bytes at a time" \
  	) \
       "\n	count=N		Copy only N input blocks" \
       "\n	skip=N		Skip N input blocks" \
       "\n	seek=N		Skip N output blocks" \
- 	USE_FEATURE_DD_IBS_OBS( \
+ 	IF_FEATURE_DD_IBS_OBS( \
       "\n	conv=notrunc	Don't truncate output file" \
       "\n	conv=noerror	Continue after read errors" \
       "\n	conv=sync	Pad blocks with zeros" \
-Line 677
+Line 774
         "Deallocate unused virtual terminal /dev/ttyN"
  #define delgroup_trivial_usage \
- 	USE_FEATURE_DEL_USER_FROM_GROUP("[USER] ")"GROUP"
+ 	IF_FEATURE_DEL_USER_FROM_GROUP("[USER] ")"GROUP"
  #define delgroup_full_usage "\n\n" \
         "Delete group GROUP from the system" \
- 	USE_FEATURE_DEL_USER_FROM_GROUP(" or user USER from group GROUP")
+ 	IF_FEATURE_DEL_USER_FROM_GROUP(" or user USER from group GROUP")
  #define deluser_trivial_usage \
         "USER"
-Line 700
+Line 797
       "\n	VALUE	Data to be written" \
  #define devfsd_trivial_usage \
-        "mntpnt [-v]" USE_DEVFSD_FG_NP("[-fg][-np]")
+        "mntpnt [-v]" IF_DEVFSD_FG_NP("[-fg][-np]")
  #define devfsd_full_usage "\n\n" \
         "Manage devfs permissions and old device name symlinks\n" \
       "\nOptions:" \
       "\n	mntpnt	The mount point where devfs is mounted" \
       "\n	-v	Print the protocol version numbers for devfsd" \
       "\n		and the kernel-side protocol version and exit" \
- 	USE_DEVFSD_FG_NP( \
+ 	IF_DEVFSD_FG_NP( \
       "\n	-fg	Run in foreground" \
       "\n	-np	Exit after parsing the configuration file" \
       "\n		and processing synthetic REGISTER events," \
-      "\n		do not poll for events" \
+      "\n		don't poll for events" \
  	)
  #define df_trivial_usage \
  	"[-Pk" \
- 	USE_FEATURE_HUMAN_READABLE("mh") \
+ 	IF_FEATURE_HUMAN_READABLE("mh") \
- 	USE_FEATURE_DF_FANCY("ai] [-B SIZE") \
+ 	IF_FEATURE_DF_FANCY("ai] [-B SIZE") \
- 	"] [FILESYSTEM...]"
+ 	"] [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( \
+ 	IF_FEATURE_HUMAN_READABLE( \
       "\n	-m	1M-byte blocks" \
       "\n	-h	Human readable (e.g. 1K 243M 2G)" \
  	) \
- 	USE_FEATURE_DF_FANCY( \
+ 	IF_FEATURE_DF_FANCY( \
       "\n	-a	Show all filesystems" \
       "\n	-i	Inodes" \
       "\n	-B SIZE	Blocksize" \
-Line 750
+Line 847
         "/dev/sda3             17381728  17107080    274648      98% /\n"
  #define dhcprelay_trivial_usage \
-        "[client1,client2,...] [server_device]"
+        "CLIENT_IFACE[,CLIENT_IFACE2]... SERVER_IFACE [SERVER_IP]"
  #define dhcprelay_full_usage "\n\n" \
-        "Relay dhcp requests from client devices to server device.\n" \
+        "Relay DHCP requests between clients and server" \
-        "Pass clients as CSV"
  #define diff_trivial_usage \
-        "[-abdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2"
+        "[-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2"
  #define diff_full_usage "\n\n" \
         "Compare files line by line and output the differences between them.\n" \
         "This implementation supports unified diffs only.\n" \
       "\nOptions:" \
       "\n	-a	Treat all files as text" \
       "\n	-b	Ignore changes in the amount of whitespace" \
+      "\n	-B	Ignore changes whose lines are all blank" \
       "\n	-d	Try hard to find a smaller set of changes" \
       "\n	-i	Ignore case differences" \
       "\n	-L	Use LABEL instead of the filename in the unified header" \
       "\n	-N	Treat absent files as empty" \
       "\n	-q	Output only whether files differ" \
-      "\n	-r	Recursively compare subdirectories" \
+      "\n	-r	Recurse" \
       "\n	-S	Start with FILE when comparing directories" \
       "\n	-T	Make tabs line up by prefixing a tab when necessary" \
       "\n	-s	Report when two files are the same" \
-Line 796
+Line 893
       "\n	-s SIZE		Buffer size" \
  #define dnsd_trivial_usage \
-        "[-c config] [-t seconds] [-p port] [-i iface-ip] [-d]"
+        "[-dvs] [-c CONFFILE] [-t TTL_SEC] [-p PORT] [-i ADDR]"
  #define dnsd_full_usage "\n\n" \
         "Small static DNS server daemon\n" \
       "\nOptions:" \
-      "\n	-c	Config filename" \
+      "\n	-c FILE	Config file" \
-      "\n	-t	TTL in seconds" \
+      "\n	-t SEC	TTL" \
-      "\n	-p	Listening port" \
+      "\n	-p PORT	Listen on PORT" \
-      "\n	-i	Listening ip (default all)" \
+      "\n	-i ADDR	Listen on ADDR" \
       "\n	-d	Daemonize" \
+      "\n	-v	Verbose" \
+      "\n	-s	Send successful replies only. Use this if you want" \
+      "\n		to use /etc/resolv.conf with two nameserver lines:" \
+      "\n			nameserver DNSD_SERVER" \
+      "\n			nameserver NORNAL_DNS_SERVER" \
  #define dos2unix_trivial_usage \
-        "[option] [FILE]"
+        "[OPTIONS] [FILE]"
  #define dos2unix_full_usage "\n\n" \
-        "Convert FILE from dos to unix format.\n" \
+        "Convert FILE in-place from DOS to Unix format.\n" \
+        "When no file is given, use stdin/stdout.\n" \
+      "\nOptions:" \
+      "\n	-u	dos2unix" \
+      "\n	-d	unix2dos" \
+ #define unix2dos_trivial_usage \
+        "[OPTIONS] [FILE]"
+ #define unix2dos_full_usage "\n\n" \
+        "Convert FILE in-place from Unix to DOS format.\n" \
         "When no file is given, use stdin/stdout.\n" \
       "\nOptions:" \
       "\n	-u	dos2unix" \
       "\n	-d	unix2dos" \
  #define dpkg_trivial_usage \
-        "[-ilCPru] [-F option] package_name"
+        "[-ilCPru] [-F OPT] PACKAGE"
  #define dpkg_full_usage "\n\n" \
         "Install, remove and manage Debian packages\n" \
       "\nOptions:" \
-Line 843
+Line 954
         "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
  #define du_trivial_usage \
-        "[-aHLdclsx" USE_FEATURE_HUMAN_READABLE("hm") "k] [FILE]..."
+        "[-aHLdclsx" IF_FEATURE_HUMAN_READABLE("hm") "k] [FILE]..."
  #define du_full_usage "\n\n" \
         "Summarize disk space used for each FILE and/or directory.\n" \
         "Disk space is printed in units of " \
- 	USE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("1024") \
+ 	IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("1024") \
- 	SKIP_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("512") \
+ 	IF_NOT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("512") \
         " bytes.\n" \
       "\nOptions:" \
       "\n	-a	Show file sizes too" \
-      "\n	-H	Follow symlinks on command line" \
       "\n	-L	Follow all symlinks" \
+      "\n	-H	Follow symlinks on command line" \
       "\n	-d N	Limit output to directories (and files with -a) of depth < N" \
       "\n	-c	Show grand total" \
       "\n	-l	Count sizes many times if hard linked" \
       "\n	-s	Display only a total for each argument" \
       "\n	-x	Skip directories on different filesystems" \
- 	USE_FEATURE_HUMAN_READABLE( \
+ 	IF_FEATURE_HUMAN_READABLE( \
       "\n	-h	Sizes in human readable format (e.g., 1K 243M 2G )" \
       "\n	-m	Sizes in megabytes" \
  	) \
       "\n	-k	Sizes in kilobytes" \
- 			USE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(" (default)") \
+ 			IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K(" (default)") \
  #define du_example_usage \
         "$ du\n" \
-Line 882
+Line 993
  #define dumpkmap_trivial_usage \
         "> keymap"
  #define dumpkmap_full_usage "\n\n" \
-        "Print a binary keyboard translation table to standard output"
+        "Print a binary keyboard translation table to stdout"
  #define dumpkmap_example_usage \
         "$ dumpkmap > keymap\n"
-Line 891
+Line 1002
  #define dumpleases_full_usage "\n\n" \
         "Display DHCP leases granted by udhcpd\n" \
       "\nOptions:" \
- 	USE_GETOPT_LONG( \
+ 	IF_LONG_OPTS( \
       "\n	-f,--file=FILE	Leases file to load" \
       "\n	-r,--remaining	Interpret lease times as time remaining" \
       "\n	-a,--absolute	Interpret lease times as expire time" \
  	) \
- 	SKIP_GETOPT_LONG( \
+ 	IF_NOT_LONG_OPTS( \
       "\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] " \
-Line 921
+Line 1033
       "\n	-j journal	Set location of the external journal" \
       "\n	-l file		Add to badblocks list" \
       "\n	-L file		Set badblocks list" \
+ */
  #define echo_trivial_usage \
- 	USE_FEATURE_FANCY_ECHO("[-neE] ") "[ARG...]"
+ 	IF_FEATURE_FANCY_ECHO("[-neE] ") "[ARG]..."
  #define echo_full_usage "\n\n" \
         "Print the specified ARGs to stdout" \
- 	USE_FEATURE_FANCY_ECHO( "\n" \
+ 	IF_FEATURE_FANCY_ECHO( "\n" \
       "\nOptions:" \
       "\n	-n	Suppress trailing newline" \
       "\n	-e	Interpret backslash-escaped characters (i.e., \\t=tab)" \
-Line 935
+Line 1048
  #define echo_example_usage \
         "$ echo \"Erik is cool\"\n" \
         "Erik is cool\n" \
- 	USE_FEATURE_FANCY_ECHO("$ echo -e \"Erik\\nis\\ncool\"\n" \
+ 	IF_FEATURE_FANCY_ECHO("$ echo -e \"Erik\\nis\\ncool\"\n" \
         "Erik\n" \
         "is\n" \
         "cool\n" \
-Line 945
+Line 1058
  #define eject_trivial_usage \
         "[-t] [-T] [DEVICE]"
  #define eject_full_usage "\n\n" \
-        "Eject specified DEVICE (or default /dev/cdrom)\n" \
+        "Eject DEVICE or default /dev/cdrom\n" \
       "\nOptions:" \
- 	USE_FEATURE_EJECT_SCSI( \
+ 	IF_FEATURE_EJECT_SCSI( \
       "\n	-s	SCSI device" \
  	) \
       "\n	-t	Close tray" \
-Line 957
+Line 1070
  #define ed_full_usage ""
  #define env_trivial_usage \
-        "[-iu] [-] [name=value]... [command]"
+        "[-iu] [-] [name=value]... [PROG ARGS]"
  #define env_full_usage "\n\n" \
-        "Print the current environment or run a program after setting\n" \
+        "Print the current environment or run PROG after setting up\n" \
-        "up the specified environment\n" \
+        "the specified environment\n" \
       "\nOptions:" \
       "\n	-, -i	Start with an empty environment" \
       "\n	-u	Remove variable from the environment" \
-Line 977
+Line 1090
       "\n	-p pass		Append four or six byte password PW to the packet" \
  #define expand_trivial_usage \
-        "[-i] [-t NUM] [FILE|-]"
+        "[-i] [-t N] [FILE|-]"
  #define expand_full_usage "\n\n" \
-        "Convert tabs to spaces, writing to standard output.\n" \
+        "Convert tabs to spaces, writing to stdout\n" \
       "\nOptions:" \
- 	USE_FEATURE_EXPAND_LONG_OPTIONS( \
+ 	IF_FEATURE_EXPAND_LONG_OPTIONS( \
-      "\n	-i,--initial	Do not convert tabs after non blanks" \
+      "\n	-i,--initial	Don't convert tabs after non blanks" \
       "\n	-t,--tabs=N	Tabstops every N chars" \
  	) \
- 	SKIP_FEATURE_EXPAND_LONG_OPTIONS( \
+ 	IF_NOT_FEATURE_EXPAND_LONG_OPTIONS( \
-      "\n	-i	Do not convert tabs after non blanks" \
+      "\n	-i	Don't convert tabs after non blanks" \
       "\n	-t	Tabstops every N chars" \
  	)
  #define expr_trivial_usage \
         "EXPRESSION"
  #define expr_full_usage "\n\n" \
-        "Print the value of EXPRESSION to standard output.\n" \
+        "Print the value of EXPRESSION to stdout\n" \
-        "\n" \
+     "\n" \
         "EXPRESSION may be:\n" \
         "	ARG1 | ARG2	ARG1 if it is neither null nor 0, otherwise ARG2\n" \
         "	ARG1 & ARG2	ARG1 if neither argument is null or 0, otherwise 0\n" \
-Line 1034
+Line 1147
       "\n	-i	Inetd mode" \
       "\n	-w	Inetd 'wait' mode" \
       "\n	-b ADDR	Bind to specified address" \
-      "\n	STRING	Ident answer string (default is 'nobody')" \
+      "\n	STRING	Ident answer string (default: nobody)" \
  #define false_trivial_usage \
         ""
-Line 1047
+Line 1160
         "1\n"
  #define fbset_trivial_usage \
-        "[options] [mode]"
+        "[OPTIONS] [MODE]"
  #define fbset_full_usage "\n\n" \
         "Show and modify frame buffer settings"
-Line 1076
+Line 1189
  /* 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)
+ # define IF_FEATURE_FDISK_BLKSIZE(a)
  #endif
  #define fdisk_trivial_usage \
-        "[-ul" USE_FEATURE_FDISK_BLKSIZE("s") "] " \
+        "[-ul" IF_FEATURE_FDISK_BLKSIZE("s") "] " \
         "[-C CYLINDERS] [-H HEADS] [-S SECTORS] [-b SSZ] DISK"
  #define fdisk_full_usage "\n\n" \
         "Change partition table\n" \
       "\nOptions:" \
       "\n	-u		Start and End are in sectors (instead of cylinders)" \
       "\n	-l		Show partition table for each DISK, then exit" \
- 	USE_FEATURE_FDISK_BLKSIZE( \
+ 	IF_FEATURE_FDISK_BLKSIZE( \
       "\n	-s		Show partition sizes in kb for each DISK, then exit" \
  	) \
       "\n	-b 2048		(for certain MO disks) use 2048-byte sectors" \
-Line 1098
+Line 1211
  #define blkid_trivial_usage \
         ""
  #define blkid_full_usage "\n\n" \
-        "Print UUIDs of all filesystems."
+        "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."
+        "Find a filesystem device based on a label or UUID"
  #define findfs_example_usage \
         "$ findfs LABEL=MyDevice"
  #define find_trivial_usage \
-        "[PATH...] [EXPRESSION]"
+        "[PATH]... [EXPRESSION]"
  #define find_full_usage "\n\n" \
         "Search for files. The default PATH is the current directory,\n" \
         "default EXPRESSION is '-print'\n" \
       "\nEXPRESSION may consist of:" \
-      "\n	-follow		Dereference symlinks" \
+      "\n	-follow		Follow symlinks" \
- 	USE_FEATURE_FIND_XDEV( \
+ 	IF_FEATURE_FIND_XDEV( \
       "\n	-xdev		Don't descend directories on other filesystems") \
- 	USE_FEATURE_FIND_MAXDEPTH( \
+ 	IF_FEATURE_FIND_MAXDEPTH( \
       "\n	-maxdepth N	Descend at most N levels. -maxdepth 0 applies" \
       "\n			tests/actions to command line arguments only") \
+      "\n	-mindepth N	Don't act on first N levels" \
       "\n	-name PATTERN	File name (w/o directory name) matches PATTERN" \
       "\n	-iname PATTERN	Case insensitive -name" \
- 	USE_FEATURE_FIND_PATH( \
+ 	IF_FEATURE_FIND_PATH( \
       "\n	-path PATTERN	Path matches PATTERN") \
- 	USE_FEATURE_FIND_REGEX( \
+ 	IF_FEATURE_FIND_REGEX( \
       "\n	-regex PATTERN	Path matches regex PATTERN") \
- 	USE_FEATURE_FIND_TYPE( \
+ 	IF_FEATURE_FIND_TYPE( \
       "\n	-type X		File type is X (X is one of: f,d,l,b,c,...)") \
- 	USE_FEATURE_FIND_PERM( \
+ 	IF_FEATURE_FIND_PERM( \
       "\n	-perm NNN	Permissions match any of (+NNN), all of (-NNN)," \
-      "\n			or exactly (NNN)") \
+      "\n			or exactly NNN") \
- 	USE_FEATURE_FIND_MTIME( \
+ 	IF_FEATURE_FIND_MTIME( \
       "\n	-mtime DAYS	Modified time is greater than (+N), less than (-N)," \
-      "\n			or exactly (N) days") \
+      "\n			or exactly N days") \
- 	USE_FEATURE_FIND_MMIN( \
+ 	IF_FEATURE_FIND_MMIN( \
       "\n	-mmin MINS	Modified time is greater than (+N), less than (-N)," \
-      "\n			or exactly (N) minutes") \
+      "\n			or exactly N minutes") \
- 	USE_FEATURE_FIND_NEWER( \
+ 	IF_FEATURE_FIND_NEWER( \
       "\n	-newer FILE	Modified time is more recent than FILE's") \
- 	USE_FEATURE_FIND_INUM( \
+ 	IF_FEATURE_FIND_INUM( \
       "\n	-inum N		File has inode number N") \
- 	USE_FEATURE_FIND_USER( \
+ 	IF_FEATURE_FIND_USER( \
       "\n	-user NAME	File is owned by user NAME (numeric user ID allowed)") \
- 	USE_FEATURE_FIND_GROUP( \
+ 	IF_FEATURE_FIND_GROUP( \
       "\n	-group NAME	File belongs to group NAME (numeric group ID allowed)") \
- 	USE_FEATURE_FIND_DEPTH( \
+ 	IF_FEATURE_FIND_DEPTH( \
       "\n	-depth		Process directory name after traversing it") \
- 	USE_FEATURE_FIND_SIZE( \
+ 	IF_FEATURE_FIND_SIZE( \
-      "\n	-size N[bck]	File size is N (c:bytes,k:kbytes,b:512 bytes(def.))." \
+      "\n	-size N[bck]	File size is N (c:bytes,k:kbytes,b:512 bytes(def.))" \
       "\n			+/-N: file size is bigger/smaller than N") \
+ 	IF_FEATURE_FIND_LINKS( \
+      "\n	-links N	Number of links is greater than (+N), less than (-N)," \
+      "\n			or exactly N") \
       "\n	-print		Print (default and assumed)" \
- 	USE_FEATURE_FIND_PRINT0( \
+ 	IF_FEATURE_FIND_PRINT0( \
       "\n	-print0		Delimit output with null characters rather than" \
       "\n			newlines") \
- 	USE_FEATURE_FIND_CONTEXT ( \
+ 	IF_FEATURE_FIND_CONTEXT ( \
       "\n	-context	File has specified security context") \
- 	USE_FEATURE_FIND_EXEC( \
+ 	IF_FEATURE_FIND_EXEC( \
-      "\n	-exec CMD ARG ;	Execute CMD with all instances of {} replaced by the" \
+      "\n	-exec CMD ARG ;	Run CMD with all instances of {} replaced by the" \
       "\n			matching files") \
- 	USE_FEATURE_FIND_PRUNE( \
+ 	IF_FEATURE_FIND_PRUNE( \
       "\n	-prune		Stop traversing current subtree") \
- 	USE_FEATURE_FIND_DELETE( \
+ 	IF_FEATURE_FIND_DELETE( \
       "\n	-delete		Delete files, turns on -depth option") \
- 	USE_FEATURE_FIND_PAREN( \
+ 	IF_FEATURE_FIND_PAREN( \
       "\n	(EXPR)		Group an expression") \
  #define find_example_usage \
         "$ find / -name passwd\n" \
         "/etc/passwd\n"
+ #define flash_lock_trivial_usage \
+        "MTD_DEVICE OFFSET SECTORS"
+ #define flash_lock_full_usage "\n\n" \
+        "Lock part or all of an MTD device. If SECTORS is -1, then all sectors\n" \
+        "will be locked, regardless of the value of OFFSET"
+ #define flash_unlock_trivial_usage \
+        "MTD_DEVICE"
+ #define flash_unlock_full_usage "\n\n" \
+        "Unlock an MTD device"
+ #define flash_eraseall_trivial_usage \
+        "[-jq] MTD_DEVICE"
+ #define flash_eraseall_full_usage "\n\n" \
+        "Erase an MTD device\n" \
+      "\nOptions:" \
+      "\n	-j	Format the device for jffs2" \
+      "\n	-q	Don't display progress messages" \
+ #define flashcp_trivial_usage \
+        "-v FILE MTD_DEVICE"
+ #define flashcp_full_usage "\n\n" \
+        "Copy an image to MTD device\n" \
+      "\nOptions:" \
+      "\n	-v	Verbose" \
  #define fold_trivial_usage \
-        "[-bs] [-w WIDTH] [FILE]"
+        "[-bs] [-w WIDTH] [FILE]..."
  #define fold_full_usage "\n\n" \
-        "Wrap input lines in each FILE (standard input by default), writing to\n" \
+        "Wrap input lines in each FILE (or stdin), writing to stdout\n" \
-        "standard output\n" \
       "\nOptions:" \
       "\n	-b	Count bytes rather than columns" \
       "\n	-s	Break at spaces" \
-Line 1198
+Line 1340
         "$ freeramdisk /dev/ram2\n"
  #define fsck_trivial_usage \
-        "[-ANPRTV] [-C fd] [-t fstype] [fs-options] [filesys...]"
+        "[-ANPRTV] [-C FD] [-t FSTYPE] [FS_OPTS] [BLOCKDEV]..."
  #define fsck_full_usage "\n\n" \
         "Check and repair filesystems\n" \
       "\nOptions:" \
-Line 1209
+Line 1351
       "\n	-T	Don't show title on startup" \
       "\n	-V	Verbose" \
       "\n	-C n	Write status information to specified filedescriptor" \
-      "\n	-t type	List of filesystem types to check" \
+      "\n	-t TYPE	List of filesystem types to check" \
  #define fsck_minix_trivial_usage \
-        "[-larvsmf] /dev/name"
+        "[-larvsmf] BLOCKDEV"
  #define fsck_minix_full_usage "\n\n" \
         "Check MINIX filesystem\n" \
       "\nOptions:" \
-Line 1224
+Line 1366
       "\n	-m	Show \"mode not cleared\" warnings" \
       "\n	-f	Force file system check" \
+ #define ftpd_trivial_usage \
+        "[-wvS] [-t N] [-T N] [DIR]"
+ #define ftpd_full_usage "\n\n" \
+        "Anonymous FTP server\n" \
+        "\n" \
+        "ftpd should be used as an inetd service.\n" \
+        "ftpd's line for inetd.conf:\n" \
+        "	21 stream tcp nowait root ftpd ftpd /files/to/serve\n" \
+        "It also can be ran from tcpsvd:\n" \
+        "	tcpsvd -vE 0.0.0.0 21 ftpd /files/to/serve\n" \
+      "\nOptions:" \
+      "\n	-w	Allow upload" \
+      "\n	-v	Log to stderr" \
+      "\n	-S	Log to syslog" \
+      "\n	-t,-T	Idle and absolute timeouts" \
+      "\n	DIR	Change root to this directory" \
  #define ftpget_trivial_usage \
-        "[options] remote-host local-file remote-file"
+        "[OPTIONS] HOST [LOCAL_FILE] REMOTE_FILE"
  #define ftpget_full_usage "\n\n" \
         "Retrieve a remote file via FTP\n" \
       "\nOptions:" \
- 	USE_FEATURE_FTPGETPUT_LONG_OPTIONS( \
+ 	IF_FEATURE_FTPGETPUT_LONG_OPTIONS( \
       "\n	-c,--continue	Continue previous transfer" \
       "\n	-v,--verbose	Verbose" \
       "\n	-u,--username	Username" \
       "\n	-p,--password	Password" \
       "\n	-P,--port	Port number" \
  	) \
- 	SKIP_FEATURE_FTPGETPUT_LONG_OPTIONS( \
+ 	IF_NOT_FEATURE_FTPGETPUT_LONG_OPTIONS( \
       "\n	-c	Continue previous transfer" \
       "\n	-v	Verbose" \
       "\n	-u	Username" \
-Line 1245
+Line 1404
  	)
  #define ftpput_trivial_usage \
-        "[options] remote-host remote-file local-file"
+        "[OPTIONS] HOST [REMOTE_FILE] LOCAL_FILE"
  #define ftpput_full_usage "\n\n" \
         "Store a local file on a remote machine via FTP\n" \
       "\nOptions:" \
- 	USE_FEATURE_FTPGETPUT_LONG_OPTIONS( \
+ 	IF_FEATURE_FTPGETPUT_LONG_OPTIONS( \
       "\n	-v,--verbose	Verbose" \
       "\n	-u,--username	Username" \
       "\n	-p,--password	Password" \
       "\n	-P,--port	Port number" \
  	) \
- 	SKIP_FEATURE_FTPGETPUT_LONG_OPTIONS( \
+ 	IF_NOT_FEATURE_FTPGETPUT_LONG_OPTIONS( \
       "\n	-v	Verbose" \
       "\n	-u	Username" \
       "\n	-p	Password" \
-Line 1263
+Line 1422
  	)
  #define fuser_trivial_usage \
-        "[options] FILE or PORT/PROTO"
+        "[OPTIONS] FILE or PORT/PROTO"
  #define fuser_full_usage "\n\n" \
         "Find processes which use FILEs or PORTs\n" \
       "\nOptions:" \
-Line 1278
+Line 1437
  #define getenforce_full_usage ""
  #define getopt_trivial_usage \
-        "[OPTIONS]..."
+        "[OPTIONS]"
  #define getopt_full_usage "\n\n" \
-        "Parse command options\n" \
+        "Options:" \
- 	USE_GETOPT_LONG( \
+ 	IF_LONG_OPTS( \
       "\n	-a,--alternative		Allow long options starting with single -" \
       "\n	-l,--longoptions=longopts	Long options to be recognized" \
       "\n	-n,--name=progname		The name under which errors are reported" \
-Line 1292
+Line 1451
       "\n	-T,--test			Test for getopt(1) version" \
       "\n	-u,--unquoted			Don't quote the output" \
  	) \
- 	SKIP_GETOPT_LONG( \
+ 	IF_NOT_LONG_OPTS( \
       "\n	-a		Allow long options starting with single -" \
       "\n	-l longopts	Long options to be recognized" \
       "\n	-n progname	The name under which errors are reported" \
-Line 1308
+Line 1467
         "#!/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" \
         " case $1 in\n" \
-Line 1335
+Line 1494
         "Open a tty, prompt for a login name, then invoke /bin/login\n" \
       "\nOptions:" \
       "\n	-h		Enable hardware (RTS/CTS) flow control" \
-      "\n	-i		Do not display /etc/issue before running login" \
+      "\n	-i		Don't display /etc/issue before running login" \
-      "\n	-L		Local line, do not do carrier detect" \
+      "\n	-L		Local line, don't do carrier detect" \
       "\n	-m		Get baud rate from modem's CONNECT status message" \
       "\n	-w		Wait for a CR or LF before sending /etc/issue" \
-      "\n	-n		Do not prompt the user for a login name" \
+      "\n	-n		Don't prompt the user for a login name" \
-      "\n	-f issue_file	Display issue_file instead of /etc/issue" \
+      "\n	-f ISSUE_FILE	Display ISSUE_FILE instead of /etc/issue" \
-      "\n	-l login_app	Invoke login_app instead of /bin/login" \
+      "\n	-l LOGIN	Invoke LOGIN instead of /bin/login" \
-      "\n	-t timeout	Terminate after timeout if no username is read" \
+      "\n	-t SEC		Terminate after SEC if no username is read" \
-      "\n	-I initstring	Init string to send before anything else" \
+      "\n	-I INITSTR	Send INITSTR before anything else" \
-      "\n	-H login_host	Log login_host into the utmp file as the hostname" \
+      "\n	-H HOST		Log HOST into the utmp file as the hostname" \
  #define grep_trivial_usage \
-        "[-HhrilLnqvso" \
+        "[-HhnlLoqvsri" \
- 	USE_DESKTOP("w") \
+ 	IF_DESKTOP("w") \
-        "eF" \
+        "F" \
- 	USE_FEATURE_GREP_EGREP_ALIAS("E") \
+ 	IF_FEATURE_GREP_EGREP_ALIAS("E") \
- 	USE_FEATURE_GREP_CONTEXT("ABC") \
+ 	IF_EXTRA_COMPAT("z") \
-        "] PATTERN [FILEs...]"
+        "] [-m N] " \
+ 	IF_FEATURE_GREP_CONTEXT("[-A/B/C N] ") \
+        "PATTERN/-e PATTERN.../-f FILE [FILE]..."
  #define grep_full_usage "\n\n" \
-        "Search for PATTERN in each FILE or standard input\n" \
+        "Search for PATTERN in FILEs (or stdin)\n" \
       "\nOptions:" \
-      "\n	-H	Prefix output lines with filename where match was found" \
+      "\n	-H	Add 'filename:' prefix" \
-      "\n	-h	Suppress the prefixing filename on output" \
+      "\n	-h	Do not add 'filename:' prefix" \
-      "\n	-r	Recurse subdirectories" \
+      "\n	-n	Add 'line_no:' prefix" \
-      "\n	-i	Ignore case distinctions" \
+      "\n	-l	Show only names of files that match" \
-      "\n	-l	List names of files that match" \
+      "\n	-L	Show only names of files that don't match" \
-      "\n	-L	List names of files that do not match" \
+      "\n	-c	Show only count of matching lines" \
-      "\n	-n	Print line number with output lines" \
+      "\n	-o	Show only the matching part of line" \
       "\n	-q	Quiet. Return 0 if PATTERN is found, 1 otherwise" \
       "\n	-v	Select non-matching lines" \
-      "\n	-s	Suppress file open/read error messages" \
+      "\n	-s	Suppress open and read errors" \
-      "\n	-c	Only print count of matching lines" \
+      "\n	-r	Recurse" \
-      "\n	-o	Show only the part of a line that matches PATTERN" \
+      "\n	-i	Ignore case" \
-      "\n	-m MAX	Match up to MAX times per file" \
+ 	IF_DESKTOP( \
- 	USE_DESKTOP( \
+      "\n	-w	Match whole words only" \
-      "\n	-w	Match whole words only") \
+ 	) \
-      "\n	-F	PATTERN is a set of newline-separated strings" \
+      "\n	-F	PATTERN is a literal (not regexp)" \
- 	USE_FEATURE_GREP_EGREP_ALIAS( \
+ 	IF_FEATURE_GREP_EGREP_ALIAS( \
-      "\n	-E	PATTERN is an extended regular expression") \
+      "\n	-E	PATTERN is an extended regexp" \
+ 	) \
+ 	IF_EXTRA_COMPAT( \
+      "\n	-z	Input is NUL terminated" \
+ 	) \
+      "\n	-m N	Match up to N times per file" \
+ 	IF_FEATURE_GREP_CONTEXT( \
+      "\n	-A N	Print N lines of trailing context" \
+      "\n	-B N	Print N lines of leading context" \
+      "\n	-C N	Same as '-A N -B N'" \
+ 	) \
       "\n	-e PTRN	Pattern to match" \
       "\n	-f FILE	Read pattern from file" \
- 	USE_FEATURE_GREP_CONTEXT( \
-      "\n	-A	Print NUM lines of trailing context" \
-      "\n	-B	Print NUM lines of leading context" \
-      "\n	-C	Print NUM lines of output context") \
  #define grep_example_usage \
         "$ grep root /etc/passwd\n" \
-Line 1394
+Line 1561
  #define fgrep_full_usage ""
  #define gunzip_trivial_usage \
-        "[OPTION]... [FILE]..."
+        "[OPTIONS] [FILE]..."
  #define gunzip_full_usage "\n\n" \
-        "Uncompress FILEs (or standard input)\n" \
+        "Uncompress FILEs (or stdin)\n" \
       "\nOptions:" \
-      "\n	-c	Write to standard output" \
+      "\n	-c	Write to stdout" \
       "\n	-f	Force" \
       "\n	-t	Test file integrity" \
-Line 1410
+Line 1577
         "-rw-rw-r--    1 andersen andersen  1761280 Apr 14 17:47 /tmp/BusyBox-0.43.tar\n"
  #define gzip_trivial_usage \
-        "[OPTION]... [FILE]..."
+        "[OPTIONS] [FILE]..."
  #define gzip_full_usage "\n\n" \
-        "Compress FILEs (or standard input)\n" \
+        "Compress FILEs (or stdin)\n" \
       "\nOptions:" \
-      "\n	-c	Write to standard output" \
+      "\n	-c	Write to stdout" \
       "\n	-d	Decompress" \
       "\n	-f	Force" \
-Line 1426
+Line 1593
         "-rw-rw-r--    1 andersen andersen   554058 Apr 14 17:49 /tmp/busybox.tar.gz\n"
  #define halt_trivial_usage \
-        "[-d delay] [-n] [-f]" USE_FEATURE_WTMP(" [-w]")
+        "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]")
  #define halt_full_usage "\n\n" \
         "Halt the system\n" \
       "\nOptions:" \
       "\n	-d	Delay interval for halting" \
       "\n	-n	No call to sync()" \
       "\n	-f	Force halt (don't go through init)" \
- 	USE_FEATURE_WTMP( \
+ 	IF_FEATURE_WTMP( \
       "\n	-w	Only write a wtmp record" \
  	)
  #define hdparm_trivial_usage \
-        "[options] [device] .."
+        "[OPTIONS] [DEVICE]"
  #define hdparm_full_usage "\n\n" \
         "Options:" \
       "\n	-a	Get/set fs readahead" \
-Line 1447
+Line 1614
       "\n	-B	Set Advanced Power Management setting (1-255)" \
       "\n	-c	Get/set IDE 32-bit IO setting" \
       "\n	-C	Check IDE power mode status" \
- 	USE_FEATURE_HDPARM_HDIO_GETSET_DMA( \
+ 	IF_FEATURE_HDPARM_HDIO_GETSET_DMA( \
       "\n	-d	Get/set using_dma flag") \
       "\n	-D	Enable/disable drive defect-mgmt" \
       "\n	-f	Flush buffer cache for device on exit" \
       "\n	-g	Display drive geometry" \
       "\n	-h	Display terse usage information" \
- 	USE_FEATURE_HDPARM_GET_IDENTITY( \
+ 	IF_FEATURE_HDPARM_GET_IDENTITY( \
       "\n	-i	Display drive identification") \
- 	USE_FEATURE_HDPARM_GET_IDENTITY( \
+ 	IF_FEATURE_HDPARM_GET_IDENTITY( \
       "\n	-I	Detailed/current information directly from drive") \
       "\n	-k	Get/set keep_settings_over_reset flag (0/1)" \
       "\n	-K	Set drive keep_features_over_reset flag (0/1)" \
-Line 1467
+Line 1634
  /*   "\n	-q	Change next setting quietly" - not supported ib bbox */ \
       "\n	-Q	Get/set DMA tagged-queuing depth (if supported)" \
       "\n	-r	Get/set readonly flag (DANGEROUS to set)" \
- 	USE_FEATURE_HDPARM_HDIO_SCAN_HWIF( \
+ 	IF_FEATURE_HDPARM_HDIO_SCAN_HWIF( \
       "\n	-R	Register an IDE interface (DANGEROUS)") \
       "\n	-S	Set standby (spindown) timeout" \
       "\n	-t	Perform device read timings" \
       "\n	-T	Perform cache read timings" \
       "\n	-u	Get/set unmaskirq flag (0/1)" \
- 	USE_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF( \
+ 	IF_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF( \
-      "\n	-U	Un-register an IDE interface (DANGEROUS)") \
+      "\n	-U	Unregister an IDE interface (DANGEROUS)") \
       "\n	-v	Defaults; same as -mcudkrag for IDE drives" \
       "\n	-V	Display program version and exit immediately" \
- 	USE_FEATURE_HDPARM_HDIO_DRIVE_RESET( \
+ 	IF_FEATURE_HDPARM_HDIO_DRIVE_RESET( \
       "\n	-w	Perform device reset (DANGEROUS)") \
       "\n	-W	Set drive write-caching flag (0/1) (DANGEROUS)" \
- 	USE_FEATURE_HDPARM_HDIO_TRISTATE_HWIF( \
+ 	IF_FEATURE_HDPARM_HDIO_TRISTATE_HWIF( \
       "\n	-x	Tristate device for hotswap (0/1) (DANGEROUS)") \
       "\n	-X	Set IDE xfer mode (DANGEROUS)" \
       "\n	-y	Put IDE drive in standby mode" \
       "\n	-Y	Put IDE drive to sleep" \
       "\n	-Z	Disable Seagate auto-powersaving mode" \
-      "\n	-z	Re-read partition table" \
+      "\n	-z	Reread partition table" \
  #define head_trivial_usage \
-        "[OPTION]... [FILE]..."
+        "[OPTIONS] [FILE]..."
  #define head_full_usage "\n\n" \
-        "Print first 10 lines of each FILE to standard output.\n" \
+        "Print first 10 lines of each FILE (or stdin) to stdout.\n" \
-        "With more than one FILE, precede each with a header giving the\n" \
+        "With more than one FILE, precede each with a header giving the file name.\n" \
-        "file name. With no FILE, or when FILE is -, read standard input.\n" \
+      "\nOptions:" \
-      "\nOptions:" \
+      "\n	-n N	Print first N lines instead of first 10" \
-      "\n	-n NUM	Print first NUM lines instead of first 10" \
+ 	IF_FEATURE_FANCY_HEAD( \
- 	USE_FEATURE_FANCY_HEAD( \
+      "\n	-c N	Output the first N bytes" \
-      "\n	-c NUM	Output the first NUM bytes" \
       "\n	-q	Never output headers giving file names" \
       "\n	-v	Always output headers giving file names") \
-Line 1507
+Line 1673
         "daemon:x:1:1:daemon:/usr/sbin:/bin/sh\n"
  #define hexdump_trivial_usage \
-        "[-bcCdefnosvx" USE_FEATURE_HEXDUMP_REVERSE("R") "] FILE..."
+        "[-bcCdefnosvx" IF_FEATURE_HEXDUMP_REVERSE("R") "] [FILE]..."
  #define hexdump_full_usage "\n\n" \
-        "Display file(s) or standard input in a user specified format\n" \
+        "Display FILEs (or stdin) in a user specified format\n" \
       "\nOptions:" \
       "\n	-b		One-byte octal display" \
       "\n	-c		One-byte character display" \
-Line 1522
+Line 1688
       "\n	-s OFFSET	Skip OFFSET bytes" \
       "\n	-v		Display all input data" \
       "\n	-x		Two-byte hexadecimal display" \
- 	USE_FEATURE_HEXDUMP_REVERSE( \
+ 	IF_FEATURE_HEXDUMP_REVERSE( \
       "\n	-R		Reverse of 'hexdump -Cv'") \
  #define hd_trivial_usage \
-Line 1536
+Line 1702
         "Print out a unique 32-bit identifier for the machine"
  #define hostname_trivial_usage \
-        "[OPTION] [hostname | -F FILE]"
+        "[OPTIONS] [HOSTNAME | -F FILE]"
  #define hostname_full_usage "\n\n" \
         "Get or set hostname or DNS domain name\n" \
       "\nOptions:" \
-Line 1544
+Line 1710
       "\n	-i	Addresses for the hostname" \
       "\n	-d	DNS domain name" \
       "\n	-f	Fully qualified domain name" \
-      "\n	-F FILE	Use the contents of FILE to specify the hostname" \
+      "\n	-F FILE	Use FILE's content as hostname" \
  #define hostname_example_usage \
         "$ hostname\n" \
         "sage\n"
+ #define dnsdomainname_trivial_usage NOUSAGE_STR
+ #define dnsdomainname_full_usage ""
  #define httpd_trivial_usage \
-        "[-c conffile]" \
+        "[-ifv[v]]" \
-        " [-p [ip:]port]" \
+        " [-c CONFFILE]" \
-        " [-i] [-f] [-v[v]]" \
+        " [-p [IP:]PORT]" \
- 	USE_FEATURE_HTTPD_SETUID(" [-u user[:grp]]") \
+ 	IF_FEATURE_HTTPD_SETUID(" [-u USER[:GRP]]") \
- 	USE_FEATURE_HTTPD_BASIC_AUTH(" [-r realm]") \
+ 	IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") \
- 	USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \
+        " [-h HOME]\n" \
-        " [-h home]" \
+        "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING"
-        " [-d/-e string]"
  #define httpd_full_usage "\n\n" \
         "Listen for incoming HTTP requests\n" \
       "\nOptions:" \
-      "\n	-c FILE		Configuration file (default httpd.conf)" \
-      "\n	-p [IP:]PORT	Bind to ip:port (default *:80)" \
       "\n	-i		Inetd mode" \
-      "\n	-f		Do not daemonize" \
+      "\n	-f		Don't daemonize" \
       "\n	-v[v]		Verbose" \
- 	USE_FEATURE_HTTPD_SETUID( \
+      "\n	-c FILE		Configuration file (default httpd.conf)" \
+      "\n	-p [IP:]PORT	Bind to ip:port (default *:80)" \
+ 	IF_FEATURE_HTTPD_SETUID( \
       "\n	-u USER[:GRP]	Set uid/gid after binding to port") \
- 	USE_FEATURE_HTTPD_BASIC_AUTH( \
+ 	IF_FEATURE_HTTPD_BASIC_AUTH( \
       "\n	-r REALM	Authentication Realm for Basic Authentication") \
- 	USE_FEATURE_HTTPD_AUTH_MD5( \
-      "\n	-m PASS		Crypt PASS with md5 algorithm") \
       "\n	-h HOME		Home directory (default .)" \
+ 	IF_FEATURE_HTTPD_AUTH_MD5( \
+      "\n	-m STRING	MD5 crypt STRING") \
       "\n	-e STRING	HTML encode STRING" \
       "\n	-d STRING	URL decode STRING" \
  #define hwclock_trivial_usage \
- 	USE_FEATURE_HWCLOCK_LONG_OPTIONS( \
+ 	IF_FEATURE_HWCLOCK_LONG_OPTIONS( \
         "[-r|--show] [-s|--hctosys] [-w|--systohc]" \
         " [-l|--localtime] [-u|--utc]" \
         " [-f FILE]" \
  	) \
- 	SKIP_FEATURE_HWCLOCK_LONG_OPTIONS( \
+ 	IF_NOT_FEATURE_HWCLOCK_LONG_OPTIONS( \
         "[-r] [-s] [-w] [-l] [-u] [-f FILE]" \
  	)
  #define hwclock_full_usage "\n\n" \
-Line 1597
+Line 1765
       "\n	-f FILE	Use specified device (e.g. /dev/rtc2)" \
  #define id_trivial_usage \
-        "[OPTIONS]... [USER]"
+        "[OPTIONS] [USER]"
  #define id_full_usage "\n\n" \
         "Print information about USER or the current user\n" \
       "\nOptions:" \
- 	USE_SELINUX( \
+ 	IF_SELINUX( \
       "\n	-Z	Print the security context" \
  	) \
       "\n	-u	Print user ID" \
-Line 1615
+Line 1783
         "uid=1000(andersen) gid=1000(andersen)\n"
  #define ifconfig_trivial_usage \
- 	USE_FEATURE_IFCONFIG_STATUS("[-a]") " interface [address]"
+ 	IF_FEATURE_IFCONFIG_STATUS("[-a]") " interface [address]"
  #define ifconfig_full_usage "\n\n" \
         "Configure a network interface\n" \
       "\nOptions:" \
       "\n" \
- 	USE_FEATURE_IPV6( \
+ 	IF_FEATURE_IPV6( \
         "	[add ADDRESS[/PREFIXLEN]]\n") \
- 	USE_FEATURE_IPV6( \
+ 	IF_FEATURE_IPV6( \
         "	[del ADDRESS[/PREFIXLEN]]\n") \
         "	[[-]broadcast [ADDRESS]] [[-]pointopoint [ADDRESS]]\n" \
         "	[netmask ADDRESS] [dstaddr ADDRESS]\n" \
- 	USE_FEATURE_IFCONFIG_SLIP( \
+ 	IF_FEATURE_IFCONFIG_SLIP( \
         "	[outfill NN] [keepalive NN]\n") \
-        "	" USE_FEATURE_IFCONFIG_HW("[hw ether" USE_FEATURE_HWIB("|infiniband")" ADDRESS] ") "[metric NN] [mtu NN]\n" \
+        "	" IF_FEATURE_IFCONFIG_HW("[hw ether" IF_FEATURE_HWIB("|infiniband")" ADDRESS] ") "[metric NN] [mtu NN]\n" \
         "	[[-]trailers] [[-]arp] [[-]allmulti]\n" \
         "	[multicast] [[-]promisc] [txqueuelen NN] [[-]dynamic]\n" \
- 	USE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ( \
+ 	IF_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ( \
         "	[mem_start NN] [io_addr NN] [irq NN]\n") \
         "	[up|down] ..."
  #define ifenslave_trivial_usage \
-        "[-cdf] master-iface <slave-iface...>"
+        "[-cdf] MASTER_IFACE SLAVE_IFACE..."
  #define ifenslave_full_usage "\n\n" \
         "Configure network interfaces for parallel routing\n" \
       "\nOptions:" \
-Line 1646
+Line 1814
  /*   "\n	-r, --receive-slave	Create a receive-only slave" */
  #define ifenslave_example_usage \
-        "To create a bond device, simply follow these three steps :\n" \
+        "To create a bond device, simply follow these three steps:\n" \
-        "- ensure that the required drivers are properly loaded :\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" \
+        "- 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" \
+        "- 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" \
+        "  To detach a dead interface without setting the bond device down:\n" \
-        "   # ifenslave -d bond0 eth1\n\n" \
+        "  # ifenslave -d bond0 eth1\n\n" \
-        "  To set the bond device down and automatically release all the slaves :\n" \
+        "  To set the bond device down and automatically release all the slaves:\n" \
-        "   # ifconfig bond0 down\n\n" \
+        "  # ifconfig bond0 down\n\n" \
-        "  To change active slave :\n" \
+        "  To change active slave:\n" \
-        "   # ifenslave -c bond0 eth0\n" \
+        "  # ifenslave -c bond0 eth0\n" \
+ #define ifplugd_trivial_usage \
+        "[OPTIONS]"
+ #define ifplugd_full_usage "\n\n" \
+        "Network interface plug detection daemon\n" \
+      "\nOptions:" \
+      "\n	-n		Don't daemonize" \
+      "\n	-s		Don't log to syslog" \
+      "\n	-i IFACE	Interface" \
+      "\n	-f/-F		Treat link detection error as link down/link up" \
+      "\n			(otherwise exit on error)" \
+      "\n	-a		Don't up interface at each link probe" \
+      "\n	-M		Monitor creation/destruction of interface" \
+      "\n			(otherwise it must exist)" \
+      "\n	-r PROG		Script to run" \
+      "\n	-x ARG		Extra argument for script" \
+      "\n	-I		Don't exit on nonzero exit code from script" \
+      "\n	-p		Don't run script on daemon startup" \
+      "\n	-q		Don't run script on daemon quit" \
+      "\n	-l		Run script on startup even if no cable is detected" \
+      "\n	-t SECS		Poll time in seconds" \
+      "\n	-u SECS		Delay before running script after link up" \
+      "\n	-d SECS		Delay after link down" \
+      "\n	-m MODE		API mode (mii, priv, ethtool, wlan, iff, auto)" \
+      "\n	-k		Kill running daemon" \
  #define ifup_trivial_usage \
-        "[-ain"USE_FEATURE_IFUPDOWN_MAPPING("m")"vf] ifaces..."
+        "[-ain"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] IFACE..."
  #define ifup_full_usage "\n\n" \
         "Options:" \
       "\n	-a	De/configure all interfaces automatically" \
       "\n	-i FILE	Use FILE for interface definitions" \
       "\n	-n	Print out what would happen, but don't do it" \
- 	USE_FEATURE_IFUPDOWN_MAPPING( \
+ 	IF_FEATURE_IFUPDOWN_MAPPING( \
       "\n		(note: doesn't disable mappings)" \
       "\n	-m	Don't run any mappings" \
  	) \
-Line 1677
+Line 1870
       "\n	-f	Force de/configuration" \
  #define ifdown_trivial_usage \
-        "[-ain"USE_FEATURE_IFUPDOWN_MAPPING("m")"vf] ifaces..."
+        "[-ain"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] ifaces..."
  #define ifdown_full_usage "\n\n" \
         "Options:" \
       "\n	-a	De/configure all interfaces automatically" \
       "\n	-i FILE	Use FILE for interface definitions" \
       "\n	-n	Print out what would happen, but don't do it" \
- 	USE_FEATURE_IFUPDOWN_MAPPING( \
+ 	IF_FEATURE_IFUPDOWN_MAPPING( \
       "\n		(note: doesn't disable mappings)" \
       "\n	-m	Don't run any mappings" \
  	) \
-Line 1834
+Line 2027
  "	::shutdown:/sbin/swapoff -a\n"
  #define inotifyd_trivial_usage \
- 	"/user/space/agent dir/or/file/being/watched[:mask] ..."
+ 	"PROG FILE1[:MASK]..."
  #define inotifyd_full_usage "\n\n" \
-        "Spawn userspace agent on filesystem changes." \
+        "Run PROG on filesystem changes." \
-      "\nWhen a filesystem event matching the mask occurs" \
+      "\nWhen a filesystem event matching MASK occurs on FILEn," \
-      "\non specified file/directory an userspace agent is spawned" \
+      "\nPROG ACTUAL_EVENTS FILEn [SUBFILE] is run." \
-      "\nwith the parameters:" \
+      "\nEvents:" \
-      "\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	w	Writable file is closed" \
-      "\n	0	Unwrittable file is closed" \
+      "\n	0	Unwritable file is closed" \
       "\n	r	File is opened" \
-      "\n	m	File is moved from X" \
+      "\n	D	File is deleted" \
-      "\n	y	File is moved to Y" \
+      "\n	M	File is moved" \
+      "\n	u	Backing fs is unmounted" \
+      "\n	o	Event queue overflowed" \
+      "\n	x	File can't be watched anymore" \
+      "\nIf watching a directory:" \
+      "\n	m	Subfile is moved into dir" \
+      "\n	y	Subfile is moved out of dir" \
       "\n	n	Subfile is created" \
       "\n	d	Subfile is deleted" \
-      "\n	D	Self is deleted" \
+      "\n" \
-      "\n	M	Self is moved" \
+      "\ninotifyd waits for PROG to exit." \
+      "\nWhen x event happens for all FILEs, inotifyd exits." \
+ /* 2.6 style insmod has no options and required filename
+  * (not module name - .ko can't be omitted) */
  #define insmod_trivial_usage \
- 	USE_FEATURE_2_4_MODULES("[OPTION]... ") "MODULE [symbol=value]..."
+ 	IF_FEATURE_2_4_MODULES("[OPTIONS] MODULE ") \
+ 	IF_NOT_FEATURE_2_4_MODULES("FILE ") \
+ 	"[symbol=value]..."
  #define insmod_full_usage "\n\n" \
         "Load the specified kernel modules into the kernel" \
- 	USE_FEATURE_2_4_MODULES( "\n" \
+ 	IF_FEATURE_2_4_MODULES( "\n" \
       "\nOptions:" \
       "\n	-f	Force module to load into the wrong kernel version" \
       "\n	-k	Make module autoclean-able" \
       "\n	-v	Verbose" \
       "\n	-q	Quiet" \
       "\n	-L	Lock to prevent simultaneous loads of a module" \
- 	USE_FEATURE_INSMOD_LOAD_MAP( \
+ 	IF_FEATURE_INSMOD_LOAD_MAP( \
       "\n	-m	Output load map to stdout" \
  	) \
       "\n	-o NAME	Set internal module name to NAME" \
-      "\n	-x	Do not export externs" \
+      "\n	-x	Don't export externs" \
  	)
  /* -v, -b, -c are ignored */
  #define install_trivial_usage \
-        "[-cdDsp] [-o USER] [-g GRP] [-m MODE] [source] dest|directory"
+ 	"[-cdDsp] [-o USER] [-g GRP] [-m MODE] [SOURCE]... DEST"
  #define install_full_usage "\n\n" \
         "Copy files and set attributes\n" \
       "\nOptions:" \
-Line 1889
+Line 2089
       "\n	-o USER	Set ownership" \
       "\n	-g GRP	Set group ownership" \
       "\n	-m MODE	Set permissions" \
- 	USE_SELINUX( \
+ 	IF_SELINUX( \
       "\n	-Z	Set security context" \
  	)
+ #define ionice_trivial_usage \
+ 	"[-c 1-3] [-n 0-7] [-p PID] [PROG]"
+ #define ionice_full_usage "\n\n" \
+        "Change I/O scheduling class and priority\n" \
+      "\nOptions:" \
+      "\n	-c	Class. 1:realtime 2:best-effort 3:idle" \
+      "\n	-n	Priority" \
  /* would need to make the " | " optional depending on more than one selected: */
  #define ip_trivial_usage \
         "[OPTIONS] {" \
- 	USE_FEATURE_IP_ADDRESS("address | ") \
+ 	IF_FEATURE_IP_ADDRESS("address | ") \
- 	USE_FEATURE_IP_ROUTE("route | ") \
+ 	IF_FEATURE_IP_ROUTE("route | ") \
- 	USE_FEATURE_IP_LINK("link | ") \
+ 	IF_FEATURE_IP_LINK("link | ") \
- 	USE_FEATURE_IP_TUNNEL("tunnel | ") \
+ 	IF_FEATURE_IP_TUNNEL("tunnel | ") \
- 	USE_FEATURE_IP_RULE("rule") \
+ 	IF_FEATURE_IP_RULE("rule") \
         "} {COMMAND}"
  #define ip_full_usage "\n\n" \
         "ip [OPTIONS] OBJECT {COMMAND}\n" \
         "where OBJECT := {" \
- 	USE_FEATURE_IP_ADDRESS("address | ") \
+ 	IF_FEATURE_IP_ADDRESS("address | ") \
- 	USE_FEATURE_IP_ROUTE("route | ") \
+ 	IF_FEATURE_IP_ROUTE("route | ") \
- 	USE_FEATURE_IP_LINK("link | ") \
+ 	IF_FEATURE_IP_LINK("link | ") \
- 	USE_FEATURE_IP_TUNNEL("tunnel | ") \
+ 	IF_FEATURE_IP_TUNNEL("tunnel | ") \
- 	USE_FEATURE_IP_RULE("rule") \
+ 	IF_FEATURE_IP_RULE("rule") \
         "}\n" \
         "OPTIONS := { -f[amily] { inet | inet6 | link } | -o[neline] }" \
-Line 1926
+Line 2134
         "	SCOPE-ID := [host | link | global | NUMBER]" \
  #define ipcalc_trivial_usage \
-        "[OPTION]... ADDRESS[[/]NETMASK] [NETMASK]"
+        "[OPTIONS] ADDRESS[[/]NETMASK] [NETMASK]"
  #define ipcalc_full_usage "\n\n" \
         "Calculate IP network settings from a IP address\n" \
       "\nOptions:" \
- 	USE_FEATURE_IPCALC_LONG_OPTIONS( \
+ 	IF_FEATURE_IPCALC_LONG_OPTIONS( \
       "\n	-b,--broadcast	Display calculated broadcast address" \
       "\n	-n,--network	Display calculated network address" \
       "\n	-m,--netmask	Display default netmask for IP" \
- 	USE_FEATURE_IPCALC_FANCY( \
+ 	IF_FEATURE_IPCALC_FANCY( \
       "\n	-p,--prefix	Display the prefix for IP/NETMASK" \
       "\n	-h,--hostname	Display first resolved host name" \
       "\n	-s,--silent	Don't ever display error messages" \
  	) \
  	) \
- 	SKIP_FEATURE_IPCALC_LONG_OPTIONS( \
+ 	IF_NOT_FEATURE_IPCALC_LONG_OPTIONS( \
       "\n	-b	Display calculated broadcast address" \
       "\n	-n	Display calculated network address" \
       "\n	-m	Display default netmask for IP" \
- 	USE_FEATURE_IPCALC_FANCY( \
+ 	IF_FEATURE_IPCALC_FANCY( \
       "\n	-p	Display the prefix for IP/NETMASK" \
       "\n	-h	Display first resolved host name" \
       "\n	-s	Don't ever display error messages" \
-Line 2022
+Line 2230
         "[-a|k|s|u] [-C TTY]"
  #define kbd_mode_full_usage "\n\n" \
         "Report or set the keyboard mode\n" \
-      "\nOptions set mode:" \
+      "\nOptions:" \
       "\n	-a	Default (ASCII)" \
       "\n	-k	Medium-raw (keyboard)" \
       "\n	-s	Raw (scancode)" \
-Line 2032
+Line 2240
  #define kill_trivial_usage \
         "[-l] [-SIG] PID..."
  #define kill_full_usage "\n\n" \
-        "Send a signal (default is TERM) to given PIDs\n" \
+        "Send a signal (default: TERM) to given PIDs\n" \
       "\nOptions:" \
       "\n	-l	List all signal names and numbers" \
  /*   "\n	-s SIG	Yet another way of specifying SIG" */ \
-Line 2048
+Line 2256
         "$ kill 252\n"
  #define killall_trivial_usage \
-        "[-l] [-q] [-SIG] process-name..."
+        "[-l] [-q] [-SIG] PROCESS_NAME..."
  #define killall_full_usage "\n\n" \
-        "Send a signal (default is TERM) to given processes\n" \
+        "Send a signal (default: TERM) to given processes\n" \
       "\nOptions:" \
       "\n	-l	List all signal names and numbers" \
  /*   "\n	-s SIG	Yet another way of specifying SIG" */ \
-      "\n	-q	Do not complain if no processes were killed" \
+      "\n	-q	Don't complain if no processes were killed" \
  #define killall_example_usage \
         "$ killall apache\n"
  #define killall5_trivial_usage \
-        "[-l] [-SIG]"
+        "[-l] [-SIG] [-o PID]..."
  #define killall5_full_usage "\n\n" \
-        "Send a signal (default is TERM) to all processes outside current session\n" \
+        "Send a signal (default: TERM) to all processes outside current session\n" \
       "\nOptions:" \
       "\n	-l	List all signal names and numbers" \
+      "\n	-o PID	Don't signal this PID" \
  /*   "\n	-s SIG	Yet another way of specifying SIG" */ \
  #define klogd_trivial_usage \
-Line 2085
+Line 2294
         "5\n"
  #define less_trivial_usage \
-        "[-EMNmh~I?] [FILE...]"
+        "[-EMNmh~I?] [FILE]..."
  #define less_full_usage "\n\n" \
-        "View a file or list of files. The position within files can be\n" \
+        "View FILE (or stdin) one screenful at a time\n" \
-        "changed, and files can be manipulated in various ways.\n" \
       "\nOptions:" \
       "\n	-E	Quit once the end of a file is reached" \
-      "\n	-M,-m	Display a status line containing the line numbers" \
+      "\n	-M,-m	Display status line with line numbers" \
       "\n		and percentage through the file" \
-      "\n	-N	Prefix line numbers to each line" \
+      "\n	-N	Prefix line number to each line" \
       "\n	-I	Ignore case in all searches" \
       "\n	-~	Suppress ~s displayed past the end of the file" \
-Line 2106
+Line 2314
  #define linuxrc_full_usage ""
  #define setarch_trivial_usage \
-        "personality program [args...]"
+        "personality PROG ARGS"
  #define setarch_full_usage "\n\n" \
         "Personality may be:\n" \
         "	linux32		Set 32bit uname emulation\n" \
         "	linux64		Set 64bit uname emulation" \
  #define ln_trivial_usage \
-        "[OPTION] TARGET... LINK_NAME|DIRECTORY"
+        "[OPTIONS] TARGET... LINK|DIR"
  #define ln_full_usage "\n\n" \
-        "Create a link named LINK_NAME or DIRECTORY to the specified TARGET.\n" \
+        "Create a link LINK or DIR/TARGET to the specified TARGET(s)\n" \
-        "Use '--' to indicate that all following arguments are non-options.\n" \
       "\nOptions:" \
       "\n	-s	Make symlinks instead of hardlinks" \
-      "\n	-f	Remove existing destination files" \
+      "\n	-f	Remove existing destinations" \
       "\n	-n	Don't dereference symlinks - treat like normal file" \
       "\n	-b	Make a backup of the target (if exists) before link operation" \
       "\n	-S suf	Use suffix instead of ~ when making backup files" \
-Line 2135
+Line 2342
  #define loadfont_trivial_usage \
         "< font"
  #define loadfont_full_usage "\n\n" \
-        "Load a console font from standard input" \
+        "Load a console font from stdin" \
  /*   "\n	-C TTY	Affect TTY instead of /dev/tty" */ \
  #define loadfont_example_usage \
-Line 2144
+Line 2351
  #define loadkmap_trivial_usage \
         "< keymap"
  #define loadkmap_full_usage "\n\n" \
-        "Load a binary keyboard translation table from standard input\n" \
+        "Load a binary keyboard translation table from stdin\n" \
  /*   "\n	-C TTY	Affect TTY instead of /dev/tty" */ \
  #define loadkmap_example_usage \
         "$ loadkmap < /etc/i18n/lang-keymap\n"
  #define logger_trivial_usage \
-        "[OPTION]... [MESSAGE]"
+        "[OPTIONS] [MESSAGE]"
  #define logger_full_usage "\n\n" \
-        "Write MESSAGE to the system log. If MESSAGE is omitted, log stdin.\n" \
+        "Write MESSAGE (or stdin) to syslog\n" \
       "\nOptions:" \
       "\n	-s	Log to stderr as well as the system log" \
       "\n	-t TAG	Log using the specified tag (defaults to user name)" \
-Line 2167
+Line 2374
  #define login_full_usage "\n\n" \
         "Begin a new session on the system\n" \
       "\nOptions:" \
-      "\n	-f	Do not authenticate (user already authenticated)" \
+      "\n	-f	Don't authenticate (user already authenticated)" \
       "\n	-h	Name of the remote host" \
       "\n	-p	Preserve environment" \
-Line 2180
+Line 2387
         "root\n"
  #define logread_trivial_usage \
-        "[OPTION]..."
+        "[OPTIONS]"
  #define logread_full_usage "\n\n" \
         "Show messages in syslogd's circular buffer\n" \
       "\nOptions:" \
-Line 2205
+Line 2412
         "losetup -f will show the first loop free loop device\n\n"
  #define lpd_trivial_usage \
-        "SPOOLDIR [HELPER [ARGS...]]"
+        "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" \
-Line 2216
+Line 2423
       "\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]"
+        "[-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)" \
-Line 2225
+Line 2432
       "\n	-s	Short display" \
  #define lpr_trivial_usage \
-        "-P queue[@host[:port]] -U USERNAME -J TITLE -Vmh [FILE...]"
+        "-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" \
-Line 2236
+Line 2443
       "\n	-V	Verbose" \
  #define ls_trivial_usage \
-        "[-1Aa" USE_FEATURE_LS_TIMESTAMPS("c") "Cd" \
+        "[-1Aa" IF_FEATURE_LS_TIMESTAMPS("c") "Cd" \
- 	USE_FEATURE_LS_TIMESTAMPS("e") USE_FEATURE_LS_FILETYPES("F") "iln" \
+ 	IF_FEATURE_LS_TIMESTAMPS("e") IF_FEATURE_LS_FILETYPES("F") "iln" \
- 	USE_FEATURE_LS_FILETYPES("p") USE_FEATURE_LS_FOLLOWLINKS("L") \
+ 	IF_FEATURE_LS_FILETYPES("p") IF_FEATURE_LS_FOLLOWLINKS("L") \
- 	USE_FEATURE_LS_RECURSIVE("R") USE_FEATURE_LS_SORTFILES("rS") "s" \
+ 	IF_FEATURE_LS_RECURSIVE("R") IF_FEATURE_LS_SORTFILES("rS") "s" \
- 	USE_FEATURE_AUTOWIDTH("T") USE_FEATURE_LS_TIMESTAMPS("tu") \
+ 	IF_FEATURE_AUTOWIDTH("T") IF_FEATURE_LS_TIMESTAMPS("tu") \
- 	USE_FEATURE_LS_SORTFILES("v") USE_FEATURE_AUTOWIDTH("w") "x" \
+ 	IF_FEATURE_LS_SORTFILES("v") IF_FEATURE_AUTOWIDTH("w") "x" \
- 	USE_FEATURE_LS_SORTFILES("X") USE_FEATURE_HUMAN_READABLE("h") "k" \
+ 	IF_FEATURE_LS_SORTFILES("X") IF_FEATURE_HUMAN_READABLE("h") "k" \
- 	USE_SELINUX("K") "] [filenames...]"
+ 	IF_SELINUX("K") "] [FILE]..."
  #define ls_full_usage "\n\n" \
         "List directory contents\n" \
       "\nOptions:" \
-Line 2251
+Line 2458
       "\n	-A	Don't list . and .." \
       "\n	-a	Don't hide entries starting with ." \
       "\n	-C	List by columns" \
- 	USE_FEATURE_LS_TIMESTAMPS( \
+ 	IF_FEATURE_LS_TIMESTAMPS( \
       "\n	-c	With -l: sort by ctime") \
- 	USE_FEATURE_LS_COLOR( \
+ 	IF_FEATURE_LS_COLOR( \
       "\n	--color[={always,never,auto}]	Control coloring") \
       "\n	-d	List directory entries instead of contents" \
- 	USE_FEATURE_LS_TIMESTAMPS( \
+ 	IF_FEATURE_LS_TIMESTAMPS( \
       "\n	-e	List full date and time") \
- 	USE_FEATURE_LS_FILETYPES( \
+ 	IF_FEATURE_LS_FILETYPES( \
       "\n	-F	Append indicator (one of */=@|) to entries") \
       "\n	-i	List inode numbers" \
       "\n	-l	Long listing format" \
       "\n	-n	List numeric UIDs and GIDs instead of names" \
- 	USE_FEATURE_LS_FILETYPES( \
+ 	IF_FEATURE_LS_FILETYPES( \
       "\n	-p	Append indicator (one of /=@|) to entries") \
- 	USE_FEATURE_LS_FOLLOWLINKS( \
+ 	IF_FEATURE_LS_FOLLOWLINKS( \
       "\n	-L	List entries pointed to by symlinks") \
- 	USE_FEATURE_LS_RECURSIVE( \
+ 	IF_FEATURE_LS_RECURSIVE( \
-      "\n	-R	List subdirectories recursively") \
+      "\n	-R	Recurse") \
- 	USE_FEATURE_LS_SORTFILES( \
+ 	IF_FEATURE_LS_SORTFILES( \
       "\n	-r	Sort in reverse order") \
- 	USE_FEATURE_LS_SORTFILES( \
+ 	IF_FEATURE_LS_SORTFILES( \
       "\n	-S	Sort by file size") \
       "\n	-s	List the size of each file, in blocks" \
- 	USE_FEATURE_AUTOWIDTH( \
+ 	IF_FEATURE_AUTOWIDTH( \
-      "\n	-T NUM	Assume tabstop every NUM columns") \
+      "\n	-T N	Assume tabstop every N columns") \
- 	USE_FEATURE_LS_TIMESTAMPS( \
+ 	IF_FEATURE_LS_TIMESTAMPS( \
       "\n	-t	With -l: sort by modification time") \
- 	USE_FEATURE_LS_TIMESTAMPS( \
+ 	IF_FEATURE_LS_TIMESTAMPS( \
       "\n	-u	With -l: sort by access time") \
- 	USE_FEATURE_LS_SORTFILES( \
+ 	IF_FEATURE_LS_SORTFILES( \
       "\n	-v	Sort by version") \
- 	USE_FEATURE_AUTOWIDTH( \
+ 	IF_FEATURE_AUTOWIDTH( \
-      "\n	-w NUM	Assume the terminal is NUM columns wide") \
+      "\n	-w N	Assume the terminal is N columns wide") \
       "\n	-x	List by lines" \
- 	USE_FEATURE_LS_SORTFILES( \
+ 	IF_FEATURE_LS_SORTFILES( \
       "\n	-X	Sort by extension") \
- 	USE_FEATURE_HUMAN_READABLE( \
+ 	IF_FEATURE_HUMAN_READABLE( \
       "\n	-h	List sizes in human readable format (1K 243M 2G)") \
- 	USE_SELINUX( \
+ 	IF_SELINUX( \
       "\n	-k	List security context") \
- 	USE_SELINUX( \
+ 	IF_SELINUX( \
       "\n	-K	List security context in long format") \
- 	USE_SELINUX( \
+ 	IF_SELINUX( \
       "\n	-Z	List security context and permission") \
  #define lsattr_trivial_usage \
-        "[-Radlv] [files...]"
+        "[-Radlv] [FILE]..."
  #define lsattr_full_usage "\n\n" \
         "List file attributes on an ext2 fs\n" \
       "\nOptions:" \
-      "\n	-R	Recursively list subdirectories" \
+      "\n	-R	Recurse" \
-      "\n	-a	Do not hide entries starting with ." \
+      "\n	-a	Don't hide entries starting with ." \
       "\n	-d	List directory entries instead of contents" \
       "\n	-l	List long flag names" \
       "\n	-v	List the file's version/generation number" \
-Line 2312
+Line 2519
  #define lsmod_full_usage "\n\n" \
         "List the currently loaded kernel modules"
+ #define lspci_trivial_usage \
+        "[-mk]"
+ #define lspci_full_usage "\n\n" \
+        "List all PCI devices" \
+      "\n" \
+      "\n	-m	Parseable output" \
+      "\n	-k	Show driver" \
+ #define lsusb_trivial_usage NOUSAGE_STR
+ #define lsusb_full_usage ""
  #if ENABLE_FEATURE_MAKEDEVS_LEAF
  #define makedevs_trivial_usage \
         "NAME TYPE MAJOR MINOR FIRST LAST [s]"
-Line 2371
+Line 2589
  #endif
  #define makemime_trivial_usage \
-        "[OPTION]... [FILE]..."
+        "[OPTIONS] [FILE]..."
  #define makemime_full_usage "\n\n" \
-        "Create MIME-encoded message\n" \
+        "Create multipart MIME-encoded message from FILEs\n" \
+ /*     "Transfer encoding is base64, disposition is inline (not attachment)\n" */ \
       "\nOptions:" \
-      "\n	-C      Charset" \
+      "\n	-o FILE	Output. Default: stdout" \
-      "\n	-e	Tranfer encoding. Ignored. base64 is assumed" \
+      "\n	-a HDR	Add header. Examples:" \
+      "\n		\"From: user@host.org\", \"Date: `date -R`\"" \
+      "\n	-c CT	Content type. Default: text/plain" \
+      "\n	-C CS   Charset. Default: " CONFIG_FEATURE_MIME_CHARSET \
+ /*   "\n	-e ENC	Transfer encoding. Ignored. base64 is assumed" */ \
       "\n" \
-      "\nOther options are silently ignored." \
+      "\nOther options are silently ignored" \
  #define man_trivial_usage \
-        "[OPTION]... [MANPAGE]..."
+        "[OPTIONS] [MANPAGE]..."
  #define man_full_usage "\n\n" \
         "Format and display manual page\n" \
       "\nOptions:" \
-Line 2391
+Line 2614
  #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	Don't display path" \
-      "\n	-N	Do not use translations" \
+      "\n	-N	Don't use translations" \
       "\n	-f	Use alternate file_context file" \
       "\n	-p	Use prefix to speed translations" \
       "\n	-V	Verify file context on disk matches defaults" \
  #define md5sum_trivial_usage \
-        "[OPTION] [FILEs...]" \
+        "[OPTIONS] [FILE]..." \
- 	USE_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: md5sum [OPTION] -c [FILE]")
+ 	IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: md5sum [OPTIONS] -c [FILE]")
  #define md5sum_full_usage "\n\n" \
-        "Print" USE_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " MD5 checksums" \
+        "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " MD5 checksums" \
- 	USE_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
+ 	IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
       "\nOptions:" \
-      "\n	-c	Check MD5 sums against given list" \
+      "\n	-c	Check sums against given list" \
       "\n	-s	Don't output anything, status code shows success" \
-      "\n	-w	Warn about improperly formatted MD5 checksum lines") \
+      "\n	-w	Warn about improperly formatted checksum lines" \
+ 	)
  #define md5sum_example_usage \
         "$ md5sum < busybox\n" \
-Line 2418
+Line 2642
         "busybox: OK\n" \
         "^D\n"
+ #define sha1sum_trivial_usage \
+        "[OPTIONS] [FILE]..." \
+ 	IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha1sum [OPTIONS] -c [FILE]")
+ #define sha1sum_full_usage "\n\n" \
+        "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums" \
+ 	IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
+      "\nOptions:" \
+      "\n	-c	Check sums against given list" \
+      "\n	-s	Don't output anything, status code shows success" \
+      "\n	-w	Warn about improperly formatted checksum lines" \
+ 	)
+ #define sha256sum_trivial_usage \
+        "[OPTIONS] [FILE]..." \
+ 	IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha256sum [OPTIONS] -c [FILE]")
+ #define sha256sum_full_usage "\n\n" \
+        "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA256 checksums" \
+ 	IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
+      "\nOptions:" \
+      "\n	-c	Check sums against given list" \
+      "\n	-s	Don't output anything, status code shows success" \
+      "\n	-w	Warn about improperly formatted checksum lines" \
+ 	)
+ #define sha512sum_trivial_usage \
+        "[OPTIONS] [FILE]..." \
+ 	IF_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha512sum [OPTIONS] -c [FILE]")
+ #define sha512sum_full_usage "\n\n" \
+        "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA512 checksums" \
+ 	IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
+      "\nOptions:" \
+      "\n	-c	Check sums against given list" \
+      "\n	-s	Don't output anything, status code shows success" \
+      "\n	-w	Warn about improperly formatted checksum lines" \
+ 	)
  #define mdev_trivial_usage \
         "[-s]"
  #define mdev_full_usage "\n\n" \
         "	-s	Scan /sys and populate /dev during system boot\n" \
         "\n" \
-        "Called with no options (via hotplug) it uses environment variables\n" \
+        "It can be run by kernel as a hotplug helper. To activate it:\n" \
-        "to determine which device to add/remove."
+        " echo /sbin/mdev > /proc/sys/kernel/hotplug\n" \
+ 	IF_FEATURE_MDEV_CONF( \
+        "It uses /etc/mdev.conf with lines\n" \
+        "[-]DEVNAME UID:GID PERM" \
+ 			IF_FEATURE_MDEV_RENAME(" [>|=PATH]") \
+ 			IF_FEATURE_MDEV_EXEC(" [@|$|*PROG]") \
+ 	) \
  #define mdev_notes_usage "" \
- 	USE_FEATURE_MDEV_CONFIG( \
+ 	IF_FEATURE_MDEV_CONFIG( \
         "The mdev config file contains lines that look like:\n" \
         "  hd[a-z][0-9]* 0:3 660\n\n" \
         "That's device name (with regex match), uid:gid, and permissions.\n\n" \
- 	USE_FEATURE_MDEV_EXEC( \
+ 	IF_FEATURE_MDEV_EXEC( \
         "Optionally, that can be followed (on the same line) by a special character\n" \
         "and a command line to run after creating/before deleting the corresponding\n" \
         "device(s). The environment variable $MDEV indicates the active device node\n" \
-Line 2465
+Line 2731
       "\n	-X	Disable special meaning of NUL and Ctrl-X from stdin" \
  #define mkdir_trivial_usage \
-        "[OPTION] DIRECTORY..."
+        "[OPTIONS] DIRECTORY..."
  #define mkdir_full_usage "\n\n" \
         "Create DIRECTORY\n" \
       "\nOptions:" \
-      "\n	-m	Set permission mode (as in chmod), not rwxrwxrwx - umask" \
+      "\n	-m	Mode" \
-      "\n	-p	No error if existing, make parent directories as needed" \
+      "\n	-p	No error if exists; make parent directories as needed" \
- 	USE_SELINUX( \
+ 	IF_SELINUX( \
       "\n	-Z	Set security context" \
  	)
-Line 2483
+Line 2749
         "/tmp/foo/bar/baz: No such file or directory\n" \
         "$ mkdir -p /tmp/foo/bar/baz\n"
- #define mke2fs_trivial_usage \
-        "[-c|-l filename] [-b block-size] [-f fragment-size] [-g blocks-per-group] " \
-        "[-i bytes-per-inode] [-j] [-J journal-options] [-N number-of-inodes] [-n] " \
-        "[-m reserved-blocks-percentage] [-o creator-os] [-O feature[,...]] [-q] " \
-        "[r fs-revision-level] [-E extended-options] [-v] [-F] [-L volume-label] " \
-        "[-M last-mounted-directory] [-S] [-T filesystem-type] " \
-        "device [blocks-count]"
- #define mke2fs_full_usage "\n\n" \
-        "	-b size		Block size in bytes" \
-      "\n	-c		Check for bad blocks before creating" \
-      "\n	-E opts		Set extended options" \
-      "\n	-f size		Fragment size in bytes" \
-      "\n	-F		Force (ignore sanity checks)" \
-      "\n	-g num		Number of blocks in a block group" \
-      "\n	-i ratio	The bytes/inode ratio" \
-      "\n	-j		Create a journal (ext3)" \
-      "\n	-J opts		Set journal options (size/device)" \
-      "\n	-l file		Read bad blocks list from file" \
-      "\n	-L lbl		Set the volume label" \
-      "\n	-m percent	Percent of fs blocks to reserve for admin" \
-      "\n	-M dir		Set last mounted directory" \
-      "\n	-n		Do not actually create anything" \
-      "\n	-N num		Number of inodes to create" \
-      "\n	-o os		Set the 'creator os' field" \
-      "\n	-O features	Dir_index/filetype/has_journal/journal_dev/sparse_super" \
-      "\n	-q		Quiet" \
-      "\n	-r rev		Set filesystem revision" \
-      "\n	-S		Write superblock and group descriptors only" \
-      "\n	-T fs-type	Set usage type (news/largefile/largefile4)" \
-      "\n	-v		Verbose" \
  #define mkfifo_trivial_usage \
         "[OPTIONS] name"
  #define mkfifo_full_usage "\n\n" \
         "Create named pipe (identical to 'mknod name p')\n" \
       "\nOptions:" \
       "\n	-m MODE	Mode (default a=rw)" \
- 	USE_SELINUX( \
+ 	IF_SELINUX( \
       "\n	-Z	Set security context" \
  	)
+ #define mkfs_ext2_trivial_usage \
+        "[-Fn] " \
+        /* "[-c|-l filename] " */ \
+        "[-b BLK_SIZE] " \
+        /* "[-f fragment-size] [-g blocks-per-group] " */ \
+        "[-i INODE_RATIO] [-I INODE_SIZE] " \
+        /* "[-j] [-J journal-options] [-N number-of-inodes] " */ \
+        "[-m RESERVED_PERCENT] " \
+        /* "[-o creator-os] [-O feature[,...]] [-q] " */ \
+        /* "[r fs-revision-level] [-E extended-options] [-v] [-F] " */ \
+        "[-L LABEL] " \
+        /* "[-M last-mounted-directory] [-S] [-T filesystem-type] " */ \
+        "BLOCKDEV [KBYTES]"
+ #define mkfs_ext2_full_usage "\n\n" \
+        "	-b BLK_SIZE	Block size, bytes" \
+ /*   "\n	-c		Check device for bad blocks" */ \
+ /*   "\n	-E opts		Set extended options" */ \
+ /*   "\n	-f size		Fragment size in bytes" */ \
+      "\n	-F		Force" \
+ /*   "\n	-g N		Number of blocks in a block group" */ \
+      "\n	-i RATIO	Max number of files is filesystem_size / RATIO" \
+      "\n	-I BYTES	Inode size (min 128)" \
+ /*   "\n	-j		Create a journal (ext3)" */ \
+ /*   "\n	-J opts		Set journal options (size/device)" */ \
+ /*   "\n	-l file		Read bad blocks list from file" */ \
+      "\n	-L LBL		Volume label" \
+      "\n	-m PERCENT	Percent of blocks to reserve for admin" \
+ /*   "\n	-M dir		Set last mounted directory" */ \
+      "\n	-n		Dry run" \
+ /*   "\n	-N N		Number of inodes to create" */ \
+ /*   "\n	-o os		Set the 'creator os' field" */ \
+ /*   "\n	-O features	Dir_index/filetype/has_journal/journal_dev/sparse_super" */ \
+ /*   "\n	-q		Quiet" */ \
+ /*   "\n	-r rev		Set filesystem revision" */ \
+ /*   "\n	-S		Write superblock and group descriptors only" */ \
+ /*   "\n	-T fs-type	Set usage type (news/largefile/largefile4)" */ \
+ /*   "\n	-v		Verbose" */ \
  #define mkfs_minix_trivial_usage \
-        "[-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
+        "[-c | -l FILE] [-nXX] [-iXX] BLOCKDEV [KBYTES]"
  #define mkfs_minix_full_usage "\n\n" \
         "Make a MINIX filesystem\n" \
       "\nOptions:" \
       "\n	-c		Check device for bad blocks" \
       "\n	-n [14|30]	Maximum length of filenames" \
       "\n	-i INODES	Number of inodes for the filesystem" \
-      "\n	-l FILENAME	Read bad blocks list from FILENAME" \
+      "\n	-l FILE		Read bad blocks list from FILE" \
       "\n	-v		Make version 2 filesystem" \
+ #define mkfs_reiser_trivial_usage \
+        "[-f] [-l LABEL] BLOCKDEV [4K-BLOCKS]"
+ #define mkfs_reiser_full_usage "\n\n" \
+        "Make a ReiserFS V3 filesystem\n" \
+      "\nOptions:" \
+      "\n	-f	Force" \
+      "\n	-l LBL	Volume label" \
+ #define mkfs_vfat_trivial_usage \
+        "[-v] [-n LABEL] BLOCKDEV [KBYTES]"
+ /* Accepted but ignored:
+        "[-c] [-C] [-I] [-l bad-block-file] [-b backup-boot-sector] "
+        "[-m boot-msg-file] [-i volume-id] "
+        "[-s sectors-per-cluster] [-S logical-sector-size] [-f number-of-FATs] "
+        "[-h hidden-sectors] [-F fat-size] [-r root-dir-entries] [-R reserved-sectors] "
+ */
+ #define mkfs_vfat_full_usage "\n\n" \
+        "Make a FAT32 filesystem\n" \
+      "\nOptions:" \
+ /*   "\n	-c	Check device for bad blocks" */ \
+      "\n	-v	Verbose" \
+ /*   "\n	-I	Allow to use entire disk device (e.g. /dev/hda)" */ \
+      "\n	-n LBL	Volume label" \
  #define mknod_trivial_usage \
         "[OPTIONS] NAME TYPE MAJOR MINOR"
  #define mknod_full_usage "\n\n" \
-Line 2545
+Line 2843
       "\n	b:	Make a block device" \
       "\n	c or u:	Make a character device" \
       "\n	p:	Make a named pipe (MAJOR and MINOR are ignored)" \
- 	USE_SELINUX( \
+ 	IF_SELINUX( \
       "\n	-Z	Set security context" \
  	)
-Line 2554
+Line 2852
         "$ mknod -m 644 /tmp/pipe p\n"
  #define mkswap_trivial_usage \
-        "DEVICE"
+        "[OPTIONS] BLOCKDEV [KBYTES]"
  #define mkswap_full_usage "\n\n" \
-        "Prepare block device to be used as swap partition"
+        "Prepare BLOCKDEV to be used as swap partition\n" \
- #if 0
+      "\nOptions:" \
-        "[-c] [-v0|-v1] DEVICE [BLOCKS]"
+      "\n	-L LBL	Label" \
-      "\nOptions:"
-      "\n	-c	Check for readability"
-      "\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 \
         "[-dt] [-p DIR] [TEMPLATE]"
-Line 2587
+Line 2879
         "-rw-------    1 andersen andersen        0 Apr 25 17:10 /tmp/temp.mWiLjM\n"
  #define modprobe_trivial_usage \
-        "[-knqrsv] MODULE [symbol=value...]"
+ 	IF_MODPROBE_SMALL("[-qfwrsv] MODULE [symbol=value]...") \
+ 	IF_NOT_MODPROBE_SMALL("[-" \
+ 		IF_FEATURE_2_4_MODULES("k")"nqrsv" \
+ 		IF_FEATURE_MODPROBE_BLACKLIST("b")"] MODULE [symbol=value]...")
  #define modprobe_full_usage "\n\n" \
         "Options:" \
- 	USE_FEATURE_2_4_MODULES( \
+ 	IF_MODPROBE_SMALL( \
+      "\n	-q	Quiet" \
+      "\n	-f	Force" \
+      "\n	-w	Wait for unload" \
+      "\n	-r	Remove module (stacks) or do autoclean" \
+      "\n	-s	Report via syslog instead of stderr" \
+      "\n	-v	Verbose" \
+ 	) \
+ 	IF_NOT_MODPROBE_SMALL( \
+ 	IF_FEATURE_2_4_MODULES( \
       "\n	-k	Make module autoclean-able" \
  	) \
       "\n	-n	Dry run" \
-Line 2598
+Line 2902
       "\n	-r	Remove module (stacks) or do autoclean" \
       "\n	-s	Report via syslog instead of stderr" \
       "\n	-v	Verbose" \
- 	USE_FEATURE_MODPROBE_BLACKLIST( \
+ 	IF_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" \
  "pass each module it loads.\n" \
  "\n" \
- "The configuration file is searched (in order) amongst:\n" \
+ "The configuration file is searched (in this order):\n" \
  "\n" \
  "    /etc/modprobe.conf (2.6 only)\n" \
  "    /etc/modules.conf\n" \
-Line 2663
+Line 2968
         "   from the command line\n"
  #define more_trivial_usage \
-        "[FILE...]"
+        "[FILE]..."
  #define more_full_usage "\n\n" \
-        "View FILE or standard input one screenful at a time"
+        "View FILE (or stdin) one screenful at a time"
  #define more_example_usage \
         "$ dmesg | more\n"
  #define mount_trivial_usage \
-        "[flags] DEVICE NODE [-o options,more-options]"
+        "[OPTIONS] [-o OPTS] DEVICE NODE"
  #define mount_full_usage "\n\n" \
-        "Mount a filesystem. Filesystem autodetection requires /proc be mounted.\n" \
+        "Mount a filesystem. Filesystem autodetection requires /proc.\n" \
       "\nOptions:" \
       "\n	-a		Mount all filesystems in fstab" \
- 	USE_FEATURE_MOUNT_FAKE( \
+ 	IF_FEATURE_MOUNT_FAKE( \
-      "\n	-f		"USE_FEATURE_MTAB_SUPPORT("Update /etc/mtab, but ")"don't mount" \
+ 	IF_FEATURE_MTAB_SUPPORT( \
+      "\n	-f		Update /etc/mtab, but don't mount" \
+ 	) \
+ 	IF_NOT_FEATURE_MTAB_SUPPORT( \
+      "\n	-f		Dry run" \
+ 	) \
+ 	) \
+ 	IF_FEATURE_MOUNT_HELPERS( \
+      "\n	-i		Don't run mount helper" \
  	) \
- 	USE_FEATURE_MTAB_SUPPORT( \
+ 	IF_FEATURE_MTAB_SUPPORT( \
       "\n	-n		Don't update /etc/mtab" \
  	) \
       "\n	-r		Read-only mount" \
-      "\n	-t fs-type	Filesystem type" \
       "\n	-w		Read-write mount (default)" \
-        "\n" \
+      "\n	-t FSTYPE	Filesystem type" \
-        "-o option:\n" \
+      "\n	-O OPT		Mount only filesystems with option OPT (-a only)" \
- 	USE_FEATURE_MOUNT_LOOP( \
+      "\n-o OPT:" \
-        "	loop		Ignored (loop devices are autodetected)\n" \
+ 	IF_FEATURE_MOUNT_LOOP( \
- 	) \
+      "\n	loop		Ignored (loop devices are autodetected)" \
- 	USE_FEATURE_MOUNT_FLAGS( \
+ 	) \
-        "	[a]sync		Writes are asynchronous / synchronous\n" \
+ 	IF_FEATURE_MOUNT_FLAGS( \
-        "	[no]atime	Disable / enable updates to inode access times\n" \
+      "\n	[a]sync		Writes are [a]synchronous" \
-        "	[no]diratime	Disable / enable atime updates to directories\n" \
+      "\n	[no]atime	Disable/enable updates to inode access times" \
-        "	[no]relatime	Disable / enable atime updates relative to modification time\n" \
+      "\n	[no]diratime	Disable/enable atime updates to directories" \
-        "	[no]dev		Allow use of special device files / disallow them\n" \
+      "\n	[no]relatime	Disable/enable atime updates relative to modification time" \
-        "	[no]exec	Allow use of executable files / disallow them\n" \
+      "\n	[no]dev		(Dis)allow use of special device files" \
-        "	[no]suid	Allow set-user-id-root programs / disallow them\n" \
+      "\n	[no]exec	(Dis)allow use of executable files" \
-        "	[r]shared	Convert [recursively] to a shared subtree\n" \
+      "\n	[no]suid	(Dis)allow set-user-id-root programs" \
-        "	[r]slave	Convert [recursively] to a slave subtree\n" \
+      "\n	[r]shared	Convert [recursively] to a shared subtree" \
-        "	[r]private	Convert [recursively] to a private subtree\n" \
+      "\n	[r]slave	Convert [recursively] to a slave subtree" \
-        "	[un]bindable	Make mount point [un]able to be bind mounted\n" \
+      "\n	[r]private	Convert [recursively] to a private subtree" \
-        "	bind		Bind a directory to an additional location\n" \
+      "\n	[un]bindable	Make mount point [un]able to be bind mounted" \
-        "	move		Relocate an existing mount point\n" \
+      "\n	bind		Bind a file or directory to another location" \
+      "\n	move		Relocate an existing mount point" \
  	) \
-        "	remount		Remount a mounted filesystem, changing its flags\n" \
+      "\n	remount		Remount a mounted filesystem, changing flags" \
-        "	ro/rw		Mount for read-only / read-write\n" \
+      "\n	ro/rw		Same as -r/-w" \
-        "\n" \
+      "\n" \
-        "There are EVEN MORE flags that are specific to each filesystem\n" \
+      "\nThere are filesystem-specific -o flags." \
-        "You'll have to see the written documentation for those filesystems" \
  #define mount_example_usage \
         "$ mount\n" \
-Line 2723
+Line 3035
         "Returns 0 for success, number of failed mounts for -a, or errno for one mount."
  #define mountpoint_trivial_usage \
-        "[-q] <[-d] DIR | -x DEVICE>"
+        "[-q] <[-dn] DIR | -x DEVICE>"
  #define mountpoint_full_usage "\n\n" \
-        "mountpoint checks if the directory is a mountpoint\n" \
+        "Check if the directory is a mountpoint\n" \
       "\nOptions:" \
       "\n	-q	Quiet" \
       "\n	-d	Print major/minor device number of the filesystem" \
+      "\n	-n	Print device name of the filesystem" \
       "\n	-x	Print major/minor device number of the blockdevice" \
  #define mountpoint_example_usage \
-Line 2750
+Line 3063
         "setpart tell unload unlock weof wset" \
  #define mv_trivial_usage \
-        "[OPTION]... SOURCE DEST\n" \
+        "[OPTIONS] SOURCE DEST\n" \
-        "or: mv [OPTION]... SOURCE... DIRECTORY"
+        "or: mv [OPTIONS] SOURCE... DIRECTORY"
  #define mv_full_usage "\n\n" \
         "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY\n" \
       "\nOptions:" \
-Line 2766
+Line 3079
  #define nameif_full_usage "\n\n" \
         "Rename network interface while it in the down state\n" \
       "\nOptions:" \
-      "\n	-c FILE		Use configuration file (default is /etc/mactab)" \
+      "\n	-c FILE		Use configuration file (default: /etc/mactab)" \
       "\n	-s		Use syslog (LOCAL0 facility)" \
       "\n	IFNAME MACADDR	new_interface_name interface_mac_address" \
-Line 2784
+Line 3097
  #endif
  #define nc_trivial_usage \
- 	USE_NC_EXTRA("[-iN] [-wN] ")USE_NC_SERVER("[-l] [-p PORT] ") \
+ 	IF_NC_EXTRA("[-iN] [-wN] ")IF_NC_SERVER("[-l] [-p PORT] ") \
-        "["USE_NC_EXTRA("-f FILENAME|")"IPADDR PORTNUM]"USE_NC_EXTRA(" [-e COMMAND]")
+        "["IF_NC_EXTRA("-f FILENAME|")"IPADDR PORT]"IF_NC_EXTRA(" [-e PROG]")
  #define nc_full_usage "\n\n" \
-        "Open a pipe to IP:port" USE_NC_EXTRA(" or file") \
+        "Open a pipe to IP:port" IF_NC_EXTRA(" or file") \
  	NC_OPTIONS_STR \
- 	USE_NC_EXTRA( \
+ 	IF_NC_EXTRA( \
-      "\n	-e	Exec rest of command line after connect" \
+      "\n	-e PROG	Run PROG after connect" \
-      "\n	-i SECS	Delay interval for lines sent" \
+      "\n	-i SEC	Delay interval for lines sent" \
-      "\n	-w SECS	Timeout for connect" \
+      "\n	-w SEC	Timeout for connect" \
       "\n	-f FILE	Use file (ala /dev/ttyS0) instead of network" \
  	) \
- 	USE_NC_SERVER( \
+ 	IF_NC_SERVER( \
       "\n	-l	Listen mode, for inbound connects" \
- 	USE_NC_EXTRA( \
+ 	IF_NC_EXTRA( \
       "\n		(use -l twice with -e for persistent server)") \
-      "\n	-p PORT	Local port number" \
+      "\n	-p PORT	Local port" \
  	)
  #define nc_notes_usage "" \
- 	USE_NC_EXTRA( \
+ 	IF_NC_EXTRA( \
         "To use netcat as a terminal emulator on a serial port:\n\n" \
         "$ stty 115200 -F /dev/ttyS0\n" \
         "$ stty raw -echo -ctlecho && nc -f /dev/ttyS0\n" \
-Line 2822
+Line 3135
  #else /* DESKTOP nc - much more compatible with nc 1.10 */
  #define nc_trivial_usage \
-        "[-options] hostname port  - connect" \
+        "[OPTIONS] HOST PORT  - connect" \
- 	USE_NC_SERVER("\n" \
+ 	IF_NC_SERVER("\n" \
-        "nc [-options] -l -p port [hostname] [port]  - listen")
+        "nc [OPTIONS] -l -p PORT [HOST] [PORT]  - listen")
  #define nc_full_usage "\n\n" \
         "Options:" \
-      "\n	-e prog [args]	Program to exec after connect (must be last)" \
+      "\n	-e PROG		Run PROG after connect (must be last)" \
- 	USE_NC_SERVER( \
+ 	IF_NC_SERVER( \
       "\n	-l		Listen mode, for inbound connects" \
  	) \
       "\n	-n		Don't do DNS resolution" \
-      "\n	-s addr		Local address" \
+      "\n	-s ADDR		Local address" \
-      "\n	-p port		Local port" \
+      "\n	-p PORT		Local port" \
       "\n	-u		UDP mode" \
-      "\n	-v		Verbose (cumulative: -vv)" \
+      "\n	-v		Verbose" \
-      "\n	-w secs		Timeout for connects and final net reads" \
+      "\n	-w SEC		Timeout for connects and final net reads" \
- 	USE_NC_EXTRA( \
+ 	IF_NC_EXTRA( \
-      "\n	-i sec		Delay interval for lines sent" /* ", ports scanned" */ \
+      "\n	-i SEC		Delay interval for lines sent" /* ", ports scanned" */ \
-      "\n	-o file		Hex dump of traffic" \
+      "\n	-o FILE		Hex dump traffic" \
       "\n	-z		Zero-I/O mode (scanning)" \
  	) \
  /*   "\n	-r		Randomize local and remote ports" */
-Line 2847
+Line 3160
  /*   "\n	-G num		Source-routing pointer: 4, 8, 12, ..." */
  /*   "\nport numbers can be individual or ranges: lo-hi [inclusive]" */
+ /* -e PROG can take ARGS too: "nc ... -e ls -l", but we don't document it
+  * in help text: nc 1.10 does not allow that. We don't want to entice
+  * users to use this incompatibility */
  #endif
  #define netstat_trivial_usage \
-        "[-laentuwxr"USE_FEATURE_NETSTAT_WIDE("W")USE_FEATURE_NETSTAT_PRG("p")"]"
+        "[-laentuwxr"IF_FEATURE_NETSTAT_WIDE("W")IF_FEATURE_NETSTAT_PRG("p")"]"
  #define netstat_full_usage "\n\n" \
         "Display networking information\n" \
       "\nOptions:" \
-Line 2863
+Line 3180
       "\n	-w	Raw sockets" \
       "\n	-x	Unix sockets" \
       "\n	-r	Display routing table" \
- 	USE_FEATURE_NETSTAT_WIDE( \
+ 	IF_FEATURE_NETSTAT_WIDE( \
       "\n	-W	Display with no column truncation" \
  	) \
- 	USE_FEATURE_NETSTAT_PRG( \
+ 	IF_FEATURE_NETSTAT_PRG( \
       "\n	-p	Display PID/Program name for sockets" \
  	)
  #define nice_trivial_usage \
-        "[-n ADJUST] [COMMAND [ARG]...]"
+        "[-n ADJUST] [PROG ARGS]"
  #define nice_full_usage "\n\n" \
-        "Run a program with modified scheduling priority\n" \
+        "Run PROG with modified scheduling priority\n" \
       "\nOptions:" \
-      "\n	-n ADJUST	Adjust the scheduling priority by ADJUST" \
+      "\n	-n ADJUST	Adjust priority by ADJUST" \
  #define nmeter_trivial_usage \
         "format_string"
  #define nmeter_full_usage "\n\n" \
         "Monitor system in real time\n\n" \
         "Format specifiers:\n" \
-        "%Nc or %[cN]	Monitor CPU. N - bar size, default 10\n" \
+        " %Nc or %[cN]	Monitor CPU. N - bar size, default 10\n" \
         "		(displays: S:system U:user N:niced D:iowait I:irq i:softirq)\n" \
-        "%[niface]	Monitor network interface 'iface'\n" \
+        " %[niface]	Monitor network interface 'iface'\n" \
-        "%m		Monitor allocated memory\n" \
+        " %m		Monitor allocated memory\n" \
-        "%[mf]		Monitor free memory\n" \
+        " %[mf]		Monitor free memory\n" \
-        "%[mt]		Monitor total memory\n" \
+        " %[mt]		Monitor total memory\n" \
-        "%s		Monitor allocated swap\n" \
+        " %s		Monitor allocated swap\n" \
-        "%f		Monitor number of used file descriptors\n" \
+        " %f		Monitor number of used file descriptors\n" \
-        "%Ni		Monitor total/specific IRQ rate\n" \
+        " %Ni		Monitor total/specific IRQ rate\n" \
-        "%x		Monitor context switch rate\n" \
+        " %x		Monitor context switch rate\n" \
-        "%p		Monitor forks\n" \
+        " %p		Monitor forks\n" \
-        "%[pn]		Monitor # of processes\n" \
+        " %[pn]		Monitor # of processes\n" \
-        "%b		Monitor block io\n" \
+        " %b		Monitor block io\n" \
-        "%Nt		Show time (with N decimal points)\n" \
+        " %Nt		Show time (with N decimal points)\n" \
-        "%Nd		Milliseconds between updates (default=1000)\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]"
+        "PROG ARGS"
  #define nohup_full_usage "\n\n" \
-        "Run a command immune to hangups, with output to a non-tty"
+        "Run PROG immune to hangups, with output to a non-tty"
  #define nohup_example_usage \
         "$ nohup make &"
-Line 2922
+Line 3239
         "Name:       debian\n" \
         "Address:    127.0.0.1\n"
+ #define ntpd_trivial_usage \
+ 	"[-dnqwl] [-S PROG] [-p PEER]..."
+ #define ntpd_full_usage "\n\n" \
+        "NTP client/server\n" \
+      "\nOptions:" \
+      "\n	-d	Verbose" \
+      "\n	-n	Do not daemonize" \
+      "\n	-q	Quit after clock is set" \
+ /* -N exists for mostly compat reasons, thus not essential to inform */ \
+ /* the user that it exists: user may use nice as well */ \
+ /*   "\n	-N	Run at high priority" */ \
+      "\n	-w	Do not set time (only query peers), implies -n" \
+      "\n	-l	Run as server on port 123" \
+      "\n	-S PROG	Run PROG after stepping time, stratum change, and every 11 mins" \
+      "\n	-p PEER	Obtain time from PEER (may be repeated)" \
  #define od_trivial_usage \
-        "[-aBbcDdeFfHhIiLlOovXx] " USE_DESKTOP("[-t TYPE] ") "[FILE]"
+        "[-aBbcDdeFfHhIiLlOovXx] " IF_DESKTOP("[-t TYPE] ") "[FILE]"
  #define od_full_usage "\n\n" \
         "Write an unambiguous representation, octal bytes by default, of FILE\n" \
-        "to standard output. With no FILE or when FILE is -, read standard input."
+        "(or stdin) to stdout"
  #define openvt_trivial_usage \
-        "[-c NUM] [-sw] [COMMAND [ARGS]]"
+        "[-c N] [-sw] [PROG ARGS]"
  #define openvt_full_usage "\n\n" \
-        "Start COMMAND on a new virtual terminal\n" \
+        "Start PROG on a new virtual terminal\n" \
       "\nOptions:" \
-      "\n	-c	Use specified VT" \
+      "\n	-c N	Use specified VT" \
       "\n	-s	Switch to the VT" \
- /*   "\n	-l	Run COMMAND as login shell (by prepending '-')" */ \
+ /*   "\n	-l	Run PROG as login shell (by prepending '-')" */ \
-      "\n	-w	Wait for COMMAND to exit" \
+      "\n	-w	Wait for PROG to exit" \
  #define openvt_example_usage \
         "openvt 2 /bin/ash\n"
+ /*
  #define parse_trivial_usage \
-        "[-n maxtokens] [-m mintokens] [-d delims] [-f flags] file ..."
+        "[-n MAXTOKENS] [-m MINTOKENS] [-d DELIMS] [-f FLAGS] FILE..."
- #define parse_full_usage "\n\n" \
+ #define parse_full_usage ""
-        "[-n maxtokens] [-m mintokens] [-d delims] [-f flags] file ..."
+ */
  #define passwd_trivial_usage \
-        "[OPTION] [name]"
+        "[OPTIONS] [USER]"
  #define passwd_full_usage "\n\n" \
-        "Change user's password. If no name is specified,\n" \
+        "Change USER's password. If no USER is specified,\n" \
         "changes the password for the current user.\n" \
       "\nOptions:" \
-      "\n	-a	Algorithm to use for password (choices: des, md5)" /* ", sha1)" */ \
+      "\n	-a	Algorithm to use for password (des, md5)" /* ", sha1)" */ \
       "\n	-d	Delete password for the account" \
       "\n	-l	Lock (disable) account" \
       "\n	-u	Unlock (re-enable) account" \
  #define chpasswd_trivial_usage \
- 	USE_GETOPT_LONG("[--md5|--encrypted]") SKIP_GETOPT_LONG("[-m|-e]")
+ 	IF_LONG_OPTS("[--md5|--encrypted]") IF_NOT_LONG_OPTS("[-m|-e]")
  #define chpasswd_full_usage "\n\n" \
-        "Read user:password information from stdin " \
+        "Read user:password from stdin and update /etc/passwd\n" \
-        "and update /etc/passwd accordingly.\n" \
       "\nOptions:" \
- 	USE_GETOPT_LONG( \
+ 	IF_LONG_OPTS( \
       "\n	-e,--encrypted	Supplied passwords are in encrypted form" \
       "\n	-m,--md5	Use MD5 encryption instead of DES" \
  	) \
- 	SKIP_GETOPT_LONG( \
+ 	IF_NOT_LONG_OPTS( \
       "\n	-e	Supplied passwords are in encrypted form" \
       "\n	-m	Use MD5 encryption instead of DES" \
  	)
  #define patch_trivial_usage \
-        "[-p NUM] [-i DIFF] [-R]"
+        "[OPTIONS] [ORIGFILE [PATCHFILE]]"
  #define patch_full_usage "\n\n" \
-        "	-p NUM	Strip NUM leading components from file names" \
+ 	IF_LONG_OPTS( \
+        "	-p,--strip N	Strip N leading components from file names" \
+      "\n	-i,--input DIFF	Read DIFF instead of stdin" \
+      "\n	-R,--reverse	Reverse patch" \
+      "\n	-N,--forward	Ignore already applied patches" \
+      "\n	--dry-run	Don't actually change files" \
+ 	) \
+ 	IF_NOT_LONG_OPTS( \
+        "	-p N	Strip N leading components from file names" \
       "\n	-i DIFF	Read DIFF instead of stdin" \
       "\n	-R	Reverse patch" \
+      "\n	-N	Ignore already applied patches" \
+ 	)
  #define patch_example_usage \
         "$ patch -p1 < example.diff\n" \
         "$ patch -p0 -i example.diff"
  #define pgrep_trivial_usage \
-        "[-flnovx] pattern"
+        "[-flnovx] [-s SID|-P PPID|PATTERN]"
  #define pgrep_full_usage "\n\n" \
-        "Display process(es) selected by regex pattern\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	-v	Negate the match" \
       "\n	-x	Match whole name (not substring)" \
+      "\n	-s	Match session ID (0 for current)" \
+      "\n	-P	Match parent process ID" \
  #if (ENABLE_FEATURE_PIDOF_SINGLE || ENABLE_FEATURE_PIDOF_OMIT)
  #define pidof_trivial_usage \
-        "[OPTION] [NAME...]"
+        "[OPTIONS] [NAME]..."
  #define USAGE_PIDOF "\n\nOptions:"
  #else
  #define pidof_trivial_usage \
-        "[NAME...]"
+        "[NAME]..."
  #define USAGE_PIDOF /* none */
  #endif
  #define pidof_full_usage "\n\n" \
         "List PIDs of all processes with names that match NAMEs" \
  	USAGE_PIDOF \
- 	USE_FEATURE_PIDOF_SINGLE( \
+ 	IF_FEATURE_PIDOF_SINGLE( \
       "\n	-s	Show only one PID") \
- 	USE_FEATURE_PIDOF_OMIT( \
+ 	IF_FEATURE_PIDOF_OMIT( \
       "\n	-o PID	Omit given pid" \
       "\n		Use %PPID to omit pid of pidof's parent") \
  #define pidof_example_usage \
         "$ pidof init\n" \
         "1\n" \
- 	USE_FEATURE_PIDOF_OMIT( \
+ 	IF_FEATURE_PIDOF_OMIT( \
         "$ pidof /bin/sh\n20351 5973 5950\n") \
- 	USE_FEATURE_PIDOF_OMIT( \
+ 	IF_FEATURE_PIDOF_OMIT( \
         "$ pidof /bin/sh -o %PPID\n20351 5950")
  #if !ENABLE_FEATURE_FANCY_PING
-Line 3032
+Line 3377
         "Send ICMP ECHO_REQUEST packets to network hosts"
  #else
  #define ping_trivial_usage \
-        "[OPTION]... host"
+        "[OPTIONS] HOST"
  #define ping_full_usage "\n\n" \
         "Send ICMP ECHO_REQUEST packets to network hosts\n" \
       "\nOptions:" \
-      "\n	-4, -6		Force IPv4 or IPv6 hostname resolution" \
+      "\n	-4, -6		Force IP or IPv6 name resolution" \
       "\n	-c CNT		Send only CNT pings" \
-      "\n	-s SIZE		Send SIZE data bytes in packets (default=56)" \
+      "\n	-s SIZE		Send SIZE data bytes in packets (default:56)" \
-      "\n	-I iface/IP	Use interface or IP address as source" \
+      "\n	-I IFACE/IP	Use interface or IP address as source" \
-      "\n	-W timeout	Seconds to wait for the first response (default:10)" \
+      "\n	-W SEC		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	-w SEC		Seconds until ping exits (default:infinite)" \
       "\n			(can exit earlier with -c CNT)" \
       "\n	-q		Quiet, only displays output at start" \
       "\n			and when finished" \
  #define ping6_trivial_usage \
-        "[OPTION]... host"
+        "[OPTIONS] HOST"
  #define ping6_full_usage "\n\n" \
         "Send ICMP ECHO_REQUEST packets to network hosts\n" \
       "\nOptions:" \
       "\n	-c CNT		Send only CNT pings" \
-      "\n	-s SIZE		Send SIZE data bytes in packets (default=56)" \
+      "\n	-s SIZE		Send SIZE data bytes in packets (default:56)" \
-      "\n	-I iface/IP	Use interface or IP address as source" \
+      "\n	-I IFACE/IP	Use interface or IP address as source" \
       "\n	-q		Quiet, only displays output at start" \
       "\n			and when finished" \
-Line 3086
+Line 3431
         "the new root file system"
  #define pkill_trivial_usage \
-        "[-l] | [-fnovx] [-signal] pattern"
+        "[-l|-SIGNAL] [-fnovx] [-s SID|-P PPID|PATTERN]"
  #define pkill_full_usage "\n\n" \
-        "Send a signal to process(es) selected by regex pattern\n" \
+        "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	-v	Negate the match" \
       "\n	-x	Match whole name (not substring)" \
+      "\n	-s	Match session ID (0 for current)" \
+      "\n	-P	Match parent process ID" \
  #define popmaildir_trivial_usage \
-        "[OPTIONS] Maildir [connection-helper ...]"
+        "[OPTIONS] MAILDIR [CONN_HELPER ARGS]"
  #define popmaildir_full_usage "\n\n" \
         "Fetch content of remote mailbox to local maildir\n" \
       "\nOptions:" \
-      "\n	-b		Binary mode. Ignored" \
+ /*   "\n	-b		Binary mode. Ignored" */ \
-      "\n	-d		Debug. Ignored" \
+ /*   "\n	-d		Debug. Ignored" */ \
-      "\n	-m		Show used memory. Ignored" \
+ /*   "\n	-m		Show used memory. Ignored" */ \
-      "\n	-V		Show version. Ignored" \
+ /*   "\n	-V		Show version. Ignored" */ \
-      "\n	-c		Use tcpclient. Ignored" \
+ /*   "\n	-c		Use tcpclient. Ignored" */ \
-      "\n	-a		Use APOP protocol. Implied. If server supports APOP -> use it" \
+ /*   "\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" \
+      "\n	-t SEC		Network timeout" \
-      USE_FEATURE_POPMAILDIR_DELIVERY( \
+ 	IF_FEATURE_POPMAILDIR_DELIVERY( \
-      "\n	-F \"program arg1 arg2 ...\"	Filter by program. May be multiple" \
+      "\n	-F \"PROG ARGS\"	Filter program. May be multiple" \
-      "\n	-M \"program arg1 arg2 ...\"	Deliver by program" \
+      "\n	-M \"PROG ARGS\"	Delivery program" \
-      ) \
+ 	) \
-      "\n	-R size		Remove old messages on the server >= size (in bytes). Ignored" \
+ /*   "\n	-R BYTES	Remove old messages on the server >= BYTES. Ignored" */
-      "\n	-Z N1-N2	Remove messages from N1 to N2 (dangerous). 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	-L BYTES	Don't retrieve new messages >= BYTES. Ignored" */
-      "\n	-H lines	Type specified number of lines of a message. Ignored"
+ /*   "\n	-H LINES	Type first LINES of a message. Ignored" */
  #define popmaildir_example_usage \
         "$ popmaildir -k ~/Maildir -- nc pop.drvv.ru 110 [<password_file]\n" \
         "$ popmaildir ~/Maildir -- openssl s_client -quiet -connect pop.gmail.com:995 [<password_file]\n"
  #define poweroff_trivial_usage \
-        "[-d delay] [-n] [-f]"
+        "[-d DELAY] [-n] [-f]"
  #define poweroff_full_usage "\n\n" \
         "Halt and shut off power\n" \
       "\nOptions:" \
-Line 3134
+Line 3481
       "\n	-f	Force power off (don't go through init)" \
  #define printenv_trivial_usage \
-        "[VARIABLES...]"
+        "[VARIABLE]..."
  #define printenv_full_usage "\n\n" \
-        "Print all or part of environment.\n" \
+        "Print environment VARIABLEs.\n" \
-        "If no environment VARIABLE specified, print them all."
+        "If no VARIABLE specified, print all."
  #define printf_trivial_usage \
-        "FORMAT [ARGUMENT...]"
+        "FORMAT [ARGUMENT]..."
  #define printf_full_usage "\n\n" \
         "Format and print ARGUMENT(s) according to FORMAT,\n" \
         "where FORMAT controls the output exactly as in C printf"
-Line 3157
+Line 3504
         "Report process status\n" \
       "\nOptions:" \
       "\n	-o col1,col2=header	Select columns for display" \
+ 	IF_FEATURE_SHOW_THREADS( \
+      "\n	-T			Show threads" \
+ 	)
  #else /* !ENABLE_DESKTOP */
-Line 3171
+Line 3521
  #define ps_full_usage "\n\n" \
         "Report process status\n" \
  	USAGE_PS \
- 	USE_SELINUX( \
+ 	IF_SELINUX( \
       "\n	-Z	Show SE Linux context" \
  	) \
- 	USE_FEATURE_PS_WIDE( \
+ 	IF_FEATURE_PS_WIDE( \
       "\n	w	Wide output" \
  	)
-Line 3239
+Line 3589
  #define readahead_trivial_usage \
         "[FILE]..."
  #define readahead_full_usage "\n\n" \
-        "Preload FILE(s) in RAM cache so that subsequent reads for those" \
+        "Preload FILEs to RAM"
-        "files do not block on disk I/O"
  #define readlink_trivial_usage \
- 	USE_FEATURE_READLINK_FOLLOW("[-f] ") "FILE"
+ 	IF_FEATURE_READLINK_FOLLOW("[-fnv] ") "FILE"
  #define readlink_full_usage "\n\n" \
         "Display the value of a symlink" \
- 	USE_FEATURE_READLINK_FOLLOW( "\n" \
+ 	IF_FEATURE_READLINK_FOLLOW( "\n" \
       "\nOptions:" \
-      "\n	-f	Canonicalize by following all symlinks") \
+      "\n	-f	Canonicalize by following all symlinks" \
+      "\n	-n	Don't add newline" \
+      "\n	-v	Verbose" \
+ 	) \
  #define readprofile_trivial_usage \
-        "[OPTIONS]..."
+        "[OPTIONS]"
  #define readprofile_full_usage "\n\n" \
         "Options:" \
       "\n	-m mapfile	(Default: /boot/System.map)" \
-Line 3266
+Line 3618
       "\n	-n		Disable byte order auto-detection" \
  #define realpath_trivial_usage \
-        "pathname..."
+        "FILE..."
  #define realpath_full_usage "\n\n" \
-        "Return the absolute pathnames of given argument"
+        "Return the absolute pathnames of given FILE"
  #define reboot_trivial_usage \
-        "[-d delay] [-n] [-f]"
+        "[-d DELAY] [-n] [-f]"
  #define reboot_full_usage "\n\n" \
         "Reboot the system\n" \
       "\nOptions:" \
-Line 3280
+Line 3632
       "\n	-f	Force reboot (don't go through init)" \
  #define reformime_trivial_usage \
-        "[OPTION]... [FILE]..."
+        "[OPTIONS] [FILE]..."
  #define reformime_full_usage "\n\n" \
         "Parse MIME-encoded message\n" \
       "\nOptions:" \
-      "\n	-x prefix	Extract content of MIME sections to files" \
+      "\n	-x PREFIX	Extract content of MIME sections to files" \
-      "\n	-X prog [args]	Filter content of MIME sections through prog." \
+      "\n	-X PROG ARGS	Filter content of MIME sections through PROG" \
       "\n			Must be the last option" \
       "\n" \
-      "\nOther options are silently ignored." \
+      "\nOther options are silently ignored" \
  #define renice_trivial_usage \
         "{{-n INCREMENT} | PRIORITY} [[-p | -g | -u] ID...]"
-Line 3300
+Line 3652
       "\n	-g	Process group id(s)" \
       "\n	-u	Process user name(s) and/or id(s)" \
+ #define scriptreplay_trivial_usage \
+        "timingfile [typescript [divisor]]"
+ #define scriptreplay_full_usage "\n\n" \
+        "Play back typescripts, using timing information"
  #define reset_trivial_usage \
         ""
  #define reset_full_usage "\n\n" \
-Line 3314
+Line 3671
         "[-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	-i		Ignore files that don't 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	-R,-r		Recurse" \
       "\n	-n		Don't change any file labels" \
       "\n	-o file		Save list of files with incorrect context" \
       "\n	-v		Verbose" \
-Line 3327
+Line 3684
       "\n			if it has changed" \
  #define rm_trivial_usage \
-        "[OPTION]... FILE..."
+        "[OPTIONS] FILE..."
  #define rm_full_usage "\n\n" \
-        "Remove (unlink) the FILE(s). Use '--' to\n" \
+        "Remove (unlink) FILEs\n" \
-        "indicate that all following arguments are non-options.\n" \
       "\nOptions:" \
       "\n	-i	Always prompt before removing" \
       "\n	-f	Never prompt" \
-      "\n	-r,-R	Remove directories recursively" \
+      "\n	-R,-r	Recurse" \
  #define rm_example_usage \
         "$ rm -rf /tmp/foo\n"
  #define rmdir_trivial_usage \
-        "[OPTION]... DIRECTORY..."
+        "[OPTIONS] DIRECTORY..."
  #define rmdir_full_usage "\n\n" \
-        "Remove the DIRECTORY, if it is empty.\n" \
+        "Remove DIRECTORY if it is empty\n" \
       "\nOptions:" \
-      USE_FEATURE_RMDIR_LONG_OPTIONS( \
+ 	IF_FEATURE_RMDIR_LONG_OPTIONS( \
       "\n	-p|--parents	Include parents" \
-      "\n	-ignore-fail-on-non-empty" \
+      "\n	--ignore-fail-on-non-empty" \
-      ) \
+ 	) \
-      SKIP_FEATURE_RMDIR_LONG_OPTIONS( \
+ 	IF_NOT_FEATURE_RMDIR_LONG_OPTIONS( \
       "\n	-p	Include parents" \
-      )
+ 	)
  #define rmdir_example_usage \
         "# rmdir /tmp/foo\n"
  #define rmmod_trivial_usage \
-        "[OPTION]... [MODULE]..."
+        "[OPTIONS] [MODULE]..."
  #define rmmod_full_usage "\n\n" \
         "Unload the specified kernel modules from the kernel\n" \
       "\nOptions:" \
-Line 3374
+Line 3730
       "\nOptions:" \
       "\n	-n	Don't resolve names" \
       "\n	-e	Display other/more information" \
-      "\n	-A inet" USE_FEATURE_IPV6("{6}") "	Select address family" \
+      "\n	-A inet" IF_FEATURE_IPV6("{6}") "	Select address family" \
  #define rpm_trivial_usage \
-        "-i -q[ildc]p package.rpm"
+        "-i -q[ildc]p PACKAGE.rpm"
  #define rpm_full_usage "\n\n" \
         "Manipulate RPM packages\n" \
       "\nOptions:" \
-Line 3395
+Line 3751
         "Output a cpio archive of the rpm file"
  #define rtcwake_trivial_usage \
-        "[-a | -l | -u] [-d DEV] [-m MODE] [-s SECS | -t TIME]"
+        "[-a | -l | -u] [-d DEV] [-m MODE] [-s SEC | -t TIME]"
  #define rtcwake_full_usage "\n\n" \
         "Enter a system sleep state until specified wakeup time\n" \
- 	USE_GETOPT_LONG( \
+ 	IF_LONG_OPTS( \
-      "\n	-a,--auto	 Read clock mode from adjtime" \
+      "\n	-a,--auto	Read clock mode from adjtime" \
-      "\n	-l,--local	 Clock is set to local time" \
+      "\n	-l,--local	Clock is set to local time" \
-      "\n	-u,--utc	 Clock is set to UTC time" \
+      "\n	-u,--utc	Clock is set to UTC time" \
-      "\n	-d,--device=DEV	 Specify the RTC device" \
+      "\n	-d,--device=DEV	Specify the RTC device" \
-      "\n	-m,--mode=MODE	 Set the sleep state (default: standby)" \
+      "\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" \
+      "\n	-t,--time=TIME	Set the timeout to TIME seconds from epoch" \
  	) \
- 	SKIP_GETOPT_LONG( \
+ 	IF_NOT_LONG_OPTS( \
       "\n	-a	Read clock mode from adjtime" \
       "\n	-l	Clock is set to local time" \
       "\n	-u	Clock is set to UTC time" \
-Line 3418
+Line 3774
  	)
  #define runcon_trivial_usage \
-        "[-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n" \
+        "[-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] PROG ARGS\n" \
-        "	runcon CONTEXT COMMAND [args]"
+        "	runcon CONTEXT PROG ARGS"
  #define runcon_full_usage "\n\n" \
-        "Run a program in a different security context\n" \
+        "Run PROG in a different security context\n" \
       "\n	CONTEXT		Complete security context\n" \
- 	USE_FEATURE_RUNCON_LONG_OPTIONS( \
+ 	IF_FEATURE_RUNCON_LONG_OPTIONS( \
       "\n	-c,--compute	Compute process transition context before modifying" \
       "\n	-t,--type=TYPE	Type (for same role as parent)" \
       "\n	-u,--user=USER	User identity" \
       "\n	-r,--role=ROLE	Role" \
       "\n	-l,--range=RNG	Levelrange" \
  	) \
- 	SKIP_FEATURE_RUNCON_LONG_OPTIONS( \
+ 	IF_NOT_FEATURE_RUNCON_LONG_OPTIONS( \
       "\n	-c	Compute process transition context before modifying" \
       "\n	-t TYPE	Type (for same role as parent)" \
       "\n	-u USER	User identity" \
-Line 3439
+Line 3795
  	)
  #define run_parts_trivial_usage \
-        "[-t] "USE_FEATURE_RUN_PARTS_FANCY("[-l] ")"[-a ARG] [-u MASK] DIRECTORY"
+        "[-t] "IF_FEATURE_RUN_PARTS_FANCY("[-l] ")"[-a ARG] [-u MASK] DIRECTORY"
  #define run_parts_full_usage "\n\n" \
-        "Run a bunch of scripts in a directory\n" \
+        "Run a bunch of scripts in DIRECTORY\n" \
       "\nOptions:" \
       "\n	-t	Print what would be run, but don't actually run anything" \
       "\n	-a ARG	Pass ARG as argument for every program" \
       "\n	-u MASK	Set the umask to MASK before running every program" \
- 	USE_FEATURE_RUN_PARTS_FANCY( \
+ 	IF_FEATURE_RUN_PARTS_FANCY( \
       "\n	-l	Print names of all matching files even if they are not executable" \
  	)
-Line 3465
+Line 3821
         "+ shutdown -h +4m"
  #define runlevel_trivial_usage \
-        "[utmp]"
+        "[FILE]"
  #define runlevel_full_usage "\n\n" \
-        "Find the current and previous system runlevel.\n\n" \
+        "Find the current and previous system runlevel\n" \
-        "If no utmp file exists or if no runlevel record can be found,\n" \
+        "\n" \
+        "If no utmp FILE exists or if no runlevel record can be found,\n" \
         "print \"unknown\""
  #define runlevel_example_usage \
         "$ runlevel /var/run/utmp\n" \
         "N 2"
  #define runsv_trivial_usage \
-        "dir"
+        "DIR"
  #define runsv_full_usage "\n\n" \
         "Start and monitor a service and optionally an appendant log service"
  #define runsvdir_trivial_usage \
-        "[-P] [-s SCRIPT] dir"
+        "[-P] [-s SCRIPT] DIR"
  #define runsvdir_full_usage "\n\n" \
         "Start a runsv process for each subdirectory. If it exits, restart it.\n" \
       "\n	-P		Put each runsv in a new session" \
-Line 3494
+Line 3851
         "$ rx /tmp/foo\n"
  #define script_trivial_usage \
-        "[-afq] [-c COMMAND] [OUTFILE]"
+        "[-afq" IF_SCRIPTREPLAY("t") "] [-c PROG] [OUTFILE]"
  #define script_full_usage "\n\n" \
         "Options:" \
       "\n	-a	Append output" \
-      "\n	-c	Run COMMAND, not shell" \
+      "\n	-c	Run PROG, not shell" \
       "\n	-f	Flush output after each write" \
       "\n	-q	Quiet" \
+ 	IF_SCRIPTREPLAY( \
+      "\n	-t	Send timing to stderr" \
+ 	)
  #define sed_trivial_usage \
-        "[-efinr] pattern [files...]"
+        "[-efinr] SED_CMD [FILE]..."
  #define sed_full_usage "\n\n" \
         "Options:" \
-      "\n	-e script	Add the script to the commands to be executed" \
+      "\n	-e CMD	Add CMD to sed commands to be executed" \
-      "\n	-f scriptfile	Add scriptfile contents to the" \
+      "\n	-f FILE	Add FILE contents to sed commands to be executed" \
-      "\n			commands to be executed" \
+      "\n	-i	Edit files in-place (else sends result to stdout)" \
-      "\n	-i		Edit files in-place" \
+      "\n	-n	Suppress automatic printing of pattern space" \
-      "\n	-n		Suppress automatic printing of pattern space" \
+      "\n	-r	Use extended regex syntax" \
-      "\n	-r		Use extended regular expression syntax" \
       "\n" \
-      "\nIf no -e or -f is given, the first non-option argument is taken as the sed" \
+      "\nIf no -e or -f, the first non-option argument is the sed command string." \
-      "\nscript to interpret. All remaining arguments are names of input files; if no" \
+      "\nRemaining arguments are input files (stdin if none)."
-      "\ninput files are specified, then the standard input is read. Source files" \
-      "\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" \
-Line 3526
+Line 3883
  #define selinuxenabled_full_usage ""
  #define sendmail_trivial_usage \
-        "[OPTIONS] [rcpt]..."
+        "[OPTIONS] [RECIPIENT_EMAIL]..."
  #define sendmail_full_usage "\n\n" \
-        "Send an email\n" \
+        "Read email from stdin and send it\n" \
-      "\nOptions:" \
+      "\nStandard options:" \
-      "\n	-w timeout	Network timeout" \
+      "\n	-t		Read additional recipients from message body" \
-      "\n	-H [user:pass@]server[:port] Server" \
+      "\n	-f sender	Sender (required)" \
-      "\n	-S		Use openssl connection helper for secure servers" \
+      "\n	-o options	Various options. -oi implied, others are ignored" \
-      "\n	-N type		Request delivery notification. Type is ignored" \
+      "\n	-i		-oi synonym. implied and ignored" \
-      "\n	-f sender	Sender" \
+      "\n" \
-      "\n	-F fullname	Sender full name. Overrides $NAME" \
+      "\nBusybox specific options:" \
- 	USE_FEATURE_SENDMAIL_MAILX( \
+      "\n	-w seconds	Network timeout" \
-      "\n	-s subject	Subject" \
+      "\n	-H 'PROG ARGS'	Run connection helper" \
-      "\n	-j charset	Assume charset for body and subject (" CONFIG_FEATURE_MIME_CHARSET ")" \
+      "\n			Examples:" \
-      "\n	-a file		File to attach. May be multiple" \
+      "\n			-H 'exec openssl s_client -quiet -tls1 -starttls smtp" \
-      "\n	-H \"prog args...\" Use external connection helper. E.g. openssl for secure servers" \
+      "\n				-connect smtp.gmail.com:25' <email.txt" \
+      "\n				[4<username_and_passwd.txt | -au<username> -ap<password>]" \
+      "\n			-H 'exec openssl s_client -quiet -tls1" \
+      "\n				-connect smtp.gmail.com:465' <email.txt" \
+      "\n				[4<username_and_passwd.txt | -au<username> -ap<password>]" \
       "\n	-S server[:port] Server" \
-      	) \
+      "\n	-au<username>	Username for AUTH LOGIN" \
- 	USE_FEATURE_SENDMAIL_MAILXX( \
+      "\n	-ap<password>	Password for AUTH LOGIN" \
-      "\n	-c rcpt		Cc: recipient. May be multiple" \
+      "\n	-am<method>	Authentication method. Ignored. LOGIN is implied" \
-      "\n	-e rcpt		Errors-To: recipient" \
-        	)
-      "\n	-t		Read recipients and subject from body" \
       "\n" \
-      "\nOther options are silently ignored; -oi is implied" \
+      "\nOther options are silently ignored; -oi -t is implied" \
+ 	IF_MAKEMIME( \
+      "\nUse makemime applet to create message with attachments" \
+ 	)
  #define seq_trivial_usage \
-        "[first [increment]] last"
+        "[-w] [-s SEP] [FIRST [INC]] LAST"
  #define seq_full_usage "\n\n" \
-        "Print numbers from FIRST to LAST, in steps of INCREMENT.\n" \
+        "Print numbers from FIRST to LAST, in steps of INC.\n" \
-        "FIRST, INCREMENT default to 1\n" \
+        "FIRST, INC default to 1.\n" \
-      "\nArguments:" \
+      "\nOptions:" \
-      "\n	LAST" \
+      "\n	-w	Pad to last with leading zeros" \
-      "\n	FIRST LAST" \
+      "\n	-s SEP	String separator" \
-      "\n	FIRST INCREMENT LAST" \
  #define sestatus_trivial_usage \
         "[-vb]"
-Line 3568
+Line 3928
       "\n	-b	Display current state of booleans" \
  #define setconsole_trivial_usage \
-        "[-r" USE_FEATURE_SETCONSOLE_LONG_OPTIONS("|--reset") "] [DEVICE]"
+        "[-r" IF_FEATURE_SETCONSOLE_LONG_OPTIONS("|--reset") "] [DEVICE]"
  #define setconsole_full_usage "\n\n" \
         "Redirect system console output to DEVICE (default: /dev/tty)\n" \
       "\nOptions:" \
-Line 3579
+Line 3939
  #define setenforce_full_usage ""
  #define setfiles_trivial_usage \
-        "[-dnpqsvW] [-e dir]... [-o file] [-r alt_root_path]" \
+        "[-dnpqsvW] [-e DIR]... [-o FILE] [-r alt_root_path]" \
- 	USE_FEATURE_SETFILES_CHECK_OPTION( \
+ 	IF_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( \
+ 	IF_FEATURE_SETFILES_CHECK_OPTION( \
-      "\n	-c file	Check the validity of the contexts against the specified binary policy" \
+      "\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	-r DIR	Use an alternate root path" \
-      "\n	-e dir	Exclude directory" \
+      "\n	-e DIR	Exclude DIR" \
       "\n	-F	Force reset of context to match file_context for customizable files" \
-      "\n	-o file	Save list of files with incorrect context" \
+      "\n	-o FILE	Save list of files with incorrect context" \
-      "\n	-s	Take a list of files from standard input (instead of command line)" \
+      "\n	-s	Take a list of files from stdin (instead of command line)" \
       "\n	-v	Show changes in file labels, if type or role are changing" \
       "\n	-vv	Show changes in file labels, if type, role, or user are changing" \
       "\n	-W	Display warnings about entries that had no matching files" \
-Line 3619
+Line 3979
         "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"
-Line 3636
+Line 3996
         "Change boolean setting"
  #define setsid_trivial_usage \
-        "PROG [ARG...]"
+        "PROG ARGS"
  #define setsid_full_usage "\n\n" \
         "Run PROG in a new session. PROG will have no controlling terminal\n" \
         "and will not be affected by keyboard signals (Ctrl-C etc).\n" \
         "See setsid(2) for details." \
- #define lash_trivial_usage \
-        "[FILE]...\n" \
-        "or: sh -c command [args]..."
- #define lash_full_usage "\n\n" \
-        "lash is deprecated, please use hush"
  #define last_trivial_usage \
-        ""USE_FEATURE_LAST_FANCY("[-HW] [-f file]")
+        ""IF_FEATURE_LAST_FANCY("[-HW] [-f file]")
  #define last_full_usage "\n\n" \
         "Show listing of the last users that logged into the system" \
- 	USE_FEATURE_LAST_FANCY( "\n" \
+ 	IF_FEATURE_LAST_FANCY( "\n" \
       "\nOptions:" \
  /*   "\n	-H	Show header line" */ \
       "\n	-W	Display with no host column truncation" \
       "\n	-f file Read from file instead of /var/log/wtmp" \
  	)
- #define sha1sum_trivial_usage \
-        "[OPTION] [FILEs...]" \
- 	USE_FEATURE_MD5_SHA1_SUM_CHECK("\n   or: sha1sum [OPTION] -c [FILE]")
- #define sha1sum_full_usage "\n\n" \
-        "Print" USE_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums." \
- 	USE_FEATURE_MD5_SHA1_SUM_CHECK( "\n" \
-      "\nOptions:" \
-      "\n	-c	Check SHA1 sums against given list" \
-      "\n	-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" \
-Line 3681
+Line 4023
       "\n	-s	Display raw scan-codes" \
  #define slattach_trivial_usage \
-        "[-cehmLF] [-s speed] [-p protocol] DEVICEs"
+        "[-cehmLF] [-s SPEED] [-p PROTOCOL] DEVICE"
  #define slattach_full_usage "\n\n" \
         "Attach network interface(s) to serial line(s)\n" \
       "\nOptions:" \
-      "\n	-p	Set protocol (slip, cslip, slip6, clisp6 or adaptive)" \
+      "\n	-p PROT	Set protocol (slip, cslip, slip6, clisp6 or adaptive)" \
-      "\n	-s	Set line speed" \
+      "\n	-s SPD	Set line speed" \
       "\n	-e	Exit after initializing device" \
       "\n	-h	Exit when the carrier is lost" \
-      "\n	-c	Execute a command when the line is hung up" \
+      "\n	-c PROG	Run PROG when the line is hung up" \
       "\n	-m	Do NOT initialize the line in raw 8 bits mode" \
       "\n	-L	Enable 3-wire operation" \
       "\n	-F	Disable RTS/CTS flow control" \
  #define sleep_trivial_usage \
- 	USE_FEATURE_FANCY_SLEEP("[") "N" USE_FEATURE_FANCY_SLEEP("]...")
+ 	IF_FEATURE_FANCY_SLEEP("[") "N" IF_FEATURE_FANCY_SLEEP("]...")
  #define sleep_full_usage "\n\n" \
- 	SKIP_FEATURE_FANCY_SLEEP("Pause for N seconds") \
+ 	IF_NOT_FEATURE_FANCY_SLEEP("Pause for N seconds") \
- 	USE_FEATURE_FANCY_SLEEP( \
+ 	IF_FEATURE_FANCY_SLEEP( \
         "Pause for a time equal to the total of the args given, where each arg can\n" \
         "have an optional suffix of (s)econds, (m)inutes, (h)ours, or (d)ays")
  #define sleep_example_usage \
         "$ sleep 2\n" \
         "[2 second delay results]\n" \
- 	USE_FEATURE_FANCY_SLEEP( \
+ 	IF_FEATURE_FANCY_SLEEP( \
         "$ sleep 1d 3h 22m 8s\n" \
         "[98528 second delay results]\n")
  #define sort_trivial_usage \
         "[-nru" \
- 	USE_FEATURE_SORT_BIG("gMcszbdfimSTokt] [-o FILE] [-k start[.offset][opts][,end[.offset][opts]] [-t CHAR") \
+ 	IF_FEATURE_SORT_BIG("gMcszbdfimSTokt] [-o FILE] [-k start[.offset][opts][,end[.offset][opts]] [-t CHAR") \
         "] [FILE]..."
  #define sort_full_usage "\n\n" \
         "Sort lines of text\n" \
       "\nOptions:" \
- 	USE_FEATURE_SORT_BIG( \
+ 	IF_FEATURE_SORT_BIG( \
       "\n	-b	Ignore leading blanks" \
       "\n	-c	Check whether input is sorted" \
       "\n	-d	Dictionary order (blank or alphanumeric only)" \
-Line 3726
+Line 4068
       "\n	-M	Sort month" \
  	) \
       "\n	-n	Sort numbers" \
- 	USE_FEATURE_SORT_BIG( \
+ 	IF_FEATURE_SORT_BIG( \
       "\n	-o	Output to file" \
       "\n	-k	Sort by key" \
       "\n	-t CHAR	Key separator" \
  	) \
       "\n	-r	Reverse sort order" \
- 	USE_FEATURE_SORT_BIG( \
+ 	IF_FEATURE_SORT_BIG( \
       "\n	-s	Stable (don't sort ties alphabetically)" \
  	) \
       "\n	-u	Suppress duplicate lines" \
- 	USE_FEATURE_SORT_BIG( \
+ 	IF_FEATURE_SORT_BIG( \
       "\n	-z	Lines are terminated by NUL, not newline" \
       "\n	-mST	Ignored for GNU compatibility") \
-Line 3748
+Line 4090
         "d\n" \
         "e\n" \
         "f\n" \
- 	USE_FEATURE_SORT_BIG( \
+ 	IF_FEATURE_SORT_BIG( \
  		"$ echo -e \"c 3\\nb 2\\nd 2\" | $SORT -k 2,2n -k 1,1r\n" \
  		"d 2\n" \
  		"b 2\n" \
-Line 3757
+Line 4099
         ""
  #define split_trivial_usage \
-        "[OPTION] [INPUT [PREFIX]]"
+        "[OPTIONS] [INPUT [PREFIX]]"
  #define split_full_usage "\n\n" \
         "Options:" \
       "\n	-b n[k|m]	Split by bytes" \
-Line 3769
+Line 4111
         "$ cat TODO | split -a 2 -l 2 TODO_\n"
  #define start_stop_daemon_trivial_usage \
-        "[OPTIONS] [-S|-K] ... [-- arguments...]"
+        "[OPTIONS] [-S|-K] ... [-- ARGS...]"
  #define start_stop_daemon_full_usage "\n\n" \
         "Search for matching processes, and then\n" \
         "-K: stop all matching processes.\n" \
         "-S: start a process unless a matching process is found.\n" \
- 	USE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS( \
+ 	IF_FEATURE_START_STOP_DAEMON_LONG_OPTIONS( \
       "\nProcess matching:" \
       "\n	-u,--user USERNAME|UID	Match only this user's processes" \
       "\n	-n,--name NAME		Match processes with NAME" \
-Line 3787
+Line 4129
       "\n	-x,--exec EXECUTABLE	Program to run" \
       "\n	-a,--startas NAME	Zeroth argument" \
       "\n	-b,--background		Background" \
- 	USE_FEATURE_START_STOP_DAEMON_FANCY( \
+ 	IF_FEATURE_START_STOP_DAEMON_FANCY( \
       "\n	-N,--nicelevel N	Change nice level" \
  	) \
       "\n	-c,--chuid USER[:[GRP]]	Change to user/group" \
-Line 3796
+Line 4138
       "\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( \
+ 	IF_FEATURE_START_STOP_DAEMON_FANCY( \
       "\n	-o,--oknodo		Exit with status 0 if nothing is done" \
       "\n	-v,--verbose		Verbose" \
  	) \
       "\n	-q,--quiet		Quiet" \
  	) \
- 	SKIP_FEATURE_START_STOP_DAEMON_LONG_OPTIONS( \
+ 	IF_NOT_FEATURE_START_STOP_DAEMON_LONG_OPTIONS( \
       "\nProcess matching:" \
       "\n	-u USERNAME|UID	Match only this user's processes" \
       "\n	-n NAME		Match processes with NAME" \
-Line 3815
+Line 4157
       "\n	-x EXECUTABLE	Program to run" \
       "\n	-a NAME		Zeroth argument" \
       "\n	-b		Background" \
- 	USE_FEATURE_START_STOP_DAEMON_FANCY( \
+ 	IF_FEATURE_START_STOP_DAEMON_FANCY( \
       "\n	-N N		Change nice level" \
  	) \
       "\n	-c USER[:[GRP]]	Change to user/group" \
-Line 3824
+Line 4166
       "\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( \
+ 	IF_FEATURE_START_STOP_DAEMON_FANCY( \
       "\n	-o		Exit with status 0 if nothing is done" \
       "\n	-v		Verbose" \
  	) \
-Line 3832
+Line 4174
  	) \
  #define stat_trivial_usage \
-        "[OPTION] FILE..."
+        "[OPTIONS] FILE..."
  #define stat_full_usage "\n\n" \
         "Display file (default) or filesystem status\n" \
       "\nOptions:" \
- 	USE_FEATURE_STAT_FORMAT( \
+ 	IF_FEATURE_STAT_FORMAT( \
       "\n	-c fmt	Use the specified format" \
  	) \
       "\n	-f	Display filesystem status" \
-      "\n	-L	Dereference links" \
+      "\n	-L	Follow links" \
       "\n	-t	Display info in terse form" \
- 	USE_SELINUX( \
+ 	IF_SELINUX( \
       "\n	-Z	Print security context" \
  	) \
- 	USE_FEATURE_STAT_FORMAT( \
+ 	IF_FEATURE_STAT_FORMAT( \
         "\n\nValid format sequences for files:\n" \
         " %a	Access rights in octal\n" \
         " %A	Access rights in human readable form\n" \
-Line 3860
+Line 4202
         " %h	Number of hard links\n" \
         " %i	Inode number\n" \
         " %n	File name\n" \
-        " %N	Quoted file name with dereference if symlink\n" \
+        " %N	File name, with -> TARGET if symlink\n" \
         " %o	I/O block size\n" \
         " %s	Total size, in bytes\n" \
         " %t	Major device type in hex\n" \
-Line 3879
+Line 4221
         " %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( \
+ 	IF_SELINUX( \
         " %C	Security context in SELinux\n" \
  	) \
         " %i	File System ID in hex\n" \
-Line 3892
+Line 4234
  	) \
  #define strings_trivial_usage \
-        "[-afo] [-n length] [file...]"
+        "[-afo] [-n LEN] [FILE]..."
  #define strings_full_usage "\n\n" \
         "Display printable strings in a binary file\n" \
       "\nOptions:" \
       "\n	-a	Scan whole file (default)" \
       "\n	-f	Precede strings with filenames" \
-      "\n	-n N	At least N characters form a string (default 4)" \
+      "\n	-n LEN	At least LEN characters form a string (default 4)" \
       "\n	-o	Precede strings with decimal offsets" \
  #define stty_trivial_usage \
-Line 3913
+Line 4255
       "\n	[SETTING]	See manpage" \
  #define su_trivial_usage \
-        "[OPTION]... [-] [username]"
+        "[OPTIONS] [-] [USERNAME]"
  #define su_full_usage "\n\n" \
         "Change user id or become root\n" \
       "\nOptions:" \
-      "\n	-p, -m	Preserve environment" \
+      "\n	-p,-m	Preserve environment" \
-      "\n	-c	Command to pass to 'sh -c'" \
+      "\n	-c CMD	Command to pass to 'sh -c'" \
-      "\n	-s	Shell to use instead of default shell" \
+      "\n	-s SH	Shell to use instead of default shell" \
  #define sulogin_trivial_usage \
-        "[OPTION]... [tty-device]"
+        "[-t N] [TTY]"
  #define sulogin_full_usage "\n\n" \
         "Single user login\n" \
       "\nOptions:" \
-      "\n	-t	Timeout" \
+      "\n	-t N	Timeout" \
  #define sum_trivial_usage \
-        "[rs] [files...]"
+        "[-rs] [FILE]..."
  #define sum_full_usage "\n\n" \
         "Checksum and count the blocks in a file\n" \
       "\nOptions:" \
-Line 3937
+Line 4279
       "\n	-s	Use System V sum algorithm (512byte blocks)" \
  #define sv_trivial_usage \
-        "[-v] [-w sec] command service..."
+        "[-v] [-w SEC] CMD SERVICE_DIR..."
  #define sv_full_usage "\n\n" \
         "Control services monitored by runsv supervisor.\n" \
         "Commands (only first character is enough):\n" \
-Line 3946
+Line 4288
         "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" \
+        "	if it exists. After it stops, don't restart service\n" \
         "exit: send TERM and CONT signals to service and log service. If they exit,\n" \
         "	runsv exits too\n" \
         "pause, cont, hup, alarm, interrupt, quit, 1, 2, term, kill: send\n" \
-Line 3955
+Line 4297
  #define svlogd_trivial_usage \
         "[-ttv] [-r c] [-R abc] [-l len] [-b buflen] dir..."
  #define svlogd_full_usage "\n\n" \
-        "Continuously read log data from standard input, optionally " \
+        "Continuously read log data from stdin, optionally\n" \
-        "filter log messages, and write the data to one or more automatically " \
+        "filter log messages, and write the data to one or more automatically\n" \
         "rotated logs" \
  #define swapoff_trivial_usage \
-Line 3967
+Line 4309
       "\n	-a	Stop swapping on all swap devices" \
  #define swapon_trivial_usage \
-        "[-a]" USE_FEATURE_SWAPON_PRI(" [-p pri]") " [DEVICE]"
+        "[-a]" IF_FEATURE_SWAPON_PRI(" [-p PRI]") " [DEVICE]"
  #define swapon_full_usage "\n\n" \
         "Start swapping on DEVICE\n" \
       "\nOptions:" \
       "\n	-a	Start swapping on all swap devices" \
- 	USE_FEATURE_SWAPON_PRI( \
+ 	IF_FEATURE_SWAPON_PRI( \
-      "\n	-p pri	Set swap device priority" \
+      "\n	-p PRI	Set swap device priority" \
  	) \
  #define switch_root_trivial_usage \
-        "[-c /dev/console] NEW_ROOT NEW_INIT [ARGUMENTS_TO_INIT]"
+        "[-c /dev/console] NEW_ROOT NEW_INIT [ARGS]"
  #define switch_root_full_usage "\n\n" \
-        "Use from PID 1 under initramfs to free initramfs, chroot to NEW_ROOT,\n" \
+        "Free initramfs and switch to another root fs:\n" \
-        "and exec NEW_INIT\n" \
+        "chroot to NEW_ROOT, delete all in /, move NEW_ROOT to /,\n" \
+        "execute NEW_INIT. PID must be 1. NEW_ROOT must be a mountpoint.\n" \
       "\nOptions:" \
-      "\n	-c	Redirect console to device on new root" \
+      "\n	-c DEV	Reopen stdio to DEV after switch" \
  #define sync_trivial_usage \
         ""
  #define sync_full_usage "\n\n" \
-        "Write all buffered filesystem blocks to disk"
+        "Write all buffered blocks to disk"
+ #define fsync_trivial_usage \
+        "[OPTIONS] FILE..."
+ #define fsync_full_usage "\n\n" \
+        "Write files' buffered blocks to disk\n" \
+      "\nOptions:" \
+      "\n	-d	Avoid syncing metadata"
  #define sysctl_trivial_usage \
-        "[OPTIONS]... [VALUE]..."
+        "[OPTIONS] [VALUE]..."
  #define sysctl_full_usage "\n\n" \
         "Configure kernel parameters at runtime\n" \
       "\nOptions:" \
-      "\n	-n	Disable printing of key names" \
+      "\n	-n	Don't print key names" \
       "\n	-e	Don't warn about unknown keys" \
       "\n	-w	Change sysctl setting" \
       "\n	-p FILE	Load sysctl settings from FILE (default /etc/sysctl.conf)" \
-Line 4009
+Line 4359
         "sysctl [-n] [-e] -A\n"
  #define syslogd_trivial_usage \
-        "[OPTION]..."
+        "[OPTIONS]"
  #define syslogd_full_usage "\n\n" \
         "System logging utility.\n" \
-        "Note that this version of syslogd ignores /etc/syslog.conf.\n" \
+        "This version of syslogd ignores /etc/syslog.conf\n" \
       "\nOptions:" \
       "\n	-n		Run in foreground" \
-      "\n	-O FILE		Log to given file (default=/var/log/messages)" \
+      "\n	-O FILE		Log to given file (default:/var/log/messages)" \
-      "\n	-l n		Set local log level" \
+      "\n	-l N		Set local log level" \
       "\n	-S		Smaller logging output" \
- 	USE_FEATURE_ROTATE_LOGFILE( \
+ 	IF_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 N		N rotated logs to keep (default:1, max=99, 0=purge)") \
- 	USE_FEATURE_REMOTE_LOG( \
+ 	IF_FEATURE_REMOTE_LOG( \
       "\n	-R HOST[:PORT]	Log to IP or hostname on PORT (default PORT=514/UDP)" \
       "\n	-L		Log locally and via network (default is network only if -R)") \
- 	USE_FEATURE_SYSLOGD_DUP( \
+ 	IF_FEATURE_SYSLOGD_DUP( \
       "\n	-D		Drop duplicates") \
- 	USE_FEATURE_IPC_SYSLOG( \
+ 	IF_FEATURE_IPC_SYSLOG( \
       "\n	-C[size(KiB)]	Log to shared mem buffer (read it using logread)") \
  	/* NB: -Csize shouldn't have space (because size is optional) */
- /*   "\n	-m MIN		Minutes between MARK lines (default=20, 0=off)" */
+ /*   "\n	-m MIN		Minutes between MARK lines (default:20, 0=off)" */
  #define syslogd_example_usage \
         "$ syslogd -R masterlog:514\n" \
-Line 4038
+Line 4388
  #define tac_trivial_usage \
  	"[FILE]..."
  #define tac_full_usage "\n\n" \
- 	"Concatenate FILE(s) and print them in reverse"
+ 	"Concatenate FILEs and print them in reverse"
  #define tail_trivial_usage \
-        "[OPTION]... [FILE]..."
+        "[OPTIONS] [FILE]..."
  #define tail_full_usage "\n\n" \
-        "Print last 10 lines of each FILE to standard output.\n" \
+        "Print last 10 lines of each FILE (or stdin) to stdout.\n" \
-        "With more than one FILE, precede each with a header giving the\n" \
+        "With more than one FILE, precede each with a header giving the file name.\n" \
-        "file name. With no FILE, or when FILE is -, read standard input.\n" \
       "\nOptions:" \
- 	USE_FEATURE_FANCY_TAIL( \
+ 	IF_FEATURE_FANCY_TAIL( \
-      "\n	-c N[kbm]	Output the last N bytes") \
+      "\n	-c N[kbm]	Output last N bytes") \
       "\n	-n N[kbm]	Print last N lines instead of last 10" \
       "\n	-f		Output data as the file grows" \
- 	USE_FEATURE_FANCY_TAIL( \
+ 	IF_FEATURE_FANCY_TAIL( \
       "\n	-q		Never output headers giving file names" \
       "\n	-s SEC		Wait SEC seconds between reads with -f" \
       "\n	-v		Always output headers giving file names" \
-Line 4065
+Line 4414
         "nameserver 10.0.0.1\n"
  #define tar_trivial_usage \
-        "-[" USE_FEATURE_TAR_CREATE("c") USE_FEATURE_SEAMLESS_GZ("z") \
+        "-[" IF_FEATURE_TAR_CREATE("c") "xt" IF_FEATURE_SEAMLESS_GZ("z") \
- 	USE_FEATURE_SEAMLESS_BZ2("j") USE_FEATURE_SEAMLESS_LZMA("a") \
+ 	IF_FEATURE_SEAMLESS_BZ2("j") IF_FEATURE_SEAMLESS_LZMA("a") \
- 	USE_FEATURE_SEAMLESS_Z("Z") "xtvO] " \
+ 	IF_FEATURE_SEAMLESS_Z("Z") IF_FEATURE_TAR_NOPRESERVE_TIME("m") "vO] " \
- 	USE_FEATURE_TAR_FROM("[-X FILE] ") \
+ 	IF_FEATURE_TAR_FROM("[-X FILE] ") \
-        "[-f TARFILE] [-C DIR] [FILE(s)]..."
+        "[-f TARFILE] [-C DIR] [FILE]..."
  #define tar_full_usage "\n\n" \
-        "Create, extract, or list files from a tar file\n" \
+ 	IF_FEATURE_TAR_CREATE("Create, extract, ") \
+ 	IF_NOT_FEATURE_TAR_CREATE("Extract ") \
+        "or list files from a tar file\n" \
       "\nOptions:" \
- 	USE_FEATURE_TAR_CREATE( \
+ 	IF_FEATURE_TAR_CREATE( \
-      "\n	c	Create") \
+      "\n	c	Create" \
+ 	) \
       "\n	x	Extract" \
       "\n	t	List" \
       "\nArchive format selection:" \
- 	USE_FEATURE_SEAMLESS_GZ( \
+ 	IF_FEATURE_SEAMLESS_GZ( \
       "\n	z	Filter the archive through gzip" \
  	) \
- 	USE_FEATURE_SEAMLESS_BZ2( \
+ 	IF_FEATURE_SEAMLESS_BZ2( \
       "\n	j	Filter the archive through bzip2" \
  	) \
- 	USE_FEATURE_SEAMLESS_LZMA( \
+ 	IF_FEATURE_SEAMLESS_LZMA( \
       "\n	a	Filter the archive through lzma" \
  	) \
- 	USE_FEATURE_SEAMLESS_Z( \
+ 	IF_FEATURE_SEAMLESS_Z( \
       "\n	Z	Filter the archive through compress" \
  	) \
+ 	IF_FEATURE_TAR_NOPRESERVE_TIME( \
+      "\n	m	Do not restore mtime" \
+ 	) \
       "\nFile selection:" \
       "\n	f	Name of TARFILE or \"-\" for stdin" \
       "\n	O	Extract to stdout" \
- 	USE_FEATURE_TAR_FROM( \
+ 	IF_FEATURE_TAR_FROM( \
+ 	IF_FEATURE_TAR_LONG_OPTIONS( \
       "\n	exclude	File to exclude" \
+ 	) \
       "\n	X	File with names to exclude" \
  	) \
-      "\n	C	Change to directory DIR before operation" \
+      "\n	C	Change to DIR before operation" \
       "\n	v	Verbose" \
  #define tar_example_usage \
-Line 4105
+Line 4462
         "$ tar -cf /tmp/tarball.tar /usr/local\n"
  #define taskset_trivial_usage \
-        "[-p] [mask] [pid | command [arg]...]"
+        "[-p] [MASK] [PID | PROG ARGS]"
  #define taskset_full_usage "\n\n" \
         "Set or get CPU affinity\n" \
       "\nOptions:" \
-Line 4123
+Line 4480
         "pid 1's current affinity mask: 3\n"
  #define tee_trivial_usage \
-        "[OPTION]... [FILE]..."
+        "[OPTIONS] [FILE]..."
  #define tee_full_usage "\n\n" \
-        "Copy standard input to each FILE, and also to standard output\n" \
+        "Copy stdin to each FILE, and also to stdout\n" \
       "\nOptions:" \
-      "\n	-a	Append to the given FILEs, do not overwrite" \
+      "\n	-a	Append to the given FILEs, don't overwrite" \
       "\n	-i	Ignore interrupt signals (SIGINT)" \
  #define tee_example_usage \
-Line 4152
+Line 4509
  #endif
  #define telnetd_trivial_usage \
-        "[OPTION]"
+        "[OPTIONS]"
  #define telnetd_full_usage "\n\n" \
         "Handle incoming telnet connections" \
- 	SKIP_FEATURE_TELNETD_STANDALONE(" via inetd") "\n" \
+ 	IF_NOT_FEATURE_TELNETD_STANDALONE(" via inetd") "\n" \
       "\nOptions:" \
       "\n	-l LOGIN	Exec LOGIN on connect" \
-      "\n	-f issue_file	Display issue_file instead of /etc/issue" \
+      "\n	-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( \
+ 	IF_FEATURE_TELNETD_STANDALONE( \
       "\n	-p PORT		Port to listen on" \
-      "\n	-b ADDR		Address to bind to" \
+      "\n	-b ADDR[:PORT]	Address to bind to" \
       "\n	-F		Run in foreground" \
-      "\n	-i		Run as inetd subservice" \
+      "\n	-i		Inetd mode" \
+ 	IF_FEATURE_TELNETD_INETD_WAIT( \
+      "\n	-w SEC		Inetd 'wait' mode, linger time SEC" \
+      "\n	-S		Log to syslog (implied by -i or without -F and -w)" \
+ 	) \
  	)
  /* "test --help" does not print help (POSIX compat), only "[ --help" does.
-  * We display "<applet> EXPRESSION ]" here (not "<applet> EXPRESSION") */
+  * We display "<applet> EXPRESSION ]" here (not "<applet> EXPRESSION")
+  * Unfortunately, it screws up generated BusyBox.html. TODO. */
  #define test_trivial_usage \
         "EXPRESSION ]"
  #define test_full_usage "\n\n" \
-Line 4195
+Line 4557
  	"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" \
+ 	"qdisc [ handle QHANDLE ] [ root |"IF_FEATURE_TC_INGRESS(" ingress |")" parent CLASSID ]\n" \
- 	/* "\t[ estimator INTERVAL TIME_CONSTANT ]\n" */ \
+ 	/* "[ estimator INTERVAL TIME_CONSTANT ]\n" */ \
- 	"\t[ [ QDISC_KIND ] [ help | OPTIONS ] ]\n" \
+ 	"	[ [ QDISC_KIND ] [ help | OPTIONS ] ]\n" \
- 	"\tQDISC_KIND := { [p|b]fifo | tbf | prio | cbq | red | etc. }\n" \
+ 	"	QDISC_KIND := { [p|b]fifo | tbf | prio | cbq | red | etc. }\n" \
- 	"qdisc show [ dev STRING ]"USE_FEATURE_TC_INGRESS(" [ingress]")"\n" \
+ 	"qdisc show [ dev STRING ]"IF_FEATURE_TC_INGRESS(" [ingress]")"\n" \
  	"class [ classid CLASSID ] [ root | parent CLASSID ]\n" \
- 	"\t[ [ QDISC_KIND ] [ help | OPTIONS ] ]\n" \
+ 	"	[ [ QDISC_KIND ] [ help | OPTIONS ] ]\n" \
  	"class show [ dev STRING ] [ root | parent CLASSID ]\n" \
  	"filter [ pref PRIO ] [ protocol PROTO ]\n" \
  	/* "\t[ estimator INTERVAL TIME_CONSTANT ]\n" */ \
- 	"\t[ root | classid CLASSID ] [ handle FILTERID ]\n" \
+ 	"	[ root | classid CLASSID ] [ handle FILTERID ]\n" \
- 	"\t[ [ FILTER_TYPE ] [ help | OPTIONS ] ]\n" \
+ 	"	[ [ FILTER_TYPE ] [ help | OPTIONS ] ]\n" \
  	"filter show [ dev STRING ] [ root | parent CLASSID ]"
  #define tcpsvd_trivial_usage \
-        "[-hEv] [-c n] [-C n:msg] [-b n] [-u user] [-l name] ip port prog..."
+        "[-hEv] [-c N] [-C N[:MSG]] [-b N] [-u USER] [-l NAME] IP PORT PROG"
  /* with not-implemented options: */
- /*     "[-hpEvv] [-c n] [-C n:msg] [-b n] [-u user] [-l name] [-i dir|-x cdb] [-t sec] ip port prog..." */
+ /*     "[-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" \
+        "Create TCP socket, bind to IP:PORT and listen\n" \
         "for incoming connection. Run PROG for each connection.\n" \
-      "\nip		IP to listen on. '0' = all" \
+      "\n	IP		IP to listen on. '0' = all" \
-      "\nport		Port to listen on" \
+      "\n	PORT		Port to listen on" \
-      "\nprog [arg]	Program to run" \
+      "\n	PROG ARGS	Program to run" \
-      "\n-l name		Local hostname (else looks up local hostname in DNS)" \
+      "\n	-l NAME		Local hostname (else looks up local hostname in DNS)" \
-      "\n-u user[:group]	Change to user/group after bind" \
+      "\n	-u USER[:GRP]	Change to user/group after bind" \
-      "\n-c n		Handle up to n connections simultaneously" \
+      "\n	-c N		Handle up to N connections simultaneously" \
-      "\n-b n		Allow a backlog of approximately n TCP SYNs" \
+      "\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	-C N[:MSG]	Allow only up to N connections from the same IP" \
-      "\n		New connections from this IP address are closed" \
+      "\n			New connections from this IP address are closed" \
-      "\n		immediately. 'msg' is written to the peer before close" \
+      "\n			immediately. MSG is written to the peer before close" \
-      "\n-h		Look up peer's hostname" \
+      "\n	-h		Look up peer's hostname" \
-      "\n-E		Do not set up environment variables" \
+      "\n	-E		Don't set up environment variables" \
-      "\n-v		Verbose" \
+      "\n	-v		Verbose" \
  #define udpsvd_trivial_usage \
-        "[-hEv] [-c n] [-u user] [-l name] ip port prog"
+        "[-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" \
+        "Create UDP socket, bind to IP:PORT and wait\n" \
         "for incoming packets. Run PROG for each packet,\n" \
-        "redirecting all further packets with same peer ip:port to it\n" \
+        "redirecting all further packets with same peer ip:port to it.\n" \
-      "\nip		IP to listen on. '0' = all" \
+      "\n	IP		IP to listen on. '0' = all" \
-      "\nport		Port to listen on" \
+      "\n	PORT		Port to listen on" \
-      "\nprog [arg]	Program to run" \
+      "\n	PROG ARGS	Program to run" \
-      "\n-l name		Local hostname (else looks up local hostname in DNS)" \
+      "\n	-l NAME		Local hostname (else looks up local hostname in DNS)" \
-      "\n-u user[:group]	Change to user/group after bind" \
+      "\n	-u USER[:GRP]	Change to user/group after bind" \
-      "\n-c n		Handle up to n connections simultaneously" \
+      "\n	-c N		Handle up to N connections simultaneously" \
-      "\n-h		Look up peer's hostname" \
+      "\n	-h		Look up peer's hostname" \
-      "\n-E		Do not set up environment variables" \
+      "\n	-E		Don't set up environment variables" \
-      "\n-v		Verbose" \
+      "\n	-v		Verbose" \
  #define tftp_trivial_usage \
-        "[OPTION]... HOST [PORT]"
+        "[OPTIONS] HOST [PORT]"
  #define tftp_full_usage "\n\n" \
         "Transfer a file from/to tftp server\n" \
       "\nOptions:" \
       "\n	-l FILE	Local FILE" \
       "\n	-r FILE	Remote FILE" \
- 	USE_FEATURE_TFTP_GET( \
+ 	IF_FEATURE_TFTP_GET( \
       "\n	-g	Get file" \
  	) \
- 	USE_FEATURE_TFTP_PUT( \
+ 	IF_FEATURE_TFTP_PUT( \
       "\n	-p	Put file" \
  	) \
- 	USE_FEATURE_TFTP_BLOCKSIZE( \
+ 	IF_FEATURE_TFTP_BLOCKSIZE( \
       "\n	-b SIZE	Transfer blocks of SIZE octets" \
  	)
  #define tftpd_trivial_usage \
         "[-cr] [-u USER] [DIR]"
  #define tftpd_full_usage "\n\n" \
-        "Transfer a file on tftp client's request.\n" \
+        "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" \
-Line 4279
+Line 4641
       "\n	-u	Access files as USER" \
  #define time_trivial_usage \
-        "[OPTION]... COMMAND [ARGS...]"
+        "[OPTIONS] PROG ARGS"
  #define time_full_usage "\n\n" \
-        "Run the program COMMAND with arguments ARGS. When COMMAND finishes,\n" \
+        "Run PROG, display resource usage when it exits\n" \
-        "COMMAND's resource usage information is displayed.\n" \
       "\nOptions:" \
       "\n	-v	Verbose" \
+ #define timeout_trivial_usage \
+        "[-t SECS] [-s SIG] PROG ARGS"
+ #define timeout_full_usage "\n\n" \
+        "Runs PROG. Sends SIG to it if it is not gone in SECS seconds.\n" \
+        "Defaults: SECS: 10, SIG: TERM." \
  #define top_trivial_usage \
-        "[-b] [-nCOUNT] [-dSECONDS]"
+        "[-b] [-nCOUNT] [-dSECONDS]" IF_FEATURE_TOPMEM(" [-m]")
  #define top_full_usage "\n\n" \
         "Provide a view of process activity in real time.\n" \
         "Read the status of all processes from /proc each SECONDS\n" \
-        "and show the status for however many processes will fit on the screen." \
+        "and display a screenful of them." \
+ //TODO: add options and keyboard commands
  #define touch_trivial_usage \
-        "[-c] FILE [FILE...]"
+        "[-c] [-d DATE] FILE [FILE]..."
  #define touch_full_usage "\n\n" \
         "Update the last-modified date on the given FILE[s]\n" \
       "\nOptions:" \
-      "\n	-c	Do not create any files" \
+      "\n	-c	Don't create files" \
+      "\n	-d DT	Date/time to use" \
  #define touch_example_usage \
         "$ ls -l /tmp/foo\n" \
-Line 4310
+Line 4679
  #define tr_trivial_usage \
         "[-cds] STRING1 [STRING2]"
  #define tr_full_usage "\n\n" \
-        "Translate, squeeze, and/or delete characters from\n" \
+        "Translate, squeeze, or delete characters from stdin, writing to stdout\n" \
-        "standard input, writing to standard output\n" \
       "\nOptions:" \
       "\n	-c	Take complement of STRING1" \
       "\n	-d	Delete input characters coded STRING1" \
-Line 4322
+Line 4690
         "hello world\n"
  #define traceroute_trivial_usage \
-        "[-FIldnrv] [-f 1st_ttl] [-m max_ttl] [-p port#] [-q nqueries]\n" \
+        "[-"IF_TRACEROUTE6("46")"FIldnrv] [-f 1ST_TTL] [-m MAXTTL] [-p PORT] [-q PROBES]\n" \
-        "	[-s src_addr] [-t tos] [-w wait] [-g gateway] [-i iface]\n" \
+        "	[-s SRC_IP] [-t TOS] [-w WAIT_SEC] [-g GATEWAY] [-i IFACE]\n" \
-        "	[-z pausemsecs] HOST [data size]"
+        "	[-z PAUSE_MSEC] HOST [BYTES]"
  #define traceroute_full_usage "\n\n" \
         "Trace the route to HOST\n" \
       "\nOptions:" \
+ 	IF_TRACEROUTE6( \
+      "\n	-4, -6	Force IP or IPv6 name resolution" \
+ 	) \
       "\n	-F	Set the don't fragment bit" \
       "\n	-I	Use ICMP ECHO instead of UDP datagrams" \
-      "\n	-l	Display the ttl value of the returned packet" \
+      "\n	-l	Display the TTL value of the returned packet" \
       "\n	-d	Set SO_DEBUG options to socket" \
-      "\n	-n	Print hop addresses numerically rather than symbolically" \
+      "\n	-n	Print numeric addresses" \
-      "\n	-r	Bypass the normal routing tables and send directly to a host" \
+      "\n	-r	Bypass routing tables, send directly to HOST" \
       "\n	-v	Verbose" \
-      "\n	-m max_ttl	Max time-to-live (max number of hops)" \
+      "\n	-m	Max time-to-live (max number of hops)" \
-      "\n	-p port#	Base UDP port number used in probes" \
+      "\n	-p	Base UDP port number used in probes" \
-      "\n			(default is 33434)" \
+      "\n		(default 33434)" \
-      "\n	-q nqueries	Number of probes per 'ttl' (default 3)" \
+      "\n	-q	Number of probes per TTL (default 3)" \
-      "\n	-s src_addr	IP address to use as the source address" \
+      "\n	-s	IP address to use as the source address" \
-      "\n	-t tos		Type-of-service in probe packets (default 0)" \
+      "\n	-t	Type-of-service in probe packets (default 0)" \
-      "\n	-w wait		Time in seconds to wait for a response" \
+      "\n	-w	Time in seconds to wait for a response (default 3)" \
-      "\n			(default 3 sec)" \
+      "\n	-g	Loose source route gateway (8 max)" \
-      "\n	-g		Loose source route gateway (8 max)" \
+ #define traceroute6_trivial_usage \
+        "[-dnrv] [-m MAXTTL] [-p PORT] [-q PROBES]\n" \
+        "	[-s SRC_IP] [-t TOS] [-w WAIT_SEC] [-i IFACE]\n" \
+        "	HOST [BYTES]"
+ #define traceroute6_full_usage "\n\n" \
+        "Trace the route to HOST\n" \
+      "\nOptions:" \
+      "\n	-d	Set SO_DEBUG options to socket" \
+      "\n	-n	Print numeric addresses" \
+      "\n	-r	Bypass routing tables, send directly to HOST" \
+      "\n	-v	Verbose" \
+      "\n	-m	Max time-to-live (max number of hops)" \
+      "\n	-p	Base UDP port number used in probes" \
+      "\n		(default is 33434)" \
+      "\n	-q	Number of probes per TTL (default 3)" \
+      "\n	-s	IP address to use as the source address" \
+      "\n	-t	Type-of-service in probe packets (default 0)" \
+      "\n	-w	Time in seconds to wait for a response (default 3)" \
  #define true_trivial_usage \
         ""
-Line 4357
+Line 4746
  #define tty_trivial_usage \
         ""
  #define tty_full_usage "\n\n" \
-        "Print file name of standard input's terminal" \
+        "Print file name of stdin's terminal" \
- 	USE_INCLUDE_SUSv2( "\n" \
+ 	IF_INCLUDE_SUSv2( "\n" \
       "\nOptions:" \
       "\n	-s	Print nothing, only return exit status" \
  	)
-Line 4369
+Line 4758
  #define ttysize_trivial_usage \
         "[w] [h]"
  #define ttysize_full_usage "\n\n" \
-        "Print dimension(s) of standard input's terminal, on error return 80x25"
+        "Print dimension(s) of stdin's terminal, on error return 80x25"
+ #define tunctl_trivial_usage \
+        "[-f device] ([-t name] | -d name)" IF_FEATURE_TUNCTL_UG(" [-u owner] [-g group] [-b]")
+ #define tunctl_full_usage "\n\n" \
+        "Create or delete tun interfaces\n" \
+      "\nOptions:" \
+      "\n	-f name		tun device (/dev/net/tun)" \
+      "\n	-t name		Create iface 'name'" \
+      "\n	-d name		Delete iface 'name'" \
+ 	IF_FEATURE_TUNCTL_UG( \
+      "\n	-u owner	Set iface owner" \
+      "\n	-g group	Set iface group" \
+      "\n	-b		Brief output" \
+ 	)
+ #define tunctl_example_usage \
+        "# tunctl\n" \
+        "# tunctl -d tun0\n"
  #define tune2fs_trivial_usage \
-        "[-c max-mounts-count] [-e errors-behavior] [-g group] " \
+ /*     "[-c max-mounts-count] [-e errors-behavior] [-g group] " */ \
-        "[-i interval[d|m|w]] [-j] [-J journal-options] [-l] [-s sparse-flag] " \
+ /*     "[-i interval[d|m|w]] [-j] [-J journal-options] [-l] [-s sparse-flag] " */ \
-        "[-m reserved-blocks-percent] [-o [^]mount-options[,...]] " \
+ /*     "[-m reserved-blocks-percent] [-o [^]mount-options[,...]] " */ \
-        "[-r reserved-blocks-count] [-u user] [-C mount-count] " \
+ /*     "[-r reserved-blocks-count] [-u user] [-C mount-count] " */ \
-        "[-L volume-label] [-M last-mounted-dir] [-O [^]feature[,...]] " \
+        "[-L LABEL] " \
-        "[-T last-check-time] [-U UUID] device"
+ /*     "[-M last-mounted-dir] [-O [^]feature[,...]] " */ \
+ /*     "[-T last-check-time] [-U UUID] " */ \
+        "BLOCKDEV"
  #define tune2fs_full_usage "\n\n" \
         "Adjust filesystem options on ext[23] filesystems"
  #define udhcpc_trivial_usage \
         "[-Cfbnqtvo] [-c CID] [-V VCLS] [-H HOSTNAME] [-i INTERFACE]\n" \
-        "	[-p pidfile] [-r IP] [-s script] [-O dhcp-option]..." USE_FEATURE_UDHCP_PORT(" [-P N]")
+        "	[-p pidfile] [-r IP] [-s script] [-O dhcp-option]..." IF_FEATURE_UDHCP_PORT(" [-P N]")
  #define udhcpc_full_usage "\n\n" \
- 	USE_GETOPT_LONG( \
+ 	IF_LONG_OPTS( \
         "	-V,--vendorclass=CLASSID	Vendor class identifier" \
       "\n	-i,--interface=INTERFACE	Interface to use (default eth0)" \
       "\n	-H,-h,--hostname=HOSTNAME	Client hostname" \
       "\n	-c,--clientid=CLIENTID	Client identifier" \
       "\n	-C,--clientid-none	Suppress default client identifier" \
-      "\n	-p,--pidfile=file	Create pidfile" \
+      "\n	-p,--pidfile=FILE	Create pidfile" \
       "\n	-r,--request=IP		IP address to request" \
-      "\n	-s,--script=file	Run file at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")" \
+      "\n	-s,--script=FILE	Run FILE at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")" \
-      "\n	-t,--retries=N		Send up to N request packets" \
+      "\n	-t,--retries=N		Send up to N discover packets" \
-      "\n	-T,--timeout=N		Try to get a lease for N seconds (default 3)" \
+      "\n	-T,--timeout=N		Pause between packets (default 3 seconds)" \
       "\n	-A,--tryagain=N		Wait N seconds (default 20) after failure" \
       "\n	-O,--request-option=OPT	Request DHCP option OPT (cumulative)" \
-      "\n	-o,--no-default-options	Do not request any options (unless -O is also given)" \
+      "\n	-o,--no-default-options	Don't 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" \
-Line 4407
+Line 4815
       "\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( \
+ 	IF_FEATURE_UDHCP_PORT( \
       "\n	-P,--client-port N  Use port N instead of default 68" \
  	) \
- 	USE_FEATURE_UDHCPC_ARPING( \
+ 	IF_FEATURE_UDHCPC_ARPING( \
       "\n	-a,--arping	Use arping to validate offered address" \
  	) \
  	) \
- 	SKIP_GETOPT_LONG( \
+ 	IF_NOT_LONG_OPTS( \
         "	-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	-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	-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	-o		Don't 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" \
-Line 4436
+Line 4844
       "\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( \
+ 	IF_FEATURE_UDHCP_PORT( \
       "\n	-P N		Use port N instead of default 68" \
  	) \
- 	USE_FEATURE_UDHCPC_ARPING( \
+ 	IF_FEATURE_UDHCPC_ARPING( \
       "\n	-a		Use arping to validate offered address" \
  	) \
  	)
  #define udhcpd_trivial_usage \
-        "[-fS]" USE_FEATURE_UDHCP_PORT(" [-P N]") " [configfile]" \
+        "[-fS]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [configfile]" \
  #define udhcpd_full_usage "\n\n" \
         "DHCP server\n" \
       "\n	-f	Run in foreground" \
       "\n	-S	Log to syslog too" \
- 	USE_FEATURE_UDHCP_PORT( \
+ 	IF_FEATURE_UDHCP_PORT( \
       "\n	-P N	Use port N instead of default 67" \
  	)
  #define umount_trivial_usage \
-        "[flags] FILESYSTEM|DIRECTORY"
+        "[OPTIONS] FILESYSTEM|DIRECTORY"
  #define umount_full_usage "\n\n" \
         "Unmount file systems\n" \
       "\nOptions:" \
- 	USE_FEATURE_UMOUNT_ALL( \
+ 	IF_FEATURE_UMOUNT_ALL( \
-      "\n	-a	Unmount all file systems" USE_FEATURE_MTAB_SUPPORT(" in /etc/mtab") \
+      "\n	-a	Unmount all file systems" IF_FEATURE_MTAB_SUPPORT(" in /etc/mtab") \
  	) \
- 	USE_FEATURE_MTAB_SUPPORT( \
+ 	IF_FEATURE_MTAB_SUPPORT( \
       "\n	-n	Don't erase /etc/mtab entries" \
  	) \
       "\n	-r	Try to remount devices as read-only if mount is busy" \
       "\n	-l	Lazy umount (detach filesystem)" \
       "\n	-f	Force umount (i.e., unreachable NFS server)" \
- 	USE_FEATURE_MOUNT_LOOP( \
+ 	IF_FEATURE_MOUNT_LOOP( \
       "\n	-d	Free loop device if it has been used" \
  	)
-Line 4479
+Line 4887
  #define uname_trivial_usage \
         "[-amnrspv]"
  #define uname_full_usage "\n\n" \
-        "Print system information.\n" \
+        "Print system information\n" \
       "\nOptions:" \
       "\n	-a	Print all" \
       "\n	-m	The machine (hardware) type" \
-Line 4494
+Line 4902
         "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] [FILE]..."
  #define uncompress_full_usage "\n\n" \
         "Uncompress .Z file[s]\n" \
       "\nOptions:" \
-Line 4502
+Line 4910
       "\n	-f	Overwrite an existing file" \
  #define unexpand_trivial_usage \
-        "[-f][-a][-t NUM] [FILE|-]"
+        "[-f][-a][-t N] [FILE|-]"
  #define unexpand_full_usage "\n\n" \
-        "Convert spaces to tabs, writing to standard output.\n" \
+        "Convert spaces to tabs, writing to stdout\n" \
       "\nOptions:" \
- 	USE_FEATURE_UNEXPAND_LONG_OPTIONS( \
+ 	IF_FEATURE_UNEXPAND_LONG_OPTIONS( \
       "\n	-a,--all	Convert all blanks" \
       "\n	-f,--first-only	Convert only leading blanks" \
       "\n	-t,--tabs=N	Tabstops every N chars" \
  	) \
- 	SKIP_FEATURE_UNEXPAND_LONG_OPTIONS( \
+ 	IF_NOT_FEATURE_UNEXPAND_LONG_OPTIONS( \
       "\n	-a	Convert all blanks" \
       "\n	-f	Convert only leading blanks" \
       "\n	-t N	Tabstops every N chars" \
-Line 4535
+Line 4943
         "b\n" \
         "c\n"
- #define unix2dos_trivial_usage \
-        "[option] [FILE]"
- #define unix2dos_full_usage "\n\n" \
-        "Convert FILE from unix to dos format.\n" \
-        "When no file is given, use stdin/stdout.\n" \
-      "\nOptions:" \
-      "\n	-u	dos2unix" \
-      "\n	-d	unix2dos" \
  #define unzip_trivial_usage \
         "[-opts[modifiers]] file[.zip] [list] [-x xlist] [-d exdir]"
  #define unzip_full_usage "\n\n" \
-Line 4576
+Line 4975
         "[pauses for 1 second]\n"
  #define uudecode_trivial_usage \
-        "[-o outfile] [infile]"
+        "[-o OUTFILE] [INFILE]"
  #define uudecode_full_usage "\n\n" \
         "Uudecode a file\n" \
         "Finds outfile name in uuencoded source unless -o is given"
-Line 4587
+Line 4986
         "-rwxr-xr-x   1 ams      ams        245264 Jun  7 21:35 busybox\n"
  #define uuencode_trivial_usage \
-        "[-m] [infile] stored_filename"
+        "[-m] [INFILE] STORED_FILENAME"
  #define uuencode_full_usage "\n\n" \
         "Uuencode a file to stdout\n" \
       "\nOptions:" \
-Line 4601
+Line 5000
         "$\n"
  #define vconfig_trivial_usage \
-        "COMMAND [OPTIONS]..."
+        "COMMAND [OPTIONS]"
  #define vconfig_full_usage "\n\n" \
         "Create and remove virtual ethernet devices\n" \
       "\nOptions:" \
-Line 4613
+Line 5012
       "\n	set_name_type	[name-type]" \
  #define vi_trivial_usage \
-        "[OPTION] [FILE]..."
+        "[OPTIONS] [FILE]..."
  #define vi_full_usage "\n\n" \
         "Edit FILE\n" \
       "\nOptions:" \
- 	USE_FEATURE_VI_COLON( \
+ 	IF_FEATURE_VI_COLON( \
       "\n	-c	Initial command to run ($EXINIT also available)") \
- 	USE_FEATURE_VI_READONLY( \
+ 	IF_FEATURE_VI_READONLY( \
-      "\n	-R	Read-only - do not write to the file") \
+      "\n	-R	Read-only") \
       "\n	-H	Short help regarding available features" \
  #define vlock_trivial_usage \
-Line 4630
+Line 5029
       "\nOptions:" \
       "\n	-a	Lock all VTs" \
+ #define volname_trivial_usage \
+        "[DEVICE]"
+ #define volname_full_usage "\n\n" \
+        "Show CD volume name of the DEVICE (default /dev/cdrom)"
+ #define wall_trivial_usage \
+ 	"[FILE]"
+ #define wall_full_usage "\n\n" \
+ 	"Write content of FILE or stdin to all logged-in users"
+ #define wall_sample_usage \
+ 	"echo foo | wall\n" \
+ 	"wall ./mymessage"
  #define watch_trivial_usage \
-        "[-n seconds] [-t] COMMAND..."
+        "[-n SEC] [-t] PROG ARGS"
  #define watch_full_usage "\n\n" \
-        "Execute a program periodically\n" \
+        "Run PROG periodically\n" \
       "\nOptions:" \
       "\n	-n	Loop period in seconds (default 2)" \
       "\n	-t	Don't print header" \
-Line 4656
+Line 5068
       "\nUse 500ms to specify period in milliseconds" \
  #define wc_trivial_usage \
-        "[OPTION]... [FILE]..."
+        "[OPTIONS] [FILE]..."
  #define wc_full_usage "\n\n" \
-        "Print line, word, and byte counts for each FILE, and a total line if\n" \
+        "Print line, word, and byte counts for each FILE (or stdin),\n" \
-        "more than one FILE is specified. With no FILE, read standard input.\n" \
+        "and a total line if more than one FILE is specified\n" \
       "\nOptions:" \
       "\n	-c	Print the byte counts" \
       "\n	-l	Print the newline counts" \
-Line 4671
+Line 5083
         "     31      46    1365 /etc/passwd\n"
  #define wget_trivial_usage \
- 	USE_FEATURE_WGET_LONG_OPTIONS( \
+ 	IF_FEATURE_WGET_LONG_OPTIONS( \
         "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document file]\n" \
         "	[--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \
-        "	[-U|--user-agent agent] url" \
+        "	[--no-check-certificate] [-U|--user-agent agent] url" \
  	) \
- 	SKIP_FEATURE_WGET_LONG_OPTIONS( \
+ 	IF_NOT_FEATURE_WGET_LONG_OPTIONS( \
         "[-csq] [-O file] [-Y on/off] [-P DIR] [-U agent] url" \
  	)
  #define wget_full_usage "\n\n" \
-Line 4691
+Line 5103
       "\n	-Y	Use proxy ('on' or 'off')" \
  #define which_trivial_usage \
-        "[COMMAND...]"
+        "[COMMAND]..."
  #define which_full_usage "\n\n" \
         "Locate a COMMAND"
  #define which_example_usage \
-Line 4711
+Line 5123
         "Print the user name associated with the current effective user id"
  #define xargs_trivial_usage \
-        "[OPTIONS] [COMMAND] [ARGS...]"
+        "[OPTIONS] [PROG ARGS]"
  #define xargs_full_usage "\n\n" \
-        "Execute COMMAND on every item given by standard input\n" \
+        "Run PROG on every item given by stdin\n" \
       "\nOptions:" \
- 	USE_FEATURE_XARGS_SUPPORT_CONFIRMATION( \
+ 	IF_FEATURE_XARGS_SUPPORT_CONFIRMATION( \
       "\n	-p	Ask user whether to run each command") \
-      "\n	-r	Do not run command if input is empty" \
+      "\n	-r	Don't run command if input is empty" \
- 	USE_FEATURE_XARGS_SUPPORT_ZERO_TERM( \
+ 	IF_FEATURE_XARGS_SUPPORT_ZERO_TERM( \
       "\n	-0	Input is separated by NUL characters") \
       "\n	-t	Print the command on stderr before execution" \
       "\n	-e[STR]	STR stops input processing" \
-      "\n	-n N	Pass no more than N args to COMMAND" \
+      "\n	-n N	Pass no more than N args to PROG" \
       "\n	-s N	Pass command line of no more than N bytes" \
- 	USE_FEATURE_XARGS_SUPPORT_TERMOPT( \
+ 	IF_FEATURE_XARGS_SUPPORT_TERMOPT( \
       "\n	-x	Exit if size is exceeded") \
  #define xargs_example_usage \
-Line 4732
+Line 5144
         "$ find . -name '*.c' -print | xargs rm\n"
  #define yes_trivial_usage \
-        "[OPTION]... [STRING]..."
+        "[OPTIONS] [STRING]"
  #define yes_full_usage "\n\n" \
-        "Repeatedly output a line with all specified STRING(s), or 'y'"
+        "Repeatedly output a line with STRING, or 'y'"
  #define zcat_trivial_usage \
         "FILE"
-Line 4742
+Line 5154
         "Uncompress to stdout"
  #define zcip_trivial_usage \
-        "[OPTIONS] ifname script"
+        "[OPTIONS] IFACE SCRIPT"
  #define zcip_full_usage "\n\n" \
         "Manage a ZeroConf IPv4 link-local address\n" \
       "\nOptions:" \
-Line 4754
+Line 5166
       "\nWith no -q, runs continuously monitoring for ARP conflicts," \
       "\nexits only on I/O errors (link down etc)" \
- #endif /* __BB_USAGE_H__ */
+ #endif

 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
-Removed from v.983
+Added in v.984