X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Flocale.conf.xml;h=b90efea50c3e910860f478f11aa78ab29cff21fd;hp=d36e7bda64074b60ff407536e0ff42ccb3282275;hb=ff5d32c875fe5507db2004d3c22fe77cbc7eab0d;hpb=76e7bc8dfbb1139254c3819f448246592f17f317

diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index d36e7bda6..b90efea50 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/>.
 -->
 
@@ -55,7 +55,9 @@
                 <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
@@ -69,6 +71,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 +89,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 +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>,
@@ -123,12 +127,12 @@
                 <title>Example</title>
 
                 <example>
-                        <title>German locale with english messages</title>
+                        <title>German locale with English messages</title>
 
                         <para><filename>/etc/locale.conf:</filename></para>
 
                         <programlisting>LANG=de_DE.UTF-8
-LC_MESSAGE=C</programlisting>
+LC_MESSAGES=C</programlisting>
                 </example>
 
         </refsect1>
@@ -137,7 +141,8 @@ LC_MESSAGE=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>