grep branch, master, updated. v3.6-18-g7051705

[Jim Meyering]

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  70517057c9234146d56bb05cc22cd62ab6407c86 (commit)
       via  74cda437ff9a594edb4c7300950cd23f2346f856 (commit)
      from  b216515f9c72dd7529e3e587abed101efd1d9ae5 (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=70517057c9234146d56bb05cc22cd62ab6407c86


commit 70517057c9234146d56bb05cc22cd62ab6407c86
Author: Jim Meyering <meyering@fb.com>
Date:   Sun Jan 31 09:10:01 2021 -0800

    doc: man: fix -L description and improve -l's
    
    * doc/grep.texi (-L): Remove erroneous sentence about stopping early.
    With -L, grep cannot stop scanning early.
    (-l): Tweak existing wording.
    * doc/grep.in.1: Remove the -L sentence here, too.
    (-l): Copy the sentence from grep.texi, to clarify: it's only per-file
    scanning that stops upon match.  Reported by Robert Bruntz
    in http://debbugs.gnu.org/46179

diff --git a/doc/grep.in.1 b/doc/grep.in.1
index db270dd..c0b6b40 100644
--- a/doc/grep.in.1
+++ b/doc/grep.in.1
@@ -319,13 +319,12 @@ is
 Suppress normal output; instead print the name
 of each input file from which no output would
 normally have been printed.
-The scanning will stop on the first match.
 .TP
 .BR \-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 will stop on the first match.
+Scanning each input file stops upon first match.
 .TP
 .BI \-m " NUM" "\fR,\fP \-\^\-max\-count=" NUM
 Stop reading a file after
diff --git a/doc/grep.texi b/doc/grep.texi
index 19099cc..e3b1555 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -323,7 +323,6 @@ which only covers the color for matched text.
 Suppress normal output;
 instead print the name of each input file from which
 no output would normally have been printed.
-The scanning of each file stops on the first match.
 
 @item -l
 @itemx --files-with-matches
@@ -333,7 +332,7 @@ The scanning of each file stops on the first match.
 Suppress normal output;
 instead print the name of each input file from which
 output would normally have been printed.
-The scanning of each file stops on the first match.
+Scanning each input file stops upon first match.
 (@option{-l} is specified by POSIX.)
 
 @item -m @var{num}

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


commit 70517057c9234146d56bb05cc22cd62ab6407c86
Author: Jim Meyering <meyering@fb.com>
Date:   Sun Jan 31 09:10:01 2021 -0800

    doc: man: fix -L description and improve -l's
    
    * doc/grep.texi (-L): Remove erroneous sentence about stopping early.
    With -L, grep cannot stop scanning early.
    (-l): Tweak existing wording.
    * doc/grep.in.1: Remove the -L sentence here, too.
    (-l): Copy the sentence from grep.texi, to clarify: it's only per-file
    scanning that stops upon match.  Reported by Robert Bruntz
    in http://debbugs.gnu.org/46179

diff --git a/doc/grep.in.1 b/doc/grep.in.1
index db270dd..c0b6b40 100644
--- a/doc/grep.in.1
+++ b/doc/grep.in.1
@@ -319,13 +319,12 @@ is
 Suppress normal output; instead print the name
 of each input file from which no output would
 normally have been printed.
-The scanning will stop on the first match.
 .TP
 .BR \-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 will stop on the first match.
+Scanning each input file stops upon first match.
 .TP
 .BI \-m " NUM" "\fR,\fP \-\^\-max\-count=" NUM
 Stop reading a file after
diff --git a/doc/grep.texi b/doc/grep.texi
index 19099cc..e3b1555 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -323,7 +323,6 @@ which only covers the color for matched text.
 Suppress normal output;
 instead print the name of each input file from which
 no output would normally have been printed.
-The scanning of each file stops on the first match.
 
 @item -l
 @itemx --files-with-matches
@@ -333,7 +332,7 @@ The scanning of each file stops on the first match.
 Suppress normal output;
 instead print the name of each input file from which
 output would normally have been printed.
-The scanning of each file stops on the first match.
+Scanning each input file stops upon first match.
 (@option{-l} is specified by POSIX.)
 
 @item -m @var{num}

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

Summary of changes:
 configure.ac  | 7 +++++++
 doc/grep.in.1 | 3 +--
 doc/grep.texi | 3 +--
 3 files changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
grep