Move \n to inside TRIVIAL_HELP, to save a few bytes for the default case.

Patch from Vladimir N. Oleynik <dzo@simtreas.ru>

1 files changed, 334 insertions, 337 deletions

diff --git a/applets/usage.c b/applets/usage.c
index e92b87a9c..864891797 100644
--- a/applets/usage.c
+++ b/applets/usage.c
@@ -2,102 +2,102 @@
 
 #if defined BB_AR
 const char ar_usage[] =
-	"ar -[ovR]{ptx} archive filenames \n"
+	"ar -[ovR]{ptx} archive filenames"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nExtract or list files from an ar archive.\n\n"
+	"\n\nExtract or list files from an ar archive.\n\n"
 	"Options:\n"
 	"\t-o\t\tpreserve original dates\n"
 	"\t-p\t\textract to stdout\n"
 	"\t-t\t\tlist\n"
 	"\t-x\t\textract\n"
 	"\t-v\t\tverbosely list files processed\n"
-	"\t-R\t\trecursive action\n"
+	"\t-R\t\trecursive action"
 #endif
 	;
 #endif
 
 #if defined BB_BASENAME
 const char basename_usage[] =
-	"basename FILE [SUFFIX]\n"
+	"basename FILE [SUFFIX]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nStrips directory path and suffixes from FILE.\n"
-	"If specified, also removes any trailing SUFFIX.\n"
+	"\n\nStrips directory path and suffixes from FILE.\n"
+	"If specified, also removes any trailing SUFFIX."
 #endif
 	;
 #endif
 
 #if defined BB_CAT
 const char cat_usage[] =
-	"cat [FILE]...\n"
+	"cat [FILE]..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nConcatenates FILE(s) and prints them to stdout.\n"
+	"\n\nConcatenates FILE(s) and prints them to stdout."
 #endif
 	;
 #endif
 
 #if defined BB_CHMOD_CHOWN_CHGRP
 const char chgrp_usage[] =
-	"chgrp [OPTION]... GROUP FILE...\n"
+	"chgrp [OPTION]... GROUP FILE..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nChange the group membership of each FILE to GROUP.\n"
-	"\nOptions:\n\t-R\tChanges files and directories recursively.\n"
+	"\n\nChange the group membership of each FILE to GROUP.\n"
+	"\nOptions:\n\t-R\tChanges files and directories recursively."
 #endif
 	;
 #endif
 
 #if defined BB_CHMOD_CHOWN_CHGRP
 const char chmod_usage[] =
-	"chmod [-R] MODE[,MODE]... FILE...\n"
+	"chmod [-R] MODE[,MODE]... FILE..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nEach MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
+	"\n\nEach MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
 	"one or more of the letters rwxst.\n\n"
-	"\nOptions:\n\t-R\tChanges files and directories recursively.\n"
+	"\nOptions:\n\t-R\tChanges files and directories recursively."
 #endif
 	;
 #endif
 
 #if defined BB_CHMOD_CHOWN_CHGRP
 const char chown_usage[] =
-	"chown [OPTION]...  OWNER[<.|:>[GROUP] FILE...\n"
+	"chown [OPTION]...  OWNER[<.|:>[GROUP] FILE..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nChange the owner and/or group of each FILE to OWNER and/or GROUP.\n"
-	"\nOptions:\n\t-R\tChanges files and directories recursively.\n"
+	"\n\nChange the owner and/or group of each FILE to OWNER and/or GROUP.\n"
+	"\nOptions:\n\t-R\tChanges files and directories recursively."
 #endif
 	;
 #endif
 
 #if defined BB_CHROOT
 const char chroot_usage[] =
-	"chroot NEWROOT [COMMAND...]\n"
+	"chroot NEWROOT [COMMAND...]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nRun COMMAND with root directory set to NEWROOT.\n"
+	"\n\nRun COMMAND with root directory set to NEWROOT."
 #endif
 	;
 #endif
 
 #if defined BB_CHVT
 const char chvt_usage[] =
-	"chvt N\n"
+	"chvt N"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nChanges the foreground virtual terminal to /dev/ttyN\n"
+	"\n\nChanges the foreground virtual terminal to /dev/ttyN"
 #endif
 	;
 #endif
 
 #if defined BB_CLEAR
 const char clear_usage[] =
-	"clear\n"
+	"clear"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nClear screen.\n"
+	"\n\nClear screen."
 #endif
 	;
 #endif
 
 #if defined BB_CMP
 const char cmp_usage[] =
-	"cmp FILE1 [FILE2]\n"
+	"cmp FILE1 [FILE2]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCompare files.\n"
+	"\n\nCompare files."
 #endif
 	;
 #endif
@@ -105,31 +105,31 @@ const char cmp_usage[] =
 #if defined BB_CP_MV
 const char cp_usage[] =
 	"cp [OPTION]... SOURCE DEST\n"
-	"   or: cp [OPTION]... SOURCE... DIRECTORY\n"
+	"   or: cp [OPTION]... SOURCE... DIRECTORY"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCopies SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
+	"\n\nCopies SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n"
 	"\n"
 	"\t-a\tSame as -dpR\n"
 	"\t-d\tPreserves links\n"
 	"\t-p\tPreserves file attributes if possible\n"
 	"\t-f\tforce (implied; ignored) - always set\n"
-	"\t-R\tCopies directories recursively\n"
+	"\t-R\tCopies directories recursively"
 #endif
 	;
 #endif
 
 #if defined BB_CUT
 const char cut_usage[] =
-	"cut [OPTION]... [FILE]...\n"
+	"cut [OPTION]... [FILE]..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrints selected fields from each input FILE to standard output.\n\n"
+	"\n\nPrints selected fields from each input FILE to standard output.\n\n"
 	"Options:\n"
 	"\t-b LIST\tOutput only bytes from LIST\n"
 	"\t-c LIST\tOutput only characters from LIST\n"
 	"\t-d CHAR\tUse CHAR instead of tab as the field delimiter\n"
 	"\t-s\tOutput only the lines containing delimiter\n"
 	"\t-f N\tPrint only these fields\n"
-	"\t-n\tIgnored\n"
+	"\t-n\tIgnored"
 #endif
 	;
 #endif
@@ -137,33 +137,33 @@ const char cut_usage[] =
 #if defined BB_DATE
 const char date_usage[] =
 	"date [OPTION]... [+FORMAT]\n"
-	"  or:  date [OPTION] [MMDDhhmm[[CC]YY][.ss]]\n"
+	"  or:  date [OPTION] [MMDDhhmm[[CC]YY][.ss]]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nDisplays the current time in the given FORMAT, or sets the system date.\n"
+	"\n\nDisplays the current time in the given FORMAT, or sets the system date.\n"
 	"\nOptions:\n\t-R\t\tOutputs RFC-822 compliant date string\n"
 	"\t-d STRING\tdisplay time described by STRING, not `now'\n"
 	"\t-s\t\tSets time described by STRING\n"
-	"\t-u\t\tPrints or sets Coordinated Universal Time\n"
+	"\t-u\t\tPrints or sets Coordinated Universal Time"
 #endif
 	;
 #endif
 
 #if defined BB_DC
 const char dc_usage[] =
-	"dc expression ...\n"
+	"dc expression ..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nThis is a Tiny RPN calculator that understands the\n"
+	"\n\nThis is a Tiny RPN calculator that understands the\n"
 	"following operations: +, -, /, *, and, or, not, eor.\n"
-	"i.e. 'dc 2 2 add' -> 4, and 'dc 8 8 \\* 2 2 + /' -> 16\n"
+	"i.e. 'dc 2 2 add' -> 4, and 'dc 8 8 \\* 2 2 + /' -> 16"
 #endif
 	;
 #endif
 
 #if defined BB_DD
 const char dd_usage[] =
-	"dd [if=FILE] [of=FILE] [bs=N] [count=N] [skip=N] [seek=N] [conv=notrunc|sync]\n"
+	"dd [if=FILE] [of=FILE] [bs=N] [count=N] [skip=N] [seek=N] [conv=notrunc|sync]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCopy a file, converting and formatting according to options\n\n"
+	"\n\nCopy a file, converting and formatting according to options\n\n"
 	"\tif=FILE\tread from FILE instead of stdin\n"
 	"\tof=FILE\twrite to FILE instead of stdout\n"
 	"\tbs=N\tread and write N bytes at a time\n"
