From: Eric Blake Date: Wed, 9 Jun 2010 17:13:13 +0000 (-0600) Subject: cat: improve documentation X-Git-Tag: v8.6~138 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=879e8261bbc7cc42f620778155b1e1c9e5ae3ef2;p=thirdparty%2Fcoreutils.git cat: improve documentation * src/cat.c (usage): Clarify that -b overrides -n. * doc/coreutils.texi (cat invocation): Likewise. * THANKS: Update. Suggested by Chas. Owens, in bug 6383. --- diff --git a/THANKS b/THANKS index dce3c94d67..caa40de28f 100644 --- a/THANKS +++ b/THANKS @@ -103,6 +103,7 @@ Carl Roth roth@urs.us Carlos Canau Carlos.Canau@relay.puug.pt Charles Karney karney@pppl.gov Charles Randall crandall@matchlogic.com +Chas. Owens chas.owens@gmail.com Chip Salzenberg chip@valinux.com Chris Clayton chris2553@googlemail.com Chris Faylor cgf@cygnus.com diff --git a/doc/coreutils.texi b/doc/coreutils.texi index 102ceaf97c..f103bd8694 100644 --- a/doc/coreutils.texi +++ b/doc/coreutils.texi @@ -1494,7 +1494,8 @@ Display a @samp{$} after the end of each line. @itemx --number @opindex -n @opindex --number -Number all output lines, starting with 1. +Number all output lines, starting with 1. This option is ignored +if @option{-b} is in effect. @item -s @itemx --squeeze-blank diff --git a/src/cat.c b/src/cat.c index eebfb974dc..c4a2a9e3ca 100644 --- a/src/cat.c +++ b/src/cat.c @@ -92,7 +92,7 @@ Usage: %s [OPTION]... [FILE]...\n\ Concatenate FILE(s), or standard input, to standard output.\n\ \n\ -A, --show-all equivalent to -vET\n\ - -b, --number-nonblank number nonempty output lines\n\ + -b, --number-nonblank number nonempty output lines, overrides -n\n\ -e equivalent to -vE\n\ -E, --show-ends display $ at end of each line\n\ -n, --number number all output lines\n\