*: remove "Options:" string from help texts

function                                             old     new   delta
packed_usage                                       28706   28623     -83

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

archival/ar.c

@@ -21,7 +21,6 @@
 //usage:       "[-o] [-v] [-p] [-t] [-x] ARCHIVE FILES"
 //usage:#define ar_full_usage "\n\n"
 //usage:       "Extract or list FILES from an ar archive\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-o	Preserve original dates"
 //usage:     "\n	-p	Extract to stdout"
 //usage:     "\n	-t	List"

archival/bbunzip.c

@@ -172,7 +172,6 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
 //usage:       "[-cf] [FILE]..."
 //usage:#define uncompress_full_usage "\n\n"
 //usage:       "Decompress .Z file[s]\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-c	Write to stdout"
 //usage:     "\n	-f	Overwrite"
 
@@ -232,7 +231,6 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "[-cft] [FILE]..."
 //usage:#define gunzip_full_usage "\n\n"
 //usage:       "Decompress FILEs (or stdin)\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-c	Write to stdout"
 //usage:     "\n	-f	Force"
 //usage:     "\n	-t	Test file integrity"
@@ -339,7 +337,6 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "[-cf] [FILE]..."
 //usage:#define bunzip2_full_usage "\n\n"
 //usage:       "Decompress FILEs (or stdin)\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-c	Write to stdout"
 //usage:     "\n	-f	Force"
 //usage:#define bzcat_trivial_usage
@@ -380,7 +377,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "[-cf] [FILE]..."
 //usage:#define unlzma_full_usage "\n\n"
 //usage:       "Decompress FILE (or stdin)\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-c	Write to stdout"
 //usage:     "\n	-f	Force"
 //usage:
@@ -388,7 +384,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "-d [-cf] [FILE]..."
 //usage:#define lzma_full_usage "\n\n"
 //usage:       "Decompress FILE (or stdin)\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-d	Decompress"
 //usage:     "\n	-c	Write to stdout"
 //usage:     "\n	-f	Force"
@@ -402,7 +397,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "[-cf] [FILE]..."
 //usage:#define unxz_full_usage "\n\n"
 //usage:       "Decompress FILE (or stdin)\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-c	Write to stdout"
 //usage:     "\n	-f	Force"
 //usage:
@@ -410,7 +404,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "-d [-cf] [FILE]..."
 //usage:#define xz_full_usage "\n\n"
 //usage:       "Decompress FILE (or stdin)\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-d	Decompress"
 //usage:     "\n	-c	Write to stdout"
 //usage:     "\n	-f	Force"

archival/bzip2.c

@@ -11,7 +11,6 @@
 //usage:       "[OPTIONS] [FILE]..."
 //usage:#define bzip2_full_usage "\n\n"
 //usage:       "Compress FILEs (or stdin) with bzip2 algorithm\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-1..9	Compression level"
 //usage:     "\n	-d	Decompress"
 //usage:     "\n	-c	Write to stdout"

archival/cpio.c

@@ -34,7 +34,6 @@
 //usage:	IF_FEATURE_CPIO_P(
 //usage:     "\n	-p DIR	Copy files to DIR"
 //usage:	)
-//usage:     "\nOptions:"
 //usage:     "\n	-d	Make leading directories"
 //usage:     "\n	-m	Preserve mtime"
 //usage:     "\n	-v	Verbose"

archival/dpkg.c

@@ -32,7 +32,6 @@
 //usage:       "[-ilCPru] [-F OPT] PACKAGE"
 //usage:#define dpkg_full_usage "\n\n"
 //usage:       "Install, remove and manage Debian packages\n"
-//usage:     "\nOptions:"
 //usage:	IF_LONG_OPTS(
 //usage:     "\n	-i,--install	Install the package"
 //usage:     "\n	-l,--list	List of installed packages"

archival/dpkg_deb.c

@@ -9,7 +9,6 @@
 //usage:       "[-cefxX] FILE [argument"
 //usage:#define dpkg_deb_full_usage "\n\n"
 //usage:       "Perform actions on Debian packages (.debs)\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-c	List contents of filesystem tree"
 //usage:     "\n	-e	Extract control files to [argument] directory"
 //usage:     "\n	-f	Display control field name starting with [argument]"

archival/gzip.c

@@ -43,7 +43,6 @@ aa:      85.1% -- replaced with aa.gz
 //usage:       "[-cfd] [FILE]..."
 //usage:#define gzip_full_usage "\n\n"
 //usage:       "Compress FILEs (or stdin)\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-d	Decompress"
 //usage:     "\n	-c	Write to stdout"
 //usage:     "\n	-f	Force"

archival/lzop.c

@@ -28,8 +28,7 @@
 //usage:#define lzop_trivial_usage
 //usage:       "[-cfvd123456789CF] [FILE]..."
 //usage:#define lzop_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n	-1..9	Compression level"
+//usage:       "	-1..9	Compression level"
 //usage:     "\n	-d	Decompress"
 //usage:     "\n	-c	Write to stdout"
 //usage:     "\n	-f	Force"
@@ -46,8 +45,7 @@
 //usage:#define unlzop_trivial_usage
 //usage:       "[-cfvCF] [FILE]..."
 //usage:#define unlzop_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n	-c	Write to stdout"
+//usage:       "	-c	Write to stdout"
 //usage:     "\n	-f	Force"
 //usage:     "\n	-v	Verbose"
 //usage:     "\n	-F	Don't store or verify checksum"

archival/rpm.c

@@ -14,7 +14,6 @@
 //usage:     "\nCommands:"
 //usage:     "\n	-i	Install package"
 //usage:     "\n	-qp	Query package"
-//usage:     "\nOptions:"
 //usage:     "\n	-i	Show information"
 //usage:     "\n	-l	List contents"
 //usage:     "\n	-d	List documents"

archival/tar.c

@@ -759,7 +759,6 @@ static void handle_SIGCHLD(int status)
 //usage:	)
 //usage:     "\n	x	Extract"
 //usage:     "\n	t	List"
