Add a paragraph about locale names.

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index 26f2c2f91742393d2f9656cb1a3080ee0ce49b71..c48f5bddc553a7279103c035b210fc8133879bbc 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-17  Bruno Haible  <bruno@clisp.org>
+
+       * gettext.texi (Locale Names): Explain the variant syntax.
+       Reported by Karl Berry <karl@freefriends.org>.
+
 2007-06-07  Bruno Haible  <bruno@clisp.org>
 
        * gettext.texi (aclocal): Mention also intlmacosx.m4.
@@ -5,7 +10,7 @@
 2007-06-07  Bruno Haible  <bruno@clisp.org>
 
        * xgettext.texi: Mention some caveats.
-       Reported by Ariel <asgettext@dsgml.com>.
+       Reported by Ariel Shkedi <asgettext@dsgml.com>.
 
 2007-06-03  Bruno Haible  <bruno@clisp.org>
 

diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index afe9fb93696d101693bed8dda20d4c8450a4b5a4..adaaf58bc2eb4064ea2fdec238a698ed5a05b24b 100644 (file)
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -1214,6 +1214,17 @@ still refers to the German locale as of 2000 that stores characters in
 ISO-8859-1 encoding -- a text encoding that cannot even accomodate the Euro
 currency sign.
 
+Some locale names use @samp{@var{ll}_@var{CC}.@@@var{variant}} instead of
+@samp{@var{ll}_@var{CC}}.  The @samp{@@@var{variant}} can denote any kind of
+characteristics that is not already implied by the language @var{ll} and
+the country @var{CC}.  It can denote a particular monetary unit.  For example,
+on glibc systems, @samp{de_DE@@euro} denotes the locale that uses the Euro
+currency, in contrast to the older locale @samp{de_DE} which implies the use
+of the currency before 2002.  It can also denote a dialect of the language,
+or the script used to write text (for example, @samp{sr_RS@@latin} uses the
+Latin script, whereas @samp{sr_RS} uses the Cyrillic script to write Serbian),
+or the orthography rules, or similar.
+
 On other systems, some variations of this scheme are used, such as
 @samp{@var{ll}}.  You can get the list of locales supported by your system
 for your language by running the command @samp{locale -a | grep '^@var{ll}'}.