From MAILER-DAEMON Thu Mar 01 10:46:42 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S38DK-0000RR-2W
	for mharc-grep-commit@gnu.org; Thu, 01 Mar 2012 10:46:42 -0500
Received: from eggs.gnu.org ([208.118.235.92]:57976)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1S38DD-0000Q9-W1
	for grep-commit@gnu.org; Thu, 01 Mar 2012 10:46:40 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1S38D4-0002Wi-Tn
	for grep-commit@gnu.org; Thu, 01 Mar 2012 10:46:35 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:40013)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1S38D4-0002Wc-Nl
	for grep-commit@gnu.org; Thu, 01 Mar 2012 10:46:26 -0500
Received: from eggert by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <eggert@cs.ucla.edu>) id 1S38D3-0003iB-2o
	for grep-commit@gnu.org; Thu, 01 Mar 2012 15:46:25 +0000
Date: Thu, 01 Mar 2012 15:46:25 +0000
Message-Id: <E1S38D3-0003iB-2o@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.10-85-g8fcf615
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3732fd2b98692a1e58fa7254fc0cacab8136fb11
X-Git-Newrev: 8fcf61523644df42e1905c81bed26838e0b04f91
From: Paul Eggert <eggert@cs.ucla.edu>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Mar 2012 15:46:41 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  8fcf61523644df42e1905c81bed26838e0b04f91 (commit)
       via  4572ea4649d025e51463d48c2d06a1c66134cdb8 (commit)
       via  a19dc139056aaf09137991bacef364c8fef60168 (commit)
       via  cbbc1a45b9f843c811905c97c90a5d31f8e6c189 (commit)
       via  235aad711285fc6978f6ff26397743930b23f79a (commit)
      from  3732fd2b98692a1e58fa7254fc0cacab8136fb11 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=8fcf61523644df42e1905c81bed26838e0b04f91


commit 8fcf61523644df42e1905c81bed26838e0b04f91
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Wed Feb 29 00:49:40 2012 -0800

    grep: fix integer-overflow issues in main program
    
    * NEWS: Document this.
    * bootstrap.conf (gnulib_modules): Add inttypes, xstrtoimax.
    Remove xstrtoumax.
    * src/main.c: Include <inttypes.h>, for INTMAX_MAX, PRIdMAX.
    (context_length_arg, prtext, grepbuf, grep, grepfile)
    (get_nondigit_option, main):
    Use intmax_t, not int, for line counts.
    (context_length_arg, main): Silently ceiling line counts
    to maximum value, since there's no practical difference between
    doing that and using infinite-precision arithmetic.
    (out_before, out_after, pending): Now intmax_t, not int.
    (max_count, outleft): Now intmax_t, not off_t.
    (prepend_args, prepend_default_options, main):
    Use size_t, not int, for sizes.
    (prepend_default_options): Check for int and size_t overflow.

diff --git a/NEWS b/NEWS
index 47e0ca4..5ff4027 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,11 @@ GNU grep NEWS                                    -*- outline -*-
   GNU C library's regular expression functions cannot handle such long lines.
   [bug present since "the beginning"]
 
+  The -m, -A, -B, and -C options no longer mishandle context line
+  counts that do not fit in 'int'.  Also, grep -c's counts are now
+  limited by the type 'intmax_t' (typically less than 2**63) rather
+  than 'int' (typically less than 2**31).
+
   grep no longer silently suppresses errors when reading a directory
   as if it were a text file.  For example, "grep x ." now reports a
   read error on most systems; formerly, it ignored the error.
diff --git a/bootstrap.conf b/bootstrap.conf
index 2b7a5ec..45bb33d 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -41,6 +41,7 @@ gnupload
 hard-locale
 ignore-value
 intprops
+inttypes
 isatty
 isblank
 isdir
@@ -85,7 +86,7 @@ wcscoll
 wctob
 wctype-h
 xalloc
-xstrtoumax
+xstrtoimax
 '
 gnulib_name=libgreputils
 
diff --git a/src/main.c b/src/main.c
index 3c5f6dd..7d83f4d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -25,6 +25,7 @@
 #include <wchar.h>
 #include <wctype.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include "system.h"
 
@@ -425,17 +426,21 @@ clean_up_stdout (void)
     close_stdout ();
 }
 
-/* Convert STR to a positive integer, storing the result in *OUT.
+/* Convert STR to a nonnegative integer, storing the result in *OUT.
    STR must be a valid context length argument; report an error if it
-   isn't.  */
+   isn't.  Silently ceiling *OUT at the maximum value, as that is
+   practically equivalent to infinity for grep's purposes.  */
 static void
-context_length_arg (char const *str, int *out)
+context_length_arg (char const *str, intmax_t *out)
 {
-  uintmax_t value;
-  if (! (xstrtoumax (str, 0, 10, &value, "") == LONGINT_OK
-         && 0 <= (*out = value)
-         && *out == value))
+  switch (xstrtoimax (str, 0, 10, out, ""))
     {
+    case LONGINT_OK:
+    case LONGINT_OVERFLOW:
+      if (0 <= *out)
+        break;
+      /* Fall through.  */
+    default:
       error (EXIT_TROUBLE, 0, "%s: %s", str,
              _("invalid context length argument"));
     }
@@ -603,12 +608,12 @@ static int out_invert;		/* Print nonmatching stuff. */
 static int out_file;		/* Print filenames. */
 static int out_line;		/* Print line numbers. */
 static int out_byte;		/* Print byte offsets. */
-static int out_before;		/* Lines of leading context. */
-static int out_after;		/* Lines of trailing context. */
+static intmax_t out_before;	/* Lines of leading context. */
+static intmax_t out_after;	/* Lines of trailing context. */
 static int count_matches;	/* Count matching lines.  */
 static int list_files;		/* List matching files.  */
 static int no_filenames;	/* Suppress file names.  */
-static off_t max_count;		/* Stop after outputting this many
+static intmax_t max_count;	/* Stop after outputting this many
                                    lines from an input file.  */
 static int line_buffered;       /* If nonzero, use line buffering, i.e.
                                    fflush everyline out.  */
@@ -622,8 +627,8 @@ static char const *lastout;	/* Pointer after last character output;
                                    NULL if no character has been output
                                    or if it's conceptually before bufbeg. */
 static uintmax_t totalnl;	/* Total newline count before lastnl. */
-static off_t outleft;		/* Maximum number of lines to be output.  */
-static int pending;		/* Pending lines of output.
+static intmax_t outleft;	/* Maximum number of lines to be output.  */
+static intmax_t pending;	/* Pending lines of output.
                                    Always kept 0 if out_quiet is true.  */
 static int done_on_match;	/* Stop scanning file on first match.  */
 static int exit_on_match;	/* Exit on first match.  */
@@ -917,12 +922,12 @@ prpending (char const *lim)
 /* Print the lines between BEG and LIM.  Deal with context crap.
    If NLINESP is non-null, store a count of lines between BEG and LIM.  */
 static void
-prtext (char const *beg, char const *lim, int *nlinesp)
+prtext (char const *beg, char const *lim, intmax_t *nlinesp)
 {
   static int used;	/* avoid printing SEP_STR_GROUP before any output */
   char const *bp, *p;
   char eol = eolbyte;
-  int i, n;
+  intmax_t i, n;
 
   if (!out_quiet && pending > 0)
     prpending (beg);
@@ -1026,10 +1031,10 @@ do_execute (char const *buf, size_t size, size_t *match_size, char const *start_
 /* Scan the specified portion of the buffer, matching lines (or
    between matching lines if OUT_INVERT is true).  Return a count of
    lines printed. */
-static int
+static intmax_t
 grepbuf (char const *beg, char const *lim)
 {
-  int nlines, n;
+  intmax_t nlines, n;
   char const *p;
   size_t match_offset;
   size_t match_size;
@@ -1046,7 +1051,7 @@ grepbuf (char const *beg, char const *lim)
         break;
       if (!out_invert)
         {
-          prtext (b, endp, (int *) 0);
+          prtext (b, endp, NULL);
           nlines++;
           outleft--;
           if (!outleft || done_on_match)
@@ -1079,10 +1084,10 @@ grepbuf (char const *beg, char const *lim)
 /* Search a given file.  Normally, return a count of lines printed;
    but if the file is a directory and we search it recursively, then
    return -2 if there was a match, and -1 otherwise.  */
-static int
+static intmax_t
 grep (int fd, char const *file, struct stats *stats)
 {
-  int nlines, i;
+  intmax_t nlines, i;
   int not_text;
   size_t residue, save;
   char oldc;
@@ -1212,7 +1217,7 @@ static int
 grepfile (char const *file, struct stats *stats)
 {
   int desc;
-  int count;
+  intmax_t count;
   int status;
 
   filename = (file ? file : label ? label : _("(standard input)"));
@@ -1319,7 +1324,7 @@ grepfile (char const *file, struct stats *stats)
               else
                 fputc (0, stdout);
             }
-          printf ("%d\n", count);
+          printf ("%" PRIdMAX "\n", count);
         }
 
       status = !count;
@@ -1590,12 +1595,12 @@ setmatcher (char const *m)
    etc. to the option copies.  Return the number N of options found.
    Do not set ARGV[N] to NULL.  If ARGV is NULL, do not store ARGV[0]
    etc.  Backslash can be used to escape whitespace (and backslashes).  */
-static int
+static size_t
 prepend_args (char const *options, char *buf, char **argv)
 {
   char const *o = options;
   char *b = buf;
-  int n = 0;
+  size_t n = 0;
 
   for (;;)
     {
@@ -1625,10 +1630,14 @@ prepend_default_options (char const *options, int *pargc, char ***pargv)
   if (options && *options)
     {
       char *buf = xmalloc (strlen (options) + 1);
-      int prepended = prepend_args (options, buf, (char **) NULL);
+      size_t prepended = prepend_args (options, buf, NULL);
       int argc = *pargc;
       char *const *argv = *pargv;
-      char **pp = xmalloc ((prepended + argc + 1) * sizeof *pp);
+      char **pp;
+      enum { MAX_ARGS = MIN (INT_MAX, SIZE_MAX / sizeof *pp - 1) };
+      if (MAX_ARGS - argc < prepended)
+        xalloc_die ();
+      pp = xmalloc ((prepended + argc + 1) * sizeof *pp);
       *pargc = prepended + argc;
       *pargv = pp;
       *pp++ = *argv++;
@@ -1646,11 +1655,11 @@ prepend_default_options (char const *options, int *pargc, char ***pargv)
    Process any digit options that were encountered on the way,
    and store the resulting integer into *DEFAULT_CONTEXT.  */
 static int
-get_nondigit_option (int argc, char *const *argv, int *default_context)
+get_nondigit_option (int argc, char *const *argv, intmax_t *default_context)
 {
   static int prev_digit_optind = -1;
   int opt, this_digit_optind, was_digit;
-  char buf[sizeof (uintmax_t) * CHAR_BIT + 4];
+  char buf[INT_BUFSIZE_BOUND (intmax_t) + 4];
   char *p = buf;
 
   was_digit = 0;
@@ -1760,11 +1769,11 @@ main (int argc, char **argv)
   char *keys;
   size_t keycc, oldcc, keyalloc;
   int with_filenames;
-  int opt, cc, status, prepended;
+  size_t cc;
+  int opt, status, prepended;
   int prev_optind, last_recursive;
-  int default_context;
+  intmax_t default_context;
   FILE *fp;
-
   exit_failure = EXIT_TROUBLE;
   initialize_main (&argc, &argv);
   set_program_name (argv[0]);
@@ -1776,7 +1785,7 @@ main (int argc, char **argv)
   eolbyte = '\n';
   filename_mask = ~0;
 
-  max_count = TYPE_MAXIMUM (off_t);
+  max_count = INTMAX_MAX;
 
   /* The value -1 means to use DEFAULT_CONTEXT. */
   out_after = out_before = -1;
@@ -1947,23 +1956,15 @@ main (int argc, char **argv)
         break;
 
       case 'm':
-        {
-          uintmax_t value;
-          switch (xstrtoumax (optarg, 0, 10, &value, ""))
-            {
-            case LONGINT_OK:
-              max_count = value;
-              if (0 <= max_count && max_count == value)
-                break;
-              /* Fall through.  */
-            case LONGINT_OVERFLOW:
-              max_count = TYPE_MAXIMUM (off_t);
-              break;
+        switch (xstrtoimax (optarg, 0, 10, &max_count, ""))
+          {
+          case LONGINT_OK:
+          case LONGINT_OVERFLOW:
+            break;
 
-            default:
-              error (EXIT_TROUBLE, 0, _("invalid max count"));
-            }
-        }
+          default:
+            error (EXIT_TROUBLE, 0, _("invalid max count"));
+          }
         break;
 
       case 'n':

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=4572ea4649d025e51463d48c2d06a1c66134cdb8


commit 8fcf61523644df42e1905c81bed26838e0b04f91
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Wed Feb 29 00:49:40 2012 -0800

    grep: fix integer-overflow issues in main program
    
    * NEWS: Document this.
    * bootstrap.conf (gnulib_modules): Add inttypes, xstrtoimax.
    Remove xstrtoumax.
    * src/main.c: Include <inttypes.h>, for INTMAX_MAX, PRIdMAX.
    (context_length_arg, prtext, grepbuf, grep, grepfile)
    (get_nondigit_option, main):
    Use intmax_t, not int, for line counts.
    (context_length_arg, main): Silently ceiling line counts
    to maximum value, since there's no practical difference between
    doing that and using infinite-precision arithmetic.
    (out_before, out_after, pending): Now intmax_t, not int.
    (max_count, outleft): Now intmax_t, not off_t.
    (prepend_args, prepend_default_options, main):
    Use size_t, not int, for sizes.
    (prepend_default_options): Check for int and size_t overflow.

diff --git a/NEWS b/NEWS
index 47e0ca4..5ff4027 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,11 @@ GNU grep NEWS                                    -*- outline -*-
   GNU C library's regular expression functions cannot handle such long lines.
   [bug present since "the beginning"]
 
+  The -m, -A, -B, and -C options no longer mishandle context line
+  counts that do not fit in 'int'.  Also, grep -c's counts are now
+  limited by the type 'intmax_t' (typically less than 2**63) rather
+  than 'int' (typically less than 2**31).
+
   grep no longer silently suppresses errors when reading a directory
   as if it were a text file.  For example, "grep x ." now reports a
   read error on most systems; formerly, it ignored the error.
diff --git a/bootstrap.conf b/bootstrap.conf
index 2b7a5ec..45bb33d 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -41,6 +41,7 @@ gnupload
 hard-locale
 ignore-value
 intprops
+inttypes
 isatty
 isblank
 isdir
@@ -85,7 +86,7 @@ wcscoll
 wctob
 wctype-h
 xalloc
-xstrtoumax
+xstrtoimax
 '
 gnulib_name=libgreputils
 
diff --git a/src/main.c b/src/main.c
index 3c5f6dd..7d83f4d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -25,6 +25,7 @@
 #include <wchar.h>
 #include <wctype.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include "system.h"
 
@@ -425,17 +426,21 @@ clean_up_stdout (void)
     close_stdout ();
 }
 
-/* Convert STR to a positive integer, storing the result in *OUT.
+/* Convert STR to a nonnegative integer, storing the result in *OUT.
    STR must be a valid context length argument; report an error if it
-   isn't.  */
+   isn't.  Silently ceiling *OUT at the maximum value, as that is
+   practically equivalent to infinity for grep's purposes.  */
 static void
-context_length_arg (char const *str, int *out)
+context_length_arg (char const *str, intmax_t *out)
 {
-  uintmax_t value;
-  if (! (xstrtoumax (str, 0, 10, &value, "") == LONGINT_OK
-         && 0 <= (*out = value)
-         && *out == value))
+  switch (xstrtoimax (str, 0, 10, out, ""))
     {
+    case LONGINT_OK:
+    case LONGINT_OVERFLOW:
+      if (0 <= *out)
+        break;
+      /* Fall through.  */
+    default:
       error (EXIT_TROUBLE, 0, "%s: %s", str,
              _("invalid context length argument"));
     }
@@ -603,12 +608,12 @@ static int out_invert;		/* Print nonmatching stuff. */
 static int out_file;		/* Print filenames. */
 static int out_line;		/* Print line numbers. */
 static int out_byte;		/* Print byte offsets. */
-static int out_before;		/* Lines of leading context. */
-static int out_after;		/* Lines of trailing context. */
+static intmax_t out_before;	/* Lines of leading context. */
+static intmax_t out_after;	/* Lines of trailing context. */
 static int count_matches;	/* Count matching lines.  */
 static int list_files;		/* List matching files.  */
 static int no_filenames;	/* Suppress file names.  */
-static off_t max_count;		/* Stop after outputting this many
+static intmax_t max_count;	/* Stop after outputting this many
                                    lines from an input file.  */
 static int line_buffered;       /* If nonzero, use line buffering, i.e.
                                    fflush everyline out.  */
@@ -622,8 +627,8 @@ static char const *lastout;	/* Pointer after last character output;
                                    NULL if no character has been output
                                    or if it's conceptually before bufbeg. */
 static uintmax_t totalnl;	/* Total newline count before lastnl. */
-static off_t outleft;		/* Maximum number of lines to be output.  */
-static int pending;		/* Pending lines of output.
+static intmax_t outleft;	/* Maximum number of lines to be output.  */
+static intmax_t pending;	/* Pending lines of output.
                                    Always kept 0 if out_quiet is true.  */
 static int done_on_match;	/* Stop scanning file on first match.  */
 static int exit_on_match;	/* Exit on first match.  */
@@ -917,12 +922,12 @@ prpending (char const *lim)
 /* Print the lines between BEG and LIM.  Deal with context crap.
    If NLINESP is non-null, store a count of lines between BEG and LIM.  */
 static void
-prtext (char const *beg, char const *lim, int *nlinesp)
+prtext (char const *beg, char const *lim, intmax_t *nlinesp)
 {
   static int used;	/* avoid printing SEP_STR_GROUP before any output */
   char const *bp, *p;
   char eol = eolbyte;
-  int i, n;
+  intmax_t i, n;
 
   if (!out_quiet && pending > 0)
     prpending (beg);
@@ -1026,10 +1031,10 @@ do_execute (char const *buf, size_t size, size_t *match_size, char const *start_
 /* Scan the specified portion of the buffer, matching lines (or
    between matching lines if OUT_INVERT is true).  Return a count of
    lines printed. */
-static int
+static intmax_t
 grepbuf (char const *beg, char const *lim)
 {
-  int nlines, n;
+  intmax_t nlines, n;
   char const *p;
   size_t match_offset;
   size_t match_size;
@@ -1046,7 +1051,7 @@ grepbuf (char const *beg, char const *lim)
         break;
       if (!out_invert)
         {
-          prtext (b, endp, (int *) 0);
+          prtext (b, endp, NULL);
           nlines++;
           outleft--;
           if (!outleft || done_on_match)
@@ -1079,10 +1084,10 @@ grepbuf (char const *beg, char const *lim)
 /* Search a given file.  Normally, return a count of lines printed;
    but if the file is a directory and we search it recursively, then
    return -2 if there was a match, and -1 otherwise.  */
-static int
+static intmax_t
 grep (int fd, char const *file, struct stats *stats)
 {
-  int nlines, i;
+  intmax_t nlines, i;
   int not_text;
   size_t residue, save;
   char oldc;
@@ -1212,7 +1217,7 @@ static int
 grepfile (char const *file, struct stats *stats)
 {
   int desc;
-  int count;
+  intmax_t count;
   int status;
 
   filename = (file ? file : label ? label : _("(standard input)"));
@@ -1319,7 +1324,7 @@ grepfile (char const *file, struct stats *stats)
               else
                 fputc (0, stdout);
             }
-          printf ("%d\n", count);
+          printf ("%" PRIdMAX "\n", count);
         }
 
       status = !count;
@@ -1590,12 +1595,12 @@ setmatcher (char const *m)
    etc. to the option copies.  Return the number N of options found.
    Do not set ARGV[N] to NULL.  If ARGV is NULL, do not store ARGV[0]
    etc.  Backslash can be used to escape whitespace (and backslashes).  */
-static int
+static size_t
 prepend_args (char const *options, char *buf, char **argv)
 {
   char const *o = options;
   char *b = buf;
-  int n = 0;
+  size_t n = 0;
 
   for (;;)
     {
@@ -1625,10 +1630,14 @@ prepend_default_options (char const *options, int *pargc, char ***pargv)
   if (options && *options)
     {
       char *buf = xmalloc (strlen (options) + 1);
-      int prepended = prepend_args (options, buf, (char **) NULL);
+      size_t prepended = prepend_args (options, buf, NULL);
       int argc = *pargc;
       char *const *argv = *pargv;
-      char **pp = xmalloc ((prepended + argc + 1) * sizeof *pp);
+      char **pp;
+      enum { MAX_ARGS = MIN (INT_MAX, SIZE_MAX / sizeof *pp - 1) };
+      if (MAX_ARGS - argc < prepended)
+        xalloc_die ();
+      pp = xmalloc ((prepended + argc + 1) * sizeof *pp);
       *pargc = prepended + argc;
       *pargv = pp;
       *pp++ = *argv++;
@@ -1646,11 +1655,11 @@ prepend_default_options (char const *options, int *pargc, char ***pargv)
    Process any digit options that were encountered on the way,
    and store the resulting integer into *DEFAULT_CONTEXT.  */
 static int
-get_nondigit_option (int argc, char *const *argv, int *default_context)
+get_nondigit_option (int argc, char *const *argv, intmax_t *default_context)
 {
   static int prev_digit_optind = -1;
   int opt, this_digit_optind, was_digit;
-  char buf[sizeof (uintmax_t) * CHAR_BIT + 4];
+  char buf[INT_BUFSIZE_BOUND (intmax_t) + 4];
   char *p = buf;
 
   was_digit = 0;
@@ -1760,11 +1769,11 @@ main (int argc, char **argv)
   char *keys;
   size_t keycc, oldcc, keyalloc;
   int with_filenames;
-  int opt, cc, status, prepended;
+  size_t cc;
+  int opt, status, prepended;
   int prev_optind, last_recursive;
-  int default_context;
+  intmax_t default_context;
   FILE *fp;
-
   exit_failure = EXIT_TROUBLE;
   initialize_main (&argc, &argv);
   set_program_name (argv[0]);
@@ -1776,7 +1785,7 @@ main (int argc, char **argv)
   eolbyte = '\n';
   filename_mask = ~0;
 
-  max_count = TYPE_MAXIMUM (off_t);
+  max_count = INTMAX_MAX;
 
   /* The value -1 means to use DEFAULT_CONTEXT. */
   out_after = out_before = -1;
@@ -1947,23 +1956,15 @@ main (int argc, char **argv)
         break;
 
       case 'm':
-        {
-          uintmax_t value;
-          switch (xstrtoumax (optarg, 0, 10, &value, ""))
-            {
-            case LONGINT_OK:
-              max_count = value;
-              if (0 <= max_count && max_count == value)
-                break;
-              /* Fall through.  */
-            case LONGINT_OVERFLOW:
-              max_count = TYPE_MAXIMUM (off_t);
-              break;
+        switch (xstrtoimax (optarg, 0, 10, &max_count, ""))
+          {
+          case LONGINT_OK:
+          case LONGINT_OVERFLOW:
+            break;
 
-            default:
-              error (EXIT_TROUBLE, 0, _("invalid max count"));
-            }
-        }
+          default:
+            error (EXIT_TROUBLE, 0, _("invalid max count"));
+          }
         break;
 
       case 'n':

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=a19dc139056aaf09137991bacef364c8fef60168


commit 8fcf61523644df42e1905c81bed26838e0b04f91
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Wed Feb 29 00:49:40 2012 -0800

    grep: fix integer-overflow issues in main program
    
    * NEWS: Document this.
    * bootstrap.conf (gnulib_modules): Add inttypes, xstrtoimax.
    Remove xstrtoumax.
    * src/main.c: Include <inttypes.h>, for INTMAX_MAX, PRIdMAX.
    (context_length_arg, prtext, grepbuf, grep, grepfile)
    (get_nondigit_option, main):
    Use intmax_t, not int, for line counts.
    (context_length_arg, main): Silently ceiling line counts
    to maximum value, since there's no practical difference between
    doing that and using infinite-precision arithmetic.
    (out_before, out_after, pending): Now intmax_t, not int.
    (max_count, outleft): Now intmax_t, not off_t.
    (prepend_args, prepend_default_options, main):
    Use size_t, not int, for sizes.
    (prepend_default_options): Check for int and size_t overflow.

diff --git a/NEWS b/NEWS
index 47e0ca4..5ff4027 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,11 @@ GNU grep NEWS                                    -*- outline -*-
   GNU C library's regular expression functions cannot handle such long lines.
   [bug present since "the beginning"]
 
+  The -m, -A, -B, and -C options no longer mishandle context line
+  counts that do not fit in 'int'.  Also, grep -c's counts are now
+  limited by the type 'intmax_t' (typically less than 2**63) rather
+  than 'int' (typically less than 2**31).
+
   grep no longer silently suppresses errors when reading a directory
   as if it were a text file.  For example, "grep x ." now reports a
   read error on most systems; formerly, it ignored the error.
diff --git a/bootstrap.conf b/bootstrap.conf
index 2b7a5ec..45bb33d 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -41,6 +41,7 @@ gnupload
 hard-locale
 ignore-value
 intprops
+inttypes
 isatty
 isblank
 isdir
@@ -85,7 +86,7 @@ wcscoll
 wctob
 wctype-h
 xalloc
-xstrtoumax
+xstrtoimax
 '
 gnulib_name=libgreputils
 
diff --git a/src/main.c b/src/main.c
index 3c5f6dd..7d83f4d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -25,6 +25,7 @@
 #include <wchar.h>
 #include <wctype.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include "system.h"
 
@@ -425,17 +426,21 @@ clean_up_stdout (void)
     close_stdout ();
 }
 
-/* Convert STR to a positive integer, storing the result in *OUT.
+/* Convert STR to a nonnegative integer, storing the result in *OUT.
    STR must be a valid context length argument; report an error if it
-   isn't.  */
+   isn't.  Silently ceiling *OUT at the maximum value, as that is
+   practically equivalent to infinity for grep's purposes.  */
 static void
-context_length_arg (char const *str, int *out)
+context_length_arg (char const *str, intmax_t *out)
 {
-  uintmax_t value;
-  if (! (xstrtoumax (str, 0, 10, &value, "") == LONGINT_OK
-         && 0 <= (*out = value)
-         && *out == value))
+  switch (xstrtoimax (str, 0, 10, out, ""))
     {
+    case LONGINT_OK:
+    case LONGINT_OVERFLOW:
+      if (0 <= *out)
+        break;
+      /* Fall through.  */
+    default:
       error (EXIT_TROUBLE, 0, "%s: %s", str,
              _("invalid context length argument"));
     }
@@ -603,12 +608,12 @@ static int out_invert;		/* Print nonmatching stuff. */
 static int out_file;		/* Print filenames. */
 static int out_line;		/* Print line numbers. */
 static int out_byte;		/* Print byte offsets. */
-static int out_before;		/* Lines of leading context. */
-static int out_after;		/* Lines of trailing context. */
+static intmax_t out_before;	/* Lines of leading context. */
+static intmax_t out_after;	/* Lines of trailing context. */
 static int count_matches;	/* Count matching lines.  */
 static int list_files;		/* List matching files.  */
 static int no_filenames;	/* Suppress file names.  */
-static off_t max_count;		/* Stop after outputting this many
+static intmax_t max_count;	/* Stop after outputting this many
                                    lines from an input file.  */
 static int line_buffered;       /* If nonzero, use line buffering, i.e.
                                    fflush everyline out.  */
@@ -622,8 +627,8 @@ static char const *lastout;	/* Pointer after last character output;
                                    NULL if no character has been output
                                    or if it's conceptually before bufbeg. */
 static uintmax_t totalnl;	/* Total newline count before lastnl. */
-static off_t outleft;		/* Maximum number of lines to be output.  */
-static int pending;		/* Pending lines of output.
+static intmax_t outleft;	/* Maximum number of lines to be output.  */
+static intmax_t pending;	/* Pending lines of output.
                                    Always kept 0 if out_quiet is true.  */
 static int done_on_match;	/* Stop scanning file on first match.  */
 static int exit_on_match;	/* Exit on first match.  */
@@ -917,12 +922,12 @@ prpending (char const *lim)
 /* Print the lines between BEG and LIM.  Deal with context crap.
    If NLINESP is non-null, store a count of lines between BEG and LIM.  */
 static void
-prtext (char const *beg, char const *lim, int *nlinesp)
+prtext (char const *beg, char const *lim, intmax_t *nlinesp)
 {
   static int used;	/* avoid printing SEP_STR_GROUP before any output */
   char const *bp, *p;
   char eol = eolbyte;
-  int i, n;
+  intmax_t i, n;
 
   if (!out_quiet && pending > 0)
     prpending (beg);
@@ -1026,10 +1031,10 @@ do_execute (char const *buf, size_t size, size_t *match_size, char const *start_
 /* Scan the specified portion of the buffer, matching lines (or
    between matching lines if OUT_INVERT is true).  Return a count of
    lines printed. */
-static int
+static intmax_t
 grepbuf (char const *beg, char const *lim)
 {
-  int nlines, n;
+  intmax_t nlines, n;
   char const *p;
   size_t match_offset;
   size_t match_size;
@@ -1046,7 +1051,7 @@ grepbuf (char const *beg, char const *lim)
         break;
       if (!out_invert)
         {
-          prtext (b, endp, (int *) 0);
+          prtext (b, endp, NULL);
           nlines++;
           outleft--;
           if (!outleft || done_on_match)
@@ -1079,10 +1084,10 @@ grepbuf (char const *beg, char const *lim)
 /* Search a given file.  Normally, return a count of lines printed;
    but if the file is a directory and we search it recursively, then
    return -2 if there was a match, and -1 otherwise.  */
-static int
+static intmax_t
 grep (int fd, char const *file, struct stats *stats)
 {
-  int nlines, i;
+  intmax_t nlines, i;
   int not_text;
   size_t residue, save;
   char oldc;
@@ -1212,7 +1217,7 @@ static int
 grepfile (char const *file, struct stats *stats)
 {
   int desc;
-  int count;
+  intmax_t count;
   int status;
 
   filename = (file ? file : label ? label : _("(standard input)"));
@@ -1319,7 +1324,7 @@ grepfile (char const *file, struct stats *stats)
               else
                 fputc (0, stdout);
             }
-          printf ("%d\n", count);
+          printf ("%" PRIdMAX "\n", count);
         }
 
       status = !count;
@@ -1590,12 +1595,12 @@ setmatcher (char const *m)
    etc. to the option copies.  Return the number N of options found.
    Do not set ARGV[N] to NULL.  If ARGV is NULL, do not store ARGV[0]
    etc.  Backslash can be used to escape whitespace (and backslashes).  */
-static int
+static size_t
 prepend_args (char const *options, char *buf, char **argv)
 {
   char const *o = options;
   char *b = buf;
-  int n = 0;
+  size_t n = 0;
 
   for (;;)
     {
@@ -1625,10 +1630,14 @@ prepend_default_options (char const *options, int *pargc, char ***pargv)
   if (options && *options)
     {
       char *buf = xmalloc (strlen (options) + 1);
-      int prepended = prepend_args (options, buf, (char **) NULL);
+      size_t prepended = prepend_args (options, buf, NULL);
       int argc = *pargc;
       char *const *argv = *pargv;
-      char **pp = xmalloc ((prepended + argc + 1) * sizeof *pp);
+      char **pp;
+      enum { MAX_ARGS = MIN (INT_MAX, SIZE_MAX / sizeof *pp - 1) };
+      if (MAX_ARGS - argc < prepended)
+        xalloc_die ();
+      pp = xmalloc ((prepended + argc + 1) * sizeof *pp);
       *pargc = prepended + argc;
       *pargv = pp;
       *pp++ = *argv++;
@@ -1646,11 +1655,11 @@ prepend_default_options (char const *options, int *pargc, char ***pargv)
    Process any digit options that were encountered on the way,
    and store the resulting integer into *DEFAULT_CONTEXT.  */
 static int
-get_nondigit_option (int argc, char *const *argv, int *default_context)
+get_nondigit_option (int argc, char *const *argv, intmax_t *default_context)
 {
   static int prev_digit_optind = -1;
   int opt, this_digit_optind, was_digit;
-  char buf[sizeof (uintmax_t) * CHAR_BIT + 4];
+  char buf[INT_BUFSIZE_BOUND (intmax_t) + 4];
   char *p = buf;
 
   was_digit = 0;
@@ -1760,11 +1769,11 @@ main (int argc, char **argv)
   char *keys;
   size_t keycc, oldcc, keyalloc;
   int with_filenames;
-  int opt, cc, status, prepended;
+  size_t cc;
+  int opt, status, prepended;
   int prev_optind, last_recursive;
-  int default_context;
+  intmax_t default_context;
   FILE *fp;
-
   exit_failure = EXIT_TROUBLE;
   initialize_main (&argc, &argv);
   set_program_name (argv[0]);
@@ -1776,7 +1785,7 @@ main (int argc, char **argv)
   eolbyte = '\n';
   filename_mask = ~0;
 
-  max_count = TYPE_MAXIMUM (off_t);
+  max_count = INTMAX_MAX;
 
   /* The value -1 means to use DEFAULT_CONTEXT. */
   out_after = out_before = -1;
@@ -1947,23 +1956,15 @@ main (int argc, char **argv)
         break;
 
       case 'm':
-        {
-          uintmax_t value;
-          switch (xstrtoumax (optarg, 0, 10, &value, ""))
-            {
-            case LONGINT_OK:
-              max_count = value;
-              if (0 <= max_count && max_count == value)
-                break;
-              /* Fall through.  */
-            case LONGINT_OVERFLOW:
-              max_count = TYPE_MAXIMUM (off_t);
-              break;
+        switch (xstrtoimax (optarg, 0, 10, &max_count, ""))
+          {
+          case LONGINT_OK:
+          case LONGINT_OVERFLOW:
+            break;
 
-            default:
-              error (EXIT_TROUBLE, 0, _("invalid max count"));
-            }
-        }
+          default:
+            error (EXIT_TROUBLE, 0, _("invalid max count"));
+          }
         break;
 
       case 'n':

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=cbbc1a45b9f843c811905c97c90a5d31f8e6c189


commit 8fcf61523644df42e1905c81bed26838e0b04f91
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Wed Feb 29 00:49:40 2012 -0800

    grep: fix integer-overflow issues in main program
    
    * NEWS: Document this.
    * bootstrap.conf (gnulib_modules): Add inttypes, xstrtoimax.
    Remove xstrtoumax.
    * src/main.c: Include <inttypes.h>, for INTMAX_MAX, PRIdMAX.
    (context_length_arg, prtext, grepbuf, grep, grepfile)
    (get_nondigit_option, main):
    Use intmax_t, not int, for line counts.
    (context_length_arg, main): Silently ceiling line counts
    to maximum value, since there's no practical difference between
    doing that and using infinite-precision arithmetic.
    (out_before, out_after, pending): Now intmax_t, not int.
    (max_count, outleft): Now intmax_t, not off_t.
    (prepend_args, prepend_default_options, main):
    Use size_t, not int, for sizes.
    (prepend_default_options): Check for int and size_t overflow.

diff --git a/NEWS b/NEWS
index 47e0ca4..5ff4027 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,11 @@ GNU grep NEWS                                    -*- outline -*-
   GNU C library's regular expression functions cannot handle such long lines.
   [bug present since "the beginning"]
 
+  The -m, -A, -B, and -C options no longer mishandle context line
+  counts that do not fit in 'int'.  Also, grep -c's counts are now
+  limited by the type 'intmax_t' (typically less than 2**63) rather
+  than 'int' (typically less than 2**31).
+
   grep no longer silently suppresses errors when reading a directory
   as if it were a text file.  For example, "grep x ." now reports a
   read error on most systems; formerly, it ignored the error.
diff --git a/bootstrap.conf b/bootstrap.conf
index 2b7a5ec..45bb33d 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -41,6 +41,7 @@ gnupload
 hard-locale
 ignore-value
 intprops
+inttypes
 isatty
 isblank
 isdir
@@ -85,7 +86,7 @@ wcscoll
 wctob
 wctype-h
 xalloc
-xstrtoumax
+xstrtoimax
 '
 gnulib_name=libgreputils
 
diff --git a/src/main.c b/src/main.c
index 3c5f6dd..7d83f4d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -25,6 +25,7 @@
 #include <wchar.h>
 #include <wctype.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include "system.h"
 
@@ -425,17 +426,21 @@ clean_up_stdout (void)
     close_stdout ();
 }
 
-/* Convert STR to a positive integer, storing the result in *OUT.
+/* Convert STR to a nonnegative integer, storing the result in *OUT.
    STR must be a valid context length argument; report an error if it
-   isn't.  */
+   isn't.  Silently ceiling *OUT at the maximum value, as that is
+   practically equivalent to infinity for grep's purposes.  */
 static void
-context_length_arg (char const *str, int *out)
+context_length_arg (char const *str, intmax_t *out)
 {
-  uintmax_t value;
-  if (! (xstrtoumax (str, 0, 10, &value, "") == LONGINT_OK
-         && 0 <= (*out = value)
-         && *out == value))
+  switch (xstrtoimax (str, 0, 10, out, ""))
     {
+    case LONGINT_OK:
+    case LONGINT_OVERFLOW:
+      if (0 <= *out)
+        break;
+      /* Fall through.  */
+    default:
       error (EXIT_TROUBLE, 0, "%s: %s", str,
              _("invalid context length argument"));
     }
@@ -603,12 +608,12 @@ static int out_invert;		/* Print nonmatching stuff. */
 static int out_file;		/* Print filenames. */
 static int out_line;		/* Print line numbers. */
 static int out_byte;		/* Print byte offsets. */
-static int out_before;		/* Lines of leading context. */
-static int out_after;		/* Lines of trailing context. */
+static intmax_t out_before;	/* Lines of leading context. */
+static intmax_t out_after;	/* Lines of trailing context. */
 static int count_matches;	/* Count matching lines.  */
 static int list_files;		/* List matching files.  */
 static int no_filenames;	/* Suppress file names.  */
-static off_t max_count;		/* Stop after outputting this many
+static intmax_t max_count;	/* Stop after outputting this many
                                    lines from an input file.  */
 static int line_buffered;       /* If nonzero, use line buffering, i.e.
                                    fflush everyline out.  */
@@ -622,8 +627,8 @@ static char const *lastout;	/* Pointer after last character output;
                                    NULL if no character has been output
                                    or if it's conceptually before bufbeg. */
 static uintmax_t totalnl;	/* Total newline count before lastnl. */
-static off_t outleft;		/* Maximum number of lines to be output.  */
-static int pending;		/* Pending lines of output.
+static intmax_t outleft;	/* Maximum number of lines to be output.  */
+static intmax_t pending;	/* Pending lines of output.
                                    Always kept 0 if out_quiet is true.  */
 static int done_on_match;	/* Stop scanning file on first match.  */
 static int exit_on_match;	/* Exit on first match.  */
@@ -917,12 +922,12 @@ prpending (char const *lim)
 /* Print the lines between BEG and LIM.  Deal with context crap.
    If NLINESP is non-null, store a count of lines between BEG and LIM.  */
 static void
-prtext (char const *beg, char const *lim, int *nlinesp)
+prtext (char const *beg, char const *lim, intmax_t *nlinesp)
 {
   static int used;	/* avoid printing SEP_STR_GROUP before any output */
   char const *bp, *p;
   char eol = eolbyte;
-  int i, n;
+  intmax_t i, n;
 
   if (!out_quiet && pending > 0)
     prpending (beg);
@@ -1026,10 +1031,10 @@ do_execute (char const *buf, size_t size, size_t *match_size, char const *start_
 /* Scan the specified portion of the buffer, matching lines (or
    between matching lines if OUT_INVERT is true).  Return a count of
    lines printed. */
-static int
+static intmax_t
 grepbuf (char const *beg, char const *lim)
 {
-  int nlines, n;
+  intmax_t nlines, n;
   char const *p;
   size_t match_offset;
   size_t match_size;
@@ -1046,7 +1051,7 @@ grepbuf (char const *beg, char const *lim)
         break;
       if (!out_invert)
         {
-          prtext (b, endp, (int *) 0);
+          prtext (b, endp, NULL);
           nlines++;
           outleft--;
           if (!outleft || done_on_match)
@@ -1079,10 +1084,10 @@ grepbuf (char const *beg, char const *lim)
 /* Search a given file.  Normally, return a count of lines printed;
    but if the file is a directory and we search it recursively, then
    return -2 if there was a match, and -1 otherwise.  */
-static int
+static intmax_t
 grep (int fd, char const *file, struct stats *stats)
 {
-  int nlines, i;
+  intmax_t nlines, i;
   int not_text;
   size_t residue, save;
   char oldc;
@@ -1212,7 +1217,7 @@ static int
 grepfile (char const *file, struct stats *stats)
 {
   int desc;
-  int count;
+  intmax_t count;
   int status;
 
   filename = (file ? file : label ? label : _("(standard input)"));
@@ -1319,7 +1324,7 @@ grepfile (char const *file, struct stats *stats)
               else
                 fputc (0, stdout);
             }
-          printf ("%d\n", count);
+          printf ("%" PRIdMAX "\n", count);
         }
 
       status = !count;
@@ -1590,12 +1595,12 @@ setmatcher (char const *m)
    etc. to the option copies.  Return the number N of options found.
    Do not set ARGV[N] to NULL.  If ARGV is NULL, do not store ARGV[0]
    etc.  Backslash can be used to escape whitespace (and backslashes).  */
-static int
+static size_t
 prepend_args (char const *options, char *buf, char **argv)
 {
   char const *o = options;
   char *b = buf;
-  int n = 0;
+  size_t n = 0;
 
   for (;;)
     {
@@ -1625,10 +1630,14 @@ prepend_default_options (char const *options, int *pargc, char ***pargv)
   if (options && *options)
     {
       char *buf = xmalloc (strlen (options) + 1);
-      int prepended = prepend_args (options, buf, (char **) NULL);
+      size_t prepended = prepend_args (options, buf, NULL);
       int argc = *pargc;
       char *const *argv = *pargv;
-      char **pp = xmalloc ((prepended + argc + 1) * sizeof *pp);
+      char **pp;
+      enum { MAX_ARGS = MIN (INT_MAX, SIZE_MAX / sizeof *pp - 1) };
+      if (MAX_ARGS - argc < prepended)
+        xalloc_die ();
+      pp = xmalloc ((prepended + argc + 1) * sizeof *pp);
       *pargc = prepended + argc;
       *pargv = pp;
       *pp++ = *argv++;
@@ -1646,11 +1655,11 @@ prepend_default_options (char const *options, int *pargc, char ***pargv)
    Process any digit options that were encountered on the way,
    and store the resulting integer into *DEFAULT_CONTEXT.  */
 static int
-get_nondigit_option (int argc, char *const *argv, int *default_context)
+get_nondigit_option (int argc, char *const *argv, intmax_t *default_context)
 {
   static int prev_digit_optind = -1;
   int opt, this_digit_optind, was_digit;
-  char buf[sizeof (uintmax_t) * CHAR_BIT + 4];
+  char buf[INT_BUFSIZE_BOUND (intmax_t) + 4];
   char *p = buf;
 
   was_digit = 0;
@@ -1760,11 +1769,11 @@ main (int argc, char **argv)
   char *keys;
   size_t keycc, oldcc, keyalloc;
   int with_filenames;
-  int opt, cc, status, prepended;
+  size_t cc;
+  int opt, status, prepended;
   int prev_optind, last_recursive;
-  int default_context;
+  intmax_t default_context;
   FILE *fp;
-
   exit_failure = EXIT_TROUBLE;
   initialize_main (&argc, &argv);
   set_program_name (argv[0]);
@@ -1776,7 +1785,7 @@ main (int argc, char **argv)
   eolbyte = '\n';
   filename_mask = ~0;
 
-  max_count = TYPE_MAXIMUM (off_t);
+  max_count = INTMAX_MAX;
 
   /* The value -1 means to use DEFAULT_CONTEXT. */
   out_after = out_before = -1;
@@ -1947,23 +1956,15 @@ main (int argc, char **argv)
         break;
 
       case 'm':
-        {
-          uintmax_t value;
-          switch (xstrtoumax (optarg, 0, 10, &value, ""))
-            {
-            case LONGINT_OK:
-              max_count = value;
-              if (0 <= max_count && max_count == value)
-                break;
-              /* Fall through.  */
-            case LONGINT_OVERFLOW:
-              max_count = TYPE_MAXIMUM (off_t);
-              break;
+        switch (xstrtoimax (optarg, 0, 10, &max_count, ""))
+          {
+          case LONGINT_OK:
+          case LONGINT_OVERFLOW:
+            break;
 
-            default:
-              error (EXIT_TROUBLE, 0, _("invalid max count"));
-            }
-        }
+          default:
+            error (EXIT_TROUBLE, 0, _("invalid max count"));
+          }
         break;
 
       case 'n':

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=235aad711285fc6978f6ff26397743930b23f79a


commit 8fcf61523644df42e1905c81bed26838e0b04f91
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Wed Feb 29 00:49:40 2012 -0800

    grep: fix integer-overflow issues in main program
    
    * NEWS: Document this.
    * bootstrap.conf (gnulib_modules): Add inttypes, xstrtoimax.
    Remove xstrtoumax.
    * src/main.c: Include <inttypes.h>, for INTMAX_MAX, PRIdMAX.
    (context_length_arg, prtext, grepbuf, grep, grepfile)
    (get_nondigit_option, main):
    Use intmax_t, not int, for line counts.
    (context_length_arg, main): Silently ceiling line counts
    to maximum value, since there's no practical difference between
    doing that and using infinite-precision arithmetic.
    (out_before, out_after, pending): Now intmax_t, not int.
    (max_count, outleft): Now intmax_t, not off_t.
    (prepend_args, prepend_default_options, main):
    Use size_t, not int, for sizes.
    (prepend_default_options): Check for int and size_t overflow.

diff --git a/NEWS b/NEWS
index 47e0ca4..5ff4027 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,11 @@ GNU grep NEWS                                    -*- outline -*-
   GNU C library's regular expression functions cannot handle such long lines.
   [bug present since "the beginning"]
 
+  The -m, -A, -B, and -C options no longer mishandle context line
+  counts that do not fit in 'int'.  Also, grep -c's counts are now
+  limited by the type 'intmax_t' (typically less than 2**63) rather
+  than 'int' (typically less than 2**31).
+
   grep no longer silently suppresses errors when reading a directory
   as if it were a text file.  For example, "grep x ." now reports a
   read error on most systems; formerly, it ignored the error.
diff --git a/bootstrap.conf b/bootstrap.conf
index 2b7a5ec..45bb33d 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -41,6 +41,7 @@ gnupload
 hard-locale
 ignore-value
 intprops
+inttypes
 isatty
 isblank
 isdir
@@ -85,7 +86,7 @@ wcscoll
 wctob
 wctype-h
 xalloc
-xstrtoumax
+xstrtoimax
 '
 gnulib_name=libgreputils
 
diff --git a/src/main.c b/src/main.c
index 3c5f6dd..7d83f4d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -25,6 +25,7 @@
 #include <wchar.h>
 #include <wctype.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include "system.h"
 
@@ -425,17 +426,21 @@ clean_up_stdout (void)
     close_stdout ();
 }
 
-/* Convert STR to a positive integer, storing the result in *OUT.
+/* Convert STR to a nonnegative integer, storing the result in *OUT.
    STR must be a valid context length argument; report an error if it
-   isn't.  */
+   isn't.  Silently ceiling *OUT at the maximum value, as that is
+   practically equivalent to infinity for grep's purposes.  */
 static void
-context_length_arg (char const *str, int *out)
+context_length_arg (char const *str, intmax_t *out)
 {
-  uintmax_t value;
-  if (! (xstrtoumax (str, 0, 10, &value, "") == LONGINT_OK
-         && 0 <= (*out = value)
-         && *out == value))
+  switch (xstrtoimax (str, 0, 10, out, ""))
     {
+    case LONGINT_OK:
+    case LONGINT_OVERFLOW:
+      if (0 <= *out)
+        break;
+      /* Fall through.  */
+    default:
       error (EXIT_TROUBLE, 0, "%s: %s", str,
              _("invalid context length argument"));
     }
@@ -603,12 +608,12 @@ static int out_invert;		/* Print nonmatching stuff. */
 static int out_file;		/* Print filenames. */
 static int out_line;		/* Print line numbers. */
 static int out_byte;		/* Print byte offsets. */
-static int out_before;		/* Lines of leading context. */
-static int out_after;		/* Lines of trailing context. */
+static intmax_t out_before;	/* Lines of leading context. */
+static intmax_t out_after;	/* Lines of trailing context. */
 static int count_matches;	/* Count matching lines.  */
 static int list_files;		/* List matching files.  */
 static int no_filenames;	/* Suppress file names.  */
-static off_t max_count;		/* Stop after outputting this many
+static intmax_t max_count;	/* Stop after outputting this many
                                    lines from an input file.  */
 static int line_buffered;       /* If nonzero, use line buffering, i.e.
                                    fflush everyline out.  */
@@ -622,8 +627,8 @@ static char const *lastout;	/* Pointer after last character output;
                                    NULL if no character has been output
                                    or if it's conceptually before bufbeg. */
 static uintmax_t totalnl;	/* Total newline count before lastnl. */
-static off_t outleft;		/* Maximum number of lines to be output.  */
-static int pending;		/* Pending lines of output.
+static intmax_t outleft;	/* Maximum number of lines to be output.  */
+static intmax_t pending;	/* Pending lines of output.
                                    Always kept 0 if out_quiet is true.  */
 static int done_on_match;	/* Stop scanning file on first match.  */
 static int exit_on_match;	/* Exit on first match.  */
@@ -917,12 +922,12 @@ prpending (char const *lim)
 /* Print the lines between BEG and LIM.  Deal with context crap.
    If NLINESP is non-null, store a count of lines between BEG and LIM.  */
 static void
-prtext (char const *beg, char const *lim, int *nlinesp)
+prtext (char const *beg, char const *lim, intmax_t *nlinesp)
 {
   static int used;	/* avoid printing SEP_STR_GROUP before any output */
   char const *bp, *p;
   char eol = eolbyte;
-  int i, n;
+  intmax_t i, n;
 
   if (!out_quiet && pending > 0)
     prpending (beg);
@@ -1026,10 +1031,10 @@ do_execute (char const *buf, size_t size, size_t *match_size, char const *start_
 /* Scan the specified portion of the buffer, matching lines (or
    between matching lines if OUT_INVERT is true).  Return a count of
    lines printed. */
-static int
+static intmax_t
 grepbuf (char const *beg, char const *lim)
 {
-  int nlines, n;
+  intmax_t nlines, n;
   char const *p;
   size_t match_offset;
   size_t match_size;
@@ -1046,7 +1051,7 @@ grepbuf (char const *beg, char const *lim)
         break;
       if (!out_invert)
         {
-          prtext (b, endp, (int *) 0);
+          prtext (b, endp, NULL);
           nlines++;
           outleft--;
           if (!outleft || done_on_match)
@@ -1079,10 +1084,10 @@ grepbuf (char const *beg, char const *lim)
 /* Search a given file.  Normally, return a count of lines printed;
    but if the file is a directory and we search it recursively, then
    return -2 if there was a match, and -1 otherwise.  */
-static int
+static intmax_t
 grep (int fd, char const *file, struct stats *stats)
 {
-  int nlines, i;
+  intmax_t nlines, i;
   int not_text;
   size_t residue, save;
   char oldc;
@@ -1212,7 +1217,7 @@ static int
 grepfile (char const *file, struct stats *stats)
 {
   int desc;
-  int count;
+  intmax_t count;
   int status;
 
   filename = (file ? file : label ? label : _("(standard input)"));
@@ -1319,7 +1324,7 @@ grepfile (char const *file, struct stats *stats)
               else
                 fputc (0, stdout);
             }
-          printf ("%d\n", count);
+          printf ("%" PRIdMAX "\n", count);
         }
 
       status = !count;
@@ -1590,12 +1595,12 @@ setmatcher (char const *m)
    etc. to the option copies.  Return the number N of options found.
    Do not set ARGV[N] to NULL.  If ARGV is NULL, do not store ARGV[0]
    etc.  Backslash can be used to escape whitespace (and backslashes).  */
-static int
+static size_t
 prepend_args (char const *options, char *buf, char **argv)
 {
   char const *o = options;
   char *b = buf;
-  int n = 0;
+  size_t n = 0;
 
   for (;;)
     {
@@ -1625,10 +1630,14 @@ prepend_default_options (char const *options, int *pargc, char ***pargv)
   if (options && *options)
     {
       char *buf = xmalloc (strlen (options) + 1);
-      int prepended = prepend_args (options, buf, (char **) NULL);
+      size_t prepended = prepend_args (options, buf, NULL);
       int argc = *pargc;
       char *const *argv = *pargv;
-      char **pp = xmalloc ((prepended + argc + 1) * sizeof *pp);
+      char **pp;
+      enum { MAX_ARGS = MIN (INT_MAX, SIZE_MAX / sizeof *pp - 1) };
+      if (MAX_ARGS - argc < prepended)
+        xalloc_die ();
+      pp = xmalloc ((prepended + argc + 1) * sizeof *pp);
       *pargc = prepended + argc;
       *pargv = pp;
       *pp++ = *argv++;
@@ -1646,11 +1655,11 @@ prepend_default_options (char const *options, int *pargc, char ***pargv)
    Process any digit options that were encountered on the way,
    and store the resulting integer into *DEFAULT_CONTEXT.  */
 static int
-get_nondigit_option (int argc, char *const *argv, int *default_context)
+get_nondigit_option (int argc, char *const *argv, intmax_t *default_context)
 {
   static int prev_digit_optind = -1;
   int opt, this_digit_optind, was_digit;
-  char buf[sizeof (uintmax_t) * CHAR_BIT + 4];
+  char buf[INT_BUFSIZE_BOUND (intmax_t) + 4];
   char *p = buf;
 
   was_digit = 0;
@@ -1760,11 +1769,11 @@ main (int argc, char **argv)
   char *keys;
   size_t keycc, oldcc, keyalloc;
   int with_filenames;
-  int opt, cc, status, prepended;
+  size_t cc;
+  int opt, status, prepended;
   int prev_optind, last_recursive;
-  int default_context;
+  intmax_t default_context;
   FILE *fp;
-
   exit_failure = EXIT_TROUBLE;
   initialize_main (&argc, &argv);
   set_program_name (argv[0]);
@@ -1776,7 +1785,7 @@ main (int argc, char **argv)
   eolbyte = '\n';
   filename_mask = ~0;
 
-  max_count = TYPE_MAXIMUM (off_t);
+  max_count = INTMAX_MAX;
 
   /* The value -1 means to use DEFAULT_CONTEXT. */
   out_after = out_before = -1;
@@ -1947,23 +1956,15 @@ main (int argc, char **argv)
         break;
 
       case 'm':
-        {
-          uintmax_t value;
-          switch (xstrtoumax (optarg, 0, 10, &value, ""))
-            {
-            case LONGINT_OK:
-              max_count = value;
-              if (0 <= max_count && max_count == value)
-                break;
-              /* Fall through.  */
-            case LONGINT_OVERFLOW:
-              max_count = TYPE_MAXIMUM (off_t);
-              break;
+        switch (xstrtoimax (optarg, 0, 10, &max_count, ""))
+          {
+          case LONGINT_OK:
+          case LONGINT_OVERFLOW:
+            break;
 
-            default:
-              error (EXIT_TROUBLE, 0, _("invalid max count"));
-            }
-        }
+          default:
+            error (EXIT_TROUBLE, 0, _("invalid max count"));
+          }
         break;
 
       case 'n':

-----------------------------------------------------------------------

Summary of changes:
 HACKING           |    6 +
 Makefile.am       |    5 +
 NEWS              |   12 +++
 bootstrap.conf    |    3 +-
 src/dfa.c         |  270 +++++++++++++++++++++++++++++-----------------------
 src/dfa.h         |    4 +-
 src/dfasearch.c   |   31 +++++--
 src/kwset.c       |    4 +-
 src/kwset.h       |    2 +-
 src/main.c        |  133 ++++++++++-----------------
 src/pcresearch.c  |    3 +
 tests/Makefile.am |    1 +
 tests/big-match   |   32 ++++++
 tests/init.cfg    |   17 ++++
 14 files changed, 306 insertions(+), 217 deletions(-)
 create mode 100755 tests/big-match


hooks/post-receive
-- 
grep


From MAILER-DAEMON Thu Mar 01 20:12:15 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3H2d-0004Ze-Ea
	for mharc-grep-commit@gnu.org; Thu, 01 Mar 2012 20:12:15 -0500
Received: from eggs.gnu.org ([208.118.235.92]:42903)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1S3H2Z-0004ZM-Eh
	for grep-commit@gnu.org; Thu, 01 Mar 2012 20:12:13 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1S3H2W-0001ia-6F
	for grep-commit@gnu.org; Thu, 01 Mar 2012 20:12:11 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:56128)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1S3H2W-0001iS-26
	for grep-commit@gnu.org; Thu, 01 Mar 2012 20:12:08 -0500
Received: from eggert by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <eggert@cs.ucla.edu>) id 1S3H2V-0005J9-1f
	for grep-commit@gnu.org; Fri, 02 Mar 2012 01:12:07 +0000
Date: Fri, 02 Mar 2012 01:12:07 +0000
Message-Id: <E1S3H2V-0005J9-1f@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.10-86-gfff5850
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8fcf61523644df42e1905c81bed26838e0b04f91
X-Git-Newrev: fff5850967ec10fa3e2e4a800031cb8e335e8fca
From: Paul Eggert <eggert@cs.ucla.edu>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 01:12:13 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  fff5850967ec10fa3e2e4a800031cb8e335e8fca (commit)
      from  8fcf61523644df42e1905c81bed26838e0b04f91 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=fff5850967ec10fa3e2e4a800031cb8e335e8fca


commit fff5850967ec10fa3e2e4a800031cb8e335e8fca
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Thu Mar 1 17:04:32 2012 -0800

    maint: spelling fixes

diff --git a/AUTHORS b/AUTHORS
index 55bc714..1423c8b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -41,7 +41,7 @@ for complete details and credits.
 Arnold Robbins contributed to improve dfa.[ch]. In fact
 it came straight from gawk-3.0.3 with small editing and fixes.
 
-Many folks contributed see THANKS, if I omited someone please
+Many folks contributed.  See THANKS; if I omitted someone please
 send me email.
 
 Alain Magloire maintained GNU grep until version 2.5e.
diff --git a/Makefile.boot b/Makefile.boot
index 5c2993c..043429b 100644
--- a/Makefile.boot
+++ b/Makefile.boot
@@ -108,7 +108,7 @@ DEFS_ansi_c = -DPROTOTYPES
 # DEFS_wchar =  -Dwchar_t=int -Dmbstate_t=int
 DEFS_wchar =  -DHAVE_WCHAR_H
 
-# Is strtol() and strtoul()  declarared ?
+# Are strtol() and strtoul() declared?
 #DEFS_strtol = -DHAVE_DECL_STRTOULL=0 -DHAVE_DECL_STRTOUL=0
 DEFS_strtol = -DHAVE_DECL_STRTOULL=1 -DHAVE_DECL_STRTOUL=1
 
diff --git a/NEWS b/NEWS
index 5ff4027..4a530a6 100644
--- a/NEWS
+++ b/NEWS
@@ -344,7 +344,7 @@ Version 2.5
     consistency, and partly because POSIX.2 recommends against
     optional arguments.
 
-  - The new -P or --perl-regexp option tells grep to interpert the pattern as
+  - The new -P or --perl-regexp option tells grep to interpret the pattern as
     a Perl regular expression.
 
   - The new option --max-count=num makes grep stop reading a file after num
@@ -469,7 +469,7 @@ This is a bug fix release(see Changelog) i.e. no new features.
 
   - More compliance to GNU standard.
   - Long options.
-  - Internationalisation.
+  - Internationalization.
   - Use automake/autoconf.
   - Directory hierarchy change.
   - Sigvec with -e on Linux corrected.
diff --git a/README-boot b/README-boot
index 2b4bb57..88bead7 100644
--- a/README-boot
+++ b/README-boot
@@ -5,7 +5,7 @@
   notice and this notice are preserved.
 
 If your system is lacking the necessary tools to build the configuration,
-Makefile.boot is provided for bootstraping.  Invoke it with the following
+Makefile.boot is provided for bootstrapping.  Invoke it with the following
 command:
 
   (cd src && make -f ../Makefile.boot)
diff --git a/TODO b/TODO
index 9d4bb73..ae8a5b4 100644
--- a/TODO
+++ b/TODO
@@ -79,7 +79,7 @@ but POSIX does not standardize any method for accessing this information!
 For Unicode, interesting things to check include the Unicode Standard
 <http://www.unicode.org/standard/standard.html> and the Unicode Technical
 Standard #18 (<http://www.unicode.org/reports/tr18/> “Unicode Regular
-Expressions”).  Talk to Bruno Haible who's mantaining GNU libunistring.
+Expressions”).  Talk to Bruno Haible who's maintaining GNU libunistring.
 See also Unicode Standard Annex #15 (<http://www.unicode.org/reports/tr15/>
 “Unicode Normalization Forms”), already implemented by GNU libunistring.
 
diff --git a/cfg.mk b/cfg.mk
index 5040199..a495959 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -31,7 +31,7 @@ bootstrap-tools = autoconf,automake,gnulib
 # Now that we have better tests, make this the default.
 export VERBOSE = yes
 
-old_NEWS_hash = 25ce2f420ad2d0f4ec68b23237691054
+old_NEWS_hash = 83c4de7ac0356eb3814cd97161e3e742
 
 # Many m4 macros names once began with `jm_'.
 # Make sure that none are inadvertently reintroduced.
diff --git a/doc/grep.texi b/doc/grep.texi
index de73d7f..5381a30 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -1015,7 +1015,7 @@ instead of strict equality with@ 2.
 @node grep Programs
 @section @command{grep} Programs
 @cindex @command{grep} programs
-@cindex variants of @command{gerp}
+@cindex variants of @command{grep}
 
 @command{grep} searches the named input files
 for lines containing a match to the given pattern.
@@ -1178,7 +1178,7 @@ that respectively match the concatenated expressions.
 
 Two regular expressions may be joined by the infix operator @samp{|};
 the resulting regular expression
-matches any string matching either alternalte expression.
+matches any string matching either alternate expression.
 
 Repetition takes precedence over concatenation,
 which in turn takes precedence over alternation.
diff --git a/src/dfa.c b/src/dfa.c
index 4c9071f..2a69025 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -206,7 +206,7 @@ enum
                                    the beginning or end of a word. */
 
   QMARK,			/* QMARK is an operator of one argument that
-                                   matches zero or one occurences of its
+                                   matches zero or one occurrences of its
                                    argument. */
 
   STAR,				/* STAR is an operator of one argument that
@@ -346,7 +346,7 @@ struct dfa
                  single-byte characters.
 
        if tokens[i] = MBCSET
-         ("the index of mbcsets correspnd to this operator" << 2) + 3
+         ("the index of mbcsets corresponding to this operator" << 2) + 3
 
      e.g.
      tokens
@@ -751,7 +751,7 @@ static unsigned char *mblen_buf;/* Correspond to the input buffer in dfaexec().
                                    byte of corresponding multibyte character
                                    in the input string.  A element's value
                                    is 0 if corresponding character is a
-                                   single byte chracter.
+                                   single byte character.
                                    e.g. input : 'a', <mb(0)>, <mb(1)>, <mb(2)>
                                     mblen_buf :   0,       3,       2,       1
                                 */
@@ -2972,11 +2972,11 @@ match_mb_charset (struct dfa *d, state_num s, position pos, size_t idx)
   char buffer[128];
   wchar_t wcbuf[6];
 
-  /* Pointer to the structure to which we are currently refering.  */
+  /* Pointer to the structure to which we are currently referring.  */
   struct mb_char_classes *work_mbc;
 
   int context;
-  wchar_t wc;		/* Current refering character.  */
+  wchar_t wc;		/* Current referring character.  */
 
   wc = inputwcs[idx];
 
@@ -2996,7 +2996,7 @@ match_mb_charset (struct dfa *d, state_num s, position pos, size_t idx)
   if (!SUCCEEDS_IN_CONTEXT(pos.constraint, d->states[s].context, context))
     return 0;
 
-  /* Assign the current refering operator to work_mbc.  */
+  /* Assign the current referring operator to work_mbc.  */
   work_mbc = &(d->mbcsets[(d->multibyte_prop[pos.index]) >> 2]);
   match = !work_mbc->invert;
   match_len = (mblen_buf[idx] == 0)? 1 : mblen_buf[idx];
@@ -3135,7 +3135,7 @@ transit_state_consume_1char (struct dfa *d, state_num s,
   /* Copy the positions contained by `s1' to the set `pps'.  */
   copy(&(d->states[s1].elems), pps);
 
-  /* Check (inputed)match_lens, and initialize if it is NULL.  */
+  /* Check (input) match_lens, and initialize if it is NULL.  */
   if (match_lens == NULL && d->states[s].mbps.nelem != 0)
     work_mbls = check_matching_with_multibyte_ops(d, s, *pp - buf_begin);
   else
@@ -3978,7 +3978,7 @@ dfamust (struct dfa *d)
             rmp = --mp;
             lmp = --mp;
             /* In.  Everything in left, plus everything in
-               right, plus catenation of
+               right, plus concatenation of
                left's right and right's left. */
             lmp->in = addlists(lmp->in, rmp->in);
             if (lmp->in == NULL)
diff --git a/src/dfasearch.c b/src/dfasearch.c
index ffb8bb1..bd09aa6 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -332,7 +332,7 @@ EGexecute (char const *buf, size_t size, size_t *match_size,
                 }
               /* If -w, check if the match aligns with word boundaries.
                  We do this iteratively because:
-                 (a) the line may contain more than one occurence of the
+                 (a) the line may contain more than one occurrence of the
                  pattern, and
                  (b) Several alternatives in the pattern might be valid at a
                  given point, and we may need to consider a shorter one to
diff --git a/src/kwset.c b/src/kwset.c
index 5496371..cd40953 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -21,7 +21,7 @@
    The author may be reached (Email) at the address mike@ai.mit.edu,
    or (US mail) as Mike Haertel c/o Free Software Foundation. */
 
-/* The algorithm implemented by these routines bears a startling resemblence
+/* The algorithm implemented by these routines bears a startling resemblance
    to one discovered by Beate Commentz-Walter, although it is not identical.
    See "A String Matching Algorithm Fast on the Average," Technical Report,
    IBM-Germany, Scientific Center Heidelberg, Tiergartenstrasse 15, D-6900
@@ -69,7 +69,7 @@ struct trie
   struct trie *fail;		/* Aho-Corasick failure function. */
   int depth;			/* Depth of this node from the root. */
   int shift;			/* Shift function for search failures. */
-  int maxshift;			/* Max shift of self and descendents. */
+  int maxshift;			/* Max shift of self and descendants. */
 };
 
 /* Structure returned opaquely to the caller, containing everything. */
@@ -314,7 +314,7 @@ treefails (struct tree const *tree, struct trie const *fail,
   treefails(tree->rlink, fail, recourse);
 
   /* Find, in the chain of fails going back to the root, the first
-     node that has a descendent on the current label. */
+     node that has a descendant on the current label. */
   while (fail)
     {
       link = fail->links;
@@ -432,16 +432,16 @@ kwsprep (kwset_t kws)
          computing the delta table, failure function, and shift function. */
       for (curr = last = kwset->trie; curr; curr = curr->next)
         {
-          /* Enqueue the immediate descendents in the level order queue. */
+          /* Enqueue the immediate descendants in the level order queue. */
           enqueue(curr->links, &last);
 
           curr->shift = kwset->mind;
           curr->maxshift = kwset->mind;
 
-          /* Update the delta table for the descendents of this node. */
+          /* Update the delta table for the descendants of this node. */
           treedelta(curr->links, curr->depth, delta);
 
-          /* Compute the failure function for the decendents of this node. */
+          /* Compute the failure function for the descendants of this node.  */
           treefails(curr->links, curr->fail, kwset->trie);
 
           /* Update the shifts at each node in the current node's chain
@@ -456,7 +456,7 @@ kwsprep (kwset_t kws)
                   fail->shift = curr->depth - fail->depth;
 
               /* If the current node is accepting then the shift at the
-                 fail and its descendents should be no larger than the
+                 fail and its descendants should be no larger than the
                  difference of their depths. */
               if (curr->accepting && fail->maxshift > curr->depth - fail->depth)
                 fail->maxshift = curr->depth - fail->depth;
diff --git a/src/main.c b/src/main.c
index 7d83f4d..2f6c761 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1789,7 +1789,7 @@ main (int argc, char **argv)
 
   /* The value -1 means to use DEFAULT_CONTEXT. */
   out_after = out_before = -1;
-  /* Default before/after context: chaged by -C/-NUM options */
+  /* Default before/after context: changed by -C/-NUM options */
   default_context = 0;
   /* Changed by -o option */
   only_matching = 0;
diff --git a/tests/fedora b/tests/fedora
index 304ca8a..d26b40e 100755
--- a/tests/fedora
+++ b/tests/fedora
@@ -8,7 +8,7 @@
 
 if [ -t 1 ]
 then
-        # Colored output on terimal
+        # Colored output on terminal
         G='\033[32m'
         R='\033[31m'
         D='\033[0m'

-----------------------------------------------------------------------

Summary of changes:
 AUTHORS         |    2 +-
 Makefile.boot   |    2 +-
 NEWS            |    4 ++--
 README-boot     |    2 +-
 TODO            |    2 +-
 cfg.mk          |    2 +-
 doc/grep.texi   |    4 ++--
 src/dfa.c       |   16 ++++++++--------
 src/dfasearch.c |    2 +-
 src/kwset.c     |   14 +++++++-------
 src/main.c      |    2 +-
 tests/fedora    |    2 +-
 12 files changed, 27 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Fri Mar 02 01:45:11 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3MEp-0004id-Hc
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 01:45:11 -0500
Received: from eggs.gnu.org ([208.118.235.92]:48351)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3MEl-0004es-Jp
	for grep-commit@gnu.org; Fri, 02 Mar 2012 01:45:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3MEb-0003XI-0g
	for grep-commit@gnu.org; Fri, 02 Mar 2012 01:45:07 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50539)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3MEa-0003XD-TG
	for grep-commit@gnu.org; Fri, 02 Mar 2012 01:44:56 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3MEZ-0003Lf-Cq
	for grep-commit@gnu.org; Fri, 02 Mar 2012 06:44:56 +0000
Date: Fri, 02 Mar 2012 06:44:56 +0000
Message-Id: <E1S3MEZ-0003Lf-Cq@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.10-87-gadaf678
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: fff5850967ec10fa3e2e4a800031cb8e335e8fca
X-Git-Newrev: adaf678d87a1c6369fd7ce444c5f8f2ede2b277e
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 06:45:09 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  adaf678d87a1c6369fd7ce444c5f8f2ede2b277e (commit)
      from  fff5850967ec10fa3e2e4a800031cb8e335e8fca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=adaf678d87a1c6369fd7ce444c5f8f2ede2b277e


commit adaf678d87a1c6369fd7ce444c5f8f2ede2b277e
Author: Jim Meyering <meyering@redhat.com>
Date:   Wed Feb 29 11:04:18 2012 +0100

    doc: correct grep.1's descriptions of \w and \W (they omitted "_")
    
    * doc/grep.in.1: Fix descriptions of \w and \W.
    They did not mention "_".
    * doc/grep.texi (The Backslash Character and Special Expressions):
    [\w, \W]: List the "_" before the char class, not after: [_[:alnum:]],
    for readability and to be consistent with the man page.

diff --git a/doc/grep.in.1 b/doc/grep.in.1
index 65d3e3a..4cf1f17 100644
--- a/doc/grep.in.1
+++ b/doc/grep.in.1
@@ -717,11 +717,11 @@ at the edge of a word.
 The symbol
 .B \ew
 is a synonym for
-.B [[:alnum:]]
+.B [_[:alnum:]]
 and
 .B \eW
 is a synonym for
-.BR [^[:alnum:]] .
+.BR [^_[:alnum:]] .
 .SS Repetition
 A regular expression may be followed by one of several repetition operators:
 .PD 0
diff --git a/doc/grep.texi b/doc/grep.texi
index 5381a30..c014d8f 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -1377,10 +1377,10 @@ Match the empty string at the beginning of word.
 Match the empty string at the end of word.
 
 @item \w
-Match word constituent, it is a synonym for @samp{[[:alnum:]_]}.
+Match word constituent, it is a synonym for @samp{[_[:alnum:]]}.
 
 @item \W
-Match non-word constituent, it is a synonym for @samp{[^[:alnum:]_]}.
+Match non-word constituent, it is a synonym for @samp{[^_[:alnum:]]}.
 
 @item \s
 Match whitespace, it is a synonym for @samp{[[:space:]]}.

-----------------------------------------------------------------------

Summary of changes:
 doc/grep.in.1 |    4 ++--
 doc/grep.texi |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Fri Mar 02 04:14:39 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3OZT-0005Yq-Lq
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:14:39 -0500
Received: from eggs.gnu.org ([208.118.235.92]:51036)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OZN-0005YO-3L
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:14:37 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OZI-00015F-WF
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:14:32 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44575)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OZI-000158-SQ
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:14:28 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3OZI-0002n0-82
	for grep-commit@gnu.org; Fri, 02 Mar 2012 09:14:28 +0000
Date: Fri, 02 Mar 2012 09:14:28 +0000
Message-Id: <E1S3OZI-0002n0-82@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.11-1-ge16e21c
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: adaf678d87a1c6369fd7ce444c5f8f2ede2b277e
X-Git-Newrev: e16e21caf7f2d68003800e684e1b53ba75613209
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:14:38 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  e16e21caf7f2d68003800e684e1b53ba75613209 (commit)
       via  f80de4cb768997b0dd947a7e775d1892105aae5f (commit)
       via  6495328815d75827338c0742b598b92e934ee24d (commit)
       via  8dee6ace770d36c5fc72b01a5e287accd47bc336 (commit)
       via  bc6c1e74fb562c02c1a34cf5d7f59bb054a1dc02 (commit)
      from  adaf678d87a1c6369fd7ce444c5f8f2ede2b277e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=e16e21caf7f2d68003800e684e1b53ba75613209


commit e16e21caf7f2d68003800e684e1b53ba75613209
Author: Jim Meyering <meyering@redhat.com>
Date:   Fri Mar 2 09:34:07 2012 +0100

    maint: post-release administrivia
    
    * NEWS: Add header line for next release.
    * .prev-version: Record previous version.
    * cfg.mk (old_NEWS_hash): Auto-update.

diff --git a/.prev-version b/.prev-version
index 37989bd..6a5fe6e 100644
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-2.10
+2.11
diff --git a/NEWS b/NEWS
index fccf1b6..d0a63d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 GNU grep NEWS                                    -*- outline -*-
 
+* Noteworthy changes in release ?.? (????-??-??) [?]
+
+
 * Noteworthy changes in release 2.11 (2012-03-02) [stable]
 
 ** Bug fixes
diff --git a/cfg.mk b/cfg.mk
index a495959..08bb156 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -31,7 +31,7 @@ bootstrap-tools = autoconf,automake,gnulib
 # Now that we have better tests, make this the default.
 export VERBOSE = yes
 
-old_NEWS_hash = 83c4de7ac0356eb3814cd97161e3e742
+old_NEWS_hash = 347e90ee0ec0489707df139ca3539934
 
 # Many m4 macros names once began with `jm_'.
 # Make sure that none are inadvertently reintroduced.

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=f80de4cb768997b0dd947a7e775d1892105aae5f


commit e16e21caf7f2d68003800e684e1b53ba75613209
Author: Jim Meyering <meyering@redhat.com>
Date:   Fri Mar 2 09:34:07 2012 +0100

    maint: post-release administrivia
    
    * NEWS: Add header line for next release.
    * .prev-version: Record previous version.
    * cfg.mk (old_NEWS_hash): Auto-update.

diff --git a/.prev-version b/.prev-version
index 37989bd..6a5fe6e 100644
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-2.10
+2.11
diff --git a/NEWS b/NEWS
index fccf1b6..d0a63d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 GNU grep NEWS                                    -*- outline -*-
 
+* Noteworthy changes in release ?.? (????-??-??) [?]
+
+
 * Noteworthy changes in release 2.11 (2012-03-02) [stable]
 
 ** Bug fixes
diff --git a/cfg.mk b/cfg.mk
index a495959..08bb156 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -31,7 +31,7 @@ bootstrap-tools = autoconf,automake,gnulib
 # Now that we have better tests, make this the default.
 export VERBOSE = yes
 
-old_NEWS_hash = 83c4de7ac0356eb3814cd97161e3e742
+old_NEWS_hash = 347e90ee0ec0489707df139ca3539934
 
 # Many m4 macros names once began with `jm_'.
 # Make sure that none are inadvertently reintroduced.

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=6495328815d75827338c0742b598b92e934ee24d


commit e16e21caf7f2d68003800e684e1b53ba75613209
Author: Jim Meyering <meyering@redhat.com>
Date:   Fri Mar 2 09:34:07 2012 +0100

    maint: post-release administrivia
    
    * NEWS: Add header line for next release.
    * .prev-version: Record previous version.
    * cfg.mk (old_NEWS_hash): Auto-update.

diff --git a/.prev-version b/.prev-version
index 37989bd..6a5fe6e 100644
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-2.10
+2.11
diff --git a/NEWS b/NEWS
index fccf1b6..d0a63d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 GNU grep NEWS                                    -*- outline -*-
 
+* Noteworthy changes in release ?.? (????-??-??) [?]
+
+
 * Noteworthy changes in release 2.11 (2012-03-02) [stable]
 
 ** Bug fixes
diff --git a/cfg.mk b/cfg.mk
index a495959..08bb156 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -31,7 +31,7 @@ bootstrap-tools = autoconf,automake,gnulib
 # Now that we have better tests, make this the default.
 export VERBOSE = yes
 
-old_NEWS_hash = 83c4de7ac0356eb3814cd97161e3e742
+old_NEWS_hash = 347e90ee0ec0489707df139ca3539934
 
 # Many m4 macros names once began with `jm_'.
 # Make sure that none are inadvertently reintroduced.

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=8dee6ace770d36c5fc72b01a5e287accd47bc336


commit e16e21caf7f2d68003800e684e1b53ba75613209
Author: Jim Meyering <meyering@redhat.com>
Date:   Fri Mar 2 09:34:07 2012 +0100

    maint: post-release administrivia
    
    * NEWS: Add header line for next release.
    * .prev-version: Record previous version.
    * cfg.mk (old_NEWS_hash): Auto-update.

diff --git a/.prev-version b/.prev-version
index 37989bd..6a5fe6e 100644
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-2.10
+2.11
diff --git a/NEWS b/NEWS
index fccf1b6..d0a63d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 GNU grep NEWS                                    -*- outline -*-
 
+* Noteworthy changes in release ?.? (????-??-??) [?]
+
+
 * Noteworthy changes in release 2.11 (2012-03-02) [stable]
 
 ** Bug fixes
diff --git a/cfg.mk b/cfg.mk
index a495959..08bb156 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -31,7 +31,7 @@ bootstrap-tools = autoconf,automake,gnulib
 # Now that we have better tests, make this the default.
 export VERBOSE = yes
 
-old_NEWS_hash = 83c4de7ac0356eb3814cd97161e3e742
+old_NEWS_hash = 347e90ee0ec0489707df139ca3539934
 
 # Many m4 macros names once began with `jm_'.
 # Make sure that none are inadvertently reintroduced.

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=bc6c1e74fb562c02c1a34cf5d7f59bb054a1dc02


commit e16e21caf7f2d68003800e684e1b53ba75613209
Author: Jim Meyering <meyering@redhat.com>
Date:   Fri Mar 2 09:34:07 2012 +0100

    maint: post-release administrivia
    
    * NEWS: Add header line for next release.
    * .prev-version: Record previous version.
    * cfg.mk (old_NEWS_hash): Auto-update.

diff --git a/.prev-version b/.prev-version
index 37989bd..6a5fe6e 100644
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-2.10
+2.11
diff --git a/NEWS b/NEWS
index fccf1b6..d0a63d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 GNU grep NEWS                                    -*- outline -*-
 
+* Noteworthy changes in release ?.? (????-??-??) [?]
+
+
 * Noteworthy changes in release 2.11 (2012-03-02) [stable]
 
 ** Bug fixes
diff --git a/cfg.mk b/cfg.mk
index a495959..08bb156 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -31,7 +31,7 @@ bootstrap-tools = autoconf,automake,gnulib
 # Now that we have better tests, make this the default.
 export VERBOSE = yes
 
-old_NEWS_hash = 83c4de7ac0356eb3814cd97161e3e742
+old_NEWS_hash = 347e90ee0ec0489707df139ca3539934
 
 # Many m4 macros names once began with `jm_'.
 # Make sure that none are inadvertently reintroduced.

-----------------------------------------------------------------------

Summary of changes:
 .prev-version                  |    2 +-
 NEWS                           |    3 +
 cfg.mk                         |    2 +-
 src/dfa.c                      | 1597 ++++++++++++++++++++--------------------
 tests/reversed-range-endpoints |    4 +-
 5 files changed, 818 insertions(+), 790 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Fri Mar 02 04:14:59 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3OZn-0005ZP-Pc
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:14:59 -0500
Received: from eggs.gnu.org ([208.118.235.92]:51094)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OZi-0005ZG-EM
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:14:59 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OZJ-00015N-5I
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:14:54 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44577)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OZI-00015B-WF
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:14:29 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3OZI-0002nf-I4
	for grep-commit@gnu.org; Fri, 02 Mar 2012 09:14:28 +0000
Date: Fri, 02 Mar 2012 09:14:28 +0000
Message-Id: <E1S3OZI-0002nf-I4@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep annotated tag, v2.11, created. v2.11
X-Git-Refname: refs/tags/v2.11
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: 6833876dd5bdc041725f3a911f1ab10c1d9f7b4d
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:14:59 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The annotated tag, v2.11 has been created
        at  6833876dd5bdc041725f3a911f1ab10c1d9f7b4d (tag)
   tagging  f80de4cb768997b0dd947a7e775d1892105aae5f (commit)
  replaces  v2.10
 tagged by  Jim Meyering
        on  Fri Mar 2 09:31:57 2012 +0100

- Log -----------------------------------------------------------------
grep 2.11
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABCAAGBQJPUIV9AAoJEH/Z/MsAC+7u6LEP/0ht7hhutRgoK+RoIWuErn27
P/Ahx2SIcJX5UHd+3vkBzgckeV9AqVX2Wwz2IUfyKNz+O2AiFs9xwtnqy/iEGYg4
7c2deSg4nuf6tMW+EC9SVfwticDdd+BElJ2ppTqNit8vJrkvlwDzExrbLPkTPt42
Xt7meaHB9+yKwgSRWS1Y0UGOocLHIjacpfQ2c3f6gzDMjxmQuJlO97LYIkewYWoF
/0SY1ntqKkvB3sKzVekaHftaGcGEwpQdSUV+Ex3O3tDogxvxSUFGKbx522lTI5Ou
0EO69EPgHbT625k6q/An0OHdZPnjUphtbEPHRXZnuXOOccnim+ykTa85pX6zt9kT
w9AeNux5gRbI7O94GdF+vDtyQidYgpNEFUgBikZoyqo7Smsf3BYpBWu5HHOA9N/O
e/boBT77KmzZUsbza5/Z5GOyetEr9xBypf0NNPEGYz5VIFJV+eKb8LYmkpMxhywm
j2U5dpj9A0EKwBfKD82tvcwzTIay5BihW+wG/gKjhYGLivJpjeZdAsxADU1sX1Fs
8fZPfExIpNJf9VymQkC36XCkWsDSuiQXqvtsCTfumND0vhFEqxoAk78Lbe36QsRK
BnTyVVn3c673h2QnRfpeJSZkwUwLhlkjtn8sAJd3d23x0MnKNxwcL0V90quh75n6
SQwDoZxVsWEzp3uSOnEU
=FMmO
-----END PGP SIGNATURE-----

Arnold D. Robbins (1):
      doc: improve grep.texi

Arnold Robbins (2):
      dfa: avoid warning from deficient compiler in !MBS_SUPPORT mode
      dfa: do not call nl_langinfo in !MBS_SUPPORT mode

Bruno Haible (1):
      build: fix "make check" error on OSF/1

Eli Zaretskii (4):
      Support color highlighting on MS-Windows
      Fix the test suite for MS-Windows.
      update NEWS for MS-Windows changes
      Fix whitespace, indentation and documentation

Jim Meyering (32):
      maint: post-release administrivia
      maint: accommodate -Wdeclaration-after-statement, but only in dfa.c,
      tests: avoid unwarranted test failure on *BSD-based systems
      tests: fix typo in last change
      maint: remove an avoidable #ifdef/#endif pair
      maint: consistently use NULL, not 0, when comparing pointers
      portability: work consistently on *BSD systems
      build: accommodate -Werror=suggest-attribute=pure
      build: update gnulib submodule to latest
      tests: use "compare exp out", not "compare out exp"
      disable the new input==output guard for additional options
      build: use gnulib's iswctype wcscoll
      build: update gnulib submodule to latest
      avoid new syntax-check failures
      main.c: correct indentation and formatting style
      main.c: add some 'const' directives
      maint: distribute ChangeLog-2009
      maint: update all copyright year number ranges
      tests: avoid minor "make check" failure
      build: avoid build failure with --enable-gcc-warnings and recent gcc
      deprecate the --mmap option
      tests: adjust test to match code, now that --mmap writes to stderr
      build: update gnulib to latest; adjust quoting in tests
      maint: convert `this' to 'this' quoting style in diagnostics
      build: update bootstrap from gnulib and adapt
      build: accommodate -Wshadow and -Werror=suggest-attribute=pure
      build: update submodule, bootstrap, tests/init.sh from gnulib
      doc: correct grep.1's descriptions of \w and \W (they omitted "_")
      maint: indent dfa.c
      maint: manually correct formatting in dfa.c's cpp definitions
      tests: avoid failure when using Solaris 10's sed
      version 2.11

Nicolas Vigier (1):
      do not reject "grep -qr . > out"

Paolo Bonzini (22):
      colorize: use isatty module
      unify colorize.h headers
      remove lib/ms/
      dfa: x2nrealloc starting from a NULL pointer works
      dfa: remove unnecessary braces
      dfa: use MALLOC/REALLOC always
      dfa: use a more compact data type for grps
      dfa: introduce alloc_position_set
      dfa: remove dead assignment
      dfa: move nalloc to position_set structure
      dfa: change position_set nelem to size_t
      dfa: automatically resize position_sets
      dfa: fix rebase conflict
      dfa: fix incorrect comment
      dfa: remove useless check
      dfa: introduce contexts for the values in d->success
      dfa: change newline/letter to a single context value
      dfa: refactor common context computations
      dfa: change meaning of a state context
      dfa: do not use MATCHES_*_CONTEXT directly
      dfa: fix a subtle constraint encoding bug
      dfa: merge calls to SUCCEEDS_IN_CONTEXT

Paul Eggert (28):
      --include etc. now work on command-line args more consistently
      don't ignore errors when reading a directory
      maint: remove now-unused/obsolete files
      build: update gnulib submodule to latest
      grep: do input==output check more like dir loop check
      ms: move Microsoft-specific stuff to lib/ms
      grep: lower-case function names
      grep: check stdin like other files
      grep: prefer fgets to printf, _ to gettext
      grep: -r with no args now searches "."
      grep: with no args, search "." only if command-line -r
      doc: document empty pattern better
      dfa: non-glibc word-constituent unibyte fix
      grep: don't say "write error" over and over
      grep: suppress read errors if -s
      grep: exit with nonzero status if directory loop
      grep: be quiet about GREP_COLORS syntax
      doc: document recent diagnostics-related changes
      tests: work even if SIGPIPE is ignored
      tests: work portably even if SIGPIPE is ignored
      tests: fix loop in epipe test
      maint: use gnulib _Noreturn rather than __attribute__ ((noreturn))
      tests: test for problems with long matches
      grep: fix some core dumps with long lines etc.
      grep: remove no-longer-used setrlimit code
      grep: avoid mishandling of long lines
      grep: fix integer-overflow issues in main program
      maint: spelling fixes

-----------------------------------------------------------------------


hooks/post-receive
-- 
grep


From MAILER-DAEMON Fri Mar 02 04:28:57 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3OnJ-0000FH-GN
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:57 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35833)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On8-0008Nu-2o
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:56 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On1-0004ak-KA
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:45 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36134)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On1-0004aZ-Go
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:39 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35594)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3On0-0007H4-TF
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:38 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omv-0004XN-JH
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:37 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37427)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omv-0004X9-Fj
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:33 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3Omu-0003xy-UN
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:33 +0000
Date: Fri, 02 Mar 2012 09:28:32 +0000
Message-Id: <E1S3Omu-0003xy-UN@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/grep.dvi.gz,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:28:56 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: grep.dvi.gz
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.dvi.gz,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
Binary files /tmp/cvsItx653 and /tmp/cvsRngYYR differ


From MAILER-DAEMON Fri Mar 02 04:29:05 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3OnR-0000Gs-JW
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:05 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35863)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnB-0008Vu-As
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On4-0004d5-8c
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:48 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36137)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On4-0004cn-4C
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:42 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35616)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3On3-0007HE-Fh
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:41 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omx-0004YJ-3b
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:40 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37443)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omx-0004Y7-0O
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:35 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3Omw-0003yH-76
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:34 +0000
Date: Fri, 02 Mar 2012 09:28:34 +0000
Message-Id: <E1S3Omw-0003yH-76@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/grep.info.tar.gz,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:04 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: grep.info.tar.gz
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.info.tar.gz,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
Binary files /tmp/cvs4hWW06 and /tmp/cvsKgDZZU differ


From MAILER-DAEMON Fri Mar 02 04:29:05 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3OnR-0000HE-PC
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:05 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35888)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnD-0000BK-MS
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On3-0004ca-Mb
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:51 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36135)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On3-0004cG-K1
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:41 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35610)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3On2-0007HC-UY
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:41 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omw-0004Xn-60
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:40 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37437)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omw-0004Xa-3I
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:34 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3Omv-0003y8-Ga
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:33 +0000
Date: Fri, 02 Mar 2012 09:28:33 +0000
Message-Id: <E1S3Omv-0003y8-Ga@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/grep.html.gz,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:05 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: grep.html.gz
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.html.gz,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
Binary files /tmp/cvsegu2X3 and /tmp/cvscFBUUR differ


From MAILER-DAEMON Fri Mar 02 04:29:09 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3OnV-0000JP-Re
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:09 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35978)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnK-0000Ff-A0
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On6-0004fD-IO
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:57 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36140)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On6-0004et-Dn
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:44 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35643)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3On5-0007HR-Qc
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:43 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On1-0004ac-Bw
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:42 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37482)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On1-0004aU-8p
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:39 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On0-0003zd-Mr
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:38 +0000
Date: Fri, 02 Mar 2012 09:28:38 +0000
Message-Id: <E1S3On0-0003zd-Mr@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Context-Line-Control.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:09 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Context-Line-Control.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Context-Line-Control.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Context-Line-Control.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Context-Line-Control.html	2 Mar 2012 09:28:26 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Context Line Control - GNU Grep 2.9</title>
+<title>Context Line Control - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Command_002dline-Options.html#Command_002dline-Options" title="Command-line Options">
@@ -12,7 +12,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -48,40 +49,52 @@
 
 <p>Regardless of how these options are set,
 <samp><span class="command">grep</span></samp> will never print any given line more than once. 
-If the &lsquo;<samp><span class="samp">-o</span></samp>&rsquo; or &lsquo;<samp><span class="samp">--only-matching</span></samp>&rsquo; option is specified,
+If the <samp><span class="option">-o</span></samp> (<samp><span class="option">--only-matching</span></samp>) option is specified,
 these options have no effect and a warning is given upon their use.
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">-A </span><var>num</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--after-context=</span><var>num</var></samp>&rsquo;<dd><a name="index-g_t_002dA-76"></a><a name="index-g_t_002d_002dafter_002dcontext-77"></a><a name="index-after-context-78"></a><a name="index-context-lines_002c-after-match-79"></a>Print <var>num</var> lines of trailing context after matching lines.
+<dt><samp><span class="option">-A </span><var>num</var></samp><dt><samp><span class="option">--after-context=</span><var>num</var></samp><dd><a name="index-g_t_002dA-76"></a><a name="index-g_t_002d_002dafter_002dcontext-77"></a><a name="index-after-context-78"></a><a name="index-context-lines_002c-after-match-79"></a>Print <var>num</var> lines of trailing context after matching lines.
 
-     <br><dt>&lsquo;<samp><span class="samp">-B </span><var>num</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--before-context=</span><var>num</var></samp>&rsquo;<dd><a name="index-g_t_002dB-80"></a><a name="index-g_t_002d_002dbefore_002dcontext-81"></a><a name="index-before-context-82"></a><a name="index-context-lines_002c-before-match-83"></a>Print <var>num</var> lines of leading context before matching lines.
+     <br><dt><samp><span class="option">-B </span><var>num</var></samp><dt><samp><span class="option">--before-context=</span><var>num</var></samp><dd><a name="index-g_t_002dB-80"></a><a name="index-g_t_002d_002dbefore_002dcontext-81"></a><a name="index-before-context-82"></a><a name="index-context-lines_002c-before-match-83"></a>Print <var>num</var> lines of leading context before matching lines.
 
-     <br><dt>&lsquo;<samp><span class="samp">-C </span><var>num</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">-</span><var>num</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--context=</span><var>num</var></samp>&rsquo;<dd><a name="index-g_t_002dC-84"></a><a name="index-g_t_002d_002dcontext-85"></a><a name="index-g_t_002d_0040var_007bnum_007d-86"></a><a name="index-context-87"></a>Print <var>num</var> lines of leading and trailing output context.
+     <br><dt><samp><span class="option">-C </span><var>num</var></samp><dt><samp><span class="option">-</span><var>num</var></samp><dt><samp><span class="option">--context=</span><var>num</var></samp><dd><a name="index-g_t_002dC-84"></a><a name="index-g_t_002d_002dcontext-85"></a><a name="index-g_t_002d_0040var_007bnum_007d-86"></a><a name="index-context-87"></a>Print <var>num</var> lines of leading and trailing output context.
 
-     <br><dt>&lsquo;<samp><span class="samp">--group-separator=</span><var>string</var></samp>&rsquo;<dd><a name="index-g_t_002d_002dgroup_002dseparator-88"></a><a name="index-group-separator-89"></a>When <samp><span class="option">-A</span></samp>, <samp><span class="option">-B</span></samp> or <samp><span class="option">-C</span></samp> are in use,
-print <var>string</var> instead of &lsquo;<samp><span class="samp">--</span></samp>&rsquo; around disjoint groups
+     <br><dt><samp><span class="option">--group-separator=</span><var>string</var></samp><dd><a name="index-g_t_002d_002dgroup_002dseparator-88"></a><a name="index-group-separator-89"></a>When <samp><span class="option">-A</span></samp>, <samp><span class="option">-B</span></samp> or <samp><span class="option">-C</span></samp> are in use,
+print <var>string</var> instead of <samp><span class="option">--</span></samp> around disjoint groups
 of lines.
 
-     <br><dt>&lsquo;<samp><span class="samp">--no-group-separator</span></samp>&rsquo;<dd><a name="index-g_t_002d_002dgroup_002dseparator-90"></a><a name="index-group-separator-91"></a>When <samp><span class="option">-A</span></samp>, <samp><span class="option">-B</span></samp> or <samp><span class="option">-C</span></samp> are in use,
+     <br><dt><samp><span class="option">--no-group-separator</span></samp><dd><a name="index-g_t_002d_002dgroup_002dseparator-90"></a><a name="index-group-separator-91"></a>When <samp><span class="option">-A</span></samp>, <samp><span class="option">-B</span></samp> or <samp><span class="option">-C</span></samp> are in use,
 print disjoint groups of lines adjacent to each other.
 
    </dl>
 
-   <p>Matching lines normally use &lsquo;<samp><span class="samp">:</span></samp>&rsquo; as a separator
+   <p>Here are some points about how <samp><span class="command">grep</span></samp> chooses
+the separator to print between prefix fields and line content:
+
+     <ul>
+<li>Matching lines normally use &lsquo;<samp><span class="samp">:</span></samp>&rsquo; as a separator
 between prefix fields and actual line content. 
-Context (i.e., non-matching) lines use &lsquo;<samp><span class="samp">-</span></samp>&rsquo; instead. 
-When no context is specified,
+
+     <li>Context (i.e., non-matching) lines use &lsquo;<samp><span class="samp">-</span></samp>&rsquo; instead.
+
+     <li>When no context is specified,
 matching lines are simply output one right after another. 
-When nonzero context is specified,
+
+     <li>When nonzero context is specified,
 lines that are adjacent in the input form a group
 and are output one right after another, while
 a separator appears by default between disjoint groups on a line
-of its own and without any prefix.  The default separator
+of its own and without any prefix.
+
+     <li>The default separator
 is &lsquo;<samp><span class="samp">--</span></samp>&rsquo;, however whether to include it and its appearance
-can be changed with the options above.  Each group may contain
+can be changed with the options above.
+
+     <li>Each group may contain
 several matching lines when they are close enough to each other
 that two otherwise adjacent but divided groups connect
 and can just merge into a single contiguous one.
+</ul>
 
    </body></html>
 


From MAILER-DAEMON Fri Mar 02 04:29:11 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3OnW-0000Kj-WB
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:10 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36000)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnL-0000G7-DS
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On8-0004gl-2n
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:58 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36141)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On8-0004gS-0S
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:46 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35660)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3On7-0007HW-CC
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:45 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On0-0004a5-8d
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:44 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37470)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On0-0004Zu-5g
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:38 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3Omz-0003zE-KL
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:37 +0000
Date: Fri, 02 Mar 2012 09:28:37 +0000
Message-Id: <E1S3Omz-0003zE-KL@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Basic-vs-Extended.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:09 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Basic-vs-Extended.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Basic-vs-Extended.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Basic-vs-Extended.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Basic-vs-Extended.html	2 Mar 2012 09:28:26 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Basic vs Extended - GNU Grep 2.9</title>
+<title>Basic vs Extended - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Regular-Expressions.html#Regular-Expressions" title="Regular Expressions">
@@ -11,7 +11,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -55,13 +56,13 @@
 portable scripts should avoid &lsquo;<samp><span class="samp">{</span></samp>&rsquo; in &lsquo;<samp><span class="samp">grep -E</span></samp>&rsquo; patterns and
 should use &lsquo;<samp><span class="samp">[{]</span></samp>&rsquo; to match a literal &lsquo;<samp><span class="samp">{</span></samp>&rsquo;.
 
-   <p><span class="sc">gnu</span> <samp><span class="command">grep -E</span></samp> attempts to support traditional usage by
+   <p>GNU <samp><span class="command">grep -E</span></samp> attempts to support traditional usage by
 assuming that &lsquo;<samp><span class="samp">{</span></samp>&rsquo; is not special if it would be the start of an
 invalid interval specification. 
 For example, the command
 &lsquo;<samp><span class="samp">grep -E '{1'</span></samp>&rsquo; searches for the two-character string &lsquo;<samp><span class="samp">{1</span></samp>&rsquo;
 instead of reporting a syntax error in the regular expression. 
-<span class="sc">posix.2</span> allows this behavior as an extension, but portable scripts
+POSIX allows this behavior as an extension, but portable scripts
 should avoid it.
 
    </body></html>


From MAILER-DAEMON Fri Mar 02 04:29:12 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3OnY-0000MV-5g
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:12 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36055)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnO-0000GQ-1O
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:11 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnA-0004jq-Ja
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:01 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36144)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnA-0004jK-HF
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:48 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35680)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3On9-0007Ha-Uh
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:48 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On3-0004c2-3T
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:47 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37491)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On3-0004bf-0d
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:41 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On2-000405-8S
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:40 +0000
Date: Fri, 02 Mar 2012 09:28:40 +0000
Message-Id: <E1S3On2-000405-8S@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Exit-Status.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:11 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Exit-Status.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Exit-Status.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Exit-Status.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Exit-Status.html	2 Mar 2012 09:28:27 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Exit Status - GNU Grep 2.9</title>
+<title>Exit Status - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Invoking.html#Invoking" title="Invoking">
@@ -12,7 +12,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -51,7 +52,7 @@
 But the exit status is 2 if an error occurred, unless the <samp><span class="option">-q</span></samp> or
 <samp><span class="option">--quiet</span></samp> or <samp><span class="option">--silent</span></samp> option is used and a selected line
 is found. 
-Note, however, that <span class="sc">posix</span> only mandates,
+Note, however, that POSIX only mandates,
 for programs such as <samp><span class="command">grep</span></samp>, <samp><span class="command">cmp</span></samp>, and <samp><span class="command">diff</span></samp>,
 that the exit status in case of error be greater than 1;
 it is therefore advisable, for the sake of portability,


From MAILER-DAEMON Fri Mar 02 04:29:13 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3OnZ-0000NM-7h
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:13 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36113)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnQ-0000Ge-Hr
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:11 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnH-0004rj-TI
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:04 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36152)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnH-0004rS-PE
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:55 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35757)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnH-0007Hy-0c
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:55 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On4-0004dA-A7
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:54 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37504)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On4-0004cp-5C
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:42 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On3-00040L-K4
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:41 +0000
Date: Fri, 02 Mar 2012 09:28:41 +0000
Message-Id: <E1S3On3-00040L-K4@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/General-Output-Control.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:12 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/General-Output-Control.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/General-Output-Control.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/General-Output-Control.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/General-Output-Control.html	2 Mar 2012 09:28:29 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>General Output Control - GNU Grep 2.9</title>
+<title>General Output Control - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Command_002dline-Options.html#Command_002dline-Options" title="Command-line Options">
@@ -12,7 +12,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -47,38 +48,38 @@
 <h4 class="subsection">2.1.3 General Output Control</h4>
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">-c</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--count</span></samp>&rsquo;<dd><a name="index-g_t_002dc-27"></a><a name="index-g_t_002d_002dcount-28"></a><a name="index-counting-lines-29"></a>Suppress normal output;
+<dt><samp><span class="option">-c</span></samp><dt><samp><span class="option">--count</span></samp><dd><a name="index-g_t_002dc-27"></a><a name="index-g_t_002d_002dcount-28"></a><a name="index-counting-lines-29"></a>Suppress normal output;
 instead print a count of matching lines for each input file. 
-With the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo;, &lsquo;<samp><span class="samp">--invert-match</span></samp>&rsquo; option,
+With the <samp><span class="option">-v</span></samp> (<samp><span class="option">--invert-match</span></samp>) option,
 count non-matching lines. 
-(&lsquo;<samp><span class="samp">-c</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+(<samp><span class="option">-c</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">--color[=</span><var>WHEN</var><span class="samp">]</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--colour[=</span><var>WHEN</var><span class="samp">]</span></samp>&rsquo;<dd><a name="index-g_t_002d_002dcolor-30"></a><a name="index-g_t_002d_002dcolour-31"></a><a name="index-highlight_002c-color_002c-colour-32"></a>Surround the matched (non-empty) strings, matching lines, context lines,
+     <br><dt><samp><span class="option">--color[=</span><var>WHEN</var><span class="option">]</span></samp><dt><samp><span class="option">--colour[=</span><var>WHEN</var><span class="option">]</span></samp><dd><a name="index-g_t_002d_002dcolor-30"></a><a name="index-g_t_002d_002dcolour-31"></a><a name="index-highlight_002c-color_002c-colour-32"></a>Surround the matched (non-empty) strings, matching lines, context lines,
 file names, line numbers, byte offsets, and separators (for fields and
 groups of context lines) with escape sequences to display them in color
 on the terminal. 
-The colors are defined by the environment variable <var>GREP_COLORS</var>
+The colors are defined by the environment variable <samp><span class="env">GREP_COLORS</span></samp>
 and default to &lsquo;<samp><span class="samp">ms=01;31:mc=01;31:sl=:cx=:fn=35:ln=32:bn=32:se=36</span></samp>&rsquo;
 for bold red matched text, magenta file names, green line numbers,
 green byte offsets, cyan separators, and default terminal colors otherwise. 
-The deprecated environment variable <var>GREP_COLOR</var> is still supported,
+The deprecated environment variable <samp><span class="env">GREP_COLOR</span></samp> is still supported,
 but its setting does not have priority;
 it defaults to `01;31' (bold red)
 which only covers the color for matched text. 
 <var>WHEN</var> is &lsquo;<samp><span class="samp">never</span></samp>&rsquo;, &lsquo;<samp><span class="samp">always</span></samp>&rsquo;, or &lsquo;<samp><span class="samp">auto</span></samp>&rsquo;.
 
-     <br><dt>&lsquo;<samp><span class="samp">-L</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--files-without-match</span></samp>&rsquo;<dd><a name="index-g_t_002dL-33"></a><a name="index-g_t_002d_002dfiles_002dwithout_002dmatch-34"></a><a name="index-files-which-don_0027t-match-35"></a>Suppress normal output;
+     <br><dt><samp><span class="option">-L</span></samp><dt><samp><span class="option">--files-without-match</span></samp><dd><a name="index-g_t_002dL-33"></a><a name="index-g_t_002d_002dfiles_002dwithout_002dmatch-34"></a><a name="index-files-which-don_0027t-match-35"></a>Suppress normal output;
 instead print the name of each input file from which
 no output would normally have been printed. 
-The scanning of every file will stop on the first match.
+The scanning of each file stops on the first match.
 
-     <br><dt>&lsquo;<samp><span class="samp">-l</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--files-with-matches</span></samp>&rsquo;<dd><a name="index-g_t_002dl-36"></a><a name="index-g_t_002d_002dfiles_002dwith_002dmatches-37"></a><a name="index-names-of-matching-files-38"></a>Suppress normal output;
+     <br><dt><samp><span class="option">-l</span></samp><dt><samp><span class="option">--files-with-matches</span></samp><dd><a name="index-g_t_002dl-36"></a><a name="index-g_t_002d_002dfiles_002dwith_002dmatches-37"></a><a name="index-names-of-matching-files-38"></a>Suppress normal output;
 instead print the name of each input file from which
 output would normally have been printed. 
-The scanning of every file will stop on the first match. 
-(&lsquo;<samp><span class="samp">-l</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+The scanning of each file stops on the first match. 
+(<samp><span class="option">-l</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-m </span><var>num</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--max-count=</span><var>num</var></samp>&rsquo;<dd><a name="index-g_t_002dm-39"></a><a name="index-g_t_002d_002dmax_002dcount-40"></a><a name="index-max_002dcount-41"></a>Stop reading a file after <var>num</var> matching lines. 
+     <br><dt><samp><span class="option">-m </span><var>num</var></samp><dt><samp><span class="option">--max-count=</span><var>num</var></samp><dd><a name="index-g_t_002dm-39"></a><a name="index-g_t_002d_002dmax_002dcount-40"></a><a name="index-max_002dcount-41"></a>Stop reading a file after <var>num</var> matching lines. 
 If the input is standard input from a regular file,
 and <var>num</var> matching lines are output,
 <samp><span class="command">grep</span></samp> ensures that the standard input is positioned
@@ -106,35 +107,42 @@
 it outputs any trailing context lines. 
 Since context does not include matching lines,
 <samp><span class="command">grep</span></samp> will stop when it encounters another matching line. 
-When the &lsquo;<samp><span class="samp">-c</span></samp>&rsquo; or &lsquo;<samp><span class="samp">--count</span></samp>&rsquo; option is also used,
+When the <samp><span class="option">-c</span></samp> or <samp><span class="option">--count</span></samp> option is also used,
 <samp><span class="command">grep</span></samp> does not output a count greater than <var>num</var>. 
-When the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; or &lsquo;<samp><span class="samp">--invert-match</span></samp>&rsquo; option is also used,
+When the <samp><span class="option">-v</span></samp> or <samp><span class="option">--invert-match</span></samp> option is also used,
 <samp><span class="command">grep</span></samp> stops after outputting <var>num</var> non-matching lines.
 
-     <br><dt>&lsquo;<samp><span class="samp">-o</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--only-matching</span></samp>&rsquo;<dd><a name="index-g_t_002do-42"></a><a name="index-g_t_002d_002donly_002dmatching-43"></a><a name="index-only-matching-44"></a>Print only the matched (non-empty) parts of matching lines,
+     <br><dt><samp><span class="option">-o</span></samp><dt><samp><span class="option">--only-matching</span></samp><dd><a name="index-g_t_002do-42"></a><a name="index-g_t_002d_002donly_002dmatching-43"></a><a name="index-only-matching-44"></a>Print only the matched (non-empty) parts of matching lines,
 with each such part on a separate output line.
 
-     <br><dt>&lsquo;<samp><span class="samp">-q</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--quiet</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--silent</span></samp>&rsquo;<dd><a name="index-g_t_002dq-45"></a><a name="index-g_t_002d_002dquiet-46"></a><a name="index-g_t_002d_002dsilent-47"></a><a name="index-quiet_002c-silent-48"></a>Quiet; do not write anything to standard output. 
+     <br><dt><samp><span class="option">-q</span></samp><dt><samp><span class="option">--quiet</span></samp><dt><samp><span class="option">--silent</span></samp><dd><a name="index-g_t_002dq-45"></a><a name="index-g_t_002d_002dquiet-46"></a><a name="index-g_t_002d_002dsilent-47"></a><a name="index-quiet_002c-silent-48"></a>Quiet; do not write anything to standard output. 
 Exit immediately with zero status if any match is found,
 even if an error was detected. 
-Also see the &lsquo;<samp><span class="samp">-s</span></samp>&rsquo; or &lsquo;<samp><span class="samp">--no-messages</span></samp>&rsquo; option. 
-(&lsquo;<samp><span class="samp">-q</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+Also see the <samp><span class="option">-s</span></samp> or <samp><span class="option">--no-messages</span></samp> option. 
+(<samp><span class="option">-q</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-s</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--no-messages</span></samp>&rsquo;<dd><a name="index-g_t_002ds-49"></a><a name="index-g_t_002d_002dno_002dmessages-50"></a><a name="index-suppress-error-messages-51"></a>Suppress error messages about nonexistent or unreadable files. 
+     <br><dt><samp><span class="option">-s</span></samp><dt><samp><span class="option">--no-messages</span></samp><dd><a name="index-g_t_002ds-49"></a><a name="index-g_t_002d_002dno_002dmessages-50"></a><a name="index-suppress-error-messages-51"></a>Suppress error messages about nonexistent or unreadable files. 
 Portability note:
-unlike <span class="sc">gnu</span> <samp><span class="command">grep</span></samp>,
-7th Edition Unix <samp><span class="command">grep</span></samp> did not conform to <span class="sc">posix</span>,
-because it lacked &lsquo;<samp><span class="samp">-q</span></samp>&rsquo;
-and its &lsquo;<samp><span class="samp">-s</span></samp>&rsquo; option behaved like
-<span class="sc">gnu</span> <samp><span class="command">grep</span></samp>'s &lsquo;<samp><span class="samp">-q</span></samp>&rsquo; option. 
-<span class="sc">usg</span>-style <samp><span class="command">grep</span></samp> also lacked &lsquo;<samp><span class="samp">-q</span></samp>&rsquo;
-but its &lsquo;<samp><span class="samp">-s</span></samp>&rsquo; option behaved like <span class="sc">gnu</span> <samp><span class="command">grep</span></samp>'s. 
+unlike GNU <samp><span class="command">grep</span></samp>,
+7th Edition Unix <samp><span class="command">grep</span></samp> did not conform to POSIX,
+because it lacked <samp><span class="option">-q</span></samp>
+and its <samp><span class="option">-s</span></samp> option behaved like
+GNU <samp><span class="command">grep</span></samp>'s <samp><span class="option">-q</span></samp> option.<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>
+USG-style <samp><span class="command">grep</span></samp> also lacked <samp><span class="option">-q</span></samp>
+but its <samp><span class="option">-s</span></samp> option behaved like GNU <samp><span class="command">grep</span></samp>'s. 
 Portable shell scripts should avoid both
-&lsquo;<samp><span class="samp">-q</span></samp>&rsquo; and &lsquo;<samp><span class="samp">-s</span></samp>&rsquo; and should redirect
+<samp><span class="option">-q</span></samp> and <samp><span class="option">-s</span></samp> and should redirect
 standard and error output to <samp><span class="file">/dev/null</span></samp> instead. 
-(&lsquo;<samp><span class="samp">-s</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+(<samp><span class="option">-s</span></samp> is specified by POSIX.)
 
 </dl>
 
+   <div class="footnote">
+<hr>
+<h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Of course, 7th Edition
+Unix predated POSIX by several years!</p>
+
+   <hr></div>
+
    </body></html>
 


From MAILER-DAEMON Fri Mar 02 04:29:05 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3OnR-0000H3-MJ
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:05 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35898)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnF-0000EN-Bn
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On5-0004dn-0U
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:52 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36138)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On4-0004dW-TG
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:42 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35624)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3On4-0007HL-9g
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:42 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omx-0004YZ-CW
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:41 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37446)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omx-0004YG-9A
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:35 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3Omw-0003yQ-ON
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:34 +0000
Date: Fri, 02 Mar 2012 09:28:34 +0000
Message-Id: <E1S3Omw-0003yQ-ON@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/grep.pdf,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:04 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: grep.pdf
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.pdf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
Binary files /tmp/cvsuqFkm5 and /tmp/cvsfKRZoT differ


From MAILER-DAEMON Fri Mar 02 04:29:14 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Ona-0000Pe-GQ
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:14 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36093)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnP-0000GX-Oj
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:13 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnB-0004lB-O4
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:03 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36146)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnB-0004kp-Kg
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:49 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35694)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnA-0007Hi-V8
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:49 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On2-0004b4-4q
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:48 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37486)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On2-0004aq-0t
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:40 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On1-0003zj-0d
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:39 +0000
Date: Fri, 02 Mar 2012 09:28:39 +0000
Message-Id: <E1S3On1-0003zj-0d@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Copying.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:13 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Copying.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Copying.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Copying.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Copying.html	2 Mar 2012 09:28:27 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Copying - GNU Grep 2.9</title>
+<title>Copying - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="prev" href="Reporting-Bugs.html#Reporting-Bugs" title="Reporting Bugs">
@@ -11,7 +11,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -46,13 +47,13 @@
 <h2 class="chapter">6 Copying</h2>
 
 <p><a name="index-copying-251"></a>
-GNU grep is licensed under the GNU GPL, which makes it <dfn>free
+GNU <samp><span class="command">grep</span></samp> is licensed under the GNU GPL, which makes it <dfn>free
 software</dfn>.
 
    <p>The &ldquo;free&rdquo; in &ldquo;free software&rdquo; refers to liberty, not price. As
 some GNU project advocates like to point out, think of &ldquo;free speech&rdquo;
 rather than &ldquo;free beer&rdquo;.  In short, you have the right (freedom) to
-run and change grep and distribute it to other people, and&mdash;if you
+run and change <samp><span class="command">grep</span></samp> and distribute it to other people, and&mdash;if you
 want&mdash;charge money for doing either.  The important restriction is
 that you have to grant your recipients the same rights and impose the
 same restrictions.


From MAILER-DAEMON Fri Mar 02 04:29:15 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Onb-0000RV-MZ
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:15 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36177)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnT-0000Iw-V6
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:14 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnG-0004ph-6B
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:07 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36149)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnF-0004pU-RI
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:54 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35730)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnE-0007Hq-UE
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:53 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On2-0004bb-M4
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:52 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37488)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On2-0004bC-Hp
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:40 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On1-000401-PM
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:40 +0000
Date: Fri, 02 Mar 2012 09:28:39 +0000
Message-Id: <E1S3On1-000401-PM@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Environment-Variables.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:14 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Environment-Variables.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Environment-Variables.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Environment-Variables.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Environment-Variables.html	2 Mar 2012 09:28:27 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Environment Variables - GNU Grep 2.9</title>
+<title>Environment Variables - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Invoking.html#Invoking" title="Invoking">
@@ -12,7 +12,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -61,7 +62,41 @@
 The &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale is used if none of these environment variables are set,
 if the locale catalog is not installed,
 or if <samp><span class="command">grep</span></samp> was not compiled
-with national language support (<span class="sc">nls</span>).
+with national language support (NLS).
+
+   <p>Many of the environment variables in the following list let you
+control highlighting using
+Select Graphic Rendition (SGR)
+commands interpreted by the terminal or terminal emulator. 
+(See the
+section
+in the documentation of your text terminal
+for permitted values and their meanings as character attributes.) 
+These substring values are integers in decimal representation
+and can be concatenated with semicolons. 
+<samp><span class="command">grep</span></samp> takes care of assembling the result
+into a complete SGR sequence (&lsquo;<samp><span class="samp">\33[</span></samp>&rsquo;...&lsquo;<samp><span class="samp">m</span></samp>&rsquo;). 
+Common values to concatenate include
+&lsquo;<samp><span class="samp">1</span></samp>&rsquo; for bold,
+&lsquo;<samp><span class="samp">4</span></samp>&rsquo; for underline,
+&lsquo;<samp><span class="samp">5</span></samp>&rsquo; for blink,
+&lsquo;<samp><span class="samp">7</span></samp>&rsquo; for inverse,
+&lsquo;<samp><span class="samp">39</span></samp>&rsquo; for default foreground color,
+&lsquo;<samp><span class="samp">30</span></samp>&rsquo; to &lsquo;<samp><span class="samp">37</span></samp>&rsquo; for foreground colors,
+&lsquo;<samp><span class="samp">90</span></samp>&rsquo; to &lsquo;<samp><span class="samp">97</span></samp>&rsquo; for 16-color mode foreground colors,
+&lsquo;<samp><span class="samp">38;5;0</span></samp>&rsquo; to &lsquo;<samp><span class="samp">38;5;255</span></samp>&rsquo;
+for 88-color and 256-color modes foreground colors,
+&lsquo;<samp><span class="samp">49</span></samp>&rsquo; for default background color,
+&lsquo;<samp><span class="samp">40</span></samp>&rsquo; to &lsquo;<samp><span class="samp">47</span></samp>&rsquo; for background colors,
+&lsquo;<samp><span class="samp">100</span></samp>&rsquo; to &lsquo;<samp><span class="samp">107</span></samp>&rsquo; for 16-color mode background colors,
+and &lsquo;<samp><span class="samp">48;5;0</span></samp>&rsquo; to &lsquo;<samp><span class="samp">48;5;255</span></samp>&rsquo;
+for 88-color and 256-color modes background colors.
+
+   <p>The two-letter names used in the <samp><span class="env">GREP_COLORS</span></samp> environment variable
+(and some of the others) refer to terminal &ldquo;capabilities,&rdquo; the ability
+of a terminal to highlight text, or change its color, and so on. 
+These capabilities are stored in an online database and accessed by
+the <code>terminfo</code> library.
 
    <p><a name="index-environment-variables-130"></a>
      <dl>
@@ -77,20 +112,27 @@
 A backslash escapes the next character, so it can be used to
 specify an option containing whitespace or a backslash.
 
+     <p>The <code>GREP_OPTIONS</code> value does not affect whether <samp><span class="command">grep</span></samp>
+without file operands searches standard input or the working
+directory; that is affected only by command-line options.  For
+example, the command &lsquo;<samp><span class="samp">grep PAT</span></samp>&rsquo; searches standard input and the
+command &lsquo;<samp><span class="samp">grep -r PAT</span></samp>&rsquo; searches the working directory, regardless
+of whether <code>GREP_OPTIONS</code> contains <samp><span class="option">-r</span></samp>.
+
      <br><dt><samp><span class="env">GREP_COLOR</span></samp><dd><a name="index-GREP_005fCOLOR-_0040r_007benvironment-variable_007d-133"></a><a name="index-highlight-markers-134"></a>This variable specifies the color used to highlight matched (non-empty) text. 
-It is deprecated in favor of <code>GREP_COLORS</code>, but still supported. 
-The &lsquo;<samp><span class="samp">mt</span></samp>&rsquo;, &lsquo;<samp><span class="samp">ms</span></samp>&rsquo;, and &lsquo;<samp><span class="samp">mc</span></samp>&rsquo; capabilities of <code>GREP_COLORS</code>
+It is deprecated in favor of <samp><span class="env">GREP_COLORS</span></samp>, but still supported. 
+The &lsquo;<samp><span class="samp">mt</span></samp>&rsquo;, &lsquo;<samp><span class="samp">ms</span></samp>&rsquo;, and &lsquo;<samp><span class="samp">mc</span></samp>&rsquo; capabilities of <samp><span class="env">GREP_COLORS</span></samp>
 have priority over it. 
 It can only specify the color used to highlight
 the matching non-empty text in any matching line
-(a selected line when the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option is omitted,
-or a context line when &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; is specified). 
+(a selected line when the <samp><span class="option">-v</span></samp> command-line option is omitted,
+or a context line when <samp><span class="option">-v</span></samp> is specified). 
 The default is &lsquo;<samp><span class="samp">01;31</span></samp>&rsquo;,
 which means a bold red foreground text on the terminal's default background.
 
      <br><dt><samp><span class="env">GREP_COLORS</span></samp><dd><a name="index-GREP_005fCOLORS-_0040r_007benvironment-variable_007d-135"></a><a name="index-highlight-markers-136"></a>This variable specifies the colors and other attributes
 used to highlight various parts of the output. 
-Its value is a colon-separated list of capabilities
+Its value is a colon-separated list of <code>terminfo</code> capabilities
 that defaults to &lsquo;<samp><span class="samp">ms=01;31:mc=01;31:sl=:cx=:fn=35:ln=32:bn=32:se=36</span></samp>&rsquo;
 with the &lsquo;<samp><span class="samp">rv</span></samp>&rsquo; and &lsquo;<samp><span class="samp">ne</span></samp>&rsquo; boolean capabilities omitted (i.e., false). 
 Supported capabilities are as follows.
@@ -98,45 +140,45 @@
           <dl>
 <dt><code>sl=</code><dd><a name="index-sl-GREP_005fCOLORS-_0040r_007bcapability_007d-137"></a>SGR substring for whole selected lines
 (i.e.,
-matching lines when the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option is omitted,
-or non-matching lines when &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; is specified). 
+matching lines when the <samp><span class="option">-v</span></samp> command-line option is omitted,
+or non-matching lines when <samp><span class="option">-v</span></samp> is specified). 
 If however the boolean &lsquo;<samp><span class="samp">rv</span></samp>&rsquo; capability
-and the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option are both specified,
+and the <samp><span class="option">-v</span></samp> command-line option are both specified,
 it applies to context matching lines instead. 
 The default is empty (i.e., the terminal's default color pair).
 
           <br><dt><code>cx=</code><dd><a name="index-cx-GREP_005fCOLORS-_0040r_007bcapability_007d-138"></a>SGR substring for whole context lines
 (i.e.,
-non-matching lines when the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option is omitted,
-or matching lines when &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; is specified). 
+non-matching lines when the <samp><span class="option">-v</span></samp> command-line option is omitted,
+or matching lines when <samp><span class="option">-v</span></samp> is specified). 
 If however the boolean &lsquo;<samp><span class="samp">rv</span></samp>&rsquo; capability
-and the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option are both specified,
+and the <samp><span class="option">-v</span></samp> command-line option are both specified,
 it applies to selected non-matching lines instead. 
 The default is empty (i.e., the terminal's default color pair).
 
           <br><dt><code>rv</code><dd><a name="index-rv-GREP_005fCOLORS-_0040r_007bcapability_007d-139"></a>Boolean value that reverses (swaps) the meanings of
 the &lsquo;<samp><span class="samp">sl=</span></samp>&rsquo; and &lsquo;<samp><span class="samp">cx=</span></samp>&rsquo; capabilities
-when the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option is specified. 
+when the <samp><span class="option">-v</span></samp> command-line option is specified. 
 The default is false (i.e., the capability is omitted).
 
           <br><dt><code>mt=01;31</code><dd><a name="index-mt-GREP_005fCOLORS-_0040r_007bcapability_007d-140"></a>SGR substring for matching non-empty text in any matching line
 (i.e.,
-a selected line when the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option is omitted,
-or a context line when &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; is specified). 
+a selected line when the <samp><span class="option">-v</span></samp> command-line option is omitted,
+or a context line when <samp><span class="option">-v</span></samp> is specified). 
 Setting this is equivalent to setting both &lsquo;<samp><span class="samp">ms=</span></samp>&rsquo; and &lsquo;<samp><span class="samp">mc=</span></samp>&rsquo;
 at once to the same value. 
 The default is a bold red text foreground over the current line background.
 
           <br><dt><code>ms=01;31</code><dd><a name="index-ms-GREP_005fCOLORS-_0040r_007bcapability_007d-141"></a>SGR substring for matching non-empty text in a selected line. 
-(This is only used when the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option is omitted.) 
+(This is used only when the <samp><span class="option">-v</span></samp> command-line option is omitted.) 
 The effect of the &lsquo;<samp><span class="samp">sl=</span></samp>&rsquo; (or &lsquo;<samp><span class="samp">cx=</span></samp>&rsquo; if &lsquo;<samp><span class="samp">rv</span></samp>&rsquo;) capability
-remains active when this kicks in. 
+remains active when this takes effect. 
 The default is a bold red text foreground over the current line background.
 
           <br><dt><code>mc=01;31</code><dd><a name="index-mc-GREP_005fCOLORS-_0040r_007bcapability_007d-142"></a>SGR substring for matching non-empty text in a context line. 
-(This is only used when the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option is specified.) 
+(This is used only when the <samp><span class="option">-v</span></samp> command-line option is specified.) 
 The effect of the &lsquo;<samp><span class="samp">cx=</span></samp>&rsquo; (or &lsquo;<samp><span class="samp">sl=</span></samp>&rsquo; if &lsquo;<samp><span class="samp">rv</span></samp>&rsquo;) capability
-remains active when this kicks in. 
+remains active when this takes effect. 
 The default is a bold red text foreground over the current line background.
 
           <br><dt><code>fn=35</code><dd><a name="index-fn-GREP_005fCOLORS-_0040r_007bcapability_007d-143"></a>SGR substring for file names prefixing any content line. 
@@ -161,7 +203,7 @@
 This is needed on terminals on which EL is not supported. 
 It is otherwise useful on terminals
 for which the <code>back_color_erase</code>
-(<code>bce</code>) boolean terminfo capability does not apply,
+(<code>bce</code>) boolean <code>terminfo</code> capability does not apply,
 when the chosen highlight colors do not affect the background,
 or when EL is too slow or causes too much flicker. 
 The default is false (i.e., the capability is omitted). 
@@ -170,29 +212,6 @@
      <p>Note that boolean capabilities have no &lsquo;<samp><span class="samp">=</span></samp>&rsquo;... part. 
 They are omitted (i.e., false) by default and become true when specified.
 
-     <p>See the Select Graphic Rendition (SGR) section
-in the documentation of your text terminal
-for permitted values and their meaning as character attributes. 
-These substring values are integers in decimal representation
-and can be concatenated with semicolons. 
-<samp><span class="command">grep</span></samp> takes care of assembling the result
-into a complete SGR sequence (&lsquo;<samp><span class="samp">\33[</span></samp>&rsquo;...&lsquo;<samp><span class="samp">m</span></samp>&rsquo;). 
-Common values to concatenate include
-&lsquo;<samp><span class="samp">1</span></samp>&rsquo; for bold,
-&lsquo;<samp><span class="samp">4</span></samp>&rsquo; for underline,
-&lsquo;<samp><span class="samp">5</span></samp>&rsquo; for blink,
-&lsquo;<samp><span class="samp">7</span></samp>&rsquo; for inverse,
-&lsquo;<samp><span class="samp">39</span></samp>&rsquo; for default foreground color,
-&lsquo;<samp><span class="samp">30</span></samp>&rsquo; to &lsquo;<samp><span class="samp">37</span></samp>&rsquo; for foreground colors,
-&lsquo;<samp><span class="samp">90</span></samp>&rsquo; to &lsquo;<samp><span class="samp">97</span></samp>&rsquo; for 16-color mode foreground colors,
-&lsquo;<samp><span class="samp">38;5;0</span></samp>&rsquo; to &lsquo;<samp><span class="samp">38;5;255</span></samp>&rsquo;
-for 88-color and 256-color modes foreground colors,
-&lsquo;<samp><span class="samp">49</span></samp>&rsquo; for default background color,
-&lsquo;<samp><span class="samp">40</span></samp>&rsquo; to &lsquo;<samp><span class="samp">47</span></samp>&rsquo; for background colors,
-&lsquo;<samp><span class="samp">100</span></samp>&rsquo; to &lsquo;<samp><span class="samp">107</span></samp>&rsquo; for 16-color mode background colors,
-and &lsquo;<samp><span class="samp">48;5;0</span></samp>&rsquo; to &lsquo;<samp><span class="samp">48;5;255</span></samp>&rsquo;
-for 88-color and 256-color modes background colors.
-
      <br><dt><samp><span class="env">LC_ALL</span></samp><dt><samp><span class="env">LC_COLLATE</span></samp><dt><samp><span class="env">LANG</span></samp><dd><a name="index-LC_005fALL-_0040r_007benvironment-variable_007d-148"></a><a name="index-LC_005fCOLLATE-_0040r_007benvironment-variable_007d-149"></a><a name="index-LANG-_0040r_007benvironment-variable_007d-150"></a><a name="index-character-type-151"></a><a name="index-national-language-support-152"></a><a name="index-NLS-153"></a>These variables specify the locale for the <code>LC_COLLATE</code> category,
 which determines the collating sequence
 used to interpret range expressions like &lsquo;<samp><span class="samp">[a-z]</span></samp>&rsquo;.
@@ -205,9 +224,9 @@
 which determines the language that <samp><span class="command">grep</span></samp> uses for messages. 
 The default &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale uses American English messages.
 
-     <br><dt><samp><span class="env">POSIXLY_CORRECT</span></samp><dd><a name="index-POSIXLY_005fCORRECT-_0040r_007benvironment-variable_007d-164"></a>If set, <samp><span class="command">grep</span></samp> behaves as <span class="sc">posix.2</span> requires; otherwise,
-<samp><span class="command">grep</span></samp> behaves more like other <span class="sc">gnu</span> programs. 
-<span class="sc">posix.2</span>
+     <br><dt><samp><span class="env">POSIXLY_CORRECT</span></samp><dd><a name="index-POSIXLY_005fCORRECT-_0040r_007benvironment-variable_007d-164"></a>If set, <samp><span class="command">grep</span></samp> behaves as POSIX requires; otherwise,
+<samp><span class="command">grep</span></samp> behaves more like other GNU programs. 
+POSIX
 requires that options that
 follow file names must be treated as file names;
 by default,
@@ -223,7 +242,7 @@
 A shell can put this variable in the environment for each command it runs,
 specifying which operands are the results of file name wildcard expansion
 and therefore should not be treated as options. 
-This behavior is available only with the <span class="sc">gnu</span> C library,
+This behavior is available only with the GNU C library,
 and only when <code>POSIXLY_CORRECT</code> is not set.
 
    </dl>


From MAILER-DAEMON Fri Mar 02 04:29:16 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Onb-0000SY-VK
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:15 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36102)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnQ-0000GZ-1H
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:14 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnJ-0004tJ-7u
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:03 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36155)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnJ-0004t5-57
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:57 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35777)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnI-0007I7-87
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:56 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omx-0004Ym-Q2
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:55 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37450)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omx-0004Ye-Mo
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:35 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3Omx-0003yU-1N
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:35 +0000
Date: Fri, 02 Mar 2012 09:28:35 +0000
Message-Id: <E1S3Omx-0003yU-1N@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/grep.ps.gz,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:15 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: grep.ps.gz
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.ps.gz,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
Binary files /tmp/cvs0yYdn9 and /tmp/cvs1KgisX differ


From MAILER-DAEMON Fri Mar 02 04:29:17 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Ond-0000VI-4G
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:17 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36206)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnV-0000JF-VZ
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:15 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnN-0004zW-Ss
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:09 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36163)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnN-0004zC-QA
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:01 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35870)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnN-0007IW-75
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:01 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omy-0004ZI-TD
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:00 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37458)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omy-0004Z7-Q2
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:36 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3Omy-0003yt-6P
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:36 +0000
Date: Fri, 02 Mar 2012 09:28:36 +0000
Message-Id: <E1S3Omy-0003yt-6P@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/grep.txt.gz,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:15 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: grep.txt.gz
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.txt.gz,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
Binary files /tmp/cvsS22Vec and /tmp/cvsG7Xho0 differ


From MAILER-DAEMON Fri Mar 02 04:29:17 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Ond-0000Vp-9h
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:17 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36070)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnO-0000GU-OY
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:16 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnA-0004ji-F7
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:02 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36143)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnA-0004jH-BT
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:48 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35676)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3On9-0007HZ-GA
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:47 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omy-0004Z9-Iv
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:46 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37455)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omy-0004Z4-Dj
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:36 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3Omx-0003yq-SF
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:35 +0000
Date: Fri, 02 Mar 2012 09:28:35 +0000
Message-Id: <E1S3Omx-0003yq-SF@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/grep.txt,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:16 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: grep.txt
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- grep.txt	25 Jun 2011 09:28:43 -0000	1.9
+++ grep.txt	2 Mar 2012 09:28:23 -0000	1.10
@@ -33,13 +33,13 @@
 grep
 ****
 
-`grep' prints lines that match a pattern.
+`grep' prints lines that contain a match for a pattern.
 
-   This manual is for version 2.9 of GNU Grep.
+   This manual is for version 2.11 of GNU Grep.
 
    This manual is for `grep', a pattern matching engine.
 
-   Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation,
+   Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
 Inc.
 
      Permission is granted to copy, distribute and/or modify this
@@ -52,7 +52,7 @@
 1 Introduction
 **************
 
-`grep' searches the input files for lines containing a match to a given
+`grep' searches input files for lines containing a match to a given
 pattern list.  When it finds a match in a line, it copies the line to
 standard output (by default), or produces whatever other sort of output
 you have requested with options.
@@ -79,12 +79,12 @@
 2.1 Command-line Options
 ========================
 
-`grep' comes with a rich set of options: some from POSIX.2 and some
-being GNU extensions.  Long option names are always a GNU extension,
-even for options that are from POSIX specifications.  Options that are
-specified by POSIX, under their short names, are explicitly marked as
-such to facilitate POSIX-portable programming.  A few option names are
-provided for compatibility with older or more exotic implementations.
+`grep' comes with a rich set of options: some from POSIX and some being
+GNU extensions.  Long option names are always a GNU extension, even for
+options that are from POSIX specifications.  Options that are specified
+by POSIX, under their short names, are explicitly marked as such to
+facilitate POSIX-portable programming.  A few option names are provided
+for compatibility with older or more exotic implementations.
 
    Several additional options control which variant of the `grep'
 matching engine is used.  *Note grep Programs::.
@@ -150,7 +150,7 @@
 `-c'
 `--count'
      Suppress normal output; instead print a count of matching lines
-     for each input file.  With the `-v', `--invert-match' option,
+     for each input file.  With the `-v' (`--invert-match') option,
      count non-matching lines.  (`-c' is specified by POSIX.)
 
 `--color[=WHEN]'
@@ -159,26 +159,26 @@
      lines, file names, line numbers, byte offsets, and separators (for
      fields and groups of context lines) with escape sequences to
      display them in color on the terminal.  The colors are defined by
-     the environment variable GREP_COLORS and default to
+     the environment variable `GREP_COLORS' and default to
      `ms=01;31:mc=01;31:sl=:cx=:fn=35:ln=32:bn=32:se=36' for bold red
      matched text, magenta file names, green line numbers, green byte
      offsets, cyan separators, and default terminal colors otherwise.
-     The deprecated environment variable GREP_COLOR is still supported,
-     but its setting does not have priority; it defaults to `01;31'
-     (bold red) which only covers the color for matched text.  WHEN is
-     `never', `always', or `auto'.
+     The deprecated environment variable `GREP_COLOR' is still
+     supported, but its setting does not have priority; it defaults to
+     `01;31' (bold red) which only covers the color for matched text.
+     WHEN is `never', `always', or `auto'.
 
 `-L'
 `--files-without-match'
      Suppress normal output; instead print the name of each input file
      from which no output would normally have been printed.  The
-     scanning of every file will stop on the first match.
+     scanning of each file stops on the first match.
 
 `-l'
 `--files-with-matches'
      Suppress normal output; instead print the name of each input file
      from which output would normally have been printed.  The scanning
-     of every file will stop on the first match.  (`-l' is specified by
+     of each file stops on the first match.  (`-l' is specified by
      POSIX.)
 
 `-m NUM'
@@ -232,13 +232,17 @@
      Suppress error messages about nonexistent or unreadable files.
      Portability note: unlike GNU `grep', 7th Edition Unix `grep' did
      not conform to POSIX, because it lacked `-q' and its `-s' option
-     behaved like GNU `grep''s `-q' option.  USG-style `grep' also
+     behaved like GNU `grep''s `-q' option.(1) USG-style `grep' also
      lacked `-q' but its `-s' option behaved like GNU `grep''s.
      Portable shell scripts should avoid both `-q' and `-s' and should
      redirect standard and error output to `/dev/null' instead.  (`-s'
      is specified by POSIX.)
 
 
+   ---------- Footnotes ----------
+
+   (1) Of course, 7th Edition Unix predated POSIX by several years!
+
 2.1.4 Output Line Prefix Control
 --------------------------------
 
@@ -313,7 +317,7 @@
 --------------------------
 
 Regardless of how these options are set, `grep' will never print any
-given line more than once.  If the `-o' or `--only-matching' option is
+given line more than once.  If the `-o' (`--only-matching') option is
 specified, these options have no effect and a warning is given upon
 their use.
 
@@ -339,18 +343,28 @@
      adjacent to each other.
 
 
-   Matching lines normally use `:' as a separator between prefix fields
-and actual line content.  Context (i.e., non-matching) lines use `-'
-instead.  When no context is specified, matching lines are simply
-output one right after another.  When nonzero context is specified,
-lines that are adjacent in the input form a group and are output one
-right after another, while a separator appears by default between
-disjoint groups on a line of its own and without any prefix.  The
-default separator is `--', however whether to include it and its
-appearance can be changed with the options above.  Each group may
-contain several matching lines when they are close enough to each other
-that two otherwise adjacent but divided groups connect and can just
-merge into a single contiguous one.
+   Here are some points about how `grep' chooses the separator to print
+between prefix fields and line content:
+
+   * Matching lines normally use `:' as a separator between prefix
+     fields and actual line content.
+
+   * Context (i.e., non-matching) lines use `-' instead.
+
+   * When no context is specified, matching lines are simply output one
+     right after another.
+
+   * When nonzero context is specified, lines that are adjacent in the
+     input form a group and are output one right after another, while a
+     separator appears by default between disjoint groups on a line of
+     its own and without any prefix.
+
+   * The default separator is `--', however whether to include it and
+     its appearance can be changed with the options above.
+
+   * Each group may contain several matching lines when they are close
+     enough to each other that two otherwise adjacent but divided
+     groups connect and can just merge into a single contiguous one.
 
 2.1.6 File and Directory Selection
 ----------------------------------
@@ -365,13 +379,17 @@
      binary data, assume that the file is of type TYPE.  By default,
      TYPE is `binary', and `grep' normally outputs either a one-line
      message saying that a binary file matches, or no message if there
-     is no match.  If TYPE is `without-match', `grep' assumes that a
-     binary file does not match; this is equivalent to the `-I' option.
+     is no match.
+
+     If TYPE is `without-match', `grep' assumes that a binary file does
+     not match; this is equivalent to the `-I' option.
+
      If TYPE is `text', `grep' processes a binary file as if it were
-     text; this is equivalent to the `-a' option.  _Warning:_
-     `--binary-files=text' might output binary garbage, which can have
-     nasty side effects if the output is a terminal and if the terminal
-     driver interprets some of it as commands.
+     text; this is equivalent to the `-a' option.
+
+     _Warning:_ `--binary-files=text' might output binary garbage,
+     which can have nasty side effects if the output is a terminal and
+     if the terminal driver interprets some of it as commands.
 
 `-D ACTION'
 `--devices=ACTION'
@@ -415,8 +433,8 @@
 `-r'
 `-R'
 `--recursive'
-     For each directory mentioned on the command line, read and process
-     all files in that directory, recursively.  This is the same as the
+     For each directory operand, read and process all files in that
+     directory, recursively.  This is the same as the
      `--directories=recurse' option.
 
 
@@ -428,10 +446,11 @@
      penalty.
 
 `--mmap'
-     This option is ignored for backwards compatibility.  It used to
-     read input with the `mmap' system call, instead of the default
-     `read' system call.  On modern systems, `mmap' would rarely if
-     ever yield better performance.
+     This option is deprecated and now elicits a warning, but is
+     otherwise a no-op.  It used to make `grep' read input with the
+     `mmap' system call, instead of the default `read' system call.  On
+     modern systems, `mmap' would rarely if ever yield better
+     performance.
 
 `-U'
 `--binary'
@@ -470,6 +489,28 @@
 variables are set, if the locale catalog is not installed, or if `grep'
 was not compiled with national language support (NLS).
 
+   Many of the environment variables in the following list let you
+control highlighting using Select Graphic Rendition (SGR) commands
+interpreted by the terminal or terminal emulator.  (See the section in
+the documentation of your text terminal for permitted values and their
+meanings as character attributes.)  These substring values are integers
+in decimal representation and can be concatenated with semicolons.
+`grep' takes care of assembling the result into a complete SGR sequence
+(`\33['...`m').  Common values to concatenate include `1' for bold, `4'
+for underline, `5' for blink, `7' for inverse, `39' for default
+foreground color, `30' to `37' for foreground colors, `90' to `97' for
+16-color mode foreground colors, `38;5;0' to `38;5;255' for 88-color
+and 256-color modes foreground colors, `49' for default background
+color, `40' to `47' for background colors, `100' to `107' for 16-color
+mode background colors, and `48;5;0' to `48;5;255' for 88-color and
+256-color modes background colors.
+
+   The two-letter names used in the `GREP_COLORS' environment variable
+(and some of the others) refer to terminal "capabilities," the ability
+of a terminal to highlight text, or change its color, and so on.  These
+capabilities are stored in an online database and accessed by the
+`terminfo' library.
+
 `GREP_OPTIONS'
      This variable specifies default options to be placed in front of
      any explicit options.  For example, if `GREP_OPTIONS' is
@@ -480,6 +521,13 @@
      backslash escapes the next character, so it can be used to specify
      an option containing whitespace or a backslash.
 
+     The `GREP_OPTIONS' value does not affect whether `grep' without
+     file operands searches standard input or the working directory;
+     that is affected only by command-line options.  For example, the
+     command `grep PAT' searches standard input and the command `grep
+     -r PAT' searches the working directory, regardless of whether
+     `GREP_OPTIONS' contains `-r'.
+
 `GREP_COLOR'
      This variable specifies the color used to highlight matched
      (non-empty) text.  It is deprecated in favor of `GREP_COLORS', but
@@ -494,7 +542,7 @@
 `GREP_COLORS'
      This variable specifies the colors and other attributes used to
      highlight various parts of the output.  Its value is a
-     colon-separated list of capabilities that defaults to
+     colon-separated list of `terminfo' capabilities that defaults to
      `ms=01;31:mc=01;31:sl=:cx=:fn=35:ln=32:bn=32:se=36' with the `rv'
      and `ne' boolean capabilities omitted (i.e., false).  Supported
      capabilities are as follows.
@@ -532,17 +580,19 @@
 
     `ms=01;31'
           SGR substring for matching non-empty text in a selected line.
-          (This is only used when the `-v' command-line option is
+          (This is used only when the `-v' command-line option is
           omitted.)  The effect of the `sl=' (or `cx=' if `rv')
-          capability remains active when this kicks in.  The default is
-          a bold red text foreground over the current line background.
+          capability remains active when this takes effect.  The
+          default is a bold red text foreground over the current line
+          background.
 
     `mc=01;31'
           SGR substring for matching non-empty text in a context line.
-          (This is only used when the `-v' command-line option is
+          (This is used only when the `-v' command-line option is
           specified.)  The effect of the `cx=' (or `sl=' if `rv')
-          capability remains active when this kicks in.  The default is
-          a bold red text foreground over the current line background.
+          capability remains active when this takes effect.  The
+          default is a bold red text foreground over the current line
+          background.
 
     `fn=35'
           SGR substring for file names prefixing any content line.  The
@@ -571,7 +621,7 @@
           Erase in Line (EL) to Right (`\33[K') each time a colorized
           item ends.  This is needed on terminals on which EL is not
           supported.  It is otherwise useful on terminals for which the
-          `back_color_erase' (`bce') boolean terminfo capability does
+          `back_color_erase' (`bce') boolean `terminfo' capability does
           not apply, when the chosen highlight colors do not affect the
           background, or when EL is too slow or causes too much flicker.
           The default is false (i.e., the capability is omitted).
@@ -579,21 +629,6 @@
      Note that boolean capabilities have no `='... part.  They are
      omitted (i.e., false) by default and become true when specified.
 
-     See the Select Graphic Rendition (SGR) section in the
-     documentation of your text terminal for permitted values and their
-     meaning as character attributes.  These substring values are
-     integers in decimal representation and can be concatenated with
-     semicolons.  `grep' takes care of assembling the result into a
-     complete SGR sequence (`\33['...`m').  Common values to
-     concatenate include `1' for bold, `4' for underline, `5' for blink,
-     `7' for inverse, `39' for default foreground color, `30' to `37'
-     for foreground colors, `90' to `97' for 16-color mode foreground
-     colors, `38;5;0' to `38;5;255' for 88-color and 256-color modes
-     foreground colors, `49' for default background color, `40' to `47'
-     for background colors, `100' to `107' for 16-color mode background
-     colors, and `48;5;0' to `48;5;255' for 88-color and 256-color
-     modes background colors.
-
 `LC_ALL'
 `LC_COLLATE'
 `LANG'
@@ -616,12 +651,12 @@
      default `C' locale uses American English messages.
 
 `POSIXLY_CORRECT'
-     If set, `grep' behaves as POSIX.2 requires; otherwise, `grep'
-     behaves more like other GNU programs.  POSIX.2 requires that
-     options that follow file names must be treated as file names; by
-     default, such options are permuted to the front of the operand list
-     and are treated as options.  Also, `POSIXLY_CORRECT' disables
-     special handling of an invalid bracket expression.  *Note
+     If set, `grep' behaves as POSIX requires; otherwise, `grep'
+     behaves more like other GNU programs.  POSIX requires that options
+     that follow file names must be treated as file names; by default,
+     such options are permuted to the front of the operand list and are
+     treated as options.  Also, `POSIXLY_CORRECT' disables special
+     handling of an invalid bracket expression.  *Note
      invalid-bracket-expr::.
 
 `_N_GNU_nonoption_argv_flags_'
@@ -650,9 +685,11 @@
 2.4 `grep' Programs
 ===================
 
-`grep' searches the named input files (or standard input if no files
-are named, or the file name `-' is given) for lines containing a match
-to the given pattern.  By default, `grep' prints the matching lines.
+`grep' searches the named input files for lines containing a match to
+the given pattern.  By default, `grep' prints the matching lines.  A
+file named `-' stands for standard input.  If no input is specified,
+`grep' searches the working directory `.' if given a command-line
+option specifying recursion; otherwise, `grep' searches standard input.
 There are four major variants of `grep', controlled by the following
 options.
 
@@ -693,13 +730,13 @@
 expressions, by using various operators to combine smaller expressions.
 `grep' understands three different versions of regular expression
 syntax: "basic," (BRE) "extended" (ERE) and "perl".  In GNU `grep',
-there is no difference in available functionality between basic and
+there is no difference in available functionality between the basic and
 extended syntaxes.  In other implementations, basic regular expressions
 are less powerful.  The following description applies to extended
 regular expressions; differences for basic regular expressions are
 summarized afterwards.  Perl regular expressions give additional
-functionality, and are documented in pcresyntax(3) and pcrepattern(3),
-but may not be available on every system.
+functionality, and are documented in the pcresyntax(3) and
+pcrepattern(3) manual pages, but may not be available on every system.
 
 3.1 Fundamental Structure
 =========================
@@ -738,13 +775,14 @@
      M times.
 
 
-   Two regular expressions may be concatenated; the resulting regular
-expression matches any string formed by concatenating two substrings
-that respectively match the concatenated expressions.
+   The empty regular expression matches the empty string.  Two regular
+expressions may be concatenated; the resulting regular expression
+matches any string formed by concatenating two substrings that
+respectively match the concatenated expressions.
 
    Two regular expressions may be joined by the infix operator `|'; the
 resulting regular expression matches any string matching either
-alternalte expression.
+alternate expression.
 
    Repetition takes precedence over concatenation, which in turn takes
 precedence over alternation.  A whole expression may be enclosed in
@@ -772,14 +810,18 @@
 
    Finally, certain named classes of characters are predefined within
 bracket expressions, as follows.  Their interpretation depends on the
-`LC_CTYPE' locale; the interpretation below is that of the `C' locale,
-which is the default if no `LC_CTYPE' locale is specified.
+`LC_CTYPE' locale; for example, `[[:alnum:]]' means the character class
+of numbers and letters in the current locale.
 
 `[:alnum:]'
-     Alphanumeric characters: `[:alpha:]' and `[:digit:]'.
+     Alphanumeric characters: `[:alpha:]' and `[:digit:]'; in the `C'
+     locale and ASCII character encoding, this is the same as
+     `[0-9A-Za-z]'.
 
 `[:alpha:]'
-     Alphabetic characters: `[:lower:]' and `[:upper:]'.
+     Alphabetic characters: `[:lower:]' and `[:upper:]'; in the `C'
+     locale and ASCII character encoding, this is the same as
+     `[A-Za-z]'.
 
 `[:blank:]'
      Blank characters: space and tab.
@@ -796,34 +838,34 @@
      Graphical characters: `[:alnum:]' and `[:punct:]'.
 
 `[:lower:]'
-     Lower-case letters: `a b c d e f g h i j k l m n o p q r s t u v w
-     x y z'.
+     Lower-case letters; in the `C' locale and ASCII character
+     encoding, this is `a b c d e f g h i j k l m n o p q r s t u v w x
+     y z'.
 
 `[:print:]'
      Printable characters: `[:alnum:]', `[:punct:]', and space.
 
 `[:punct:]'
-     Punctuation characters: `! " # $ % & ' ( ) * + , - . / : ; < = > ?
-     @ [ \ ] ^ _ ` { | } ~'.
+     Punctuation characters; in the `C' locale and ASCII character
+     encoding, this is `! " # $ % & ' ( ) * + , - . / : ; < = > ? @ [ \
+     ] ^ _ ` { | } ~'.
 
 `[:space:]'
-     Space characters: tab, newline, vertical tab, form feed, carriage
-     return, and space.  *Note Usage::, for more discussion of matching
-     newlines.
+     Space characters: in the `C' locale, this is tab, newline,
+     vertical tab, form feed, carriage return, and space.  *Note
+     Usage::, for more discussion of matching newlines.
 
 `[:upper:]'
-     Upper-case letters: `A B C D E F G H I J K L M N O P Q R S T U V W
-     X Y Z'.
+     Upper-case letters: in the `C' locale and ASCII character
+     encoding, this is `A B C D E F G H I J K L M N O P Q R S T U V W X
+     Y Z'.
 
 `[:xdigit:]'
      Hexadecimal digits: `0 1 2 3 4 5 6 7 8 9 A B C D E F a b c d e f'.
 
-   For example, `[[:alnum:]]' means `[0-9A-Za-z]', except the latter
-depends upon the `C' locale and the ASCII character encoding, whereas
-the former is independent of locale and character set.  (Note that the
-brackets in these class names are part of the symbolic names, and must
-be included in addition to the brackets delimiting the bracket
-expression.)
+   Note that the brackets in these class names are part of the symbolic
+names, and must be included in addition to the brackets delimiting the
+bracket expression.
 
    If you mistakenly omit the outer brackets, and search for say,
 `[:upper:]', GNU `grep' prints a diagnostic and exits with status 2, on
@@ -873,28 +915,28 @@
 The `\' character, when followed by certain ordinary characters, takes
 a special meaning:
 
-``\b''
+`\b'
      Match the empty string at the edge of a word.
 
-``\B''
+`\B'
      Match the empty string provided it's not at the edge of a word.
 
-``\<''
+`\<'
      Match the empty string at the beginning of word.
 
-``\>''
+`\>'
      Match the empty string at the end of word.
 
-``\w''
-     Match word constituent, it is a synonym for `[[:alnum:]]'.
+`\w'
+     Match word constituent, it is a synonym for `[_[:alnum:]]'.
 
-``\W''
-     Match non-word constituent, it is a synonym for `[^[:alnum:]]'.
+`\W'
+     Match non-word constituent, it is a synonym for `[^_[:alnum:]]'.
 
-``\s''
+`\s'
      Match whitespace, it is a synonym for `[[:space:]]'.
 
-``\S''
+`\S'
      Match non-whitespace, it is a synonym for `[^[:space:]]'.
 
 
@@ -906,6 +948,8 @@
 
 The caret `^' and the dollar sign `$' are meta-characters that
 respectively match the empty string at the beginning and end of a line.
+They are termed "anchors", since they force the match to be "anchored"
+to beginning or end of a line, respectively.
 
 3.5 Back-references and Subexpressions
 ======================================
@@ -916,7 +960,7 @@
 with alternation, if the group does not participate in the match then
 the back-reference makes the whole match fail.  For example, `a(.)|b\1'
 will not match `ba'.  When multiple regular expressions are given with
-`-e' or from a file (`-f file'), back-references are local to each
+`-e' or from a file (`-f FILE'), back-references are local to each
 expression.
 
 3.6 Basic vs Extended Regular Expressions
@@ -935,7 +979,7 @@
 `{' is not special if it would be the start of an invalid interval
 specification.  For example, the command `grep -E '{1'' searches for
 the two-character string `{1' instead of reporting a syntax error in
-the regular expression.  POSIX.2 allows this behavior as an extension,
+the regular expression.  POSIX allows this behavior as an extension,
 but portable scripts should avoid it.
 
 4 Usage
@@ -974,12 +1018,10 @@
 
      This differs from the command:
 
-          grep -rH 'hello' *.c
+          grep -H 'hello' *.c
 
      which merely looks for `hello' in all files in the current
-     directory whose names end in `.c'.  Here the `-r' is probably
-     unnecessary, as recursion occurs only in the unlikely event that
-     one of `.c' files is a directory.  The `find ...' command line
+     directory whose names end in `.c'.  The `find ...' command line
      above is more similar to the command:
 
           grep -rH --include='*.c' 'hello' /home/gigi
@@ -1052,26 +1094,38 @@
      contain no matching lines, use the `-L' or `--files-without-match'
      option.
 
- 10. I can do OR with `|', but what about AND?
+ 10. I can do "OR" with `|', but what about "AND"?
 
           grep 'paul' /etc/motd | grep 'franc,ois'
 
      finds all lines that contain both `paul' and `franc,ois'.
 
- 11. How can I search in both standard input and in files?
+ 11. Why does the empty pattern match every input line?
+
+     The `grep' command searches for lines that contain strings that
+     match a pattern.  Every line contains the empty string, so an
+     empty pattern causes `grep' to find a match on each line.  It is
+     not the only such pattern: `^', `$', `.*', and many other patterns
+     cause `grep' to match every line.
+
+     To match empty lines, use the pattern `^$'.  To match blank lines,
+     use the pattern `^[[:blank:]]*$'.  To match no lines at all, use
+     the command `grep -f /dev/null'.
+
+ 12. How can I search in both standard input and in files?
 
      Use the special file name `-':
 
           cat /etc/passwd | grep 'alain' - /etc/motd
 
- 12. How to express palindromes in a regular expression?
+ 13. How to express palindromes in a regular expression?
 
      It can be done by using back-references; for example, a palindrome
      of 4 characters can be written with a BRE:
 
           grep -w -e '\(.\)\(.\).\2\1' file
 
-     It matches the word "radar" or "civic".
+     It matches the word "radar" or "civic."
 
      Guglielmo Bondioni proposed a single RE that finds all palindromes
      up to 19 characters long using 9 subexpressions and
@@ -1082,7 +1136,7 @@
      Note this is done by using GNU ERE extensions; it might not be
      portable to other implementations of `grep'.
 
- 13. Why is this back-reference failing?
+ 14. Why is this back-reference failing?
 
           echo 'ba' | grep -E '(a)\1|b\1'
 
@@ -1093,7 +1147,7 @@
      match if the first alternate has matched--making the second one
      superfluous.)
 
- 14. How can I match across lines?
+ 15. How can I match across lines?
 
      Standard grep cannot do this, as it is fundamentally line-based.
      Therefore, merely using the `[:space:]' character class does not
@@ -1115,7 +1169,7 @@
      before giving it to `grep', or turn to `awk', `sed', `perl', or
      many other utilities that are designed to operate across lines.
 
- 15. What do `grep', `fgrep', and `egrep' stand for?
+ 16. What do `grep', `fgrep', and `egrep' stand for?
 
      The name `grep' comes from the way line editing was done on Unix.
      For example, `ed' uses the following syntax to print a list of
@@ -1149,14 +1203,16 @@
 6 Copying
 *********
 
-GNU grep is licensed under the GNU GPL, which makes it "free software".
+GNU `grep' is licensed under the GNU GPL, which makes it "free
+software".
 
    The "free" in "free software" refers to liberty, not price. As some
 GNU project advocates like to point out, think of "free speech" rather
 than "free beer".  In short, you have the right (freedom) to run and
-change grep and distribute it to other people, and--if you want--charge
-money for doing either.  The important restriction is that you have to
-grant your recipients the same rights and impose the same restrictions.
+change `grep' and distribute it to other people, and--if you
+want--charge money for doing either.  The important restriction is that
+you have to grant your recipients the same rights and impose the same
+restrictions.
 
    This general method of licensing software is sometimes called "open
 source".  The GNU project prefers the term "free software" for reasons
@@ -1173,7 +1229,7 @@
 
                      Version 1.3, 3 November 2008
 
-     Copyright (C) 2000-2002, 2007-2008, 2010-2011 Free Software
+     Copyright (C) 2000-2002, 2007-2008, 2010-2012 Free Software
      Foundation, Inc.
      `http://fsf.org/'
 
@@ -1655,240 +1711,240 @@
 Index
 *****
 
-*:                                             See 3.1.      (line  722)
-+:                                             See 3.1.      (line  725)
---after-context:                               See 2.1.5.    (line  322)
---basic-regexp:                                See 2.4.      (line  661)
---before-context:                              See 2.1.5.    (line  326)
---binary:                                      See 2.1.7.    (line  438)
---binary-files:                                See 2.1.6.    (line  364)
---byte-offset:                                 See 2.1.4.    (line  251)
+*:                                             See 3.1.      (line  759)
++:                                             See 3.1.      (line  762)
+--after-context:                               See 2.1.5.    (line  326)
+--basic-regexp:                                See 2.4.      (line  698)
+--before-context:                              See 2.1.5.    (line  330)
+--binary:                                      See 2.1.7.    (line  457)
+--binary-files:                                See 2.1.6.    (line  378)
+--byte-offset:                                 See 2.1.4.    (line  255)
 --color:                                       See 2.1.3.    (line  158)
 --colour:                                      See 2.1.3.    (line  158)
---context:                                     See 2.1.5.    (line  331)
+--context:                                     See 2.1.5.    (line  335)
 --count:                                       See 2.1.3.    (line  152)
---devices:                                     See 2.1.6.    (line  378)
---directories:                                 See 2.1.6.    (line  385)
---exclude:                                     See 2.1.6.    (line  395)
---exclude-dir:                                 See 2.1.6.    (line  404)
---exclude-from:                                See 2.1.6.    (line  400)
---extended-regexp:                             See 2.4.      (line  666)
+--devices:                                     See 2.1.6.    (line  396)
+--directories:                                 See 2.1.6.    (line  403)
+--exclude:                                     See 2.1.6.    (line  413)
+--exclude-dir:                                 See 2.1.6.    (line  422)
+--exclude-from:                                See 2.1.6.    (line  418)
+--extended-regexp:                             See 2.4.      (line  703)
 --file:                                        See 2.1.2.    (line  116)
 --files-with-matches:                          See 2.1.3.    (line  179)
 --files-without-match:                         See 2.1.3.    (line  173)
---fixed-strings:                               See 2.4.      (line  671)
---group-separator:                             See 2.1.5.    (line  334)
+--fixed-strings:                               See 2.4.      (line  708)
+--group-separator:                             See 2.1.5.    (line  338)
 --help:                                        See 2.1.1.    (line   96)
 --ignore-case:                                 See 2.1.2.    (line  123)
---include:                                     See 2.1.6.    (line  412)
---initial-tab:                                 See 2.1.4.    (line  282)
+--include:                                     See 2.1.6.    (line  430)
+--initial-tab:                                 See 2.1.4.    (line  286)
 --invert-match:                                See 2.1.2.    (line  129)
---label:                                       See 2.1.4.    (line  269)
---line-buffered:                               See 2.1.7.    (line  427)
---line-number:                                 See 2.1.4.    (line  277)
+--label:                                       See 2.1.4.    (line  273)
+--line-buffered:                               See 2.1.7.    (line  445)
+--line-number:                                 See 2.1.4.    (line  281)
 --line-regexp:                                 See 2.1.2.    (line  143)
 --max-count:                                   See 2.1.3.    (line  186)
---mmap:                                        See 2.1.7.    (line  431)
---no-filename:                                 See 2.1.4.    (line  264)
+--mmap:                                        See 2.1.7.    (line  449)
+--no-filename:                                 See 2.1.4.    (line  268)
 --no-messages:                                 See 2.1.3.    (line  232)
---null:                                        See 2.1.4.    (line  302)
---null-data:                                   See 2.1.7.    (line  452)
+--null:                                        See 2.1.4.    (line  306)
+--null-data:                                   See 2.1.7.    (line  471)
 --only-matching:                               See 2.1.3.    (line  219)
---perl-regexp:                                 See 2.4.      (line  677)
+--perl-regexp:                                 See 2.4.      (line  714)
 --quiet:                                       See 2.1.3.    (line  225)
---recursive:                                   See 2.1.6.    (line  418)
+--recursive:                                   See 2.1.6.    (line  436)
 --regexp=PATTERN:                              See 2.1.2.    (line  110)
 --silent:                                      See 2.1.3.    (line  225)
---text:                                        See 2.1.6.    (line  360)
---unix-byte-offsets:                           See 2.1.4.    (line  292)
+--text:                                        See 2.1.6.    (line  374)
+--unix-byte-offsets:                           See 2.1.4.    (line  296)
 --version:                                     See 2.1.1.    (line  101)
---with-filename:                               See 2.1.4.    (line  259)
+--with-filename:                               See 2.1.4.    (line  263)
 --word-regexp:                                 See 2.1.2.    (line  134)
--a:                                            See 2.1.6.    (line  360)
--A:                                            See 2.1.5.    (line  322)
--B:                                            See 2.1.5.    (line  326)
--b:                                            See 2.1.4.    (line  251)
--C:                                            See 2.1.5.    (line  331)
+-a:                                            See 2.1.6.    (line  374)
+-A:                                            See 2.1.5.    (line  326)
+-B:                                            See 2.1.5.    (line  330)
+-b:                                            See 2.1.4.    (line  255)
+-C:                                            See 2.1.5.    (line  335)
 -c:                                            See 2.1.3.    (line  152)
--d:                                            See 2.1.6.    (line  385)
--D:                                            See 2.1.6.    (line  378)
--E:                                            See 2.4.      (line  666)
+-d:                                            See 2.1.6.    (line  403)
+-D:                                            See 2.1.6.    (line  396)
+-E:                                            See 2.4.      (line  703)
 -e:                                            See 2.1.2.    (line  110)
--F:                                            See 2.4.      (line  671)
+-F:                                            See 2.4.      (line  708)
 -f:                                            See 2.1.2.    (line  116)
--G:                                            See 2.4.      (line  661)
--h:                                            See 2.1.4.    (line  264)
--H:                                            See 2.1.4.    (line  259)
+-G:                                            See 2.4.      (line  698)
+-h:                                            See 2.1.4.    (line  268)
+-H:                                            See 2.1.4.    (line  263)
 -i:                                            See 2.1.2.    (line  123)
 -l:                                            See 2.1.3.    (line  179)
 -L:                                            See 2.1.3.    (line  173)
 -m:                                            See 2.1.3.    (line  186)
--n:                                            See 2.1.4.    (line  277)
--NUM:                                          See 2.1.5.    (line  331)
+-n:                                            See 2.1.4.    (line  281)
+-NUM:                                          See 2.1.5.    (line  335)
 -o:                                            See 2.1.3.    (line  219)
--P:                                            See 2.4.      (line  677)
+-P:                                            See 2.4.      (line  714)
 -q:                                            See 2.1.3.    (line  225)
--r:                                            See 2.1.6.    (line  418)
+-r:                                            See 2.1.6.    (line  436)
 -s:                                            See 2.1.3.    (line  232)
--T:                                            See 2.1.4.    (line  282)
--U:                                            See 2.1.7.    (line  438)
--u:                                            See 2.1.4.    (line  292)
+-T:                                            See 2.1.4.    (line  286)
+-U:                                            See 2.1.7.    (line  457)
+-u:                                            See 2.1.4.    (line  296)
 -v:                                            See 2.1.2.    (line  129)
 -V:                                            See 2.1.1.    (line  101)
 -w:                                            See 2.1.2.    (line  134)
 -x:                                            See 2.1.2.    (line  143)
 -y:                                            See 2.1.2.    (line  123)
--z:                                            See 2.1.7.    (line  452)
--Z:                                            See 2.1.4.    (line  302)
-.:                                             See 3.1.      (line  716)
-?:                                             See 3.1.      (line  719)
-_N_GNU_nonoption_argv_flags_ environment variable:See 2.2.   (line  628)
-after context:                                 See 2.1.5.    (line  322)
-alnum character class:                         See 3.2.      (line  779)
-alpha character class:                         See 3.2.      (line  782)
-alphabetic characters:                         See 3.2.      (line  782)
-alphanumeric characters:                       See 3.2.      (line  779)
-anchoring:                                     See 3.4.      (line  907)
-asterisk:                                      See 3.1.      (line  722)
-back-reference:                                See 3.5.      (line  913)
-backslash:                                     See 3.3.      (line  873)
-basic regular expressions:                     See 3.6.      (line  925)
-before context:                                See 2.1.5.    (line  326)
-binary files:                                  See 2.1.6.    (line  360)
-binary files, MS-DOS/MS-Windows:               See 2.1.7.    (line  438)
-blank character class:                         See 3.2.      (line  785)
-blank characters:                              See 3.2.      (line  785)
-bn GREP_COLORS capability:                     See 2.2.      (line  558)
-braces, first argument omitted:                See 3.1.      (line  734)
-braces, one argument:                          See 3.1.      (line  728)
-braces, second argument omitted:               See 3.1.      (line  731)
-braces, two arguments:                         See 3.1.      (line  737)
-bracket expression:                            See 3.2.      (line  756)
-Bugs, known:                                   See 5.1.      (line 1142)
-bugs, reporting:                               See 5.        (line 1134)
-byte offset:                                   See 2.1.4.    (line  251)
-byte offsets, on MS-DOS/MS-Windows:            See 2.1.4.    (line  292)
+-z:                                            See 2.1.7.    (line  471)
+-Z:                                            See 2.1.4.    (line  306)
+.:                                             See 3.1.      (line  753)
+?:                                             See 3.1.      (line  756)
+_N_GNU_nonoption_argv_flags_ environment variable:See 2.2.   (line  663)
+after context:                                 See 2.1.5.    (line  326)
+alnum character class:                         See 3.2.      (line  817)
+alpha character class:                         See 3.2.      (line  822)
+alphabetic characters:                         See 3.2.      (line  822)
+alphanumeric characters:                       See 3.2.      (line  817)
+anchoring:                                     See 3.4.      (line  949)
+asterisk:                                      See 3.1.      (line  759)
+back-reference:                                See 3.5.      (line  957)
+backslash:                                     See 3.3.      (line  915)
+basic regular expressions:                     See 3.6.      (line  969)
+before context:                                See 2.1.5.    (line  330)
+binary files:                                  See 2.1.6.    (line  374)
+binary files, MS-DOS/MS-Windows:               See 2.1.7.    (line  457)
+blank character class:                         See 3.2.      (line  827)
+blank characters:                              See 3.2.      (line  827)
+bn GREP_COLORS capability:                     See 2.2.      (line  608)
+braces, first argument omitted:                See 3.1.      (line  771)
+braces, one argument:                          See 3.1.      (line  765)
+braces, second argument omitted:               See 3.1.      (line  768)
+braces, two arguments:                         See 3.1.      (line  774)
+bracket expression:                            See 3.2.      (line  794)
+Bugs, known:                                   See 5.1.      (line 1196)
+bugs, reporting:                               See 5.        (line 1188)
+byte offset:                                   See 2.1.4.    (line  255)
+byte offsets, on MS-DOS/MS-Windows:            See 2.1.4.    (line  296)
 case insensitive search:                       See 2.1.2.    (line  123)
-changing name of standard input:               See 2.1.4.    (line  269)
-character class:                               See 3.2.      (line  756)
-character classes:                             See 3.2.      (line  778)
-character type:                                See 2.2.      (line  600)
-classes of characters:                         See 3.2.      (line  778)
-cntrl character class:                         See 3.2.      (line  788)
-context:                                       See 2.1.5.    (line  331)
-context lines, after match:                    See 2.1.5.    (line  322)
-context lines, before match:                   See 2.1.5.    (line  326)
-control characters:                            See 3.2.      (line  788)
-copying:                                       See 6.        (line 1152)
+changing name of standard input:               See 2.1.4.    (line  273)
+character class:                               See 3.2.      (line  794)
+character classes:                             See 3.2.      (line  816)
+character type:                                See 2.2.      (line  635)
+classes of characters:                         See 3.2.      (line  816)
+cntrl character class:                         See 3.2.      (line  830)
+context:                                       See 2.1.5.    (line  335)
+context lines, after match:                    See 2.1.5.    (line  326)
+context lines, before match:                   See 2.1.5.    (line  330)
+control characters:                            See 3.2.      (line  830)
+copying:                                       See 6.        (line 1206)
 counting lines:                                See 2.1.3.    (line  152)
-cx GREP_COLORS capability:                     See 2.2.      (line  511)
-default options environment variable:          See 2.2.      (line  474)
-device search:                                 See 2.1.6.    (line  378)
-digit character class:                         See 3.2.      (line  793)
-digit characters:                              See 3.2.      (line  793)
-directory search:                              See 2.1.6.    (line  385)
-dot:                                           See 3.1.      (line  716)
-environment variables:                         See 2.2.      (line  473)
-exclude directories:                           See 2.1.6.    (line  404)
-exclude files:                                 See 2.1.6.    (line  395)
-exit status:                                   See 2.3.      (line  641)
-FAQ about grep usage:                          See 4.        (line  955)
+cx GREP_COLORS capability:                     See 2.2.      (line  559)
+default options environment variable:          See 2.2.      (line  515)
+device search:                                 See 2.1.6.    (line  396)
+digit character class:                         See 3.2.      (line  835)
+digit characters:                              See 3.2.      (line  835)
+directory search:                              See 2.1.6.    (line  403)
+dot:                                           See 3.1.      (line  753)
+environment variables:                         See 2.2.      (line  514)
+exclude directories:                           See 2.1.6.    (line  422)
+exclude files:                                 See 2.1.6.    (line  413)
+exit status:                                   See 2.3.      (line  676)
+FAQ about grep usage:                          See 4.        (line  999)
 files which don't match:                       See 2.1.3.    (line  173)
-fn GREP_COLORS capability:                     See 2.2.      (line  548)
-graph character class:                         See 3.2.      (line  796)
-graphic characters:                            See 3.2.      (line  796)
-grep programs:                                 See 2.4.      (line  653)
-GREP_COLOR environment variable:               See 2.2.      (line  484)
-GREP_COLORS environment variable:              See 2.2.      (line  495)
-GREP_OPTIONS environment variable:             See 2.2.      (line  474)
-group separator:                               See 2.1.5.    (line  334)
-hexadecimal digits:                            See 3.2.      (line  819)
-highlight markers:                             See 2.2.      (line  484)
+fn GREP_COLORS capability:                     See 2.2.      (line  598)
+graph character class:                         See 3.2.      (line  838)
+graphic characters:                            See 3.2.      (line  838)
+grep programs:                                 See 2.4.      (line  688)
+GREP_COLOR environment variable:               See 2.2.      (line  532)
+GREP_COLORS environment variable:              See 2.2.      (line  543)
+GREP_OPTIONS environment variable:             See 2.2.      (line  515)
+group separator:                               See 2.1.5.    (line  338)
+hexadecimal digits:                            See 3.2.      (line  864)
+highlight markers:                             See 2.2.      (line  532)
 highlight, color, colour:                      See 2.1.3.    (line  158)
-include files:                                 See 2.1.6.    (line  412)
-interval specifications:                       See 3.6.      (line  929)
+include files:                                 See 2.1.6.    (line  430)
+interval specifications:                       See 3.6.      (line  973)
 invert matching:                               See 2.1.2.    (line  129)
-LANG environment variable:                     See 2.2.      (line  600)
-language of messages:                          See 2.2.      (line  614)
-LC_ALL environment variable:                   See 2.2.      (line  600)
-LC_COLLATE environment variable:               See 2.2.      (line  600)
-LC_CTYPE environment variable:                 See 2.2.      (line  607)
-LC_MESSAGES environment variable:              See 2.2.      (line  614)
-line buffering:                                See 2.1.7.    (line  427)
-line numbering:                                See 2.1.4.    (line  277)
-ln GREP_COLORS capability:                     See 2.2.      (line  553)
-lower character class:                         See 3.2.      (line  799)
-lower-case letters:                            See 3.2.      (line  799)
-match expression at most M times:              See 3.1.      (line  734)
-match expression at most once:                 See 3.1.      (line  719)
-match expression from N to M times:            See 3.1.      (line  737)
-match expression N or more times:              See 3.1.      (line  731)
-match expression N times:                      See 3.1.      (line  728)
-match expression one or more times:            See 3.1.      (line  725)
-match expression zero or more times:           See 3.1.      (line  722)
+LANG environment variable:                     See 2.2.      (line  635)
+language of messages:                          See 2.2.      (line  649)
+LC_ALL environment variable:                   See 2.2.      (line  635)
+LC_COLLATE environment variable:               See 2.2.      (line  635)
+LC_CTYPE environment variable:                 See 2.2.      (line  642)
+LC_MESSAGES environment variable:              See 2.2.      (line  649)
+line buffering:                                See 2.1.7.    (line  445)
+line numbering:                                See 2.1.4.    (line  281)
+ln GREP_COLORS capability:                     See 2.2.      (line  603)
+lower character class:                         See 3.2.      (line  841)
+lower-case letters:                            See 3.2.      (line  841)
+match expression at most M times:              See 3.1.      (line  771)
+match expression at most once:                 See 3.1.      (line  756)
+match expression from N to M times:            See 3.1.      (line  774)
+match expression N or more times:              See 3.1.      (line  768)
+match expression N times:                      See 3.1.      (line  765)
+match expression one or more times:            See 3.1.      (line  762)
+match expression zero or more times:           See 3.1.      (line  759)
 match the whole line:                          See 2.1.2.    (line  143)
-matching basic regular expressions:            See 2.4.      (line  661)
-matching extended regular expressions:         See 2.4.      (line  666)
-matching fixed strings:                        See 2.4.      (line  671)
-matching Perl regular expressions:             See 2.4.      (line  677)
+matching basic regular expressions:            See 2.4.      (line  698)
+matching extended regular expressions:         See 2.4.      (line  703)
+matching fixed strings:                        See 2.4.      (line  708)
+matching Perl regular expressions:             See 2.4.      (line  714)
 matching whole words:                          See 2.1.2.    (line  134)
 max-count:                                     See 2.1.3.    (line  186)
-mc GREP_COLORS capability:                     See 2.2.      (line  541)
-memory mapped input:                           See 2.1.7.    (line  431)
-message language:                              See 2.2.      (line  614)
-ms GREP_COLORS capability:                     See 2.2.      (line  534)
-MS-DOS/MS-Windows binary files:                See 2.1.7.    (line  438)
-MS-DOS/MS-Windows byte offsets:                See 2.1.4.    (line  292)
-mt GREP_COLORS capability:                     See 2.2.      (line  526)
+mc GREP_COLORS capability:                     See 2.2.      (line  590)
+memory mapped input:                           See 2.1.7.    (line  449)
+message language:                              See 2.2.      (line  649)
+ms GREP_COLORS capability:                     See 2.2.      (line  582)
+MS-DOS/MS-Windows binary files:                See 2.1.7.    (line  457)
+MS-DOS/MS-Windows byte offsets:                See 2.1.4.    (line  296)
+mt GREP_COLORS capability:                     See 2.2.      (line  574)
 names of matching files:                       See 2.1.3.    (line  179)
-national language support:                     See 2.2.      (line  600)
-ne GREP_COLORS capability:                     See 2.2.      (line  570)
-NLS:                                           See 2.2.      (line  600)
-no filename prefix:                            See 2.1.4.    (line  264)
-numeric characters:                            See 3.2.      (line  793)
+national language support:                     See 2.2.      (line  635)
+ne GREP_COLORS capability:                     See 2.2.      (line  620)
+NLS:                                           See 2.2.      (line  635)
+no filename prefix:                            See 2.1.4.    (line  268)
+numeric characters:                            See 3.2.      (line  835)
 only matching:                                 See 2.1.3.    (line  219)
-palindromes:                                   See 4.        (line 1067)
+palindromes:                                   See 4.        (line 1121)
 pattern from file:                             See 2.1.2.    (line  116)
 pattern list:                                  See 2.1.2.    (line  110)
-period:                                        See 3.1.      (line  716)
-plus sign:                                     See 3.1.      (line  725)
-POSIXLY_CORRECT environment variable:          See 2.2.      (line  619)
-print character class:                         See 3.2.      (line  803)
+period:                                        See 3.1.      (line  753)
+plus sign:                                     See 3.1.      (line  762)
+POSIXLY_CORRECT environment variable:          See 2.2.      (line  654)
+print character class:                         See 3.2.      (line  846)
 print non-matching lines:                      See 2.1.2.    (line  129)
-printable characters:                          See 3.2.      (line  803)
-punct character class:                         See 3.2.      (line  806)
-punctuation characters:                        See 3.2.      (line  806)
-question mark:                                 See 3.1.      (line  719)
+printable characters:                          See 3.2.      (line  846)
+punct character class:                         See 3.2.      (line  849)
+punctuation characters:                        See 3.2.      (line  849)
+question mark:                                 See 3.1.      (line  756)
 quiet, silent:                                 See 2.1.3.    (line  225)
-range expression:                              See 3.2.      (line  762)
-recursive search:                              See 2.1.6.    (line  418)
-regular expressions:                           See 3.        (line  691)
-return status:                                 See 2.3.      (line  641)
-rv GREP_COLORS capability:                     See 2.2.      (line  520)
-searching directory trees:                     See 2.1.6.    (line  395)
+range expression:                              See 3.2.      (line  800)
+recursive search:                              See 2.1.6.    (line  436)
+regular expressions:                           See 3.        (line  728)
+return status:                                 See 2.3.      (line  676)
+rv GREP_COLORS capability:                     See 2.2.      (line  568)
+searching directory trees:                     See 2.1.6.    (line  413)
 searching for a pattern:                       See 1.        (line   55)
-sl GREP_COLORS capability:                     See 2.2.      (line  503)
-space character class:                         See 3.2.      (line  810)
-space characters:                              See 3.2.      (line  810)
-subexpression:                                 See 3.5.      (line  913)
-suppress binary data:                          See 2.1.6.    (line  360)
+sl GREP_COLORS capability:                     See 2.2.      (line  551)
+space character class:                         See 3.2.      (line  854)
+space characters:                              See 3.2.      (line  854)
+subexpression:                                 See 3.5.      (line  957)
+suppress binary data:                          See 2.1.6.    (line  374)
 suppress error messages:                       See 2.1.3.    (line  232)
-tab-aligned content lines:                     See 2.1.4.    (line  282)
-translation of message language:               See 2.2.      (line  614)
-upper character class:                         See 3.2.      (line  815)
-upper-case letters:                            See 3.2.      (line  815)
+tab-aligned content lines:                     See 2.1.4.    (line  286)
+translation of message language:               See 2.2.      (line  649)
+upper character class:                         See 3.2.      (line  859)
+upper-case letters:                            See 3.2.      (line  859)
 usage summary, printing:                       See 2.1.1.    (line   96)
-usage, examples:                               See 4.        (line  944)
-using grep, Q&A:                               See 4.        (line  955)
-variants of gerp:                              See 2.4.      (line  653)
+usage, examples:                               See 4.        (line  988)
+using grep, Q&A:                               See 4.        (line  999)
+variants of grep:                              See 2.4.      (line  688)
 version, printing:                             See 2.1.1.    (line  101)
-whitespace characters:                         See 3.2.      (line  810)
-with filename prefix:                          See 2.1.4.    (line  259)
-xdigit character class:                        See 3.2.      (line  819)
-xdigit class:                                  See 3.2.      (line  819)
-zero-terminated file names:                    See 2.1.4.    (line  302)
-zero-terminated lines:                         See 2.1.7.    (line  452)
-{,M}:                                          See 3.1.      (line  734)
-{N,M}:                                         See 3.1.      (line  737)
-{N,}:                                          See 3.1.      (line  731)
-{N}:                                           See 3.1.      (line  728)
+whitespace characters:                         See 3.2.      (line  854)
+with filename prefix:                          See 2.1.4.    (line  263)
+xdigit character class:                        See 3.2.      (line  864)
+xdigit class:                                  See 3.2.      (line  864)
+zero-terminated file names:                    See 2.1.4.    (line  306)
+zero-terminated lines:                         See 2.1.7.    (line  471)
+{,M}:                                          See 3.1.      (line  771)
+{N,M}:                                         See 3.1.      (line  774)
+{N,}:                                          See 3.1.      (line  768)
+{N}:                                           See 3.1.      (line  765)


From MAILER-DAEMON Fri Mar 02 04:29:09 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3OnV-0000Jg-Ty
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:09 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35944)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnI-0000Et-DN
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On5-0004eJ-Od
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:55 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36139)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On5-0004eA-L6
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:43 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35637)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3On5-0007HO-1i
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:43 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On0-0004aG-MC
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:42 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37473)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On0-0004aA-G4
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:38 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3Omz-0003zH-Ue
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:38 +0000
Date: Fri, 02 Mar 2012 09:28:37 +0000
Message-Id: <E1S3Omz-0003zH-Ue@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to
	grep/manual/html_node/Character-Classes-and-Bracket-Expressions.html,
	v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:09 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Character-Classes-and-Bracket-Expressions.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Character-Classes-and-Bracket-Expressions.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Character-Classes-and-Bracket-Expressions.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Character-Classes-and-Bracket-Expressions.html	2 Mar 2012 09:28:26 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Character Classes and Bracket Expressions - GNU Grep 2.9</title>
+<title>Character Classes and Bracket Expressions - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Regular-Expressions.html#Regular-Expressions" title="Regular Expressions">
@@ -12,7 +12,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -72,22 +73,22 @@
    <p>Finally, certain named classes of characters are predefined within
 bracket expressions, as follows. 
 Their interpretation depends on the <code>LC_CTYPE</code> locale;
-the interpretation below is that of the &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale,
-which is the default if no <code>LC_CTYPE</code> locale is specified.
+for example, &lsquo;<samp><span class="samp">[[:alnum:]]</span></samp>&rsquo; means the character class of numbers and letters
+in the current locale.
 
    <p><a name="index-classes-of-characters-210"></a><a name="index-character-classes-211"></a>
      <dl>
 <dt>&lsquo;<samp><span class="samp">[:alnum:]</span></samp>&rsquo;<dd><a name="index-alnum-_0040r_007bcharacter-class_007d-212"></a><a name="index-alphanumeric-characters-213"></a>Alphanumeric characters:
-&lsquo;<samp><span class="samp">[:alpha:]</span></samp>&rsquo; and &lsquo;<samp><span class="samp">[:digit:]</span></samp>&rsquo;.
+&lsquo;<samp><span class="samp">[:alpha:]</span></samp>&rsquo; and &lsquo;<samp><span class="samp">[:digit:]</span></samp>&rsquo;; in the &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale and ASCII character encoding, this is the same as &lsquo;<samp><span class="samp">[0-9A-Za-z]</span></samp>&rsquo;.
 
      <br><dt>&lsquo;<samp><span class="samp">[:alpha:]</span></samp>&rsquo;<dd><a name="index-alpha-_0040r_007bcharacter-class_007d-214"></a><a name="index-alphabetic-characters-215"></a>Alphabetic characters:
-&lsquo;<samp><span class="samp">[:lower:]</span></samp>&rsquo; and &lsquo;<samp><span class="samp">[:upper:]</span></samp>&rsquo;.
+&lsquo;<samp><span class="samp">[:lower:]</span></samp>&rsquo; and &lsquo;<samp><span class="samp">[:upper:]</span></samp>&rsquo;; in the &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale and ASCII character encoding, this is the same as &lsquo;<samp><span class="samp">[A-Za-z]</span></samp>&rsquo;.
 
      <br><dt>&lsquo;<samp><span class="samp">[:blank:]</span></samp>&rsquo;<dd><a name="index-blank-_0040r_007bcharacter-class_007d-216"></a><a name="index-blank-characters-217"></a>Blank characters:
 space and tab.
 
      <br><dt>&lsquo;<samp><span class="samp">[:cntrl:]</span></samp>&rsquo;<dd><a name="index-cntrl-_0040r_007bcharacter-class_007d-218"></a><a name="index-control-characters-219"></a>Control characters. 
-In <span class="sc">ascii</span>, these characters have octal codes 000
+In ASCII, these characters have octal codes 000
 through 037, and 177 (<code>DEL</code>). 
 In other character sets, these are
 the equivalent characters, if any.
@@ -97,32 +98,32 @@
      <br><dt>&lsquo;<samp><span class="samp">[:graph:]</span></samp>&rsquo;<dd><a name="index-graph-_0040r_007bcharacter-class_007d-223"></a><a name="index-graphic-characters-224"></a>Graphical characters:
 &lsquo;<samp><span class="samp">[:alnum:]</span></samp>&rsquo; and &lsquo;<samp><span class="samp">[:punct:]</span></samp>&rsquo;.
 
-     <br><dt>&lsquo;<samp><span class="samp">[:lower:]</span></samp>&rsquo;<dd><a name="index-lower-_0040r_007bcharacter-class_007d-225"></a><a name="index-lower_002dcase-letters-226"></a>Lower-case letters:
+     <br><dt>&lsquo;<samp><span class="samp">[:lower:]</span></samp>&rsquo;<dd><a name="index-lower-_0040r_007bcharacter-class_007d-225"></a><a name="index-lower_002dcase-letters-226"></a>Lower-case letters; in the &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale and ASCII character
+encoding, this is
 <code>a b c d e f g h i j k l m n o p q r s t u v w x y z</code>.
 
      <br><dt>&lsquo;<samp><span class="samp">[:print:]</span></samp>&rsquo;<dd><a name="index-print-_0040r_007bcharacter-class_007d-227"></a><a name="index-printable-characters-228"></a>Printable characters:
 &lsquo;<samp><span class="samp">[:alnum:]</span></samp>&rsquo;, &lsquo;<samp><span class="samp">[:punct:]</span></samp>&rsquo;, and space.
 
-     <br><dt>&lsquo;<samp><span class="samp">[:punct:]</span></samp>&rsquo;<dd><a name="index-punct-_0040r_007bcharacter-class_007d-229"></a><a name="index-punctuation-characters-230"></a>Punctuation characters:
+     <br><dt>&lsquo;<samp><span class="samp">[:punct:]</span></samp>&rsquo;<dd><a name="index-punct-_0040r_007bcharacter-class_007d-229"></a><a name="index-punctuation-characters-230"></a>Punctuation characters; in the &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale and ASCII character
+encoding, this is
 <code>! " # $ % &amp; ' ( ) * + , - . / : ; &lt; = &gt; ? @ [ \ ] ^ _ ` { | } ~</code>.
 
-     <br><dt>&lsquo;<samp><span class="samp">[:space:]</span></samp>&rsquo;<dd><a name="index-space-_0040r_007bcharacter-class_007d-231"></a><a name="index-space-characters-232"></a><a name="index-whitespace-characters-233"></a>Space characters:
+     <br><dt>&lsquo;<samp><span class="samp">[:space:]</span></samp>&rsquo;<dd><a name="index-space-_0040r_007bcharacter-class_007d-231"></a><a name="index-space-characters-232"></a><a name="index-whitespace-characters-233"></a>Space characters: in the &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale, this is
 tab, newline, vertical tab, form feed, carriage return, and space. 
 See <a href="Usage.html#Usage">Usage</a>, for more discussion of matching newlines.
 
-     <br><dt>&lsquo;<samp><span class="samp">[:upper:]</span></samp>&rsquo;<dd><a name="index-upper-_0040r_007bcharacter-class_007d-234"></a><a name="index-upper_002dcase-letters-235"></a>Upper-case letters:
+     <br><dt>&lsquo;<samp><span class="samp">[:upper:]</span></samp>&rsquo;<dd><a name="index-upper-_0040r_007bcharacter-class_007d-234"></a><a name="index-upper_002dcase-letters-235"></a>Upper-case letters: in the &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale and ASCII character
+encoding, this is
 <code>A B C D E F G H I J K L M N O P Q R S T U V W X Y Z</code>.
 
      <br><dt>&lsquo;<samp><span class="samp">[:xdigit:]</span></samp>&rsquo;<dd><a name="index-xdigit-_0040r_007bcharacter-class_007d-236"></a><a name="index-xdigit-class-237"></a><a name="index-hexadecimal-digits-238"></a>Hexadecimal digits:
 <code>0 1 2 3 4 5 6 7 8 9 A B C D E F a b c d e f</code>.
 
    </dl>
-   For example, &lsquo;<samp><span class="samp">[[:alnum:]]</span></samp>&rsquo; means &lsquo;<samp><span class="samp">[0-9A-Za-z]</span></samp>&rsquo;, except the latter
-depends upon the &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale and the <span class="sc">ascii</span> character
-encoding, whereas the former is independent of locale and character set. 
-(Note that the brackets in these class names are
+   Note that the brackets in these class names are
 part of the symbolic names, and must be included in addition to
-the brackets delimiting the bracket expression.)
+the brackets delimiting the bracket expression.
 
    <p><a name="invalid_002dbracket_002dexpr"></a>If you mistakenly omit the outer brackets, and search for say, &lsquo;<samp><span class="samp">[:upper:]</span></samp>&rsquo;,
 GNU <samp><span class="command">grep</span></samp> prints a diagnostic and exits with status 2, on


From MAILER-DAEMON Fri Mar 02 04:29:18 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3One-0000XT-Ct
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:18 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36164)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnS-0000I0-MM
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:16 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnM-0004yM-SY
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:06 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36160)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnM-0004y8-OS
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:00 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35842)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnM-0007IO-2V
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:00 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On6-0004fL-Km
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:59 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37515)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On6-0004ew-H8
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:44 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On6-00040y-1a
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:44 +0000
Date: Fri, 02 Mar 2012 09:28:44 +0000
Message-Id: <E1S3On6-00040y-1a@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Introduction.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:16 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Introduction.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Introduction.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Introduction.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Introduction.html	2 Mar 2012 09:28:29 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Introduction - GNU Grep 2.9</title>
+<title>Introduction - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="prev" href="index.html#Top" title="Top">
@@ -11,7 +11,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -46,7 +47,7 @@
 <h2 class="chapter">1 Introduction</h2>
 
 <p><a name="index-searching-for-a-pattern-1"></a>
-<samp><span class="command">grep</span></samp> searches the input files
+<samp><span class="command">grep</span></samp> searches input files
 for lines containing a match to a given pattern list. 
 When it finds a match in a line,
 it copies the line to standard output (by default),


From MAILER-DAEMON Fri Mar 02 04:29:18 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3One-0000Xz-HL
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:18 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36210)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnW-0000JS-2a
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:16 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnM-0004xy-15
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:09 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36159)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnL-0004xN-Tb
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:59 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35832)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnL-0007IJ-BV
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:59 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnA-0004jC-2C
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:58 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37531)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On9-0004ia-V7
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:48 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On9-00042N-Cu
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:47 +0000
Date: Fri, 02 Mar 2012 09:28:47 +0000
Message-Id: <E1S3On9-00042N-Cu@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Output-Line-Prefix-Control.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:16 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Output-Line-Prefix-Control.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Output-Line-Prefix-Control.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Output-Line-Prefix-Control.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Output-Line-Prefix-Control.html	2 Mar 2012 09:28:30 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Output Line Prefix Control - GNU Grep 2.9</title>
+<title>Output Line Prefix Control - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Command_002dline-Options.html#Command_002dline-Options" title="Command-line Options">
@@ -12,7 +12,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -51,51 +52,51 @@
 regardless of the order in which these options were specified.
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">-b</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--byte-offset</span></samp>&rsquo;<dd><a name="index-g_t_002db-52"></a><a name="index-g_t_002d_002dbyte_002doffset-53"></a><a name="index-byte-offset-54"></a>Print the 0-based byte offset within the input file
+<dt><samp><span class="option">-b</span></samp><dt><samp><span class="option">--byte-offset</span></samp><dd><a name="index-g_t_002db-52"></a><a name="index-g_t_002d_002dbyte_002doffset-53"></a><a name="index-byte-offset-54"></a>Print the 0-based byte offset within the input file
 before each line of output. 
-If &lsquo;<samp><span class="samp">-o</span></samp>&rsquo; (&lsquo;<samp><span class="samp">--only-matching</span></samp>&rsquo;) is specified,
+If <samp><span class="option">-o</span></samp> (<samp><span class="option">--only-matching</span></samp>) is specified,
 print the offset of the matching part itself. 
-When <samp><span class="command">grep</span></samp> runs on <span class="sc">ms-dos</span> or <span class="sc">ms</span>-Windows,
+When <samp><span class="command">grep</span></samp> runs on MS-DOS or MS-Windows,
 the printed byte offsets depend on whether
-the &lsquo;<samp><span class="samp">-u</span></samp>&rsquo; (&lsquo;<samp><span class="samp">--unix-byte-offsets</span></samp>&rsquo;) option is used;
+the <samp><span class="option">-u</span></samp> (<samp><span class="option">--unix-byte-offsets</span></samp>) option is used;
 see below.
 
-     <br><dt>&lsquo;<samp><span class="samp">-H</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--with-filename</span></samp>&rsquo;<dd><a name="index-g_t_002dH-55"></a><a name="index-g_t_002d_002dwith_002dfilename-56"></a><a name="index-with-filename-prefix-57"></a>Print the file name for each match. 
+     <br><dt><samp><span class="option">-H</span></samp><dt><samp><span class="option">--with-filename</span></samp><dd><a name="index-g_t_002dH-55"></a><a name="index-g_t_002d_002dwith_002dfilename-56"></a><a name="index-with-filename-prefix-57"></a>Print the file name for each match. 
 This is the default when there is more than one file to search.
 
-     <br><dt>&lsquo;<samp><span class="samp">-h</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--no-filename</span></samp>&rsquo;<dd><a name="index-g_t_002dh-58"></a><a name="index-g_t_002d_002dno_002dfilename-59"></a><a name="index-no-filename-prefix-60"></a>Suppress the prefixing of file names on output. 
+     <br><dt><samp><span class="option">-h</span></samp><dt><samp><span class="option">--no-filename</span></samp><dd><a name="index-g_t_002dh-58"></a><a name="index-g_t_002d_002dno_002dfilename-59"></a><a name="index-no-filename-prefix-60"></a>Suppress the prefixing of file names on output. 
 This is the default when there is only one file
 (or only standard input) to search.
 
-     <br><dt>&lsquo;<samp><span class="samp">--label=</span><var>LABEL</var></samp>&rsquo;<dd><a name="index-g_t_002d_002dlabel-61"></a><a name="index-changing-name-of-standard-input-62"></a>Display input actually coming from standard input
+     <br><dt><samp><span class="option">--label=</span><var>LABEL</var></samp><dd><a name="index-g_t_002d_002dlabel-61"></a><a name="index-changing-name-of-standard-input-62"></a>Display input actually coming from standard input
 as input coming from file <var>LABEL</var>.  This is
 especially useful when implementing tools like
 <samp><span class="command">zgrep</span></samp>; e.g.:
 
      <pre class="example">          gzip -cd foo.gz | grep --label=foo -H something
 </pre>
-     <br><dt>&lsquo;<samp><span class="samp">-n</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--line-number</span></samp>&rsquo;<dd><a name="index-g_t_002dn-63"></a><a name="index-g_t_002d_002dline_002dnumber-64"></a><a name="index-line-numbering-65"></a>Prefix each line of output with the 1-based line number within its input file. 
-(&lsquo;<samp><span class="samp">-n</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+     <br><dt><samp><span class="option">-n</span></samp><dt><samp><span class="option">--line-number</span></samp><dd><a name="index-g_t_002dn-63"></a><a name="index-g_t_002d_002dline_002dnumber-64"></a><a name="index-line-numbering-65"></a>Prefix each line of output with the 1-based line number within its input file. 
+(<samp><span class="option">-n</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-T</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--initial-tab</span></samp>&rsquo;<dd><a name="index-g_t_002dT-66"></a><a name="index-g_t_002d_002dinitial_002dtab-67"></a><a name="index-tab_002daligned-content-lines-68"></a>Make sure that the first character of actual line content lies on a tab stop,
+     <br><dt><samp><span class="option">-T</span></samp><dt><samp><span class="option">--initial-tab</span></samp><dd><a name="index-g_t_002dT-66"></a><a name="index-g_t_002d_002dinitial_002dtab-67"></a><a name="index-tab_002daligned-content-lines-68"></a>Make sure that the first character of actual line content lies on a tab stop,
 so that the alignment of tabs looks normal. 
 This is useful with options that prefix their output to the actual content:
-&lsquo;<samp><span class="samp">-H</span></samp>&rsquo;, &lsquo;<samp><span class="samp">-n</span></samp>&rsquo;, and &lsquo;<samp><span class="samp">-b</span></samp>&rsquo;. 
+<samp><span class="option">-H</span></samp>, <samp><span class="option">-n</span></samp>, and <samp><span class="option">-b</span></samp>. 
 In order to improve the probability that lines
 from a single file will all start at the same column,
 this also causes the line number and byte offset (if present)
 to be printed in a minimum-size field width.
 
-     <br><dt>&lsquo;<samp><span class="samp">-u</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--unix-byte-offsets</span></samp>&rsquo;<dd><a name="index-g_t_002du-69"></a><a name="index-g_t_002d_002dunix_002dbyte_002doffsets-70"></a><a name="index-g_t_0040sc_007bms_002ddos_007d_002f_0040sc_007bms_007d_002dWindows-byte-offsets-71"></a><a name="index-byte-offsets_002c-on-_0040sc_007bms_002ddos_007d_002f_0040sc_007bms_007d_002dWindows-72"></a>Report Unix-style byte offsets. 
+     <br><dt><samp><span class="option">-u</span></samp><dt><samp><span class="option">--unix-byte-offsets</span></samp><dd><a name="index-g_t_002du-69"></a><a name="index-g_t_002d_002dunix_002dbyte_002doffsets-70"></a><a name="index-MS_002dDOS_002fMS_002dWindows-byte-offsets-71"></a><a name="index-byte-offsets_002c-on-MS_002dDOS_002fMS_002dWindows-72"></a>Report Unix-style byte offsets. 
 This option causes <samp><span class="command">grep</span></samp> to report byte offsets
 as if the file were a Unix-style text file,
 i.e., the byte offsets ignore the <code>CR</code> characters that were stripped. 
 This will produce results identical
 to running <samp><span class="command">grep</span></samp> on a Unix machine. 
-This option has no effect unless the &lsquo;<samp><span class="samp">-b</span></samp>&rsquo; option is also used;
-it has no effect on platforms other than <span class="sc">ms-dos</span> and <span class="sc">ms</span>-Windows.
+This option has no effect unless the <samp><span class="option">-b</span></samp> option is also used;
+it has no effect on platforms other than MS-DOS and MS-Windows.
 
-     <br><dt>&lsquo;<samp><span class="samp">-Z</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--null</span></samp>&rsquo;<dd><a name="index-g_t_002dZ-73"></a><a name="index-g_t_002d_002dnull-74"></a><a name="index-zero_002dterminated-file-names-75"></a>Output a zero byte (the <span class="sc">ascii</span> <code>NUL</code> character)
+     <br><dt><samp><span class="option">-Z</span></samp><dt><samp><span class="option">--null</span></samp><dd><a name="index-g_t_002dZ-73"></a><a name="index-g_t_002d_002dnull-74"></a><a name="index-zero_002dterminated-file-names-75"></a>Output a zero byte (the ASCII <code>NUL</code> character)
 instead of the character that normally follows a file name. 
 For example,
 &lsquo;<samp><span class="samp">grep -lZ</span></samp>&rsquo; outputs a zero byte after each file name


From MAILER-DAEMON Fri Mar 02 04:29:18 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3One-0000YY-Kt
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:18 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36188)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnU-0000Iz-KF
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:17 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnI-0004sk-Bs
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:08 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36153)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnI-0004rp-7m
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:56 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35764)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnH-0007I1-EH
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:55 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On6-0004f0-D3
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:54 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37512)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On6-0004es-8u
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:44 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On5-00040l-JE
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:43 +0000
Date: Fri, 02 Mar 2012 09:28:43 +0000
Message-Id: <E1S3On5-00040l-JE@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Index.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:17 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Index.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Index.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Index.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Index.html	2 Mar 2012 09:28:29 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Index - GNU Grep 2.9</title>
+<title>Index - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="prev" href="Copying.html#Copying" title="Copying">
@@ -10,7 +10,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -144,7 +145,7 @@
 <li><a href="Basic-vs-Extended.html#index-basic-regular-expressions-243">basic regular expressions</a>: <a href="Basic-vs-Extended.html#Basic-vs-Extended">Basic vs Extended</a></li>
 <li><a href="Context-Line-Control.html#index-before-context-82">before context</a>: <a href="Context-Line-Control.html#Context-Line-Control">Context Line Control</a></li>
 <li><a href="File-and-Directory-Selection.html#index-binary-files-95">binary files</a>: <a href="File-and-Directory-Selection.html#File-and-Directory-Selection">File and Directory Selection</a></li>
-<li><a href="Other-Options.html#index-binary-files_002c-_0040sc_007bms_002ddos_007d_002f_0040sc_007bms_007d_002dWindows-126">binary files, <span class="sc">ms-dos</span>/<span class="sc">ms</span>-Windows</a>: <a href="Other-Options.html#Other-Options">Other Options</a></li>
+<li><a href="Other-Options.html#index-binary-files_002c-MS_002dDOS_002fMS_002dWindows-126">binary files, MS-DOS/MS-Windows</a>: <a href="Other-Options.html#Other-Options">Other Options</a></li>
 <li><a href="Character-Classes-and-Bracket-Expressions.html#index-blank-_0040r_007bcharacter-class_007d-216"><code>blank </code><span class="roman">character class</span></a>: <a href="Character-Classes-and-Bracket-Expressions.html#Character-Classes-and-Bracket-Expressions">Character Classes and Bracket Expressions</a></li>
 <li><a href="Character-Classes-and-Bracket-Expressions.html#index-blank-characters-217">blank characters</a>: <a href="Character-Classes-and-Bracket-Expressions.html#Character-Classes-and-Bracket-Expressions">Character Classes and Bracket Expressions</a></li>
 <li><a href="Environment-Variables.html#index-bn-GREP_005fCOLORS-_0040r_007bcapability_007d-145"><code>bn GREP_COLORS </code><span class="roman">capability</span></a>: <a href="Environment-Variables.html#Environment-Variables">Environment Variables</a></li>
@@ -156,7 +157,7 @@
 <li><a href="Reporting-Bugs.html#index-Bugs_002c-known-250">Bugs, known</a>: <a href="Reporting-Bugs.html#Reporting-Bugs">Reporting Bugs</a></li>
 <li><a href="Reporting-Bugs.html#index-bugs_002c-reporting-249">bugs, reporting</a>: <a href="Reporting-Bugs.html#Reporting-Bugs">Reporting Bugs</a></li>
 <li><a href="Output-Line-Prefix-Control.html#index-byte-offset-54">byte offset</a>: <a href="Output-Line-Prefix-Control.html#Output-Line-Prefix-Control">Output Line Prefix Control</a></li>
-<li><a href="Output-Line-Prefix-Control.html#index-byte-offsets_002c-on-_0040sc_007bms_002ddos_007d_002f_0040sc_007bms_007d_002dWindows-72">byte offsets, on <span class="sc">ms-dos</span>/<span class="sc">ms</span>-Windows</a>: <a href="Output-Line-Prefix-Control.html#Output-Line-Prefix-Control">Output Line Prefix Control</a></li>
+<li><a href="Output-Line-Prefix-Control.html#index-byte-offsets_002c-on-MS_002dDOS_002fMS_002dWindows-72">byte offsets, on MS-DOS/MS-Windows</a>: <a href="Output-Line-Prefix-Control.html#Output-Line-Prefix-Control">Output Line Prefix Control</a></li>
 <li><a href="Matching-Control.html#index-case-insensitive-search-16">case insensitive search</a>: <a href="Matching-Control.html#Matching-Control">Matching Control</a></li>
 <li><a href="Output-Line-Prefix-Control.html#index-changing-name-of-standard-input-62">changing name of standard input</a>: <a href="Output-Line-Prefix-Control.html#Output-Line-Prefix-Control">Output Line Prefix Control</a></li>
 <li><a href="Character-Classes-and-Bracket-Expressions.html#index-character-class-208">character class</a>: <a href="Character-Classes-and-Bracket-Expressions.html#Character-Classes-and-Bracket-Expressions">Character Classes and Bracket Expressions</a></li>
@@ -226,8 +227,8 @@
 <li><a href="Other-Options.html#index-memory-mapped-input-122">memory mapped input</a>: <a href="Other-Options.html#Other-Options">Other Options</a></li>
 <li><a href="Environment-Variables.html#index-message-language-161">message language</a>: <a href="Environment-Variables.html#Environment-Variables">Environment Variables</a></li>
 <li><a href="Environment-Variables.html#index-ms-GREP_005fCOLORS-_0040r_007bcapability_007d-141"><code>ms GREP_COLORS </code><span class="roman">capability</span></a>: <a href="Environment-Variables.html#Environment-Variables">Environment Variables</a></li>
-<li><a href="Other-Options.html#index-g_t_0040sc_007bms_002ddos_007d_002f_0040sc_007bms_007d_002dWindows-binary-files-125"><span class="sc">ms-dos</span>/<span class="sc">ms</span>-Windows binary files</a>: <a href="Other-Options.html#Other-Options">Other Options</a></li>
-<li><a href="Output-Line-Prefix-Control.html#index-g_t_0040sc_007bms_002ddos_007d_002f_0040sc_007bms_007d_002dWindows-byte-offsets-71"><span class="sc">ms-dos</span>/<span class="sc">ms</span>-Windows byte offsets</a>: <a href="Output-Line-Prefix-Control.html#Output-Line-Prefix-Control">Output Line Prefix Control</a></li>
+<li><a href="Other-Options.html#index-MS_002dDOS_002fMS_002dWindows-binary-files-125">MS-DOS/MS-Windows binary files</a>: <a href="Other-Options.html#Other-Options">Other Options</a></li>
+<li><a href="Output-Line-Prefix-Control.html#index-MS_002dDOS_002fMS_002dWindows-byte-offsets-71">MS-DOS/MS-Windows byte offsets</a>: <a href="Output-Line-Prefix-Control.html#Output-Line-Prefix-Control">Output Line Prefix Control</a></li>
 <li><a href="Environment-Variables.html#index-mt-GREP_005fCOLORS-_0040r_007bcapability_007d-140"><code>mt GREP_COLORS </code><span class="roman">capability</span></a>: <a href="Environment-Variables.html#Environment-Variables">Environment Variables</a></li>
 <li><a href="General-Output-Control.html#index-names-of-matching-files-38">names of matching files</a>: <a href="General-Output-Control.html#General-Output-Control">General Output Control</a></li>
 <li><a href="Environment-Variables.html#index-national-language-support-152">national language support</a>: <a href="Environment-Variables.html#Environment-Variables">Environment Variables</a></li>
@@ -269,7 +270,7 @@
 <li><a href="Generic-Program-Information.html#index-usage-summary_002c-printing-3">usage summary, printing</a>: <a href="Generic-Program-Information.html#Generic-Program-Information">Generic Program Information</a></li>
 <li><a href="Usage.html#index-usage_002c-examples-245">usage, examples</a>: <a href="Usage.html#Usage">Usage</a></li>
 <li><a href="Usage.html#index-using-_0040command_007bgrep_007d_002c-Q_0026A-246">using <samp><span class="command">grep</span></samp>, Q&amp;A</a>: <a href="Usage.html#Usage">Usage</a></li>
-<li><a href="grep-Programs.html#index-variants-of-_0040command_007bgerp_007d-169">variants of <samp><span class="command">gerp</span></samp></a>: <a href="grep-Programs.html#grep-Programs">grep Programs</a></li>
+<li><a href="grep-Programs.html#index-variants-of-_0040command_007bgrep_007d-169">variants of <samp><span class="command">grep</span></samp></a>: <a href="grep-Programs.html#grep-Programs">grep Programs</a></li>
 <li><a href="Generic-Program-Information.html#index-version_002c-printing-6">version, printing</a>: <a href="Generic-Program-Information.html#Generic-Program-Information">Generic Program Information</a></li>
 <li><a href="Character-Classes-and-Bracket-Expressions.html#index-whitespace-characters-233">whitespace characters</a>: <a href="Character-Classes-and-Bracket-Expressions.html#Character-Classes-and-Bracket-Expressions">Character Classes and Bracket Expressions</a></li>
 <li><a href="Output-Line-Prefix-Control.html#index-with-filename-prefix-57">with filename prefix</a>: <a href="Output-Line-Prefix-Control.html#Output-Line-Prefix-Control">Output Line Prefix Control</a></li>


From MAILER-DAEMON Fri Mar 02 04:29:11 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3OnX-0000Kr-1v
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:11 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36005)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnL-0000GB-LS
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:10 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnB-0004kN-2j
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:59 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36145)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnA-0004k9-Vn
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:48 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35685)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnA-0007Hc-Az
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:48 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On1-0004aQ-0s
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:47 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37476)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On0-0004aK-U1
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:38 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On0-0003zL-8f
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:38 +0000
Date: Fri, 02 Mar 2012 09:28:38 +0000
Message-Id: <E1S3On0-0003zL-8f@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Command_002dline-Options.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:10 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Command_002dline-Options.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Command_002dline-Options.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Command_002dline-Options.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Command_002dline-Options.html	2 Mar 2012 09:28:26 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Command-line Options - GNU Grep 2.9</title>
+<title>Command-line Options - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Invoking.html#Invoking" title="Invoking">
@@ -11,7 +11,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -46,13 +47,13 @@
 <h3 class="section">2.1 Command-line Options</h3>
 
 <p><samp><span class="command">grep</span></samp> comes with a rich set of options:
-some from <span class="sc">posix.2</span> and some being <span class="sc">gnu</span> extensions. 
-Long option names are always a <span class="sc">gnu</span> extension,
-even for options that are from <span class="sc">posix</span> specifications. 
-Options that are specified by <span class="sc">posix</span>,
+some from POSIX and some being GNU extensions. 
+Long option names are always a GNU extension,
+even for options that are from POSIX specifications. 
+Options that are specified by POSIX,
 under their short names,
 are explicitly marked as such
-to facilitate <span class="sc">posix</span>-portable programming. 
+to facilitate POSIX-portable programming. 
 A few option names are provided
 for compatibility with older or more exotic implementations.
 


From MAILER-DAEMON Fri Mar 02 04:29:13 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3OnZ-0000Nv-Ci
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:13 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36126)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnR-0000Go-7C
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:12 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnE-0004ot-Vd
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:04 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36148)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnE-0004of-Se
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:52 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35725)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnE-0007Hp-1u
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:52 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On3-0004cI-Du
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:51 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37495)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On3-0004c0-9t
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:41 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On2-00040C-OA
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:40 +0000
Date: Fri, 02 Mar 2012 09:28:40 +0000
Message-Id: <E1S3On2-00040C-OA@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/File-and-Directory-Selection.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:12 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/File-and-Directory-Selection.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/File-and-Directory-Selection.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/File-and-Directory-Selection.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/File-and-Directory-Selection.html	2 Mar 2012 09:28:29 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>File and Directory Selection - GNU Grep 2.9</title>
+<title>File and Directory Selection - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Command_002dline-Options.html#Command_002dline-Options" title="Command-line Options">
@@ -12,7 +12,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -47,33 +48,36 @@
 <h4 class="subsection">2.1.6 File and Directory Selection</h4>
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">-a</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--text</span></samp>&rsquo;<dd><a name="index-g_t_002da-92"></a><a name="index-g_t_002d_002dtext-93"></a><a name="index-suppress-binary-data-94"></a><a name="index-binary-files-95"></a>Process a binary file as if it were text;
+<dt><samp><span class="option">-a</span></samp><dt><samp><span class="option">--text</span></samp><dd><a name="index-g_t_002da-92"></a><a name="index-g_t_002d_002dtext-93"></a><a name="index-suppress-binary-data-94"></a><a name="index-binary-files-95"></a>Process a binary file as if it were text;
 this is equivalent to the &lsquo;<samp><span class="samp">--binary-files=text</span></samp>&rsquo; option.
 
-     <dt>&lsquo;<samp><span class="samp">--binary-files=</span><var>type</var></samp>&rsquo;<dd><a name="index-g_t_002d_002dbinary_002dfiles-96"></a><a name="index-binary-files-97"></a>If the first few bytes of a file indicate that the file contains binary data,
+     <br><dt><samp><span class="option">--binary-files=</span><var>type</var></samp><dd><a name="index-g_t_002d_002dbinary_002dfiles-96"></a><a name="index-binary-files-97"></a>If the first few bytes of a file indicate that the file contains binary data,
 assume that the file is of type <var>type</var>. 
 By default, <var>type</var> is &lsquo;<samp><span class="samp">binary</span></samp>&rsquo;,
 and <samp><span class="command">grep</span></samp> normally outputs either
 a one-line message saying that a binary file matches,
 or no message if there is no match. 
-If <var>type</var> is &lsquo;<samp><span class="samp">without-match</span></samp>&rsquo;,
+
+     <p>If <var>type</var> is &lsquo;<samp><span class="samp">without-match</span></samp>&rsquo;,
 <samp><span class="command">grep</span></samp> assumes that a binary file does not match;
-this is equivalent to the &lsquo;<samp><span class="samp">-I</span></samp>&rsquo; option. 
-If <var>type</var> is &lsquo;<samp><span class="samp">text</span></samp>&rsquo;,
+this is equivalent to the <samp><span class="option">-I</span></samp> option.
+
+     <p>If <var>type</var> is &lsquo;<samp><span class="samp">text</span></samp>&rsquo;,
 <samp><span class="command">grep</span></samp> processes a binary file as if it were text;
-this is equivalent to the &lsquo;<samp><span class="samp">-a</span></samp>&rsquo; option. 
-<em>Warning:</em> &lsquo;<samp><span class="samp">--binary-files=text</span></samp>&rsquo; might output binary garbage,
+this is equivalent to the <samp><span class="option">-a</span></samp> option.
+
+     <p><em>Warning:</em> &lsquo;<samp><span class="samp">--binary-files=text</span></samp>&rsquo; might output binary garbage,
 which can have nasty side effects
 if the output is a terminal and
 if the terminal driver interprets some of it as commands.
 
-     <br><dt>&lsquo;<samp><span class="samp">-D </span><var>action</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--devices=</span><var>action</var></samp>&rsquo;<dd><a name="index-g_t_002dD-98"></a><a name="index-g_t_002d_002ddevices-99"></a><a name="index-device-search-100"></a>If an input file is a device, FIFO, or socket, use <var>action</var> to process it. 
+     <br><dt><samp><span class="option">-D </span><var>action</var></samp><dt><samp><span class="option">--devices=</span><var>action</var></samp><dd><a name="index-g_t_002dD-98"></a><a name="index-g_t_002d_002ddevices-99"></a><a name="index-device-search-100"></a>If an input file is a device, FIFO, or socket, use <var>action</var> to process it. 
 By default, <var>action</var> is &lsquo;<samp><span class="samp">read</span></samp>&rsquo;,
 which means that devices are read just as if they were ordinary files. 
 If <var>action</var> is &lsquo;<samp><span class="samp">skip</span></samp>&rsquo;,
 devices, FIFOs, and sockets are silently skipped.
 
-     <br><dt>&lsquo;<samp><span class="samp">-d </span><var>action</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--directories=</span><var>action</var></samp>&rsquo;<dd><a name="index-g_t_002dd-101"></a><a name="index-g_t_002d_002ddirectories-102"></a><a name="index-directory-search-103"></a>If an input file is a directory, use <var>action</var> to process it. 
+     <br><dt><samp><span class="option">-d </span><var>action</var></samp><dt><samp><span class="option">--directories=</span><var>action</var></samp><dd><a name="index-g_t_002dd-101"></a><a name="index-g_t_002d_002ddirectories-102"></a><a name="index-directory-search-103"></a>If an input file is a directory, use <var>action</var> to process it. 
 By default, <var>action</var> is &lsquo;<samp><span class="samp">read</span></samp>&rsquo;,
 which means that directories are read just as if they were ordinary files
 (some operating systems and file systems disallow this,
@@ -82,28 +86,28 @@
 If <var>action</var> is &lsquo;<samp><span class="samp">skip</span></samp>&rsquo;, directories are silently skipped. 
 If <var>action</var> is &lsquo;<samp><span class="samp">recurse</span></samp>&rsquo;,
 <samp><span class="command">grep</span></samp> reads all files under each directory, recursively;
-this is equivalent to the &lsquo;<samp><span class="samp">-r</span></samp>&rsquo; option.
+this is equivalent to the <samp><span class="option">-r</span></samp> option.
 
-     <br><dt>&lsquo;<samp><span class="samp">--exclude=</span><var>glob</var></samp>&rsquo;<dd><a name="index-g_t_002d_002dexclude-104"></a><a name="index-exclude-files-105"></a><a name="index-searching-directory-trees-106"></a>Skip files whose base name matches <var>glob</var>
+     <br><dt><samp><span class="option">--exclude=</span><var>glob</var></samp><dd><a name="index-g_t_002d_002dexclude-104"></a><a name="index-exclude-files-105"></a><a name="index-searching-directory-trees-106"></a>Skip files whose base name matches <var>glob</var>
 (using wildcard matching). 
 A file-name glob can use
 &lsquo;<samp><span class="samp">*</span></samp>&rsquo;, &lsquo;<samp><span class="samp">?</span></samp>&rsquo;, and &lsquo;<samp><span class="samp">[</span></samp>&rsquo;...&lsquo;<samp><span class="samp">]</span></samp>&rsquo; as wildcards,
 and <code>\</code> to quote a wildcard or backslash character literally.
 
-     <br><dt>&lsquo;<samp><span class="samp">--exclude-from=</span><var>file</var></samp>&rsquo;<dd><a name="index-g_t_002d_002dexclude_002dfrom-107"></a><a name="index-exclude-files-108"></a><a name="index-searching-directory-trees-109"></a>Skip files whose base name matches any of the file-name globs
+     <br><dt><samp><span class="option">--exclude-from=</span><var>file</var></samp><dd><a name="index-g_t_002d_002dexclude_002dfrom-107"></a><a name="index-exclude-files-108"></a><a name="index-searching-directory-trees-109"></a>Skip files whose base name matches any of the file-name globs
 read from <var>file</var> (using wildcard matching as described
-under &lsquo;<samp><span class="samp">--exclude</span></samp>&rsquo;).
+under <samp><span class="option">--exclude</span></samp>).
 
-     <br><dt>&lsquo;<samp><span class="samp">--exclude-dir=</span><var>dir</var></samp>&rsquo;<dd><a name="index-g_t_002d_002dexclude_002ddir-110"></a><a name="index-exclude-directories-111"></a>Exclude directories matching the pattern <var>dir</var> from recursive
+     <br><dt><samp><span class="option">--exclude-dir=</span><var>dir</var></samp><dd><a name="index-g_t_002d_002dexclude_002ddir-110"></a><a name="index-exclude-directories-111"></a>Exclude directories matching the pattern <var>dir</var> from recursive
 directory searches.
 
-     <br><dt>&lsquo;<samp><span class="samp">-I</span></samp>&rsquo;<dd>Process a binary file as if it did not contain matching data;
+     <br><dt><samp><span class="option">-I</span></samp><dd>Process a binary file as if it did not contain matching data;
 this is equivalent to the &lsquo;<samp><span class="samp">--binary-files=without-match</span></samp>&rsquo; option.
 
-     <br><dt>&lsquo;<samp><span class="samp">--include=</span><var>glob</var></samp>&rsquo;<dd><a name="index-g_t_002d_002dinclude-112"></a><a name="index-include-files-113"></a><a name="index-searching-directory-trees-114"></a>Search only files whose base name matches <var>glob</var>
-(using wildcard matching as described under &lsquo;<samp><span class="samp">--exclude</span></samp>&rsquo;).
+     <br><dt><samp><span class="option">--include=</span><var>glob</var></samp><dd><a name="index-g_t_002d_002dinclude-112"></a><a name="index-include-files-113"></a><a name="index-searching-directory-trees-114"></a>Search only files whose base name matches <var>glob</var>
+(using wildcard matching as described under <samp><span class="option">--exclude</span></samp>).
 
-     <br><dt>&lsquo;<samp><span class="samp">-r</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">-R</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--recursive</span></samp>&rsquo;<dd><a name="index-g_t_002dr-115"></a><a name="index-g_t_002d_002drecursive-116"></a><a name="index-recursive-search-117"></a><a name="index-searching-directory-trees-118"></a>For each directory mentioned on the command line,
+     <br><dt><samp><span class="option">-r</span></samp><dt><samp><span class="option">-R</span></samp><dt><samp><span class="option">--recursive</span></samp><dd><a name="index-g_t_002dr-115"></a><a name="index-g_t_002d_002drecursive-116"></a><a name="index-recursive-search-117"></a><a name="index-searching-directory-trees-118"></a>For each directory operand,
 read and process all files in that directory, recursively. 
 This is the same as the &lsquo;<samp><span class="samp">--directories=recurse</span></samp>&rsquo; option.
 


From MAILER-DAEMON Fri Mar 02 04:29:22 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Oni-0000bp-3V
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:22 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36279)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Ona-0000Op-4q
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:17 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnT-00055y-GU
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:13 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36173)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnT-00055f-4l
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:07 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35991)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnS-0007JH-HM
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnC-0004mQ-ER
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:05 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37550)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnC-0004lq-B7
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:50 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3OnB-00043n-LA
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:49 +0000
Date: Fri, 02 Mar 2012 09:28:49 +0000
Message-Id: <E1S3OnB-00043n-LA@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/grep-Programs.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:18 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/grep-Programs.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/grep-Programs.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/grep-Programs.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/grep-Programs.html	2 Mar 2012 09:28:30 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>grep Programs - GNU Grep 2.9</title>
+<title>grep Programs - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Invoking.html#Invoking" title="Invoking">
@@ -11,7 +11,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -44,27 +45,29 @@
 
 <h3 class="section">2.4 <samp><span class="command">grep</span></samp> Programs</h3>
 
-<p><a name="index-g_t_0040command_007bgrep_007d-programs-168"></a><a name="index-variants-of-_0040command_007bgerp_007d-169"></a>
+<p><a name="index-g_t_0040command_007bgrep_007d-programs-168"></a><a name="index-variants-of-_0040command_007bgrep_007d-169"></a>
 <samp><span class="command">grep</span></samp> searches the named input files
-(or standard input if no files are named,
-or the file name <samp><span class="file">-</span></samp> is given)
 for lines containing a match to the given pattern. 
 By default, <samp><span class="command">grep</span></samp> prints the matching lines. 
+A file named <samp><span class="file">-</span></samp> stands for standard input. 
+If no input is specified, <samp><span class="command">grep</span></samp> searches the working
+directory <samp><span class="file">.</span></samp> if given a command-line option specifying
+recursion; otherwise, <samp><span class="command">grep</span></samp> searches standard input. 
 There are four major variants of <samp><span class="command">grep</span></samp>,
 controlled by the following options.
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">-G</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--basic-regexp</span></samp>&rsquo;<dd><a name="index-g_t_002dG-170"></a><a name="index-g_t_002d_002dbasic_002dregexp-171"></a><a name="index-matching-basic-regular-expressions-172"></a>Interpret the pattern as a basic regular expression (BRE). 
+<dt><samp><span class="option">-G</span></samp><dt><samp><span class="option">--basic-regexp</span></samp><dd><a name="index-g_t_002dG-170"></a><a name="index-g_t_002d_002dbasic_002dregexp-171"></a><a name="index-matching-basic-regular-expressions-172"></a>Interpret the pattern as a basic regular expression (BRE). 
 This is the default.
 
-     <br><dt>&lsquo;<samp><span class="samp">-E</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--extended-regexp</span></samp>&rsquo;<dd><a name="index-g_t_002dE-173"></a><a name="index-g_t_002d_002dextended_002dregexp-174"></a><a name="index-matching-extended-regular-expressions-175"></a>Interpret the pattern as an extended regular expression (ERE). 
-(&lsquo;<samp><span class="samp">-E</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+     <br><dt><samp><span class="option">-E</span></samp><dt><samp><span class="option">--extended-regexp</span></samp><dd><a name="index-g_t_002dE-173"></a><a name="index-g_t_002d_002dextended_002dregexp-174"></a><a name="index-matching-extended-regular-expressions-175"></a>Interpret the pattern as an extended regular expression (ERE). 
+(<samp><span class="option">-E</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-F</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--fixed-strings</span></samp>&rsquo;<dd><a name="index-g_t_002dF-176"></a><a name="index-g_t_002d_002dfixed_002dstrings-177"></a><a name="index-matching-fixed-strings-178"></a>Interpret the pattern as a list of fixed strings, separated
+     <br><dt><samp><span class="option">-F</span></samp><dt><samp><span class="option">--fixed-strings</span></samp><dd><a name="index-g_t_002dF-176"></a><a name="index-g_t_002d_002dfixed_002dstrings-177"></a><a name="index-matching-fixed-strings-178"></a>Interpret the pattern as a list of fixed strings, separated
 by newlines, any of which is to be matched. 
-(&lsquo;<samp><span class="samp">-F</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+(<samp><span class="option">-F</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-P</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--perl-regexp</span></samp>&rsquo;<dd><a name="index-g_t_002dP-179"></a><a name="index-g_t_002d_002dperl_002dregexp-180"></a><a name="index-matching-Perl-regular-expressions-181"></a>Interpret the pattern as a Perl regular expression. 
+     <br><dt><samp><span class="option">-P</span></samp><dt><samp><span class="option">--perl-regexp</span></samp><dd><a name="index-g_t_002dP-179"></a><a name="index-g_t_002d_002dperl_002dregexp-180"></a><a name="index-matching-Perl-regular-expressions-181"></a>Interpret the pattern as a Perl regular expression. 
 This is highly experimental and
 &lsquo;<samp><span class="samp">grep -P</span></samp>&rsquo; may warn of unimplemented features.
 


From MAILER-DAEMON Fri Mar 02 04:29:22 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Oni-0000ce-BB
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:22 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36283)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Ona-0000P2-7v
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:17 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnP-00051Y-9s
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:13 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36165)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnP-00050y-6s
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:03 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35898)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnO-0007Iv-J4
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:02 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On9-0004iF-CZ
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:01 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37523)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On9-0004hk-8h
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:47 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On6-000414-Hi
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:44 +0000
Date: Fri, 02 Mar 2012 09:28:44 +0000
Message-Id: <E1S3On6-000414-Hi@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Matching-Control.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:18 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Matching-Control.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Matching-Control.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Matching-Control.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Matching-Control.html	2 Mar 2012 09:28:29 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Matching Control - GNU Grep 2.9</title>
+<title>Matching Control - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Command_002dline-Options.html#Command_002dline-Options" title="Command-line Options">
@@ -12,7 +12,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -47,23 +48,23 @@
 <h4 class="subsection">2.1.2 Matching Control</h4>
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">-e </span><var>pattern</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--regexp=</span><var>pattern</var></samp>&rsquo;<dd><a name="index-g_t_002de-7"></a><a name="index-g_t_002d_002dregexp_003d_0040var_007bpattern_007d-8"></a><a name="index-pattern-list-9"></a>Use <var>pattern</var> as the pattern. 
+<dt><samp><span class="option">-e </span><var>pattern</var></samp><dt><samp><span class="option">--regexp=</span><var>pattern</var></samp><dd><a name="index-g_t_002de-7"></a><a name="index-g_t_002d_002dregexp_003d_0040var_007bpattern_007d-8"></a><a name="index-pattern-list-9"></a>Use <var>pattern</var> as the pattern. 
 This can be used to specify multiple search patterns,
 or to protect a pattern beginning with a &lsquo;<samp><span class="samp">-</span></samp>&rsquo;. 
-(&lsquo;<samp><span class="samp">-e</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+(<samp><span class="option">-e</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-f </span><var>file</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--file=</span><var>file</var></samp>&rsquo;<dd><a name="index-g_t_002df-10"></a><a name="index-g_t_002d_002dfile-11"></a><a name="index-pattern-from-file-12"></a>Obtain patterns from <var>file</var>, one per line. 
+     <br><dt><samp><span class="option">-f </span><var>file</var></samp><dt><samp><span class="option">--file=</span><var>file</var></samp><dd><a name="index-g_t_002df-10"></a><a name="index-g_t_002d_002dfile-11"></a><a name="index-pattern-from-file-12"></a>Obtain patterns from <var>file</var>, one per line. 
 The empty file contains zero patterns, and therefore matches nothing. 
-(&lsquo;<samp><span class="samp">-f</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+(<samp><span class="option">-f</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-i</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">-y</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--ignore-case</span></samp>&rsquo;<dd><a name="index-g_t_002di-13"></a><a name="index-g_t_002dy-14"></a><a name="index-g_t_002d_002dignore_002dcase-15"></a><a name="index-case-insensitive-search-16"></a>Ignore case distinctions in both the pattern and the input files. 
-&lsquo;<samp><span class="samp">-y</span></samp>&rsquo; is an obsolete synonym that is provided for compatibility. 
-(&lsquo;<samp><span class="samp">-i</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+     <br><dt><samp><span class="option">-i</span></samp><dt><samp><span class="option">-y</span></samp><dt><samp><span class="option">--ignore-case</span></samp><dd><a name="index-g_t_002di-13"></a><a name="index-g_t_002dy-14"></a><a name="index-g_t_002d_002dignore_002dcase-15"></a><a name="index-case-insensitive-search-16"></a>Ignore case distinctions in both the pattern and the input files. 
+<samp><span class="option">-y</span></samp> is an obsolete synonym that is provided for compatibility. 
+(<samp><span class="option">-i</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-v</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--invert-match</span></samp>&rsquo;<dd><a name="index-g_t_002dv-17"></a><a name="index-g_t_002d_002dinvert_002dmatch-18"></a><a name="index-invert-matching-19"></a><a name="index-print-non_002dmatching-lines-20"></a>Invert the sense of matching, to select non-matching lines. 
-(&lsquo;<samp><span class="samp">-v</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+     <br><dt><samp><span class="option">-v</span></samp><dt><samp><span class="option">--invert-match</span></samp><dd><a name="index-g_t_002dv-17"></a><a name="index-g_t_002d_002dinvert_002dmatch-18"></a><a name="index-invert-matching-19"></a><a name="index-print-non_002dmatching-lines-20"></a>Invert the sense of matching, to select non-matching lines. 
+(<samp><span class="option">-v</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-w</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--word-regexp</span></samp>&rsquo;<dd><a name="index-g_t_002dw-21"></a><a name="index-g_t_002d_002dword_002dregexp-22"></a><a name="index-matching-whole-words-23"></a>Select only those lines containing matches that form whole words. 
+     <br><dt><samp><span class="option">-w</span></samp><dt><samp><span class="option">--word-regexp</span></samp><dd><a name="index-g_t_002dw-21"></a><a name="index-g_t_002d_002dword_002dregexp-22"></a><a name="index-matching-whole-words-23"></a>Select only those lines containing matches that form whole words. 
 The test is that the matching substring must either
 be at the beginning of the line,
 or preceded by a non-word constituent character. 
@@ -72,8 +73,8 @@
 or followed by a non-word constituent character. 
 Word-constituent characters are letters, digits, and the underscore.
 
-     <br><dt>&lsquo;<samp><span class="samp">-x</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--line-regexp</span></samp>&rsquo;<dd><a name="index-g_t_002dx-24"></a><a name="index-g_t_002d_002dline_002dregexp-25"></a><a name="index-match-the-whole-line-26"></a>Select only those matches that exactly match the whole line. 
-(&lsquo;<samp><span class="samp">-x</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+     <br><dt><samp><span class="option">-x</span></samp><dt><samp><span class="option">--line-regexp</span></samp><dd><a name="index-g_t_002dx-24"></a><a name="index-g_t_002d_002dline_002dregexp-25"></a><a name="index-match-the-whole-line-26"></a>Select only those matches that exactly match the whole line. 
+(<samp><span class="option">-x</span></samp> is specified by POSIX.)
 
 </dl>
 


From MAILER-DAEMON Fri Mar 02 04:29:22 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Oni-0000d7-Dg
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:22 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36321)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Onc-0000Rz-1J
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:18 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnR-00053k-Fl
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:15 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36168)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnR-00053T-7X
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:05 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35937)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnQ-0007J6-Ey
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnA-0004jy-LX
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:03 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37534)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnA-0004jU-JC
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:48 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On9-00043C-Nd
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:47 +0000
Date: Fri, 02 Mar 2012 09:28:47 +0000
Message-Id: <E1S3On9-00043C-Nd@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Regular-Expressions.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:18 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Regular-Expressions.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Regular-Expressions.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Regular-Expressions.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Regular-Expressions.html	2 Mar 2012 09:28:30 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Regular Expressions - GNU Grep 2.9</title>
+<title>Regular Expressions - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="prev" href="Invoking.html#Invoking" title="Invoking">
@@ -11,7 +11,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -52,15 +53,15 @@
 <samp><span class="command">grep</span></samp> understands
 three different versions of regular expression syntax:
 &ldquo;basic,&rdquo; (BRE) &ldquo;extended&rdquo; (ERE) and &ldquo;perl&rdquo;. 
-In <span class="sc">gnu</span> <samp><span class="command">grep</span></samp>,
-there is no difference in available functionality between basic and
+In GNU <samp><span class="command">grep</span></samp>,
+there is no difference in available functionality between the basic and
 extended syntaxes. 
 In other implementations, basic regular expressions are less powerful. 
 The following description applies to extended regular expressions;
 differences for basic regular expressions are summarized afterwards. 
 Perl regular expressions give additional functionality, and are
-documented in pcresyntax(3) and pcrepattern(3), but may not be
-available on every system.
+documented in the <i>pcresyntax</i>(3) and <i>pcrepattern</i>(3) manual pages,
+but may not be available on every system.
 
 <ul class="menu">
 <li><a accesskey="1" href="Fundamental-Structure.html#Fundamental-Structure">Fundamental Structure</a>


From MAILER-DAEMON Fri Mar 02 04:29:14 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Ona-0000Pz-J0
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:14 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36178)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnU-0000Ix-0l
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:13 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnH-0004rD-AW
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:07 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36151)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnH-0004qv-73
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:55 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35749)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnG-0007Hx-EH
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:54 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On3-0004cr-VB
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:53 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37501)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On3-0004cR-Rl
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:41 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On3-00040I-Ar
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:41 +0000
Date: Fri, 02 Mar 2012 09:28:41 +0000
Message-Id: <E1S3On3-00040I-Ar@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/GNU-Free-Documentation-License.html,
	v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:13 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/GNU-Free-Documentation-License.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/GNU-Free-Documentation-License.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/GNU-Free-Documentation-License.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/GNU-Free-Documentation-License.html	2 Mar 2012 09:28:29 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>GNU Free Documentation License - GNU Grep 2.9</title>
+<title>GNU Free Documentation License - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Copying.html#Copying" title="Copying">
@@ -10,7 +10,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -47,7 +48,7 @@
 
 <!-- This file is intended to be included within another document, -->
 <!-- hence no sectioning command or @node. -->
-<pre class="display">     Copyright &copy; 2000-2002, 2007-2008, 2010-2011 Free Software
+<pre class="display">     Copyright &copy; 2000-2002, 2007-2008, 2010-2012 Free Software
      Foundation, Inc.
      <a href="http://fsf.org/">http://fsf.org/</a>
      


From MAILER-DAEMON Fri Mar 02 04:29:22 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Oni-0000dP-Fy
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:22 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36201)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnV-0000J9-Ml
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:19 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnN-0004yk-4K
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:09 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36161)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnN-0004yI-1J
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:01 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35853)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnM-0007IR-EL
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:00 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On6-0004fd-SY
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:59 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37518)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On6-0004fB-P6
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:44 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On6-000411-9i
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:44 +0000
Date: Fri, 02 Mar 2012 09:28:44 +0000
Message-Id: <E1S3On6-000411-9i@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Invoking.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:19 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Invoking.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Invoking.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Invoking.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Invoking.html	2 Mar 2012 09:28:29 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Invoking - GNU Grep 2.9</title>
+<title>Invoking - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="prev" href="Introduction.html#Introduction" title="Introduction">
@@ -11,7 +11,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,


From MAILER-DAEMON Fri Mar 02 04:29:22 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Oni-0000e4-MR
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:22 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36261)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnY-0000NB-V4
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:21 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnP-00051n-K3
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:12 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36166)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnP-00051V-G5
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:03 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35906)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnO-0007Iw-SI
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:02 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omz-0004ZR-7f
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:02 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37461)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omz-0004ZM-4W
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:37 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3Omy-0003yw-Hr
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:36 +0000
Date: Fri, 02 Mar 2012 09:28:36 +0000
Message-Id: <E1S3Omy-0003yw-Hr@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/index.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:21 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: index.html
===================================================================
RCS file: /webcvs/grep/grep/manual/index.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- index.html	25 Jun 2011 09:21:01 -0000	1.9
+++ index.html	2 Mar 2012 09:28:24 -0000	1.10
@@ -4,17 +4,17 @@
 <h2>GNU grep - GNU Grep: Print lines matching a pattern</h2>
 
 <address>Free Software Foundation</address>
-<address>last updated June 25, 2011</address>
+<address>last updated March 02, 2012</address>
 
 <p>This manual (grep) is available in the following formats:</p>
 
 <ul>
 <li><a href="grep.html">HTML
-    (168K bytes)</a> - entirely on one web page.</li>
+    (160K bytes)</a> - entirely on one web page.</li>
 <li><a href="html_node/index.html">HTML</a> - with one web page per
     node.</li>
 <li><a href="grep.html.gz">HTML compressed
-    (32K gzipped characters)</a> - entirely on
+    (36K gzipped characters)</a> - entirely on
     one web page.</li>
 <li><a href="grep.html_node.tar.gz">HTML compressed
     (40K gzipped tar file)</a> -
@@ -22,17 +22,17 @@
 <li><a href="grep.info.tar.gz">Info document
     (28K bytes gzipped tar file)</a>.</li>
 <li><a href="grep.txt">ASCII text
-    (96K bytes)</a>.</li>
+    (88K bytes)</a>.</li>
 <li><a href="grep.txt.gz">ASCII text compressed
     (28K bytes gzipped)</a>.</li>
 <li><a href="grep.dvi.gz">TeX dvi file
-    (44K bytes gzipped)</a>.</li>
+    (48K bytes gzipped)</a>.</li>
 <li><a href="grep.ps.gz">PostScript file
-    (168K bytes gzipped)</a>.</li>
+    (164K bytes gzipped)</a>.</li>
 <li><a href="grep.pdf">PDF file
     (272K bytes)</a>.</li>
 <li><a href="grep.texi.tar.gz">Texinfo source
-    (24K bytes gzipped tar file).</a></li>
+    (28K bytes gzipped tar file).</a></li>
 </ul>
 
 <p>You can <a href="http://shop.fsf.org/">buy printed copies of
@@ -59,7 +59,7 @@
 Please send broken links and other corrections or suggestions to
 <a href="mailto:bug-grep@gnu.org">&lt;bug-grep@gnu.org&gt;</a>.</p>
 
-<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2012 Free Software Foundation, Inc.</p>
 
 <p>Verbatim copying and distribution of this entire article are
 permitted worldwide, without royalty, in any medium, provided this


From MAILER-DAEMON Fri Mar 02 04:29:23 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Onj-0000fc-Oo
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:23 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36273)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnZ-0000OP-Sd
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:21 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnO-00050o-VT
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:13 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36164)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnO-00050A-LG
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:02 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35886)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnO-0007Ic-05
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:02 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnD-0004mk-7F
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:01 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37552)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnC-0004mW-Td
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:51 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3OnC-00043u-2F
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:50 +0000
Date: Fri, 02 Mar 2012 09:28:50 +0000
Message-Id: <E1S3OnC-00043u-2F@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/index.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:21 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/index.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/index.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/index.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/index.html	2 Mar 2012 09:28:30 -0000	1.10
@@ -1,15 +1,16 @@
 <html lang="en">
 <head>
-<title>GNU Grep 2.9</title>
+<title>GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -32,7 +33,7 @@
 --></style>
 </head>
 <body>
-<h1 class="settitle">GNU Grep 2.9</h1>
+<h1 class="settitle">GNU Grep 2.11</h1>
 <div class="contents">
 <h2>Table of Contents</h2>
 <ul>
@@ -88,13 +89,14 @@
 
 <h2 class="unnumbered">grep</h2>
 
-<p><samp><span class="command">grep</span></samp> prints lines that match a pattern.
+<p><samp><span class="command">grep</span></samp> prints lines that contain a match for a pattern.
 
-   <p>This manual is for version 2.9 of GNU Grep.
+   <p>This manual is for version 2.11 of GNU Grep.
 
    <p>This manual is for <samp><span class="command">grep</span></samp>, a pattern matching engine.
 
-   <p>Copyright &copy; 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+   <p>Copyright &copy; 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
    <blockquote>
 Permission is granted to copy, distribute and/or modify this document


From MAILER-DAEMON Fri Mar 02 04:29:15 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Onb-0000S2-S1
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:15 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36094)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnP-0000GY-QX
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:14 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnI-0004t1-Qj
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:03 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36154)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnI-0004sq-NN
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:56 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35774)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnH-0007I4-Ve
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:56 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omw-0004Y0-Hb
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:55 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37440)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omw-0004Xs-EP
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:34 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3Omv-0003yB-S9
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:33 +0000
Date: Fri, 02 Mar 2012 09:28:33 +0000
Message-Id: <E1S3Omv-0003yB-S9@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/grep.html_node.tar.gz,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:14 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: grep.html_node.tar.gz
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.html_node.tar.gz,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
Binary files /tmp/cvsIfF0m6 and /tmp/cvst39ZkU differ


From MAILER-DAEMON Fri Mar 02 04:29:24 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Onk-0000h6-RU
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:24 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36348)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Ond-0000W3-JJ
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:22 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnT-00055k-1T
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:17 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36172)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnS-00055U-UX
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:06 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35982)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnS-0007JF-Ay
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnB-0004kt-KA
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:05 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37544)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnB-0004km-HO
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:49 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3OnA-00043g-V8
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:49 +0000
Date: Fri, 02 Mar 2012 09:28:48 +0000
Message-Id: <E1S3OnA-00043g-V8@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to
	grep/manual/html_node/The-Backslash-Character-and-Special-Expressions.html,
	v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:22 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/The-Backslash-Character-and-Special-Expressions.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/The-Backslash-Character-and-Special-Expressions.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/The-Backslash-Character-and-Special-Expressions.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/The-Backslash-Character-and-Special-Expressions.html	2 Mar 2012 09:28:30 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>The Backslash Character and Special Expressions - GNU Grep 2.9</title>
+<title>The Backslash Character and Special Expressions - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Regular-Expressions.html#Regular-Expressions" title="Regular Expressions">
@@ -12,7 +12,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -52,21 +53,21 @@
 takes a special meaning:
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">&lsquo;</span><samp><span class="samp">\b</span></samp><span class="samp">&rsquo;</span></samp>&rsquo;<dd>Match the empty string at the edge of a word.
+<dt>&lsquo;<samp><span class="samp">\b</span></samp>&rsquo;<dd>Match the empty string at the edge of a word.
 
-     <br><dt>&lsquo;<samp><span class="samp">&lsquo;</span><samp><span class="samp">\B</span></samp><span class="samp">&rsquo;</span></samp>&rsquo;<dd>Match the empty string provided it's not at the edge of a word.
+     <br><dt>&lsquo;<samp><span class="samp">\B</span></samp>&rsquo;<dd>Match the empty string provided it's not at the edge of a word.
 
-     <br><dt>&lsquo;<samp><span class="samp">&lsquo;</span><samp><span class="samp">\&lt;</span></samp><span class="samp">&rsquo;</span></samp>&rsquo;<dd>Match the empty string at the beginning of word.
+     <br><dt>&lsquo;<samp><span class="samp">\&lt;</span></samp>&rsquo;<dd>Match the empty string at the beginning of word.
 
-     <br><dt>&lsquo;<samp><span class="samp">&lsquo;</span><samp><span class="samp">\&gt;</span></samp><span class="samp">&rsquo;</span></samp>&rsquo;<dd>Match the empty string at the end of word.
+     <br><dt>&lsquo;<samp><span class="samp">\&gt;</span></samp>&rsquo;<dd>Match the empty string at the end of word.
 
-     <br><dt>&lsquo;<samp><span class="samp">&lsquo;</span><samp><span class="samp">\w</span></samp><span class="samp">&rsquo;</span></samp>&rsquo;<dd>Match word constituent, it is a synonym for &lsquo;<samp><span class="samp">[[:alnum:]]</span></samp>&rsquo;.
+     <br><dt>&lsquo;<samp><span class="samp">\w</span></samp>&rsquo;<dd>Match word constituent, it is a synonym for &lsquo;<samp><span class="samp">[_[:alnum:]]</span></samp>&rsquo;.
 
-     <br><dt>&lsquo;<samp><span class="samp">&lsquo;</span><samp><span class="samp">\W</span></samp><span class="samp">&rsquo;</span></samp>&rsquo;<dd>Match non-word constituent, it is a synonym for &lsquo;<samp><span class="samp">[^[:alnum:]]</span></samp>&rsquo;.
+     <br><dt>&lsquo;<samp><span class="samp">\W</span></samp>&rsquo;<dd>Match non-word constituent, it is a synonym for &lsquo;<samp><span class="samp">[^_[:alnum:]]</span></samp>&rsquo;.
 
-     <br><dt>&lsquo;<samp><span class="samp">&lsquo;</span><samp><span class="samp">\s</span></samp><span class="samp">&rsquo;</span></samp>&rsquo;<dd>Match whitespace, it is a synonym for &lsquo;<samp><span class="samp">[[:space:]]</span></samp>&rsquo;.
+     <br><dt>&lsquo;<samp><span class="samp">\s</span></samp>&rsquo;<dd>Match whitespace, it is a synonym for &lsquo;<samp><span class="samp">[[:space:]]</span></samp>&rsquo;.
 
-     <br><dt>&lsquo;<samp><span class="samp">&lsquo;</span><samp><span class="samp">\S</span></samp><span class="samp">&rsquo;</span></samp>&rsquo;<dd>Match non-whitespace, it is a synonym for &lsquo;<samp><span class="samp">[^[:space:]]</span></samp>&rsquo;.
+     <br><dt>&lsquo;<samp><span class="samp">\S</span></samp>&rsquo;<dd>Match non-whitespace, it is a synonym for &lsquo;<samp><span class="samp">[^[:space:]]</span></samp>&rsquo;.
 
    </dl>
 


From MAILER-DAEMON Fri Mar 02 04:29:25 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Onl-0000hk-1N
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:25 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36312)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Onb-0000Qh-Cu
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:23 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnS-00054S-7E
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:14 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36170)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnS-00054E-3d
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:06 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35962)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnR-0007J9-GB
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:05 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnC-0004lm-26
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:04 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37547)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnB-0004l0-UH
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:49 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3OnB-00043k-A1
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:49 +0000
Date: Fri, 02 Mar 2012 09:28:49 +0000
Message-Id: <E1S3OnB-00043k-A1@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Usage.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:23 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Usage.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Usage.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Usage.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Usage.html	2 Mar 2012 09:28:30 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Usage - GNU Grep 2.9</title>
+<title>Usage - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="prev" href="Regular-Expressions.html#Regular-Expressions" title="Regular Expressions">
@@ -11,7 +11,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -45,7 +46,7 @@
 
 <h2 class="chapter">4 Usage</h2>
 
-<p><a name="index-usage_002c-examples-245"></a>Here is an example command that invokes <span class="sc">gnu</span> <samp><span class="command">grep</span></samp>:
+<p><a name="index-usage_002c-examples-245"></a>Here is an example command that invokes GNU <samp><span class="command">grep</span></samp>:
 
 <pre class="example">     grep -i 'hello.*world' menu.h main.c
 </pre>
@@ -53,7 +54,7 @@
 contain the string &lsquo;<samp><span class="samp">hello</span></samp>&rsquo; followed by the string &lsquo;<samp><span class="samp">world</span></samp>&rsquo;;
 this is because &lsquo;<samp><span class="samp">.*</span></samp>&rsquo; matches zero or more characters within a line. 
 See <a href="Regular-Expressions.html#Regular-Expressions">Regular Expressions</a>. 
-The &lsquo;<samp><span class="samp">-i</span></samp>&rsquo; option causes <samp><span class="command">grep</span></samp>
+The <samp><span class="option">-i</span></samp> option causes <samp><span class="command">grep</span></samp>
 to ignore case, causing it to match the line &lsquo;<samp><span class="samp">Hello, world!</span></samp>&rsquo;, which
 it would not otherwise match. 
 See <a href="Invoking.html#Invoking">Invoking</a>, for more details about
@@ -84,13 +85,10 @@
 </pre>
      <p>This differs from the command:
 
-     <pre class="example">          grep -rH 'hello' *.c
+     <pre class="example">          grep -H 'hello' *.c
 </pre>
      <p>which merely looks for &lsquo;<samp><span class="samp">hello</span></samp>&rsquo; in all files in the current
 directory whose names end in &lsquo;<samp><span class="samp">.c</span></samp>&rsquo;. 
-Here the <samp><span class="option">-r</span></samp> is
-probably unnecessary, as recursion occurs only in the unlikely event
-that one of &lsquo;<samp><span class="samp">.c</span></samp>&rsquo; files is a directory. 
 The &lsquo;<samp><span class="samp">find ...</span></samp>&rsquo; command line above is more similar to the command:
 
      <pre class="example">          grep -rH --include='*.c' 'hello' /home/gigi
@@ -100,7 +98,7 @@
      <pre class="example">          grep -e '--cut here--' *
 </pre>
      <p class="noindent">searches for all lines matching &lsquo;<samp><span class="samp">--cut here--</span></samp>&rsquo;. 
-Without &lsquo;<samp><span class="samp">-e</span></samp>&rsquo;,
+Without <samp><span class="option">-e</span></samp>,
 <samp><span class="command">grep</span></samp> would attempt to parse &lsquo;<samp><span class="samp">--cut here--</span></samp>&rsquo; as a list of
 options.
 
@@ -135,7 +133,7 @@
 
      <pre class="example">          /etc/passwd:eli:x:2098:1000:Eli Smith:/home/eli:/bin/bash
 </pre>
-     <p>Alternatively, use &lsquo;<samp><span class="samp">-H</span></samp>&rsquo;, which is a <span class="sc">gnu</span> extension:
+     <p>Alternatively, use <samp><span class="option">-H</span></samp>, which is a GNU extension:
 
      <pre class="example">          grep -H 'eli' /etc/passwd
 </pre>
@@ -156,13 +154,13 @@
      <p>If <samp><span class="command">grep</span></samp> listed all matching &ldquo;lines&rdquo; from a binary file, it
 would probably generate output that is not useful, and it might even
 muck up your display. 
-So <span class="sc">gnu</span> <samp><span class="command">grep</span></samp> suppresses output from
+So GNU <samp><span class="command">grep</span></samp> suppresses output from
 files that appear to be binary files. 
-To force <span class="sc">gnu</span> <samp><span class="command">grep</span></samp>
+To force GNU <samp><span class="command">grep</span></samp>
 to output lines even from files that appear to be binary, use the
-&lsquo;<samp><span class="samp">-a</span></samp>&rsquo; or &lsquo;<samp><span class="samp">--binary-files=text</span></samp>&rsquo; option. 
+<samp><span class="option">-a</span></samp> or &lsquo;<samp><span class="samp">--binary-files=text</span></samp>&rsquo; option. 
 To eliminate the
-&ldquo;Binary file matches&rdquo; messages, use the &lsquo;<samp><span class="samp">-I</span></samp>&rsquo; or
+&ldquo;Binary file matches&rdquo; messages, use the <samp><span class="option">-I</span></samp> or
 &lsquo;<samp><span class="samp">--binary-files=without-match</span></samp>&rsquo; option.
 
      <li>Why doesn't &lsquo;<samp><span class="samp">grep -lv</span></samp>&rsquo; print non-matching file names?
@@ -170,15 +168,27 @@
      <p>&lsquo;<samp><span class="samp">grep -lv</span></samp>&rsquo; lists the names of all files containing one or more
 lines that do not match. 
 To list the names of all files that contain no
-matching lines, use the &lsquo;<samp><span class="samp">-L</span></samp>&rsquo; or &lsquo;<samp><span class="samp">--files-without-match</span></samp>&rsquo;
+matching lines, use the <samp><span class="option">-L</span></samp> or <samp><span class="option">--files-without-match</span></samp>
 option.
 
-     <li>I can do <span class="sc">or</span> with &lsquo;<samp><span class="samp">|</span></samp>&rsquo;, but what about <span class="sc">and</span>?
+     <li>I can do &ldquo;OR&rdquo; with &lsquo;<samp><span class="samp">|</span></samp>&rsquo;, but what about &ldquo;AND&rdquo;?
 
      <pre class="example">          grep 'paul' /etc/motd | grep 'franc,ois'
 </pre>
      <p class="noindent">finds all lines that contain both &lsquo;<samp><span class="samp">paul</span></samp>&rsquo; and &lsquo;<samp><span class="samp">franc,ois</span></samp>&rsquo;.
 
+     <li>Why does the empty pattern match every input line?
+
+     <p>The <samp><span class="command">grep</span></samp> command searches for lines that contain strings
+that match a pattern.  Every line contains the empty string, so an
+empty pattern causes <samp><span class="command">grep</span></samp> to find a match on each line.  It
+is not the only such pattern: &lsquo;<samp><span class="samp">^</span></samp>&rsquo;, &lsquo;<samp><span class="samp">$</span></samp>&rsquo;, &lsquo;<samp><span class="samp">.*</span></samp>&rsquo;, and many
+other patterns cause <samp><span class="command">grep</span></samp> to match every line.
+
+     <p>To match empty lines, use the pattern &lsquo;<samp><span class="samp">^$</span></samp>&rsquo;.  To match blank
+lines, use the pattern &lsquo;<samp><span class="samp">^[[:blank:]]*$</span></samp>&rsquo;.  To match no lines at
+all, use the command &lsquo;<samp><span class="samp">grep -f /dev/null</span></samp>&rsquo;.
+
      <li>How can I search in both standard input and in files?
 
      <p>Use the special file name &lsquo;<samp><span class="samp">-</span></samp>&rsquo;:
@@ -193,7 +203,7 @@
 
      <pre class="example">          grep -w -e '\(.\)\(.\).\2\1' file
 </pre>
-     <p>It matches the word "radar" or "civic".
+     <p>It matches the word &ldquo;radar&rdquo; or &ldquo;civic.&rdquo;
 
      <p>Guglielmo Bondioni proposed a single RE
 that finds all palindromes up to 19 characters long
@@ -201,7 +211,7 @@
 
      <pre class="smallexample">          grep -E -e '^(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?).?\9\8\7\6\5\4\3\2\1$' file
 </pre>
-     <p>Note this is done by using <span class="sc">gnu</span> ERE extensions;
+     <p>Note this is done by using GNU ERE extensions;
 it might not be portable to other implementations of <samp><span class="command">grep</span></samp>.
 
      <li>Why is this back-reference failing?


From MAILER-DAEMON Fri Mar 02 04:29:18 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3One-0000YK-JC
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:18 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36222)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnW-0000KW-Rv
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:16 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnL-0004x9-JN
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:10 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36158)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnL-0004wP-FX
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:59 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35817)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnK-0007IG-OU
	for grep-webcvs-logs@gnu.org; Fri, 02 Mar 2012 04:28:58 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omv-0004XF-C7
	for grep-webcvs-logs@gnu.org; Fri, 02 Mar 2012 04:28:57 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37425)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omv-0004Wz-8P
	for grep-webcvs-logs@gnu.org; Fri, 02 Mar 2012 04:28:33 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3Omu-0003xw-C8
	for grep-webcvs-logs@gnu.org; Fri, 02 Mar 2012 09:28:32 +0000
Date: Fri, 02 Mar 2012 09:28:32 +0000
Message-Id: <E1S3Omu-0003xw-C8@vcs.savannah.gnu.org>
To: grep-webcvs-logs@gnu.org
Subject: grep/manual grep.dvi.gz grep.html grep.html.gz ...
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:16 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Modified files:
	manual         : grep.dvi.gz grep.html grep.html.gz 
	                 grep.html_node.tar.gz grep.info.tar.gz grep.pdf 
	                 grep.ps.gz grep.texi.tar.gz grep.txt 
	                 grep.txt.gz index.html 
	manual/html_node: Anchoring.html 
	                  Back_002dreferences-and-Subexpressions.html 
	                  Basic-vs-Extended.html 
	                  Character-Classes-and-Bracket-Expressions.html 
	                  Command_002dline-Options.html 
	                  Context-Line-Control.html Copying.html 
	                  Environment-Variables.html Exit-Status.html 
	                  File-and-Directory-Selection.html 
	                  Fundamental-Structure.html 
	                  GNU-Free-Documentation-License.html 
	                  General-Output-Control.html 
	                  Generic-Program-Information.html Index.html 
	                  Introduction.html Invoking.html 
	                  Matching-Control.html Other-Options.html 
	                  Output-Line-Prefix-Control.html 
	                  Regular-Expressions.html Reporting-Bugs.html 
	                  The-Backslash-Character-and-Special-Expressions.html 
	                  Usage.html grep-Programs.html index.html 

Log message:
	2.11

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/grep.dvi.gz?cvsroot=grep&rev=1.12
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/grep.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/grep.html.gz?cvsroot=grep&rev=1.12
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/grep.html_node.tar.gz?cvsroot=grep&rev=1.12
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/grep.info.tar.gz?cvsroot=grep&rev=1.12
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/grep.pdf?cvsroot=grep&rev=1.12
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/grep.ps.gz?cvsroot=grep&rev=1.12
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/grep.texi.tar.gz?cvsroot=grep&rev=1.12
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/grep.txt?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/grep.txt.gz?cvsroot=grep&rev=1.12
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/index.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Anchoring.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Back_002dreferences-and-Subexpressions.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Basic-vs-Extended.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Character-Classes-and-Bracket-Expressions.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Command_002dline-Options.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Context-Line-Control.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Copying.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Environment-Variables.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Exit-Status.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/File-and-Directory-Selection.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Fundamental-Structure.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/GNU-Free-Documentation-License.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/General-Output-Control.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Generic-Program-Information.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Index.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Introduction.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Invoking.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Matching-Control.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Other-Options.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Output-Line-Prefix-Control.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Regular-Expressions.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Reporting-Bugs.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/The-Backslash-Character-and-Special-Expressions.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/Usage.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/grep-Programs.html?cvsroot=grep&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/grep/manual/html_node/index.html?cvsroot=grep&r1=1.9&r2=1.10


From MAILER-DAEMON Fri Mar 02 04:29:13 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3OnZ-0000Nh-Aw
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:13 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36076)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnP-0000GW-0L
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:12 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnG-0004qn-Vo
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:02 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36150)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnG-0004qT-S2
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:54 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35742)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnG-0007Hv-3G
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:54 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On3-0004cU-LC
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:53 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37497)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On3-0004cE-IB
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:41 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On3-00040F-28
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:41 +0000
Date: Fri, 02 Mar 2012 09:28:41 +0000
Message-Id: <E1S3On3-00040F-28@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Fundamental-Structure.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:12 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Fundamental-Structure.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Fundamental-Structure.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Fundamental-Structure.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Fundamental-Structure.html	2 Mar 2012 09:28:29 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Fundamental Structure - GNU Grep 2.9</title>
+<title>Fundamental Structure - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Regular-Expressions.html#Regular-Expressions" title="Regular Expressions">
@@ -11,7 +11,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -74,14 +75,15 @@
 
    </dl>
 
-   <p>Two regular expressions may be concatenated;
+   <p>The empty regular expression matches the empty string. 
+Two regular expressions may be concatenated;
 the resulting regular expression
 matches any string formed by concatenating two substrings
 that respectively match the concatenated expressions.
 
    <p>Two regular expressions may be joined by the infix operator &lsquo;<samp><span class="samp">|</span></samp>&rsquo;;
 the resulting regular expression
-matches any string matching either alternalte expression.
+matches any string matching either alternate expression.
 
    <p>Repetition takes precedence over concatenation,
 which in turn takes precedence over alternation. 


From MAILER-DAEMON Fri Mar 02 04:29:22 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Oni-0000cG-5w
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:22 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36179)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnU-0000Iy-6q
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:17 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnK-0004vg-O0
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:07 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36156)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnK-0004uy-JX
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:58 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35808)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnK-0007IE-0C
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:58 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On5-0004ef-Tx
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:57 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37506)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On5-0004eD-Qb
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:43 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On3-00040R-Tw
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:42 +0000
Date: Fri, 02 Mar 2012 09:28:41 +0000
Message-Id: <E1S3On3-00040R-Tw@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Generic-Program-Information.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:18 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Generic-Program-Information.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Generic-Program-Information.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Generic-Program-Information.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Generic-Program-Information.html	2 Mar 2012 09:28:29 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Generic Program Information - GNU Grep 2.9</title>
+<title>Generic Program Information - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Command_002dline-Options.html#Command_002dline-Options" title="Command-line Options">
@@ -11,7 +11,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -45,10 +46,10 @@
 <h4 class="subsection">2.1.1 Generic Program Information</h4>
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">--help</span></samp>&rsquo;<dd><a name="index-g_t_002d_002dhelp-2"></a><a name="index-usage-summary_002c-printing-3"></a>Print a usage message briefly summarizing the command-line options
+<dt><samp><span class="option">--help</span></samp><dd><a name="index-g_t_002d_002dhelp-2"></a><a name="index-usage-summary_002c-printing-3"></a>Print a usage message briefly summarizing the command-line options
 and the bug-reporting address, then exit.
 
-     <br><dt>&lsquo;<samp><span class="samp">-V</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--version</span></samp>&rsquo;<dd><a name="index-g_t_002dV-4"></a><a name="index-g_t_002d_002dversion-5"></a><a name="index-version_002c-printing-6"></a>Print the version number of <samp><span class="command">grep</span></samp> to the standard output stream. 
+     <br><dt><samp><span class="option">-V</span></samp><dt><samp><span class="option">--version</span></samp><dd><a name="index-g_t_002dV-4"></a><a name="index-g_t_002d_002dversion-5"></a><a name="index-version_002c-printing-6"></a>Print the version number of <samp><span class="command">grep</span></samp> to the standard output stream. 
 This version number should be included in all bug reports.
 
 </dl>


From MAILER-DAEMON Fri Mar 02 04:29:22 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Oni-0000dd-Iw
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:22 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36254)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnY-0000MO-Ag
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:19 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnS-00054o-HT
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:11 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36171)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnS-00054W-En
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:06 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35968)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnR-0007JC-RU
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:05 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnB-0004ki-9R
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:04 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37542)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnB-0004kJ-6A
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:49 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3OnA-00043Y-Bt
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:48 +0000
Date: Fri, 02 Mar 2012 09:28:48 +0000
Message-Id: <E1S3OnA-00043Y-Bt@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Reporting-Bugs.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:19 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Reporting-Bugs.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Reporting-Bugs.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Reporting-Bugs.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Reporting-Bugs.html	2 Mar 2012 09:28:30 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Reporting Bugs - GNU Grep 2.9</title>
+<title>Reporting Bugs - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="prev" href="Usage.html#Usage" title="Usage">
@@ -11,7 +11,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,


From MAILER-DAEMON Fri Mar 02 04:29:16 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Onc-0000St-29
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:16 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36199)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnV-0000J8-Ks
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:14 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnL-0004wW-AJ
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:09 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36157)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnL-0004vx-3v
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:28:59 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35813)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnK-0007IF-Dt
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:58 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omz-0004Zp-Tv
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:57 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37467)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omz-0004Zh-RY
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:37 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3Omz-0003z6-7r
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:37 +0000
Date: Fri, 02 Mar 2012 09:28:37 +0000
Message-Id: <E1S3Omz-0003z6-7r@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to
	grep/manual/html_node/Back_002dreferences-and-Subexpressions.html, v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:15 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Back_002dreferences-and-Subexpressions.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Back_002dreferences-and-Subexpressions.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Back_002dreferences-and-Subexpressions.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Back_002dreferences-and-Subexpressions.html	2 Mar 2012 09:28:26 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Back-references and Subexpressions - GNU Grep 2.9</title>
+<title>Back-references and Subexpressions - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Regular-Expressions.html#Regular-Expressions" title="Regular Expressions">
@@ -12,7 +12,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -57,7 +58,7 @@
 For example, &lsquo;<samp><span class="samp">a(.)|b\1</span></samp>&rsquo;
 will not match &lsquo;<samp><span class="samp">ba</span></samp>&rsquo;. 
 When multiple regular expressions are given with
-&lsquo;<samp><span class="samp">-e</span></samp>&rsquo; or from a file (&lsquo;<samp><span class="samp">-f file</span></samp>&rsquo;),
+<samp><span class="option">-e</span></samp> or from a file (&lsquo;<samp><span class="samp">-f </span><var>file</var></samp>&rsquo;),
 back-references are local to each expression.
 
    </body></html>


From MAILER-DAEMON Fri Mar 02 04:29:25 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Onk-0000hP-VY
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:24 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36305)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Ona-0000Q9-Tr
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:22 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnR-00053w-Mg
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:14 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36169)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnR-00053h-JD
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:05 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35953)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnR-0007J7-03
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:05 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On9-0004ig-RE
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:04 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37527)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3On9-0004iN-K5
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:47 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3On9-00041N-1S
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:47 +0000
Date: Fri, 02 Mar 2012 09:28:47 +0000
Message-Id: <E1S3On9-00041N-1S@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Other-Options.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:23 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Other-Options.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Other-Options.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Other-Options.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Other-Options.html	2 Mar 2012 09:28:30 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Other Options - GNU Grep 2.9</title>
+<title>Other Options - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Command_002dline-Options.html#Command_002dline-Options" title="Command-line Options">
@@ -11,7 +11,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -45,31 +46,32 @@
 <h4 class="subsection">2.1.7 Other Options</h4>
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">--line-buffered</span></samp>&rsquo;<dd><a name="index-g_t_002d_002dline_002dbuffered-119"></a><a name="index-line-buffering-120"></a>Use line buffering on output. 
+<dt><samp><span class="option">--line-buffered</span></samp><dd><a name="index-g_t_002d_002dline_002dbuffered-119"></a><a name="index-line-buffering-120"></a>Use line buffering on output. 
 This can cause a performance penalty.
 
-     <br><dt>&lsquo;<samp><span class="samp">--mmap</span></samp>&rsquo;<dd><a name="index-g_t_002d_002dmmap-121"></a><a name="index-memory-mapped-input-122"></a>This option is ignored for backwards compatibility.  It used to read
+     <br><dt><samp><span class="option">--mmap</span></samp><dd><a name="index-g_t_002d_002dmmap-121"></a><a name="index-memory-mapped-input-122"></a>This option is deprecated and now elicits a warning, but is otherwise a no-op. 
+It used to make <samp><span class="command">grep</span></samp> read
 input with the <code>mmap</code> system call, instead of the default <code>read</code>
 system call.  On modern systems, <code>mmap</code> would rarely if ever yield
 better performance.
 
-     <br><dt>&lsquo;<samp><span class="samp">-U</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--binary</span></samp>&rsquo;<dd><a name="index-g_t_002dU-123"></a><a name="index-g_t_002d_002dbinary-124"></a><a name="index-g_t_0040sc_007bms_002ddos_007d_002f_0040sc_007bms_007d_002dWindows-binary-files-125"></a><a name="index-binary-files_002c-_0040sc_007bms_002ddos_007d_002f_0040sc_007bms_007d_002dWindows-126"></a>Treat the file(s) as binary. 
-By default, under <span class="sc">ms-dos</span> and <span class="sc">ms</span>-Windows,
+     <br><dt><samp><span class="option">-U</span></samp><dt><samp><span class="option">--binary</span></samp><dd><a name="index-g_t_002dU-123"></a><a name="index-g_t_002d_002dbinary-124"></a><a name="index-MS_002dDOS_002fMS_002dWindows-binary-files-125"></a><a name="index-binary-files_002c-MS_002dDOS_002fMS_002dWindows-126"></a>Treat the file(s) as binary. 
+By default, under MS-DOS and MS-Windows,
 <samp><span class="command">grep</span></samp> guesses the file type
 by looking at the contents of the first 32kB read from the file. 
 If <samp><span class="command">grep</span></samp> decides the file is a text file,
 it strips the <code>CR</code> characters from the original file contents
 (to make regular expressions with <code>^</code> and <code>$</code> work correctly). 
-Specifying &lsquo;<samp><span class="samp">-U</span></samp>&rsquo; overrules this guesswork,
+Specifying <samp><span class="option">-U</span></samp> overrules this guesswork,
 causing all files to be read and passed to the matching mechanism verbatim;
 if the file is a text file with <code>CR/LF</code> pairs at the end of each line,
 this will cause some regular expressions to fail. 
 This option has no effect
-on platforms other than <span class="sc">ms-dos</span> and <span class="sc">ms</span>-Windows.
+on platforms other than MS-DOS and MS-Windows.
 
-     <br><dt>&lsquo;<samp><span class="samp">-z</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--null-data</span></samp>&rsquo;<dd><a name="index-g_t_002dz-127"></a><a name="index-g_t_002d_002dnull_002ddata-128"></a><a name="index-zero_002dterminated-lines-129"></a>Treat the input as a set of lines, each terminated by a zero byte (the
-<span class="sc">ascii</span> <code>NUL</code> character) instead of a newline. 
-Like the &lsquo;<samp><span class="samp">-Z</span></samp>&rsquo; or &lsquo;<samp><span class="samp">--null</span></samp>&rsquo; option,
+     <br><dt><samp><span class="option">-z</span></samp><dt><samp><span class="option">--null-data</span></samp><dd><a name="index-g_t_002dz-127"></a><a name="index-g_t_002d_002dnull_002ddata-128"></a><a name="index-zero_002dterminated-lines-129"></a>Treat the input as a set of lines, each terminated by a zero byte (the
+ASCII <code>NUL</code> character) instead of a newline. 
+Like the <samp><span class="option">-Z</span></samp> or <samp><span class="option">--null</span></samp> option,
 this option can be used with commands like
 &lsquo;<samp><span class="samp">sort -z</span></samp>&rsquo; to process arbitrary file names.
 


From MAILER-DAEMON Fri Mar 02 04:29:17 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Ond-0000VW-7I
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:17 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36207)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnW-0000JI-0f
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:15 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnP-00051w-Oj
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:09 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36167)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnP-00051e-Ln
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:03 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35907)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnP-0007Iz-3I
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:03 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omz-0004Zb-IG
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:02 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37464)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omz-0004ZV-F3
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:37 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3Omy-0003yz-TW
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:37 +0000
Date: Fri, 02 Mar 2012 09:28:36 +0000
Message-Id: <E1S3Omy-0003yz-TW@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/html_node/Anchoring.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:16 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: html_node/Anchoring.html
===================================================================
RCS file: /webcvs/grep/grep/manual/html_node/Anchoring.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- html_node/Anchoring.html	25 Jun 2011 09:28:45 -0000	1.9
+++ html_node/Anchoring.html	2 Mar 2012 09:28:26 -0000	1.10
@@ -1,8 +1,8 @@
 <html lang="en">
 <head>
-<title>Anchoring - GNU Grep 2.9</title>
+<title>Anchoring - GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="start" href="index.html#Top">
 <link rel="up" href="Regular-Expressions.html#Regular-Expressions" title="Regular Expressions">
@@ -12,7 +12,8 @@
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -49,6 +50,8 @@
 <p><a name="index-anchoring-240"></a>
 The caret &lsquo;<samp><span class="samp">^</span></samp>&rsquo; and the dollar sign &lsquo;<samp><span class="samp">$</span></samp>&rsquo; are meta-characters that
 respectively match the empty string at the beginning and end of a line.
+They are termed <dfn>anchors</dfn>, since they force the match to be &ldquo;anchored&rdquo;
+to beginning or end of a line, respectively.
 
    </body></html>
 


From MAILER-DAEMON Fri Mar 02 04:29:41 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Oo1-0000jt-4R
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:41 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36437)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Onn-0000iZ-Jp
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:39 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnV-00056y-9T
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:27 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36174)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnV-00056d-3L
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:09 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36014)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnU-0007JP-Au
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:08 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omw-0004Xe-0B
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:07 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37431)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omv-0004XK-Nx
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:33 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3Omv-0003y4-8X
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:33 +0000
Date: Fri, 02 Mar 2012 09:28:33 +0000
Message-Id: <E1S3Omv-0003y4-8X@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/grep.html,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:39 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: grep.html
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- grep.html	25 Jun 2011 09:28:43 -0000	1.9
+++ grep.html	2 Mar 2012 09:28:23 -0000	1.10
@@ -1,15 +1,16 @@
 <html lang="en">
 <head>
-<title>GNU Grep 2.9</title>
+<title>GNU Grep 2.11</title>
 <meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="GNU Grep 2.9">
+<meta name="description" content="GNU Grep 2.11">
 <meta name="generator" content="makeinfo 4.13">
 <link title="Top" rel="top" href="#Top">
 <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
 <!--
 This manual is for `grep', a pattern matching engine.
 
-Copyright (C) 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+Copyright (C) 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU Free Documentation License,
@@ -32,8 +33,8 @@
 --></style>
 </head>
 <body>
-<h1 class="settitle">GNU Grep 2.9</h1>
-<div class="contents">
+<h1 class="settitle">GNU Grep 2.11</h1>
+   <div class="contents">
 <h2>Table of Contents</h2>
 <ul>
 <li><a name="toc_Top" href="#Top">grep</a>
@@ -88,13 +89,14 @@
 
 <h2 class="unnumbered">grep</h2>
 
-<p><samp><span class="command">grep</span></samp> prints lines that match a pattern.
+<p><samp><span class="command">grep</span></samp> prints lines that contain a match for a pattern.
 
-   <p>This manual is for version 2.9 of GNU Grep.
+   <p>This manual is for version 2.11 of GNU Grep.
 
    <p>This manual is for <samp><span class="command">grep</span></samp>, a pattern matching engine.
 
-   <p>Copyright &copy; 1999-2002, 2005, 2008-2011 Free Software Foundation, Inc.
+   <p>Copyright &copy; 1999-2002, 2005, 2008-2012 Free Software Foundation,
+Inc.
 
    <blockquote>
 Permission is granted to copy, distribute and/or modify this document
@@ -127,7 +129,7 @@
 <h2 class="chapter">1 Introduction</h2>
 
 <p><a name="index-searching-for-a-pattern-1"></a>
-<samp><span class="command">grep</span></samp> searches the input files
+<samp><span class="command">grep</span></samp> searches input files
 for lines containing a match to a given pattern list. 
 When it finds a match in a line,
 it copies the line to standard output (by default),
@@ -183,13 +185,13 @@
 <h3 class="section">2.1 Command-line Options</h3>
 
 <p><samp><span class="command">grep</span></samp> comes with a rich set of options:
-some from <span class="sc">posix.2</span> and some being <span class="sc">gnu</span> extensions. 
-Long option names are always a <span class="sc">gnu</span> extension,
-even for options that are from <span class="sc">posix</span> specifications. 
-Options that are specified by <span class="sc">posix</span>,
+some from POSIX and some being GNU extensions. 
+Long option names are always a GNU extension,
+even for options that are from POSIX specifications. 
+Options that are specified by POSIX,
 under their short names,
 are explicitly marked as such
-to facilitate <span class="sc">posix</span>-portable programming. 
+to facilitate POSIX-portable programming. 
 A few option names are provided
 for compatibility with older or more exotic implementations.
 
@@ -218,10 +220,10 @@
 <h4 class="subsection">2.1.1 Generic Program Information</h4>
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">--help</span></samp>&rsquo;<dd><a name="index-g_t_002d_002dhelp-2"></a><a name="index-usage-summary_002c-printing-3"></a>Print a usage message briefly summarizing the command-line options
+<dt><samp><span class="option">--help</span></samp><dd><a name="index-g_t_002d_002dhelp-2"></a><a name="index-usage-summary_002c-printing-3"></a>Print a usage message briefly summarizing the command-line options
 and the bug-reporting address, then exit.
 
-     <br><dt>&lsquo;<samp><span class="samp">-V</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--version</span></samp>&rsquo;<dd><a name="index-g_t_002dV-4"></a><a name="index-g_t_002d_002dversion-5"></a><a name="index-version_002c-printing-6"></a>Print the version number of <samp><span class="command">grep</span></samp> to the standard output stream. 
+     <br><dt><samp><span class="option">-V</span></samp><dt><samp><span class="option">--version</span></samp><dd><a name="index-g_t_002dV-4"></a><a name="index-g_t_002d_002dversion-5"></a><a name="index-version_002c-printing-6"></a>Print the version number of <samp><span class="command">grep</span></samp> to the standard output stream. 
 This version number should be included in all bug reports.
 
 </dl>
@@ -238,23 +240,23 @@
 <h4 class="subsection">2.1.2 Matching Control</h4>
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">-e </span><var>pattern</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--regexp=</span><var>pattern</var></samp>&rsquo;<dd><a name="index-g_t_002de-7"></a><a name="index-g_t_002d_002dregexp_003d_0040var_007bpattern_007d-8"></a><a name="index-pattern-list-9"></a>Use <var>pattern</var> as the pattern. 
+<dt><samp><span class="option">-e </span><var>pattern</var></samp><dt><samp><span class="option">--regexp=</span><var>pattern</var></samp><dd><a name="index-g_t_002de-7"></a><a name="index-g_t_002d_002dregexp_003d_0040var_007bpattern_007d-8"></a><a name="index-pattern-list-9"></a>Use <var>pattern</var> as the pattern. 
 This can be used to specify multiple search patterns,
 or to protect a pattern beginning with a &lsquo;<samp><span class="samp">-</span></samp>&rsquo;. 
-(&lsquo;<samp><span class="samp">-e</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+(<samp><span class="option">-e</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-f </span><var>file</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--file=</span><var>file</var></samp>&rsquo;<dd><a name="index-g_t_002df-10"></a><a name="index-g_t_002d_002dfile-11"></a><a name="index-pattern-from-file-12"></a>Obtain patterns from <var>file</var>, one per line. 
+     <br><dt><samp><span class="option">-f </span><var>file</var></samp><dt><samp><span class="option">--file=</span><var>file</var></samp><dd><a name="index-g_t_002df-10"></a><a name="index-g_t_002d_002dfile-11"></a><a name="index-pattern-from-file-12"></a>Obtain patterns from <var>file</var>, one per line. 
 The empty file contains zero patterns, and therefore matches nothing. 
-(&lsquo;<samp><span class="samp">-f</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+(<samp><span class="option">-f</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-i</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">-y</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--ignore-case</span></samp>&rsquo;<dd><a name="index-g_t_002di-13"></a><a name="index-g_t_002dy-14"></a><a name="index-g_t_002d_002dignore_002dcase-15"></a><a name="index-case-insensitive-search-16"></a>Ignore case distinctions in both the pattern and the input files. 
-&lsquo;<samp><span class="samp">-y</span></samp>&rsquo; is an obsolete synonym that is provided for compatibility. 
-(&lsquo;<samp><span class="samp">-i</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+     <br><dt><samp><span class="option">-i</span></samp><dt><samp><span class="option">-y</span></samp><dt><samp><span class="option">--ignore-case</span></samp><dd><a name="index-g_t_002di-13"></a><a name="index-g_t_002dy-14"></a><a name="index-g_t_002d_002dignore_002dcase-15"></a><a name="index-case-insensitive-search-16"></a>Ignore case distinctions in both the pattern and the input files. 
+<samp><span class="option">-y</span></samp> is an obsolete synonym that is provided for compatibility. 
+(<samp><span class="option">-i</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-v</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--invert-match</span></samp>&rsquo;<dd><a name="index-g_t_002dv-17"></a><a name="index-g_t_002d_002dinvert_002dmatch-18"></a><a name="index-invert-matching-19"></a><a name="index-print-non_002dmatching-lines-20"></a>Invert the sense of matching, to select non-matching lines. 
-(&lsquo;<samp><span class="samp">-v</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+     <br><dt><samp><span class="option">-v</span></samp><dt><samp><span class="option">--invert-match</span></samp><dd><a name="index-g_t_002dv-17"></a><a name="index-g_t_002d_002dinvert_002dmatch-18"></a><a name="index-invert-matching-19"></a><a name="index-print-non_002dmatching-lines-20"></a>Invert the sense of matching, to select non-matching lines. 
+(<samp><span class="option">-v</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-w</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--word-regexp</span></samp>&rsquo;<dd><a name="index-g_t_002dw-21"></a><a name="index-g_t_002d_002dword_002dregexp-22"></a><a name="index-matching-whole-words-23"></a>Select only those lines containing matches that form whole words. 
+     <br><dt><samp><span class="option">-w</span></samp><dt><samp><span class="option">--word-regexp</span></samp><dd><a name="index-g_t_002dw-21"></a><a name="index-g_t_002d_002dword_002dregexp-22"></a><a name="index-matching-whole-words-23"></a>Select only those lines containing matches that form whole words. 
 The test is that the matching substring must either
 be at the beginning of the line,
 or preceded by a non-word constituent character. 
@@ -263,8 +265,8 @@
 or followed by a non-word constituent character. 
 Word-constituent characters are letters, digits, and the underscore.
 
-     <br><dt>&lsquo;<samp><span class="samp">-x</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--line-regexp</span></samp>&rsquo;<dd><a name="index-g_t_002dx-24"></a><a name="index-g_t_002d_002dline_002dregexp-25"></a><a name="index-match-the-whole-line-26"></a>Select only those matches that exactly match the whole line. 
-(&lsquo;<samp><span class="samp">-x</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+     <br><dt><samp><span class="option">-x</span></samp><dt><samp><span class="option">--line-regexp</span></samp><dd><a name="index-g_t_002dx-24"></a><a name="index-g_t_002d_002dline_002dregexp-25"></a><a name="index-match-the-whole-line-26"></a>Select only those matches that exactly match the whole line. 
+(<samp><span class="option">-x</span></samp> is specified by POSIX.)
 
 </dl>
 
@@ -280,38 +282,38 @@
 <h4 class="subsection">2.1.3 General Output Control</h4>
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">-c</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--count</span></samp>&rsquo;<dd><a name="index-g_t_002dc-27"></a><a name="index-g_t_002d_002dcount-28"></a><a name="index-counting-lines-29"></a>Suppress normal output;
+<dt><samp><span class="option">-c</span></samp><dt><samp><span class="option">--count</span></samp><dd><a name="index-g_t_002dc-27"></a><a name="index-g_t_002d_002dcount-28"></a><a name="index-counting-lines-29"></a>Suppress normal output;
 instead print a count of matching lines for each input file. 
-With the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo;, &lsquo;<samp><span class="samp">--invert-match</span></samp>&rsquo; option,
+With the <samp><span class="option">-v</span></samp> (<samp><span class="option">--invert-match</span></samp>) option,
 count non-matching lines. 
-(&lsquo;<samp><span class="samp">-c</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+(<samp><span class="option">-c</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">--color[=</span><var>WHEN</var><span class="samp">]</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--colour[=</span><var>WHEN</var><span class="samp">]</span></samp>&rsquo;<dd><a name="index-g_t_002d_002dcolor-30"></a><a name="index-g_t_002d_002dcolour-31"></a><a name="index-highlight_002c-color_002c-colour-32"></a>Surround the matched (non-empty) strings, matching lines, context lines,
+     <br><dt><samp><span class="option">--color[=</span><var>WHEN</var><span class="option">]</span></samp><dt><samp><span class="option">--colour[=</span><var>WHEN</var><span class="option">]</span></samp><dd><a name="index-g_t_002d_002dcolor-30"></a><a name="index-g_t_002d_002dcolour-31"></a><a name="index-highlight_002c-color_002c-colour-32"></a>Surround the matched (non-empty) strings, matching lines, context lines,
 file names, line numbers, byte offsets, and separators (for fields and
 groups of context lines) with escape sequences to display them in color
 on the terminal. 
-The colors are defined by the environment variable <var>GREP_COLORS</var>
+The colors are defined by the environment variable <samp><span class="env">GREP_COLORS</span></samp>
 and default to &lsquo;<samp><span class="samp">ms=01;31:mc=01;31:sl=:cx=:fn=35:ln=32:bn=32:se=36</span></samp>&rsquo;
 for bold red matched text, magenta file names, green line numbers,
 green byte offsets, cyan separators, and default terminal colors otherwise. 
-The deprecated environment variable <var>GREP_COLOR</var> is still supported,
+The deprecated environment variable <samp><span class="env">GREP_COLOR</span></samp> is still supported,
 but its setting does not have priority;
 it defaults to `01;31' (bold red)
 which only covers the color for matched text. 
 <var>WHEN</var> is &lsquo;<samp><span class="samp">never</span></samp>&rsquo;, &lsquo;<samp><span class="samp">always</span></samp>&rsquo;, or &lsquo;<samp><span class="samp">auto</span></samp>&rsquo;.
 
-     <br><dt>&lsquo;<samp><span class="samp">-L</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--files-without-match</span></samp>&rsquo;<dd><a name="index-g_t_002dL-33"></a><a name="index-g_t_002d_002dfiles_002dwithout_002dmatch-34"></a><a name="index-files-which-don_0027t-match-35"></a>Suppress normal output;
+     <br><dt><samp><span class="option">-L</span></samp><dt><samp><span class="option">--files-without-match</span></samp><dd><a name="index-g_t_002dL-33"></a><a name="index-g_t_002d_002dfiles_002dwithout_002dmatch-34"></a><a name="index-files-which-don_0027t-match-35"></a>Suppress normal output;
 instead print the name of each input file from which
 no output would normally have been printed. 
-The scanning of every file will stop on the first match.
+The scanning of each file stops on the first match.
 
-     <br><dt>&lsquo;<samp><span class="samp">-l</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--files-with-matches</span></samp>&rsquo;<dd><a name="index-g_t_002dl-36"></a><a name="index-g_t_002d_002dfiles_002dwith_002dmatches-37"></a><a name="index-names-of-matching-files-38"></a>Suppress normal output;
+     <br><dt><samp><span class="option">-l</span></samp><dt><samp><span class="option">--files-with-matches</span></samp><dd><a name="index-g_t_002dl-36"></a><a name="index-g_t_002d_002dfiles_002dwith_002dmatches-37"></a><a name="index-names-of-matching-files-38"></a>Suppress normal output;
 instead print the name of each input file from which
 output would normally have been printed. 
-The scanning of every file will stop on the first match. 
-(&lsquo;<samp><span class="samp">-l</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+The scanning of each file stops on the first match. 
+(<samp><span class="option">-l</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-m </span><var>num</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--max-count=</span><var>num</var></samp>&rsquo;<dd><a name="index-g_t_002dm-39"></a><a name="index-g_t_002d_002dmax_002dcount-40"></a><a name="index-max_002dcount-41"></a>Stop reading a file after <var>num</var> matching lines. 
+     <br><dt><samp><span class="option">-m </span><var>num</var></samp><dt><samp><span class="option">--max-count=</span><var>num</var></samp><dd><a name="index-g_t_002dm-39"></a><a name="index-g_t_002d_002dmax_002dcount-40"></a><a name="index-max_002dcount-41"></a>Stop reading a file after <var>num</var> matching lines. 
 If the input is standard input from a regular file,
 and <var>num</var> matching lines are output,
 <samp><span class="command">grep</span></samp> ensures that the standard input is positioned
@@ -339,33 +341,33 @@
 it outputs any trailing context lines. 
 Since context does not include matching lines,
 <samp><span class="command">grep</span></samp> will stop when it encounters another matching line. 
-When the &lsquo;<samp><span class="samp">-c</span></samp>&rsquo; or &lsquo;<samp><span class="samp">--count</span></samp>&rsquo; option is also used,
+When the <samp><span class="option">-c</span></samp> or <samp><span class="option">--count</span></samp> option is also used,
 <samp><span class="command">grep</span></samp> does not output a count greater than <var>num</var>. 
-When the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; or &lsquo;<samp><span class="samp">--invert-match</span></samp>&rsquo; option is also used,
+When the <samp><span class="option">-v</span></samp> or <samp><span class="option">--invert-match</span></samp> option is also used,
 <samp><span class="command">grep</span></samp> stops after outputting <var>num</var> non-matching lines.
 
-     <br><dt>&lsquo;<samp><span class="samp">-o</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--only-matching</span></samp>&rsquo;<dd><a name="index-g_t_002do-42"></a><a name="index-g_t_002d_002donly_002dmatching-43"></a><a name="index-only-matching-44"></a>Print only the matched (non-empty) parts of matching lines,
+     <br><dt><samp><span class="option">-o</span></samp><dt><samp><span class="option">--only-matching</span></samp><dd><a name="index-g_t_002do-42"></a><a name="index-g_t_002d_002donly_002dmatching-43"></a><a name="index-only-matching-44"></a>Print only the matched (non-empty) parts of matching lines,
 with each such part on a separate output line.
 
-     <br><dt>&lsquo;<samp><span class="samp">-q</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--quiet</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--silent</span></samp>&rsquo;<dd><a name="index-g_t_002dq-45"></a><a name="index-g_t_002d_002dquiet-46"></a><a name="index-g_t_002d_002dsilent-47"></a><a name="index-quiet_002c-silent-48"></a>Quiet; do not write anything to standard output. 
+     <br><dt><samp><span class="option">-q</span></samp><dt><samp><span class="option">--quiet</span></samp><dt><samp><span class="option">--silent</span></samp><dd><a name="index-g_t_002dq-45"></a><a name="index-g_t_002d_002dquiet-46"></a><a name="index-g_t_002d_002dsilent-47"></a><a name="index-quiet_002c-silent-48"></a>Quiet; do not write anything to standard output. 
 Exit immediately with zero status if any match is found,
 even if an error was detected. 
-Also see the &lsquo;<samp><span class="samp">-s</span></samp>&rsquo; or &lsquo;<samp><span class="samp">--no-messages</span></samp>&rsquo; option. 
-(&lsquo;<samp><span class="samp">-q</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+Also see the <samp><span class="option">-s</span></samp> or <samp><span class="option">--no-messages</span></samp> option. 
+(<samp><span class="option">-q</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-s</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--no-messages</span></samp>&rsquo;<dd><a name="index-g_t_002ds-49"></a><a name="index-g_t_002d_002dno_002dmessages-50"></a><a name="index-suppress-error-messages-51"></a>Suppress error messages about nonexistent or unreadable files. 
+     <br><dt><samp><span class="option">-s</span></samp><dt><samp><span class="option">--no-messages</span></samp><dd><a name="index-g_t_002ds-49"></a><a name="index-g_t_002d_002dno_002dmessages-50"></a><a name="index-suppress-error-messages-51"></a>Suppress error messages about nonexistent or unreadable files. 
 Portability note:
-unlike <span class="sc">gnu</span> <samp><span class="command">grep</span></samp>,
-7th Edition Unix <samp><span class="command">grep</span></samp> did not conform to <span class="sc">posix</span>,
-because it lacked &lsquo;<samp><span class="samp">-q</span></samp>&rsquo;
-and its &lsquo;<samp><span class="samp">-s</span></samp>&rsquo; option behaved like
-<span class="sc">gnu</span> <samp><span class="command">grep</span></samp>'s &lsquo;<samp><span class="samp">-q</span></samp>&rsquo; option. 
-<span class="sc">usg</span>-style <samp><span class="command">grep</span></samp> also lacked &lsquo;<samp><span class="samp">-q</span></samp>&rsquo;
-but its &lsquo;<samp><span class="samp">-s</span></samp>&rsquo; option behaved like <span class="sc">gnu</span> <samp><span class="command">grep</span></samp>'s. 
+unlike GNU <samp><span class="command">grep</span></samp>,
+7th Edition Unix <samp><span class="command">grep</span></samp> did not conform to POSIX,
+because it lacked <samp><span class="option">-q</span></samp>
+and its <samp><span class="option">-s</span></samp> option behaved like
+GNU <samp><span class="command">grep</span></samp>'s <samp><span class="option">-q</span></samp> option.<a rel="footnote" href="#fn-1" name="fnd-1"><sup>1</sup></a>
+USG-style <samp><span class="command">grep</span></samp> also lacked <samp><span class="option">-q</span></samp>
+but its <samp><span class="option">-s</span></samp> option behaved like GNU <samp><span class="command">grep</span></samp>'s. 
 Portable shell scripts should avoid both
-&lsquo;<samp><span class="samp">-q</span></samp>&rsquo; and &lsquo;<samp><span class="samp">-s</span></samp>&rsquo; and should redirect
+<samp><span class="option">-q</span></samp> and <samp><span class="option">-s</span></samp> and should redirect
 standard and error output to <samp><span class="file">/dev/null</span></samp> instead. 
-(&lsquo;<samp><span class="samp">-s</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+(<samp><span class="option">-s</span></samp> is specified by POSIX.)
 
 </dl>
 
@@ -385,51 +387,51 @@
 regardless of the order in which these options were specified.
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">-b</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--byte-offset</span></samp>&rsquo;<dd><a name="index-g_t_002db-52"></a><a name="index-g_t_002d_002dbyte_002doffset-53"></a><a name="index-byte-offset-54"></a>Print the 0-based byte offset within the input file
+<dt><samp><span class="option">-b</span></samp><dt><samp><span class="option">--byte-offset</span></samp><dd><a name="index-g_t_002db-52"></a><a name="index-g_t_002d_002dbyte_002doffset-53"></a><a name="index-byte-offset-54"></a>Print the 0-based byte offset within the input file
 before each line of output. 
-If &lsquo;<samp><span class="samp">-o</span></samp>&rsquo; (&lsquo;<samp><span class="samp">--only-matching</span></samp>&rsquo;) is specified,
+If <samp><span class="option">-o</span></samp> (<samp><span class="option">--only-matching</span></samp>) is specified,
 print the offset of the matching part itself. 
-When <samp><span class="command">grep</span></samp> runs on <span class="sc">ms-dos</span> or <span class="sc">ms</span>-Windows,
+When <samp><span class="command">grep</span></samp> runs on MS-DOS or MS-Windows,
 the printed byte offsets depend on whether
-the &lsquo;<samp><span class="samp">-u</span></samp>&rsquo; (&lsquo;<samp><span class="samp">--unix-byte-offsets</span></samp>&rsquo;) option is used;
+the <samp><span class="option">-u</span></samp> (<samp><span class="option">--unix-byte-offsets</span></samp>) option is used;
 see below.
 
-     <br><dt>&lsquo;<samp><span class="samp">-H</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--with-filename</span></samp>&rsquo;<dd><a name="index-g_t_002dH-55"></a><a name="index-g_t_002d_002dwith_002dfilename-56"></a><a name="index-with-filename-prefix-57"></a>Print the file name for each match. 
+     <br><dt><samp><span class="option">-H</span></samp><dt><samp><span class="option">--with-filename</span></samp><dd><a name="index-g_t_002dH-55"></a><a name="index-g_t_002d_002dwith_002dfilename-56"></a><a name="index-with-filename-prefix-57"></a>Print the file name for each match. 
 This is the default when there is more than one file to search.
 
-     <br><dt>&lsquo;<samp><span class="samp">-h</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--no-filename</span></samp>&rsquo;<dd><a name="index-g_t_002dh-58"></a><a name="index-g_t_002d_002dno_002dfilename-59"></a><a name="index-no-filename-prefix-60"></a>Suppress the prefixing of file names on output. 
+     <br><dt><samp><span class="option">-h</span></samp><dt><samp><span class="option">--no-filename</span></samp><dd><a name="index-g_t_002dh-58"></a><a name="index-g_t_002d_002dno_002dfilename-59"></a><a name="index-no-filename-prefix-60"></a>Suppress the prefixing of file names on output. 
 This is the default when there is only one file
 (or only standard input) to search.
 
-     <br><dt>&lsquo;<samp><span class="samp">--label=</span><var>LABEL</var></samp>&rsquo;<dd><a name="index-g_t_002d_002dlabel-61"></a><a name="index-changing-name-of-standard-input-62"></a>Display input actually coming from standard input
+     <br><dt><samp><span class="option">--label=</span><var>LABEL</var></samp><dd><a name="index-g_t_002d_002dlabel-61"></a><a name="index-changing-name-of-standard-input-62"></a>Display input actually coming from standard input
 as input coming from file <var>LABEL</var>.  This is
 especially useful when implementing tools like
 <samp><span class="command">zgrep</span></samp>; e.g.:
 
      <pre class="example">          gzip -cd foo.gz | grep --label=foo -H something
 </pre>
-     <br><dt>&lsquo;<samp><span class="samp">-n</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--line-number</span></samp>&rsquo;<dd><a name="index-g_t_002dn-63"></a><a name="index-g_t_002d_002dline_002dnumber-64"></a><a name="index-line-numbering-65"></a>Prefix each line of output with the 1-based line number within its input file. 
-(&lsquo;<samp><span class="samp">-n</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+     <br><dt><samp><span class="option">-n</span></samp><dt><samp><span class="option">--line-number</span></samp><dd><a name="index-g_t_002dn-63"></a><a name="index-g_t_002d_002dline_002dnumber-64"></a><a name="index-line-numbering-65"></a>Prefix each line of output with the 1-based line number within its input file. 
+(<samp><span class="option">-n</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-T</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--initial-tab</span></samp>&rsquo;<dd><a name="index-g_t_002dT-66"></a><a name="index-g_t_002d_002dinitial_002dtab-67"></a><a name="index-tab_002daligned-content-lines-68"></a>Make sure that the first character of actual line content lies on a tab stop,
+     <br><dt><samp><span class="option">-T</span></samp><dt><samp><span class="option">--initial-tab</span></samp><dd><a name="index-g_t_002dT-66"></a><a name="index-g_t_002d_002dinitial_002dtab-67"></a><a name="index-tab_002daligned-content-lines-68"></a>Make sure that the first character of actual line content lies on a tab stop,
 so that the alignment of tabs looks normal. 
 This is useful with options that prefix their output to the actual content:
-&lsquo;<samp><span class="samp">-H</span></samp>&rsquo;, &lsquo;<samp><span class="samp">-n</span></samp>&rsquo;, and &lsquo;<samp><span class="samp">-b</span></samp>&rsquo;. 
+<samp><span class="option">-H</span></samp>, <samp><span class="option">-n</span></samp>, and <samp><span class="option">-b</span></samp>. 
 In order to improve the probability that lines
 from a single file will all start at the same column,
 this also causes the line number and byte offset (if present)
 to be printed in a minimum-size field width.
 
-     <br><dt>&lsquo;<samp><span class="samp">-u</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--unix-byte-offsets</span></samp>&rsquo;<dd><a name="index-g_t_002du-69"></a><a name="index-g_t_002d_002dunix_002dbyte_002doffsets-70"></a><a name="index-g_t_0040sc_007bms_002ddos_007d_002f_0040sc_007bms_007d_002dWindows-byte-offsets-71"></a><a name="index-byte-offsets_002c-on-_0040sc_007bms_002ddos_007d_002f_0040sc_007bms_007d_002dWindows-72"></a>Report Unix-style byte offsets. 
+     <br><dt><samp><span class="option">-u</span></samp><dt><samp><span class="option">--unix-byte-offsets</span></samp><dd><a name="index-g_t_002du-69"></a><a name="index-g_t_002d_002dunix_002dbyte_002doffsets-70"></a><a name="index-MS_002dDOS_002fMS_002dWindows-byte-offsets-71"></a><a name="index-byte-offsets_002c-on-MS_002dDOS_002fMS_002dWindows-72"></a>Report Unix-style byte offsets. 
 This option causes <samp><span class="command">grep</span></samp> to report byte offsets
 as if the file were a Unix-style text file,
 i.e., the byte offsets ignore the <code>CR</code> characters that were stripped. 
 This will produce results identical
 to running <samp><span class="command">grep</span></samp> on a Unix machine. 
-This option has no effect unless the &lsquo;<samp><span class="samp">-b</span></samp>&rsquo; option is also used;
-it has no effect on platforms other than <span class="sc">ms-dos</span> and <span class="sc">ms</span>-Windows.
+This option has no effect unless the <samp><span class="option">-b</span></samp> option is also used;
+it has no effect on platforms other than MS-DOS and MS-Windows.
 
-     <br><dt>&lsquo;<samp><span class="samp">-Z</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--null</span></samp>&rsquo;<dd><a name="index-g_t_002dZ-73"></a><a name="index-g_t_002d_002dnull-74"></a><a name="index-zero_002dterminated-file-names-75"></a>Output a zero byte (the <span class="sc">ascii</span> <code>NUL</code> character)
+     <br><dt><samp><span class="option">-Z</span></samp><dt><samp><span class="option">--null</span></samp><dd><a name="index-g_t_002dZ-73"></a><a name="index-g_t_002d_002dnull-74"></a><a name="index-zero_002dterminated-file-names-75"></a>Output a zero byte (the ASCII <code>NUL</code> character)
 instead of the character that normally follows a file name. 
 For example,
 &lsquo;<samp><span class="samp">grep -lZ</span></samp>&rsquo; outputs a zero byte after each file name
@@ -456,40 +458,52 @@
 
 <p>Regardless of how these options are set,
 <samp><span class="command">grep</span></samp> will never print any given line more than once. 
-If the &lsquo;<samp><span class="samp">-o</span></samp>&rsquo; or &lsquo;<samp><span class="samp">--only-matching</span></samp>&rsquo; option is specified,
+If the <samp><span class="option">-o</span></samp> (<samp><span class="option">--only-matching</span></samp>) option is specified,
 these options have no effect and a warning is given upon their use.
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">-A </span><var>num</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--after-context=</span><var>num</var></samp>&rsquo;<dd><a name="index-g_t_002dA-76"></a><a name="index-g_t_002d_002dafter_002dcontext-77"></a><a name="index-after-context-78"></a><a name="index-context-lines_002c-after-match-79"></a>Print <var>num</var> lines of trailing context after matching lines.
+<dt><samp><span class="option">-A </span><var>num</var></samp><dt><samp><span class="option">--after-context=</span><var>num</var></samp><dd><a name="index-g_t_002dA-76"></a><a name="index-g_t_002d_002dafter_002dcontext-77"></a><a name="index-after-context-78"></a><a name="index-context-lines_002c-after-match-79"></a>Print <var>num</var> lines of trailing context after matching lines.
 
-     <br><dt>&lsquo;<samp><span class="samp">-B </span><var>num</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--before-context=</span><var>num</var></samp>&rsquo;<dd><a name="index-g_t_002dB-80"></a><a name="index-g_t_002d_002dbefore_002dcontext-81"></a><a name="index-before-context-82"></a><a name="index-context-lines_002c-before-match-83"></a>Print <var>num</var> lines of leading context before matching lines.
+     <br><dt><samp><span class="option">-B </span><var>num</var></samp><dt><samp><span class="option">--before-context=</span><var>num</var></samp><dd><a name="index-g_t_002dB-80"></a><a name="index-g_t_002d_002dbefore_002dcontext-81"></a><a name="index-before-context-82"></a><a name="index-context-lines_002c-before-match-83"></a>Print <var>num</var> lines of leading context before matching lines.
 
-     <br><dt>&lsquo;<samp><span class="samp">-C </span><var>num</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">-</span><var>num</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--context=</span><var>num</var></samp>&rsquo;<dd><a name="index-g_t_002dC-84"></a><a name="index-g_t_002d_002dcontext-85"></a><a name="index-g_t_002d_0040var_007bnum_007d-86"></a><a name="index-context-87"></a>Print <var>num</var> lines of leading and trailing output context.
+     <br><dt><samp><span class="option">-C </span><var>num</var></samp><dt><samp><span class="option">-</span><var>num</var></samp><dt><samp><span class="option">--context=</span><var>num</var></samp><dd><a name="index-g_t_002dC-84"></a><a name="index-g_t_002d_002dcontext-85"></a><a name="index-g_t_002d_0040var_007bnum_007d-86"></a><a name="index-context-87"></a>Print <var>num</var> lines of leading and trailing output context.
 
-     <br><dt>&lsquo;<samp><span class="samp">--group-separator=</span><var>string</var></samp>&rsquo;<dd><a name="index-g_t_002d_002dgroup_002dseparator-88"></a><a name="index-group-separator-89"></a>When <samp><span class="option">-A</span></samp>, <samp><span class="option">-B</span></samp> or <samp><span class="option">-C</span></samp> are in use,
-print <var>string</var> instead of &lsquo;<samp><span class="samp">--</span></samp>&rsquo; around disjoint groups
+     <br><dt><samp><span class="option">--group-separator=</span><var>string</var></samp><dd><a name="index-g_t_002d_002dgroup_002dseparator-88"></a><a name="index-group-separator-89"></a>When <samp><span class="option">-A</span></samp>, <samp><span class="option">-B</span></samp> or <samp><span class="option">-C</span></samp> are in use,
+print <var>string</var> instead of <samp><span class="option">--</span></samp> around disjoint groups
 of lines.
 
-     <br><dt>&lsquo;<samp><span class="samp">--no-group-separator</span></samp>&rsquo;<dd><a name="index-g_t_002d_002dgroup_002dseparator-90"></a><a name="index-group-separator-91"></a>When <samp><span class="option">-A</span></samp>, <samp><span class="option">-B</span></samp> or <samp><span class="option">-C</span></samp> are in use,
+     <br><dt><samp><span class="option">--no-group-separator</span></samp><dd><a name="index-g_t_002d_002dgroup_002dseparator-90"></a><a name="index-group-separator-91"></a>When <samp><span class="option">-A</span></samp>, <samp><span class="option">-B</span></samp> or <samp><span class="option">-C</span></samp> are in use,
 print disjoint groups of lines adjacent to each other.
 
    </dl>
 
-   <p>Matching lines normally use &lsquo;<samp><span class="samp">:</span></samp>&rsquo; as a separator
+   <p>Here are some points about how <samp><span class="command">grep</span></samp> chooses
+the separator to print between prefix fields and line content:
+
+     <ul>
+<li>Matching lines normally use &lsquo;<samp><span class="samp">:</span></samp>&rsquo; as a separator
 between prefix fields and actual line content. 
-Context (i.e., non-matching) lines use &lsquo;<samp><span class="samp">-</span></samp>&rsquo; instead. 
-When no context is specified,
+
+     <li>Context (i.e., non-matching) lines use &lsquo;<samp><span class="samp">-</span></samp>&rsquo; instead.
+
+     <li>When no context is specified,
 matching lines are simply output one right after another. 
-When nonzero context is specified,
+
+     <li>When nonzero context is specified,
 lines that are adjacent in the input form a group
 and are output one right after another, while
 a separator appears by default between disjoint groups on a line
-of its own and without any prefix.  The default separator
+of its own and without any prefix.
+
+     <li>The default separator
 is &lsquo;<samp><span class="samp">--</span></samp>&rsquo;, however whether to include it and its appearance
-can be changed with the options above.  Each group may contain
+can be changed with the options above.
+
+     <li>Each group may contain
 several matching lines when they are close enough to each other
 that two otherwise adjacent but divided groups connect
 and can just merge into a single contiguous one.
+</ul>
 
 <div class="node">
 <a name="File-and-Directory-Selection"></a>
@@ -503,33 +517,36 @@
 <h4 class="subsection">2.1.6 File and Directory Selection</h4>
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">-a</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--text</span></samp>&rsquo;<dd><a name="index-g_t_002da-92"></a><a name="index-g_t_002d_002dtext-93"></a><a name="index-suppress-binary-data-94"></a><a name="index-binary-files-95"></a>Process a binary file as if it were text;
+<dt><samp><span class="option">-a</span></samp><dt><samp><span class="option">--text</span></samp><dd><a name="index-g_t_002da-92"></a><a name="index-g_t_002d_002dtext-93"></a><a name="index-suppress-binary-data-94"></a><a name="index-binary-files-95"></a>Process a binary file as if it were text;
 this is equivalent to the &lsquo;<samp><span class="samp">--binary-files=text</span></samp>&rsquo; option.
 
-     <dt>&lsquo;<samp><span class="samp">--binary-files=</span><var>type</var></samp>&rsquo;<dd><a name="index-g_t_002d_002dbinary_002dfiles-96"></a><a name="index-binary-files-97"></a>If the first few bytes of a file indicate that the file contains binary data,
+     <br><dt><samp><span class="option">--binary-files=</span><var>type</var></samp><dd><a name="index-g_t_002d_002dbinary_002dfiles-96"></a><a name="index-binary-files-97"></a>If the first few bytes of a file indicate that the file contains binary data,
 assume that the file is of type <var>type</var>. 
 By default, <var>type</var> is &lsquo;<samp><span class="samp">binary</span></samp>&rsquo;,
 and <samp><span class="command">grep</span></samp> normally outputs either
 a one-line message saying that a binary file matches,
 or no message if there is no match. 
-If <var>type</var> is &lsquo;<samp><span class="samp">without-match</span></samp>&rsquo;,
+
+     <p>If <var>type</var> is &lsquo;<samp><span class="samp">without-match</span></samp>&rsquo;,
 <samp><span class="command">grep</span></samp> assumes that a binary file does not match;
-this is equivalent to the &lsquo;<samp><span class="samp">-I</span></samp>&rsquo; option. 
-If <var>type</var> is &lsquo;<samp><span class="samp">text</span></samp>&rsquo;,
+this is equivalent to the <samp><span class="option">-I</span></samp> option.
+
+     <p>If <var>type</var> is &lsquo;<samp><span class="samp">text</span></samp>&rsquo;,
 <samp><span class="command">grep</span></samp> processes a binary file as if it were text;
-this is equivalent to the &lsquo;<samp><span class="samp">-a</span></samp>&rsquo; option. 
-<em>Warning:</em> &lsquo;<samp><span class="samp">--binary-files=text</span></samp>&rsquo; might output binary garbage,
+this is equivalent to the <samp><span class="option">-a</span></samp> option.
+
+     <p><em>Warning:</em> &lsquo;<samp><span class="samp">--binary-files=text</span></samp>&rsquo; might output binary garbage,
 which can have nasty side effects
 if the output is a terminal and
 if the terminal driver interprets some of it as commands.
 
-     <br><dt>&lsquo;<samp><span class="samp">-D </span><var>action</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--devices=</span><var>action</var></samp>&rsquo;<dd><a name="index-g_t_002dD-98"></a><a name="index-g_t_002d_002ddevices-99"></a><a name="index-device-search-100"></a>If an input file is a device, FIFO, or socket, use <var>action</var> to process it. 
+     <br><dt><samp><span class="option">-D </span><var>action</var></samp><dt><samp><span class="option">--devices=</span><var>action</var></samp><dd><a name="index-g_t_002dD-98"></a><a name="index-g_t_002d_002ddevices-99"></a><a name="index-device-search-100"></a>If an input file is a device, FIFO, or socket, use <var>action</var> to process it. 
 By default, <var>action</var> is &lsquo;<samp><span class="samp">read</span></samp>&rsquo;,
 which means that devices are read just as if they were ordinary files. 
 If <var>action</var> is &lsquo;<samp><span class="samp">skip</span></samp>&rsquo;,
 devices, FIFOs, and sockets are silently skipped.
 
-     <br><dt>&lsquo;<samp><span class="samp">-d </span><var>action</var></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--directories=</span><var>action</var></samp>&rsquo;<dd><a name="index-g_t_002dd-101"></a><a name="index-g_t_002d_002ddirectories-102"></a><a name="index-directory-search-103"></a>If an input file is a directory, use <var>action</var> to process it. 
+     <br><dt><samp><span class="option">-d </span><var>action</var></samp><dt><samp><span class="option">--directories=</span><var>action</var></samp><dd><a name="index-g_t_002dd-101"></a><a name="index-g_t_002d_002ddirectories-102"></a><a name="index-directory-search-103"></a>If an input file is a directory, use <var>action</var> to process it. 
 By default, <var>action</var> is &lsquo;<samp><span class="samp">read</span></samp>&rsquo;,
 which means that directories are read just as if they were ordinary files
 (some operating systems and file systems disallow this,
@@ -538,28 +555,28 @@
 If <var>action</var> is &lsquo;<samp><span class="samp">skip</span></samp>&rsquo;, directories are silently skipped. 
 If <var>action</var> is &lsquo;<samp><span class="samp">recurse</span></samp>&rsquo;,
 <samp><span class="command">grep</span></samp> reads all files under each directory, recursively;
-this is equivalent to the &lsquo;<samp><span class="samp">-r</span></samp>&rsquo; option.
+this is equivalent to the <samp><span class="option">-r</span></samp> option.
 
-     <br><dt>&lsquo;<samp><span class="samp">--exclude=</span><var>glob</var></samp>&rsquo;<dd><a name="index-g_t_002d_002dexclude-104"></a><a name="index-exclude-files-105"></a><a name="index-searching-directory-trees-106"></a>Skip files whose base name matches <var>glob</var>
+     <br><dt><samp><span class="option">--exclude=</span><var>glob</var></samp><dd><a name="index-g_t_002d_002dexclude-104"></a><a name="index-exclude-files-105"></a><a name="index-searching-directory-trees-106"></a>Skip files whose base name matches <var>glob</var>
 (using wildcard matching). 
 A file-name glob can use
 &lsquo;<samp><span class="samp">*</span></samp>&rsquo;, &lsquo;<samp><span class="samp">?</span></samp>&rsquo;, and &lsquo;<samp><span class="samp">[</span></samp>&rsquo;...&lsquo;<samp><span class="samp">]</span></samp>&rsquo; as wildcards,
 and <code>\</code> to quote a wildcard or backslash character literally.
 
-     <br><dt>&lsquo;<samp><span class="samp">--exclude-from=</span><var>file</var></samp>&rsquo;<dd><a name="index-g_t_002d_002dexclude_002dfrom-107"></a><a name="index-exclude-files-108"></a><a name="index-searching-directory-trees-109"></a>Skip files whose base name matches any of the file-name globs
+     <br><dt><samp><span class="option">--exclude-from=</span><var>file</var></samp><dd><a name="index-g_t_002d_002dexclude_002dfrom-107"></a><a name="index-exclude-files-108"></a><a name="index-searching-directory-trees-109"></a>Skip files whose base name matches any of the file-name globs
 read from <var>file</var> (using wildcard matching as described
-under &lsquo;<samp><span class="samp">--exclude</span></samp>&rsquo;).
+under <samp><span class="option">--exclude</span></samp>).
 
-     <br><dt>&lsquo;<samp><span class="samp">--exclude-dir=</span><var>dir</var></samp>&rsquo;<dd><a name="index-g_t_002d_002dexclude_002ddir-110"></a><a name="index-exclude-directories-111"></a>Exclude directories matching the pattern <var>dir</var> from recursive
+     <br><dt><samp><span class="option">--exclude-dir=</span><var>dir</var></samp><dd><a name="index-g_t_002d_002dexclude_002ddir-110"></a><a name="index-exclude-directories-111"></a>Exclude directories matching the pattern <var>dir</var> from recursive
 directory searches.
 
-     <br><dt>&lsquo;<samp><span class="samp">-I</span></samp>&rsquo;<dd>Process a binary file as if it did not contain matching data;
+     <br><dt><samp><span class="option">-I</span></samp><dd>Process a binary file as if it did not contain matching data;
 this is equivalent to the &lsquo;<samp><span class="samp">--binary-files=without-match</span></samp>&rsquo; option.
 
-     <br><dt>&lsquo;<samp><span class="samp">--include=</span><var>glob</var></samp>&rsquo;<dd><a name="index-g_t_002d_002dinclude-112"></a><a name="index-include-files-113"></a><a name="index-searching-directory-trees-114"></a>Search only files whose base name matches <var>glob</var>
-(using wildcard matching as described under &lsquo;<samp><span class="samp">--exclude</span></samp>&rsquo;).
+     <br><dt><samp><span class="option">--include=</span><var>glob</var></samp><dd><a name="index-g_t_002d_002dinclude-112"></a><a name="index-include-files-113"></a><a name="index-searching-directory-trees-114"></a>Search only files whose base name matches <var>glob</var>
+(using wildcard matching as described under <samp><span class="option">--exclude</span></samp>).
 
-     <br><dt>&lsquo;<samp><span class="samp">-r</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">-R</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--recursive</span></samp>&rsquo;<dd><a name="index-g_t_002dr-115"></a><a name="index-g_t_002d_002drecursive-116"></a><a name="index-recursive-search-117"></a><a name="index-searching-directory-trees-118"></a>For each directory mentioned on the command line,
+     <br><dt><samp><span class="option">-r</span></samp><dt><samp><span class="option">-R</span></samp><dt><samp><span class="option">--recursive</span></samp><dd><a name="index-g_t_002dr-115"></a><a name="index-g_t_002d_002drecursive-116"></a><a name="index-recursive-search-117"></a><a name="index-searching-directory-trees-118"></a>For each directory operand,
 read and process all files in that directory, recursively. 
 This is the same as the &lsquo;<samp><span class="samp">--directories=recurse</span></samp>&rsquo; option.
 
@@ -576,31 +593,32 @@
 <h4 class="subsection">2.1.7 Other Options</h4>
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">--line-buffered</span></samp>&rsquo;<dd><a name="index-g_t_002d_002dline_002dbuffered-119"></a><a name="index-line-buffering-120"></a>Use line buffering on output. 
+<dt><samp><span class="option">--line-buffered</span></samp><dd><a name="index-g_t_002d_002dline_002dbuffered-119"></a><a name="index-line-buffering-120"></a>Use line buffering on output. 
 This can cause a performance penalty.
 
-     <br><dt>&lsquo;<samp><span class="samp">--mmap</span></samp>&rsquo;<dd><a name="index-g_t_002d_002dmmap-121"></a><a name="index-memory-mapped-input-122"></a>This option is ignored for backwards compatibility.  It used to read
+     <br><dt><samp><span class="option">--mmap</span></samp><dd><a name="index-g_t_002d_002dmmap-121"></a><a name="index-memory-mapped-input-122"></a>This option is deprecated and now elicits a warning, but is otherwise a no-op. 
+It used to make <samp><span class="command">grep</span></samp> read
 input with the <code>mmap</code> system call, instead of the default <code>read</code>
 system call.  On modern systems, <code>mmap</code> would rarely if ever yield
 better performance.
 
-     <br><dt>&lsquo;<samp><span class="samp">-U</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--binary</span></samp>&rsquo;<dd><a name="index-g_t_002dU-123"></a><a name="index-g_t_002d_002dbinary-124"></a><a name="index-g_t_0040sc_007bms_002ddos_007d_002f_0040sc_007bms_007d_002dWindows-binary-files-125"></a><a name="index-binary-files_002c-_0040sc_007bms_002ddos_007d_002f_0040sc_007bms_007d_002dWindows-126"></a>Treat the file(s) as binary. 
-By default, under <span class="sc">ms-dos</span> and <span class="sc">ms</span>-Windows,
+     <br><dt><samp><span class="option">-U</span></samp><dt><samp><span class="option">--binary</span></samp><dd><a name="index-g_t_002dU-123"></a><a name="index-g_t_002d_002dbinary-124"></a><a name="index-MS_002dDOS_002fMS_002dWindows-binary-files-125"></a><a name="index-binary-files_002c-MS_002dDOS_002fMS_002dWindows-126"></a>Treat the file(s) as binary. 
+By default, under MS-DOS and MS-Windows,
 <samp><span class="command">grep</span></samp> guesses the file type
 by looking at the contents of the first 32kB read from the file. 
 If <samp><span class="command">grep</span></samp> decides the file is a text file,
 it strips the <code>CR</code> characters from the original file contents
 (to make regular expressions with <code>^</code> and <code>$</code> work correctly). 
-Specifying &lsquo;<samp><span class="samp">-U</span></samp>&rsquo; overrules this guesswork,
+Specifying <samp><span class="option">-U</span></samp> overrules this guesswork,
 causing all files to be read and passed to the matching mechanism verbatim;
 if the file is a text file with <code>CR/LF</code> pairs at the end of each line,
 this will cause some regular expressions to fail. 
 This option has no effect
-on platforms other than <span class="sc">ms-dos</span> and <span class="sc">ms</span>-Windows.
+on platforms other than MS-DOS and MS-Windows.
 
-     <br><dt>&lsquo;<samp><span class="samp">-z</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--null-data</span></samp>&rsquo;<dd><a name="index-g_t_002dz-127"></a><a name="index-g_t_002d_002dnull_002ddata-128"></a><a name="index-zero_002dterminated-lines-129"></a>Treat the input as a set of lines, each terminated by a zero byte (the
-<span class="sc">ascii</span> <code>NUL</code> character) instead of a newline. 
-Like the &lsquo;<samp><span class="samp">-Z</span></samp>&rsquo; or &lsquo;<samp><span class="samp">--null</span></samp>&rsquo; option,
+     <br><dt><samp><span class="option">-z</span></samp><dt><samp><span class="option">--null-data</span></samp><dd><a name="index-g_t_002dz-127"></a><a name="index-g_t_002d_002dnull_002ddata-128"></a><a name="index-zero_002dterminated-lines-129"></a>Treat the input as a set of lines, each terminated by a zero byte (the
+ASCII <code>NUL</code> character) instead of a newline. 
+Like the <samp><span class="option">-Z</span></samp> or <samp><span class="option">--null</span></samp> option,
 this option can be used with commands like
 &lsquo;<samp><span class="samp">sort -z</span></samp>&rsquo; to process arbitrary file names.
 
@@ -632,7 +650,41 @@
 The &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale is used if none of these environment variables are set,
 if the locale catalog is not installed,
 or if <samp><span class="command">grep</span></samp> was not compiled
-with national language support (<span class="sc">nls</span>).
+with national language support (NLS).
+
+   <p>Many of the environment variables in the following list let you
+control highlighting using
+Select Graphic Rendition (SGR)
+commands interpreted by the terminal or terminal emulator. 
+(See the
+section
+in the documentation of your text terminal
+for permitted values and their meanings as character attributes.) 
+These substring values are integers in decimal representation
+and can be concatenated with semicolons. 
+<samp><span class="command">grep</span></samp> takes care of assembling the result
+into a complete SGR sequence (&lsquo;<samp><span class="samp">\33[</span></samp>&rsquo;...&lsquo;<samp><span class="samp">m</span></samp>&rsquo;). 
+Common values to concatenate include
+&lsquo;<samp><span class="samp">1</span></samp>&rsquo; for bold,
+&lsquo;<samp><span class="samp">4</span></samp>&rsquo; for underline,
+&lsquo;<samp><span class="samp">5</span></samp>&rsquo; for blink,
+&lsquo;<samp><span class="samp">7</span></samp>&rsquo; for inverse,
+&lsquo;<samp><span class="samp">39</span></samp>&rsquo; for default foreground color,
+&lsquo;<samp><span class="samp">30</span></samp>&rsquo; to &lsquo;<samp><span class="samp">37</span></samp>&rsquo; for foreground colors,
+&lsquo;<samp><span class="samp">90</span></samp>&rsquo; to &lsquo;<samp><span class="samp">97</span></samp>&rsquo; for 16-color mode foreground colors,
+&lsquo;<samp><span class="samp">38;5;0</span></samp>&rsquo; to &lsquo;<samp><span class="samp">38;5;255</span></samp>&rsquo;
+for 88-color and 256-color modes foreground colors,
+&lsquo;<samp><span class="samp">49</span></samp>&rsquo; for default background color,
+&lsquo;<samp><span class="samp">40</span></samp>&rsquo; to &lsquo;<samp><span class="samp">47</span></samp>&rsquo; for background colors,
+&lsquo;<samp><span class="samp">100</span></samp>&rsquo; to &lsquo;<samp><span class="samp">107</span></samp>&rsquo; for 16-color mode background colors,
+and &lsquo;<samp><span class="samp">48;5;0</span></samp>&rsquo; to &lsquo;<samp><span class="samp">48;5;255</span></samp>&rsquo;
+for 88-color and 256-color modes background colors.
+
+   <p>The two-letter names used in the <samp><span class="env">GREP_COLORS</span></samp> environment variable
+(and some of the others) refer to terminal &ldquo;capabilities,&rdquo; the ability
+of a terminal to highlight text, or change its color, and so on. 
+These capabilities are stored in an online database and accessed by
+the <code>terminfo</code> library.
 
    <p><a name="index-environment-variables-130"></a>
      <dl>
@@ -648,20 +700,27 @@
 A backslash escapes the next character, so it can be used to
 specify an option containing whitespace or a backslash.
 
+     <p>The <code>GREP_OPTIONS</code> value does not affect whether <samp><span class="command">grep</span></samp>
+without file operands searches standard input or the working
+directory; that is affected only by command-line options.  For
+example, the command &lsquo;<samp><span class="samp">grep PAT</span></samp>&rsquo; searches standard input and the
+command &lsquo;<samp><span class="samp">grep -r PAT</span></samp>&rsquo; searches the working directory, regardless
+of whether <code>GREP_OPTIONS</code> contains <samp><span class="option">-r</span></samp>.
+
      <br><dt><samp><span class="env">GREP_COLOR</span></samp><dd><a name="index-GREP_005fCOLOR-_0040r_007benvironment-variable_007d-133"></a><a name="index-highlight-markers-134"></a>This variable specifies the color used to highlight matched (non-empty) text. 
-It is deprecated in favor of <code>GREP_COLORS</code>, but still supported. 
-The &lsquo;<samp><span class="samp">mt</span></samp>&rsquo;, &lsquo;<samp><span class="samp">ms</span></samp>&rsquo;, and &lsquo;<samp><span class="samp">mc</span></samp>&rsquo; capabilities of <code>GREP_COLORS</code>
+It is deprecated in favor of <samp><span class="env">GREP_COLORS</span></samp>, but still supported. 
+The &lsquo;<samp><span class="samp">mt</span></samp>&rsquo;, &lsquo;<samp><span class="samp">ms</span></samp>&rsquo;, and &lsquo;<samp><span class="samp">mc</span></samp>&rsquo; capabilities of <samp><span class="env">GREP_COLORS</span></samp>
 have priority over it. 
 It can only specify the color used to highlight
 the matching non-empty text in any matching line
-(a selected line when the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option is omitted,
-or a context line when &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; is specified). 
+(a selected line when the <samp><span class="option">-v</span></samp> command-line option is omitted,
+or a context line when <samp><span class="option">-v</span></samp> is specified). 
 The default is &lsquo;<samp><span class="samp">01;31</span></samp>&rsquo;,
 which means a bold red foreground text on the terminal's default background.
 
      <br><dt><samp><span class="env">GREP_COLORS</span></samp><dd><a name="index-GREP_005fCOLORS-_0040r_007benvironment-variable_007d-135"></a><a name="index-highlight-markers-136"></a>This variable specifies the colors and other attributes
 used to highlight various parts of the output. 
-Its value is a colon-separated list of capabilities
+Its value is a colon-separated list of <code>terminfo</code> capabilities
 that defaults to &lsquo;<samp><span class="samp">ms=01;31:mc=01;31:sl=:cx=:fn=35:ln=32:bn=32:se=36</span></samp>&rsquo;
 with the &lsquo;<samp><span class="samp">rv</span></samp>&rsquo; and &lsquo;<samp><span class="samp">ne</span></samp>&rsquo; boolean capabilities omitted (i.e., false). 
 Supported capabilities are as follows.
@@ -669,45 +728,45 @@
           <dl>
 <dt><code>sl=</code><dd><a name="index-sl-GREP_005fCOLORS-_0040r_007bcapability_007d-137"></a>SGR substring for whole selected lines
 (i.e.,
-matching lines when the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option is omitted,
-or non-matching lines when &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; is specified). 
+matching lines when the <samp><span class="option">-v</span></samp> command-line option is omitted,
+or non-matching lines when <samp><span class="option">-v</span></samp> is specified). 
 If however the boolean &lsquo;<samp><span class="samp">rv</span></samp>&rsquo; capability
-and the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option are both specified,
+and the <samp><span class="option">-v</span></samp> command-line option are both specified,
 it applies to context matching lines instead. 
 The default is empty (i.e., the terminal's default color pair).
 
           <br><dt><code>cx=</code><dd><a name="index-cx-GREP_005fCOLORS-_0040r_007bcapability_007d-138"></a>SGR substring for whole context lines
 (i.e.,
-non-matching lines when the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option is omitted,
-or matching lines when &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; is specified). 
+non-matching lines when the <samp><span class="option">-v</span></samp> command-line option is omitted,
+or matching lines when <samp><span class="option">-v</span></samp> is specified). 
 If however the boolean &lsquo;<samp><span class="samp">rv</span></samp>&rsquo; capability
-and the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option are both specified,
+and the <samp><span class="option">-v</span></samp> command-line option are both specified,
 it applies to selected non-matching lines instead. 
 The default is empty (i.e., the terminal's default color pair).
 
           <br><dt><code>rv</code><dd><a name="index-rv-GREP_005fCOLORS-_0040r_007bcapability_007d-139"></a>Boolean value that reverses (swaps) the meanings of
 the &lsquo;<samp><span class="samp">sl=</span></samp>&rsquo; and &lsquo;<samp><span class="samp">cx=</span></samp>&rsquo; capabilities
-when the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option is specified. 
+when the <samp><span class="option">-v</span></samp> command-line option is specified. 
 The default is false (i.e., the capability is omitted).
 
           <br><dt><code>mt=01;31</code><dd><a name="index-mt-GREP_005fCOLORS-_0040r_007bcapability_007d-140"></a>SGR substring for matching non-empty text in any matching line
 (i.e.,
-a selected line when the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option is omitted,
-or a context line when &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; is specified). 
+a selected line when the <samp><span class="option">-v</span></samp> command-line option is omitted,
+or a context line when <samp><span class="option">-v</span></samp> is specified). 
 Setting this is equivalent to setting both &lsquo;<samp><span class="samp">ms=</span></samp>&rsquo; and &lsquo;<samp><span class="samp">mc=</span></samp>&rsquo;
 at once to the same value. 
 The default is a bold red text foreground over the current line background.
 
           <br><dt><code>ms=01;31</code><dd><a name="index-ms-GREP_005fCOLORS-_0040r_007bcapability_007d-141"></a>SGR substring for matching non-empty text in a selected line. 
-(This is only used when the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option is omitted.) 
+(This is used only when the <samp><span class="option">-v</span></samp> command-line option is omitted.) 
 The effect of the &lsquo;<samp><span class="samp">sl=</span></samp>&rsquo; (or &lsquo;<samp><span class="samp">cx=</span></samp>&rsquo; if &lsquo;<samp><span class="samp">rv</span></samp>&rsquo;) capability
-remains active when this kicks in. 
+remains active when this takes effect. 
 The default is a bold red text foreground over the current line background.
 
           <br><dt><code>mc=01;31</code><dd><a name="index-mc-GREP_005fCOLORS-_0040r_007bcapability_007d-142"></a>SGR substring for matching non-empty text in a context line. 
-(This is only used when the &lsquo;<samp><span class="samp">-v</span></samp>&rsquo; command-line option is specified.) 
+(This is used only when the <samp><span class="option">-v</span></samp> command-line option is specified.) 
 The effect of the &lsquo;<samp><span class="samp">cx=</span></samp>&rsquo; (or &lsquo;<samp><span class="samp">sl=</span></samp>&rsquo; if &lsquo;<samp><span class="samp">rv</span></samp>&rsquo;) capability
-remains active when this kicks in. 
+remains active when this takes effect. 
 The default is a bold red text foreground over the current line background.
 
           <br><dt><code>fn=35</code><dd><a name="index-fn-GREP_005fCOLORS-_0040r_007bcapability_007d-143"></a>SGR substring for file names prefixing any content line. 
@@ -732,7 +791,7 @@
 This is needed on terminals on which EL is not supported. 
 It is otherwise useful on terminals
 for which the <code>back_color_erase</code>
-(<code>bce</code>) boolean terminfo capability does not apply,
+(<code>bce</code>) boolean <code>terminfo</code> capability does not apply,
 when the chosen highlight colors do not affect the background,
 or when EL is too slow or causes too much flicker. 
 The default is false (i.e., the capability is omitted). 
@@ -741,29 +800,6 @@
      <p>Note that boolean capabilities have no &lsquo;<samp><span class="samp">=</span></samp>&rsquo;... part. 
 They are omitted (i.e., false) by default and become true when specified.
 
-     <p>See the Select Graphic Rendition (SGR) section
-in the documentation of your text terminal
-for permitted values and their meaning as character attributes. 
-These substring values are integers in decimal representation
-and can be concatenated with semicolons. 
-<samp><span class="command">grep</span></samp> takes care of assembling the result
-into a complete SGR sequence (&lsquo;<samp><span class="samp">\33[</span></samp>&rsquo;...&lsquo;<samp><span class="samp">m</span></samp>&rsquo;). 
-Common values to concatenate include
-&lsquo;<samp><span class="samp">1</span></samp>&rsquo; for bold,
-&lsquo;<samp><span class="samp">4</span></samp>&rsquo; for underline,
-&lsquo;<samp><span class="samp">5</span></samp>&rsquo; for blink,
-&lsquo;<samp><span class="samp">7</span></samp>&rsquo; for inverse,
-&lsquo;<samp><span class="samp">39</span></samp>&rsquo; for default foreground color,
-&lsquo;<samp><span class="samp">30</span></samp>&rsquo; to &lsquo;<samp><span class="samp">37</span></samp>&rsquo; for foreground colors,
-&lsquo;<samp><span class="samp">90</span></samp>&rsquo; to &lsquo;<samp><span class="samp">97</span></samp>&rsquo; for 16-color mode foreground colors,
-&lsquo;<samp><span class="samp">38;5;0</span></samp>&rsquo; to &lsquo;<samp><span class="samp">38;5;255</span></samp>&rsquo;
-for 88-color and 256-color modes foreground colors,
-&lsquo;<samp><span class="samp">49</span></samp>&rsquo; for default background color,
-&lsquo;<samp><span class="samp">40</span></samp>&rsquo; to &lsquo;<samp><span class="samp">47</span></samp>&rsquo; for background colors,
-&lsquo;<samp><span class="samp">100</span></samp>&rsquo; to &lsquo;<samp><span class="samp">107</span></samp>&rsquo; for 16-color mode background colors,
-and &lsquo;<samp><span class="samp">48;5;0</span></samp>&rsquo; to &lsquo;<samp><span class="samp">48;5;255</span></samp>&rsquo;
-for 88-color and 256-color modes background colors.
-
      <br><dt><samp><span class="env">LC_ALL</span></samp><dt><samp><span class="env">LC_COLLATE</span></samp><dt><samp><span class="env">LANG</span></samp><dd><a name="index-LC_005fALL-_0040r_007benvironment-variable_007d-148"></a><a name="index-LC_005fCOLLATE-_0040r_007benvironment-variable_007d-149"></a><a name="index-LANG-_0040r_007benvironment-variable_007d-150"></a><a name="index-character-type-151"></a><a name="index-national-language-support-152"></a><a name="index-NLS-153"></a>These variables specify the locale for the <code>LC_COLLATE</code> category,
 which determines the collating sequence
 used to interpret range expressions like &lsquo;<samp><span class="samp">[a-z]</span></samp>&rsquo;.
@@ -776,9 +812,9 @@
 which determines the language that <samp><span class="command">grep</span></samp> uses for messages. 
 The default &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale uses American English messages.
 
-     <br><dt><samp><span class="env">POSIXLY_CORRECT</span></samp><dd><a name="index-POSIXLY_005fCORRECT-_0040r_007benvironment-variable_007d-164"></a>If set, <samp><span class="command">grep</span></samp> behaves as <span class="sc">posix.2</span> requires; otherwise,
-<samp><span class="command">grep</span></samp> behaves more like other <span class="sc">gnu</span> programs. 
-<span class="sc">posix.2</span>
+     <br><dt><samp><span class="env">POSIXLY_CORRECT</span></samp><dd><a name="index-POSIXLY_005fCORRECT-_0040r_007benvironment-variable_007d-164"></a>If set, <samp><span class="command">grep</span></samp> behaves as POSIX requires; otherwise,
+<samp><span class="command">grep</span></samp> behaves more like other GNU programs. 
+POSIX
 requires that options that
 follow file names must be treated as file names;
 by default,
@@ -794,7 +830,7 @@
 A shell can put this variable in the environment for each command it runs,
 specifying which operands are the results of file name wildcard expansion
 and therefore should not be treated as options. 
-This behavior is available only with the <span class="sc">gnu</span> C library,
+This behavior is available only with the GNU C library,
 and only when <code>POSIXLY_CORRECT</code> is not set.
 
    </dl>
@@ -815,7 +851,7 @@
 But the exit status is 2 if an error occurred, unless the <samp><span class="option">-q</span></samp> or
 <samp><span class="option">--quiet</span></samp> or <samp><span class="option">--silent</span></samp> option is used and a selected line
 is found. 
-Note, however, that <span class="sc">posix</span> only mandates,
+Note, however, that POSIX only mandates,
 for programs such as <samp><span class="command">grep</span></samp>, <samp><span class="command">cmp</span></samp>, and <samp><span class="command">diff</span></samp>,
 that the exit status in case of error be greater than 1;
 it is therefore advisable, for the sake of portability,
@@ -832,27 +868,29 @@
 
 <h3 class="section">2.4 <samp><span class="command">grep</span></samp> Programs</h3>
 
-<p><a name="index-g_t_0040command_007bgrep_007d-programs-168"></a><a name="index-variants-of-_0040command_007bgerp_007d-169"></a>
+<p><a name="index-g_t_0040command_007bgrep_007d-programs-168"></a><a name="index-variants-of-_0040command_007bgrep_007d-169"></a>
 <samp><span class="command">grep</span></samp> searches the named input files
-(or standard input if no files are named,
-or the file name <samp><span class="file">-</span></samp> is given)
 for lines containing a match to the given pattern. 
 By default, <samp><span class="command">grep</span></samp> prints the matching lines. 
+A file named <samp><span class="file">-</span></samp> stands for standard input. 
+If no input is specified, <samp><span class="command">grep</span></samp> searches the working
+directory <samp><span class="file">.</span></samp> if given a command-line option specifying
+recursion; otherwise, <samp><span class="command">grep</span></samp> searches standard input. 
 There are four major variants of <samp><span class="command">grep</span></samp>,
 controlled by the following options.
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">-G</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--basic-regexp</span></samp>&rsquo;<dd><a name="index-g_t_002dG-170"></a><a name="index-g_t_002d_002dbasic_002dregexp-171"></a><a name="index-matching-basic-regular-expressions-172"></a>Interpret the pattern as a basic regular expression (BRE). 
+<dt><samp><span class="option">-G</span></samp><dt><samp><span class="option">--basic-regexp</span></samp><dd><a name="index-g_t_002dG-170"></a><a name="index-g_t_002d_002dbasic_002dregexp-171"></a><a name="index-matching-basic-regular-expressions-172"></a>Interpret the pattern as a basic regular expression (BRE). 
 This is the default.
 
-     <br><dt>&lsquo;<samp><span class="samp">-E</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--extended-regexp</span></samp>&rsquo;<dd><a name="index-g_t_002dE-173"></a><a name="index-g_t_002d_002dextended_002dregexp-174"></a><a name="index-matching-extended-regular-expressions-175"></a>Interpret the pattern as an extended regular expression (ERE). 
-(&lsquo;<samp><span class="samp">-E</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+     <br><dt><samp><span class="option">-E</span></samp><dt><samp><span class="option">--extended-regexp</span></samp><dd><a name="index-g_t_002dE-173"></a><a name="index-g_t_002d_002dextended_002dregexp-174"></a><a name="index-matching-extended-regular-expressions-175"></a>Interpret the pattern as an extended regular expression (ERE). 
+(<samp><span class="option">-E</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-F</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--fixed-strings</span></samp>&rsquo;<dd><a name="index-g_t_002dF-176"></a><a name="index-g_t_002d_002dfixed_002dstrings-177"></a><a name="index-matching-fixed-strings-178"></a>Interpret the pattern as a list of fixed strings, separated
+     <br><dt><samp><span class="option">-F</span></samp><dt><samp><span class="option">--fixed-strings</span></samp><dd><a name="index-g_t_002dF-176"></a><a name="index-g_t_002d_002dfixed_002dstrings-177"></a><a name="index-matching-fixed-strings-178"></a>Interpret the pattern as a list of fixed strings, separated
 by newlines, any of which is to be matched. 
-(&lsquo;<samp><span class="samp">-F</span></samp>&rsquo; is specified by <span class="sc">posix</span>.)
+(<samp><span class="option">-F</span></samp> is specified by POSIX.)
 
-     <br><dt>&lsquo;<samp><span class="samp">-P</span></samp>&rsquo;<dt>&lsquo;<samp><span class="samp">--perl-regexp</span></samp>&rsquo;<dd><a name="index-g_t_002dP-179"></a><a name="index-g_t_002d_002dperl_002dregexp-180"></a><a name="index-matching-Perl-regular-expressions-181"></a>Interpret the pattern as a Perl regular expression. 
+     <br><dt><samp><span class="option">-P</span></samp><dt><samp><span class="option">--perl-regexp</span></samp><dd><a name="index-g_t_002dP-179"></a><a name="index-g_t_002d_002dperl_002dregexp-180"></a><a name="index-matching-Perl-regular-expressions-181"></a>Interpret the pattern as a Perl regular expression. 
 This is highly experimental and
 &lsquo;<samp><span class="samp">grep -P</span></samp>&rsquo; may warn of unimplemented features.
 
@@ -885,15 +923,15 @@
 <samp><span class="command">grep</span></samp> understands
 three different versions of regular expression syntax:
 &ldquo;basic,&rdquo; (BRE) &ldquo;extended&rdquo; (ERE) and &ldquo;perl&rdquo;. 
-In <span class="sc">gnu</span> <samp><span class="command">grep</span></samp>,
-there is no difference in available functionality between basic and
+In GNU <samp><span class="command">grep</span></samp>,
+there is no difference in available functionality between the basic and
 extended syntaxes. 
 In other implementations, basic regular expressions are less powerful. 
 The following description applies to extended regular expressions;
 differences for basic regular expressions are summarized afterwards. 
 Perl regular expressions give additional functionality, and are
-documented in pcresyntax(3) and pcrepattern(3), but may not be
-available on every system.
+documented in the <i>pcresyntax</i>(3) and <i>pcrepattern</i>(3) manual pages,
+but may not be available on every system.
 
 <ul class="menu">
 <li><a accesskey="1" href="#Fundamental-Structure">Fundamental Structure</a>
@@ -944,14 +982,15 @@
 
    </dl>
 
-   <p>Two regular expressions may be concatenated;
+   <p>The empty regular expression matches the empty string. 
+Two regular expressions may be concatenated;
 the resulting regular expression
 matches any string formed by concatenating two substrings
 that respectively match the concatenated expressions.
 
    <p>Two regular expressions may be joined by the infix operator &lsquo;<samp><span class="samp">|</span></samp>&rsquo;;
 the resulting regular expression
-matches any string matching either alternalte expression.
+matches any string matching either alternate expression.
 
    <p>Repetition takes precedence over concatenation,
 which in turn takes precedence over alternation. 
@@ -995,22 +1034,22 @@
    <p>Finally, certain named classes of characters are predefined within
 bracket expressions, as follows. 
 Their interpretation depends on the <code>LC_CTYPE</code> locale;
-the interpretation below is that of the &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale,
-which is the default if no <code>LC_CTYPE</code> locale is specified.
+for example, &lsquo;<samp><span class="samp">[[:alnum:]]</span></samp>&rsquo; means the character class of numbers and letters
+in the current locale.
 
    <p><a name="index-classes-of-characters-210"></a><a name="index-character-classes-211"></a>
      <dl>
 <dt>&lsquo;<samp><span class="samp">[:alnum:]</span></samp>&rsquo;<dd><a name="index-alnum-_0040r_007bcharacter-class_007d-212"></a><a name="index-alphanumeric-characters-213"></a>Alphanumeric characters:
-&lsquo;<samp><span class="samp">[:alpha:]</span></samp>&rsquo; and &lsquo;<samp><span class="samp">[:digit:]</span></samp>&rsquo;.
+&lsquo;<samp><span class="samp">[:alpha:]</span></samp>&rsquo; and &lsquo;<samp><span class="samp">[:digit:]</span></samp>&rsquo;; in the &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale and ASCII character encoding, this is the same as &lsquo;<samp><span class="samp">[0-9A-Za-z]</span></samp>&rsquo;.
 
      <br><dt>&lsquo;<samp><span class="samp">[:alpha:]</span></samp>&rsquo;<dd><a name="index-alpha-_0040r_007bcharacter-class_007d-214"></a><a name="index-alphabetic-characters-215"></a>Alphabetic characters:
-&lsquo;<samp><span class="samp">[:lower:]</span></samp>&rsquo; and &lsquo;<samp><span class="samp">[:upper:]</span></samp>&rsquo;.
+&lsquo;<samp><span class="samp">[:lower:]</span></samp>&rsquo; and &lsquo;<samp><span class="samp">[:upper:]</span></samp>&rsquo;; in the &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale and ASCII character encoding, this is the same as &lsquo;<samp><span class="samp">[A-Za-z]</span></samp>&rsquo;.
 
      <br><dt>&lsquo;<samp><span class="samp">[:blank:]</span></samp>&rsquo;<dd><a name="index-blank-_0040r_007bcharacter-class_007d-216"></a><a name="index-blank-characters-217"></a>Blank characters:
 space and tab.
 
      <br><dt>&lsquo;<samp><span class="samp">[:cntrl:]</span></samp>&rsquo;<dd><a name="index-cntrl-_0040r_007bcharacter-class_007d-218"></a><a name="index-control-characters-219"></a>Control characters. 
-In <span class="sc">ascii</span>, these characters have octal codes 000
+In ASCII, these characters have octal codes 000
 through 037, and 177 (<code>DEL</code>). 
 In other character sets, these are
 the equivalent characters, if any.
@@ -1020,32 +1059,32 @@
      <br><dt>&lsquo;<samp><span class="samp">[:graph:]</span></samp>&rsquo;<dd><a name="index-graph-_0040r_007bcharacter-class_007d-223"></a><a name="index-graphic-characters-224"></a>Graphical characters:
 &lsquo;<samp><span class="samp">[:alnum:]</span></samp>&rsquo; and &lsquo;<samp><span class="samp">[:punct:]</span></samp>&rsquo;.
 
-     <br><dt>&lsquo;<samp><span class="samp">[:lower:]</span></samp>&rsquo;<dd><a name="index-lower-_0040r_007bcharacter-class_007d-225"></a><a name="index-lower_002dcase-letters-226"></a>Lower-case letters:
+     <br><dt>&lsquo;<samp><span class="samp">[:lower:]</span></samp>&rsquo;<dd><a name="index-lower-_0040r_007bcharacter-class_007d-225"></a><a name="index-lower_002dcase-letters-226"></a>Lower-case letters; in the &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale and ASCII character
+encoding, this is
 <code>a b c d e f g h i j k l m n o p q r s t u v w x y z</code>.
 
      <br><dt>&lsquo;<samp><span class="samp">[:print:]</span></samp>&rsquo;<dd><a name="index-print-_0040r_007bcharacter-class_007d-227"></a><a name="index-printable-characters-228"></a>Printable characters:
 &lsquo;<samp><span class="samp">[:alnum:]</span></samp>&rsquo;, &lsquo;<samp><span class="samp">[:punct:]</span></samp>&rsquo;, and space.
 
-     <br><dt>&lsquo;<samp><span class="samp">[:punct:]</span></samp>&rsquo;<dd><a name="index-punct-_0040r_007bcharacter-class_007d-229"></a><a name="index-punctuation-characters-230"></a>Punctuation characters:
+     <br><dt>&lsquo;<samp><span class="samp">[:punct:]</span></samp>&rsquo;<dd><a name="index-punct-_0040r_007bcharacter-class_007d-229"></a><a name="index-punctuation-characters-230"></a>Punctuation characters; in the &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale and ASCII character
+encoding, this is
 <code>! " # $ % &amp; ' ( ) * + , - . / : ; &lt; = &gt; ? @ [ \ ] ^ _ ` { | } ~</code>.
 
-     <br><dt>&lsquo;<samp><span class="samp">[:space:]</span></samp>&rsquo;<dd><a name="index-space-_0040r_007bcharacter-class_007d-231"></a><a name="index-space-characters-232"></a><a name="index-whitespace-characters-233"></a>Space characters:
+     <br><dt>&lsquo;<samp><span class="samp">[:space:]</span></samp>&rsquo;<dd><a name="index-space-_0040r_007bcharacter-class_007d-231"></a><a name="index-space-characters-232"></a><a name="index-whitespace-characters-233"></a>Space characters: in the &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale, this is
 tab, newline, vertical tab, form feed, carriage return, and space. 
 See <a href="#Usage">Usage</a>, for more discussion of matching newlines.
 
-     <br><dt>&lsquo;<samp><span class="samp">[:upper:]</span></samp>&rsquo;<dd><a name="index-upper-_0040r_007bcharacter-class_007d-234"></a><a name="index-upper_002dcase-letters-235"></a>Upper-case letters:
+     <br><dt>&lsquo;<samp><span class="samp">[:upper:]</span></samp>&rsquo;<dd><a name="index-upper-_0040r_007bcharacter-class_007d-234"></a><a name="index-upper_002dcase-letters-235"></a>Upper-case letters: in the &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale and ASCII character
+encoding, this is
 <code>A B C D E F G H I J K L M N O P Q R S T U V W X Y Z</code>.
 
      <br><dt>&lsquo;<samp><span class="samp">[:xdigit:]</span></samp>&rsquo;<dd><a name="index-xdigit-_0040r_007bcharacter-class_007d-236"></a><a name="index-xdigit-class-237"></a><a name="index-hexadecimal-digits-238"></a>Hexadecimal digits:
 <code>0 1 2 3 4 5 6 7 8 9 A B C D E F a b c d e f</code>.
 
    </dl>
-   For example, &lsquo;<samp><span class="samp">[[:alnum:]]</span></samp>&rsquo; means &lsquo;<samp><span class="samp">[0-9A-Za-z]</span></samp>&rsquo;, except the latter
-depends upon the &lsquo;<samp><span class="samp">C</span></samp>&rsquo; locale and the <span class="sc">ascii</span> character
-encoding, whereas the former is independent of locale and character set. 
-(Note that the brackets in these class names are
+   Note that the brackets in these class names are
 part of the symbolic names, and must be included in addition to
-the brackets delimiting the bracket expression.)
+the brackets delimiting the bracket expression.
 
    <p><a name="invalid_002dbracket_002dexpr"></a>If you mistakenly omit the outer brackets, and search for say, &lsquo;<samp><span class="samp">[:upper:]</span></samp>&rsquo;,
 GNU <samp><span class="command">grep</span></samp> prints a diagnostic and exits with status 2, on
@@ -1098,21 +1137,21 @@
 takes a special meaning:
 
      <dl>
-<dt>&lsquo;<samp><span class="samp">&lsquo;</span><samp><span class="samp">\b</span></samp><span class="samp">&rsquo;</span></samp>&rsquo;<dd>Match the empty string at the edge of a word.
+<dt>&lsquo;<samp><span class="samp">\b</span></samp>&rsquo;<dd>Match the empty string at the edge of a word.
 
-     <br><dt>&lsquo;<samp><span class="samp">&lsquo;</span><samp><span class="samp">\B</span></samp><span class="samp">&rsquo;</span></samp>&rsquo;<dd>Match the empty string provided it's not at the edge of a word.
+     <br><dt>&lsquo;<samp><span class="samp">\B</span></samp>&rsquo;<dd>Match the empty string provided it's not at the edge of a word.
 
-     <br><dt>&lsquo;<samp><span class="samp">&lsquo;</span><samp><span class="samp">\&lt;</span></samp><span class="samp">&rsquo;</span></samp>&rsquo;<dd>Match the empty string at the beginning of word.
+     <br><dt>&lsquo;<samp><span class="samp">\&lt;</span></samp>&rsquo;<dd>Match the empty string at the beginning of word.
 
-     <br><dt>&lsquo;<samp><span class="samp">&lsquo;</span><samp><span class="samp">\&gt;</span></samp><span class="samp">&rsquo;</span></samp>&rsquo;<dd>Match the empty string at the end of word.
+     <br><dt>&lsquo;<samp><span class="samp">\&gt;</span></samp>&rsquo;<dd>Match the empty string at the end of word.
 
-     <br><dt>&lsquo;<samp><span class="samp">&lsquo;</span><samp><span class="samp">\w</span></samp><span class="samp">&rsquo;</span></samp>&rsquo;<dd>Match word constituent, it is a synonym for &lsquo;<samp><span class="samp">[[:alnum:]]</span></samp>&rsquo;.
+     <br><dt>&lsquo;<samp><span class="samp">\w</span></samp>&rsquo;<dd>Match word constituent, it is a synonym for &lsquo;<samp><span class="samp">[_[:alnum:]]</span></samp>&rsquo;.
 
-     <br><dt>&lsquo;<samp><span class="samp">&lsquo;</span><samp><span class="samp">\W</span></samp><span class="samp">&rsquo;</span></samp>&rsquo;<dd>Match non-word constituent, it is a synonym for &lsquo;<samp><span class="samp">[^[:alnum:]]</span></samp>&rsquo;.
+     <br><dt>&lsquo;<samp><span class="samp">\W</span></samp>&rsquo;<dd>Match non-word constituent, it is a synonym for &lsquo;<samp><span class="samp">[^_[:alnum:]]</span></samp>&rsquo;.
 
-     <br><dt>&lsquo;<samp><span class="samp">&lsquo;</span><samp><span class="samp">\s</span></samp><span class="samp">&rsquo;</span></samp>&rsquo;<dd>Match whitespace, it is a synonym for &lsquo;<samp><span class="samp">[[:space:]]</span></samp>&rsquo;.
+     <br><dt>&lsquo;<samp><span class="samp">\s</span></samp>&rsquo;<dd>Match whitespace, it is a synonym for &lsquo;<samp><span class="samp">[[:space:]]</span></samp>&rsquo;.
 
-     <br><dt>&lsquo;<samp><span class="samp">&lsquo;</span><samp><span class="samp">\S</span></samp><span class="samp">&rsquo;</span></samp>&rsquo;<dd>Match non-whitespace, it is a synonym for &lsquo;<samp><span class="samp">[^[:space:]]</span></samp>&rsquo;.
+     <br><dt>&lsquo;<samp><span class="samp">\S</span></samp>&rsquo;<dd>Match non-whitespace, it is a synonym for &lsquo;<samp><span class="samp">[^[:space:]]</span></samp>&rsquo;.
 
    </dl>
 
@@ -1133,6 +1172,8 @@
 <p><a name="index-anchoring-240"></a>
 The caret &lsquo;<samp><span class="samp">^</span></samp>&rsquo; and the dollar sign &lsquo;<samp><span class="samp">$</span></samp>&rsquo; are meta-characters that
 respectively match the empty string at the beginning and end of a line.
+They are termed <dfn>anchors</dfn>, since they force the match to be &ldquo;anchored&rdquo;
+to beginning or end of a line, respectively.
 
 <div class="node">
 <a name="Back-references-and-Subexpressions"></a>
@@ -1156,7 +1197,7 @@
 For example, &lsquo;<samp><span class="samp">a(.)|b\1</span></samp>&rsquo;
 will not match &lsquo;<samp><span class="samp">ba</span></samp>&rsquo;. 
 When multiple regular expressions are given with
-&lsquo;<samp><span class="samp">-e</span></samp>&rsquo; or from a file (&lsquo;<samp><span class="samp">-f file</span></samp>&rsquo;),
+<samp><span class="option">-e</span></samp> or from a file (&lsquo;<samp><span class="samp">-f </span><var>file</var></samp>&rsquo;),
 back-references are local to each expression.
 
 <div class="node">
@@ -1180,13 +1221,13 @@
 portable scripts should avoid &lsquo;<samp><span class="samp">{</span></samp>&rsquo; in &lsquo;<samp><span class="samp">grep -E</span></samp>&rsquo; patterns and
 should use &lsquo;<samp><span class="samp">[{]</span></samp>&rsquo; to match a literal &lsquo;<samp><span class="samp">{</span></samp>&rsquo;.
 
-   <p><span class="sc">gnu</span> <samp><span class="command">grep -E</span></samp> attempts to support traditional usage by
+   <p>GNU <samp><span class="command">grep -E</span></samp> attempts to support traditional usage by
 assuming that &lsquo;<samp><span class="samp">{</span></samp>&rsquo; is not special if it would be the start of an
 invalid interval specification. 
 For example, the command
 &lsquo;<samp><span class="samp">grep -E '{1'</span></samp>&rsquo; searches for the two-character string &lsquo;<samp><span class="samp">{1</span></samp>&rsquo;
 instead of reporting a syntax error in the regular expression. 
-<span class="sc">posix.2</span> allows this behavior as an extension, but portable scripts
+POSIX allows this behavior as an extension, but portable scripts
 should avoid it.
 
 <div class="node">
@@ -1200,7 +1241,7 @@
 
 <h2 class="chapter">4 Usage</h2>
 
-<p><a name="index-usage_002c-examples-245"></a>Here is an example command that invokes <span class="sc">gnu</span> <samp><span class="command">grep</span></samp>:
+<p><a name="index-usage_002c-examples-245"></a>Here is an example command that invokes GNU <samp><span class="command">grep</span></samp>:
 
 <pre class="example">     grep -i 'hello.*world' menu.h main.c
 </pre>
@@ -1208,7 +1249,7 @@
 contain the string &lsquo;<samp><span class="samp">hello</span></samp>&rsquo; followed by the string &lsquo;<samp><span class="samp">world</span></samp>&rsquo;;
 this is because &lsquo;<samp><span class="samp">.*</span></samp>&rsquo; matches zero or more characters within a line. 
 See <a href="#Regular-Expressions">Regular Expressions</a>. 
-The &lsquo;<samp><span class="samp">-i</span></samp>&rsquo; option causes <samp><span class="command">grep</span></samp>
+The <samp><span class="option">-i</span></samp> option causes <samp><span class="command">grep</span></samp>
 to ignore case, causing it to match the line &lsquo;<samp><span class="samp">Hello, world!</span></samp>&rsquo;, which
 it would not otherwise match. 
 See <a href="#Invoking">Invoking</a>, for more details about
@@ -1239,13 +1280,10 @@
 </pre>
      <p>This differs from the command:
 
-     <pre class="example">          grep -rH 'hello' *.c
+     <pre class="example">          grep -H 'hello' *.c
 </pre>
      <p>which merely looks for &lsquo;<samp><span class="samp">hello</span></samp>&rsquo; in all files in the current
 directory whose names end in &lsquo;<samp><span class="samp">.c</span></samp>&rsquo;. 
-Here the <samp><span class="option">-r</span></samp> is
-probably unnecessary, as recursion occurs only in the unlikely event
-that one of &lsquo;<samp><span class="samp">.c</span></samp>&rsquo; files is a directory. 
 The &lsquo;<samp><span class="samp">find ...</span></samp>&rsquo; command line above is more similar to the command:
 
      <pre class="example">          grep -rH --include='*.c' 'hello' /home/gigi
@@ -1255,7 +1293,7 @@
      <pre class="example">          grep -e '--cut here--' *
 </pre>
      <p class="noindent">searches for all lines matching &lsquo;<samp><span class="samp">--cut here--</span></samp>&rsquo;. 
-Without &lsquo;<samp><span class="samp">-e</span></samp>&rsquo;,
+Without <samp><span class="option">-e</span></samp>,
 <samp><span class="command">grep</span></samp> would attempt to parse &lsquo;<samp><span class="samp">--cut here--</span></samp>&rsquo; as a list of
 options.
 
@@ -1290,7 +1328,7 @@
 
      <pre class="example">          /etc/passwd:eli:x:2098:1000:Eli Smith:/home/eli:/bin/bash
 </pre>
-     <p>Alternatively, use &lsquo;<samp><span class="samp">-H</span></samp>&rsquo;, which is a <span class="sc">gnu</span> extension:
+     <p>Alternatively, use <samp><span class="option">-H</span></samp>, which is a GNU extension:
 
      <pre class="example">          grep -H 'eli' /etc/passwd
 </pre>
@@ -1311,13 +1349,13 @@
      <p>If <samp><span class="command">grep</span></samp> listed all matching &ldquo;lines&rdquo; from a binary file, it
 would probably generate output that is not useful, and it might even
 muck up your display. 
-So <span class="sc">gnu</span> <samp><span class="command">grep</span></samp> suppresses output from
+So GNU <samp><span class="command">grep</span></samp> suppresses output from
 files that appear to be binary files. 
-To force <span class="sc">gnu</span> <samp><span class="command">grep</span></samp>
+To force GNU <samp><span class="command">grep</span></samp>
 to output lines even from files that appear to be binary, use the
-&lsquo;<samp><span class="samp">-a</span></samp>&rsquo; or &lsquo;<samp><span class="samp">--binary-files=text</span></samp>&rsquo; option. 
+<samp><span class="option">-a</span></samp> or &lsquo;<samp><span class="samp">--binary-files=text</span></samp>&rsquo; option. 
 To eliminate the
-&ldquo;Binary file matches&rdquo; messages, use the &lsquo;<samp><span class="samp">-I</span></samp>&rsquo; or
+&ldquo;Binary file matches&rdquo; messages, use the <samp><span class="option">-I</span></samp> or
 &lsquo;<samp><span class="samp">--binary-files=without-match</span></samp>&rsquo; option.
 
      <li>Why doesn't &lsquo;<samp><span class="samp">grep -lv</span></samp>&rsquo; print non-matching file names?
@@ -1325,15 +1363,27 @@
      <p>&lsquo;<samp><span class="samp">grep -lv</span></samp>&rsquo; lists the names of all files containing one or more
 lines that do not match. 
 To list the names of all files that contain no
-matching lines, use the &lsquo;<samp><span class="samp">-L</span></samp>&rsquo; or &lsquo;<samp><span class="samp">--files-without-match</span></samp>&rsquo;
+matching lines, use the <samp><span class="option">-L</span></samp> or <samp><span class="option">--files-without-match</span></samp>
 option.
 
-     <li>I can do <span class="sc">or</span> with &lsquo;<samp><span class="samp">|</span></samp>&rsquo;, but what about <span class="sc">and</span>?
+     <li>I can do &ldquo;OR&rdquo; with &lsquo;<samp><span class="samp">|</span></samp>&rsquo;, but what about &ldquo;AND&rdquo;?
 
      <pre class="example">          grep 'paul' /etc/motd | grep 'franc,ois'
 </pre>
      <p class="noindent">finds all lines that contain both &lsquo;<samp><span class="samp">paul</span></samp>&rsquo; and &lsquo;<samp><span class="samp">franc,ois</span></samp>&rsquo;.
 
+     <li>Why does the empty pattern match every input line?
+
+     <p>The <samp><span class="command">grep</span></samp> command searches for lines that contain strings
+that match a pattern.  Every line contains the empty string, so an
+empty pattern causes <samp><span class="command">grep</span></samp> to find a match on each line.  It
+is not the only such pattern: &lsquo;<samp><span class="samp">^</span></samp>&rsquo;, &lsquo;<samp><span class="samp">$</span></samp>&rsquo;, &lsquo;<samp><span class="samp">.*</span></samp>&rsquo;, and many
+other patterns cause <samp><span class="command">grep</span></samp> to match every line.
+
+     <p>To match empty lines, use the pattern &lsquo;<samp><span class="samp">^$</span></samp>&rsquo;.  To match blank
+lines, use the pattern &lsquo;<samp><span class="samp">^[[:blank:]]*$</span></samp>&rsquo;.  To match no lines at
+all, use the command &lsquo;<samp><span class="samp">grep -f /dev/null</span></samp>&rsquo;.
+
      <li>How can I search in both standard input and in files?
 
      <p>Use the special file name &lsquo;<samp><span class="samp">-</span></samp>&rsquo;:
@@ -1348,7 +1398,7 @@
 
      <pre class="example">          grep -w -e '\(.\)\(.\).\2\1' file
 </pre>
-     <p>It matches the word "radar" or "civic".
+     <p>It matches the word &ldquo;radar&rdquo; or &ldquo;civic.&rdquo;
 
      <p>Guglielmo Bondioni proposed a single RE
 that finds all palindromes up to 19 characters long
@@ -1356,7 +1406,7 @@
 
      <pre class="smallexample">          grep -E -e '^(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?).?\9\8\7\6\5\4\3\2\1$' file
 </pre>
-     <p>Note this is done by using <span class="sc">gnu</span> ERE extensions;
+     <p>Note this is done by using GNU ERE extensions;
 it might not be portable to other implementations of <samp><span class="command">grep</span></samp>.
 
      <li>Why is this back-reference failing?
@@ -1446,13 +1496,13 @@
 <h2 class="chapter">6 Copying</h2>
 
 <p><a name="index-copying-251"></a>
-GNU grep is licensed under the GNU GPL, which makes it <dfn>free
+GNU <samp><span class="command">grep</span></samp> is licensed under the GNU GPL, which makes it <dfn>free
 software</dfn>.
 
    <p>The &ldquo;free&rdquo; in &ldquo;free software&rdquo; refers to liberty, not price. As
 some GNU project advocates like to point out, think of &ldquo;free speech&rdquo;
 rather than &ldquo;free beer&rdquo;.  In short, you have the right (freedom) to
-run and change grep and distribute it to other people, and&mdash;if you
+run and change <samp><span class="command">grep</span></samp> and distribute it to other people, and&mdash;if you
 want&mdash;charge money for doing either.  The important restriction is
 that you have to grant your recipients the same rights and impose the
 same restrictions.
@@ -1485,7 +1535,7 @@
 
 <!-- This file is intended to be included within another document, -->
 <!-- hence no sectioning command or @node. -->
-<pre class="display">     Copyright &copy; 2000-2002, 2007-2008, 2010-2011 Free Software
+<pre class="display">     Copyright &copy; 2000-2002, 2007-2008, 2010-2012 Free Software
      Foundation, Inc.
      <a href="http://fsf.org/">http://fsf.org/</a>
      
@@ -2058,7 +2108,7 @@
 <li><a href="#index-basic-regular-expressions-243">basic regular expressions</a>: <a href="#Basic-vs-Extended">Basic vs Extended</a></li>
 <li><a href="#index-before-context-82">before context</a>: <a href="#Context-Line-Control">Context Line Control</a></li>
 <li><a href="#index-binary-files-95">binary files</a>: <a href="#File-and-Directory-Selection">File and Directory Selection</a></li>
-<li><a href="#index-binary-files_002c-_0040sc_007bms_002ddos_007d_002f_0040sc_007bms_007d_002dWindows-126">binary files, <span class="sc">ms-dos</span>/<span class="sc">ms</span>-Windows</a>: <a href="#Other-Options">Other Options</a></li>
+<li><a href="#index-binary-files_002c-MS_002dDOS_002fMS_002dWindows-126">binary files, MS-DOS/MS-Windows</a>: <a href="#Other-Options">Other Options</a></li>
 <li><a href="#index-blank-_0040r_007bcharacter-class_007d-216"><code>blank </code><span class="roman">character class</span></a>: <a href="#Character-Classes-and-Bracket-Expressions">Character Classes and Bracket Expressions</a></li>
 <li><a href="#index-blank-characters-217">blank characters</a>: <a href="#Character-Classes-and-Bracket-Expressions">Character Classes and Bracket Expressions</a></li>
 <li><a href="#index-bn-GREP_005fCOLORS-_0040r_007bcapability_007d-145"><code>bn GREP_COLORS </code><span class="roman">capability</span></a>: <a href="#Environment-Variables">Environment Variables</a></li>
@@ -2070,7 +2120,7 @@
 <li><a href="#index-Bugs_002c-known-250">Bugs, known</a>: <a href="#Reporting-Bugs">Reporting Bugs</a></li>
 <li><a href="#index-bugs_002c-reporting-249">bugs, reporting</a>: <a href="#Reporting-Bugs">Reporting Bugs</a></li>
 <li><a href="#index-byte-offset-54">byte offset</a>: <a href="#Output-Line-Prefix-Control">Output Line Prefix Control</a></li>
-<li><a href="#index-byte-offsets_002c-on-_0040sc_007bms_002ddos_007d_002f_0040sc_007bms_007d_002dWindows-72">byte offsets, on <span class="sc">ms-dos</span>/<span class="sc">ms</span>-Windows</a>: <a href="#Output-Line-Prefix-Control">Output Line Prefix Control</a></li>
+<li><a href="#index-byte-offsets_002c-on-MS_002dDOS_002fMS_002dWindows-72">byte offsets, on MS-DOS/MS-Windows</a>: <a href="#Output-Line-Prefix-Control">Output Line Prefix Control</a></li>
 <li><a href="#index-case-insensitive-search-16">case insensitive search</a>: <a href="#Matching-Control">Matching Control</a></li>
 <li><a href="#index-changing-name-of-standard-input-62">changing name of standard input</a>: <a href="#Output-Line-Prefix-Control">Output Line Prefix Control</a></li>
 <li><a href="#index-character-class-208">character class</a>: <a href="#Character-Classes-and-Bracket-Expressions">Character Classes and Bracket Expressions</a></li>
@@ -2140,8 +2190,8 @@
 <li><a href="#index-memory-mapped-input-122">memory mapped input</a>: <a href="#Other-Options">Other Options</a></li>
 <li><a href="#index-message-language-161">message language</a>: <a href="#Environment-Variables">Environment Variables</a></li>
 <li><a href="#index-ms-GREP_005fCOLORS-_0040r_007bcapability_007d-141"><code>ms GREP_COLORS </code><span class="roman">capability</span></a>: <a href="#Environment-Variables">Environment Variables</a></li>
-<li><a href="#index-g_t_0040sc_007bms_002ddos_007d_002f_0040sc_007bms_007d_002dWindows-binary-files-125"><span class="sc">ms-dos</span>/<span class="sc">ms</span>-Windows binary files</a>: <a href="#Other-Options">Other Options</a></li>
-<li><a href="#index-g_t_0040sc_007bms_002ddos_007d_002f_0040sc_007bms_007d_002dWindows-byte-offsets-71"><span class="sc">ms-dos</span>/<span class="sc">ms</span>-Windows byte offsets</a>: <a href="#Output-Line-Prefix-Control">Output Line Prefix Control</a></li>
+<li><a href="#index-MS_002dDOS_002fMS_002dWindows-binary-files-125">MS-DOS/MS-Windows binary files</a>: <a href="#Other-Options">Other Options</a></li>
+<li><a href="#index-MS_002dDOS_002fMS_002dWindows-byte-offsets-71">MS-DOS/MS-Windows byte offsets</a>: <a href="#Output-Line-Prefix-Control">Output Line Prefix Control</a></li>
 <li><a href="#index-mt-GREP_005fCOLORS-_0040r_007bcapability_007d-140"><code>mt GREP_COLORS </code><span class="roman">capability</span></a>: <a href="#Environment-Variables">Environment Variables</a></li>
 <li><a href="#index-names-of-matching-files-38">names of matching files</a>: <a href="#General-Output-Control">General Output Control</a></li>
 <li><a href="#index-national-language-support-152">national language support</a>: <a href="#Environment-Variables">Environment Variables</a></li>
@@ -2183,7 +2233,7 @@
 <li><a href="#index-usage-summary_002c-printing-3">usage summary, printing</a>: <a href="#Generic-Program-Information">Generic Program Information</a></li>
 <li><a href="#index-usage_002c-examples-245">usage, examples</a>: <a href="#Usage">Usage</a></li>
 <li><a href="#index-using-_0040command_007bgrep_007d_002c-Q_0026A-246">using <samp><span class="command">grep</span></samp>, Q&amp;A</a>: <a href="#Usage">Usage</a></li>
-<li><a href="#index-variants-of-_0040command_007bgerp_007d-169">variants of <samp><span class="command">gerp</span></samp></a>: <a href="#grep-Programs">grep Programs</a></li>
+<li><a href="#index-variants-of-_0040command_007bgrep_007d-169">variants of <samp><span class="command">grep</span></samp></a>: <a href="#grep-Programs">grep Programs</a></li>
 <li><a href="#index-version_002c-printing-6">version, printing</a>: <a href="#Generic-Program-Information">Generic Program Information</a></li>
 <li><a href="#index-whitespace-characters-233">whitespace characters</a>: <a href="#Character-Classes-and-Bracket-Expressions">Character Classes and Bracket Expressions</a></li>
 <li><a href="#index-with-filename-prefix-57">with filename prefix</a>: <a href="#Output-Line-Prefix-Control">Output Line Prefix Control</a></li>
@@ -2195,5 +2245,12 @@
 <li><a href="#index-g_t_0040_007b_0040var_007bn_007d_002c_0040var_007bm_007d_0040_007d-204"><code>{</code><var>n</var><code>,</code><var>m</var><code>}</code></a>: <a href="#Fundamental-Structure">Fundamental Structure</a></li>
 <li><a href="#index-g_t_0040_007b_0040var_007bn_007d_002c_0040_007d-198"><code>{</code><var>n</var><code>,}</code></a>: <a href="#Fundamental-Structure">Fundamental Structure</a></li>
 <li><a href="#index-g_t_0040_007b_0040var_007bn_007d_0040_007d-195"><code>{</code><var>n</var><code>}</code></a>: <a href="#Fundamental-Structure">Fundamental Structure</a></li>
-   </ul></body></html>
+   </ul><div class="footnote">
+<hr>
+<a name="texinfo-footnotes-in-document"></a><h4>Footnotes</h4><p class="footnote"><small>[<a name="fn-1" href="#fnd-1">1</a>]</small> Of course, 7th Edition
+Unix predated POSIX by several years!</p>
+
+   <hr></div>
+
+</body></html>
 


From MAILER-DAEMON Fri Mar 02 04:29:41 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3Oo1-0000k5-6s
	for mharc-grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:41 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36230)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnX-0000Kf-4Z
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:39 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnN-0004zJ-NG
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:10 -0500
Received: from fencepost.gnu.org ([208.118.235.10]:36162)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3OnN-0004z8-Ka
	for grep-commit@gnu.org; Fri, 02 Mar 2012 04:29:01 -0500
Received: from eggs.gnu.org ([208.118.235.92]:35865)
	by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <jim@meyering.net>) id 1S3OnM-0007IT-Uc
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:01 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omy-0004Yz-6b
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:29:00 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37452)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3Omy-0004Yq-3G
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 04:28:36 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3Omx-0003yn-FO
	for grep-webcvs-diffs@gnu.org; Fri, 02 Mar 2012 09:28:35 +0000
Date: Fri, 02 Mar 2012 09:28:35 +0000
Message-Id: <E1S3Omx-0003yn-FO@vcs.savannah.gnu.org>
To: grep-webcvs-diffs@gnu.org
Subject: Changes to grep/manual/grep.texi.tar.gz,v
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Mar 2012 09:29:39 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Changes by:	Jim Meyering <meyering>	12/03/02 09:28:32

Index: grep.texi.tar.gz
===================================================================
RCS file: /webcvs/grep/grep/manual/grep.texi.tar.gz,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
Binary files /tmp/cvsHuHQl8 and /tmp/cvsJeTbsW differ


From MAILER-DAEMON Sat Mar 03 05:14:52 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S3lzI-0002DJ-IS
	for mharc-grep-commit@gnu.org; Sat, 03 Mar 2012 05:14:52 -0500
Received: from eggs.gnu.org ([208.118.235.92]:57150)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3lzE-0002Co-Qe
	for grep-commit@gnu.org; Sat, 03 Mar 2012 05:14:50 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3lzC-0001Uq-Fa
	for grep-commit@gnu.org; Sat, 03 Mar 2012 05:14:48 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:50955)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S3lzC-0001Uj-Bv
	for grep-commit@gnu.org; Sat, 03 Mar 2012 05:14:46 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S3lzB-0004fX-CX
	for grep-commit@gnu.org; Sat, 03 Mar 2012 10:14:45 +0000
Date: Sat, 03 Mar 2012 10:14:45 +0000
Message-Id: <E1S3lzB-0004fX-CX@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.11-3-g4b22246
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e16e21caf7f2d68003800e684e1b53ba75613209
X-Git-Newrev: 4b2224681fbc297bf585630b679d8540a02b78d3
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Mar 2012 10:14:50 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  4b2224681fbc297bf585630b679d8540a02b78d3 (commit)
       via  3db1e8238af7201b991c34dd51e156b852be3304 (commit)
      from  e16e21caf7f2d68003800e684e1b53ba75613209 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=4b2224681fbc297bf585630b679d8540a02b78d3


commit 4b2224681fbc297bf585630b679d8540a02b78d3
Author: Jim Meyering <meyering@redhat.com>
Date:   Sat Mar 3 10:51:11 2012 +0100

    maint: use an optimal-for-grep xz compression setting
    
    * cfg.mk (XZ_OPT): Use -6e (determined empirically, see comments).
    This sacrifices a meager 60 bytes of compressed tarball size for a
    55-MiB decrease in the memory required during decompression.  I.e.,
    using -9e would shave off only 60 bytes from the tar.xz file, yet
    would force every decompression process to use 55 MiB more memory.

diff --git a/cfg.mk b/cfg.mk
index 08bb156..84115c2 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -31,6 +31,26 @@ bootstrap-tools = autoconf,automake,gnulib
 # Now that we have better tests, make this the default.
 export VERBOSE = yes
 
+# Comparing tarball sizes compressed using different xz presets, we see
+# that -6e adds only 60 bytes to the size of the tarball, yet reduces
+# (from -9) the decompression memory requirement from 64 MiB to 9 MiB.
+# Don't be tempted by -5e, since -6 and -5 use the same dictionary size.
+# $ for i in {4,5,6,7,8,9}{e,}; do \
+#     (n=$(xz -$i < grep-2.11.tar|wc -c);echo $n $i) & done |sort -nr
+# 1236632 4
+# 1162564 5
+# 1140988 4e
+# 1139620 6
+# 1139480 7
+# 1139480 8
+# 1139480 9
+# 1129552 5e
+# 1127616 6e
+# 1127556 7e
+# 1127556 8e
+# 1127556 9e
+export XZ_OPT = -6e
+
 old_NEWS_hash = 347e90ee0ec0489707df139ca3539934
 
 # Many m4 macros names once began with `jm_'.

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=3db1e8238af7201b991c34dd51e156b852be3304


commit 4b2224681fbc297bf585630b679d8540a02b78d3
Author: Jim Meyering <meyering@redhat.com>
Date:   Sat Mar 3 10:51:11 2012 +0100

    maint: use an optimal-for-grep xz compression setting
    
    * cfg.mk (XZ_OPT): Use -6e (determined empirically, see comments).
    This sacrifices a meager 60 bytes of compressed tarball size for a
    55-MiB decrease in the memory required during decompression.  I.e.,
    using -9e would shave off only 60 bytes from the tar.xz file, yet
    would force every decompression process to use 55 MiB more memory.

diff --git a/cfg.mk b/cfg.mk
index 08bb156..84115c2 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -31,6 +31,26 @@ bootstrap-tools = autoconf,automake,gnulib
 # Now that we have better tests, make this the default.
 export VERBOSE = yes
 
+# Comparing tarball sizes compressed using different xz presets, we see
+# that -6e adds only 60 bytes to the size of the tarball, yet reduces
+# (from -9) the decompression memory requirement from 64 MiB to 9 MiB.
+# Don't be tempted by -5e, since -6 and -5 use the same dictionary size.
+# $ for i in {4,5,6,7,8,9}{e,}; do \
+#     (n=$(xz -$i < grep-2.11.tar|wc -c);echo $n $i) & done |sort -nr
+# 1236632 4
+# 1162564 5
+# 1140988 4e
+# 1139620 6
+# 1139480 7
+# 1139480 8
+# 1139480 9
+# 1129552 5e
+# 1127616 6e
+# 1127556 7e
+# 1127556 8e
+# 1127556 9e
+export XZ_OPT = -6e
+
 old_NEWS_hash = 347e90ee0ec0489707df139ca3539934
 
 # Many m4 macros names once began with `jm_'.

-----------------------------------------------------------------------

Summary of changes:
 cfg.mk |   20 ++++++++++++++++++++
 gnulib |    2 +-
 2 files changed, 21 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Tue Mar 06 19:28:52 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S54kO-0001Tj-8P
	for mharc-grep-commit@gnu.org; Tue, 06 Mar 2012 19:28:52 -0500
Received: from eggs.gnu.org ([208.118.235.92]:55597)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <worthspending@gmail.com>) id 1S52uS-0007xG-EI
	for grep-commit@gnu.org; Tue, 06 Mar 2012 17:31:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <worthspending@gmail.com>) id 1S52uQ-00029X-Qf
	for grep-commit@gnu.org; Tue, 06 Mar 2012 17:31:07 -0500
Received: from mail-yx0-f169.google.com ([209.85.213.169]:33386)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <worthspending@gmail.com>) id 1S52uQ-00029L-JY
	for grep-commit@gnu.org; Tue, 06 Mar 2012 17:31:06 -0500
Received: by yenm8 with SMTP id m8so3099618yen.0
	for <grep-commit@gnu.org>; Tue, 06 Mar 2012 14:31:04 -0800 (PST)
Received-SPF: pass (google.com: domain of worthspending@gmail.com designates
	10.60.14.101 as permitted sender) client-ip=10.60.14.101; 
Authentication-Results: mr.google.com; spf=pass (google.com: domain of
	worthspending@gmail.com designates 10.60.14.101 as permitted
	sender) smtp.mail=worthspending@gmail.com;
	dkim=pass header.i=worthspending@gmail.com
Received: from mr.google.com ([10.60.14.101])
	by 10.60.14.101 with SMTP id o5mr12530439oec.20.1331073063867 (num_hops
	= 1); Tue, 06 Mar 2012 14:31:03 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=mime-version:date:message-id:subject:from:to:content-type;
	bh=tLLVbBl6pWuaRmBmXqJHxzx4tbPtfk3vzLUUNC77ghs=;
	b=IG28SULemn4/5WrQPJS1uDXrS81a+a7XmIFGsyAfm2ZZRSdRZFx0v9oMtiwfnIJYkc
	3fC/tVFQi2SIg5ZFzDqrwTbdo7dxRu033kPOMkTjr/9mMn0Gx/hKPWMknmkHWGQebehC
	k8Nj09VSmie85mn1OZzriJFoqT37XS8fPWlDAt/8v8UtxU68IlIXtYz8S/nc3FFkgPpZ
	cTJJdGWAoInwMik+kQzKDOvMwmFARe+16SjitCxzMmFgNnU4yDlvinPr7geN4UGuRWmf
	VIAdAKJSHAa1frfNl2d70fD20fDQByhRt51Or6+pf8U4+4EbVbrrbEsbnLh3tCC3Apua
	8MEA==
MIME-Version: 1.0
Received: by 10.60.14.101 with SMTP id o5mr10822853oec.20.1331073063808; Tue,
	06 Mar 2012 14:31:03 -0800 (PST)
Received: by 10.182.121.71 with HTTP; Tue, 6 Mar 2012 14:31:03 -0800 (PST)
Date: Tue, 6 Mar 2012 16:31:03 -0600
Message-ID: <CAAVzzf6dSU4YcvWWo8ydXocQ7cANoyKwgfkTome2J00J6RQ0GQ@mail.gmail.com>
Subject: grep using the recursive option
From: worthspending <worthspending@gmail.com>
To: grep-commit@gnu.org
Content-Type: multipart/alternative; boundary=e89a8fb1f1a023701004ba9a99c1
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 209.85.213.169
X-Mailman-Approved-At: Tue, 06 Mar 2012 19:28:50 -0500
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Mar 2012 22:31:09 -0000

--e89a8fb1f1a023701004ba9a99c1
Content-Type: text/plain; charset=ISO-8859-1

The following work as expected.

# search everything in the current directory
grep index *

# search all files with an .rb extension
grep index *.rb

# search everything in the current directory and recursively through
sub-directories
grep -r index *

# this one does not work
grep -r index *.rb

I can only seem to get the -r option to work if I use * for everything.

I don't understand.

--e89a8fb1f1a023701004ba9a99c1
Content-Type: text/html; charset=ISO-8859-1

The following work as expected.<div><br></div><div># search everything in the current directory</div><div>grep index *</div><div><br></div><div># search all files with an .rb extension</div><div>grep index *.rb</div><div><br>
</div><div># search everything in the current directory and recursively through sub-directories</div><div>grep -r index *</div><div><br></div><div># this one does not work</div><div>grep -r index *.rb</div><div><br></div>
<div>I can only seem to get the -r option to work if I use * for everything.</div><div><br></div><div>I don&#39;t understand.</div><div><br></div>

--e89a8fb1f1a023701004ba9a99c1--


From MAILER-DAEMON Fri Mar 09 06:34:54 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S5y62-0003Ei-6y
	for mharc-grep-commit@gnu.org; Fri, 09 Mar 2012 06:34:54 -0500
Received: from eggs.gnu.org ([208.118.235.92]:49117)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S5y5v-0003EB-4D
	for grep-commit@gnu.org; Fri, 09 Mar 2012 06:34:52 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S5y5t-0004B4-64
	for grep-commit@gnu.org; Fri, 09 Mar 2012 06:34:46 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:38388)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S5y5s-0004At-VK
	for grep-commit@gnu.org; Fri, 09 Mar 2012 06:34:45 -0500
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S5y5s-00082W-GR
	for grep-commit@gnu.org; Fri, 09 Mar 2012 11:34:44 +0000
Date: Fri, 09 Mar 2012 11:34:44 +0000
Message-Id: <E1S5y5s-00082W-GR@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.11-4-gd0bb7f9
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4b2224681fbc297bf585630b679d8540a02b78d3
X-Git-Newrev: d0bb7f9c1505f08362dbf107d47d8d6795c93fbf
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Mar 2012 11:34:53 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  d0bb7f9c1505f08362dbf107d47d8d6795c93fbf (commit)
      from  4b2224681fbc297bf585630b679d8540a02b78d3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=d0bb7f9c1505f08362dbf107d47d8d6795c93fbf


commit d0bb7f9c1505f08362dbf107d47d8d6795c93fbf
Author: Jim Meyering <meyering@redhat.com>
Date:   Fri Mar 9 12:25:17 2012 +0100

    tests: exercise two recently-fixed bugs
    
    * tests/repetition-overflow: New test for bugs fixed by commit
    v2.10-82-gcbbc1a4.
    * tests/Makefile.am (TESTS): Add it.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0a22ba6..c2cd2f7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -76,6 +76,7 @@ TESTS =						\
   pcre-z					\
   prefix-of-multibyte				\
   r-dot						\
+  repetition-overflow				\
   reversed-range-endpoints			\
   sjis-mb					\
   spencer1					\
diff --git a/tests/repetition-overflow b/tests/repetition-overflow
new file mode 100755
index 0000000..c92de23
--- /dev/null
+++ b/tests/repetition-overflow
@@ -0,0 +1,19 @@
+#!/bin/sh
+# These would fail (i.e., match erroneously) prior to grep-2.11.
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+
+xp1=4294967297 # 2^32+1
+xp2=4294967298 # 2^32+2
+
+fail=0
+
+# Before grep-2.11, when DFA-matching, a repetition count exceeding the
+# range of "unsigned int" would silently wrap around.   Hence, 2^32+1
+# would be treated just like "1", and both of these would mistakenly match.
+
+echo abc  | grep -E "b{$xp1}"   > out 2>&1; test $? = 1 || fail=1
+compare out /dev/null || fail=1
+echo abbc | grep -E "b{1,$xp2}" > out 2>&1; test $? = 1 || fail=1
+compare out /dev/null || fail=1
+
+Exit $fail

-----------------------------------------------------------------------

Summary of changes:
 tests/Makefile.am         |    1 +
 tests/repetition-overflow |   19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100755 tests/repetition-overflow


hooks/post-receive
-- 
grep


From MAILER-DAEMON Mon Mar 12 04:50:58 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S70y2-0006eH-PT
	for mharc-grep-commit@gnu.org; Mon, 12 Mar 2012 04:50:58 -0400
Received: from eggs.gnu.org ([208.118.235.92]:37737)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S70xf-0006aa-3o
	for grep-commit@gnu.org; Mon, 12 Mar 2012 04:50:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S70xZ-0006Sg-Tn
	for grep-commit@gnu.org; Mon, 12 Mar 2012 04:50:34 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:42260)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1S70xZ-0006SV-Qa
	for grep-commit@gnu.org; Mon, 12 Mar 2012 04:50:29 -0400
Received: from meyering by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jim@meyering.net>) id 1S70xO-0007h4-Oo
	for grep-commit@gnu.org; Mon, 12 Mar 2012 08:50:19 +0000
Date: Mon, 12 Mar 2012 08:50:18 +0000
Message-Id: <E1S70xO-0007h4-Oo@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.11-5-g12c957f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d0bb7f9c1505f08362dbf107d47d8d6795c93fbf
X-Git-Newrev: 12c957f786b12a4dd116f9c40a715d671d17fa16
From: Jim Meyering <jim@meyering.net>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Mar 2012 08:50:58 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  12c957f786b12a4dd116f9c40a715d671d17fa16 (commit)
      from  d0bb7f9c1505f08362dbf107d47d8d6795c93fbf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=12c957f786b12a4dd116f9c40a715d671d17fa16


commit 12c957f786b12a4dd116f9c40a715d671d17fa16
Author: Allan McRae <allan@archlinux.org>
Date:   Mon Mar 12 09:28:01 2012 +0100

    grep: fix segfault with -r --exclude-dir and no file operand
    
    * src/main.c (grepdir): Don't invoke excluded_file_name on NULL.
    * NEWS (Bug fixes): Mention it.

diff --git a/NEWS b/NEWS
index d0a63d5..d4d70f5 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@ GNU grep NEWS                                    -*- outline -*-
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** Bug fixes
+
+   grep no longer segfaults with -r --exclude-dir and no file operand.
+   I.e., ":|grep -r --exclude-dir=D PAT" would segfault.
+
 
 * Noteworthy changes in release 2.11 (2012-03-02) [stable]
 
diff --git a/src/main.c b/src/main.c
index 2f6c761..f4f1235 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1361,7 +1361,7 @@ grepdir (char const *dir, struct stats const *stats)
   struct stats const *ancestor;
   char *name_space;
   int status = 1;
-  if (excluded_directory_patterns
+  if (dir && excluded_directory_patterns
       && excluded_file_name (excluded_directory_patterns, dir))
     return 1;
 

-----------------------------------------------------------------------

Summary of changes:
 NEWS       |    5 +++++
 src/main.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Mon Mar 12 13:03:23 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S78eZ-00027y-JB
	for mharc-grep-commit@gnu.org; Mon, 12 Mar 2012 13:03:23 -0400
Received: from eggs.gnu.org ([208.118.235.92]:42390)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1S78eX-00025c-J4
	for grep-commit@gnu.org; Mon, 12 Mar 2012 13:03:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1S78e6-0000PK-KB
	for grep-commit@gnu.org; Mon, 12 Mar 2012 13:03:21 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:58626)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1S78e6-0000PE-Gw
	for grep-commit@gnu.org; Mon, 12 Mar 2012 13:02:54 -0400
Received: from eggert by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <eggert@cs.ucla.edu>) id 1S78e5-0003Ig-N2
	for grep-commit@gnu.org; Mon, 12 Mar 2012 17:02:53 +0000
Date: Mon, 12 Mar 2012 17:02:53 +0000
Message-Id: <E1S78e5-0003Ig-N2@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.11-7-g354516c
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 12c957f786b12a4dd116f9c40a715d671d17fa16
X-Git-Newrev: 354516cd121a7cdbad1397662b718b04c349692a
From: Paul Eggert <eggert@cs.ucla.edu>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Mar 2012 17:03:23 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  354516cd121a7cdbad1397662b718b04c349692a (commit)
       via  2ba6d82ef0d607dbff4f2be63fe9b13832b09070 (commit)
      from  12c957f786b12a4dd116f9c40a715d671d17fa16 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=354516cd121a7cdbad1397662b718b04c349692a


commit 354516cd121a7cdbad1397662b718b04c349692a
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Mon Mar 12 09:59:16 2012 -0700

    tests: port big-match to non-GNU dd
    
    * tests/big-match: Don't assume GNU dd extension "bs=1M".

diff --git a/tests/big-match b/tests/big-match
index 1a3aeed..51e0ffd 100755
--- a/tests/big-match
+++ b/tests/big-match
@@ -5,7 +5,7 @@
 expensive_
 
 # Create a one-line file containing slightly more than 2 GiB.
-echo x | dd bs=1M seek=2048 >2G-plus-2 || framework_failure_
+echo x | dd bs=1024k seek=2048 >2G-plus-2 || framework_failure_
 
 skip_diagnostic=
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=2ba6d82ef0d607dbff4f2be63fe9b13832b09070


commit 354516cd121a7cdbad1397662b718b04c349692a
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Mon Mar 12 09:59:16 2012 -0700

    tests: port big-match to non-GNU dd
    
    * tests/big-match: Don't assume GNU dd extension "bs=1M".

diff --git a/tests/big-match b/tests/big-match
index 1a3aeed..51e0ffd 100755
--- a/tests/big-match
+++ b/tests/big-match
@@ -5,7 +5,7 @@
 expensive_
 
 # Create a one-line file containing slightly more than 2 GiB.
-echo x | dd bs=1M seek=2048 >2G-plus-2 || framework_failure_
+echo x | dd bs=1024k seek=2048 >2G-plus-2 || framework_failure_
 
 skip_diagnostic=
 

-----------------------------------------------------------------------

Summary of changes:
 tests/big-match       |    2 +-
 tests/include-exclude |    4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Thu Mar 15 01:29:12 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S83FQ-0003Us-1u
	for mharc-grep-commit@gnu.org; Thu, 15 Mar 2012 01:29:12 -0400
Received: from eggs.gnu.org ([208.118.235.92]:54881)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1S83FK-0003Sh-Gm
	for grep-commit@gnu.org; Thu, 15 Mar 2012 01:29:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1S83FF-0001w3-NK
	for grep-commit@gnu.org; Thu, 15 Mar 2012 01:29:06 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:37444)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1S83FF-0001v8-IW
	for grep-commit@gnu.org; Thu, 15 Mar 2012 01:29:01 -0400
Received: from eggert by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <eggert@cs.ucla.edu>) id 1S83FE-0003PY-Jf
	for grep-commit@gnu.org; Thu, 15 Mar 2012 05:29:01 +0000
Date: Thu, 15 Mar 2012 05:29:00 +0000
Message-Id: <E1S83FE-0003PY-Jf@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.11-8-gc6e3ea6
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 354516cd121a7cdbad1397662b718b04c349692a
X-Git-Newrev: c6e3ea61d9f08aa0128a0eb13d31a2fbad376f99
From: Paul Eggert <eggert@cs.ucla.edu>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Mar 2012 05:29:10 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  c6e3ea61d9f08aa0128a0eb13d31a2fbad376f99 (commit)
      from  354516cd121a7cdbad1397662b718b04c349692a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=c6e3ea61d9f08aa0128a0eb13d31a2fbad376f99


commit c6e3ea61d9f08aa0128a0eb13d31a2fbad376f99
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Sat Mar 10 11:29:32 2012 -0800

    grep: -r no longer follows symlinks; use fts
    
    Change -r to follow only command-line symlinks, and by default to
    read only devices named on the command line.  This is a simple
    way to get a more-useful behavior when searching random
    directories; the idea is to use 'find' if you want something fancy.
    -R acts as before and gets a new alias --dereference-recursive.
    The code now uses fts internally, so it is more robust and
    faster with large hierarchies.
    * .gitignore: Remove lib/savedir.c, lib/savedir.h.
    * tests/symlink: New file
    * Makefile.boot (LIB_OBJS_core): Remove isdir.o, savedir.o.
    Perhaps other changes are needed too, but I'm not sure what
    this makefile is for.
    * NEWS: Document changes.
    * doc/grep.texi (File and Directory Selection): Likewise.
    * bootstrap.conf (gnulib_modules): Remove dirent, dirname, isdir, open.
    Add fstatat, fts, openat-safer.
    * lib/Makefile.am (libgreputils_a_SOURCES): Remove savedir.c, savedir.h.
    * lib/savedir.c, lib/savedir.h: Remove.
    * po/POTFILES.in: Add lib/openat-die.c.
    * src/main.c: Include fcntl-safer.h, fts_.h.  Don't include
    isdir.h, savedir.h.
    (struct stats, stats_base): Remove.
    (long_options, usage, main): Add --dereference-recursive and
    implement -r vs -R.
    (filename_prefix_len, fts_options): New static vars.
    (basic_fts_options, READ_COMMAND_LINE_DEVICES): New constants.
    (devices): Now defaults to READ_COMMAND_LINE_DEVICES.
    (reset, grep): Now takes just struct stat rather than file name and
    struct stats.  All callers changed.
    (fillbuf): Now takes struct stat reather than struct stats.
    All callers changed.
    (grep): Don't worry about recursing too deeply; fts and grepdesc
    handle this now.
    (is_device_mode, grepdirent, grepdesc, grep_command_line_args):
    New functions.
    (grepfile): New args DIRDESC, FOLLOW, COMMAND_LINE.  Remove struct stats
    arg.  All callers changed.  Use openat_safer rather than open.
    Use desc == STDIN_FILENO to tell whether we're reading "-".
    Don't worry about EINTR when closing -- not possible, since we're
    not catching signals.
    * tests/Makefile.am (TESTS): Add symlink.
    * tests/symlink: New file.

diff --git a/.gitignore b/.gitignore
index 35f5d10..0b195d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,5 +64,3 @@ TAGS
 !/lib/colorize-posix.c
 !/lib/colorize-w32.c
 !/lib/colorize.h
-!/lib/savedir.c
-!/lib/savedir.h
diff --git a/Makefile.boot b/Makefile.boot
index 043429b..4414110 100644
--- a/Makefile.boot
+++ b/Makefile.boot
@@ -41,10 +41,8 @@ LIB_OBJS_core =  \
       $(libdir)/error.$(OBJEXT) \
       $(libdir)/exclude.$(OBJEXT) \
       $(libdir)/hard-locale.$(OBJEXT) \
-      $(libdir)/isdir.$(OBJEXT) \
       $(libdir)/quotearg.$(OBJEXT) \
       $(libdir)/regex.$(OBJEXT) \
-      $(libdir)/savedir.$(OBJEXT) \
       $(libdir)/strtoumax.$(OBJEXT) \
       $(libdir)/xmalloc.$(OBJEXT) \
       $(libdir)/xstrtol.$(OBJEXT) \
diff --git a/NEWS b/NEWS
index d4d70f5..6dad608 100644
--- a/NEWS
+++ b/NEWS
@@ -4,9 +4,25 @@ GNU grep NEWS                                    -*- outline -*-
 
 ** Bug fixes
 
-   grep no longer segfaults with -r --exclude-dir and no file operand.
-   I.e., ":|grep -r --exclude-dir=D PAT" would segfault.
+  grep no longer segfaults with -r --exclude-dir and no file operand.
+  I.e., ":|grep -r --exclude-dir=D PAT" would segfault.
 
+  Recursive grep now uses fts for directory traversal, so it can
+  handle much-larger directories without reporting things like "File
+  name too long", and it can run much faster when dealing with large
+  directory hierarchies.
+
+** New features
+
+  The -R option now has a long-option alias --dereference-recursive.
+
+** Changes in behavior
+
+  The -r (--recursive) option now follows only command-line symlinks.
+  Also, by default -r now reads a device only if it is named on the command
+  line; this can be overridden with --devices.  -R acts as before, so
+  use -R if you prefer the old behavior of following all symlinks and
+  defaulting to reading all devices.
 
 * Noteworthy changes in release 2.11 (2012-03-02) [stable]
 
diff --git a/bootstrap.conf b/bootstrap.conf
index 45bb33d..7a71015 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -24,13 +24,13 @@ binary-io
 btowc
 c-ctype
 closeout
-dirent
-dirname
 do-release-commit-and-tag
 error
 exclude
 fcntl-h
 fnmatch
+fstatat
+fts
 getopt-gnu
 getpagesize
 gettext-h
@@ -44,7 +44,6 @@ intprops
 inttypes
 isatty
 isblank
-isdir
 iswctype
 largefile
 lseek
@@ -58,7 +57,7 @@ memchr
 mempcpy
 minmax
 obstack
-open
+openat-safer
 progname
 propername
 quote
diff --git a/doc/grep.texi b/doc/grep.texi
index c014d8f..1840e21 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -606,16 +606,21 @@ if the terminal driver interprets some of it as commands.
 @opindex --devices
 @cindex device search
 If an input file is a device, FIFO, or socket, use @var{action} to process it.
-By default, @var{action} is @samp{read},
-which means that devices are read just as if they were ordinary files.
+If @var{action} is @samp{read},
+all devices are read just as if they were ordinary files.
 If @var{action} is @samp{skip},
 devices, FIFOs, and sockets are silently skipped.
+By default, devices are read if they are on the command line or if the
+@option{-R} (@option{--dereference-recursive}) option is used, and are
+skipped if they are encountered recursively and the @option{-r}
+(@option{--recursive}) option is used.
 
 @item -d @var{action}
 @itemx --directories=@var{action}
 @opindex -d
 @opindex --directories
 @cindex directory search
+@cindex symbolic links
 If an input file is a directory, use @var{action} to process it.
 By default, @var{action} is @samp{read},
 which means that directories are read just as if they were ordinary files
@@ -624,7 +629,8 @@ and will cause @command{grep}
 to print error messages for every directory or silently skip them).
 If @var{action} is @samp{skip}, directories are silently skipped.
 If @var{action} is @samp{recurse},
-@command{grep} reads all files under each directory, recursively;
+@command{grep} reads all files under each directory, recursively,
+following command-line symbolic links and skipping other symlinks;
 this is equivalent to the @option{-r} option.
 
 @item --exclude=@var{glob}
@@ -663,16 +669,28 @@ Search only files whose base name matches @var{glob}
 (using wildcard matching as described under @option{--exclude}).
 
 @item -r
-@itemx -R
 @itemx --recursive
 @opindex -r
 @opindex --recursive
 @cindex recursive search
 @cindex searching directory trees
+@cindex symbolic links
 For each directory operand,
 read and process all files in that directory, recursively.
+Follow symbolic links on the command line, but skip symlinks
+that are encountered recursively.
 This is the same as the @samp{--directories=recurse} option.
 
+@item -R
+@itemx --dereference-recursive
+@opindex -R
+@opindex --dereference-recursive
+@cindex recursive search
+@cindex searching directory trees
+@cindex symbolic links
+For each directory operand, read and process all files in that
+directory, recursively, following all symbolic links.
+
 @end table
 
 @node Other Options
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 04ae51e..527c6f5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -32,7 +32,7 @@ INCLUDES = -I.. -I$(srcdir)
 AM_CFLAGS += $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS)
 
 libgreputils_a_SOURCES += \
-  colorize.c colorize.h savedir.c savedir.h
+  colorize.c colorize.h
 
 EXTRA_DIST += colorize-posix.c colorize-w32.c
 
diff --git a/lib/savedir.c b/lib/savedir.c
deleted file mode 100644
index 3f93c16..0000000
--- a/lib/savedir.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/* savedir.c -- save the list of files in a directory in a string
-   Copyright (C) 1990, 1997-2001, 2009-2012 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
-
-#include <config.h>
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <dirent.h>
-
-#ifdef CLOSEDIR_VOID
-/* Fake a return value. */
-# define CLOSEDIR(d) (closedir (d), 0)
-#else
-# define CLOSEDIR(d) closedir (d)
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <fnmatch.h>
-#include "savedir.h"
-#include "xalloc.h"
-
-static char *path;
-static size_t pathlen;
-
-extern int isdir (const char *name);
-
-static int
-isdir1 (const char *dir, const char *file)
-{
-  size_t dirlen = strlen (dir);
-  size_t filelen = strlen (file);
-
-  while (dirlen && dir[dirlen - 1] == '/')
-    dirlen--;
-
-  if ((dirlen + filelen + 2) > pathlen)
-    {
-      pathlen *= 2;
-      if ((dirlen + filelen + 2) > pathlen)
-        pathlen = dirlen + filelen + 2;
-
-      path = xrealloc (path, pathlen);
-    }
-
-  memcpy (path, dir, dirlen);
-  path[dirlen] = '/';
-  strcpy (path + dirlen + 1, file);
-  return isdir (path);
-}
-
-/* Return a freshly allocated string containing the filenames
-   in directory DIR, separated by '\0' characters;
-   the end is marked by two '\0' characters in a row.
-   NAME_SIZE is the number of bytes to initially allocate
-   for the string; it will be enlarged as needed.
-   Return NULL if DIR cannot be opened or if out of memory. */
-char *
-savedir (const char *dir, off_t name_size, struct exclude *included_patterns,
-         struct exclude *excluded_patterns, struct exclude *excluded_directory_patterns )
-{
-  DIR *dirp;
-  struct dirent *dp;
-  char *name_space;
-  char *namep;
-
-  dirp = opendir (dir);
-  if (dirp == NULL)
-    return NULL;
-
-  /* Be sure name_size is at least `1' so there's room for
-     the final NUL byte.  */
-  if (name_size <= 0)
-    name_size = 1;
-
-  name_space = (char *) malloc (name_size);
-  if (name_space == NULL)
-    {
-      closedir (dirp);
-      return NULL;
-    }
-  namep = name_space;
-
-  while ((dp = readdir (dirp)) != NULL)
-    {
-      /* Skip "." and ".." (some NFS file systems' directories lack them). */
-      if (dp->d_name[0] != '.'
-          || (dp->d_name[1] != '\0'
-              && (dp->d_name[1] != '.' || dp->d_name[2] != '\0')))
-        {
-          size_t namlen = strlen (dp->d_name);
-          size_t size_needed = (namep - name_space) + namlen + 2;
-
-          if ((included_patterns || excluded_patterns)
-              && !isdir1 (dir, dp->d_name))
-            {
-              if (included_patterns
-                  && excluded_file_name (included_patterns, dp->d_name))
-                continue;
-              if (excluded_patterns
-                  && excluded_file_name (excluded_patterns, dp->d_name))
-                continue;
-            }
-
-          if ( excluded_directory_patterns
-              && isdir1 (dir, dp->d_name) )
-            {
-              if (excluded_directory_patterns
-                  && excluded_file_name (excluded_directory_patterns, dp->d_name))
-                continue;
-            }
-
-          if (size_needed > name_size)
-            {
-              char *new_name_space;
-
-              while (size_needed > name_size)
-                name_size += 1024;
-
-              new_name_space = realloc (name_space, name_size);
-              if (new_name_space == NULL)
-                {
-                  closedir (dirp);
-                  goto fail;
-                }
-              namep = new_name_space + (namep - name_space);
-              name_space = new_name_space;
-            }
-          strcpy (namep, dp->d_name);
-          namep += namlen + 1;
-        }
-    }
-  *namep = '\0';
-  if (CLOSEDIR (dirp))
-    {
-     fail:
-      free (name_space);
-      name_space = NULL;
-    }
-  if (path)
-    {
-      free (path);
-      path = NULL;
-      pathlen = 0;
-    }
-  return name_space;
-}
diff --git a/lib/savedir.h b/lib/savedir.h
deleted file mode 100644
index 00cb1a9..0000000
--- a/lib/savedir.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#if !defined SAVEDIR_H_
-# define SAVEDIR_H_
-
-#include "exclude.h"
-
-extern char *
-savedir (const char *dir, off_t name_size,
-         struct exclude *, struct exclude *,
-         struct exclude *);
-
-#endif
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b33c126..65f4f57 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,6 +20,7 @@ lib/closeout.c
 lib/error.c
 lib/getopt.c
 lib/obstack.c
+lib/openat-die.c
 lib/quotearg.c
 lib/regcomp.c
 lib/version-etc.c
diff --git a/src/main.c b/src/main.c
index f4f1235..be1e2e6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -36,14 +36,14 @@
 #include "error.h"
 #include "exclude.h"
 #include "exitfail.h"
+#include "fcntl-safer.h"
+#include "fts_.h"
 #include "getopt.h"
 #include "grep.h"
 #include "intprops.h"
-#include "isdir.h"
 #include "progname.h"
 #include "propername.h"
 #include "quote.h"
-#include "savedir.h"
 #include "version-etc.h"
 #include "xalloc.h"
 #include "xstrtol.h"
@@ -63,15 +63,6 @@
    avoiding a potential (racy) infinite loop.  */
 static struct stat out_stat;
 
-struct stats
-{
-  struct stats const *parent;
-  struct stat stat;
-};
-
-/* base of chain of stat buffers, used to detect directory loops */
-static struct stats stats_base;
-
 /* if non-zero, display usage information and exit */
 static int show_help;
 
@@ -347,7 +338,7 @@ static struct option const long_options[] =
   {"only-matching", no_argument, NULL, 'o'},
   {"quiet", no_argument, NULL, 'q'},
   {"recursive", no_argument, NULL, 'r'},
-  {"recursive", no_argument, NULL, 'R'},
+  {"dereference-recursive", no_argument, NULL, 'R'},
   {"regexp", required_argument, NULL, 'e'},
   {"invert-match", no_argument, NULL, 'v'},
   {"silent", no_argument, NULL, 'q'},
@@ -369,6 +360,7 @@ unsigned char eolbyte;
 /* For error messages. */
 /* The input file name, or (if standard input) "-" or a --label argument.  */
 static char const *filename;
+static size_t filename_prefix_len;
 static int errseen;
 static int write_error_seen;
 
@@ -392,18 +384,29 @@ ARGMATCH_VERIFY (directories_args, directories_types);
 
 static enum directories_type directories = READ_DIRECTORIES;
 
+enum { basic_fts_options = FTS_CWDFD | FTS_NOSTAT | FTS_TIGHT_CYCLE_CHECK };
+static int fts_options = basic_fts_options | FTS_COMFOLLOW | FTS_PHYSICAL;
+
 /* How to handle devices. */
 static enum
   {
+    READ_COMMAND_LINE_DEVICES,
     READ_DEVICES,
     SKIP_DEVICES
-  } devices = READ_DEVICES;
+  } devices = READ_COMMAND_LINE_DEVICES;
 
-static int grepdir (char const *, struct stats const *);
+static int grepfile (int, char const *, int, int);
+static int grepdesc (int, int);
 #if defined HAVE_DOS_FILE_CONTENTS
 static inline int undossify_input (char *, size_t);
 #endif
 
+static int
+is_device_mode (mode_t m)
+{
+  return S_ISCHR (m) || S_ISBLK (m) || S_ISSOCK (m) || S_ISFIFO (m);
+}
+
 /* Functions we'll use to search. */
 static compile_fp_t compile;
 static execute_fp_t execute;
@@ -473,7 +476,7 @@ static off_t after_last_match;	/* Pointer after last matching line that
 /* Reset the buffer for a new file, returning zero if we should skip it.
    Initialize on the first time through. */
 static int
-reset (int fd, char const *file, struct stats *stats)
+reset (int fd, struct stat const *st)
 {
   if (! pagesize)
     {
@@ -488,9 +491,9 @@ reset (int fd, char const *file, struct stats *stats)
   bufbeg[-1] = eolbyte;
   bufdesc = fd;
 
-  if (S_ISREG (stats->stat.st_mode))
+  if (S_ISREG (st->st_mode))
     {
-      if (file)
+      if (fd != STDIN_FILENO)
         bufoffset = 0;
       else
         {
@@ -510,7 +513,7 @@ reset (int fd, char const *file, struct stats *stats)
    to the beginning of the buffer contents, and 'buflim'
    points just after the end.  Return zero if there's an error.  */
 static int
-fillbuf (size_t save, struct stats const *stats)
+fillbuf (size_t save, struct stat const *st)
 {
   size_t fillsize = 0;
   int cc = 1;
@@ -543,9 +546,9 @@ fillbuf (size_t save, struct stats const *stats)
          is large.  However, do not use the original file size as a
          heuristic if we've already read past the file end, as most
          likely the file is growing.  */
-      if (S_ISREG (stats->stat.st_mode))
+      if (S_ISREG (st->st_mode))
         {
-          off_t to_be_read = stats->stat.st_size - bufoffset;
+          off_t to_be_read = st->st_size - bufoffset;
           off_t maxsize_off = save + to_be_read;
           if (0 <= to_be_read && to_be_read <= maxsize_off
               && maxsize_off == (size_t) maxsize_off
@@ -1085,7 +1088,7 @@ grepbuf (char const *beg, char const *lim)
    but if the file is a directory and we search it recursively, then
    return -2 if there was a match, and -1 otherwise.  */
 static intmax_t
-grep (int fd, char const *file, struct stats *stats)
+grep (int fd, struct stat const *st)
 {
   intmax_t nlines, i;
   int not_text;
@@ -1095,19 +1098,9 @@ grep (int fd, char const *file, struct stats *stats)
   char *lim;
   char eol = eolbyte;
 
-  if (!reset (fd, file, stats))
+  if (! reset (fd, st))
     return 0;
 
-  if (file && directories == RECURSE_DIRECTORIES
-      && S_ISDIR (stats->stat.st_mode))
-    {
-      /* Close fd now, so that we don't open a lot of file descriptors
-         when we recurse deeply.  */
-      if (close (fd) != 0)
-        suppressible_error (file, errno);
-      return grepdir (file, stats) - 2;
-    }
-
   totalcc = 0;
   lastout = 0;
   totalnl = 0;
@@ -1119,7 +1112,7 @@ grep (int fd, char const *file, struct stats *stats)
   residue = 0;
   save = 0;
 
-  if (! fillbuf (save, stats))
+  if (! fillbuf (save, st))
     {
       suppressible_error (filename, errno);
       return 0;
@@ -1190,7 +1183,7 @@ grep (int fd, char const *file, struct stats *stats)
         totalcc = add_count (totalcc, buflim - bufbeg - save);
       if (out_line)
         nlscan (beg);
-      if (! fillbuf (save, stats))
+      if (! fillbuf (save, st))
         {
           suppressible_error (filename, errno);
           goto finish_grep;
@@ -1214,53 +1207,171 @@ grep (int fd, char const *file, struct stats *stats)
 }
 
 static int
-grepfile (char const *file, struct stats *stats)
+grepdirent (FTS *fts, FTSENT *ent)
 {
-  int desc;
-  intmax_t count;
-  int status;
+  int follow, dirdesc;
+  int command_line = ent->fts_level == FTS_ROOTLEVEL;
+  struct stat *st = ent->fts_statp;
 
-  filename = (file ? file : label ? label : _("(standard input)"));
+  if (ent->fts_info == FTS_DP)
+    {
+      if (directories == RECURSE_DIRECTORIES && command_line)
+        out_file &= ~ (2 * !no_filenames);
+      return 1;
+    }
 
-  if (! file)
-    desc = STDIN_FILENO;
-  else if (devices == SKIP_DEVICES)
+  if ((ent->fts_info == FTS_D || ent->fts_info == FTS_DC
+       || ent->fts_info == FTS_DNR)
+      ? (directories == SKIP_DIRECTORIES
+         || (! (command_line && filename_prefix_len != 0)
+             && excluded_directory_patterns
+             && excluded_file_name (excluded_directory_patterns,
+                                    ent->fts_name)))
+      : ((included_patterns
+          && excluded_file_name (included_patterns, ent->fts_name))
+         || (excluded_patterns
+             && excluded_file_name (excluded_patterns, ent->fts_name))))
     {
-      /* Don't open yet, since that might have side effects on a device.  */
-      desc = -1;
+      fts_set (fts, ent, FTS_SKIP);
+      return 1;
     }
-  else
+
+  filename = ent->fts_path + filename_prefix_len;
+  follow = (fts->fts_options & FTS_LOGICAL
+            || (fts->fts_options & FTS_COMFOLLOW && command_line));
+
+  switch (ent->fts_info)
     {
-      /* When skipping directories, don't worry about directories
-         that can't be opened.  */
-      desc = open (file, O_RDONLY);
-      if (desc < 0 && directories != SKIP_DIRECTORIES)
+    case FTS_D:
+      if (directories == RECURSE_DIRECTORIES)
         {
-          suppressible_error (file, errno);
+          out_file |= 2 * !no_filenames;
           return 1;
         }
+      fts_set (fts, ent, FTS_SKIP);
+      break;
+
+    case FTS_DC:
+      if (!suppress_errors)
+        error (0, 0, _("warning: %s: %s"), filename,
+               _("recursive directory loop"));
+      return 1;
+
+    case FTS_DNR:
+    case FTS_ERR:
+    case FTS_NS:
+      suppressible_error (filename, ent->fts_errno);
+      return 1;
+
+    case FTS_DEFAULT:
+    case FTS_NSOK:
+      if (devices == SKIP_DEVICES
+          || (devices == READ_COMMAND_LINE_DEVICES && !command_line))
+        {
+          struct stat st1;
+          if (! st->st_mode)
+            {
+              /* The file type is not already known.  Get the file status
+                 before opening, since opening might have side effects
+                 on a device.  */
+              int flag = follow ? 0 : AT_SYMLINK_NOFOLLOW;
+              if (fstatat (fts->fts_cwd_fd, ent->fts_accpath, &st1, flag) != 0)
+                {
+                  suppressible_error (filename, errno);
+                  return 1;
+                }
+              st = &st1;
+            }
+          if (is_device_mode (st->st_mode))
+            return 1;
+        }
+      break;
+
+    case FTS_F:
+    case FTS_SLNONE:
+      break;
+
+    case FTS_SL:
+    case FTS_W:
+      return 1;
+
+    default:
+      abort ();
     }
 
-  if (desc < 0
-      ? stat (file, &stats->stat) != 0
-      : fstat (desc, &stats->stat) != 0)
+  dirdesc = ((fts->fts_options & (FTS_NOCHDIR | FTS_CWDFD)) == FTS_CWDFD
+             ? fts->fts_cwd_fd
+             : AT_FDCWD);
+  return grepfile (dirdesc, ent->fts_accpath, follow, command_line);
+}
+
+static int
+grepfile (int dirdesc, char const *name, int follow, int command_line)
+{
+  int desc = openat_safer (dirdesc, name, O_RDONLY | (follow ? 0 : O_NOFOLLOW));
+  if (desc < 0)
     {
-      suppressible_error (filename, errno);
-      if (file)
-        close (desc);
+      if (follow || errno != ELOOP)
+        suppressible_error (filename, errno);
       return 1;
     }
+  return grepdesc (desc, command_line);
+}
 
-  if ((directories == SKIP_DIRECTORIES && S_ISDIR (stats->stat.st_mode))
-      || (devices == SKIP_DEVICES && (S_ISCHR (stats->stat.st_mode)
-                                      || S_ISBLK (stats->stat.st_mode)
-                                      || S_ISSOCK (stats->stat.st_mode)
-                                      || S_ISFIFO (stats->stat.st_mode))))
+static int
+grepdesc (int desc, int command_line)
+{
+  intmax_t count;
+  int status = 1;
+  struct stat st;
+
+  /* Get the file status, possibly for the second time.  This catches
+     a race condition if the directory entry changes after the
+     directory entry is read and before the file is opened.  For
+     example, normally DESC is a directory only at the top level, but
+     there is an exception if some other process substitutes a
+     directory for a non-directory while 'grep' is running.  */
+  if (fstat (desc, &st) != 0)
     {
-      if (file)
-        close (desc);
-      return 1;
+      suppressible_error (filename, errno);
+      goto closeout;
+    }
+  if (desc != STDIN_FILENO
+      && directories == RECURSE_DIRECTORIES && S_ISDIR (st.st_mode))
+    {
+      /* Traverse the directory starting with its full name, because
+         unfortunately fts provides no way to traverse the directory
+         starting from its file descriptor.  */
+
+      FTS *fts;
+      FTSENT *ent;
+      int opts = fts_options & ~(command_line ? 0 : FTS_COMFOLLOW);
+      char *fts_arg[2];
+
+      /* Close DESC now, to conserve file descriptors if the race
+         condition occurs many times in a deep recursion.  */
+      if (close (desc) != 0)
+        suppressible_error (filename, errno);
+
+      fts_arg[0] = (char *) filename;
+      fts_arg[1] = NULL;
+      fts = fts_open (fts_arg, opts, NULL);
+
+      if (!fts)
+        xalloc_die ();
+      while ((ent = fts_read (fts)))
+        status &= grepdirent (fts, ent);
+      if (errno)
+        suppressible_error (filename, errno);
+      if (fts_close (fts) != 0)
+        suppressible_error (filename, errno);
+      return status;
     }
+  if ((directories == SKIP_DIRECTORIES && S_ISDIR (st.st_mode))
+      || ((devices == SKIP_DEVICES
+           || (devices == READ_COMMAND_LINE_DEVICES && !command_line))
+          && is_device_mode (st.st_mode)))
+    goto closeout;
 
   /* If there is a regular file on stdout and the current file refers
      to the same i-node, we have to report the problem and skip it.
@@ -1282,24 +1393,12 @@ grepfile (char const *file, struct stats *stats)
      condition that could result in "alternate" output.  */
   if (!out_quiet && list_files == 0 && 1 < max_count
       && S_ISREG (out_stat.st_mode) && out_stat.st_ino
-      && SAME_INODE (stats->stat, out_stat))
+      && SAME_INODE (st, out_stat))
     {
       if (! suppress_errors)
         error (0, 0, _("input file %s is also the output"), quote (filename));
       errseen = 1;
-      if (file)
-        close (desc);
-      return 1;
-    }
-
-  if (desc < 0)
-    {
-      desc = open (file, O_RDONLY);
-      if (desc < 0)
-        {
-          suppressible_error (file, errno);
-          return 1;
-        }
+      goto closeout;
     }
 
 #if defined SET_BINARY
@@ -1309,7 +1408,7 @@ grepfile (char const *file, struct stats *stats)
     SET_BINARY (desc);
 #endif
 
-  count = grep (desc, file, stats);
+  count = grep (desc, &st);
   if (count < 0)
     status = count + 2;
   else
@@ -1334,103 +1433,35 @@ grepfile (char const *file, struct stats *stats)
           fputc ('\n' & filename_mask, stdout);
         }
 
-      if (! file)
+      if (desc == STDIN_FILENO)
         {
           off_t required_offset = outleft ? bufoffset : after_last_match;
           if (required_offset != bufoffset
               && lseek (desc, required_offset, SEEK_SET) < 0
-              && S_ISREG (stats->stat.st_mode))
+              && S_ISREG (st.st_mode))
             suppressible_error (filename, errno);
         }
-      else
-        while (close (desc) != 0)
-          if (errno != EINTR)
-            {
-              suppressible_error (file, errno);
-              break;
-            }
     }
 
+ closeout:
+  if (desc != STDIN_FILENO && close (desc) != 0)
+    suppressible_error (filename, errno);
   return status;
 }
 
 static int
-grepdir (char const *dir, struct stats const *stats)
+grep_command_line_arg (char const *arg)
 {
-  char const *dir_or_dot = (dir ? dir : ".");
-  struct stats const *ancestor;
-  char *name_space;
-  int status = 1;
-  if (dir && excluded_directory_patterns
-      && excluded_file_name (excluded_directory_patterns, dir))
-    return 1;
-
-  /* Mingw32 does not support st_ino.  No known working hosts use zero
-     for st_ino, so assume that the Mingw32 bug applies if it's zero.  */
-  if (stats->stat.st_ino)
+  if (STREQ (arg, "-"))
     {
-      for (ancestor = stats; (ancestor = ancestor->parent) != 0;  )
-        {
-          if (ancestor->stat.st_ino == stats->stat.st_ino
-              && ancestor->stat.st_dev == stats->stat.st_dev)
-            {
-              if (!suppress_errors)
-                error (0, 0, _("warning: %s: %s"), dir,
-                       _("recursive directory loop"));
-              errseen = 1;
-              return 1;
-            }
-        }
-    }
-
-  name_space = savedir (dir_or_dot, stats->stat.st_size, included_patterns,
-                        excluded_patterns, excluded_directory_patterns);
-
-  if (! name_space)
-    {
-      if (errno)
-        suppressible_error (dir_or_dot, errno);
-      else
-        xalloc_die ();
+      filename = label ? label : _("(standard input)");
+      return grepdesc (STDIN_FILENO, 1);
     }
   else
     {
-      size_t dirlen = 0;
-      int needs_slash = 0;
-      char *file_space = NULL;
-      char const *namep = name_space;
-      struct stats child;
-      if (dir)
-        {
-          dirlen = strlen (dir);
-          needs_slash = ! (dirlen == FILE_SYSTEM_PREFIX_LEN (dir)
-                           || ISSLASH (dir[dirlen - 1]));
-        }
-      child.parent = stats;
-      out_file += !no_filenames;
-      while (*namep)
-        {
-          size_t namelen = strlen (namep);
-          char const *file;
-          if (! dir)
-            file = namep;
-          else
-            {
-              file_space = xrealloc (file_space, dirlen + 1 + namelen + 1);
-              strcpy (file_space, dir);
-              file_space[dirlen] = '/';
-              strcpy (file_space + dirlen + needs_slash, namep);
-              file = file_space;
-            }
-          namep += namelen + 1;
-          status &= grepfile (file, &child);
-        }
-      out_file -= !no_filenames;
-      free (file_space);
-      free (name_space);
+      filename = arg;
+      return grepfile (AT_FDCWD, arg, 1, 1);
     }
-
-  return status;
 }
 
 _Noreturn void usage (int);
@@ -1500,7 +1531,8 @@ Output control:\n\
                             ACTION is `read', `recurse', or `skip'\n\
   -D, --devices=ACTION      how to handle devices, FIFOs and sockets;\n\
                             ACTION is `read' or `skip'\n\
-  -R, -r, --recursive       equivalent to --directories=recurse\n\
+  -r, --recursive           like --directories=recurse\n\
+  -R, --dereference-recursive  likewise, but follow all symlinks\n\
 "));
       printf (_("\
       --include=FILE_PATTERN  search only files that match FILE_PATTERN\n\
@@ -1981,6 +2013,8 @@ main (int argc, char **argv)
         break;
 
       case 'R':
+        fts_options = basic_fts_options | FTS_LOGICAL;
+        /* Fall through.  */
       case 'r':
         directories = RECURSE_DIRECTORIES;
         last_recursive = prev_optind;
@@ -2177,48 +2211,24 @@ main (int argc, char **argv)
   if (max_count == 0)
     exit (EXIT_FAILURE);
 
+  if (fts_options & FTS_LOGICAL && devices == READ_COMMAND_LINE_DEVICES)
+    devices = READ_DEVICES;
+
   if (optind < argc)
     {
       status = 1;
       do
-        {
-          char *file = argv[optind];
-          if (!STREQ (file, "-")
-              && (included_patterns || excluded_patterns
-                  || excluded_directory_patterns))
-            {
-              if (isdir (file))
-                {
-                  if (excluded_directory_patterns
-                      && excluded_file_name (excluded_directory_patterns,
-                                             file))
-                    continue;
-                }
-              else
-                {
-                  if (included_patterns
-                      && excluded_file_name (included_patterns, file))
-                    continue;
-                  if (excluded_patterns
-                      && excluded_file_name (excluded_patterns, file))
-                    continue;
-                }
-            }
-          status &= grepfile (STREQ (file, "-") ? (char *) NULL : file,
-                              &stats_base);
-        }
+        status &= grep_command_line_arg (argv[optind]);
       while (++optind < argc);
     }
   else if (directories == RECURSE_DIRECTORIES && prepended < last_recursive)
     {
-      status = 1;
-      if (stat (".", &stats_base.stat) == 0)
-        status = grepdir (NULL, &stats_base);
-      else
-        suppressible_error (".", errno);
+      /* Grep through ".", omitting leading "./" from diagnostics.  */
+      filename_prefix_len = 2;
+      status = grep_command_line_arg (".");
     }
   else
-    status = grepfile ((char *) NULL, &stats_base);
+    status = grep_command_line_arg ("-");
 
   /* We register via atexit() to test stdout.  */
   exit (errseen ? EXIT_TROUBLE : status);
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c2cd2f7..13061fe 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -82,6 +82,7 @@ TESTS =						\
   spencer1					\
   spencer1-locale				\
   status					\
+  symlink					\
   turkish-I					\
   warn-char-classes				\
   word-delim-multibyte				\
diff --git a/tests/symlink b/tests/symlink
new file mode 100755
index 0000000..012d8f8
--- /dev/null
+++ b/tests/symlink
@@ -0,0 +1,65 @@
+#!/bin/sh
+# Check that "grep -r" does the right thing with symbolic links.
+
+# Copyright (C) 2012 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# written by Paul Eggert
+
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+
+mkdir dir || framework_failure_
+echo a > dir/a || framework_failure_
+echo b > dir/b || framework_failure_
+ln -s a dir/c || framework_failure_
+ln -s . dir/d || framework_failure_
+ln -s dangling dir/e || framework_failure_
+
+touch out || framework_failure_
+
+for recursion in '' -r -R
+do
+  for files in '' '*'
+  do
+    case $recursion,$files in
+      -R,* | *,'*') expected_status=2 ;;
+      *) expected_status=0 ;;
+    esac
+
+    (cd dir && grep $recursion '^' $files <a ) >grepout
+    test $? -eq $expected_status || fail=1
+
+    case $recursion,$files in
+      ,)
+         exp='a\n' ;;
+      ,'*' | -R,)
+         exp='a:a\nb:b\nc:a\n' ;;
+      -r,)
+         exp='a:a\nb:b\n' ;;
+      -r,'*')
+         exp='a:a\nb:b\nc:a\nd/a:a\nd/b:b\n' ;;
+      -R,'*')
+         exp='a:a\nb:b\nc:a\nd/a:a\nd/b:b\nd/c:a\n' ;;
+      *)
+         framework_failure_ ;;
+    esac
+
+    printf "$exp" >exp || framework_failure_
+    LC_ALL=C sort grepout >out || fail=1
+    compare exp out || fail=1
+  done
+done
+
+Exit $fail

-----------------------------------------------------------------------

Summary of changes:
 .gitignore        |    2 -
 Makefile.boot     |    2 -
 NEWS              |   20 +++-
 bootstrap.conf    |    7 +-
 doc/grep.texi     |   26 +++-
 lib/Makefile.am   |    2 +-
 lib/savedir.c     |  163 ----------------------
 lib/savedir.h     |   11 --
 po/POTFILES.in    |    1 +
 src/main.c        |  392 +++++++++++++++++++++++++++--------------------------
 tests/Makefile.am |    1 +
 tests/symlink     |   65 +++++++++
 12 files changed, 312 insertions(+), 380 deletions(-)
 delete mode 100644 lib/savedir.c
 delete mode 100644 lib/savedir.h
 create mode 100755 tests/symlink


hooks/post-receive
-- 
grep


From MAILER-DAEMON Sun Mar 18 19:04:15 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1S9P95-00065p-GP
	for mharc-grep-commit@gnu.org; Sun, 18 Mar 2012 19:04:15 -0400
Received: from eggs.gnu.org ([208.118.235.92]:58235)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1S9P91-00064n-Et
	for grep-commit@gnu.org; Sun, 18 Mar 2012 19:04:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1S9P8y-0000HE-Ox
	for grep-commit@gnu.org; Sun, 18 Mar 2012 19:04:11 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:52464)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1S9P8y-0000H5-Ks
	for grep-commit@gnu.org; Sun, 18 Mar 2012 19:04:08 -0400
Received: from eggert by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <eggert@cs.ucla.edu>) id 1S9P8x-0006ce-Hu
	for grep-commit@gnu.org; Sun, 18 Mar 2012 23:04:07 +0000
Date: Sun, 18 Mar 2012 23:04:07 +0000
Message-Id: <E1S9P8x-0006ce-Hu@vcs.savannah.gnu.org>
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.11-9-ga48ed5b
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c6e3ea61d9f08aa0128a0eb13d31a2fbad376f99
X-Git-Newrev: a48ed5b6953d6d40f6797f7e151e324924039b78
From: Paul Eggert <eggert@cs.ucla.edu>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Mar 2012 23:04:13 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  a48ed5b6953d6d40f6797f7e151e324924039b78 (commit)
      from  c6e3ea61d9f08aa0128a0eb13d31a2fbad376f99 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=a48ed5b6953d6d40f6797f7e151e324924039b78


commit a48ed5b6953d6d40f6797f7e151e324924039b78
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Sat Mar 17 18:04:50 2012 -0700

    grep: report overflow for ERE a{1000000000}
    
    * NEWS: Document this.
    * src/dfa.c (MIN): New macro.
    (lex): Lexically analyze the repeat-count operator once, not
    twice; the double-scan complicated the code and made it harder to
    understand and fix.  Adjust the repeat-count parsing so that it
    better matches the behavior of the regex code, in three ways:
    1. Diagnose too-large repeat counts rather than treating them as
    literal characters.  2. Use RE_INVALID_INTERVAL_ORD, not
    RE_NO_BK_BRACES, to decide whether to treat invalid-syntax {...}s
    as literals.  3. Use the same wording for {...}-related
    diagnostics that the regex code uses.
    * tests/bre.tests, tests/ere.tests, tests/repetition-overflow:
    Adjust to match new behavior, and add a few tests.
    * cfg.mk (exclude_file_name_regexp--sc_error_message_uppercase):
    New macro, since the diagnostics start with uppercase letters.

diff --git a/NEWS b/NEWS
index 6dad608..b219b65 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,9 @@ GNU grep NEWS                                    -*- outline -*-
   name too long", and it can run much faster when dealing with large
   directory hierarchies.
 
+  grep -E 'a{1000000000}' now reports an overflow error rather than
+  silently acting like grep -E 'a\{1000000000}'.
+
 ** New features
 
   The -R option now has a long-option alias --dereference-recursive.
diff --git a/cfg.mk b/cfg.mk
index 84115c2..329af43 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -88,3 +88,4 @@ exclude_file_name_regexp--sc_prohibit_xalloc_without_use = ^src/kwset\.c$$
 exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \
   (Makefile|\.(am|mk)$$|^gl/lib/.*\.c\.diff$$)
 exclude_file_name_regexp--sc_space_tab = ^gl/lib/.*\.c\.diff$$
+exclude_file_name_regexp--sc_error_message_uppercase = ^src/dfa\.c$$
diff --git a/src/dfa.c b/src/dfa.c
index 6eb4a11..613f548 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -861,6 +861,10 @@ static unsigned char const *buf_end;    /* reference to end in dfaexec().  */
 
 #endif /* MBS_SUPPORT */
 
+#ifndef MIN
+# define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
 typedef int predicate (int);
 
 /* The following list maps the names of the Posix named character classes
@@ -1328,90 +1332,53 @@ lex (void)
           if (!(syntax_bits & RE_CONTEXT_INDEP_OPS) && laststart)
             goto normal_char;
 
-          if (syntax_bits & RE_NO_BK_BRACES)
-            {
-              /* Scan ahead for a valid interval; if it's not valid,
-                 treat it as a literal '{'.  */
-              int lo = -1, hi = -1;
-              char const *p = lexptr;
-              char const *lim = p + lexleft;
-              for (; p != lim && ISASCIIDIGIT (*p); p++)
-                {
-                  if (lo < 0)
-                    lo = *p - '0';
-                  else
-                    {
-                      lo = lo * 10 + *p - '0';
-                      if (RE_DUP_MAX < lo)
-                        goto normal_char;
-                    }
-                }
-              if (p != lim && *p == ',')
-                while (++p != lim && ISASCIIDIGIT (*p))
-                  {
-                    if (hi < 0)
-                      hi = *p - '0';
-                    else
-                      {
-                        hi = hi * 10 + *p - '0';
-                        if (RE_DUP_MAX < hi)
-                          goto normal_char;
-                      }
-                  }
-              else
-                hi = lo;
-              if (p == lim || *p != '}' || lo < 0 || (0 <= hi && hi < lo))
-                goto normal_char;
-            }
-
-          minrep = 0;
           /* Cases:
              {M} - exact count
              {M,} - minimum count, maximum is infinity
+             {,N} - 0 through N
+             {,} - 0 to infinity (same as '*')
              {M,N} - M through N */
-          FETCH (c, _("unfinished repeat count"));
-          if (ISASCIIDIGIT (c))
-            {
-              minrep = c - '0';
-              for (;;)
-                {
-                  FETCH (c, _("unfinished repeat count"));
-                  if (!ISASCIIDIGIT (c))
-                    break;
-                  minrep = 10 * minrep + c - '0';
-                }
-            }
-          else
-            dfaerror (_("malformed repeat count"));
-          if (c == ',')
-            {
-              FETCH (c, _("unfinished repeat count"));
-              if (!ISASCIIDIGIT (c))
-                maxrep = -1;
-              else
-                {
-                  maxrep = c - '0';
-                  for (;;)
-                    {
-                      FETCH (c, _("unfinished repeat count"));
-                      if (!ISASCIIDIGIT (c))
-                        break;
-                      maxrep = 10 * maxrep + c - '0';
-                    }
-                  if (0 <= maxrep && maxrep < minrep)
-                    dfaerror (_("malformed repeat count"));
-                }
-            }
-          else
-            maxrep = minrep;
-          if (!(syntax_bits & RE_NO_BK_BRACES))
-            {
-              if (c != '\\')
-                dfaerror (_("malformed repeat count"));
-              FETCH (c, _("unfinished repeat count"));
-            }
-          if (c != '}')
-            dfaerror (_("malformed repeat count"));
+          {
+            char const *p = lexptr;
+            char const *lim = p + lexleft;
+            minrep = maxrep = -1;
+            for (; p != lim && ISASCIIDIGIT (*p); p++)
+              {
+                if (minrep < 0)
+                  minrep = *p - '0';
+                else
+                  minrep = MIN (RE_DUP_MAX + 1, minrep * 10 + *p - '0');
+              }
+            if (p != lim)
+              {
+                if (*p != ',')
+                  maxrep = minrep;
+                else
+                  {
+                    if (minrep < 0)
+                      minrep = 0;
+                    while (++p != lim && ISASCIIDIGIT (*p))
+                      {
+                        if (maxrep < 0)
+                          maxrep = *p - '0';
+                        else
+                          maxrep = MIN (RE_DUP_MAX + 1, maxrep * 10 + *p - '0');
+                      }
+                  }
+              }
+            if (! ((! backslash || (p != lim && *p++ == '\\'))
+                   && p != lim && *p++ == '}'
+                   && 0 <= minrep && (maxrep < 0 || minrep <= maxrep)))
+              {
+                if (syntax_bits & RE_INVALID_INTERVAL_ORD)
+                  goto normal_char;
+                dfaerror (_("Invalid content of \\{\\}"));
+              }
+            if (RE_DUP_MAX < maxrep)
+              dfaerror (_("Regular expression too big"));
+            lexptr = p;
+            lexleft = lim - p;
+          }
           laststart = 0;
           return lasttok = REPMN;
 
diff --git a/tests/bre.tests b/tests/bre.tests
index 60ff1b5..9d01a3c 100644
--- a/tests/bre.tests
+++ b/tests/bre.tests
@@ -42,8 +42,9 @@
 2@a\{1@EBRACE
 2@a\{1a@EBRACE
 2@a\{1a\}@BADBR
-2@a\{,2\}@BADBR
-2@a\{,\}@BADBR
+0@a\{,2\}@a\{,2\}
+0@a\{,\}@a\{,\}
+2@a\{\}@BADBR
 2@a\{1,x\}@BADBR
 2@a\{1,x@EBRACE
 2@a\{32768\}@BADBR
@@ -60,3 +61,4 @@
 2@a\{1\}*@BADRPT@TO CORRECT
 1@a\(b\)?c\1d@acd
 0@-\{0,1\}[0-9]*$@-5
+2@b\{1000000000\}@ESIZE
diff --git a/tests/ere.tests b/tests/ere.tests
index 08b3dba..e0aad2a 100644
--- a/tests/ere.tests
+++ b/tests/ere.tests
@@ -76,6 +76,7 @@
 0@a{1a}@a{1a}
 0@a{,2}@a{,2}
 0@a{,}@a{,}
+2@a{}@BADBR
 0@a{1,*}@a{1,,,}
 2@a{1,x@EBRACE@TO CORRECT
 2@a{300}@BADBR@TO CORRECT
@@ -213,3 +214,4 @@
 0@abcdefghijklmnopqrstuv@abcdefghijklmnopqrstuv
 0@CC[13]1|a{21}[23][EO][123][Es][12]a{15}aa[34][EW]aaaaaaa[X]a@CC11
 0@a?b@ab
+2@b{1000000000}@ESIZE
diff --git a/tests/repetition-overflow b/tests/repetition-overflow
index c92de23..66a44a6 100755
--- a/tests/repetition-overflow
+++ b/tests/repetition-overflow
@@ -11,9 +11,9 @@ fail=0
 # range of "unsigned int" would silently wrap around.   Hence, 2^32+1
 # would be treated just like "1", and both of these would mistakenly match.
 
-echo abc  | grep -E "b{$xp1}"   > out 2>&1; test $? = 1 || fail=1
+echo abc  | grep -E "b{$xp1}"   > out 2> /dev/null; test $? = 2 || fail=1
 compare out /dev/null || fail=1
-echo abbc | grep -E "b{1,$xp2}" > out 2>&1; test $? = 1 || fail=1
+echo abbc | grep -E "b{1,$xp2}" > out 2> /dev/null; test $? = 2 || fail=1
 compare out /dev/null || fail=1
 
 Exit $fail

-----------------------------------------------------------------------

Summary of changes:
 NEWS                      |    3 +
 cfg.mk                    |    1 +
 src/dfa.c                 |  127 +++++++++++++++++----------------------------
 tests/bre.tests           |    6 ++-
 tests/ere.tests           |    2 +
 tests/repetition-overflow |    4 +-
 6 files changed, 59 insertions(+), 84 deletions(-)


hooks/post-receive
-- 
grep


