grep branch, master, updated. v2.21-9-g4aed929

[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  4aed929ac46fae52b47990190d3ffa16fae233b0 (commit)
      from  0c5f86f38ea20887cfec0c914b06ff92551b042e (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=4aed929ac46fae52b47990190d3ffa16fae233b0


commit 4aed929ac46fae52b47990190d3ffa16fae233b0
Author: Paul Eggert <address@hidden>
Date:   Mon Dec 15 23:09:27 2014 -0800

    doc: document binary-data heuristic better
    
    Problem reported by Martin Hoch in: http://bugs.gnu.org/19388
    * doc/grep.texi (File and Directory Selection):
    Document what non-text bytes are.
    (Usage): Fix cross reference.

diff --git a/doc/grep.texi b/doc/grep.texi
index 63016bd..acd5be8 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -596,6 +596,11 @@ If a file's allocation metadata,
 or if its data read before a line is selected for output,
 indicate that the file contains binary data,
 assume that the file is of type @var{type}.
+Non-text bytes indicate binary data; these are either data bytes
+improperly encoded for the current locale, or null bytes when the
address@hidden (@option{--null-data}) option is not given (@pxref{Other
+Options}).
+
 By default, @var{type} is @samp{binary},
 and @command{grep} normally outputs either
 a one-line message saying that a binary file matches,
@@ -1721,8 +1726,8 @@ Standard grep cannot do this, as it is fundamentally 
line-based.
 Therefore, merely using the @code{[:space:]} character class does not
 match newlines in the way you might expect.
 
-With the GNU @command{grep} option @code{-z} (@pxref{File and
-Directory Selection}), the input is terminated by null bytes.  Thus,
+With the GNU @command{grep} option @option{-z} (@option{--null-data}), each
+input ``line'' is terminated by a null byte; @pxref{Other Options}.  Thus,
 you can match newlines in the input, but typically if there is a match
 the entire input is output, so this usage is often combined with
 output-suppressing options like @option{-q}, e.g.:

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

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


hooks/post-receive
-- 
grep