diff --git a/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml b/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
index e4450da3ad..eea1febf74 100644
--- a/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml
@@ -69,7 +69,7 @@
       <para>Developers shortened internationalization into the term I18N,
 	counting the number of letters between the first and the last
 	letters of internationalization.  L10N uses the same naming
-	scheme, coming from "localization".  Combined
+	scheme, coming from <quote>localization</quote>.  Combined
 	together, I18N/L10N methods, protocols, and applications allow
 	users to use languages of their choice.</para>
 
@@ -184,7 +184,7 @@
 	</listitem>
 
 	<listitem>
-	  <para>Wide or multibyte encodings, f.e. EUC, Big5.</para>
+	  <para>Wide or multibyte encodings, i.e. EUC, Big5.</para>
 	</listitem>
       </itemizedlist>
 
@@ -222,7 +222,7 @@
 	refer to language-specific FreeBSD documentation for more
 	information.</para>
 
-      <para>You should set the following two values in your configuration
+      <para>You should set the following two environment variables in your configuration
 	files:</para>
 
       <itemizedlist>
@@ -364,7 +364,7 @@ taiwan:Taiwanese User:\
 		<para>An alternative variant is answering the specified
 		  language each time that 
 <screen><prompt>Enter login class: default []: </prompt></screen>
-		  appears from &man.adduser.8;</para>
+		  appears from &man.adduser.8;.</para>
 	      </listitem>
 
 	      <listitem>
@@ -470,8 +470,8 @@ font8x8=<replaceable>font_name</replaceable></programlisting>
       <para>Also be sure to set the correct keymap and screenmap for your
 	single C chars character set through
 	<filename>/stand/sysinstall</filename>.
-	Once inside sysinstall, choose <literal>Configure</literal>, then
-	<literal>Console</literal>.  Alternatively, you can add the
+	Once inside <application>sysinstall</application>, choose <guimenuitem>Configure</guimenuitem>, then
+	<guimenuitem>Console</guimenuitem>.  Alternatively, you can add the
 	following to <filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>scrnmap=<replaceable>screenmap_name</replaceable>
@@ -486,7 +486,7 @@ keychange="<replaceable>fkey_number sequence</replaceable>"</programlisting>
 	character matrix in pseudographics area, i.e., to move letters out
 	of that area if screen font uses a bit 8 column.</para>
 
-      <para>If you have the <application>moused daemon</application>
+      <para>If you have the <application>moused</application> daemon
 	enabled by setting the following
 	in your <filename>/etc/rc.conf</filename>:</para>
 
@@ -498,7 +498,7 @@ keychange="<replaceable>fkey_number sequence</replaceable>"</programlisting>
       <indexterm>
         <primary><application>moused</application></primary>
       </indexterm>
-      <para>By default the mouse cursor of the syscons driver occupies the
+      <para>By default the mouse cursor of the &man.syscons.4; driver occupies the
 	0xd0-0xd3 range in the character set.  If your language uses this
 	range, you need to move the cursor's range outside of it.  To enable
 	the workaround for FreeBSD versions before 5.0, insert the following
@@ -514,7 +514,7 @@ keychange="<replaceable>fkey_number sequence</replaceable>"</programlisting>
       <para>The <replaceable>keymap_name</replaceable> here is taken from
         the <filename>/usr/share/syscons/keymaps</filename> directory,
 	without the <filename>.kbd</filename> suffix.  If you're
-	uncertain which keymap to use, you use &man.kbdmap.1; to test
+	uncertain which keymap to use, you use can &man.kbdmap.1; to test
 	keymaps without rebooting.</para>
 
       <para>The <literal>keychange</literal> is usually needed to program
@@ -808,11 +808,10 @@ font8x8="cp866-8x8"</programlisting>
 
 	    <note>
 	      <para><anchor id="russian-note">The Russian KOI8-R locale
-		may not work with old XFree86 releases (lower than 3.3).
-		The XFree86 port from
-		<filename role="package">x11/XFree86</filename> already is the
-		most recent XFree86 version, so it will work if you
-		install XFree86 from the port.  This should not be an
+		may not work with old <application>XFree86</application> releases (lower than 3.3).
+		<application>XFree86 4.X</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>
@@ -826,7 +825,7 @@ font8x8="cp866-8x8"</programlisting>
 	    <screen>&prompt.root; <userinput>make install</userinput></screen>
       
 	    <para>The above port installs the latest version of the KOI8-R
-	      fonts.  XFree86 3.3 already has some KOI8-R fonts, but these
+	      fonts.  <application>XFree86 3.3</application> already has some KOI8-R fonts, but these
 	      are scaled better.</para>
 
 	    <para>Check the <literal>"Files"</literal> section
@@ -848,12 +847,12 @@ FontPath   "/usr/X11R6/lib/X11/fonts/cyrillic/100dpi"</programlisting>
 	      <literal>"Keyboard"</literal> section of your
 	      <filename>XF86Config</filename> file.</para>
 
-	    <para>For XFree86 v3.*:</para>
+	    <para>For <application>XFree86 3.X</application>:</para>
 
 	    <programlisting>XkbLayout  "ru"
 XkbOptions "grp:caps_toggle"</programlisting>
 
-	    <para>For XFree86 v4.*:</para>
+	    <para>For <application>XFree86 4.X</application>:</para>
 
 	    <programlisting>Option "XkbLayout"   "ru"
 Option "XkbOptions"  "grp:caps_toggle"</programlisting>
@@ -861,9 +860,9 @@ Option "XkbOptions"  "grp:caps_toggle"</programlisting>
 	    <para>Also make sure that <literal>XkbDisable</literal> is
 	      turned off (commented out) there.</para>
 
-	    <para>The RUS/LAT switch will be <literal>CapsLock</literal>.
-	      The old <literal>CapsLock</literal> function is still
-	      available via <literal>Shift+CapsLock</literal> (in LAT mode
+	    <para>The RUS/LAT switch will be <keycap>CapsLock</keycap>.
+	    The old <keycap>CapsLock</keycap> function is still
+	    available via <keycombo action="simul"><keycap>Shift</keycap><keycap>CapsLock</keycap></keycombo> (in LAT mode
 	      only).</para>
 
 	    <para>If you have <quote>Windows</quote> keys on your keyboard,
@@ -871,16 +870,16 @@ Option "XkbOptions"  "grp:caps_toggle"</programlisting>
 	      incorrectly in RUS mode, add the following line in your
 	      <filename>XF86Config</filename> file.</para>
 
-	    <para>For XFree86 v3.*:</para>
+	    <para>For <application>XFree86 3.X</application>:</para>
 
 	<programlisting>XkbVariant "winkeys"</programlisting>
 
-	    <para>For XFree86 v4.*:</para>
+	    <para>For <application>XFree86 4.X</application>:</para>
 
 	<programlisting>Option "XkbVariant" "winkeys"</programlisting>
 
 	    <note>
-	      <para>The Russian XKB keyboard may not work with old XFree86
+	      <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
@@ -889,7 +888,7 @@ Option "XkbOptions"  "grp:caps_toggle"</programlisting>
 		NULL);</literal> function early in the program.
 		See <ulink
 		url="http://koi8.pp.ru/xwin.html">
-		KOI8-R for X-Window</ulink> for more instructions on
+		KOI8-R for X Window</ulink> for more instructions on
 		localizing X11 applications.</para>
 	    </note>
 	  </listitem>