@@ -174,56 +174,56 @@ const char dd_usage[] =
 	"\tconv=sync\tpad blocks with zeros\n"
 	"\n"
 	"Numbers may be suffixed by c (x1), w (x2), b (x512), kD (x1000), k (x1024),\n"
-	"MD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824).\n"
+	"MD (x1000000), M (x1048576), GD (x1000000000) or G (x1073741824)."
 #endif
 	;
 #endif
 
 #if defined BB_DEALLOCVT
 const char deallocvt_usage[] =
-	"deallocvt N\n"
+	"deallocvt N"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	 "\nDeallocate unused virtual terminal /dev/ttyN\n"
+	 "\n\nDeallocate unused virtual terminal /dev/ttyN"
 #endif
 	 ;
 #endif
 
 #if defined BB_DF
 const char df_usage[] =
-	"df [filesystem ...]\n"
+	"df [filesystem ...]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint the filesystem space used and space available.\n"
+	"\n\nPrint the filesystem space used and space available."
 #endif
 	;
 #endif
 
 #if defined BB_DIRNAME
 const char dirname_usage[] =
-	"dirname [FILENAME ...]\n"
+	"dirname [FILENAME ...]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nStrips non-directory suffix from FILENAME\n"
+	"\n\nStrips non-directory suffix from FILENAME"
 #endif
 	;
 #endif
 
 #if defined BB_DMESG
 const char dmesg_usage[] =
-	"dmesg [-c] [-n LEVEL] [-s SIZE]\n"
+	"dmesg [-c] [-n LEVEL] [-s SIZE]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrints or controls the kernel ring buffer\n\n"
+	"\n\nPrints or controls the kernel ring buffer\n\n"
 	"Options:\n"
 	"\t-c\t\tClears the ring buffer's contents after printing\n"
 	"\t-n LEVEL\tSets console logging level\n"
-	"\t-s SIZE\t\tUse a buffer of size SIZE\n"
+	"\t-s SIZE\t\tUse a buffer of size SIZE"
 #endif
 	;
 #endif
 
 #if defined BB_DOS2UNIX
 const char dos2unix_usage[] =
-	"dos2unix < dosfile > unixfile\n"
+	"dos2unix < dosfile > unixfile"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nConverts a text file from dos format to unix format.\n"
+	"\n\nConverts a text file from dos format to unix format."
 #endif
 	;
 #endif
@@ -232,93 +232,93 @@ const char dos2unix_usage[] =
 const char dpkg_deb_usage[] =
         "dpkg-deb [-cexX] file directory"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"Perform actions on debian packages (.debs)\n"
+	"\n\nPerform actions on debian packages (.debs)\n\n"
 	"Options:\n"
 	"\t-c\tList contents of filesystem tree\n"
 	"\t-e\tExtract control files to directory\n"	
 	"\t-x\tExctract packages filesystem tree to directory\n"
-	"\t-X\tVerbose extract\n"
+	"\t-X\tVerbose extract"
 #endif
 	;
 #endif
 
 #if defined BB_DU
 const char du_usage[] =
-	"du [OPTION]... [FILE]...\n"
+	"du [OPTION]... [FILE]..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nSummarizes disk space used for each FILE and/or directory.\n"
+	"\n\nSummarizes disk space used for each FILE and/or directory.\n"
 	"Disk space is printed in units of 1024 bytes.\n\n"
 	"Options:\n"
 	"\t-l\tcount sizes many times if hard linked\n"
-	"\t-s\tdisplay only a total for each argument\n"
+	"\t-s\tdisplay only a total for each argument"
 #endif
 	;
 #endif
 
 #if defined BB_DUMPKMAP
 const char dumpkmap_usage[] =
-	"dumpkmap > keymap\n"
+	"dumpkmap > keymap"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrints out a binary keyboard translation table to standard input.\n"
+	"\n\nPrints out a binary keyboard translation table to standard input."
 #endif
 	;
 #endif
 
 #if defined BB_DUTMP
 const char dutmp_usage[] =
-	"dutmp [FILE]\n"
+	"dutmp [FILE]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nDump utmp file format (pipe delimited) from FILE\n"
-	"or stdin to stdout.  (i.e. 'dutmp /var/run/utmp')\n"
+	"\n\nDump utmp file format (pipe delimited) from FILE\n"
+	"or stdin to stdout.  (i.e. 'dutmp /var/run/utmp')"
 #endif
 	;
 #endif
 
 #if defined BB_ECHO
 const char echo_usage[] =
-	"echo [-neE] [ARG ...]\n"
+	"echo [-neE] [ARG ...]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrints the specified ARGs to stdout\n\n"
+	"\n\nPrints the specified ARGs to stdout\n\n"
 	"Options:\n"
 	"\t-n\tsuppress trailing newline\n"
 	"\t-e\tinterpret backslash-escaped characters (i.e. \\t=tab etc)\n"
-	"\t-E\tdisable interpretation of backslash-escaped characters\n"
+	"\t-E\tdisable interpretation of backslash-escaped characters"
 #endif
 	;
 #endif
 
 #if defined BB_EXPR
 const char expr_usage[] =
-	"expr EXPRESSION\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrints the value of EXPRESSION to standard output.\n\n"
-       "EXPRESSION may be:\n"
-       "ARG1 |  ARG2	ARG1 if it is neither null nor 0, otherwise ARG2\n"
-       "ARG1 &  ARG2	ARG1 if neither argument is null or 0, otherwise 0\n"
-       "ARG1 <  ARG2	ARG1 is less than ARG2\n"
-       "ARG1 <= ARG2	ARG1 is less than or equal to ARG2\n"
-       "ARG1 =  ARG2	ARG1 is equal to ARG2\n"
-       "ARG1 != ARG2	ARG1 is unequal to ARG2\n"
-       "ARG1 >= ARG2	ARG1 is greater than or equal to ARG2\n"
-       "ARG1 >  ARG2	ARG1 is greater than ARG2\n"
-       "ARG1 +  ARG2	arithmetic sum of ARG1 and ARG2\n"
-       "ARG1 -  ARG2	arithmetic difference of ARG1 and ARG2\n"
-       "ARG1 *  ARG2	arithmetic product of ARG1 and ARG2\n"
-       "ARG1 /  ARG2	arithmetic quotient of ARG1 divided by ARG2\n"
-       "ARG1 %  ARG2	arithmetic remainder of ARG1 divided by ARG2\n"
-       "STRING : REGEXP		    anchored pattern match of REGEXP in STRING\n"
-       "match STRING REGEXP	    same as STRING : REGEXP\n"
-       "substr STRING POS LENGTH    substring of STRING, POS counted from 1\n"
-       "index STRING CHARS	    index in STRING where any CHARS is found, or 0\n"
-       "length STRING		    length of STRING\n"
-       "quote TOKEN		    interpret TOKEN as a string, even if it is a \n"
-       "				keyword like `match' or an operator like `/'\n"
-       "( EXPRESSION )		    value of EXPRESSION\n\n"
-       "Beware that many operators need to be escaped or quoted for shells.\n"
-       "Comparisons are arithmetic if both ARGs are numbers, else\n"
-       "lexicographical.  Pattern matches return the string matched between \n"
-       "\\( and \\) or null; if \\( and \\) are not used, they return the number \n"
-       "of characters matched or 0.\n"
+	"expr EXPRESSION"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+"\n\nPrints the value of EXPRESSION to standard output.\n\n"
+"EXPRESSION may be:\n"
+"ARG1 |  ARG2	ARG1 if it is neither null nor 0, otherwise ARG2\n"
+"ARG1 &  ARG2	ARG1 if neither argument is null or 0, otherwise 0\n"
+"ARG1 <  ARG2	ARG1 is less than ARG2\n"
+"ARG1 <= ARG2	ARG1 is less than or equal to ARG2\n"
+"ARG1 =  ARG2	ARG1 is equal to ARG2\n"
+"ARG1 != ARG2	ARG1 is unequal to ARG2\n"
+"ARG1 >= ARG2	ARG1 is greater than or equal to ARG2\n"
+"ARG1 >  ARG2	ARG1 is greater than ARG2\n"
+"ARG1 +  ARG2	arithmetic sum of ARG1 and ARG2\n"
+"ARG1 -  ARG2	arithmetic difference of ARG1 and ARG2\n"
+"ARG1 *  ARG2	arithmetic product of ARG1 and ARG2\n"
+"ARG1 /  ARG2	arithmetic quotient of ARG1 divided by ARG2\n"
+"ARG1 %  ARG2	arithmetic remainder of ARG1 divided by ARG2\n"
+"STRING : REGEXP		    anchored pattern match of REGEXP in STRING\n"
+"match STRING REGEXP	    same as STRING : REGEXP\n"
+"substr STRING POS LENGTH    substring of STRING, POS counted from 1\n"
+"index STRING CHARS	    index in STRING where any CHARS is found, or 0\n"
+"length STRING		    length of STRING\n"
+"quote TOKEN		    interpret TOKEN as a string, even if it is a \n"
+"				keyword like `match' or an operator like `/'\n"
+"( EXPRESSION )		    value of EXPRESSION\n\n"
+"Beware that many operators need to be escaped or quoted for shells.\n"
+"Comparisons are arithmetic if both ARGs are numbers, else\n"
+"lexicographical.  Pattern matches return the string matched between \n"
+"\\( and \\) or null; if \\( and \\) are not used, they return the number \n"
+"of characters matched or 0."
 
 #endif
 	;
