[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: An error
From: |
Paul Eggert |
Subject: |
Re: An error |
Date: |
Thu, 14 Jun 2007 15:59:52 -0700 |
User-agent: |
Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) |
"James Youngman" <address@hidden> writes:
> Arguably this is a documentation deficiency.
I agree; here's a proposed patch.
2007-06-14 Paul Eggert <address@hidden>
* doc/coreutils.texi (cat invocation): "Blank" lines actually mean
empty lines.
* src/cat.c (usage): Say that "nonblank" means nonempty. Clarify
--squeeze-blank.
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index eb6691d..7290ab2 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -1308,7 +1308,7 @@ Equivalent to @option{-vET}.
@itemx --number-nonblank
@opindex -b
@opindex --number-nonblank
-Number all nonblank output lines, starting with 1.
+Number all nonempty output lines, starting with 1.
@item -e
@opindex -e
@@ -1330,8 +1330,9 @@ Number all output lines, starting with 1.
@itemx --squeeze-blank
@opindex -s
@opindex --squeeze-blank
address@hidden squeezing blank lines
-Replace multiple adjacent blank lines with a single blank line.
address@hidden squeezing empty lines
+Suppress repeated adjacent empty lines; output just one empty line
+instead of several.
@item -t
@opindex -t
diff --git a/src/cat.c b/src/cat.c
index e100a14..a9580e8 100644
--- a/src/cat.c
+++ b/src/cat.c
@@ -100,11 +100,11 @@ 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 nonblank output lines\n\
+ -b, --number-nonblank number nonempty output lines\n\
-e equivalent to -vE\n\
-E, --show-ends display $ at end of each line\n\
-n, --number number all output lines\n\
- -s, --squeeze-blank never more than one single blank line\n\
+ -s, --squeeze-blank suppress repeated empty output lines\n\
"), stdout);
fputs (_("\
-t equivalent to -vT\n\
M ChangeLog
M doc/ChangeLog
M doc/coreutils.texi
M src/cat.c
Committed as c46293d0207ed91e86f4e25109bee6bb5af539ae