-//usage:     "\nOptions:"
 //usage:     "\n	f	Name of TARFILE ('-' for stdin/out)"
 //usage:     "\n	C	Change to DIR before operation"
 //usage:     "\n	v	Verbose"

archival/unzip.c

@@ -23,7 +23,6 @@
 //usage:       "[-opts[modifiers]] FILE[.zip] [LIST] [-x XLIST] [-d DIR]"
 //usage:#define unzip_full_usage "\n\n"
 //usage:       "Extract files from ZIP archives\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-l	List archive contents (with -q for short form)"
 //usage:     "\n	-n	Never overwrite files (default)"
 //usage:     "\n	-o	Overwrite"

console-tools/kbd_mode.c

@@ -13,7 +13,6 @@
 //usage:       "[-a|k|s|u] [-C TTY]"
 //usage:#define kbd_mode_full_usage "\n\n"
 //usage:       "Report or set the keyboard mode\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-a	Default (ASCII)"
 //usage:     "\n	-k	Medium-raw (keyboard)"
 //usage:     "\n	-s	Raw (scancode)"

console-tools/loadfont.c

@@ -23,7 +23,6 @@
 //usage:       "FONT [-m MAPFILE] [-C TTY]"
 //usage:#define setfont_full_usage "\n\n"
 //usage:       "Load a console font\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-m MAPFILE	Load console screen map"
 //usage:     "\n	-C TTY		Affect TTY instead of /dev/tty"
 //usage:

console-tools/openvt.c

@@ -12,7 +12,6 @@
 //usage:       "[-c N] [-sw] [PROG ARGS]"
 //usage:#define openvt_full_usage "\n\n"
 //usage:       "Start PROG on a new virtual terminal\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-c N	Use specified VT"
 //usage:     "\n	-s	Switch to the VT"
 /* //usage:     "\n	-l	Run PROG as login shell (by prepending '-')" */

console-tools/setconsole.c

@@ -12,7 +12,6 @@
 //usage:       "[-r" IF_FEATURE_SETCONSOLE_LONG_OPTIONS("|--reset") "] [DEVICE]"
 //usage:#define setconsole_full_usage "\n\n"
 //usage:       "Redirect system console output to DEVICE (default: /dev/tty)\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-r	Reset output to /dev/console"
 
 #include "libbb.h"

console-tools/showkey.c

@@ -11,7 +11,6 @@
 //usage:       "[-a | -k | -s]"
 //usage:#define showkey_full_usage "\n\n"
 //usage:       "Show keys pressed\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-a	Display decimal/octal/hex values of the keys"
 //usage:     "\n	-k	Display interpreted keycodes (default)"
 //usage:     "\n	-s	Display raw scan-codes"

coreutils/cal.c

@@ -21,7 +21,6 @@
 //usage:       "[-jy] [[MONTH] YEAR]"
 //usage:#define cal_full_usage "\n\n"
 //usage:       "Display a calendar\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-j	Use julian dates"
 //usage:     "\n	-y	Display the entire year"
 

coreutils/catv.c

@@ -14,7 +14,6 @@
 //usage:       "[-etv] [FILE]..."
 //usage:#define catv_full_usage "\n\n"
 //usage:       "Display nonprinting characters as ^x or M-x\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-e	End each line with $"
 //usage:     "\n	-t	Show tabs as ^I"
 //usage:     "\n	-v	Don't use ^x or M-x escapes"

coreutils/chgrp.c

@@ -15,7 +15,6 @@
 //usage:       "[-RhLHP"IF_DESKTOP("cvf")"]... GROUP FILE..."
 //usage:#define chgrp_full_usage "\n\n"
 //usage:       "Change the group membership of each FILE to GROUP\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-R	Recurse"
 //usage:     "\n	-h	Affect symlinks instead of symlink targets"
 //usage:     "\n	-L	Traverse all symlinks to directories"

coreutils/chmod.c

@@ -19,7 +19,6 @@
 //usage:#define chmod_full_usage "\n\n"
 //usage:       "Each MODE is one or more of the letters ugoa, one of the\n"
 //usage:       "symbols +-= and one or more of the letters rwxst\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-R	Recurse"
 //usage:	IF_DESKTOP(
 //usage:     "\n	-c	List changed files"

coreutils/chown.c

@@ -14,7 +14,6 @@
 //usage:       "[-RhLHP"IF_DESKTOP("cvf")"]... OWNER[<.|:>[GROUP]] FILE..."
 //usage:#define chown_full_usage "\n\n"
 //usage:       "Change the owner and/or group of each FILE to OWNER and/or GROUP\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-R	Recurse"
 //usage:     "\n	-h	Affect symlinks instead of symlink targets"
 //usage:     "\n	-L	Traverse all symlinks to directories"

coreutils/comm.c

@@ -11,7 +11,6 @@
 //usage:       "[-123] FILE1 FILE2"
 //usage:#define comm_full_usage "\n\n"
 //usage:       "Compare FILE1 with FILE2\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-1	Suppress lines unique to FILE1"
 //usage:     "\n	-2	Suppress lines unique to FILE2"
 //usage:     "\n	-3	Suppress lines common to both files"

coreutils/cp.c

@@ -19,7 +19,6 @@
 //usage:       "[OPTIONS] SOURCE DEST"
 //usage:#define cp_full_usage "\n\n"
 //usage:       "Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-a	Same as -dpR"
 //usage:	IF_SELINUX(
 //usage:     "\n	-c	Preserve security context"

coreutils/cut.c

@@ -13,7 +13,6 @@
 //usage:       "[OPTIONS] [FILE]..."
 //usage:#define cut_full_usage "\n\n"
 //usage:       "Print selected fields from each input FILE to stdout\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-b LIST	Output only bytes from LIST"
 //usage:     "\n	-c LIST	Output only characters from LIST"
 //usage:     "\n	-d CHAR	Use CHAR instead of tab as the field delimiter"

coreutils/date.c

