X-Git-Url: http://git.osdn.net/view?p=linuxjm%2FLDP_man-pages.git;a=blobdiff_plain;f=original%2Fman7%2Flocale.7;h=da05e3fee6bdb4d07ccae4201ef59b183f375567;hp=f4762d762ce67bdcbc0818786a8f777aa6dbcc8c;hb=4ea6bb24817f6f049d6bbc90ecd77a869876f9b0;hpb=110dba020f489b75aff2497105f7970c05e2b87c

diff --git a/original/man7/locale.7 b/original/man7/locale.7
index f4762d76..da05e3fe 100644
--- a/original/man7/locale.7
+++ b/original/man7/locale.7
@@ -28,7 +28,7 @@
 .\"   <jochen.hein@delphi.central.de>
 .\" Modified Thu Apr 25 00:43:19 2002 by Bruno Haible <bruno@clisp.org>
 .\"
-.TH LOCALE 7  2014-05-28 "Linux" "Linux Programmer's Manual"
+.TH LOCALE 7  2014-12-31 "Linux" "Linux Programmer's Manual"
 .SH NAME
 locale \- description of multilanguage support
 .SH SYNOPSIS
@@ -183,7 +183,7 @@ the thousands separator and the radix character
 (a period in most English-speaking countries,
 but a comma in many other regions).
 It affects functions such as
-.BR printf (3)
+.BR printf (3),
 .BR scanf (3),
 and
 .BR strtod (3).
@@ -221,7 +221,7 @@ which returns a string such as "49" (for Germany).
 This category governs the formatting used for date and time values.
 For example, most of Europe uses a 24-hour clock versus the
 12-hour clock used in the United States.
-the setting of this category affects the behavior of functions such as
+The setting of this category affects the behavior of functions such as
 .BR strftime (3)
 and
 .BR strptime (3).
@@ -330,17 +330,20 @@ The following environment variable is used by
 .BR newlocale (3)
 and
 .BR setlocale (3),
-and thus affects all localized programs:
+and thus affects all unprivileged localized programs:
 .TP
 .B LOCPATH
 A list of pathnames, separated by colons (\(aq:\(aq),
 that should be used to find locale data.
-If this variable is set, only the individual locale data files from
+If this variable is set,
+only the individual compiled locale data files from
 .I LOCPATH
-and the system default locale data path are used; any available locale
-archives are not used. The individual locale data files are searched
-under subdirectories which depend on the currently used locale. For
-example, when
+and the system default locale data path are used;
+any available locale archives are not used (see
+.BR localedef (1)).
+The individual compiled locale data files are searched for under
+subdirectories which depend on the currently used locale.
+For example, when
 .I en_GB.UTF-8
 is used for a category, the following subdirectories are searched for,
 in this order:
@@ -351,6 +354,13 @@ in this order:
 .IR en.utf8 ,
 and
 .IR en .
+.SH FILES
+.TP
+.I /usr/lib/locale/locale-archive
+Usual default locale archive location.
+.TP
+.I /usr/lib/locale
+Usual default path for compiled individual locale files.
 .SH CONFORMING TO
 POSIX.1-2001.
 .\"
@@ -373,9 +383,12 @@ POSIX.1-2001.
 .BR strxfrm (3),
 .BR uselocale (3),
 .BR wcstombs (3),
-.BR locale (5)
+.BR locale (5),
+.BR charsets (7),
+.BR unicode (7),
+.BR utf-8 (7)
 .SH COLOPHON
-This page is part of release 3.68 of the Linux
+This page is part of release 3.79 of the Linux
 .I man-pages
 project.
 A description of the project,