From ba9f9c2d2c57f6041c6c01ba7c0e8379a5f5d440 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 14 Apr 2021 15:15:45 +0200 Subject: [PATCH] *: --help text tweaks Signed-off-by: Denys Vlasenko --- coreutils/chgrp.c | 2 +- coreutils/chown.c | 2 +- coreutils/cp.c | 2 +- coreutils/cut.c | 8 ++++---- coreutils/du.c | 2 +- coreutils/fold.c | 2 +- coreutils/head.c | 2 +- coreutils/mv.c | 2 +- coreutils/realpath.c | 2 +- coreutils/tail.c | 2 +- coreutils/touch.c | 2 +- coreutils/truncate.c | 4 ++-- coreutils/wc.c | 2 +- miscutils/bc.c | 4 ++-- miscutils/watchdog.c | 2 +- selinux/chcon.c | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c index 4da43c45e..0c2060981 100644 --- a/coreutils/chgrp.c +++ b/coreutils/chgrp.c @@ -23,7 +23,7 @@ //usage:#define chgrp_trivial_usage //usage: "[-Rh"IF_DESKTOP("LHPcvf")"]... GROUP FILE..." //usage:#define chgrp_full_usage "\n\n" -//usage: "Change the group membership of each FILE to GROUP\n" +//usage: "Change the group membership of FILEs to GROUP\n" //usage: "\n -R Recurse" //usage: "\n -h Affect symlinks instead of symlink targets" //usage: IF_DESKTOP( diff --git a/coreutils/chown.c b/coreutils/chown.c index ffccc6cce..170507147 100644 --- a/coreutils/chown.c +++ b/coreutils/chown.c @@ -28,7 +28,7 @@ //usage:#define chown_trivial_usage //usage: "[-Rh"IF_DESKTOP("LHPcvf")"]... USER[:[GRP]] FILE..." //usage:#define chown_full_usage "\n\n" -//usage: "Change the owner and/or group of each FILE to USER and/or GRP\n" +//usage: "Change the owner and/or group of FILEs to USER and/or GRP\n" //usage: "\n -R Recurse" //usage: "\n -h Affect symlinks instead of symlink targets" //usage: IF_DESKTOP( diff --git a/coreutils/cp.c b/coreutils/cp.c index 9b9b8f7bf..f92ba6886 100644 --- a/coreutils/cp.c +++ b/coreutils/cp.c @@ -40,7 +40,7 @@ //usage:#define cp_trivial_usage //usage: "[-arPLHpfilsTu] SOURCE... DEST" //usage:#define cp_full_usage "\n\n" -//usage: "Copy SOURCE(s) to DEST\n" +//usage: "Copy SOURCEs to DEST\n" //usage: "\n -a Same as -dpR" //usage: IF_SELINUX( //usage: "\n -c Preserve security context" diff --git a/coreutils/cut.c b/coreutils/cut.c index 16418ff33..5897d82b6 100644 --- a/coreutils/cut.c +++ b/coreutils/cut.c @@ -22,12 +22,12 @@ //usage:#define cut_trivial_usage //usage: "[OPTIONS] [FILE]..." //usage:#define cut_full_usage "\n\n" -//usage: "Print selected fields from each input FILE to stdout\n" +//usage: "Print selected fields from FILEs to stdout\n" //usage: "\n -b LIST Output only bytes from LIST" //usage: "\n -c LIST Output only characters from LIST" -//usage: "\n -d CHAR Use CHAR instead of tab as the field delimiter" -//usage: "\n -s Output only the lines containing delimiter" -//usage: "\n -f N Print only these fields" +//usage: "\n -d CHAR Use CHAR instead of tab as field delimiter" +//usage: "\n -s Output only lines containing delimiter" +//usage: "\n -f LIST Print only these fields" //usage: "\n -n Ignored" //usage: //usage:#define cut_example_usage diff --git a/coreutils/du.c b/coreutils/du.c index d14d9e4ea..c8aedb6ef 100644 --- a/coreutils/du.c +++ b/coreutils/du.c @@ -40,7 +40,7 @@ //usage:#define du_trivial_usage //usage: "[-aHLdclsx" IF_FEATURE_HUMAN_READABLE("hm") "k] [FILE]..." //usage:#define du_full_usage "\n\n" -//usage: "Summarize disk space used for each FILE and/or directory\n" +//usage: "Summarize disk space used for FILEs (or directories)\n" //usage: "\n -a Show file sizes too" //usage: "\n -L Follow all symlinks" //usage: "\n -H Follow symlinks on command line" diff --git a/coreutils/fold.c b/coreutils/fold.c index 1e26dde0c..98c3b1491 100644 --- a/coreutils/fold.c +++ b/coreutils/fold.c @@ -23,7 +23,7 @@ //usage:#define fold_trivial_usage //usage: "[-bs] [-w WIDTH] [FILE]..." //usage:#define fold_full_usage "\n\n" -//usage: "Wrap input lines in each FILE (or stdin), writing to stdout\n" +//usage: "Wrap input lines in FILEs (or stdin), writing to stdout\n" //usage: "\n -b Count bytes rather than columns" //usage: "\n -s Break at spaces" //usage: "\n -w Use WIDTH columns instead of 80" diff --git a/coreutils/head.c b/coreutils/head.c index b6efabbe0..efb023c6f 100644 --- a/coreutils/head.c +++ b/coreutils/head.c @@ -29,7 +29,7 @@ //usage:#define head_trivial_usage //usage: "[OPTIONS] [FILE]..." //usage:#define head_full_usage "\n\n" -//usage: "Print first 10 lines of each FILE (or stdin) to stdout.\n" +//usage: "Print first 10 lines of FILEs (or stdin) to stdout.\n" //usage: "With more than one FILE, precede each with a filename header.\n" //usage: "\n -n N[kbm] Print first N lines" //usage: IF_FEATURE_FANCY_HEAD( diff --git a/coreutils/mv.c b/coreutils/mv.c index b9f8f6982..f5ed9fcfc 100644 --- a/coreutils/mv.c +++ b/coreutils/mv.c @@ -26,7 +26,7 @@ //usage: "[-fin] SOURCE DEST\n" //usage: "or: mv [-fin] SOURCE... DIRECTORY" //usage:#define mv_full_usage "\n\n" -//usage: "Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY\n" +//usage: "Rename SOURCE to DEST, or move SOURCEs to DIRECTORY\n" //usage: "\n -f Don't prompt before overwriting" //usage: "\n -i Interactive, prompt before overwrite" //usage: "\n -n Don't overwrite an existing file" diff --git a/coreutils/realpath.c b/coreutils/realpath.c index f5f868744..aeeef601c 100644 --- a/coreutils/realpath.c +++ b/coreutils/realpath.c @@ -23,7 +23,7 @@ //usage:#define realpath_trivial_usage //usage: "FILE..." //usage:#define realpath_full_usage "\n\n" -//usage: "Return the absolute pathnames of given FILE" +//usage: "Print absolute pathnames of FILEs" #include "libbb.h" diff --git a/coreutils/tail.c b/coreutils/tail.c index 1f458f9ed..08fde6cdd 100644 --- a/coreutils/tail.c +++ b/coreutils/tail.c @@ -48,7 +48,7 @@ //usage:#define tail_trivial_usage //usage: "[OPTIONS] [FILE]..." //usage:#define tail_full_usage "\n\n" -//usage: "Print last 10 lines of each FILE (or stdin) to stdout.\n" +//usage: "Print last 10 lines of FILEs (or stdin) to stdout.\n" //usage: "With more than one FILE, precede each with a filename header.\n" //usage: "\n -f Print data as file grows" //usage: "\n -c [+]N[kbm] Print last N bytes" diff --git a/coreutils/touch.c b/coreutils/touch.c index d8a930f7d..2b225dd16 100644 --- a/coreutils/touch.c +++ b/coreutils/touch.c @@ -35,7 +35,7 @@ //usage: IF_FEATURE_TOUCH_SUSV3(" [-d DATE] [-t DATE] [-r FILE]") //usage: " FILE..." //usage:#define touch_full_usage "\n\n" -//usage: "Update mtime of FILE\n" +//usage: "Update mtime of FILEs\n" //usage: "\n -c Don't create files" //usage: "\n -h Don't follow links" //usage: IF_FEATURE_TOUCH_SUSV3( diff --git a/coreutils/truncate.c b/coreutils/truncate.c index 233d0f2d1..e26c3e3e1 100644 --- a/coreutils/truncate.c +++ b/coreutils/truncate.c @@ -19,9 +19,9 @@ //usage:#define truncate_trivial_usage //usage: "[-c] -s SIZE FILE..." //usage:#define truncate_full_usage "\n\n" -//usage: "Truncate FILEs to the given size\n" +//usage: "Truncate FILEs to SIZE\n" //usage: "\n -c Do not create files" -//usage: "\n -s SIZE Truncate to SIZE" +//usage: "\n -s SIZE" //usage: //usage:#define truncate_example_usage //usage: "$ truncate -s 1G foo" diff --git a/coreutils/wc.c b/coreutils/wc.c index 99eb9dc87..d5238d3fc 100644 --- a/coreutils/wc.c +++ b/coreutils/wc.c @@ -80,7 +80,7 @@ //usage: "[-c"IF_UNICODE_SUPPORT("m")"lwL] [FILE]..." //usage: //usage:#define wc_full_usage "\n\n" -//usage: "Count lines, words, and bytes for each FILE (or stdin)\n" +//usage: "Count lines, words, and bytes for FILEs (or stdin)\n" //usage: "\n -c Count bytes" //usage: IF_UNICODE_SUPPORT( //usage: "\n -m Count characters" diff --git a/miscutils/bc.c b/miscutils/bc.c index 553d0f472..dd9f4f8f1 100644 --- a/miscutils/bc.c +++ b/miscutils/bc.c @@ -108,14 +108,14 @@ //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" //usage: "\n" ///////: "\n -i Interactive" - has no effect for now //usage: "\n -q Quiet" -//usage: "\n -l Load standard math library" +//usage: "\n -l Load standard library" //usage: "\n -s Be POSIX compatible" //usage: "\n -w Warn if extensions are used" ///////: "\n -v Version" diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c index 44649cae6..d8e9c78f5 100644 --- a/miscutils/watchdog.c +++ b/miscutils/watchdog.c @@ -27,7 +27,7 @@ //config: When enabled, the watchdog device is opened and then immediately //config: magic-closed, before being opened a second time. This may be necessary //config: for some watchdog devices, but can cause spurious warnings in the -//config: kernel log if the nowayout feature is enabled. Also, if this workaround +//config: kernel log if the nowayout feature is enabled. If this workaround //config: is really needed for you machine to work properly, consider whether //config: it should be fixed in the kernel driver instead. Even when disabled, //config: the behaviour is easily emulated with a "printf 'V' > /dev/watchdog" diff --git a/selinux/chcon.c b/selinux/chcon.c index 2e4f94c0f..e1778a36a 100644 --- a/selinux/chcon.c +++ b/selinux/chcon.c @@ -26,7 +26,7 @@ //usage: ) //usage: //usage:#define chcon_full_usage "\n\n" -//usage: "Change the security context of each FILE to CONTEXT\n" +//usage: "Change the security context of FILEs to CONTEXT\n" //usage: "\n -v Verbose" //usage: "\n -c Report changes made" //usage: "\n -h Affect symlinks instead of their targets"