From 9f7a4ee9ad5bc921927d4642f11223a93e22327d Mon Sep 17 00:00:00 2001
From: Pav Lucistnik <pav@FreeBSD.org>
Date: Wed, 1 Mar 2006 20:20:49 +0000
Subject: [PATCH] * Localizing FreeBSD to Specific Languages - Remove notes
 relevant to XFree86 3.X

---
 .../books/handbook/l10n/chapter.sgml          | 36 +++----------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml b/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
index 605242080e..0b4fa4d445 100644
--- a/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
@@ -802,16 +802,6 @@ font8x8="cp866-8x8"</programlisting>
 	  <listitem>
 	    <para>Do <link linkend="setting-locale">non-X locale
 	      setup</link> first as described.</para>
-
-	    <note>
-	      <para><anchor id="russian-note">The Russian KOI8-R locale
-		may not work with old <application>&xfree86;</application> releases (lower than 3.3).
-		<application>&xorg;</application> is now the default
-		version of the X Window System on FreeBSD.
-		This should not be an
-		issue unless you are using an old version of
-		FreeBSD.</para>
-	    </note>
 	  </listitem>
 
 	  <listitem>
@@ -837,15 +827,7 @@ FontPath   "/usr/X11R6/lib/X11/fonts/cyrillic/100dpi"</programlisting>
 	  <listitem>
 	    <para>To activate a Russian keyboard, add the following to the
 	      <literal>"Keyboard"</literal> section of your
-	      <filename>XF86Config</filename> file.</para>
-
-	    <para>For <application>&xfree86; 3.X</application>:</para>
-
-	    <programlisting>XkbLayout  "ru"
-XkbOptions "grp:caps_toggle"</programlisting>
-
-	    <para>For <application>&xorg;</application> (or
-	      <application>&xfree86; 4.X</application>):</para>
+	      <filename>xorg.conf</filename> file.</para>
 
 	    <programlisting>Option "XkbLayout"   "us,ru"
 Option "XkbOptions"  "grp:toggle"</programlisting>
@@ -865,23 +847,13 @@ Option "XkbOptions"  "grp:toggle"</programlisting>
 	    <para>If you have <quote>&windows;</quote> keys on your keyboard,
 	      and notice that some non-alphabetical keys are mapped
 	      incorrectly in RUS mode, add the following line in your
-	      <filename>XF86Config</filename> file.</para>
-
-	    <para>For <application>&xfree86; 3.X</application>:</para>
-
-	<programlisting>XkbVariant "winkeys"</programlisting>
-
-	    <para>For <application>&xorg;</application> (or
-	      <application>&xfree86; 4.X</application>):</para>
+	      <filename>xorg.conf</filename> file.</para>
 
 	<programlisting>Option "XkbVariant" ",winkeys"</programlisting>
 
 	    <note>
-	      <para>The Russian XKB keyboard may not work with old <application>&xfree86;</application>
-		versions, see the <link linkend="russian-note">above
-		note</link> for more information.  The Russian XKB
-		keyboard may also not work with non-localized
-		applications as well.</para>
+	      <para>The Russian XKB keyboard may not work with non-localized
+		applications.</para>
 	    </note>
 	  </listitem>
 	</orderedlist>