summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--THANKS1
-rw-r--r--doc/coreutils.texi3
-rw-r--r--src/cat.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/THANKS b/THANKS
index dce3c94d6..caa40de28 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 102ceaf97..f103bd869 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 eebfb974d..c4a2a9e3c 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\