@@ -327,59 +327,59 @@ const char expr_usage[] =
 
 #if defined BB_TRUE_FALSE
 const char false_usage[] =
-	"false\n"
+	"false"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nReturn an exit code of FALSE (1).\n"
+	"\n\nReturn an exit code of FALSE (1)."
 #endif
 	;
 #endif
 
 #if defined BB_FDFLUSH
 const char fdflush_usage[] =
-	"fdflush DEVICE\n"
+	"fdflush DEVICE"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nForces floppy disk drive to detect disk change\n"
+	"\n\nForces floppy disk drive to detect disk change"
 #endif
 	;
 #endif
 
 #if defined BB_FIND
 const char find_usage[] =
-	"find [PATH...] [EXPRESSION]\n"
+	"find [PATH...] [EXPRESSION]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nSearch for files in a directory hierarchy.  The default PATH is\n"
+	"\n\nSearch for files in a directory hierarchy.  The default PATH is\n"
 	"the current directory; default EXPRESSION is '-print'\n\n"
 	"\nEXPRESSION may consist of:\n"
 	"\t-follow\t\tDereference symbolic links.\n"
 	"\t-name PATTERN\tFile name (leading directories removed) matches PATTERN.\n"
-	"\t-print\t\tprint the full file name followed by a newline to stdout.\n"
+	"\t-print\t\tprint the full file name followed by a newline to stdout."
 #endif
 	;
 #endif
 
 #if defined BB_FREE
 const char free_usage[] =
-	"free\n"
+	"free"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nDisplays the amount of free and used system memory\n"
+	"\n\nDisplays the amount of free and used system memory"
 #endif
 	;
 #endif
 
 #if defined BB_FREERAMDISK
 const char freeramdisk_usage[] =
-	"freeramdisk DEVICE\n"
+	"freeramdisk DEVICE"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nFrees all memory used by the specified ramdisk.\n"
+	"\n\nFrees all memory used by the specified ramdisk."
 #endif
 	;
 #endif
 
 #if defined BB_FSCK_MINIX
 const char fsck_minix_usage[] =
-	"Usage: fsck.minix [-larvsmf] /dev/name\n"
+	"Usage: fsck.minix [-larvsmf] /dev/name"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPerforms a consistency check for MINIX filesystems.\n\n"
+	"\n\nPerforms a consistency check for MINIX filesystems.\n\n"
 	"Options:\n"
 	"\t-l\tLists all filenames\n"
 	"\t-r\tPerform interactive repairs\n"
@@ -387,16 +387,16 @@ const char fsck_minix_usage[] =
 	"\t-v\tverbose\n"
 	"\t-s\tOutputs super-block information\n"
 	"\t-m\tActivates MINIX-like \"mode not cleared\" warnings\n"
-	"\t-f\tForce file system check.\n\n"
+	"\t-f\tForce file system check."
 #endif
 	;
 #endif
 
 #if defined BB_GETOPT
 const char getopt_usage[] =
-"getopt [OPTIONS]...\n"
+"getopt [OPTIONS]..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-"Parse command options\n"
+"\nParse command options\n"
 "  -a, --alternative            Allow long options starting with single -\n"
 "  -l, --longoptions=longopts   Long options to be recognized\n"
 "  -n, --name=progname          The name under which errors are reported\n"
@@ -405,16 +405,16 @@ const char getopt_usage[] =
 "  -Q, --quiet-output           No normal output\n"
 "  -s, --shell=shell            Set shell quoting conventions\n"
 "  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unqote                 Do not quote the output\n"
+"  -u, --unqote                 Do not quote the output"
 #endif
 ;
 #endif
 
 #if defined BB_GREP
 const char grep_usage[] =
-	"grep [-ihHnqvs] pattern [files...]\n"
+	"grep [-ihHnqvs] pattern [files...]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nSearch for PATTERN in each FILE or standard input.\n\n"
+	"\n\nSearch for PATTERN in each FILE or standard input.\n\n"
 	"Options:\n"
 	"\t-H\tprefix output lines with filename where match was found\n"
 	"\t-h\tsuppress the prefixing filename on output\n"
@@ -422,200 +422,198 @@ const char grep_usage[] =
 	"\t-n\tprint line number with output lines\n"
 	"\t-q\tbe quiet. Returns 0 if result was found, 1 otherwise\n"
 	"\t-v\tselect non-matching lines\n"
-	"\t-s\tsuppress file open/read error messages\n\n"
+	"\t-s\tsuppress file open/read error messages"
 #endif
 	;
 #endif
 
 #if defined BB_GUNZIP
 const char gunzip_usage[] =
-	"gunzip [OPTION]... FILE\n"
+	"gunzip [OPTION]... FILE"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nUncompress FILE (or standard input if FILE is '-').\n\n"
+	"\n\nUncompress FILE (or standard input if FILE is '-').\n\n"
 	"Options:\n"
 	"\t-c\tWrite output to standard output\n"
-	"\t-t\tTest compressed file integrity\n"
+	"\t-t\tTest compressed file integrity"
 #endif
 	;
 #endif
 
 #if defined BB_GZIP
 const char gzip_usage[] =
-	"gzip [OPTION]... FILE\n"
+	"gzip [OPTION]... FILE"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCompress FILE with maximum compression.\n"
+	"\n\nCompress FILE with maximum compression.\n"
 	"When FILE is '-', reads standard input.  Implies -c.\n\n"
 	"Options:\n"
 	"\t-c\tWrite output to standard output instead of FILE.gz\n"
-	"\t-d\tdecompress\n"
+	"\t-d\tdecompress"
 #endif
 	;
 #endif
 
 #if defined BB_HALT
 const char halt_usage[] =
-	"halt\n"
+	"halt"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nHalt the system.\n"
+	"\n\nHalt the system."
 #endif
 	;
 #endif
 
 #if defined BB_HEAD
 const char head_usage[] =
-	"head [OPTION] [FILE]...\n"
+	"head [OPTION] [FILE]..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint first 10 lines of each FILE to standard output.\n"
+	"\n\nPrint first 10 lines of each FILE to standard output.\n"
 	"With more than one FILE, precede each with a header giving the\n"
 	"file name. With no FILE, or when FILE is -, read standard input.\n\n"
 
-	"Options:\n" "\t-n NUM\t\tPrint first NUM lines instead of first 10\n"
+	"Options:\n" "\t-n NUM\t\tPrint first NUM lines instead of first 10"
 #endif
 	;
 #endif
 
 #if defined BB_HOSTID
 const char hostid_usage[] =
