Document USG grep -s too.

  Based on a patch by Paul Eggert; suggested by Keith Marshall.

2 files changed, 22 insertions, 14 deletions

diff --git a/doc/grep.1 b/doc/grep.1
index 7cedbc39..51871bcb 100644
--- a/doc/grep.1
+++ b/doc/grep.1
@@ -12,7 +12,7 @@
 .de Id
 .ds Dt \\$4
 ..
-.Id $Id: grep.1,v 1.28 2004/12/15 14:33:38 kasal Exp $
+.Id $Id: grep.1,v 1.29 2005/04/11 23:56:01 julianfoad Exp $
 .TH GREP 1 \*(Dt "GNU Project"
 .SH NAME
 grep, egrep, fgrep \- print lines matching a pattern
@@ -335,25 +335,32 @@ option.
 Suppress error messages about nonexistent or unreadable files.
 Portability note: unlike \s-1GNU\s0
 .BR grep ,
-traditional
+7th Edition Unix
 .B grep
-did not conform to \s-1POSIX.2\s0, because traditional
-.B grep
-lacked a
+did not conform to \s-1POSIX\s0, because it lacked
 .B \-q
-option and its
+and its
 .B \-s
 option behaved like \s-1GNU\s0
 .BR grep 's
 .B \-q
 option.
-Shell scripts intended to be portable to traditional
+\s-1USG\s0-style
 .B grep
+also lacked
+.B \-q
+but its
+.B \-s
+option behaved like \s-1GNU\s0
+.BR grep .
+Portable shell scripts
 should avoid both
 .B \-q
 and
 .B \-s
-and should redirect output to /dev/null instead.
+and should redirect standard and error output to
+.B /dev/null
+instead.
 .TP
 .BR \-U ", " \-\^\-binary
 Treat the file(s) as binary.  By default, under MS-DOS and MS-Windows,
diff --git a/doc/grep.texi b/doc/grep.texi
index 7e1d357f..aca501a1 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -209,13 +209,14 @@ see the @samp{-s} or @samp{--no-messages} option.
 @opindex --no-messages
 @cindex suppress error messages
 Suppress error messages about nonexistent or unreadable files.
-Portability note: unlike @sc{gnu} @command{grep}, traditional
-@command{grep} did not conform to @sc{posix.2}, because traditional
-@command{grep} lacked a @samp{-q} option and its @samp{-s} option behaved
-like @sc{gnu} @command{grep}'s @samp{-q} option.  Shell scripts intended
-to be portable to traditional @command{grep} should avoid both
+Portability note: unlike @sc{gnu} @command{grep}, 7th Edition Unix
+@command{grep} did not conform to @sc{posix}, because it
+lacked @samp{-q} and its @samp{-s} option behaved like @sc{gnu}
+@command{grep}'s @samp{-q} option.  @sc{usg}-style @command{grep}
+also lacked @samp{-q} but its @samp{-s} option behaved like
+@sc{gnu} @command{grep}.  Portable shell scripts should avoid both
 @samp{-q} and @samp{-s} and should redirect
-output to @file{/dev/null} instead.
+standard and error output to @file{/dev/null} instead.
 
 @item -v
 @itemx --invert-match