@@ -98,7 +98,6 @@
 //usage:       "[OPTIONS] [+FMT] [TIME]"
 //usage:#define date_full_usage "\n\n"
 //usage:       "Display time (using +FMT), or set time\n"
-//usage:     "\nOptions:"
 //usage:	IF_NOT_LONG_OPTS(
 //usage:     "\n	[-s] TIME	Set time to TIME"
 //usage:     "\n	-u		Work in UTC (don't convert to local time)"

coreutils/dd.c

@@ -13,7 +13,6 @@
 //usage:       "	[seek=N]" IF_FEATURE_DD_IBS_OBS(" [conv=notrunc|noerror|sync|fsync]")
 //usage:#define dd_full_usage "\n\n"
 //usage:       "Copy a file with converting and formatting\n"
-//usage:     "\nOptions:"
 //usage:     "\n	if=FILE		Read from FILE instead of stdin"
 //usage:     "\n	of=FILE		Write to FILE instead of stdout"
 //usage:     "\n	bs=N		Read and write N bytes at a time"

coreutils/df.c

@@ -29,7 +29,6 @@
 //usage:	"] [FILESYSTEM]..."
 //usage:#define df_full_usage "\n\n"
 //usage:       "Print filesystem usage statistics\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-P	POSIX output format"
 //usage:     "\n	-k	1024-byte blocks (default)"
 //usage:	IF_FEATURE_HUMAN_READABLE(

coreutils/dos2unix.c

@@ -17,7 +17,6 @@
 //usage:#define dos2unix_full_usage "\n\n"
 //usage:       "Convert FILE in-place from DOS to Unix format.\n"
 //usage:       "When no file is given, use stdin/stdout.\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-u	dos2unix"
 //usage:     "\n	-d	unix2dos"
 //usage:
@@ -26,7 +25,6 @@
 //usage:#define unix2dos_full_usage "\n\n"
 //usage:       "Convert FILE in-place from Unix to DOS format.\n"
 //usage:       "When no file is given, use stdin/stdout.\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-u	dos2unix"
 //usage:     "\n	-d	unix2dos"
 

coreutils/du.c

@@ -31,7 +31,6 @@
 //usage:	IF_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("1024")
 //usage:	IF_NOT_FEATURE_DU_DEFAULT_BLOCKSIZE_1K("512")
 //usage:       " bytes.\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-a	Show file sizes too"
 //usage:     "\n	-L	Follow all symlinks"
 //usage:     "\n	-H	Follow symlinks on command line"

coreutils/echo.c

@@ -28,7 +28,6 @@
 //usage:#define echo_full_usage "\n\n"
 //usage:       "Print the specified ARGs to stdout"
 //usage:	IF_FEATURE_FANCY_ECHO( "\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-n	Suppress trailing newline"
 //usage:     "\n	-e	Interpret backslash escapes (i.e., \\t=tab)"
 //usage:     "\n	-E	Don't interpret backslash escapes (default)"

coreutils/env.c

@@ -36,7 +36,6 @@
 //usage:#define env_full_usage "\n\n"
 //usage:       "Print the current environment or run PROG after setting up\n"
 //usage:       "the specified environment\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-, -i	Start with an empty environment"
 //usage:     "\n	-u	Remove variable from the environment"
 

coreutils/expand.c

@@ -25,7 +25,6 @@
 //usage:       "[-i] [-t N] [FILE]..."
 //usage:#define expand_full_usage "\n\n"
 //usage:       "Convert tabs to spaces, writing to stdout\n"
-//usage:     "\nOptions:"
 //usage:	IF_FEATURE_EXPAND_LONG_OPTIONS(
 //usage:     "\n	-i,--initial	Don't convert tabs after non blanks"
 //usage:     "\n	-t,--tabs=N	Tabstops every N chars"
@@ -39,7 +38,6 @@
 //usage:       "[-fa][-t N] [FILE]..."
 //usage:#define unexpand_full_usage "\n\n"
 //usage:       "Convert spaces to tabs, writing to stdout\n"
-//usage:     "\nOptions:"
 //usage:	IF_FEATURE_UNEXPAND_LONG_OPTIONS(
 //usage:     "\n	-a,--all	Convert all blanks"
 //usage:     "\n	-f,--first-only	Convert only leading blanks"

coreutils/fold.c

@@ -14,7 +14,6 @@
 //usage:       "[-bs] [-w WIDTH] [FILE]..."
 //usage:#define fold_full_usage "\n\n"
 //usage:       "Wrap input lines in each FILE (or stdin), writing to stdout\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-b	Count bytes rather than columns"
 //usage:     "\n	-s	Break at spaces"
 //usage:     "\n	-w	Use WIDTH columns instead of 80"

coreutils/fsync.c

@@ -11,7 +11,6 @@
 //usage:       "[-d] FILE..."
 //usage:#define fsync_full_usage "\n\n"
 //usage:       "Write files' buffered blocks to disk\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-d	Avoid syncing metadata"
 
 #include "libbb.h"

coreutils/head.c

@@ -16,7 +16,6 @@
 //usage:#define head_full_usage "\n\n"
 //usage:       "Print first 10 lines of each FILE (or stdin) to stdout.\n"
 //usage:       "With more than one FILE, precede each with a filename header.\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-n N[kbm]	Print first N lines"
 //usage:	IF_FEATURE_FANCY_HEAD(
 //usage:     "\n	-c N[kbm]	Print first N bytes"

coreutils/id.c

@@ -19,7 +19,6 @@
 //usage:       "[OPTIONS] [USER]"
 //usage:#define id_full_usage "\n\n"
 //usage:       "Print information about USER or the current user\n"
-//usage:     "\nOptions:"
 //usage:	IF_SELINUX(
 //usage:     "\n	-Z	Security context"
 //usage:	)

coreutils/install.c

@@ -11,7 +11,6 @@
 //usage:	"[-cdDsp] [-o USER] [-g GRP] [-m MODE] [SOURCE]... DEST"
 //usage:#define install_full_usage "\n\n"
 //usage:       "Copy files and set attributes\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-c	Just copy (default)"
 //usage:     "\n	-d	Create directories"
 //usage:     "\n	-D	Create leading target directories"