-	"hostid\n"
+	"hostid"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint out a unique 32-bit identifier for the machine.\n"
+	"\n\nPrint out a unique 32-bit identifier for the machine."
 #endif
 	;
 #endif
 
 #if defined BB_HOSTNAME
 const char hostname_usage[] =
-	"hostname [OPTION] {hostname | -F file}\n"
+	"hostname [OPTION] {hostname | -F file}"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nGet or set the hostname or DNS domain name. If a hostname is given\n"
+	"\n\nGet or set the hostname or DNS domain name. If a hostname is given\n"
 	"(or a file with the -F parameter), the host name will be set.\n\n"
+
 	"Options:\n"
 	"\t-s\t\tShort\n"
-
 	"\t-i\t\tAddresses for the hostname\n"
 	"\t-d\t\tDNS domain name\n"
-	"\t-F, --file FILE\tUse the contents of FILE to specify the hostname\n"
+	"\t-F, --file FILE\tUse the contents of FILE to specify the hostname"
 #endif
 	;
 #endif
 
 #if defined BB_ID
 const char id_usage[] =
-	"id [OPTIONS]... [USERNAME]\n"
+	"id [OPTIONS]... [USERNAME]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint information for USERNAME or the current user\n\n"
+	"\n\nPrint information for USERNAME or the current user\n\n"
 	"Options:\n"
 	"\t-g\tprints only the group ID\n"
 	"\t-u\tprints only the user ID\n"
-	"\t-r\tprints the real user ID instead of the effective ID (with -ug)\n\n"
+	"\t-r\tprints the real user ID instead of the effective ID (with -ug)"
 #endif
 	;
 #endif
 
 #if defined BB_INSMOD
 const char insmod_usage[] =
-	"insmod [OPTION]... MODULE [symbol=value]...\n"
+	"insmod [OPTION]... MODULE [symbol=value]..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nLoads the specified kernel modules into the kernel.\n\n"
+	"\n\nLoads the specified kernel modules into the kernel.\n\n"
 	"Options:\n"
 	"\t-f\tForce module to load into the wrong kernel version.\n"
 	"\t-k\tMake module autoclean-able.\n"
-	"\t-v\tverbose output\n" "\t-x\tdo not export externs\n"
+	"\t-v\tverbose output\n" "\t-x\tdo not export externs"
 #endif
 	;
 #endif
 
 #if defined BB_KILL
 const char kill_usage[] =
-	"kill [-signal] process-id [process-id ...]\n"
+	"kill [-signal] process-id [process-id ...]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nSend a signal (default is SIGTERM) to the specified process(es).\n\n"
-	"Options:\n" "\t-l\tList all signal names and numbers.\n\n"
+	"\n\nSend a signal (default is SIGTERM) to the specified process(es).\n\n"
+	"Options:\n" "\t-l\tList all signal names and numbers."
 #endif
 	;
 #endif
 
 #if defined BB_KILLALL
 const char killall_usage[] =
-	"killall [-signal] process-name [process-name ...]\n"
+	"killall [-signal] process-name [process-name ...]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nSend a signal (default is SIGTERM) to the specified process(es).\n\n"
-	"Options:\n" "\t-l\tList all signal names and numbers.\n\n"
+	"\n\nSend a signal (default is SIGTERM) to the specified process(es).\n\n"
+	"Options:\n" "\t-l\tList all signal names and numbers."
 #endif
 	;
 #endif
 
 #if defined BB_LENGTH
 const char length_usage[] =
-	"length STRING\n"
+	"length STRING"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrints out the length of the specified STRING.\n"
+	"\n\nPrints out the length of the specified STRING."
 #endif
 	;
 #endif
 
 #if defined BB_LN
 const char ln_usage[] =
-	"ln [OPTION] TARGET... LINK_NAME|DIRECTORY\n"
+	"ln [OPTION] TARGET... LINK_NAME|DIRECTORY"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCreate a link named LINK_NAME or DIRECTORY to the specified TARGET\n"
+	"\n\nCreate a link named LINK_NAME or DIRECTORY to the specified TARGET\n"
 	"\nYou may use '--' to indicate that all following arguments are non-options.\n\n"
 	"Options:\n"
 	"\t-s\tmake symbolic links instead of hard links\n"
-
 	"\t-f\tremove existing destination files\n"
-	"\t-n\tno dereference symlinks - treat like normal file\n"
+	"\t-n\tno dereference symlinks - treat like normal file"
 #endif
 	;
 #endif
 
 #if defined BB_LOADACM
 const char loadacm_usage[] =
-	"loadacm < mapfile\n"
+	"loadacm < mapfile"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nLoads an acm from standard input.\n"
+	"\n\nLoads an acm from standard input."
 #endif
 	;
 #endif
 
 #if defined BB_LOADFONT
 const char loadfont_usage[] =
-	"loadfont < font\n"
+	"loadfont < font"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"Loads a console font from standard input.\n"
+	"\n\nLoads a console font from standard input."
 #endif
 	;
 #endif
 
 #if defined BB_LOADKMAP
 const char loadkmap_usage[] =
-	"loadkmap < keymap\n"
+	"loadkmap < keymap"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nLoads a binary keyboard translation table from standard input.\n"
+	"\n\nLoads a binary keyboard translation table from standard input."
 #endif
 	;
 #endif
 
 #if defined BB_LOGGER
 const char logger_usage[] =
-	"logger [OPTION]... [MESSAGE]\n"
+	"logger [OPTION]... [MESSAGE]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nWrite MESSAGE to the system log.  If MESSAGE is omitted, log stdin.\n\n"
+	"\n\nWrite MESSAGE to the system log.  If MESSAGE is omitted, log stdin.\n\n"
 	"Options:\n"
 	"\t-s\tLog to stderr as well as the system log.\n"
 	"\t-t\tLog using the specified tag (defaults to user name).\n"
-
 	"\t-p\tEnter the message with the specified priority.\n"
-	"\t\tThis may be numerical or a ``facility.level'' pair.\n"
+	"\t\tThis may be numerical or a ``facility.level'' pair."
 #endif
 	;
 #endif
 
 #if defined BB_LOGNAME
 const char logname_usage[] =
-	"logname\n"
+	"logname"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint the name of the current user.\n"
+	"\n\nPrint the name of the current user."
 #endif
 	;
 #endif
@@ -663,9 +661,9 @@ const char ls_usage[] =
 #ifdef BB_FEATURE_LS_SORTFILES
 	"X"
 #endif
-	"] [filenames...]\n"
+	"] [filenames...]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nList directory contents\n\n"
+	"\n\nList directory contents\n\n"
 	"Options:\n"
 	"\t-1\tlist files in a single column\n"
 	"\t-A\tdo not list implied . and ..\n"
@@ -689,7 +687,7 @@ const char ls_usage[] =
 	"\t-p\tappend indicator (one of /=@|) to entries\n"
 #endif
 #ifdef BB_FEATURE_LS_FOLLOWLINKS
-    "\t-L\tlist entries pointed to by symbolic links\n"
+	"\t-L\tlist entries pointed to by symbolic links\n"
 #endif
 #ifdef BB_FEATURE_LS_RECURSIVE
 	"\t-R\tlist subdirectories recursively\n"
@@ -724,18 +722,18 @@ const char ls_usage[] =
 
 #if defined BB_LSMOD
 const char lsmod_usage[] =
-	"lsmod\n"
+	"lsmod"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nList the currently loaded kernel modules.\n"
+	"\n\nList the currently loaded kernel modules."
 #endif
 	;
 #endif
 
 #if defined BB_MAKEDEVS
 const char makedevs_usage[] =
-	"makedevs NAME TYPE MAJOR MINOR FIRST LAST [s]\n"
+	"makedevs NAME TYPE MAJOR MINOR FIRST LAST [s]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCreates a range of block or character special files\n\n"
+	"\n\nCreates a range of block or character special files\n\n"
 	"TYPEs include:\n"
 	"\tb:\tMake a block (buffered) device.\n"
 	"\tc or u:\tMake a character (un-buffered) device.\n"
