# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1299517070 -7200
# Node ID aabd0ddc26de1d9268d73664e0950f00bfb8e4d9
# Parent  1e5afdf631ea08696d23520fa8d06a060b623db5# Parent  7ea3cc9f8d820ae326159d6bb4c848a1a3f72be8
Automated merge with file:///srv/hg/tips

diff -r 1e5afdf631ea -r aabd0ddc26de x.rst
--- a/x.rst	Fri Mar 04 15:16:16 2011 +0200
+++ b/x.rst	Mon Mar 07 18:57:50 2011 +0200
@@ -16,6 +16,25 @@
   $ sudo apt-get install imagemagic
   $ import -quality 100 -pause <sec> -silent <file>
 
+* Input method.
+
+** Input method by setxkbmap.
+
+  $ setxkbmap ru
+
+  $ setxkbmap -rules xorg -model pc104 -layout "us,ru" -option "grp:rwin_toggle,grp_led:scroll" -variant ",winkeys"
+
+** Input method by xorg.conf.
+
+  Section "InputDevice"
+      Identifier     "Keyboard0"
+      Driver         "kbd"
+      Option         "XkbModel" "pc105"
+      Option         "XkbLayout" "us,ru"
+      Option         "XkbVariant" ",winkeys"
+      Option         "XkbOptions" "grp:rwin_switch,grp_led:scroll"
+  EndSection
+
 * .Xdefaults
 
 The syntax of an Xdefaults file is as follows: