*: more --help tweaking

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

9 files changed, 20 insertions, 19 deletions

diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 7533b0aad..81a0e6aa8 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -399,7 +399,7 @@ setfont [-O font+umap.orig] [-o font.orig] [-om cmap.orig]
 -V     Version
 */
 //usage:#define setfont_trivial_usage
-//usage:       "FONT [-m MAPFILE] [-C TTY]"
+//usage:       "[-m MAPFILE] [-C TTY] FILE"
 //usage:#define setfont_full_usage "\n\n"
 //usage:       "Load a console font\n"
 //usage:     "\n        -m MAPFILE      Load console screen map"
diff --git a/coreutils/nproc.c b/coreutils/nproc.c
index 31e452bc4..89b17e0cc 100644
--- a/coreutils/nproc.c
+++ b/coreutils/nproc.c
@@ -14,7 +14,7 @@
 //kbuild:lib-$(CONFIG_NPROC) += nproc.o
 
 //usage:#define nproc_trivial_usage
-//usage:        ""IF_LONG_OPTS("--all --ignore=N")
+//usage:        ""IF_LONG_OPTS("[--all] [--ignore=N]")
 //usage:#define nproc_full_usage "\n\n"
 //usage:        "Print number of available CPUs"
 //usage:        IF_LONG_OPTS(
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index 48135921d..b25d49792 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -1394,7 +1394,7 @@ static void check_i2c_func(int fd)
 }
 
 //usage:#define i2ctransfer_trivial_usage
-//usage:       "[-fay] I2CBUS {rLENGTH[@ADDR] | wLENGTH[@ADDR] DATA...}..."
+//usage:       "[-fay] I2CBUS { rLENGTH[@ADDR] | wLENGTH[@ADDR] DATA...}..."
 //usage:#define i2ctransfer_full_usage "\n\n"
 //usage:       "Read/write I2C data in one transfer"
 //usage:     "\n"
diff --git a/miscutils/mt.c b/miscutils/mt.c
index 1a4214664..52d5476a1 100644
--- a/miscutils/mt.c
+++ b/miscutils/mt.c
@@ -19,7 +19,7 @@
 //usage:#define mt_full_usage "\n\n"
 //usage:       "Control magnetic tape drive operation\n"
 //usage:       "\n"
-//usage:       "Available Opcodes:\n"
+//usage:       "Opcodes:\n"
 //usage:       "\n"
 //usage:       "bsf bsfm bsr bss datacompression drvbuffer eof eom erase\n"
 //usage:       "fsf fsfm fsr fss load lock mkpart nop offline ras1 ras2\n"
diff --git a/networking/nameif.c b/networking/nameif.c
index 854594c83..66e042688 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -52,10 +52,10 @@
 //usage:#define nameif_full_usage "\n\n"
 //usage:        "Rename network interface while it in the down state."
 //usage:        IF_NOT_FEATURE_NAMEIF_EXTENDED(
-//usage:     "\nThe device with address HWADDR is renamed to IFACE."
+//usage:     "\nThe device with address HWADDR is renamed to IFNAME."
 //usage:        )
 //usage:        IF_FEATURE_NAMEIF_EXTENDED(
-//usage:     "\nThe device matched by SELECTOR is renamed to IFACE."
+//usage:     "\nThe device matched by SELECTOR is renamed to IFNAME."
 //usage:     "\nSELECTOR can be a combination of:"
 //usage:     "\n        driver=STRING"
 //usage:     "\n        bus=STRING"
diff --git a/procps/pgrep.c b/procps/pgrep.c
index 495e0ef9d..6d25c247e 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -44,17 +44,17 @@
 //usage:     "\n        -P      Match parent process ID"
 //usage:
 //usage:#define pkill_trivial_usage
-//usage:       "[-l|-SIGNAL] [-fnovx] [-s SID|-P PPID|PATTERN]"
+//usage:       "[-l|-SIGNAL] [-xfvno] [-s SID|-P PPID|PATTERN]"
 //usage:#define pkill_full_usage "\n\n"
