X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Flocale.conf.xml;h=0c4d351ec7440543ee5a5bfb4dbf790af4a934a7;hb=b43f208f78666fd27e274daa946ae57becd59dd6;hp=fa446a8e17fa79a563689cd39c7caddda95d075a;hpb=ee48647271132188e9ecc3507e62b6c7c7a6c9eb;p=elogind.git

diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index fa446a8e1..0c4d351ec 100644
--- a/man/locale.conf.xml
+++ b/man/locale.conf.xml
@@ -9,16 +9,16 @@
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
@@ -69,6 +69,7 @@
 
                 <para>Note that the kernel command line options
                 <varname>locale.LANG=</varname>,
+                <varname>locale.LANGUAGE=</varname>,
                 <varname>locale.LC_CTYPE=</varname>,
                 <varname>locale.LC_NUMERIC=</varname>,
                 <varname>locale.LC_TIME=</varname>,
@@ -86,7 +87,7 @@
                 <para>The locale settings configured in
                 <filename>/etc/locale.conf</filename> are system-wide
                 and are inherited by every service or user, unless
-                overriden or unset by individual programs or
+                overridden or unset by individual programs or
                 individual users.</para>
 
                 <para>Depending on the operating system other
@@ -101,6 +102,7 @@
                 <para>The following locale settings may be set using
                 <filename>/etc/locale.conf</filename>:
                 <varname>LANG=</varname>,
+                <varname>LANGUAGE=</varname>,
                 <varname>LC_CTYPE=</varname>,
                 <varname>LC_NUMERIC=</varname>,
                 <varname>LC_TIME=</varname>,
@@ -117,6 +119,19 @@
                 this file. For details about the meaning and semantics
                 of these settings, refer to
                 <citerefentry><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
+        </refsect1>
+
+        <refsect1>
+                <title>Example</title>
+
+                <example>
+                        <title>German locale with English messages</title>
+
+                        <para><filename>/etc/locale.conf:</filename></para>
+
+                        <programlisting>LANG=de_DE.UTF-8
+LC_MESSAGES=C</programlisting>
+                </example>
 
         </refsect1>