make --help texts more uniform

function                                             old     new   delta
packed_usage                                       31062   31035     -27

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

10 files changed, 48 insertions, 48 deletions

diff --git a/coreutils/expand.c b/coreutils/expand.c
index 29affc932..63b682330 100644
--- a/coreutils/expand.c
+++ b/coreutils/expand.c
@@ -8,13 +8,13 @@
  * David MacKenzie <djm@gnu.ai.mit.edu>
  *
  * Options for expand:
- * -t num  --tabs=NUM      Convert tabs to num spaces (default 8 spaces).
+ * -t num  --tabs NUM      Convert tabs to num spaces (default 8 spaces).
  * -i      --initial       Only convert initial tabs on each line to spaces.
  *
  * Options for unexpand:
  * -a      --all           Convert all blanks, instead of just initial blanks.
  * -f      --first-only    Convert only leading sequences of blanks (default).
- * -t num  --tabs=NUM      Have tabs num characters apart instead of 8.
+ * -t num  --tabs NUM      Have tabs num characters apart instead of 8.
  *
  *  Busybox version (C) 2007 by Tito Ragusa <farmatito@tiscali.it>
  *
@@ -54,7 +54,7 @@
 //usage:       "Convert tabs to spaces, writing to stdout\n"
 //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"
+//usage:     "\n	-t,--tabs N	Tabstops every N chars"
 //usage:	)
 //usage:	IF_NOT_FEATURE_EXPAND_LONG_OPTIONS(
 //usage:     "\n	-i	Don't convert tabs after non blanks"
@@ -68,7 +68,7 @@
 //usage:	IF_FEATURE_UNEXPAND_LONG_OPTIONS(
 //usage:     "\n	-a,--all	Convert all blanks"
 //usage:     "\n	-f,--first-only	Convert only leading blanks"
-//usage:     "\n	-t,--tabs=N	Tabstops every N chars"
+//usage:     "\n	-t,--tabs N	Tabstops every N chars"
 //usage:	)
 //usage:	IF_NOT_FEATURE_UNEXPAND_LONG_OPTIONS(
 //usage:     "\n	-a	Convert all blanks"
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index c95cbb21e..dbe9043f4 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -37,7 +37,7 @@
 //usage:     "\n	-s ADDR	Start address"
 
 //usage:#define nanddump_trivial_usage
-//usage:	"[-no]" IF_LONG_OPTS(" [--bb=padbad|skipbad]") " [-s ADDR] [-l LEN] [-f FILE] MTD_DEVICE"
+//usage:	"[-no]" IF_LONG_OPTS(" [--bb padbad|skipbad]") " [-s ADDR] [-l LEN] [-f FILE] MTD_DEVICE"
 //usage:#define nanddump_full_usage "\n\n"
 //usage:	"Dump MTD_DEVICE\n"
 //usage:     "\n	-n	Read without ecc"
@@ -46,7 +46,7 @@
 //usage:     "\n	-l LEN	Length"
 //usage:     "\n	-f FILE	Dump to file ('-' for stdout)"
 //usage:     IF_LONG_OPTS(
-//usage:     "\n	--bb=METHOD:"
+//usage:     "\n	--bb METHOD"
 //usage:     "\n		skipbad: skip bad blocks"
 //usage:     "\n		padbad: substitute bad blocks by 0xff (default)"
 //usage:     )
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index d83344a8d..dce9084b3 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -11,7 +11,7 @@
 //usage:#define dumpleases_full_usage "\n\n"
 //usage:       "Display DHCP leases granted by udhcpd\n"
 //usage:	IF_LONG_OPTS(
-//usage:     "\n	-f,--file=FILE	Lease file"
+//usage:     "\n	-f,--file FILE	Lease file"
 //usage:     "\n	-r,--remaining	Show remaining time"
 //usage:     "\n	-a,--absolute	Show expiration time"
 //usage:     "\n	-d,--decimal	Show time in seconds"
diff --git a/selinux/chcon.c b/selinux/chcon.c
index 4a9a4d3d5..ba9b08638 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -36,11 +36,11 @@
 //usage:     "\n	-c,--changes		Report changes made"
 //usage:     "\n	-h,--no-dereference	Affect symlinks instead of their targets"
 //usage:     "\n	-f,--silent,--quiet	Suppress most error messages"
-//usage:     "\n	--reference=RFILE	Use RFILE's group instead of using a CONTEXT value"
-//usage:     "\n	-u,--user=USER		Set user/role/type/range in the target"
-//usage:     "\n	-r,--role=ROLE		security context"
-//usage:     "\n	-t,--type=TYPE"
-//usage:     "\n	-l,--range=RANGE"
+//usage:     "\n	--reference RFILE	Use RFILE's group instead of using a CONTEXT value"
+//usage:     "\n	-u,--user USER		Set user/role/type/range in the target"
+//usage:     "\n	-r,--role ROLE		security context"
+//usage:     "\n	-t,--type TYPE"
+//usage:     "\n	-l,--range RANGE"
 //usage:     "\n	-R,--recursive		Recurse"
 //usage:	)
 //usage:	IF_NOT_FEATURE_CHCON_LONG_OPTIONS(
