picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

https://bugs.freedesktop.org/show_bug.cgi?id=85411
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-12-11 00:02:54 -05:00
parent 820aced6f6
commit 2ebcf93670
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
man/localectl.xml
View File

@ -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>

4
src/locale/localectl.c
View File

@ -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"