[gnome-user-docs/gnome-3-10: 6/19] Update keyboard-layout.page

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit 6a571264ea8ed996d5414e16bc1206934c491571
Author: Petr Kovar <pkovar redhat com>
Date:   Wed Jan 29 15:11:14 2014 +0000

    Update keyboard-layout.page

 system-admin-guide/C/keyboard-layout.page |   67 +++++++++++++++++++++++-----
 1 files changed, 55 insertions(+), 12 deletions(-)
---
diff --git a/system-admin-guide/C/keyboard-layout.page b/system-admin-guide/C/keyboard-layout.page
index 1d84de1..d7c9895 100644
--- a/system-admin-guide/C/keyboard-layout.page
+++ b/system-admin-guide/C/keyboard-layout.page
@@ -4,7 +4,7 @@
 
   <info>
     <link type="guide" xref="index#session" />
-    <revision pkgversion="3.6.0" date="2012-12-10" status="draft"/>
+    <revision pkgversion="3.11" date="2014-01-29" status="draft"/>
 
     <credit type="author copyright">
       <name>minnie_eg</name>
@@ -16,13 +16,18 @@
       <email>kittykat3756 gmail com</email>
       <years>2012</years>
     </credit>
+    <credit type="editor">
+      <name>Petr Kovar</name>
+      <email>pknbe volny cz</email>
+      <years>2014</years>
+    </credit>
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
     <desc>Populate the keyboard layout chooser on the login screen.</desc>
   </info>
 
-  <title>Multiple keyboard layouts on the login screen</title>
+  <title>Display multiple keyboard layouts on the login screen</title>
 
   <comment>
     <cite date="2012-12-02" href="mailto:amany elguindy gmail com">Amany El-Guindy</cite>
@@ -32,18 +37,53 @@
     typed.</p>
   </comment>
 
-  <p>You can add alternative keyboard layouts for users to chose from on the
-  login screen. This can be helpful for users who normally use a different
-  keyboard layout from the default.</p>
+  <p>You can change the system keyboard layout settings to add alternative
+  keyboard layouts for users to chose from on the login screen. This can be
+  helpful for users who normally use different keyboard layouts from the default
+  and who want to have those keyboard layouts available at the login screen.</p>
+
+  <steps>
+    <title>Change the system keyboard layout settings</title>
+    <item>
+      <p>Find the codes of the desired language layouts in the
+      <file>/usr/share/X11/xkb/rules/base.lst</file> file under the section
+      named <sys>! layout</sys>.</p>
+    </item>
+    <item>
+      <p>Use the <cmd>localectl</cmd> tool to change the system keyboard
+        layout settings as follows:</p>
+      <screen><cmd>localectl set-x11-keymap <var>layout</var></cmd></screen>
+      <p>You can specify multiple layouts as a comma-separated list. For example,
+        to set <sys>es</sys> as the default layout, and <sys>us</sys>
+        as the secondary layout, run the following command:
+      </p>
+      <screen><output>$ </output><input>localectl set-x11-keymap es,us</input></screen>
+    </item>
+    <item>
+      <p>Log out to find that the defined layouts are available at the top bar
+      on the login screen.</p>
+    </item>
+  </steps>
+  <p>Note that you can also use the <cmd>localectl</cmd> tool to specify
+    the machine-wide default keyboard model, variant, and options. See the
+    <cmd>localectl</cmd>(1) man page for more information.</p>
+
+  <section id="keyboard-layout-no-localectl">
+  <title>Display multiple keyboard layouts without using localectl</title>
+
+  <p>On systems that do not provide the <cmd>localectl</cmd> tool, you can
+  change the system keyboard layout settings by editing a configuration file in
+  <file>/usr/share/X11/xorg.conf.d/</file>.</p>
 
   <steps>
+    <title>Change the system keyboard layout settings</title>
     <item>
-      <p>Find the code of the desired languages layouts in
-      <file>/usr/share/X11/xkb/rules/xorg.lst</file> under the section named
-      <code>! layout</code>.</p>
+      <p>Find the codes of the desired language layouts in the
+      <file>/usr/share/X11/xkb/rules/base.lst</file> file under the section
+      named <sys>! layout</sys>.</p>
     </item>
     <item>
-      <p>Add the layouts codes to
+      <p>Add the layout codes to
       <file>/usr/share/X11/xorg.conf.d/10-evdev.conf</file> in the following
       way:</p>
       <screen>
@@ -56,12 +96,15 @@
         EndSection
       </screen>
       <p>Multiple layouts can be added as a comma separated list, as shown in
-      the example for English and French layouts.</p>
+      the example for English (<sys>en</sys>) and French (<sys>fr</sys>)
+      layouts.</p>
     </item>
     <item>
-      <p>Logout to find that the defined layouts are available on the top bar
-      of the login screen.</p>
+      <p>Log out to find that the defined layouts are available at the top bar
+      on the login screen.</p>
     </item>
   </steps>
 
+  </section>
+
 </page>