-//usage:       "Send a signal to process(es) selected by regex PATTERN\n"
+//usage:       "Send signal to processes selected by regex PATTERN\n"
 //usage:     "\n        -l      List all signals"
+//usage:     "\n        -x      Match whole name (not substring)"
 //usage:     "\n        -f      Match against entire command line"
+//usage:     "\n        -s SID  Match session ID (0 for current)"
+//usage:     "\n        -P PPID Match parent process ID"
+//usage:     "\n        -v      Negate the match"
 //usage:     "\n        -n      Signal the newest process only"
 //usage:     "\n        -o      Signal the oldest process only"
-//usage:     "\n        -v      Negate the match"
-//usage:     "\n        -x      Match whole name (not substring)"
-//usage:     "\n        -s      Match session ID (0 for current)"
-//usage:     "\n        -P      Match parent process ID"
 
 #include "libbb.h"
 #include "xregex.h"
diff --git a/util-linux/flock.c b/util-linux/flock.c
index 12c16013c..1ed752a80 100644
--- a/util-linux/flock.c
+++ b/util-linux/flock.c
@@ -14,7 +14,7 @@
 //kbuild:lib-$(CONFIG_FLOCK) += flock.o
 
 //usage:#define flock_trivial_usage
-//usage:       "[-sxun] FD|{FILE [-c] PROG ARGS}"
+//usage:       "[-sxun] FD | { FILE [-c] PROG ARGS }"
 //usage:#define flock_full_usage "\n\n"
 //usage:       "[Un]lock file descriptor, or lock FILE, run PROG\n"
 //usage:     "\n        -s      Shared lock"
diff --git a/util-linux/mountpoint.c b/util-linux/mountpoint.c
index a44cf6013..28b1e7a54 100644
--- a/util-linux/mountpoint.c
+++ b/util-linux/mountpoint.c
@@ -19,13 +19,14 @@
 //kbuild:lib-$(CONFIG_MOUNTPOINT) += mountpoint.o
 
 //usage:#define mountpoint_trivial_usage
-//usage:       "[-q] <[-dn] DIR | -x DEVICE>"
+//usage:       "[-q] { [-dn] DIR | -x DEVICE }"
 //usage:#define mountpoint_full_usage "\n\n"
-//usage:       "Check if the directory is a mountpoint\n"
+//usage:       "Check if DIR is a mountpoint\n"
 //usage:     "\n        -q      Quiet"
-//usage:     "\n        -d      Print major/minor device number of the filesystem"
+//usage:     "\n        -d      Print major:minor of the filesystem"
 //usage:     "\n        -n      Print device name of the filesystem"
-//usage:     "\n        -x      Print major/minor device number of the blockdevice"
+//////// -n is not supported by util-linux-2.36.1 ^^^^^^^^^^^^^^^^^^
+//usage:     "\n        -x      Print major:minor of DEVICE"
 //usage:
 //usage:#define mountpoint_example_usage
 //usage:       "$ mountpoint /proc\n"
diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c
index 32d9987e7..f11c62292 100644
--- a/util-linux/readprofile.c
+++ b/util-linux/readprofile.c
@@ -44,8 +44,8 @@
 //usage:#define readprofile_trivial_usage
 //usage:       "[OPTIONS]"
 //usage:#define readprofile_full_usage "\n\n"
-//usage:       "        -m mapfile      (Default: /boot/System.map)"
-//usage:     "\n        -p profile      (Default: /proc/profile)"
+//usage:       "        -m MAPFILE      (Default: /boot/System.map)"
+//usage:     "\n        -p PROFILE      (Default: /proc/profile)"
 //usage:     "\n        -M NUM          Set the profiling multiplier to NUM"
 //usage:     "\n        -i              Print only info about the sampling step"
 //usage:     "\n        -v              Verbose"