@@ -745,7 +743,7 @@ const char makedevs_usage[] =
 	"If 's' is the last argument, the base device is created as well.\n\n"
 	"For example:\n"
 	"\tmakedevs /dev/ttyS c 4 66 2 63   ->  ttyS2-ttyS63\n"
-	"\tmakedevs /dev/hda b 3 0 0 8 s    ->  hda,hda1-hda8\n"
+	"\tmakedevs /dev/hda b 3 0 0 8 s    ->  hda,hda1-hda8"
 #endif
 	;
 #endif
@@ -753,9 +751,9 @@ const char makedevs_usage[] =
 #if defined BB_MD5SUM
 const char md5sum_usage[] =
 	"md5sum [OPTION] [FILE]...\n"
-	"or:    md5sum [OPTION] -c [FILE]\n"
+	"or:    md5sum [OPTION] -c [FILE]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint or check MD5 checksums.\n\n"
+	"\n\nPrint or check MD5 checksums.\n\n"
 	"Options:\n"
 	"With no FILE, or when FILE is -, read standard input.\n\n"
 	"\t-b\tread files in binary mode\n"
@@ -764,103 +762,102 @@ const char md5sum_usage[] =
 	"\t-g\tread a string\n"
 	"\nThe following two options are useful only when verifying checksums:\n"
 	"\t-s,\tdon't output anything, status code shows success\n"
-	"\t-w,\twarn about improperly formated MD5 checksum lines\n"
+	"\t-w,\twarn about improperly formated MD5 checksum lines"
 #endif
 	;
 #endif
 
 #if defined BB_MKDIR
 const char mkdir_usage[] =
-	"mkdir [OPTION] DIRECTORY...\n"
+	"mkdir [OPTION] DIRECTORY..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCreate the DIRECTORY(ies), if they do not already exist\n\n"
+	"\n\nCreate the DIRECTORY(ies), if they do not already exist\n\n"
+	
 	"Options:\n"
-
 	"\t-m\tset permission mode (as in chmod), not rwxrwxrwx - umask\n"
-	"\t-p\tno error if existing, make parent directories as needed\n"
+	"\t-p\tno error if existing, make parent directories as needed"
 #endif
 	;
 #endif
 
 #if defined BB_MKFIFO
 const char mkfifo_usage[] =
-	"mkfifo [OPTIONS] name\n"
+	"mkfifo [OPTIONS] name"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCreates a named pipe (identical to 'mknod name p')\n\n"
+	"\n\nCreates a named pipe (identical to 'mknod name p')\n\n"
 	"Options:\n"
-	"\t-m\tcreate the pipe using the specified mode (default a=rw)\n"
+	"\t-m\tcreate the pipe using the specified mode (default a=rw)"
 #endif
 	;
 #endif
 
 #if defined BB_MKFS_MINIX
 const char mkfs_minix_usage[] =
-	"mkfs.minix [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
+	"mkfs.minix [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nMake a MINIX filesystem.\n\n"
+	"\n\nMake a MINIX filesystem.\n\n"
 	"Options:\n"
 	"\t-c\t\tCheck the device for bad blocks\n"
 	"\t-n [14|30]\tSpecify the maximum length of filenames\n"
 	"\t-i INODES\tSpecify the number of inodes for the filesystem\n"
 	"\t-l FILENAME\tRead the bad blocks list from FILENAME\n"
-	"\t-v\t\tMake a Minix version 2 filesystem\n\n"
+	"\t-v\t\tMake a Minix version 2 filesystem"
 #endif
 	;
 #endif
 
 #if defined BB_MKNOD
 const char mknod_usage[] =
-	"mknod [OPTIONS] NAME TYPE MAJOR MINOR\n"
+	"mknod [OPTIONS] NAME TYPE MAJOR MINOR"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCreate a special file (block, character, or pipe).\n\n"
+	"\n\nCreate a special file (block, character, or pipe).\n\n"
 	"Options:\n"
 	"\t-m\tcreate the special file using the specified mode (default a=rw)\n\n"
 	"TYPEs include:\n"
 	"\tb:\tMake a block (buffered) device.\n"
 	"\tc or u:\tMake a character (un-buffered) device.\n"
-	"\tp:\tMake a named pipe. MAJOR and MINOR are ignored for named pipes.\n"
+	"\tp:\tMake a named pipe. MAJOR and MINOR are ignored for named pipes."
 #endif
 	;
 #endif
 
 #if defined BB_MKSWAP
 const char mkswap_usage[] =
-	"mkswap [-c] [-v0|-v1] device [block-count]\n"
+	"mkswap [-c] [-v0|-v1] device [block-count]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrepare a disk partition to be used as a swap partition.\n\n"
+	"\n\nPrepare a disk partition to be used as a swap partition.\n\n"
 	"Options:\n" "\t-c\t\tCheck for read-ability.\n"
 	"\t-v0\t\tMake version 0 swap [max 128 Megs].\n"
 	"\t-v1\t\tMake version 1 swap [big!] (default for kernels > 2.1.117).\n"
-
-	"\tblock-count\tNumber of block to use (default is entire partition).\n"
+	"\tblock-count\tNumber of block to use (default is entire partition)."
 #endif
 	;
 #endif
 
 #if defined BB_MKTEMP
 const char mktemp_usage[] =
-	"mktemp [-q] TEMPLATE\n"
+	"mktemp [-q] TEMPLATE"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCreates a temporary file with its name based on TEMPLATE.\n"
-	"TEMPLATE is any name with six `Xs' (i.e. /tmp/temp.XXXXXX).\n"
+	"\n\nCreates a temporary file with its name based on TEMPLATE.\n"
+	"TEMPLATE is any name with six `Xs' (i.e. /tmp/temp.XXXXXX)."
 #endif
 	;
 #endif
 
 #if defined BB_MORE
 const char more_usage[] =
-	"more [FILE ...]\n"
+	"more [FILE ...]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nMore is a filter for viewing FILE one screenful at a time.\n"
+	"\n\nMore is a filter for viewing FILE one screenful at a time."
 #endif
 	;
 #endif
 
 #if defined BB_MOUNT
 const char mount_usage[] = 
-	"mount [flags] device directory [-o options,more-options]\n"
+	"mount [flags] device directory [-o options,more-options]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nMount a filesystem\n\n"
+	"\n\nMount a filesystem\n\n"
 	"Flags:\n" 
 	"\t-a:\t\tMount all filesystems in fstab.\n"
 #ifdef BB_MTAB
@@ -884,21 +881,21 @@ const char mount_usage[] =
 	"\tremount:\tRe-mount a currently-mounted filesystem, changing its flags.\n"
 	"\tro/rw:\t\tMount for read-only / read-write.\n"
 	"\nThere are EVEN MORE flags that are specific to each filesystem.\n"
-	"You'll have to see the written documentation for those.\n"
+	"You'll have to see the written documentation for those."
 #endif
 	;
 #endif
 
 #if defined BB_MT
 const char mt_usage[] =
-	"mt [-f device] opcode value\n"
+	"mt [-f device] opcode value"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nControl magnetic tape drive operation\n"
+	"\n\nControl magnetic tape drive operation\n"
 	"\nAvailable Opcodes:\n\n"
 	"bsf bsfm bsr bss datacompression drvbuffer eof eom erase\n"
 	"fsf fsfm fsr fss load lock mkpart nop offline ras1 ras2\n"
 	"ras3 reset retension rew rewoffline seek setblk setdensity\n"
-	"setpart tell unload unlock weof wset\n"
+	"setpart tell unload unlock weof wset"
 #endif
 	;
 #endif
@@ -906,27 +903,27 @@ const char mt_usage[] =
 #if defined BB_CP_MV
 const char mv_usage[] =
 	"mv SOURCE DEST\n"
-	"   or: mv SOURCE... DIRECTORY\n"
+	"   or: mv SOURCE... DIRECTORY"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nRename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n"
+	"\n\nRename SOURCE to DEST, or move SOURCE(s) to DIRECTORY."
 #endif
 	;
 #endif
 
 #if defined BB_NC
 const char nc_usage[] =
