*: --help tweaks

function                                             old     new   delta
.rodata                                           103190  103189      -1
packed_usage                                       33590   33566     -24
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-25)             Total: -25 bytes

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

3 files changed, 11 insertions, 9 deletions

diff --git a/coreutils/env.c b/coreutils/env.c
index c37c0c2df..4715bf73a 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -39,12 +39,14 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/env.html */
 
 //usage:#define env_trivial_usage
-//usage:       "[-iu] [-] [name=value]... [PROG ARGS]"
+//usage:       "[-i] [-u NAME]... [-] [NAME=VALUE]... [PROG ARGS]"
+// The "-" can occur only once (unlike, say, -i): it terminates option processing,
+// so if it is followed by another "-" arg (or any option-looking arg),
+// that arg will be taken as PROG (or even as NAME=VALUE, example: "-z=QWE").
 //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:     "\n	-, -i	Start with an empty environment"
-//usage:     "\n	-u	Remove variable from the environment"
+//usage:       "Print current environment or run PROG after setting up environment\n"
+//usage:     "\n	-, -i	Start with empty environment"
+//usage:     "\n	-u NAME	Remove variable from environment"
 
 #include "libbb.h"
 
diff --git a/coreutils/expr.c b/coreutils/expr.c
index b247f08db..760b081f9 100644
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -45,7 +45,7 @@
 //usage:#define expr_trivial_usage
 //usage:       "EXPRESSION"
 //usage:#define expr_full_usage "\n\n"
-//usage:       "Print the value of EXPRESSION to stdout\n"
+//usage:       "Print the value of EXPRESSION\n"
 //usage:    "\n"
 //usage:       "EXPRESSION may be:\n"
 //usage:       "	ARG1 | ARG2	ARG1 if it is neither null nor 0, otherwise ARG2\n"
@@ -63,7 +63,7 @@
 //usage:       "	ARG1 % ARG2\n"
 //usage:       "	STRING : REGEXP		Anchored pattern match of REGEXP in STRING\n"
 //usage:       "	match STRING REGEXP	Same as STRING : REGEXP\n"
-//usage:       "	substr STRING POS LENGTH Substring of STRING, POS counted from 1\n"
+//usage:       "	substr STRING POS LEN	Substring of STRING, POS counts from 1\n"
 //usage:       "	index STRING CHARS	Index in STRING where any CHARS is found, or 0\n"
 //usage:       "	length STRING		Length of STRING\n"
 //usage:       "	quote TOKEN		Interpret TOKEN as a string, even if\n"
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 02b037276..bd7766ef7 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -183,7 +183,7 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
 //usage:#define base32_trivial_usage
 //usage:	"[-d] [-w COL] [FILE]"
 //usage:#define base32_full_usage "\n\n"
-//usage:       "Base32 encode or decode FILE to standard output"
+//usage:       "Base32 encode or decode FILE to standard output\n"
 //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"
@@ -191,7 +191,7 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
 //usage:#define base64_trivial_usage
 //usage:	"[-d] [-w COL] [FILE]"
 //usage:#define base64_full_usage "\n\n"
-//usage:       "Base64 encode or decode FILE to standard output"
+//usage:       "Base64 encode or decode FILE to standard output\n"
 //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"