Index: en_US.ISO8859-1/books/handbook/x11/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/handbook/x11/chapter.xml
+++ en_US.ISO8859-1/books/handbook/x11/chapter.xml
@@ -585,12 +585,12 @@
 	to the X server configuration file
 	(<filename>/etc/X11/xorg.conf</filename>), which reads:</para>
 
-      <programlisting>FontPath "/usr/local/lib/X11/fonts/URW/"</programlisting>
+      <programlisting>FontPath "/usr/local/lib/X11/fonts/urwfonts/"</programlisting>
 
       <para>Alternatively, at the command line in the X session
 	run:</para>
 
-      <screen>&prompt.user; <userinput>xset fp+ /usr/local/lib/X11/fonts/URW</userinput>
+      <screen>&prompt.user; <userinput>xset fp+ /usr/local/lib/X11/fonts/urwfonts</userinput>
 &prompt.user; <userinput>xset fp rehash</userinput></screen>
 
       <para>This will work but will be lost when the X session is
@@ -653,8 +653,8 @@
       <para>or add a <literal>FontPath</literal> line to
 	<filename>xorg.conf</filename>.</para>
 
-      <para>That's it.  Now <application>Gimp</application>,
-	<application>Apache OpenOffice</application>, and all of the
+      <para>Now <application>Gimp</application>,
+	<application>OpenOffice</application>, and all of the
 	other X applications should now recognize the installed
 	&truetype; fonts.  Extremely small fonts (as with text in a
 	high resolution display on a web page) and extremely large
@@ -1301,9 +1301,9 @@
 
 	<screen>&prompt.user; <userinput>setxkbmap -model pc102 -layout fr</userinput></screen>
 
-	<para>The
+	<para>
 	  <filename>/usr/local/share/X11/xkb/rules/base.lst</filename>
-	  file lists the various keyboard, layouts and options
+	  lists the various keyboard, layouts and options
 	  available.</para>
       </note>