Index: doc/en/guide-localization.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/guide-localization.xml,v
--- doc/en/guide-localization.xml	4 Sep 2011 17:53:40 -0000	1.62
+++ doc/en/guide-localization.xml	11 Sep 2011 23:25:05 -0000
@@ -25,6 +25,9 @@ 
 <author title="Editor">
   <mail link="nightmorph"/>
 </author>
+<author title="Editor">
+  <mail link="klondike"/>
+</author>
 
 <abstract>
 This guide should help users localize their Gentoo Linux distribution to any
@@ -44,7 +47,7 @@ 
 In order to keep time properly, you need to select your timezone so that your
 system knows where it is located. Look for your timezone in
 <path>/usr/share/zoneinfo</path>. You then set your timezone in
-<path>/etc/conf.d/clock</path>. Please avoid the
+<path>/etc/timezone</path>. Please avoid the
 <path>/usr/share/zoneinfo/Etc/GMT*</path> timezones as their names do not
 indicate the expected zones. For instance, <path>GMT-8</path> is in fact GMT+8.
 </p>
@@ -55,8 +58,8 @@ 
 <comment>(First copy the proper zone to localtime)</comment>
 # <i>cp /usr/share/zoneinfo/Europe/Brussels /etc/localtime</i>
 <comment>(Now specify your timezone)</comment>
-# <i>nano -w /etc/conf.d/clock</i>
-TIMEZONE="Europe/Brussels"
+# <i>nano -w /etc/timezone</i>
+Europe/Brussels
 
 # <i>date</i>
 Wed Mar  8 00:46:05 CET 2006
@@ -88,15 +91,16 @@ 
 UTC (or GMT, Greenwich Mean Time) and then your timezone is
 taken into account to determine the actual, local time.  If,
 for some reason, you need your hardware clock not to be in UTC,
-you will need to edit <path>/etc/conf.d/clock</path> and change the
-value of <c>CLOCK</c> from <c>UTC</c> to <c>local</c>.
+you will need to edit <path>/etc/conf.d/hwclock</path> (or, if you use Gentoo
+BSD <path>/etc/conf.d/adjkerntz</path>) and change the
+value of <c>clock</c> from <c>UTC</c> to <c>local</c>.
 </p>
 
 <pre caption="local vs. GMT clock">
 <comment>(recommended:)</comment>
-CLOCK="UTC"
+clock="UTC"
 <comment>(or:)</comment>
-CLOCK="local"
+clock="local"
 </pre>
 
 </body>
@@ -222,7 +226,7 @@ 
 
 <note>
 Use <c>de_DE@euro</c> as your LANG if you want to use the Euro currency symbol
-(€).
+(€) on non UTF-8 based locales.
 </note>
 
 <p>
@@ -347,7 +351,7 @@ 
 
 <p>
 The keyboard layout used by the console is set in
-<path>/etc/conf.d/keymaps</path> by the <c>KEYMAP</c> variable.
+<path>/etc/conf.d/keymaps</path> by the <c>keymap</c> variable.
 Valid values can be found in
 <path>/usr/share/keymaps/<c>{arch}</c>/</path>.
 <path>i386</path> has further subdivisions into layout
@@ -357,9 +361,9 @@ 
 </p>
 
 <pre caption="Setting the console keymap">
-KEYMAP="de"
-KEYMAP="de-latin1"
-KEYMAP="de-latin1-nodeadkeys"
+keymap="de"
+keymap="de-latin1"
+keymap="de-latin1-nodeadkeys"
 </pre>
 
 </body>
@@ -378,13 +382,13 @@ 
 </p>
 
 <pre caption="Setting the X keymap">
- Section "InputDevice"
-     Identifier  "Keyboard1"
-     ...
-     Option "XkbLayout"    "de"
-     #Option "XkbModel"     "pc105"    <comment>## this is for international keyboards.</comment>
-     # Option "XkbVariant"  "nodeadkeys" <comment>## this would be used for xterm input</comment>
-     ...
+Section "InputClass"
+	Identifier "keyboard-all"
+	Driver "evdev"
+	Option "XkbLayout" "de"
+	#Option "XkbModel" "pc105"
+	MatchIsKeyboard "on"
+EndSection
 </pre>
 
 <p>
@@ -408,11 +412,13 @@ 
 </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"
+Section "InputClass"
+	Identifier "keyboard-all"
+	Driver "evdev"
+	Option "XkbLayout"    "us,ru"
+	Option "XkbOptions"   "grp:alt_shift_toggle,grp_led:scroll"
+	MatchIsKeyboard "on"
+EndSection
 </pre>
 
 <p>
@@ -448,25 +454,25 @@ 
 
 <p>
 In order to get your console to display the Euro symbol, you will need to set
-<c>CONSOLEFONT</c> in <path>/etc/conf.d/consolefont</path> to a file found in
+<c>consolefont</c> 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>
 
 <pre caption="Setting the console font">
-CONSOLEFONT="lat9w-16"
+consolefont="lat9w-16"
 </pre>
 
 <p>
-You should verify that <c>CONSOLEFONT</c> is in the boot runlevel:
+You should verify that <c>consolefont</c> is in the boot runlevel:
 </p>
 
 <pre caption="Verify the proper runlevel">
-# <i>rc-update -v show | grep -i consolefont</i>
+# <i>rc-update -v show | grep consolefont</i>
 </pre>
 
 <p>
-If no runlevel is displayed for <c>CONSOLEFONT</c>, then add it to the proper level:
+If no runlevel is displayed for <c>consolefont</c>, then add it to the proper level:
 </p>
 
 <pre caption="Add consolefont to boot">