coreutils/ln.c

@@ -15,7 +15,6 @@
 //usage:       "[OPTIONS] TARGET... LINK|DIR"
 //usage:#define ln_full_usage "\n\n"
 //usage:       "Create a link LINK or DIR/TARGET to the specified TARGET(s)\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-s	Make symlinks instead of hardlinks"
 //usage:     "\n	-f	Remove existing destinations"
 //usage:     "\n	-n	Don't dereference symlinks - treat like normal file"

coreutils/ls.c

@@ -42,7 +42,6 @@
 //usage:	IF_FEATURE_AUTOWIDTH(" [-w WIDTH]") " [FILE]..."
 //usage:#define ls_full_usage "\n\n"
 //usage:       "List directory contents\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-1	One column output"
 //usage:     "\n	-a	Include entries which start with ."
 //usage:     "\n	-A	Like -a, but exclude . and .."

coreutils/md5_sha1_sum.c

@@ -12,7 +12,6 @@
 //usage:#define md5sum_full_usage "\n\n"
 //usage:       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " MD5 checksums"
 //usage:	IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-c	Check sums against given list"
 //usage:     "\n	-s	Don't output anything, status code shows success"
 //usage:     "\n	-w	Warn about improperly formatted checksum lines"
@@ -34,7 +33,6 @@
 //usage:#define sha1sum_full_usage "\n\n"
 //usage:       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA1 checksums"
 //usage:	IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-c	Check sums against given list"
 //usage:     "\n	-s	Don't output anything, status code shows success"
 //usage:     "\n	-w	Warn about improperly formatted checksum lines"
@@ -46,7 +44,6 @@
 //usage:#define sha256sum_full_usage "\n\n"
 //usage:       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA256 checksums"
 //usage:	IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-c	Check sums against given list"
 //usage:     "\n	-s	Don't output anything, status code shows success"
 //usage:     "\n	-w	Warn about improperly formatted checksum lines"
@@ -58,7 +55,6 @@
 //usage:#define sha512sum_full_usage "\n\n"
 //usage:       "Print" IF_FEATURE_MD5_SHA1_SUM_CHECK(" or check") " SHA512 checksums"
 //usage:	IF_FEATURE_MD5_SHA1_SUM_CHECK( "\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-c	Check sums against given list"
 //usage:     "\n	-s	Don't output anything, status code shows success"
 //usage:     "\n	-w	Warn about improperly formatted checksum lines"

coreutils/mkdir.c

@@ -23,7 +23,6 @@
 //usage:       "[OPTIONS] DIRECTORY..."
 //usage:#define mkdir_full_usage "\n\n"
 //usage:       "Create DIRECTORY\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-m MODE	Mode"
 //usage:     "\n	-p	No error if exists; make parent directories as needed"
 //usage:	IF_SELINUX(

coreutils/mkfifo.c

@@ -14,7 +14,6 @@
 //usage:       "[-m MODE] " IF_SELINUX("[-Z] ") "NAME"
 //usage:#define mkfifo_full_usage "\n\n"
 //usage:       "Create named pipe\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-m MODE	Mode (default a=rw)"
 //usage:	IF_SELINUX(
 //usage:     "\n	-Z	Set security context"

coreutils/mknod.c

@@ -13,7 +13,6 @@
 //usage:       "[-m MODE] " IF_SELINUX("[-Z] ") "NAME TYPE MAJOR MINOR"
 //usage:#define mknod_full_usage "\n\n"
 //usage:       "Create a special file (block, character, or pipe)\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-m MODE	Creation mode (default a=rw)"
 //usage:	IF_SELINUX(
 //usage:     "\n	-Z	Set security context"

coreutils/mv.c

@@ -21,7 +21,6 @@
 //usage:       "or: mv [-fin] SOURCE... DIRECTORY"
 //usage:#define mv_full_usage "\n\n"
 //usage:       "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-f	Don't prompt before overwriting"
 //usage:     "\n	-i	Interactive, prompt before overwrite"
 //usage:     "\n	-n	Don't overwrite an existing file"

coreutils/nice.c

@@ -11,7 +11,6 @@
 //usage:       "[-n ADJUST] [PROG ARGS]"
 //usage:#define nice_full_usage "\n\n"
 //usage:       "Change scheduling priority, run PROG\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-n ADJUST	Adjust priority by ADJUST"
 
 #include <sys/resource.h>

coreutils/readlink.c

@@ -12,7 +12,6 @@
 //usage:#define readlink_full_usage "\n\n"
 //usage:       "Display the value of a symlink"
 //usage:	IF_FEATURE_READLINK_FOLLOW( "\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-f	Canonicalize by following all symlinks"
 //usage:     "\n	-n	Don't add newline"
 //usage:     "\n	-v	Verbose"

coreutils/rm.c

@@ -19,7 +19,6 @@
 //usage:       "[-irf] FILE..."
 //usage:#define rm_full_usage "\n\n"
 //usage:       "Remove (unlink) FILEs\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-i	Always prompt before removing"
 //usage:     "\n	-f	Never prompt"
 //usage:     "\n	-R,-r	Recurse"

coreutils/rmdir.c

@@ -14,7 +14,6 @@
 //usage:       "[OPTIONS] DIRECTORY..."
 //usage:#define rmdir_full_usage "\n\n"
 //usage:       "Remove DIRECTORY if it is empty\n"
-//usage:     "\nOptions:"
 //usage:	IF_FEATURE_RMDIR_LONG_OPTIONS(
 //usage:     "\n	-p|--parents	Include parents"
 //usage:     "\n	--ignore-fail-on-non-empty"

coreutils/seq.c

@@ -12,7 +12,6 @@
 //usage:#define seq_full_usage "\n\n"
 //usage:       "Print numbers from FIRST to LAST, in steps of INC.\n"
 //usage:       "FIRST, INC default to 1.\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-w	Pad to last with leading zeros"
 //usage:     "\n	-s SEP	String separator"
 

