X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Flocale.conf.xml;h=e97092102c2561bdd7eb6411a948fd64e8f84a05;hp=742c5ebb2d61c0b0455b2a562cf254d7416121ce;hb=7abfbe7903d8e792850ec39286a3d86e616a6477;hpb=8f28cbcdfe55bdaaa3e8f9c68f39b1369dd0e5dd

diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index 742c5ebb2..e97092102 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/>.
 -->
 
@@ -44,7 +44,7 @@
 
         <refnamediv>
                 <refname>locale.conf</refname>
-                <refpurpose>configuration file for locale settings</refpurpose>
+                <refpurpose>Configuration file for locale settings</refpurpose>
         </refnamediv>
 
         <refsynopsisdiv>
@@ -55,20 +55,23 @@
                 <title>Description</title>
 
                 <para>The <filename>/etc/locale.conf</filename> file
-                configures system-wide locale settings.</para>
+                configures system-wide locale settings. It is read at
+                early-boot by
+                <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
 
                 <para>The basic file format of
                 <filename>locale.conf</filename> is a
                 newline-separated list of environment-like
                 shell-compatible variable assignments. It is possible
                 to source the configuration from shell scripts,
-                however, beyond mere variable assignments no shell
+                however, beyond mere variable assignments, no shell
                 features are supported, allowing applications to read
                 the file without implementing a shell compatible
                 execution engine.</para>
 
                 <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>,
@@ -89,7 +92,7 @@
                 overridden or unset by individual programs or
                 individual users.</para>
 
-                <para>Depending on the operating system other
+                <para>Depending on the operating system, other
                 configuration files might be checked for locale
                 configuration as well, however only as
                 fallback.</para>
@@ -101,6 +104,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>,
@@ -113,7 +117,7 @@
                 <varname>LC_TELEPHONE=</varname>,
                 <varname>LC_MEASUREMENT=</varname>,
                 <varname>LC_IDENTIFICATION=</varname>. Note that
-                <varname>LC_ALL</varname> may not be be configured in
+                <varname>LC_ALL</varname> may not be configured in
                 this file. For details about the meaning and semantics
                 of these settings, refer to
                 <citerefentry><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
@@ -125,10 +129,10 @@
                 <example>
                         <title>German locale with English messages</title>
 
-                        <para><filename>/etc/locale.conf:</filename></para>
+                        <para><filename>/etc/locale.conf</filename>:</para>
 
                         <programlisting>LANG=de_DE.UTF-8
-LC_MESSAGES=C</programlisting>
+LC_MESSAGES=en_US.UTF-8</programlisting>
                 </example>
 
         </refsect1>
@@ -137,7 +141,8 @@ LC_MESSAGES=C</programlisting>
                   <title>See Also</title>
                   <para>
                           <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                          <citerefentry><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+                          <citerefentry><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                   </para>
         </refsect1>