-	"nc [IP] [port]\n" 
+	"nc [IP] [port]" 
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nNetcat opens a pipe to IP:port\n"
+	"\n\nNetcat opens a pipe to IP:port"
 #endif
 	;
 #endif
 
 #if defined BB_NSLOOKUP
 const char nslookup_usage[] =
-	"nslookup [HOST]\n"
+	"nslookup [HOST]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nQueries the nameserver for the IP address of the given HOST\n"
+	"\n\nQueries the nameserver for the IP address of the given HOST"
 #endif
 ;
 #endif
@@ -934,21 +931,21 @@ const char nslookup_usage[] =
 #if defined BB_PING
 #if defined BB_FEATURE_SIMPLE_PING
 const char ping_usage[] =
-	"ping host\n"
+	"ping host"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nSend ICMP ECHO_REQUEST packets to network hosts\n"
+	"\n\nSend ICMP ECHO_REQUEST packets to network hosts"
 #endif
 	;
 #else /* ! defined BB_FEATURE_SIMPLE_PING */
 const char ping_usage[] =
-	"ping [OPTION]... host\n"
+	"ping [OPTION]... host"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nSend ICMP ECHO_REQUEST packets to network hosts.\n\n"
+	"\n\nSend ICMP ECHO_REQUEST packets to network hosts.\n\n"
 	"Options:\n"
 	"\t-c COUNT\tSend only COUNT pings.\n"
 	"\t-s SIZE\t\tSend SIZE data bytes in packets (default=56).\n"
 	"\t-q\t\tQuiet mode, only displays output at start\n"
-	"\t\t\tand when finished.\n"
+	"\t\t\tand when finished."
 #endif
 	;
 #endif
@@ -956,79 +953,79 @@ const char ping_usage[] =
 
 #if defined BB_POWEROFF
 const char poweroff_usage[] =
-	"poweroff\n"
+	"poweroff"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nHalt the system and request that the kernel shut off the power.\n"
+	"\n\nHalt the system and request that the kernel shut off the power."
 #endif
 	;
 #endif
 
 #if defined BB_PRINTF
 const char printf_usage[] =
-	"printf FORMAT [ARGUMENT...]\n"
+	"printf FORMAT [ARGUMENT...]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nFormats and prints ARGUMENT(s) according to FORMAT,\n"
-	"Where FORMAT controls the output exactly as in C printf.\n"
+	"\n\nFormats and prints ARGUMENT(s) according to FORMAT,\n"
+	"Where FORMAT controls the output exactly as in C printf."
 #endif
 	;
 #endif
 
 #if defined BB_PS
 const char ps_usage[] =
-	"ps\n"
+	"ps"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nReport process status\n"
-	"\nThis version of ps accepts no options.\n"
+	"\n\nReport process status\n"
+	"\nThis version of ps accepts no options."
 #endif
 	;
 #endif
 
 #if defined BB_PWD
 const char pwd_usage[] =
-	"pwd\n"
+	"pwd"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint the full filename of the current working directory.\n"
+	"\n\nPrint the full filename of the current working directory."
 #endif
 	;
 #endif
 
 #if defined BB_RDATE
 const char rdate_usage[] =
-	"rdate [OPTION] HOST\n"
+	"rdate [OPTION] HOST"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nGet and possibly set the system date and time from a remote HOST.\n"
+	"\n\nGet and possibly set the system date and time from a remote HOST.\n"
 	"Options:\n"
 	"\t-s\tSet the system date and time (default).\n"
-	"\t-p\tPrint the date and time.\n"
+	"\t-p\tPrint the date and time."
 #endif
 	;
 #endif
 
 #if defined BB_READLINK
 const char readlink_usage[] =
-	"readlink\n"
+	"readlink"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nRead a symbolic link.\n"
+	"\n\nRead a symbolic link."
 #endif
 	;
 #endif
 
 #if defined BB_REBOOT
 const char reboot_usage[] =
-	"reboot\n"
+	"reboot"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nReboot the system.\n"
+	"\n\nReboot the system."
 #endif
 	;
 #endif
 	
 #if defined BB_RENICE
 const char renice_usage[] =
-	"renice priority pid [pid ...]\n"
+	"renice priority pid [pid ...]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nChanges priority of running processes. Allowed priorities range\n"
+	"\n\nChanges priority of running processes. Allowed priorities range\n"
 	"from 20 (the process runs only when nothing else is running) to 0\n"
-	"(default priority) to -20 (almost nothing else ever gets to run).\n"
+	"(default priority) to -20 (almost nothing else ever gets to run)."
 #endif
 	;
 #endif
@@ -1036,60 +1033,60 @@ const char renice_usage[] =
 
 #if defined BB_RESET
 const char reset_usage[] =
-	"reset\n"
+	"reset"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nResets the screen.\n"
+	"\n\nResets the screen."
 #endif
 	;
 #endif
 
 #if defined BB_RM
 const char rm_usage[] =
-	"rm [OPTION]... FILE...\n"
+	"rm [OPTION]... FILE..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nRemove (unlink) the FILE(s).  You may use '--' to\n"
+	"\n\nRemove (unlink) the FILE(s).  You may use '--' to\n"
 	"indicate that all following arguments are non-options.\n\n"
 	"Options:\n"
 	"\t-f\t\tremove existing destinations, never prompt\n"
-	"\t-r or -R\tremove the contents of directories recursively\n"
+	"\t-r or -R\tremove the contents of directories recursively"
 #endif
 	;
 #endif
 
 #if defined BB_RMDIR
 const char rmdir_usage[] =
-	"rmdir [OPTION]... DIRECTORY...\n"
+	"rmdir [OPTION]... DIRECTORY..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nRemove the DIRECTORY(ies), if they are empty.\n"
+	"\n\nRemove the DIRECTORY(ies), if they are empty."
 #endif
 	;
 #endif
 
 #if defined BB_RMMOD
 const char rmmod_usage[] =
-	"rmmod [OPTION]... [MODULE]...\n"
+	"rmmod [OPTION]... [MODULE]..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nUnloads the specified kernel modules from the kernel.\n\n"
+	"\n\nUnloads the specified kernel modules from the kernel.\n\n"
 	"Options:\n" 
-	"\t-a\tTry to remove all unused kernel modules.\n"
+	"\t-a\tTry to remove all unused kernel modules."
 #endif
 	;
 #endif
 
 #if defined BB_RPMUNPACK
 const char rpmunpack_usage[] =
-	"rpmunpack < package.rpm | gunzip | cpio -idmuv\n"
+	"rpmunpack < package.rpm | gunzip | cpio -idmuv"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nExtracts an rpm archive.\n"
+	"\n\nExtracts an rpm archive."
 #endif
 	;
 #endif
 
 #if defined BB_SED
 const char sed_usage[] =
-	"sed [-Vhnef] pattern [files...]\n"
+	"sed [-Vhnef] pattern [files...]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\n"
+	"\n\n"
 	"-n\t\tsuppress automatic printing of pattern space\n"
 	"-e script\tadd the script to the commands to be executed\n"
 	"-f scriptfile\tadd the contents of script-file to the commands to be executed\n"
@@ -1097,19 +1094,19 @@ const char sed_usage[] =
 	"\n"
 	"If no -e or -f is given, the first non-option argument is taken as the\n"
 	"sed script to interpret. All remaining arguments are names of input\n"
-	"files; if no input files are specified, then the standard input is read.\n"
+	"files; if no input files are specified, then the standard input is read."
 #endif
 	;
 #endif
 
 #if defined BB_SETKEYCODES
 const char setkeycodes_usage[] =
-	"setkeycodes SCANCODE KEYCODE ...\n"
+	"setkeycodes SCANCODE KEYCODE ..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nSet entries into the kernel's scancode-to-keycode map,\n"
+	"\n\nSet 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\n"
+	"and KEYCODE is given in decimal"
 #endif
 	;
 #endif
@@ -1117,18 +1114,18 @@ const char setkeycodes_usage[] =
 #if defined BB_SH
 const char shell_usage[] =
 	"sh [FILE]...\n"