coreutils/sort.c

@@ -18,7 +18,6 @@
 //usage:       "] [FILE]..."
 //usage:#define sort_full_usage "\n\n"
 //usage:       "Sort lines of text\n"
-//usage:     "\nOptions:"
 //usage:	IF_FEATURE_SORT_BIG(
 //usage:     "\n	-b	Ignore leading blanks"
 //usage:     "\n	-c	Check whether input is sorted"

coreutils/split.c

@@ -13,8 +13,7 @@
 //usage:#define split_trivial_usage
 //usage:       "[OPTIONS] [INPUT [PREFIX]]"
 //usage:#define split_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n	-b N[k|m]	Split by N (kilo|mega)bytes"
+//usage:       "	-b N[k|m]	Split by N (kilo|mega)bytes"
 //usage:     "\n	-l N		Split by N lines"
 //usage:     "\n	-a N		Use N letters as suffix"
 //usage:

coreutils/stat.c

@@ -17,7 +17,6 @@
 //usage:       "[OPTIONS] FILE..."
 //usage:#define stat_full_usage "\n\n"
 //usage:       "Display file (default) or filesystem status\n"
-//usage:     "\nOptions:"
 //usage:	IF_FEATURE_STAT_FORMAT(
 //usage:     "\n	-c fmt	Use the specified format"
 //usage:	)

coreutils/stty.c

@@ -26,7 +26,6 @@
 //usage:#define stty_full_usage "\n\n"
 //usage:       "Without arguments, prints baud rate, line discipline,\n"
 //usage:       "and deviations from stty sane\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-F DEVICE	Open device instead of stdin"
 //usage:     "\n	-a		Print all current settings in human-readable form"
 //usage:     "\n	-g		Print in stty-readable form"

coreutils/sum.c

@@ -17,7 +17,6 @@
 //usage:       "[-rs] [FILE]..."
 //usage:#define sum_full_usage "\n\n"
 //usage:       "Checksum and count the blocks in a file\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-r	Use BSD sum algorithm (1K blocks)"
 //usage:     "\n	-s	Use System V sum algorithm (512byte blocks)"
 

coreutils/tail.c

@@ -29,7 +29,6 @@
 //usage:#define tail_full_usage "\n\n"
 //usage:       "Print last 10 lines of each FILE (or stdin) to stdout.\n"
 //usage:       "With more than one FILE, precede each with a filename header.\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-f		Print data as file grows"
 //usage:	IF_FEATURE_FANCY_TAIL(
 //usage:     "\n	-s SECONDS	Wait SECONDS between reads with -f"

coreutils/tee.c

@@ -14,7 +14,6 @@
 //usage:       "[-ai] [FILE]..."
 //usage:#define tee_full_usage "\n\n"
 //usage:       "Copy stdin to each FILE, and also to stdout\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-a	Append to the given FILEs, don't overwrite"
 //usage:     "\n	-i	Ignore interrupt signals (SIGINT)"
 //usage:

coreutils/touch.c

@@ -34,7 +34,6 @@
 //usage:       "[-c]" IF_DESKTOP(" [-d DATE] [-r FILE]") " FILE [FILE]..."
 //usage:#define touch_full_usage "\n\n"
 //usage:       "Update the last-modified date on the given FILE[s]\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-c	Don't create files"
 //usage:	IF_DESKTOP(
 //usage:     "\n	-d DT	Date/time to use"

coreutils/tr.c

@@ -51,7 +51,6 @@
 //usage:       "[-cds] STRING1 [STRING2]"
 //usage:#define tr_full_usage "\n\n"
 //usage:       "Translate, squeeze, or delete characters from stdin, writing to stdout\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-c	Take complement of STRING1"
 //usage:     "\n	-d	Delete input characters coded STRING1"
 //usage:     "\n	-s	Squeeze multiple output characters of STRING2 into one character"

coreutils/tty.c

@@ -15,7 +15,6 @@
 //usage:#define tty_full_usage "\n\n"
 //usage:       "Print file name of stdin's terminal"
 //usage:	IF_INCLUDE_SUSv2( "\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-s	Print nothing, only return exit status"
 //usage:	)
 //usage:

coreutils/uname.c

@@ -52,7 +52,6 @@
 //usage:       "[-amnrspv]"
 //usage:#define uname_full_usage "\n\n"
 //usage:       "Print system information\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-a	Print all"
 //usage:     "\n	-m	The machine (hardware) type"
 //usage:     "\n	-n	Hostname"

coreutils/uniq.c

@@ -14,7 +14,6 @@
 //usage:       "[-cdu][-f,s,w N] [INPUT [OUTPUT]]"
 //usage:#define uniq_full_usage "\n\n"
 //usage:       "Discard duplicate lines\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-c	Prefix lines by the number of occurrences"
 //usage:     "\n	-d	Only print duplicate lines"
 //usage:     "\n	-u	Only print unique lines"

coreutils/uudecode.c

@@ -158,7 +158,6 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
 //usage:	"[-d] [FILE]"
 //usage:#define base64_full_usage "\n\n"
 //usage:       "Base64 encode or decode FILE to standard output"
-//usage:     "\nOptions:"
 //usage:     "\n	-d	Decode data"
 ////usage:     "\n	-w COL	Wrap lines at COL (default 76, 0 disables)"
 ////usage:     "\n	-i	When decoding, ignore non-alphabet characters"

coreutils/uuencode.c

@@ -12,7 +12,6 @@
 //usage:       "[-m] [INFILE] STORED_FILENAME"
 //usage:#define uuencode_full_usage "\n\n"
 //usage:       "Uuencode a file to stdout\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-m	Use base64 encoding per RFC1521"
 //usage:
 //usage:#define uuencode_example_usage

coreutils/wc.c

@@ -64,7 +64,6 @@
 //usage:
 //usage:#define wc_full_usage "\n\n"
 //usage:       "Count lines, words, and bytes for each FILE (or stdin)\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-c	Count bytes"
 //usage:	IF_UNICODE_SUPPORT(
 //usage:     "\n	-m	Count characters"

