*: more --help tweaks

function                                             old     new   delta
packed_usage                                       33552   33541     -11

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

10 files changed, 11 insertions, 11 deletions

diff --git a/archival/unzip.c b/archival/unzip.c
index fcdda6dfa..fc92ac661 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -56,7 +56,7 @@
 //kbuild:lib-$(CONFIG_UNZIP) += unzip.o
 
 //usage:#define unzip_trivial_usage
-//usage:       "[-lnojpq] FILE[.zip] [FILE]... [-x FILE...] [-d DIR]"
+//usage:       "[-lnojpq] FILE[.zip] [FILE]... [-x FILE]... [-d DIR]"
 //usage:#define unzip_full_usage "\n\n"
 //usage:       "Extract FILEs from ZIP archive\n"
 //usage:     "\n        -l      List contents (with -q for short form)"
diff --git a/coreutils/who.c b/coreutils/who.c
index be9c3ccca..3725d77f5 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -78,7 +78,7 @@
 // root     pts/1     Mon13    3:24m  1:01   0.01s w
 
 //usage:#define who_trivial_usage
-//usage:       "[-a]"
+//usage:       "[-aH]"
 //usage:#define who_full_usage "\n\n"
 //usage:       "Show who is logged on\n"
 //usage:     "\n        -a      Show all"
diff --git a/loginutils/su.c b/loginutils/su.c
index 784a53552..e1db7590f 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -35,7 +35,7 @@
 //kbuild:lib-$(CONFIG_SU) += su.o
 
 //usage:#define su_trivial_usage
-//usage:       "[-lmp] [-] [-s SH] [USER [SCRIPT ARGS / -c 'CMD' ARG0 ARGS]]"
+//usage:       "[-lmp] [-s SH] [-] [USER [FILE ARGS | -c 'CMD' [ARG0 ARGS]]]"
 //usage:#define su_full_usage "\n\n"
 //usage:       "Run shell under USER (by default, root)\n"
 //usage:     "\n        -,-l    Clear environment, go to home dir, run shell as login shell"
diff --git a/miscutils/bc.c b/miscutils/bc.c
index a5d8734b3..f9b08b01e 100644
--- a/miscutils/bc.c
+++ b/miscutils/bc.c
@@ -108,7 +108,7 @@
 
 //See www.gnu.org/software/bc/manual/bc.html
 //usage:#define bc_trivial_usage
-//usage:       "[-sqlw] [FILE...]"
+//usage:       "[-sqlw] [FILE]..."
 //usage:
 //usage:#define bc_full_usage "\n"
 //usage:     "\nArbitrary precision calculator"
diff --git a/miscutils/chat.c b/miscutils/chat.c
index 86a114df6..f9e12a4ac 100644
--- a/miscutils/chat.c
+++ b/miscutils/chat.c
@@ -79,7 +79,7 @@
 //kbuild:lib-$(CONFIG_CHAT) += chat.o
 
 //usage:#define chat_trivial_usage
-//usage:       "EXPECT [SEND [EXPECT [SEND...]]]"
+//usage:       "EXPECT [SEND [EXPECT [SEND]]...]"
 //usage:#define chat_full_usage "\n\n"
 //usage:       "Useful for interacting with a modem connected to stdin/stdout.\n"
 //usage:       "A script consists of \"expect-send\" argument pairs.\n"
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index 69ead7a13..6d49f61d9 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -251,7 +251,7 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
         } else
 
 //usage:#define ubirmvol_trivial_usage
-//usage:       "-n VOLID / -N VOLNAME UBI_DEVICE"
+//usage:       "-n VOLID | -N VOLNAME UBI_DEVICE"
 //usage:#define ubirmvol_full_usage "\n\n"
 //usage:       "Remove UBI volume\n"
 //usage:     "\n        -n VOLID        Volume ID"
diff --git a/procps/sysctl.c b/procps/sysctl.c
index e16b119e9..40afa0c90 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -21,16 +21,16 @@
 //kbuild:lib-$(CONFIG_BB_SYSCTL) += sysctl.o
 
 //usage:#define sysctl_trivial_usage
-//usage:       "-p [-enq] [FILE...] / [-enqaw] [KEY[=VALUE]]..."
+//usage:       "[-enq] { -a | -p [FILE]... | [-w] [KEY[=VALUE]]... }"
 //usage:#define sysctl_full_usage "\n\n"
 //usage:       "Show/set kernel parameters\n"
-//usage:     "\n        -p      Set values from FILEs (default /etc/sysctl.conf)"
 //usage:     "\n        -e      Don't warn about unknown keys"
 //usage:     "\n        -n      Don't show key names"
 //usage:     "\n        -q      Quiet"
 //usage:     "\n        -a      Show all values"
 /* Same as -a, no need to show it */
 /* //usage:     "\n     -A      Show all values in table form" */
+//usage:     "\n        -p      Set values from FILEs (default /etc/sysctl.conf)"
 //usage:     "\n        -w      Set values"
 //usage:
 //usage:#define sysctl_example_usage
diff --git a/shell/ash.c b/shell/ash.c
index 85d43ca6f..bee81920a 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -14398,7 +14398,7 @@ init(void)
 
 
 //usage:#define ash_trivial_usage
-//usage:        "[-il] [-|+Cabefmnuvx] [-|+o OPT]... [-c 'SCRIPT' [ARG0 [ARGS]] | FILE [ARGS] | -s [ARGS]]"
+//usage:        "[-il] [-|+Cabefmnuvx] [-|+o OPT]... [-c 'SCRIPT' [ARG0 ARGS] | FILE [ARGS] | -s [ARGS]]"
 ////////        comes from ^^^^^^^^^^optletters
 //usage:#define ash_full_usage "\n\n"
 //usage:        "Unix shell interpreter"
diff --git a/shell/hush.c b/shell/hush.c
index 4a049899b..741f93589 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -339,7 +339,7 @@
  * therefore we don't show them either.
  */
 //usage:#define hush_trivial_usage
-//usage:        "[-enxl] [-c 'SCRIPT' [ARG0 [ARGS]] | FILE [ARGS] | -s [ARGS]]"
+//usage:        "[-enxl] [-c 'SCRIPT' [ARG0 ARGS] | FILE [ARGS] | -s [ARGS]]"
 //usage:#define hush_full_usage "\n\n"
 //usage:        "Unix shell interpreter"
 
diff --git a/util-linux/renice.c b/util-linux/renice.c
index a318ffce0..fc72550f4 100644
--- a/util-linux/renice.c
+++ b/util-linux/renice.c
@@ -29,7 +29,7 @@
 //kbuild:lib-$(CONFIG_RENICE) += renice.o
 
 //usage:#define renice_trivial_usage
-//usage:       "[-n] PRIORITY [[-p | -g | -u] ID...]..."
+//usage:       "[-n] PRIORITY [[-p|g|u] ID...]..."
 //usage:#define renice_full_usage "\n\n"
 //usage:       "Change scheduling priority of a running process\n"
 //usage:     "\n        -n      Add PRIORITY to current nice value"