(usage): Note that ``Mandatory arguments to long options are mandatory

for short options too.''

12 files changed, 57 insertions, 1 deletions

diff --git a/src/cp.c b/src/cp.c
index 139744743..0cab4f5d2 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -168,6 +168,11 @@ Usage: %s [OPTION]... SOURCE DEST\n\
       fputs (_("\
 Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n\
 \n\
+"), stdout);
+      fputs (_("\
+Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+      fputs (_("\
   -a, --archive                same as -dpR\n\
       --backup[=CONTROL]       make a backup of each existing destination file\n\
   -b                           like --backup but does not accept an argument\n\
diff --git a/src/df.c b/src/df.c
index c04466482..cc126347d 100644
--- a/src/df.c
+++ b/src/df.c
@@ -756,6 +756,11 @@ usage (int status)
 Show information about the filesystem on which each FILE resides,\n\
 or all filesystems by default.\n\
 \n\
+"), stdout);
+      fputs (_("\
+Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+      fputs (_("\
   -a, --all             include filesystems having 0 blocks\n\
       --block-size=SIZE use SIZE-byte blocks\n\
   -h, --human-readable  print sizes in human readable format (e.g., 1K 234M 2G)\n\
diff --git a/src/du.c b/src/du.c
index 8f0c4774a..09ace435d 100644
--- a/src/du.c
+++ b/src/du.c
@@ -190,6 +190,11 @@ usage (int status)
       fputs (_("\
 Summarize disk usage of each FILE, recursively for directories.\n\
 \n\
+"), stdout);
+      fputs (_("\
+Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+      fputs (_("\
   -a, --all             write counts for all files, not just directories\n\
       --block-size=SIZE use SIZE-byte blocks\n\
   -b, --bytes           print size in bytes\n\
diff --git a/src/install.c b/src/install.c
index a7f588f04..b0849fe9c 100644
--- a/src/install.c
+++ b/src/install.c
@@ -611,6 +611,9 @@ In the third format, create all components of the given DIRECTORY(ies).\n\
 \n\
 "), stdout);
       fputs (_("\
+Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+      fputs (_("\
       --backup[=CONTROL] make a backup of each existing destination file\n\
   -b                  like --backup but does not accept an argument\n\
   -c                  (ignored)\n\
diff --git a/src/ln.c b/src/ln.c
index b8b628dc7..de088c6b3 100644
--- a/src/ln.c
+++ b/src/ln.c
@@ -352,6 +352,9 @@ links with --symbolic.  When creating hard links, each TARGET must exist.\n\
 \n\
 "), stdout);
       fputs (_("\
+Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+      fputs (_("\
       --backup[=CONTROL]      make a backup of each existing destination file\n\
   -b                          like --backup but does not accept an argument\n\
   -d, -F, --directory         hard link directories (super-user only)\n\
diff --git a/src/ls.c b/src/ls.c
index 2a332c15c..deaac8776 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -3565,6 +3565,11 @@ usage (int status)
 List information about the FILEs (the current directory by default).\n\
 Sort entries alphabetically if none of -cftuSUX nor --sort.\n\
 \n\
+"), stdout);
+      fputs (_("\
+Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+      fputs (_("\
   -a, --all                  do not hide entries starting with .\n\
   -A, --almost-all           do not list implied . and ..\n\
   -b, --escape               print octal escapes for nongraphic characters\n\
diff --git a/src/mkdir.c b/src/mkdir.c
index 57a11423e..b3bfb5cda 100644
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -62,6 +62,11 @@ usage (int status)
       fputs (_("\
 Create the DIRECTORY(ies), if they do not already exist.\n\
 \n\
+"), stdout);
+      fputs (_("\
+Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+      fputs (_("\
   -m, --mode=MODE   set permission mode (as in chmod), not rwxrwxrwx - umask\n\
   -p, --parents     no error if existing, make parent directories as needed\n\
   -v, --verbose     print a message for each created directory\n\
diff --git a/src/mkfifo.c b/src/mkfifo.c
index ca70a11ca..0eae76943 100644
--- a/src/mkfifo.c
+++ b/src/mkfifo.c
@@ -56,6 +56,11 @@ usage (int status)
       fputs (_("\
 Create named pipes (FIFOs) with the given NAMEs.\n\
 \n\
+"), stdout);
+      fputs (_("\
+Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+      fputs (_("\
   -m, --mode=MODE   set permission mode (as in chmod), not a=rw - umask\n\
 "), stdout);
       fputs (_("\
diff --git a/src/mknod.c b/src/mknod.c
index fb005bb95..7e34bd4e6 100644
--- a/src/mknod.c
+++ b/src/mknod.c
@@ -66,6 +66,11 @@ usage (int status)
       fputs (_("\
 Create the special file NAME of the given TYPE.\n\
 \n\
+"), stdout);
+      fputs (_("\
+Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+      fputs (_("\
   -m, --mode=MODE   set permission mode (as in chmod), not a=rw - umask\n\
 "), stdout);
       fputs (_("\
diff --git a/src/mv.c b/src/mv.c
index be29d622b..30ac2ccf3 100644
--- a/src/mv.c
+++ b/src/mv.c
@@ -336,6 +336,11 @@ Usage: %s [OPTION]... SOURCE DEST\n\
       fputs (_("\
 Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.\n\
 \n\
+"), stdout);
+      fputs (_("\
+Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+      fputs (_("\
       --backup[=CONTROL]       make a backup of each existing destination file\n\
   -b                           like --backup but does not accept an argument\n\
   -f, --force                  do not prompt before overwriting\n\
diff --git a/src/shred.c b/src/shred.c
index 92f4209bd..c9f66622a 100644
--- a/src/shred.c
+++ b/src/shred.c
@@ -464,10 +464,15 @@ usage (int status)
   else
     {
       printf (_("Usage: %s [OPTIONS] FILE [...]\n"), program_name);
-      printf (_("\
+      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\
 \n\
+"), stdout);
+      fputs (_("\
+Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+      printf (_("\
   -f, --force    change permissions to allow writing if necessary\n\
   -n, --iterations=N  Overwrite N times instead of the default (%d)\n\
   -s, --size=N   shred this many bytes (suffixes like k, M, G accepted)\n\
diff --git a/src/touch.c b/src/touch.c
index 8db0df7f3..a4225f927 100644
--- a/src/touch.c
+++ b/src/touch.c
@@ -231,6 +231,11 @@ usage (int status)
       fputs (_("\
 Update the access and modification times of each FILE to the current time.\n\
 \n\
+"), stdout);
+      fputs (_("\
+Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+      fputs (_("\
   -a                     change only the access time\n\
   -c, --no-create        do not create any files\n\
   -d, --date=STRING      parse STRING and use it instead of current time\n\