Index: ChangeLog =================================================================== RCS file: /cvsroot/grep/grep/ChangeLog,v retrieving revision 1.208 diff -u -r1.208 ChangeLog --- ChangeLog 8 Dec 2004 14:18:29 -0000 1.208 +++ ChangeLog 14 Dec 2004 08:36:56 -0000 @@ -1,3 +1,8 @@ +2004-12-14 Stepan Kasal + + * src/grep.texi: Minor fixes of phrasing. + * src/grep.1: Likewise. + 2004-12-01 Stepan Kasal * src/grep.c (usage): Use ``FILE_PATTERN'' for --include and --exclude, Index: doc/grep.1 =================================================================== RCS file: /cvsroot/grep/grep/doc/grep.1,v retrieving revision 1.26 diff -u -r1.26 grep.1 --- doc/grep.1 8 Dec 2004 14:18:29 -0000 1.26 +++ doc/grep.1 14 Dec 2004 08:36:56 -0000 @@ -127,9 +127,12 @@ terminal driver interprets some of it as commands. .TP .BI \-\^\-colour[=\fIWHEN\fR] ", " \-\^\-color[=\fIWHEN\fR] -Surround the matching string with the marker find in +Surround the matching strings with escape sequences to display them in color +on the terminal. The color is defined by the environment variable .B GREP_COLOR -environment variable. WHEN may be `never', `always', or `auto' +and defaults to `01;31' which means the text is red. +.I WHEN +may be `never', `always', or `auto'. .TP .BR \-c ", " \-\^\-count Suppress normal output; instead print a count of @@ -245,7 +248,7 @@ stop on the first match. .TP .BI \-\^\-label= LABEL -Displays input actually coming from standard input as input coming from file +Display input actually coming from standard input as input coming from file .I LABEL. This is especially useful for tools like zgrep, e.g. .B "gzip -cd foo.gz |grep --label=foo something" Index: doc/grep.texi =================================================================== RCS file: /cvsroot/grep/grep/doc/grep.texi,v retrieving revision 1.48 diff -u -r1.48 grep.texi --- doc/grep.texi 8 Dec 2004 14:18:29 -0000 1.48 +++ doc/grep.texi 14 Dec 2004 08:36:56 -0000 @@ -265,7 +265,9 @@ @itemx address@hidden @opindex --colour @cindex highlight, color, colour -The matching string is surrounded by the marker specify in @var{GREP_COLOR}. +Surround the matching strings with escape sequences to display them in color +on the terminal. The color is defined by the environment variable address@hidden and defaults to `01;31' which means the text is red. @var{WHEN} may be `never', `always', or `auto'. @item address@hidden @@ -362,7 +364,7 @@ @item address@hidden @opindex --label @cindex changing name of standard input -Displays input actually coming from standard input as input coming from file +Display input actually coming from standard input as input coming from file @var{LABEL}. This is especially useful for tools like zgrep, e.g. @command{gzip -cd foo.gz |grep --label=foo something} @@ -574,8 +576,8 @@ @item GREP_COLOR @vindex GREP_COLOR @cindex highlight markers -This variable specifies the surrounding markers use to highlight the matching -text. The default is control ascii red. +This variable specifies the color used to highlight the matching text. +The default is `01;31' which means red text on the default background. @item LC_ALL @itemx LC_COLLATE