summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenno Schulenberg <bensberg@justemail.net>2008-08-04 10:44:47 +0200
committerJim Meyering <meyering@redhat.com>2008-08-04 11:10:14 +0200
commitf4bffea5e95fbb008402c156e50f81a887423250 (patch)
tree5673105d5225fdc9b17f6da50b60549403cccb88
parent6b9f1bdd66a2e0b0f494d6f86e4cda43bf2215d2 (diff)
downloadcoreutils-f4bffea5e95fbb008402c156e50f81a887423250.tar.xz
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.
-rw-r--r--src/chroot.c2
-rw-r--r--src/cut.c2
-rw-r--r--src/du.c6
-rw-r--r--src/shred.c2
-rw-r--r--src/stty.c6
-rw-r--r--src/sum.c2
-rw-r--r--src/uptime.c2
-rw-r--r--src/users.c2
8 files changed, 12 insertions, 12 deletions
diff --git a/src/chroot.c b/src/chroot.c
index 399f76c30..d55db6ef0 100644
--- 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 0e151fd3e..99d2eaad9 100644
--- 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 ee2426927..fafcea08e 100644
--- 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 9e82cf2f0..d766405c8 100644
--- 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 5ac2cc6ea..a70fd9593 100644
--- 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 4dfc86797..314656f53 100644
--- 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 9e3384fc8..56ad861b1 100644
--- 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 551616e84..19ffce8ca 100644
--- 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\