coreutils/who.c

@@ -22,7 +22,6 @@
 //usage:       "[-a]"
 //usage:#define who_full_usage "\n\n"
 //usage:       "Show who is logged on\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-a	Show all"
 
 #include "libbb.h"

debianutils/mktemp.c

@@ -37,7 +37,6 @@
 //usage:       "Create a temporary file with name based on TEMPLATE and print its name.\n"
 //usage:       "TEMPLATE must end with XXXXXX (e.g. [/dir/]nameXXXXXX).\n"
 //usage:       "Without TEMPLATE, -t tmp.XXXXXX is assumed.\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-d	Make directory, not file"
 ////usage:   "\n	-q	Fail silently on errors" - we ignore this opt
 //usage:     "\n	-t	Prepend base directory name to TEMPLATE"

debianutils/run_parts.c

@@ -34,7 +34,6 @@
 //usage:       "[-t] "IF_FEATURE_RUN_PARTS_FANCY("[-l] ")"[-a ARG] [-u MASK] DIRECTORY"
 //usage:#define run_parts_full_usage "\n\n"
 //usage:       "Run a bunch of scripts in DIRECTORY\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-t	Print what would be run, but don't actually run anything"
 //usage:     "\n	-a ARG	Pass ARG as argument for every program"
 //usage:     "\n	-u MASK	Set the umask to MASK before running every program"

e2fsprogs/chattr.c

@@ -39,7 +39,6 @@
 //usage:     "\n	S	Write file contents synchronously"
 //usage:     "\n	t	Disable tail-merging of partial blocks with other files"
 //usage:     "\n	u	Allow file to be undeleted"
-//usage:     "\nOptions:"
 //usage:     "\n	-R	Recurse"
 //usage:     "\n	-v	Set the file's version/generation number"
 

e2fsprogs/fsck.c

@@ -38,7 +38,6 @@
 //usage:       "[-ANPRTV] [-C FD] [-t FSTYPE] [FS_OPTS] [BLOCKDEV]..."
 //usage:#define fsck_full_usage "\n\n"
 //usage:       "Check and repair filesystems\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-A	Walk /etc/fstab and check all filesystems"
 //usage:     "\n	-N	Don't execute, just show what would be done"
 //usage:     "\n	-P	With -A, check filesystems in parallel"

e2fsprogs/lsattr.c

@@ -22,7 +22,6 @@
 //usage:       "[-Radlv] [FILE]..."
 //usage:#define lsattr_full_usage "\n\n"
 //usage:       "List file attributes on an ext2 fs\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-R	Recurse"
 //usage:     "\n	-a	Don't hide entries starting with ."
 //usage:     "\n	-d	List directory entries instead of contents"

e2fsprogs/old_e2fsprogs/e2fsck.c

@@ -37,7 +37,6 @@
 //usage:       "[-E extended-options] device"
 //usage:#define e2fsck_full_usage "\n\n"
 //usage:       "Check ext2/ext3 file system\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-p		Automatic repair (no questions)"
 //usage:     "\n	-n		Make no changes to the filesystem"
 //usage:     "\n	-y		Assume 'yes' to all questions"

editors/awk.c

@@ -10,8 +10,7 @@
 //usage:#define awk_trivial_usage
 //usage:       "[OPTIONS] [AWK_PROGRAM] [FILE]..."
 //usage:#define awk_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n	-v VAR=VAL	Set variable"
+//usage:       "	-v VAR=VAL	Set variable"
 //usage:     "\n	-F SEP		Use SEP as field separator"
 //usage:     "\n	-f FILE		Read program from FILE"
 

editors/cmp.c

@@ -14,7 +14,6 @@
 //usage:       "[-l] [-s] FILE1 [FILE2" IF_DESKTOP(" [SKIP1 [SKIP2]]") "]"
 //usage:#define cmp_full_usage "\n\n"
 //usage:       "Compare FILE1 with FILE2 (or stdin)\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-l	Write the byte numbers (decimal) and values (octal)"
 //usage:     "\n		for all differing bytes"
 //usage:     "\n	-s	Quiet"

editors/diff.c

@@ -81,7 +81,6 @@
 //usage:#define diff_full_usage "\n\n"
 //usage:       "Compare files line by line and output the differences between them.\n"
 //usage:       "This implementation supports unified diffs only.\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-a	Treat all files as text"
 //usage:     "\n	-b	Ignore changes in the amount of whitespace"
 //usage:     "\n	-B	Ignore changes whose lines are all blank"

editors/sed.c

@@ -59,8 +59,7 @@
 //usage:#define sed_trivial_usage
 //usage:       "[-efinr] SED_CMD [FILE]..."
 //usage:#define sed_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n	-e CMD	Add CMD to sed commands to be executed"
+//usage:       "	-e CMD	Add CMD to sed commands to be executed"
 //usage:     "\n	-f FILE	Add FILE contents to sed commands to be executed"
 //usage:     "\n	-i	Edit files in-place (else sends result to stdout)"
 //usage:     "\n	-n	Suppress automatic printing of pattern space"

editors/vi.c

@@ -25,7 +25,6 @@
 //usage:       "[OPTIONS] [FILE]..."
 //usage:#define vi_full_usage "\n\n"
 //usage:       "Edit FILE\n"
-//usage:     "\nOptions:"
 //usage:	IF_FEATURE_VI_COLON(
 //usage:     "\n	-c	Initial command to run ($EXINIT also available)"
 //usage:	)

findutils/find.c

@@ -236,7 +236,6 @@
 //usage:       "Search for files and perform actions on them.\n"
 //usage:       "First failed action stops processing of current file.\n"
 //usage:       "Defaults: PATH is current directory, action is '-print'\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-follow		Follow symlinks"
 //usage:	IF_FEATURE_FIND_XDEV(
 //usage:     "\n	-xdev		Don't descend directories on other filesystems"

findutils/grep.c

