doc: correct and normalize --help output of several tools

* src/chroot.c (usage): Add "[ARG]" to synopsis.
* src/cut.c (usage): Remove an inconsistent period in an option
description.
* src/du.c (usage): Remove superfluous argument after short option -X.
Also remove inconsistent uppercase and final period.
Use a single indent level for prettiness.
* src/shred.c (usage): Normalize the synopsis.
* src/stty.c (usage): Options -F and --file are alternatives, cannot
both be used.
* src/sum.c (usage): -r does not overrule -s; the last one counts.
* src/uptime.c (usage): Remove inconsistent space from the synopsis.
* src/users.c: Likewise.

diff --git a/src/chroot.c b/src/chroot.c
index 399f76c30eec2a1b65134e932aae0863e0626ddc..d55db6ef0a2b621e5e78c5944692070d6d60a2db 100644 (file)
--- a/src/chroot.c
+++ b/src/chroot.c
@@ -41,7 +41,7 @@ usage (int status)
   else
     {
       printf (_("\
-Usage: %s NEWROOT [COMMAND...]\n\
+Usage: %s NEWROOT [COMMAND [ARG]...]\n\
   or:  %s OPTION\n\
 "), program_name, program_name);
       fputs (_("\

diff --git a/src/cut.c b/src/cut.c
index 0e151fd3e99b1b55e2bf5c430a38b0037af5bc8e..99d2eaad9bb2b2a3b01be3688fc8959c3c2f8bb5 100644 (file)
--- a/src/cut.c
+++ b/src/cut.c
@@ -210,7 +210,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
 "), stdout);
       fputs (_("\
       --complement        complement the set of selected bytes, characters\n\
-                            or fields.\n\
+                            or fields\n\
 "), stdout);
       fputs (_("\
   -s, --only-delimited    do not print lines not containing delimiters\n\

diff --git a/src/du.c b/src/du.c
index ee2426927a761df1179e6ab148ad46bbaf8c6375..fafcea08ef4f604b0a66ff1b0fa565928d4701ae 100644 (file)
--- a/src/du.c
+++ b/src/du.c
@@ -311,9 +311,9 @@ Mandatory arguments to long options are mandatory for short options too.\n\
   -s, --summarize       display only a total for each argument\n\
 "), stdout);
       fputs (_("\
-  -x, --one-file-system  skip directories on different file systems\n\
-  -X FILE, --exclude-from=FILE  Exclude files that match any pattern in FILE.\n\
-      --exclude=PATTERN  Exclude files that match PATTERN.\n\
+  -x, --one-file-system    skip directories on different file systems\n\
+  -X, --exclude-from=FILE  exclude files that match any pattern in FILE\n\
+      --exclude=PATTERN    exclude files that match PATTERN\n\
       --max-depth=N     print the total for a directory (or file, with --all)\n\
                           only if it is N or fewer levels below the command\n\
                           line argument;  --max-depth=0 is the same as\n\

diff --git a/src/shred.c b/src/shred.c
index 9e82cf2f0137c6d6cf9cd71891427bd8e6029b89..d766405c8f8786d7238c35fea25e998911f562ab 100644 (file)
--- a/src/shred.c
+++ b/src/shred.c
@@ -155,7 +155,7 @@ usage (int status)
             program_name);
   else
     {
-      printf (_("Usage: %s [OPTIONS] FILE [...]\n"), program_name);
+      printf (_("Usage: %s [OPTION]... FILE...\n"), program_name);
       fputs (_("\
 Overwrite the specified FILE(s) repeatedly, in order to make it harder\n\
 for even very expensive hardware probing to recover the data.\n\

diff --git a/src/stty.c b/src/stty.c
index 5ac2cc6ead06f45d5f75e76c83f1d9a333ce4ec5..a70fd95937706675fabec4de584747f6649d740c 100644 (file)
--- a/src/stty.c
+++ b/src/stty.c
@@ -504,9 +504,9 @@ usage (int status)
   else
     {
       printf (_("\
-Usage: %s [-F DEVICE] [--file=DEVICE] [SETTING]...\n\
-  or:  %s [-F DEVICE] [--file=DEVICE] [-a|--all]\n\
-  or:  %s [-F DEVICE] [--file=DEVICE] [-g|--save]\n\
+Usage: %s [-F DEVICE | --file=DEVICE] [SETTING]...\n\
+  or:  %s [-F DEVICE | --file=DEVICE] [-a|--all]\n\
+  or:  %s [-F DEVICE | --file=DEVICE] [-g|--save]\n\
 "),
              program_name, program_name, program_name);
       fputs (_("\

diff --git a/src/sum.c b/src/sum.c
index 4dfc86797ae0a6094fb14a92ab9c51122dd2cb70..314656f53547970d3803381a6093f9ebc1de6c5d 100644 (file)
--- a/src/sum.c
+++ b/src/sum.c
@@ -62,7 +62,7 @@ Usage: %s [OPTION]... [FILE]...\n\
       fputs (_("\
 Print checksum and block counts for each FILE.\n\
 \n\
-  -r              defeat -s, use BSD sum algorithm, use 1K blocks\n\
+  -r              use BSD sum algorithm, use 1K blocks\n\
   -s, --sysv      use System V sum algorithm, use 512 bytes blocks\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);

diff --git a/src/uptime.c b/src/uptime.c
index 9e3384fc8aca4a4088e68a30119a22afdfe86c64..56ad861b16d1d9e89153f7a0b0accf3c677a3829 100644 (file)
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -193,7 +193,7 @@ usage (int status)
             program_name);
   else
     {
-      printf (_("Usage: %s [OPTION]... [ FILE ]\n"), program_name);
+      printf (_("Usage: %s [OPTION]... [FILE]\n"), program_name);
       printf (_("\
 Print the current time, the length of time the system has been up,\n\
 the number of users on the system, and the average number of jobs\n\

diff --git a/src/users.c b/src/users.c
index 551616e84ff0d9d9bdea6bf95a18d13510a6124c..19ffce8ca8caca7d8d0cffea09d40e863df1e2fb 100644 (file)
--- a/src/users.c
+++ b/src/users.c
@@ -103,7 +103,7 @@ usage (int status)
             program_name);
   else
     {
-      printf (_("Usage: %s [OPTION]... [ FILE ]\n"), program_name);
+      printf (_("Usage: %s [OPTION]... [FILE]\n"), program_name);
       printf (_("\
 Output who is currently logged in according to FILE.\n\
 If FILE is not specified, use %s.  %s as FILE is common.\n\