grep branch, master, updated. v2.25-86-g455c840

[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  455c840f4790840a77f10f2e309e8e0481f5190a (commit)
       via  a00ea1e5732592ea54a8167304d84cfa772fd01e (commit)
      from  6c96214b4d75de6bf6cf95514e39c494fdcc8c4f (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=455c840f4790840a77f10f2e309e8e0481f5190a


commit 455c840f4790840a77f10f2e309e8e0481f5190a
Author: Paul Eggert <address@hidden>
Date:   Wed Sep 7 22:22:37 2016 -0700

    doc: define "context lines"
    
    Reported by Igor Bogomazov via Santiago Ruano Rincón (Bug#24024).
    * doc/grep.texi (Context Line Control): Define "context lines".

diff --git a/doc/grep.texi b/doc/grep.texi
index 80768dd..7e51d45 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -338,6 +338,7 @@ do
 done
 @end example
 
address@hidden context lines
 When @command{grep} stops after @var{num} matching lines,
 it outputs any trailing context lines.
 Since context does not include matching lines,
@@ -501,8 +502,11 @@ even those that contain newline characters.
 @node Context Line Control
 @subsection Context Line Control
 
address@hidden context lines
address@hidden lines} are non-matching lines that are near a matching line.
+They are output only if one of the following options are used.
 Regardless of how these options are set,
address@hidden will never print any given line more than once.
address@hidden never outputs any given line more than once.
 If the @option{-o} (@option{--only-matching}) option is specified,
 these options have no effect and a warning is given upon their use.
 
@@ -530,7 +534,7 @@ Print @var{num} lines of leading context before matching 
lines.
 @opindex -C
 @opindex --context
 @opindex address@hidden
address@hidden context
address@hidden context lines
 Print @var{num} lines of leading and trailing output context.
 
 @item address@hidden

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


commit 455c840f4790840a77f10f2e309e8e0481f5190a
Author: Paul Eggert <address@hidden>
Date:   Wed Sep 7 22:22:37 2016 -0700

    doc: define "context lines"
    
    Reported by Igor Bogomazov via Santiago Ruano Rincón (Bug#24024).
    * doc/grep.texi (Context Line Control): Define "context lines".

diff --git a/doc/grep.texi b/doc/grep.texi
index 80768dd..7e51d45 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -338,6 +338,7 @@ do
 done
 @end example
 
address@hidden context lines
 When @command{grep} stops after @var{num} matching lines,
 it outputs any trailing context lines.
 Since context does not include matching lines,
@@ -501,8 +502,11 @@ even those that contain newline characters.
 @node Context Line Control
 @subsection Context Line Control
 
address@hidden context lines
address@hidden lines} are non-matching lines that are near a matching line.
+They are output only if one of the following options are used.
 Regardless of how these options are set,
address@hidden will never print any given line more than once.
address@hidden never outputs any given line more than once.
 If the @option{-o} (@option{--only-matching}) option is specified,
 these options have no effect and a warning is given upon their use.
 
@@ -530,7 +534,7 @@ Print @var{num} lines of leading context before matching 
lines.
 @opindex -C
 @opindex --context
 @opindex address@hidden
address@hidden context
address@hidden context lines
 Print @var{num} lines of leading and trailing output context.
 
 @item address@hidden

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

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


hooks/post-receive
-- 
grep