@@ -72,7 +72,6 @@
 //usage:       "PATTERN/-e PATTERN.../-f FILE [FILE]..."
 //usage:#define grep_full_usage "\n\n"
 //usage:       "Search for PATTERN in FILEs (or stdin)\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-H	Add 'filename:' prefix"
 //usage:     "\n	-h	Do not add 'filename:' prefix"
 //usage:     "\n	-n	Add 'line_no:' prefix"

findutils/xargs.c

@@ -349,7 +349,6 @@ static int xargs_ask_confirmation(void)
 //usage:       "[OPTIONS] [PROG ARGS]"
 //usage:#define xargs_full_usage "\n\n"
 //usage:       "Run PROG on every item given by stdin\n"
-//usage:     "\nOptions:"
 //usage:	IF_FEATURE_XARGS_SUPPORT_CONFIRMATION(
 //usage:     "\n	-p	Ask user whether to run each command"
 //usage:	)

init/bootchartd.c

@@ -327,7 +327,6 @@ static void finalize(char *tempdir, const char *prog)
 //usage:       "start [PROG ARGS]|stop|init"
 //usage:#define bootchartd_full_usage "\n\n"
 //usage:       "Create /var/log/bootchart.tgz with boot chart data\n"
-//usage:     "\nOptions:"
 //usage:     "\nstart: start background logging; with PROG, run PROG, then kill logging with USR1"
 //usage:     "\nstop: send USR1 to all bootchartd processes"
 //usage:     "\ninit: start background logging; stop when getty/xdm is seen (for init scripts)"

init/halt.c

@@ -43,7 +43,6 @@
 //usage:       "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]")
 //usage:#define halt_full_usage "\n\n"
 //usage:       "Halt the system\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-d SEC	Delay interval"
 //usage:     "\n	-n	Do not sync"
 //usage:     "\n	-f	Force (don't go through init)"
@@ -55,7 +54,6 @@
 //usage:       "[-d DELAY] [-n] [-f]"
 //usage:#define poweroff_full_usage "\n\n"
 //usage:       "Halt and shut off power\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-d SEC	Delay interval"
 //usage:     "\n	-n	Do not sync"
 //usage:     "\n	-f	Force (don't go through init)"
@@ -64,7 +62,6 @@
 //usage:       "[-d DELAY] [-n] [-f]"
 //usage:#define reboot_full_usage "\n\n"
 //usage:       "Reboot the system\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-d SEC	Delay interval"
 //usage:     "\n	-n	Do not sync"
 //usage:     "\n	-f	Force (don't go through init)"

loginutils/addgroup.c

@@ -14,7 +14,6 @@
 //usage:       "[-g GID] " IF_FEATURE_ADDUSER_TO_GROUP("[USER] ") "GROUP"
 //usage:#define addgroup_full_usage "\n\n"
 //usage:       "Add a group " IF_FEATURE_ADDUSER_TO_GROUP("or add a user to a group") "\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-g GID	Group id"
 //usage:     "\n	-S	Create a system group"
 

loginutils/adduser.c

@@ -12,7 +12,6 @@
 //usage:       "[OPTIONS] USER"
 //usage:#define adduser_full_usage "\n\n"
 //usage:       "Add a user\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-h DIR		Home directory"
 //usage:     "\n	-g GECOS	GECOS field"
 //usage:     "\n	-s SHELL	Login shell"

loginutils/chpasswd.c

@@ -11,7 +11,6 @@
 //usage:	IF_LONG_OPTS("[--md5|--encrypted]") IF_NOT_LONG_OPTS("[-m|-e]")
 //usage:#define chpasswd_full_usage "\n\n"
 //usage:       "Read user:password from stdin and update /etc/passwd\n"
-//usage:     "\nOptions:"
 //usage:	IF_LONG_OPTS(
 //usage:     "\n	-e,--encrypted	Supplied passwords are in encrypted form"
 //usage:     "\n	-m,--md5	Use MD5 encryption instead of DES"

loginutils/cryptpw.c

@@ -15,7 +15,6 @@
 /* We do support -s, we just don't mention it */
 //usage:#define cryptpw_full_usage "\n\n"
 //usage:       "Crypt PASSWORD using crypt(3)\n"
-//usage:     "\nOptions:"
 //usage:	IF_LONG_OPTS(
 //usage:     "\n	-P,--password-fd=N	Read password from fd N"
 /* //usage:  "\n	-s,--stdin		Use stdin; like -P0" */
@@ -35,7 +34,6 @@
 /* We do support -s, we just don't mention it */
 //usage:#define mkpasswd_full_usage "\n\n"
 //usage:       "Crypt PASSWORD using crypt(3)\n"
-//usage:     "\nOptions:"
 //usage:	IF_LONG_OPTS(
 //usage:     "\n	-P,--password-fd=N	Read password from fd N"
 /* //usage:  "\n	-s,--stdin		Use stdin; like -P0" */

loginutils/getty.c

