X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Flocalectl.xml;h=b472b6bd9c7651f3903b42a022c3f1da7b96f874;hb=5fae368bda9419d9d378ea32077c8fd183dd4b81;hp=9c32c794aa21d320ec337255d68a304b76fd73d7;hpb=ed3e4a3fd96891b5e7015723978e78cd21efd4fe;p=elogind.git

diff --git a/man/localectl.xml b/man/localectl.xml
index 9c32c794a..b472b6bd9 100644
--- a/man/localectl.xml
+++ b/man/localectl.xml
@@ -73,6 +73,11 @@
                 UI before the user logs in, such as the display
                 manager, as well as the default for users after
                 login.</para>
+
+                <para>Use
+                <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                to initialize the system locale for mounted (but not
+                booted) system images.</para>
         </refsect1>
 
         <refsect1>
@@ -147,14 +152,14 @@
                                 <term><command>set-keymap MAP [TOGGLEMAP]</command></term>
 
                                 <listitem><para>Set the system
-                                keyboard mapping for the console. This
-                                takes a keyboard mapping name (such as
-                                "de" or "us"), and possibly a second
-                                one to define a toggle keyboard
+                                keyboard mapping for the console and
+                                X11. This takes a mapping name (such
+                                as "de" or "us"), and possibly a
+                                second one to define a toggle keyboard
                                 mapping. Unless
                                 <option>--no-convert</option> is
                                 passed, the selected setting is also
-                                applied to the default keyboard
+                                applied as the default system keyboard
                                 mapping of X11, after converting it to
                                 the closest matching X11 keyboard
                                 mapping. Use
@@ -173,18 +178,20 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><command>set-x11-keymap LAYOUT [MODEL] [VARIANT] [OPTIONS]</command></term>
+                                <term><command>set-x11-keymap LAYOUT [MODEL [VARIANT [OPTIONS]]]</command></term>
 
                                 <listitem><para>Set the system default
-                                keyboard mapping for X11. This takes a
-                                keyboard mapping name (such as "de" or
-                                "us"), and possibly a model, variant
-                                and options, see
+                                keyboard mapping for X11 and the
+                                virtual console. This takes a keyboard
+                                mapping name (such as
+                                <literal>de</literal> or
+                                <literal>us</literal>), and possibly a
+                                model, variant, and options, see
                                 <citerefentry><refentrytitle>kbd</refentrytitle><manvolnum>4</manvolnum></citerefentry>
                                 for details. Unless
                                 <option>--no-convert</option> is
                                 passed, the selected setting is also
-                                applied to the system console keyboard
+                                applied as the system console keyboard
                                 mapping, after converting it to the
                                 closest matching console keyboard
                                 mapping.</para></listitem>
@@ -233,7 +240,8 @@
                           The XKB Configuration Guide
                         </ulink>,
                         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                        <citerefentry><refentrytitle>systemd-localed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 </para>
         </refsect1>