diff --git a/selinux/runcon.c b/selinux/runcon.c
index a30e3552f..82f4d50d3 100644
--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@@ -52,10 +52,10 @@
 //usage:     "\n	CONTEXT		Complete security context\n"
 //usage:	IF_FEATURE_RUNCON_LONG_OPTIONS(
 //usage:     "\n	-c,--compute	Compute process transition context before modifying"
-//usage:     "\n	-t,--type=TYPE	Type (for same role as parent)"
-//usage:     "\n	-u,--user=USER	User identity"
-//usage:     "\n	-r,--role=ROLE	Role"
-//usage:     "\n	-l,--range=RNG	Levelrange"
+//usage:     "\n	-t,--type TYPE	Type (for same role as parent)"
+//usage:     "\n	-u,--user USER	User identity"
+//usage:     "\n	-r,--role ROLE	Role"
+//usage:     "\n	-l,--range RNG	Levelrange"
 //usage:	)
 //usage:	IF_NOT_FEATURE_RUNCON_LONG_OPTIONS(
 //usage:     "\n	-c	Compute process transition context before modifying"
diff --git a/util-linux/fstrim.c b/util-linux/fstrim.c
index fc51878b6..563aa9720 100644
--- a/util-linux/fstrim.c
+++ b/util-linux/fstrim.c
@@ -23,9 +23,9 @@
 //usage:       "[OPTIONS] MOUNTPOINT"
 //usage:#define fstrim_full_usage "\n\n"
 //usage:	IF_LONG_OPTS(
-//usage:       "	-o,--offset=OFFSET	Offset in bytes to discard from"
-//usage:     "\n	-l,--length=LEN		Bytes to discard"
-//usage:     "\n	-m,--minimum=MIN	Minimum extent length"
+//usage:       "	-o,--offset OFFSET	Offset in bytes to discard from"
+//usage:     "\n	-l,--length LEN		Bytes to discard"
+//usage:     "\n	-m,--minimum MIN	Minimum extent length"
 //usage:     "\n	-v,--verbose		Print number of discarded bytes"
 //usage:	)
 //usage:	IF_NOT_LONG_OPTS(
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index f6ecc3dde..63294c520 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -57,13 +57,13 @@
 //usage:	IF_LONG_OPTS(
 //usage:	IF_FEATURE_GETOPT_LONG(
 //usage:       "	-a,--alternative		Allow long options starting with single -\n"
-//usage:       "	-l,--longoptions=LOPT[,...]	Long options to recognize\n"
+//usage:       "	-l,--longoptions LOPT[,...]	Long options to recognize\n"
 //usage:	)
-//usage:       "	-n,--name=PROGNAME		The name under which errors are reported"
-//usage:     "\n	-o,--options=OPTSTRING		Short options to recognize"
+//usage:       "	-n,--name PROGNAME		The name under which errors are reported"
+//usage:     "\n	-o,--options OPTSTRING		Short options to recognize"
 //usage:     "\n	-q,--quiet			No error messages on unrecognized options"
 //usage:     "\n	-Q,--quiet-output		No normal output"
-//usage:     "\n	-s,--shell=SHELL		Set shell quoting conventions"
+//usage:     "\n	-s,--shell SHELL		Set shell quoting conventions"
 //usage:     "\n	-T,--test			Version test (exits with 4)"
 //usage:     "\n	-u,--unquoted			Don't quote output"
 //usage:	)
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c
index 6834292da..57b218dab 100644
--- a/util-linux/nsenter.c
+++ b/util-linux/nsenter.c
@@ -30,19 +30,19 @@
 //usage:       "[OPTIONS] [PROG [ARGS]]"
 //usage:#if ENABLE_FEATURE_NSENTER_LONG_OPTS
 //usage:#define nsenter_full_usage "\n"
