grep branch, master, updated. v2.20-17-g5f42668

[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  5f42668ee04885a86c7faec86079b89584772e24 (commit)
      from  4350fd92c58d8374af247be6073a486536c8ed16 (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=5f42668ee04885a86c7faec86079b89584772e24


commit 5f42668ee04885a86c7faec86079b89584772e24
Author: Paul Eggert <address@hidden>
Date:   Sun Aug 3 13:43:42 2014 -0700

    doc: document LANGUAGE
    
    Reported by Benno Schulenberg in: http://bugs.gnu.org/18185
    * doc/grep.texi (Environment Variables): Document LANGUAGE.

diff --git a/doc/grep.texi b/doc/grep.texi
index aaea1df..d9da088 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -759,15 +759,23 @@ this option can be used with commands like
 The behavior of @command{grep} is affected
 by the following environment variables.
 
address@hidden LANGUAGE @r{environment variable}
address@hidden LC_ALL @r{environment variable}
address@hidden LC_MESSAGES @r{environment variable}
address@hidden LANG @r{environment variable}
 The locale for category @address@hidden@var{foo}}}
 is specified by examining the three environment variables
 @env{LC_ALL}, @address@hidden@var{foo}}}, and @env{LANG},
 in that order.
 The first of these variables that is set specifies the locale.
 For example, if @env{LC_ALL} is not set,
-but @env{LC_MESSAGES} is set to @samp{pt_BR},
+but @env{LC_COLLATE} is set to @samp{pt_BR},
 then the Brazilian Portuguese locale is used
-for the @env{LC_MESSAGES} category.
+for the @env{LC_COLLATE} category.
+As a special case for @env{LC_MESSAGES} only, the environment variable
address@hidden can contain a colon-separated list of languages that
+overrides the three environment variables that ordinarily specify
+the @env{LC_MESSAGES} category.
 The @samp{C} locale is used if none of these environment variables are set,
 if the locale catalog is not installed,
 or if @command{grep} was not compiled
@@ -978,9 +986,11 @@ These variables specify the locale for the @env{LC_CTYPE} 
category,
 which determines the type of characters,
 e.g., which characters are whitespace.
 
address@hidden LC_ALL
address@hidden LANGUAGE
address@hidden LC_ALL
 @itemx LC_MESSAGES
 @itemx LANG
address@hidden LANGUAGE @r{environment variable}
 @vindex LC_ALL @r{environment variable}
 @vindex LC_MESSAGES @r{environment variable}
 @vindex LANG @r{environment variable}

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

Summary of changes:
 doc/grep.texi |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
grep