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

for short options too.''

diff --git a/src/cp.c b/src/cp.c
index 13974474322c87819f54258f82ab4cc374073306..0cab4f5d2323ee2280d32cca84cd7dc75138d31b 100644 (file)
--- 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 c0446648208bac3bd231adf8fb2696e3c6b9fc93..cc126347de4b4203da8d242a7dcf2f5d207b252a 100644 (file)
--- 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 8f0c4774aa380e2685d4954f00b8000a6281f159..09ace435d5a8843fca3fc55a25a88de063a24505 100644 (file)
--- 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 a7f588f045c663706b83f0172ff0c1b9b2edaabc..b0849fe9c64ecca1eef2dec789902e3fe1c2329a 100644 (file)
--- a/src/install.c
+++ b/src/install.c
@@ -609,6 +609,9 @@ In the first two formats, copy SOURCE to DEST or multiple SOURCE(s) to\n\
 the existing DIRECTORY, while setting permission modes and owner/group.\n\
 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\

diff --git a/src/ln.c b/src/ln.c
index b8b628dc756dee31f739c6037d83dfa8aef05ff6..de088c6b305a1adf02cc5698efeb7e15030c2e4d 100644 (file)
--- a/src/ln.c
+++ b/src/ln.c
@@ -350,6 +350,9 @@ than one TARGET, the last argument must be a directory;  create links\n\
 in DIRECTORY to each TARGET.  Create hard links by default, symbolic\n\
 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\

diff --git a/src/ls.c b/src/ls.c
index 2a332c15c7123209b39350c6a1fcfdb52b79ca34..deaac8776bfe480fbde0f2f7d8466a529fb10684 100644 (file)
--- 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 57a11423e7453a14e59b48506dd14de9d2671392..b3bfb5cda274b88addd46b1d34622a8d0a35e7ca 100644 (file)
--- 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 ca70a11caf98d79b110cdf4706edfa13b96eb872..0eae7694390a726d9cc6d4e66cb8d70f9cad3c2d 100644 (file)
--- 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 fb005bb9552a89b4ede2dd210fd2f4511f5bc857..7e34bd4e6fbbe71e3c93da633509016e810f0903 100644 (file)
--- 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 be29d622b6b98b347a409541ac107454ba23e73d..30ac2ccf33d71a6522e0561d1e244000ad127c4a 100644 (file)
--- 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 92f4209bdeb3e5a0e9036c5d5bb2071fcc58df64..c9f66622ac6873bd74946719571d8ceceaccfadb 100644 (file)
--- 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 8db0df7f3b34497a7c4b164a4b6dab167759ce9c..a4225f927383d5ea41a3b39bde4519769ebb6999 100644 (file)
--- 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\