grep branch, master, updated. v2.20-15-g846fe08

[Paul Eggert]

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  846fe088f835d481fc1b237f5c24e336a317d112 (commit)
      from  09434c399629d16bc4fceb443aa3e5cea412f4ea (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=846fe088f835d481fc1b237f5c24e336a317d112


commit 846fe088f835d481fc1b237f5c24e336a317d112
Author: Paul Eggert <address@hidden>
Date:   Fri Jul 11 13:21:19 2014 -0700

    doc: Document -r vs --exclude more carefully.
    
    Problem reported by Hugues Andreux in: http://bugs.gnu.org/17763
    * doc/grep.texi (File and Directory Selection): Be more careful
    about documenting the interaction between recursive searching,
    --include, --exclude, and --exclude-dir.

diff --git a/doc/grep.texi b/doc/grep.texi
index 6c484d6..0115560 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -651,9 +651,10 @@ this is equivalent to the @option{-r} option.
 @opindex --exclude
 @cindex exclude files
 @cindex searching directory trees
-Skip files whose base name matches @var{glob}
-(using wildcard matching).
-A file-name glob can use
+Skip files whose name matches the pattern @var{glob}, using wildcard
+matching.  When searching recursively, skip any subfile whose base
+name matches @var{glob}; the base name is the part after the last
address@hidden/}.  A pattern can use
 @samp{*}, @samp{?}, and @address@hidden as wildcards,
 and @code{\} to quote a wildcard or backslash character literally.
 
@@ -661,15 +662,16 @@ and @code{\} to quote a wildcard or backslash character 
literally.
 @opindex --exclude-from
 @cindex exclude files
 @cindex searching directory trees
-Skip files whose base name matches any of the file-name globs
+Skip files whose name matches any of the patterns
 read from @var{file} (using wildcard matching as described
 under @option{--exclude}).
 
address@hidden address@hidden
address@hidden address@hidden
 @opindex --exclude-dir
 @cindex exclude directories
-Skip any directory whose name matches the pattern @var{dir}, ignoring
-any redundant trailing slashes in @var{dir}.
+Skip any directory whose name matches the pattern @var{glob}.  When
+searching recursively, skip any subdirectory whose base name matches
address@hidden  Ignore any redundant trailing slashes in @var{glob}.
 
 @item -I
 Process a binary file as if it did not contain matching data;
@@ -679,8 +681,8 @@ this is equivalent to the 
@samp{--binary-files=without-match} option.
 @opindex --include
 @cindex include files
 @cindex searching directory trees
-Search only files whose base name matches @var{glob}
-(using wildcard matching as described under @option{--exclude}).
+Search only files whose name matches @var{glob},
+using wildcard matching as described under @option{--exclude}.
 
 @item -r
 @itemx --recursive

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

Summary of changes:
 doc/grep.texi |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
grep