grep branch, master, updated. v2.14-39-ge274031

[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  e27403159f3dafba8dcb541d7ada76b5caf92d99 (commit)
      from  05e2f162e7014185cac3ec74532becf6e1c3bde6 (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=e27403159f3dafba8dcb541d7ada76b5caf92d99


commit e27403159f3dafba8dcb541d7ada76b5caf92d99
Author: Jim Meyering <address@hidden>
Date:   Mon Sep 30 09:13:34 2013 -0700

    maint: change all references: s/POSIX\.2/POSIX/
    
    There is no longer any point in referring to POSIX.N.
    POSIX is sufficient.
    * doc/grep.in.1: As above.
    * src/main.c (main): Likewise.
    * tests/file: Likewise.
    * tests/options: Likewise.
    * ChangeLog: Likewise.
    * NEWS: Likewise.
    * cfg.mk: Update, to match changed NEWS.
    Inspired by Glenn Golden's suggestion in http://bugs.gnu.org/15486

diff --git a/ChangeLog-2009 b/ChangeLog-2009
index f7a2538..4807092 100644
--- a/ChangeLog-2009
+++ b/ChangeLog-2009
@@ -1794,7 +1794,7 @@
 
         Problen noted by Gerald Stoller <address@hidden>
 
-        * src/grep.c (main): POSIX.2 says that -q overrides -l, which
+        * src/grep.c (main): POSIX says that -q overrides -l, which
         in turn overrides the other output options.  Fix grep to
         behave that way.
 
@@ -1848,7 +1848,7 @@
 
 2000-04-24  Paul Eggert
 
-        POSIX.2 conformance fixes: grep -q now exits with status zero
+        POSIX conformance fixes: grep -q now exits with status zero
         if an input line is selected, even if an error also occurs.
         grep -s no longer affects exit status.
 
@@ -1862,10 +1862,10 @@
         (main): -q sets exit_on_match.
 
         * doc/grep.1, doc/grep.texi, NEWS:
-        Document -q's behavior as required by POSIX.2.
+        Document -q's behavior as required by POSIX.
 
         * tests/status.sh:
-        Test for -q and -s behavior as conforming to POSIX.2.
+        Test for -q and -s behavior as conforming to POSIX.
 
 2000-04-20  Paul Eggert
 
@@ -2435,7 +2435,7 @@
 
 1999-10-11  Paul Eggert
 
-        * doc/grep.texi: Fix texinfo glitches.  POSIX -> POSIX.2 where
+        * doc/grep.texi: Fix texinfo glitches.  POSIX -> POSIX where
         appropriate.
 
 1999-10-11  Paul Eggert
@@ -2568,7 +2568,7 @@
 
         * src/grep.c (grepdir):
         Don't assume that st_ino and st_dev must be integers;
-        POSIX.1 allows them to be floating-point (!).
+        POSIX allows them to be floating-point (!).
 
         * src/vms_fab.h (arr_ptr): ':' -> ';' to fix typo.
 
@@ -3095,7 +3095,7 @@
         #undef if defined.
         Fixed by Andreas Ley and Philippe Defert.
 
-        * src/grep.1 : mention that -s follows POSIX.2 behavior.
+        * src/grep.1 : mention that -s follows POSIX behavior.
         Noted by Paul Eggert and others.
 
         * tests/khadafy.sh: a typo in failure(s).
diff --git a/NEWS b/NEWS
index fba3094..2f0e862 100644
--- a/NEWS
+++ b/NEWS
@@ -433,7 +433,7 @@ Version 2.5
     --color takes an optional argument specifying when to colorize a line:
       --color=always, --color=tty, --color=never
 
-  - The following changes are for POSIX.2 conformance:
+  - The following changes are for POSIX conformance:
 
     . The -q or --quiet or --silent option now causes grep to exit
       with zero status when a input line is selected, even if an error
@@ -450,7 +450,7 @@ Version 2.5
       environment variable to the value "C".
 
   - The -C or --context option now requires an argument, partly for
-    consistency, and partly because POSIX.2 recommends against
+    consistency, and partly because POSIX recommends against
     optional arguments.
 
   - The new -P or --perl-regexp option tells grep to interpret the pattern as
diff --git a/cfg.mk b/cfg.mk
index 1ac8709..d11b5c0 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -51,7 +51,7 @@ export VERBOSE = yes
 # 1127556 9e
 export XZ_OPT = -6e
 
-old_NEWS_hash = e85b0618e5cb76be3338b2c6143bc804
+old_NEWS_hash = 19870681ceb45c66e09b0415ea2ed167
 
 # Many m4 macros names once began with 'jm_'.
 # Make sure that none are inadvertently reintroduced.
diff --git a/doc/grep.in.1 b/doc/grep.in.1
index a6f850d..3d65610 100644
--- a/doc/grep.in.1
+++ b/doc/grep.in.1
@@ -835,7 +835,7 @@ For example, the command
 searches for the two-character string
 .B {1
 instead of reporting a syntax error in the regular expression.
-\s-1POSIX.2\s0 allows this behavior as an extension, but portable scripts
+\s-1POSIX\s0 allows this behavior as an extension, but portable scripts
 should avoid it.
 .
 .SH "ENVIRONMENT VARIABLES"
@@ -1130,13 +1130,13 @@ The default C locale uses American English messages.
 .B POSIXLY_CORRECT
 If set,
 .B grep
-behaves as \s-1POSIX.2\s0 requires; otherwise,
+behaves as \s-1POSIX\s0 requires; otherwise,
 .B grep
 behaves more like other \s-1GNU\s0 programs.
-\s-1POSIX.2\s0 requires that options that follow file names must be
+\s-1POSIX\s0 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, \s-1POSIX.2\s0 requires that unrecognized options be diagnosed as
+Also, \s-1POSIX\s0 requires that unrecognized options be diagnosed as
 \*(lqillegal\*(rq, but since they are not really against the law the default
 is to diagnose them as \*(lqinvalid\*(rq.
 .B POSIXLY_CORRECT
diff --git a/src/main.c b/src/main.c
index 1975027..974cf91 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2187,7 +2187,7 @@ main (int argc, char **argv)
     color_option = isatty (STDOUT_FILENO) && should_colorize ();
   init_colorize ();
 
-  /* POSIX.2 says that -q overrides -l, which in turn overrides the
+  /* POSIX says that -q overrides -l, which in turn overrides the
      other output options.  */
   if (exit_on_match)
     list_files = 0;
diff --git a/tests/file b/tests/file
index 8cdfc8d..3314244 100755
--- a/tests/file
+++ b/tests/file
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Test for POSIX.2 options for grep:
+# Test for POSIX options for grep:
 # grep -E -f pattern_file file
 # grep -F -f pattern_file file
 # grep -G -f pattern_file file
diff --git a/tests/options b/tests/options
index aa99981..2ac1a4b 100755
--- a/tests/options
+++ b/tests/options
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Test for POSIX.2 options for grep
+# Test for POSIX options for grep
 #
 # Copyright (C) 2001, 2006, 2009-2013 Free Software Foundation, Inc.
 #

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

Summary of changes:
 ChangeLog-2009 |   14 +++++++-------
 NEWS           |    4 ++--
 cfg.mk         |    2 +-
 doc/grep.in.1  |    8 ++++----
 src/main.c     |    2 +-
 tests/file     |    2 +-
 tests/options  |    2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
grep