diff options
author | Pádraig Brady <P@draigBrady.com> | 2015-04-30 14:02:46 +0100 |
---|---|---|
committer | Pádraig Brady <P@draigBrady.com> | 2015-04-30 18:25:01 +0100 |
commit | e981643ae3e57affdf3f4f6aa8bf53cf06433f17 (patch) | |
tree | 410ea5b90407aabda7177a934bce47aaf01d4f7a /src/join.c | |
parent | 88a03548248cac37662f5044df5c35152c5eb937 (diff) | |
download | coreutils-e981643ae3e57affdf3f4f6aa8bf53cf06433f17.tar.xz |
doc: standardize messages about the '-' stdin FILE
* src/system.h (emit_stdin_note): A new function, refactoring
the usage note about the '-' FILE implying stdin.
* src/base64.c (usage): Use the new function to emit the
note in a standard location and with standard separation.
* src/cat.c (usage): Likewise.
* src/csplit.c (usage): Likewise.
* src/cut.c (usage): Likewise.
* src/expand.c (usage): Likewise.
* src/fmt.c (usage): Likewise.
* src/head.c (usage): Likewise.
* src/md5sum.c (usage): Likewise.
* src/nl.c (usage): Likewise.
* src/od.c (usage): Likewise.
* src/paste.c (usage): Likewise.
* src/pr.c (usage): Likewise.
* src/ptx.c (usage): Likewise.
* src/shred.c (usage): Likewise.
* src/shuf.c (usage): Likewise.
* src/sort.c (usage): Likewise.
* src/sum.c (usage): Likewise.
* src/tac.c (usage): Likewise.
* src/tail.c (usage): Likewise.
* src/tsort.c (usage): Likewise.
* src/unexpand.c (usage): Likewise.
* src/wc.c (usage): Likewise.
* src/join.c (usage): Adjust the separation used for
the message referring to FILE1 or FILE2 as stdin.
* src/comm.c (usage): Add a message using the same
wording (translation) as used in join.
* src/split.c (usage): Reword to using FILE rather than
INPUT, allowing use of emit_stdin_note(). Also remove
the mention of "fixed-size" pieces as this isn't now
always the case.
Fixes http://pad.lv/1450179
Diffstat (limited to 'src/join.c')
-rw-r--r-- | src/join.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/join.c b/src/join.c index 0329e023b..52e4b18b3 100644 --- a/src/join.c +++ b/src/join.c @@ -194,8 +194,14 @@ Usage: %s [OPTION]... FILE1 FILE2\n\ program_name); fputs (_("\ For each pair of input lines with identical join fields, write a line to\n\ -standard output. The default join field is the first, delimited\n\ -by whitespace. When FILE1 or FILE2 (not both) is -, read standard input.\n\ +standard output. The default join field is the first, delimited by whitespace.\ +\n\ +"), stdout); + fputs (_("\ +\n\ +When FILE1 or FILE2 (not both) is -, read standard input.\n\ +"), stdout); + fputs (_("\ \n\ -a FILENUM also print unpairable lines from file FILENUM, where\n\ FILENUM is 1 or 2, corresponding to FILE1 or FILE2\n\ |