@@ -105,7 +105,6 @@ struct globals {
 //usage:       "[OPTIONS] BAUD_RATE[,BAUD_RATE]... TTY [TERMTYPE]"
 //usage:#define getty_full_usage "\n\n"
 //usage:       "Open a tty, prompt for a login name, then invoke /bin/login\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-h		Enable hardware RTS/CTS flow control"
 //usage:     "\n	-L		Set CLOCAL (ignore Carrier Detect state)"
 //usage:     "\n	-m		Get baud rate from modem's CONNECT status message"

loginutils/login.c

@@ -7,7 +7,6 @@
 //usage:       "[-p] [-h HOST] [[-f] USER]"
 //usage:#define login_full_usage "\n\n"
 //usage:       "Begin a new session on the system\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-f	Don't authenticate (user already authenticated)"
 //usage:     "\n	-h	Name of the remote host"
 //usage:     "\n	-p	Preserve environment"

loginutils/passwd.c

@@ -8,7 +8,6 @@
 //usage:#define passwd_full_usage "\n\n"
 //usage:       "Change USER's password (default: current user)"
 //usage:     "\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-a ALG	Encryption method"
 //usage:     "\n	-d	Set password to ''"
 //usage:     "\n	-l	Lock (disable) account"

loginutils/su.c

@@ -12,7 +12,6 @@
 //usage:       "[OPTIONS] [-] [USER]"
 //usage:#define su_full_usage "\n\n"
 //usage:       "Run shell under USER (by default, root)\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-,-l	Clear environment, run shell as login shell"
 //usage:     "\n	-p,-m	Do not set new $HOME, $SHELL, $USER, $LOGNAME"
 //usage:     "\n	-c CMD	Command to pass to 'sh -c'"

loginutils/sulogin.c

@@ -9,7 +9,6 @@
 //usage:       "[-t N] [TTY]"
 //usage:#define sulogin_full_usage "\n\n"
 //usage:       "Single user login\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-t N	Timeout"
 
 #include "libbb.h"

loginutils/vlock.c

@@ -19,7 +19,6 @@
 //usage:       "[-a]"
 //usage:#define vlock_full_usage "\n\n"
 //usage:       "Lock a virtual terminal. A password is required to unlock.\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-a	Lock all VTs"
 
 #include "libbb.h"

mailutils/makemime.c

@@ -132,12 +132,11 @@ Content-Transfer-Encoding: 7bit
 //usage:#define makemime_full_usage "\n\n"
 //usage:       "Create multipart MIME-encoded message from FILEs\n"
 /* //usage:    "Transfer encoding is base64, disposition is inline (not attachment)\n" */
-//usage:     "\nOptions:"
 //usage:     "\n	-o FILE	Output. Default: stdout"
 //usage:     "\n	-a HDR	Add header. Examples:"
 //usage:     "\n		\"From: user@host.org\", \"Date: `date -R`\""
 //usage:     "\n	-c CT	Content type. Default: text/plain"
-//usage:     "\n	-C CS   Charset. Default: " CONFIG_FEATURE_MIME_CHARSET
+//usage:     "\n	-C CS	Charset. Default: " CONFIG_FEATURE_MIME_CHARSET
 /* //usage:  "\n	-e ENC	Transfer encoding. Ignored. base64 is assumed" */
 //usage:     "\n"
 //usage:     "\nOther options are silently ignored"

mailutils/popmaildir.c

@@ -16,7 +16,6 @@
 //usage:       "[OPTIONS] MAILDIR [CONN_HELPER ARGS]"
 //usage:#define popmaildir_full_usage "\n\n"
 //usage:       "Fetch content of remote mailbox to local maildir\n"
-//usage:     "\nOptions:"
 /* //usage:  "\n	-b		Binary mode. Ignored" */
 /* //usage:  "\n	-d		Debug. Ignored" */
 /* //usage:  "\n	-m		Show used memory. Ignored" */

mailutils/reformime.c

@@ -234,7 +234,6 @@ static int parse(const char *boundary, char **argv)
 //usage:       "[OPTIONS]"
 //usage:#define reformime_full_usage "\n\n"
 //usage:       "Parse MIME-encoded message on stdin\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-x PREFIX	Extract content of MIME sections to files"
 //usage:     "\n	-X PROG ARGS	Filter content of MIME sections through PROG"
 //usage:     "\n			Must be the last option"

miscutils/adjtimex.c

@@ -15,7 +15,6 @@
 //usage:       "[-q] [-o OFF] [-f FREQ] [-p TCONST] [-t TICK]"
 //usage:#define adjtimex_full_usage "\n\n"
 //usage:       "Read and optionally set system timebase parameters. See adjtimex(2)\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-q	Quiet"
 //usage:     "\n	-o OFF	Time offset, microseconds"
 //usage:     "\n	-f FREQ	Frequency adjust, integer kernel units (65536 is 1ppm)"

miscutils/beep.c

@@ -11,8 +11,7 @@
 //usage:#define beep_trivial_usage
 //usage:       "-f FREQ -l LEN -d DELAY -r COUNT -n"
 //usage:#define beep_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n	-f	Frequency in Hz"
+//usage:       "	-f	Frequency in Hz"
 //usage:     "\n	-l	Length in ms"
 //usage:     "\n	-d	Delay in ms"
 //usage:     "\n	-r	Repetitions"

miscutils/chrt.c

@@ -10,7 +10,6 @@
 //usage:       "[-prfom] [PRIO] [PID | PROG ARGS]"
 //usage:#define chrt_full_usage "\n\n"
 //usage:       "Change scheduling priority and class for a process\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-p	Operate on PID"
 //usage:     "\n	-r	Set SCHED_RR class"
 //usage:     "\n	-f	Set SCHED_FIFO class"

miscutils/conspy.c

@@ -30,7 +30,6 @@
 //usage:     "A text-mode VNC like program for Linux virtual consoles."
 //usage:     "\nTo exit, quickly press ESC 3 times."
 //usage:     "\n"
-//usage:     "\nOptions:"
 //usage:     "\n	-v	Don't send keystrokes to the console"
 //usage:     "\n	-c	Create missing devices in /dev"
 //usage:     "\n	-s	Open a SHELL session"

miscutils/devfsd.c

@@ -58,7 +58,6 @@
 //usage:       "mntpnt [-v]" IF_DEVFSD_FG_NP("[-fg][-np]")
 //usage:#define devfsd_full_usage "\n\n"
 //usage:       "Manage devfs permissions and old device name symlinks\n"
-//usage:     "\nOptions:"
 //usage:     "\n	mntpnt	The mount point where devfs is mounted"
 //usage:     "\n	-v	Print the protocol version numbers for devfsd"
 //usage:     "\n		and the kernel-side protocol version and exit"

miscutils/eject.c

@@ -17,7 +17,6 @@
 //usage:       "[-t] [-T] [DEVICE]"
 //usage:#define eject_full_usage "\n\n"
 //usage:       "Eject DEVICE or default /dev/cdrom\n"
-//usage:     "\nOptions:"
 //usage:	IF_FEATURE_EJECT_SCSI(
 //usage:     "\n	-s	SCSI device"
 //usage:	)