about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--NEWS6
-rw-r--r--manual/locale.texi10
3 files changed, 18 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5cd261285e..38c8ed96db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-17  Dwayne Grant McConnell  <decimal@us.ibm.com>
+
+	[BZ #174]
+	* manual/locale.texi (setlocale): Document LOCPATH.
+
 2012-02-17  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #10210]
diff --git a/NEWS b/NEWS
index f8c1be7a51..c25d34343c 100644
--- a/NEWS
+++ b/NEWS
@@ -9,9 +9,9 @@ Version 2.16
 
 * The following bugs are resolved with this release:
 
-  350, 411, 3335, 4026, 4822, 5805, 6884, 9902, 10140, 10210, 11494, 12047,
-  13525, 13526, 13527, 13528, 13529, 13530, 13531, 13532, 13533, 13547,
-  13551, 13552, 13553, 13555, 13559, 13583, 13618
+  174, 350, 411, 3335, 4026, 4822, 5805, 6884, 9902, 10140, 10210, 11494,
+  12047, 13525, 13526, 13527, 13528, 13529, 13530, 13531, 13532, 13533,
+  13547, 13551, 13552, 13553, 13555, 13559, 13583, 13618
 
 * ISO C11 support:
 
diff --git a/manual/locale.texi b/manual/locale.texi
index d1a50cb0f4..23ad8bcdb3 100644
--- a/manual/locale.texi
+++ b/manual/locale.texi
@@ -279,6 +279,16 @@ If you specify an invalid locale name, @code{setlocale} returns a null
 pointer and leaves the current locale unchanged.
 @end deftypefun
 
+The path used for finding locale data can be set using the
+@code{LOCPATH} environment variable. The default path for finding
+locale data is system specific.  It is computed from the value given
+as the prefix while configuring the C library.  This value normally is
+@file{/usr} or @file{/}.  For the former the complete path is:
+
+@smallexample
+/usr/lib/locale
+@end smallexample
+
 Here is an example showing how you might use @code{setlocale} to
 temporarily switch to a new locale.