X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Flocalectl.xml;h=0b13c111a554995c1b3586c11566326e13c9c3d9;hp=33508cffe5adc3ccbb2b7c240938833d243a2c8e;hb=3583882c4ff8ced09867691175e1a7396ae8e413;hpb=f274ece0f76b5709408821e317e87aef76123db6

diff --git a/man/localectl.xml b/man/localectl.xml
index 33508cffe..0b13c111a 100644
--- a/man/localectl.xml
+++ b/man/localectl.xml
@@ -21,7 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="localectl">
+<refentry id="localectl" conditional='ENABLE_LOCALED'>
 
         <refentryinfo>
                 <title>localectl</title>
@@ -79,8 +79,8 @@
 
                 <variablelist>
                         <varlistentry>
-                                <term><option>--help</option></term>
                                 <term><option>-h</option></term>
+                                <term><option>--help</option></term>
 
                                 <listitem><para>Prints a short help
                                 text and exits.</para></listitem>
@@ -183,7 +183,7 @@
                                 mapping of X11, after converting it to
                                 the closest matching X11 keyboard
                                 mapping. Use
-                                <command>list-locales</command> for a
+                                <command>list-keymaps</command> for a
                                 list of available keyboard mappings
                                 (see below).</para></listitem>
                         </varlistentry>
@@ -194,7 +194,7 @@
                                 <listitem><para>List available
                                 keyboard mappings for the console,
                                 useful for configuration with
-                                <command>set-keyboard</command>.</para></listitem>
+                                <command>set-keymap</command>.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -215,6 +215,23 @@
                                 mapping.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><command>list-x11-keymap-models</command></term>
+                                <term><command>list-x11-keymap-layouts</command></term>
+                                <term><command>list-x11-keymap-variants [LAYOUT]</command></term>
+                                <term><command>list-x11-keymap-options</command></term>
+
+                                <listitem><para>List available X11
+                                keymap models, layouts, variants and
+                                options, useful for configuration with
+                                <command>set-keymap</command>. The
+                                command
+                                <command>list-x11-keymap-variants</command>
+                                optionally takes a layout parameter to
+                                limit the output to the variants
+                                suitable for the specific
+                                layout.</para></listitem>
+                        </varlistentry>
                 </variablelist>
 
         </refsect1>
@@ -229,7 +246,7 @@
         <refsect1>
                 <title>Environment</title>
 
-                <variablelist>
+                <variablelist class='environment-variables'>
                         <varlistentry>
                                 <term><varname>$SYSTEMD_PAGER</varname></term>
                                 <listitem><para>Pager to use when