From 276d1a8cc74898acb4f5e10aeef4539985f45c3c Mon Sep 17 00:00:00 2001
From: corinna <corinna>
Date: Fri, 5 Mar 2010 15:44:03 +0000
Subject: [PATCH] 	* setup2.sgml (setup-env): Add cross reference to
 using-cygwinenv. 	Change description for locale environment variables to
 comply with 	changes in 1.7.2.

---
 winsup/doc/ChangeLog   |  6 ++++++
 winsup/doc/setup2.sgml | 13 ++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index a2efe0f023..44d8b99e40 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-05  Corinna Vinschen  <corinna@vinschen.de>
+
+	* setup2.sgml (setup-env): Add cross reference to using-cygwinenv.
+	Change description for locale environment variables to comply with
+	changes in 1.7.2.
+
 2010-03-02  Charles Wilson  <cygwin@cwilson.fastmail.fm>
 
 	* new-features.sgml (ov-new1.7.2): Describe XDR support.
diff --git a/winsup/doc/setup2.sgml b/winsup/doc/setup2.sgml
index c2baad547c..d4dd2da49d 100644
--- a/winsup/doc/setup2.sgml
+++ b/winsup/doc/setup2.sgml
@@ -25,12 +25,15 @@ DOS shell, before launching bash.</para>
 </screen>
 
 <para>
+For all possible settings of the <envar>CYGWIN</envar> environment variable,
+see <xref linkend="using-cygwinenv"></xref>.
+</para>
+
+<para>
 Locale support is controlled by the <envar>LANG</envar> and
-<envar>LC_xxx</envar> environment variables.  You can set all of them
-but Cygwin itself only honors the variables <envar>LC_ALL</envar>,
-<envar>LC_CTYPE</envar>, and <envar>LANG</envar>, in this order, according
-to the POSIX standard.  The first one found rules.  For a more detailed
-description see <xref linkend="setup-locale"></xref>.
+<envar>LC_xxx</envar> environment variables.  Since Cygwin 1.7.2, all of
+them are honored and have a meaning.  For a more detailed description see
+<xref linkend="setup-locale"></xref>.
 </para>
 
 <para>
-- 
2.11.0