--- Gentoo Docs/guide-localization.xml.orig	2005-12-19 05:08:41.000000000 -0800
+++ Gentoo Docs/guide-localization.xml	2006-01-02 05:14:41.000000000 -0800
@@ -29,8 +29,8 @@
 the German doc. Includes configuration for use of the euro currency symbol.
 </abstract>
 
-<version>1.24</version>
-<date>2005-11-25</date>
+<version>1.25</version>
+<date>2005-1-02</date>
 
 <chapter>
 <title>Time zone</title>
@@ -216,6 +216,28 @@
 </p>
 
 <p>
+Once you have set the right locale, be sure to update your environment
+variables to make your system aware of the change:
+</p>
+
+<pre caption="Update the environment">
+# <i>env-update &amp;&amp; source /etc/profile</i>
+</pre>
+
+<p>
+After this, you will need to kill your X server by pressing
+<c>Ctrl-Alt-Backspace</c>, log out, then log in as user.
+</p>
+
+<p>
+Now, verify that the changes have taken effect:
+</p>
+
+<pre caption="Verify env changes">
+$ <i>env | grep -i LC_</i>
+</pre>
+
+<p>
 There is also additional localisation variable called LINGUAS, which affects
 to localisation files that get installed in gettext-based programs, and decides
 used localisation for some specific software packages, such as 
@@ -256,6 +278,19 @@
 # <i>export LANG="en_US.ISO-8859-15"</i>
 </pre>
 
+<p>
+Be sure to update the environment after the change:
+</p>
+
+<pre caption="Update the environment">
+# <i>env-update &amp;&amp; source /etc/profile</i>
+</pre>
+
+<p>
+After this, you will need to kill your X server by pressing
+<c>Ctrl-Alt-Backspace</c>, log out, then log in as user.
+</p>
+
 </body>
 </section>
 <section>
@@ -335,10 +370,46 @@
      Identifier  "Keyboard1"
      ...
      Option "XkbLayout"    "de"
-     # Option "XkbVariant"  "nodeadkeys"
+     #Option "XkbModel"     "pc105"    <comment>## this is for international keyboards.</comment>
+     # Option "XkbVariant"  "nodeadkeys" <comment>## this would be used for xterm input</comment>
+     ...
+</pre>
+
+<p>
+If you have an international keyboard layout, you should set the option
+<c>XkbModel</c> to <c>pc102</c> or <c>pc105</c>, as this will allow mapping of the
+additional keys specific to your keyboard.
+</p>
+
+<p>
+Deadkeys allow you to press keys that will not show immediately but will be
+combined with another letter to produce a single character such as é,è,á,à,
+etc. Setting <c>XkbVariant</c> to <c>nodeadkeys</c> allows input these special
+characters into X terminals.
+</p>
+
+<p>
+If you would like to switch between more than one keyboard layout (for example
+English and Russian), all you have to do is add a few lines to
+<path>xorg.conf</path> that specify the desired layouts and the shortcut
+command.
+</p>
+
+<pre caption="Switching between two keyboard layouts">
+ Section "InputDevice"
+     Identifier  "Keyboard1"
      ...
+     Option "XkbLayout"    "us,ru"
+     Option "XkbOptions"   "grp:alt_shift_toggle,grp_led:scroll"
 </pre>
 
+<p>
+Here, <c>XkbOptions</c> allows you to toggle between keyboard layouts by simply
+pressing <c>Alt-Shift</c>. This will also toggle the Scroll Lock light on or
+off, thanks to the <c>grp_led:scroll</c> option. This is a handy visual
+indicator of which keyboard layout you are using at the moment.
+</p>
+
 </body>
 </section>
 </chapter>
@@ -365,7 +436,7 @@
 <p>
 In order to get your console to display the Euro symbol, you
 will need to set <c>CONSOLEFONT</c> in
-<path>/etc/rc.conf</path> to a file found in
+<path>/etc/conf.d/consolefont</path> to a file found in
 <path>/usr/share/consolefonts/</path> (without the
 <c>.psfu.gz</c>).  <c>lat9w-16</c> has the Euro symbol.
 </p>
@@ -374,6 +445,22 @@
 CONSOLEFONT="lat9w-16"
 </pre>
 
+<p>
+You should verify that <c>CONSOLEFONT</c> is in the boot runlevel:
+</p>
+
+<pre caption="Verify the proper runlevel">
+# <i>rc-update show | grep -i consolefont</i>
+</pre>
+
+<p>
+If no runlevel is displayed for <c>CONSOLEFONT</c>, then add it to the proper level:
+</p>
+
+<pre caption="Add consolefont to boot">
+# <i>rc-update add consolefont boot</i>
+</pre>
+
 </body>
 </section>
 </chapter>