(usage): Say that

``Mandatory arguments to long options are mandatory for short options too.\n\''

diff --git a/src/csplit.c b/src/csplit.c
index 77182d861870728745c68c5834a02da770b4d2a3..d9dd91d58875ee5f7da324e0c02918a19fd46c27 100644 (file)
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -1,5 +1,5 @@
 /* csplit - split a file into sections determined by context lines
-   Copyright (C) 91, 1995-2000 Free Software Foundation, Inc.
+   Copyright (C) 91, 1995-2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1507,6 +1507,7 @@ Usage: %s [OPTION]... FILE PATTERN...\n\
 Output pieces of FILE separated by PATTERN(s) to files `xx01', `xx02', ...,\n\
 and output byte counts of each piece to standard output.\n\
 \n\
+Mandatory arguments to long options are mandatory for short options too.\n\
   -b, --suffix-format=FORMAT use sprintf FORMAT instead of %%d\n\
   -f, --prefix=PREFIX        use PREFIX instead of `xx'\n\
   -k, --keep-files           do not remove output files on errors\n\

diff --git a/src/cut.c b/src/cut.c
index 7346beeb29b8d188ded85055974ab6a1ab2d0717..f3d164873ce1582ec1b6413cebed0d2faf31b402 100644 (file)
--- a/src/cut.c
+++ b/src/cut.c
@@ -1,5 +1,5 @@
 /* cut - remove parts of lines of files
-   Copyright (C) 1984, 1997, 1998, 1999, 2000 by David M. Ihnat
+   Copyright (C) 1984, 1997, 1998, 1999, 2000, 2001 by David M. Ihnat
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -171,6 +171,7 @@ Usage: %s [OPTION]... [FILE]...\n\
       printf (_("\
 Print selected parts of lines from each FILE to standard output.\n\
 \n\
+Mandatory arguments to long options are mandatory for short options too.\n\
   -b, --bytes=LIST        output only these bytes\n\
   -c, --characters=LIST   output only these characters\n\
   -d, --delimiter=DELIM   use DELIM instead of TAB for field delimiter\n\

diff --git a/src/expand.c b/src/expand.c
index c829f776e8b0aab640ce81af19e9e8c53617bc51..4a7f1f9b3036e7a7f49933a41339e334768cbdc1 100644 (file)
--- a/src/expand.c
+++ b/src/expand.c
@@ -1,5 +1,5 @@
 /* expand - convert tabs to spaces
-   Copyright (C) 89, 91, 1995-2000 Free Software Foundation, Inc.
+   Copyright (C) 89, 91, 1995-2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -114,6 +114,7 @@ Usage: %s [OPTION]... [FILE]...\n\
 Convert tabs in each FILE to spaces, writing to standard output.\n\
 With no FILE, or when FILE is -, read standard input.\n\
 \n\
+Mandatory arguments to long options are mandatory for short options too.\n\
   -i, --initial       do not convert TABs after non whitespace\n\
   -t, --tabs=NUMBER   have tabs NUMBER characters apart, not 8\n\
   -t, --tabs=LIST     use comma separated list of explicit tab positions\n\

diff --git a/src/fold.c b/src/fold.c
index 97afc55405764a3854d8b422f65d4a4eba0c6345..c38679741430c1b65bff9323d8cac5a7abd8db3c 100644 (file)
--- a/src/fold.c
+++ b/src/fold.c
@@ -1,5 +1,5 @@
 /* fold -- wrap each input line to fit in specified width.
-   Copyright (C) 91, 1995-2000 Free Software Foundation, Inc.
+   Copyright (C) 91, 1995-2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -71,6 +71,7 @@ Usage: %s [OPTION]... [FILE]...\n\
 Wrap input lines in each FILE (standard input by default), writing to\n\
 standard output.\n\
 \n\
+Mandatory arguments to long options are mandatory for short options too.\n\
   -b, --bytes         count bytes rather than columns\n\
   -s, --spaces        break at spaces\n\
   -w, --width=WIDTH   use WIDTH columns instead of 80\n\

diff --git a/src/head.c b/src/head.c
index 634389771bdfc47e6a7450c6c9ec6ef0b3da71e1..a2de33a441fb41286cd8dd028192a77ac8e274e1 100644 (file)
--- a/src/head.c
+++ b/src/head.c
@@ -90,6 +90,7 @@ Print first 10 lines of each FILE to standard output.\n\
 With more than one FILE, precede each with a header giving the file name.\n\
 With no FILE, or when FILE is -, read standard input.\n\
 \n\
+Mandatory arguments to long options are mandatory for short options too.\n\
   -c, --bytes=SIZE         print first SIZE bytes\n\
   -n, --lines=NUMBER       print first NUMBER lines instead of first 10\n\
   -q, --quiet, --silent    never print headers giving file names\n\

diff --git a/src/nl.c b/src/nl.c
index 4788dd9bf032cdeeec4308386b16a183d91d196b..ad6abefb278628c61f7a6ff6b612c94bb797b9d6 100644 (file)
--- a/src/nl.c
+++ b/src/nl.c
@@ -1,5 +1,5 @@
 /* nl -- number lines of files
-   Copyright (C) 89, 92, 1995-2000 Free Software Foundation, Inc.
+   Copyright (C) 89, 92, 1995-2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -181,6 +181,7 @@ Usage: %s [OPTION]... [FILE]...\n\
 Write each FILE to standard output, with line numbers added.\n\
 With no FILE, or when FILE is -, read standard input.\n\
 \n\
+Mandatory arguments to long options are mandatory for short options too.\n\
   -b, --body-numbering=STYLE      use STYLE for numbering body lines\n\
   -d, --section-delimiter=CC      use CC for separating logical pages\n\
   -f, --footer-numbering=STYLE    use STYLE for numbering footer lines\n\

diff --git a/src/od.c b/src/od.c
index fdcbd143bc7496731230a1d58fb30b90056feda7..8d9c69ca2fd05d30ef6cf34ee6e2a0f85fc0f28f 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -282,6 +282,7 @@ of FILE to standard output.  With more than one FILE argument,\n\
 concatenate them in the listed order to form the input.\n\
 With no FILE, or when FILE is -, read standard input.\n\
 \n\
+Mandatory arguments to long options are mandatory for short options too.\n\
   -A, --address-radix=RADIX   decide how file offsets are printed\n\
   -j, --skip-bytes=BYTES      skip BYTES input bytes first\n\
   -N, --read-bytes=BYTES      limit dump to BYTES input bytes\n\

diff --git a/src/paste.c b/src/paste.c
index 8bd4443319b567e0a446e4a2bbad7fad43ea0388..061750286ae733741dad64117762bbe2f7223d2b 100644 (file)
--- a/src/paste.c
+++ b/src/paste.c
@@ -1,5 +1,5 @@
 /* paste - merge lines of files
-   Copyright (C) 1984, 1997, 1998, 1999, 2000 by David M. Ihnat
+   Copyright (C) 1984, 1997, 1998, 1999, 2000, 2001 by David M. Ihnat
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -409,6 +409,7 @@ Write lines consisting of the sequentially corresponding lines from\n\
 each FILE, separated by TABs, to standard output.\n\
 With no FILE, or when FILE is -, read standard input.\n\
 \n\
+Mandatory arguments to long options are mandatory for short options too.\n\
   -d, --delimiters=LIST   reuse characters from LIST instead of TABs\n\
   -s, --serial            paste one file at a time instead of in parallel\n\
       --help              display this help and exit\n\

diff --git a/src/pr.c b/src/pr.c
index 9eb13f8d078d7e942c72d835f90d9852ccf90a3c..aec8367a6a64aaa72cb33dd871910a9307f6b318 100644 (file)
--- a/src/pr.c
+++ b/src/pr.c
@@ -2749,6 +2749,7 @@ Usage: %s [OPTION]... [FILE]...\n\
       printf (_("\
 Paginate or columnate FILE(s) for printing.\n\
 \n\
+Mandatory arguments to long options are mandatory for short options too.\n\
   +FIRST_PAGE[:LAST_PAGE], --pages=FIRST_PAGE[:LAST_PAGE]\n\
                     begin [stop] printing with page FIRST_[LAST_]PAGE\n\
   -COLUMN, --columns=COLUMN\n\

diff --git a/src/sort.c b/src/sort.c
index 17c42633ff44c3028eef80100b92b4494bce25ad..13304c751d9f0fb2506d2c24e949734adbee3872 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -291,6 +291,7 @@ Write sorted concatenation of all FILE(s) to standard output.\n\
 \n\
 Ordering options:\n\
 \n\
+Mandatory arguments to long options are mandatory for short options too.\n\
   -b, --ignore-leading-blanks ignore leading blanks\n\
   -d, --dictionary-order      consider only blanks and alphanumeric characters\n\
   -f, --ignore-case           fold lower case to upper case characters\n\

diff --git a/src/split.c b/src/split.c
index 2632819d3235f7fb4c5d965ab47032de920524bd..a02e64aa634c924dd91e2740c35a6b0a229a50be 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -92,6 +92,7 @@ Usage: %s [OPTION] [INPUT [PREFIX]]\n\
 Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; default\n\
 PREFIX is `x'.  With no INPUT, or when INPUT is -, read standard input.\n\
 \n\
+Mandatory arguments to long options are mandatory for short options too.\n\
   -b, --bytes=SIZE        put SIZE bytes per output file\n\
   -C, --line-bytes=SIZE   put at most SIZE bytes of lines per output file\n\
   -l, --lines=NUMBER      put NUMBER lines per output file\n\

diff --git a/src/tac.c b/src/tac.c
index 7b06de71585ae6ba571087f5cfeee5640de083b8..2b0a2d8be6512df09d41525eff7f14c8d86c4b02 100644 (file)
--- a/src/tac.c
+++ b/src/tac.c
@@ -132,6 +132,7 @@ Usage: %s [OPTION]... [FILE]...\n\
 Write each FILE to standard output, last line first.\n\
 With no FILE, or when FILE is -, read standard input.\n\
 \n\
+Mandatory arguments to long options are mandatory for short options too.\n\
   -b, --before             attach the separator before instead of after\n\
   -r, --regex              interpret the separator as a regular expression\n\
   -s, --separator=STRING   use STRING as the separator instead of newline\n\

diff --git a/src/tail.c b/src/tail.c
index 7b4fa715859c55aa9256ba0fbf238631b23b8b69..18f7bbe0edea56a81754968b035fe704796ff39e 100644 (file)
--- a/src/tail.c
+++ b/src/tail.c
@@ -242,6 +242,7 @@ Print the last %d lines of each FILE to standard output.\n\
 With more than one FILE, precede each with a header giving the file name.\n\
 With no FILE, or when FILE is -, read standard input.\n\
 \n\
+Mandatory arguments to long options are mandatory for short options too.\n\
       --retry              keep trying to open a file even if it is\n\
                            inaccessible when tail starts or if it becomes\n\
                            inaccessible later -- useful only with -f\n\

diff --git a/src/unexpand.c b/src/unexpand.c
index e1485b1ade37c24a1cb00499f625ca28cc7b8b99..ffc858baf2b30357ae4c912caa6b651c2693eba4 100644 (file)
--- a/src/unexpand.c
+++ b/src/unexpand.c
@@ -1,5 +1,5 @@
 /* unexpand - convert spaces to tabs
-   Copyright (C) 89, 91, 1995-2000 Free Software Foundation, Inc.
+   Copyright (C) 89, 91, 1995-2001 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -380,6 +380,7 @@ Usage: %s [OPTION]... [FILE]...\n\
 Convert spaces in each FILE to tabs, writing to standard output.\n\
 With no FILE, or when FILE is -, read standard input.\n\
 \n\
+Mandatory arguments to long options are mandatory for short options too.\n\
   -a, --all           convert all whitespace, instead of initial whitespace\n\
   -t, --tabs=NUMBER   have tabs NUMBER characters apart instead of 8\n\
   -t, --tabs=LIST     use comma separated list of explicit tab positions\n\

diff --git a/src/uniq.c b/src/uniq.c
index 3abb13135ec99a15c174b575dbc03899b1d17031..7ea3a404e04be76d67b0e752e8b2298602b0e581 100644 (file)
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -138,6 +138,7 @@ Usage: %s [OPTION]... [INPUT [OUTPUT]]\n\
 Discard all but one of successive identical lines from INPUT (or\n\
 standard input), writing to OUTPUT (or standard output).\n\
 \n\
+Mandatory arguments to long options are mandatory for short options too.\n\
   -c, --count           prefix lines by the number of occurrences\n\
   -d, --repeated        only print duplicate lines\n\
   -D, --all-repeated[=delimit-method] print all duplicate lines\n\