-	"   or: sh -c command [args]...\n"
+	"   or: sh -c command [args]..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nlash: The BusyBox command interpreter (shell).\n\n"
+	"\n\nlash: The BusyBox command interpreter (shell)."
 #endif
 	;
 #endif
 
 #if defined BB_SLEEP
 const char sleep_usage[] =
-	"sleep N\n" 
+	"sleep N" 
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPause for N seconds.\n"
+	"\n\nPause for N seconds."
 #endif
 	;
 #endif
@@ -1139,49 +1136,49 @@ const char sort_usage[] =
 #ifdef BB_FEATURE_SORT_REVERSE
 	" [-r]"
 #endif
-	" [FILE]...\n"
+	" [FILE]..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nSorts lines of text in the specified files\n"
+	"\n\nSorts lines of text in the specified files"
 #endif
 	;
 #endif
 
 #if defined BB_SWAPONOFF
 const char swapoff_usage[] =
-	"swapoff [OPTION] [device]\n"
+	"swapoff [OPTION] [device]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nStop swapping virtual memory pages on the given device.\n\n"
+	"\n\nStop swapping virtual memory pages on the given device.\n\n"
 	"Options:\n"
-	"\t-a\tStop swapping on all swap devices\n"
+	"\t-a\tStop swapping on all swap devices"
 #endif
 	;
 #endif
 
 #if defined BB_SWAPONOFF
 const char swapon_usage[] =
-	"swapon [OPTION] [device]\n"
+	"swapon [OPTION] [device]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nStart swapping virtual memory pages on the given device.\n\n"
+	"\n\nStart swapping virtual memory pages on the given device.\n\n"
 	"Options:\n"
-	"\t-a\tStart swapping on all swap devices\n"
+	"\t-a\tStart swapping on all swap devices"
 #endif
 	;
 #endif
 
 #if defined BB_SYNC
 const char sync_usage[] =
-	"sync\n"
+	"sync"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nWrite all buffered filesystem blocks to disk.\n"
+	"\n\nWrite all buffered filesystem blocks to disk."
 #endif
 	;
 #endif
 
 #if defined BB_SYSLOGD
 const char syslogd_usage[] =
-	"syslogd [OPTION]...\n"
+	"syslogd [OPTION]..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nLinux system and kernel (provides klogd) logging utility.\n"
+	"\n\nLinux system and kernel (provides klogd) logging utility.\n"
 	"Note that this version of syslogd/klogd ignores /etc/syslog.conf.\n\n"
 	"Options:\n"
 	"\t-m NUM\t\tInterval between MARK lines (default=20min, 0=off)\n"
@@ -1189,10 +1186,10 @@ const char syslogd_usage[] =
 #ifdef BB_FEATURE_KLOGD
 	"\t-K\t\tDo not start up the klogd process\n"
 #endif
-	"\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n"
+	"\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)"
 #ifdef BB_FEATURE_REMOTE_LOG
-	"\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n"
-	"\t-L\t\tLog locally as well as network logging (default is network only)\n"
+	"\n\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n"
+	"\t-L\t\tLog locally as well as network logging (default is network only)"
 #endif
 #endif
 	;
@@ -1200,9 +1197,9 @@ const char syslogd_usage[] =
 
 #if defined BB_TAIL
 const char tail_usage[] =
-	"tail [OPTION]... [FILE]...\n"
+	"tail [OPTION]... [FILE]..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint last 10 lines of each FILE to standard output.\n"
+	"\n\nPrint last 10 lines of each FILE to standard output.\n"
 	"With more than one FILE, precede each with a header giving the\n"
 	"file name. With no FILE, or when FILE is -, read standard input.\n\n"
 	"Options:\n"
@@ -1210,17 +1207,17 @@ const char tail_usage[] =
 	"\t-c N[kbm]\toutput the last N bytes\n"
 #endif
 	"\t-n N[kbm]\tprint last N lines instead of last 10\n"
-	"\t-f\t\toutput data as the file grows\n"
+	"\t-f\t\toutput data as the file grows"
 #ifndef BB_FEATURE_SIMPLE_TAIL
-	"\t-q\t\tnever output headers giving file names\n"
+	"\n\t-q\t\tnever output headers giving file names\n"
 	"\t-s SEC\t\twait SEC seconds between reads with -f\n"
 	"\t-v\t\talways output headers giving file names\n\n"
 	"If the first character of N (bytes or lines) is a `+', output begins with \n"
 	"the Nth item from the start of each file, otherwise, print the last N items\n"
-	"in the file. N bytes may be suffixed by k (x1024), b (x512), or m (1024^2).\n"
+	"in the file. N bytes may be suffixed by k (x1024), b (x512), or m (1024^2)."
 //#else
 //	"\nIf the first character of N (bytes or lines) is a `+', output begins with \n"
-//	"the Nth item from the start of each file.\n"
+//	"the Nth item from the start of each file."
 #endif
 #endif
 	;
@@ -1237,9 +1234,9 @@ const char tar_usage[] =
 	"[--exclude File] "
         "[-X File]"
 #endif
-	"[-f tarFile] [FILE(s)] ...\n"
+	"[-f tarFile] [FILE(s)] ..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCreate, extract, or list files from a tar file.\n\n"
+	"\n\nCreate, extract, or list files from a tar file.\n\n"
 	"Main operation mode:\n"
 #ifdef BB_FEATURE_TAR_CREATE
 	"\tc\t\tcreate\n"
@@ -1254,27 +1251,27 @@ const char tar_usage[] =
         "\tX\t\tfile with names to exclude\n"
 #endif
 	"\nInformative output:\n"
-	"\tv\t\tverbosely list files processed\n"
+	"\tv\t\tverbosely list files processed"
 #endif
 	;
 #endif
 
 #if defined BB_TEE
 const char tee_usage[] =
-	"tee [OPTION]... [FILE]...\n"
+	"tee [OPTION]... [FILE]..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nCopy standard input to each FILE, and also to standard output.\n\n"
-	"Options:\n" "\t-a\tappend to the given FILEs, do not overwrite\n"
+	"\n\nCopy standard input to each FILE, and also to standard output.\n\n"
+	"Options:\n" "\t-a\tappend to the given FILEs, do not overwrite"
 #endif
 	;
 #endif
 
 #if defined BB_TELNET
 const char telnet_usage[] =
-	"telnet host [port]\n"
+	"telnet host [port]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nTelnet is used to establish interactive communication with another\n"
-	"computer over a network using the TELNET protocol.\n"
+	"\n\nTelnet is used to establish interactive communication with another\n"
+	"computer over a network using the TELNET protocol."
 #endif
 	;
 #endif
@@ -1282,76 +1279,76 @@ const char telnet_usage[] =
 #if defined BB_TEST
 const char test_usage[] =
 	"test EXPRESSION\n"
-	"or   [ EXPRESSION ]\n"
+	"or   [ EXPRESSION ]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nChecks file types and compares values returning an exit\n"
-	"code determined by the value of EXPRESSION.\n"
+	"\n\nChecks file types and compares values returning an exit\n"
+	"code determined by the value of EXPRESSION."
 #endif
 	;
 #endif
 
 #if defined BB_TOUCH
 const char touch_usage[] =
-	"touch [-c] file [file ...]\n"
+	"touch [-c] file [file ...]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nUpdate the last-modified date on the given file[s].\n\n"
+	"\n\nUpdate the last-modified date on the given file[s].\n\n"
 	"Options:\n"
-	"\t-c\tDo not create any files\n"
+	"\t-c\tDo not create any files"
 #endif
 	;
 #endif
 
 #if defined BB_TR
 const char tr_usage[] =
-	"tr [-cds] STRING1 [STRING2]\n"
+	"tr [-cds] STRING1 [STRING2]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nTranslate, squeeze, and/or delete characters from\n"
+	"\n\nTranslate, squeeze, and/or delete characters from\n"
 	"standard input, writing to standard output.\n\n"
 	"Options:\n"
 	"\t-c\ttake complement of STRING1\n"
 	"\t-d\tdelete input characters coded STRING1\n"
-	"\t-s\tsqueeze multiple output characters of STRING2 into one character\n"
+	"\t-s\tsqueeze multiple output characters of STRING2 into one character"
 #endif
 	;
 #endif
 
 #if defined BB_TRUE_FALSE
 const char true_usage[] =