-//usage:     "\n	-t, --target=PID		Target process to get namespaces from"
-//usage:     "\n	-m, --mount[=FILE]		Enter mount namespace"
-//usage:     "\n	-u, --uts[=FILE]		Enter UTS namespace (hostname etc)"
-//usage:     "\n	-i, --ipc[=FILE]		Enter System V IPC namespace"
-//usage:     "\n	-n, --net[=FILE]		Enter network namespace"
-//usage:     "\n	-p, --pid[=FILE]		Enter pid namespace"
-//usage:     "\n	-U, --user[=FILE]		Enter user namespace"
-//usage:     "\n	-S, --setuid=UID		Set uid in entered namespace"
-//usage:     "\n	-G, --setgid=GID		Set gid in entered namespace"
-//usage:     "\n	--preserve-credentials		Don't touch uids or gids"
-//usage:     "\n	-r, --root[=DIR]		Set root directory"
-//usage:     "\n	-w, --wd[=DIR]			Set working directory"
-//usage:     "\n	-F, --no-fork			Don't fork before exec'ing PROG"
+//usage:     "\n	-t,--target PID		Target process to get namespaces from"
+//usage:     "\n	-m,--mount[=FILE]	Enter mount namespace"
+//usage:     "\n	-u,--uts[=FILE]		Enter UTS namespace (hostname etc)"
+//usage:     "\n	-i,--ipc[=FILE]		Enter System V IPC namespace"
+//usage:     "\n	-n,--net[=FILE]		Enter network namespace"
+//usage:     "\n	-p,--pid[=FILE]		Enter pid namespace"
+//usage:     "\n	-U,--user[=FILE]	Enter user namespace"
+//usage:     "\n	-S,--setuid UID		Set uid in entered namespace"
+//usage:     "\n	-G,--setgid GID		Set gid in entered namespace"
+//usage:     "\n	--preserve-credentials	Don't touch uids or gids"
+//usage:     "\n	-r,--root[=DIR]		Set root directory"
+//usage:     "\n	-w,--wd[=DIR]		Set working directory"
+//usage:     "\n	-F,--no-fork		Don't fork before exec'ing PROG"
 //usage:#else
 //usage:#define nsenter_full_usage "\n"
 //usage:     "\n	-t PID		Target process to get namespaces from"
diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c
index 54fc70583..b63164588 100644
--- a/util-linux/rtcwake.c
+++ b/util-linux/rtcwake.c
@@ -41,10 +41,10 @@
 //usage:     "\n	-a,--auto	Read clock mode from adjtime"
 //usage:     "\n	-l,--local	Clock is set to local time"
 //usage:     "\n	-u,--utc	Clock is set to UTC time"
-//usage:     "\n	-d,--device=DEV	Specify the RTC device"
-//usage:     "\n	-m,--mode=MODE	Set sleep state (default: standby)"
-//usage:     "\n	-s,--seconds=SEC Set timeout in SEC seconds from now"
-//usage:     "\n	-t,--time=TIME	Set timeout to TIME seconds from epoch"
+//usage:     "\n	-d,--device DEV	Specify the RTC device"
+//usage:     "\n	-m,--mode MODE	Set sleep state (default: standby)"
+//usage:     "\n	-s,--seconds SEC Set timeout in SEC seconds from now"
+//usage:     "\n	-t,--time TIME	Set timeout to TIME seconds from epoch"
 //usage:	)
 //usage:	IF_NOT_LONG_OPTS(
 //usage:     "\n	-a	Read clock mode from adjtime"
diff --git a/util-linux/unshare.c b/util-linux/unshare.c
index bbabeef55..52e8f1421 100644
--- a/util-linux/unshare.c
+++ b/util-linux/unshare.c
@@ -25,14 +25,14 @@
 //usage:#define unshare_trivial_usage
 //usage:       "[OPTIONS] [PROG [ARGS]]"
 //usage:#define unshare_full_usage "\n"
-//usage:     "\n	-m, --mount[=FILE]	Unshare mount namespace"
-//usage:     "\n	-u, --uts[=FILE]	Unshare UTS namespace (hostname etc.)"
-//usage:     "\n	-i, --ipc[=FILE]	Unshare System V IPC namespace"
-//usage:     "\n	-n, --net[=FILE]	Unshare network namespace"
-//usage:     "\n	-p, --pid[=FILE]	Unshare PID namespace"
-//usage:     "\n	-U, --user[=FILE}	Unshare user namespace"
-//usage:     "\n	-f, --fork		Fork before execing PROG"
-//usage:     "\n	-r, --map-root-user	Map current user to root (implies -u)"
+//usage:     "\n	-m,--mount[=FILE]	Unshare mount namespace"
+//usage:     "\n	-u,--uts[=FILE]		Unshare UTS namespace (hostname etc.)"
+//usage:     "\n	-i,--ipc[=FILE]		Unshare System V IPC namespace"
+//usage:     "\n	-n,--net[=FILE]		Unshare network namespace"
+//usage:     "\n	-p,--pid[=FILE]		Unshare PID namespace"
+//usage:     "\n	-U,--user[=FILE]	Unshare user namespace"
+//usage:     "\n	-f,--fork		Fork before execing PROG"
+//usage:     "\n	-r,--map-root-user	Map current user to root (implies -u)"
 //usage:     "\n	--mount-proc[=DIR]	Mount /proc filesystem first (implies -m)"
 //usage:     "\n	--propagation slave|shared|private|unchanged"
 //usage:     "\n				Modify mount propagation in mount namespace"