From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 11 Dec 2014 05:02:54 +0000 (-0500)
Subject: localectl,man: make it obvious that set-*-keymaps sets both keymaps
X-Git-Tag: v219~1069
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2ebcf936702e8e511098711b4add885372360018;p=elogind.git

localectl,man: make it obvious that set-*-keymaps sets both keymaps

https://bugs.freedesktop.org/show_bug.cgi?id=85411
---

diff --git a/man/localectl.xml b/man/localectl.xml
index c332027d8..b472b6bd9 100644
--- a/man/localectl.xml
+++ b/man/localectl.xml
@@ -152,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
@@ -181,15 +181,17 @@
                                 <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>
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 58b8984bc..0d0233bf4 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -497,10 +497,10 @@ static void help(void) {
                "  status                   Show current locale settings\n"
                "  set-locale LOCALE...     Set system locale\n"
                "  list-locales             Show known locales\n"
-               "  set-keymap MAP [MAP]     Set virtual console keyboard mapping\n"
+               "  set-keymap MAP [MAP]     Set console and X11 keyboard mappings\n"
                "  list-keymaps             Show known virtual console keyboard mappings\n"
                "  set-x11-keymap LAYOUT [MODEL [VARIANT [OPTIONS]]]\n"
-               "                           Set X11 keyboard mapping\n"
+               "                           Set X11 and console keyboard mappings\n"
                "  list-x11-keymap-models   Show known X11 keyboard mapping models\n"
                "  list-x11-keymap-layouts  Show known X11 keyboard mapping layouts\n"
                "  list-x11-keymap-variants [LAYOUT]\n"