-	"true\n"
+	"true"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nReturn an exit code of TRUE (0).\n"
+	"\n\nReturn an exit code of TRUE (0)."
 #endif
 	;
 #endif
 
 #if defined BB_TTY
 const char tty_usage[] =
-	"tty\n"
+	"tty"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint the file name of the terminal connected to standard input.\n\n"
+	"\n\nPrint the file name of the terminal connected to standard input.\n\n"
 	"Options:\n"
-	"\t-s\tprint nothing, only return an exit status\n"
+	"\t-s\tprint nothing, only return an exit status"
 #endif
 	;
 #endif
 
 #if defined BB_UMOUNT
 const char umount_usage[] =
-	"umount [flags] filesystem|directory\n"
+	"umount [flags] filesystem|directory"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"Unmount file systems\n"
+	"\nUnmount file systems\n"
 	"\nFlags:\n" "\t-a:\tUnmount all file systems"
 #ifdef BB_MTAB
 	" in /etc/mtab\n\t-n:\tDon't erase /etc/mtab entries\n"
 #else
 	"\n"
 #endif
-	"\t-r:\tTry to remount devices as read-only if mount is busy\n"
+	"\t-r:\tTry to remount devices as read-only if mount is busy"
 #if defined BB_FEATURE_MOUNT_FORCE
-	"\t-f:\tForce filesystem umount (i.e. unreachable NFS server)\n"
+	"\n\t-f:\tForce filesystem umount (i.e. unreachable NFS server)"
 #endif
 #if defined BB_FEATURE_MOUNT_LOOP
-	"\t-l:\tDo not free loop device (if a loop device has been used)\n"
+	"\n\t-l:\tDo not free loop device (if a loop device has been used)"
 #endif
 #endif
 	;
@@ -1359,9 +1356,9 @@ const char umount_usage[] =
 
 #if defined BB_UNAME
 const char uname_usage[] =
-	"uname [OPTION]...\n"
+	"uname [OPTION]..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint certain system information.  With no OPTION, same as -s.\n\n"
+	"\n\nPrint certain system information.  With no OPTION, same as -s.\n\n"
 	"Options:\n"
 	"\t-a\tprint all information\n"
 	"\t-m\tthe machine (hardware) type\n"
@@ -1370,145 +1367,145 @@ const char uname_usage[] =
 	"\t-s\tprint the operating system name\n"
 
 	"\t-p\tprint the host processor type\n"
-	"\t-v\tprint the operating system version\n"
+	"\t-v\tprint the operating system version"
 #endif
 	;
 #endif
 
 #if defined BB_UNIQ
 const char uniq_usage[] =
-	"uniq [OPTION]... [INPUT [OUTPUT]]\n"
+	"uniq [OPTION]... [INPUT [OUTPUT]]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nDiscard all but one of successive identical lines from INPUT\n"
+	"\n\nDiscard all but one of successive identical lines from INPUT\n"
 	"(or standard input), writing to OUTPUT (or standard output).\n"
 	"Options:\n"
 	"\t-c\tprefix lines by the number of occurrences\n"
 	"\t-d\tonly print duplicate lines\n"
-	"\t-u\tonly print unique lines\n"
+	"\t-u\tonly print unique lines"
 #endif
 	;
 #endif
 
 #if defined BB_UNIX2DOS
 const char unix2dos_usage[] =
-	"unix2dos < unixfile > dosfile\n"
+	"unix2dos < unixfile > dosfile"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nConverts a text file from unix format to dos format.\n"
+	"\n\nConverts a text file from unix format to dos format."
 #endif
 	;
 #endif
 
 #if defined BB_UPDATE
 const char update_usage[] =
-	"update [options]\n"
+	"update [options]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPeriodically flushes filesystem buffers.\n\n"
+	"\n\nPeriodically flushes filesystem buffers.\n\n"
 	"Options:\n"
 	"\t-S\tforce use of sync(2) instead of flushing\n"
 	"\t-s SECS\tcall sync this often (default 30)\n"
-	"\t-f SECS\tflush some buffers this often (default 5)\n"
+	"\t-f SECS\tflush some buffers this often (default 5)"
 #endif
 	;
 #endif
 
 #if defined BB_UPTIME
 const char uptime_usage[] =
-	"uptime\n"
+	"uptime"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nDisplay the time since the last boot.\n"
+	"\n\nDisplay the time since the last boot."
 #endif
 	;
 #endif
 
 #if defined BB_USLEEP
 const char usleep_usage[] =
-	"usleep N\n" 
+	"usleep N" 
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPause for N microseconds.\n"
+	"\n\nPause for N microseconds."
 #endif
 	;
 #endif
 
 #if defined BB_UUDECODE
 const char uudecode_usage[] =
-	"uudecode [FILE]...\n"
+	"uudecode [FILE]..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nUudecode a file that is uuencoded.\n\n"
+	"\n\nUudecode a file that is uuencoded.\n\n"
 	"Options:\n"
-	"\t-o FILE\tdirect output to FILE\n"
+	"\t-o FILE\tdirect output to FILE"
 #endif
 	;
 #endif
 
 #if defined BB_UUENCODE
 const char uuencode_usage[] =
-	"uuencode [OPTION] [INFILE] REMOTEFILE\n"
+	"uuencode [OPTION] [INFILE] REMOTEFILE"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nUuencode a file.\n\n"
+	"\n\nUuencode a file.\n\n"
 	"Options:\n"
-	"\t-m\tuse base64 encoding as of RFC1521\n"
+	"\t-m\tuse base64 encoding as of RFC1521"
 #endif
 	;
 #endif
 
 #if defined BB_WC
 const char wc_usage[] =
-	"wc [OPTION]... [FILE]...\n"
+	"wc [OPTION]... [FILE]..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrint line, word, and byte counts for each FILE, and a total line if\n"
+	"\n\nPrint line, word, and byte counts for each FILE, and a total line if\n"
 	"more than one FILE is specified.  With no FILE, read standard input.\n\n"
 	"Options:\n"
 	"\t-c\tprint the byte counts\n"
 	"\t-l\tprint the newline counts\n"
 
 	"\t-L\tprint the length of the longest line\n"
-	"\t-w\tprint the word counts\n"
+	"\t-w\tprint the word counts"
 #endif
 	;
 #endif
 
 #if defined BB_WGET
-const char wget_usage[] = "wget [-c] [-O file] url\n"
+const char wget_usage[] = "wget [-c] [-O file] url"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nwget retrieves files via HTTP\n\n"
+	"\n\nwget retrieves files via HTTP\n\n"
 	"Options:\n"
 	"\t-c\tcontinue retrieval of aborted transfers\n"
-	"\t-O\tsave to filename ('-' for stdout)\n"
+	"\t-O\tsave to filename ('-' for stdout)"
 #endif
 	;
 #endif
 
 #if defined BB_WHICH
 const char which_usage[] =
-	"which [COMMAND ...]\n"
+	"which [COMMAND ...]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nLocates a COMMAND.\n"
+	"\n\nLocates a COMMAND."
 #endif
 	;
 #endif
 
 #if defined BB_WHOAMI
 const char whoami_usage[] =
-	"whoami\n"
+	"whoami"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nPrints the user name associated with the current effective user id.\n"
+	"\n\nPrints the user name associated with the current effective user id."
 #endif
 	;
 #endif
 
 #if defined BB_XARGS
-const char xargs_usage[] = "xargs [COMMAND] [ARGS...]\n"
+const char xargs_usage[] = "xargs [COMMAND] [ARGS...]"
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nExecutes COMMAND on every item given by standard input.\n" 
+	"\n\nExecutes COMMAND on every item given by standard input." 
 #endif
 	;
 #endif
 
 #if defined BB_YES
 const char yes_usage[] =
-	"yes [OPTION]... [STRING]...\n"
+	"yes [OPTION]... [STRING]..."
 #ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nRepeatedly outputs a line with all specified STRING(s), or `y'.\n"
+	"\n\nRepeatedly outputs a line with all specified STRING(s), or `y'."
 #endif
 	;
 #endif