X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Flocale.conf.xml;h=67bcc18e2af7b43aad8a94c62fe6d079d16517e4;hp=b90efea50c3e910860f478f11aa78ab29cff21fd;hb=17cd091332040b9a3658db9374440fce7805ca54;hpb=4aa6e7782a1b693a8e4fa1d84c87dd76fe1e536d

diff --git a/man/locale.conf.xml b/man/locale.conf.xml
index b90efea50..67bcc18e2 100644
--- a/man/locale.conf.xml
+++ b/man/locale.conf.xml
@@ -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>
@@ -64,7 +64,7 @@
                 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>
@@ -92,10 +92,17 @@
                 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>
+
+                <para><citerefentry><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                may be used to alter the settings in this file during
+                runtime from the command line. Use
+                <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                to initialize them on mounted (but not booted) system
+                images.</para>
         </refsect1>
 
         <refsect1>
@@ -117,7 +124,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>
@@ -129,10 +136,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>
@@ -142,7 +149,9 @@ LC_MESSAGES=C</programlisting>
                   <para>
                           <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>locale</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-                          <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                          <citerefentry><refentrytitle>localectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                   </para>
         </refsect1>