Index: doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml
===================================================================
RCS file: /home/dcvs/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml,v
retrieving revision 1.180
diff -u -r1.180 chapter.sgml
--- doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml	26 Jun 2007 19:36:44 -0000	1.180
+++ doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml	27 Jun 2007 17:34:54 -0000
@@ -306,7 +306,7 @@
       implementation for &os;.  <application>&xorg;</application> is
       the X server of the open source X Window System implementation released by the X.Org
       Foundation.  <application>&xorg;</application> is based on the code of
-      <application>&xfree86&nbsp;4.4RC2</application> and X11R6.6.
+      <application>&xfree86&nbsp;4.4RC2</application> and X11R7.2.
       The version of <application>&xorg;</application> currently
       available in the &os; Ports Collection is &xorg.version;.</para>
 
@@ -527,7 +527,7 @@
         file needs to be installed in a common location where
         &man.Xorg.1; can find it.
 	This is typically <filename>/etc/X11/xorg.conf</filename> or
-	<filename>/usr/X11R6/etc/X11/xorg.conf</filename>.</para>
+	<filename>/usr/local/etc/X11/xorg.conf</filename>.</para>
 
       <screen>&prompt.root; <userinput>cp xorg.conf.new /etc/X11/xorg.conf</userinput></screen>
 
@@ -698,12 +698,12 @@
       X server configuration file (<filename>/etc/X11/xorg.conf</filename>),
       which reads:</para>
 
-      <programlisting>FontPath "/usr/X11R6/lib/X11/fonts/URW/"</programlisting>
+      <programlisting>FontPath "/usr/local/lib/X11/fonts/URW/"</programlisting>
 
       <para>Alternatively, at the command line in the X session
         run:</para>
 
-      <screen>&prompt.user; <userinput>xset fp+ /usr/X11R6/lib/X11/fonts/URW</userinput>
+      <screen>&prompt.user; <userinput>xset fp+ /usr/local/lib/X11/fonts/URW</userinput>
 &prompt.user; <userinput>xset fp rehash</userinput></screen>
 
       <para>This will work but will be lost when the X session is closed,
@@ -712,7 +712,7 @@
     or <filename>~/.xsession</filename> when logging in through a
     graphical login manager like <application>XDM</application>).
     A third way is to use the new
-    <filename>/usr/X11R6/etc/fonts/local.conf</filename> file: see the
+    <filename>/usr/local/etc/fonts/local.conf</filename> file: see the
     section on <link linkend="antialias">anti-aliasing</link>.
     </para>
     </sect2>
@@ -736,7 +736,7 @@
     <programlisting>Load  "freetype"</programlisting>
 
     <para>Now make a directory for the &truetype; fonts (for example,
-      <filename>/usr/X11R6/lib/X11/fonts/TrueType</filename>)
+      <filename>/usr/local/lib/X11/fonts/TrueType</filename>)
       and copy all of the &truetype; fonts into this directory.  Keep in
       mind that &truetype; fonts cannot be directly taken from a
       &macintosh;; they must be in &unix;/&ms-dos;/&windows; format for use by
@@ -749,14 +749,14 @@
       Ports Collection as
       <filename role="package">x11-fonts/ttmkfdir</filename>.</para>
 
-    <screen>&prompt.root; <userinput>cd /usr/X11R6/lib/X11/fonts/TrueType</userinput>
+    <screen>&prompt.root; <userinput>cd /usr/local/lib/X11/fonts/TrueType</userinput>
 &prompt.root; <userinput>ttmkfdir -o fonts.dir</userinput></screen>
 
     <para>Now add the &truetype; directory to the font
       path.  This is just the same as described above for <link
       linkend="type1">Type1</link> fonts, that is, use</para>
 
-    <screen>&prompt.user; <userinput>xset fp+ /usr/X11R6/lib/X11/fonts/TrueType</userinput>
+    <screen>&prompt.user; <userinput>xset fp+ /usr/local/lib/X11/fonts/TrueType</userinput>
 &prompt.user; <userinput>xset fp rehash</userinput></screen>
 
     <para>or add a <literal>FontPath</literal> line to the
@@ -796,7 +796,7 @@
       Beginning with
       <application>&xfree86;</application> 4.3.0, all fonts in X11
       that are found
-      in <filename>/usr/X11R6/lib/X11/fonts/</filename> and
+      in <filename>/usr/local/lib/X11/fonts/</filename> and
       <filename>~/.fonts/</filename> are automatically 
       made available for anti-aliasing to Xft-aware applications.  Not
       all applications are Xft-aware, but many have received Xft support.
@@ -810,7 +810,7 @@
     <para>In order to control which fonts are anti-aliased, or to
       configure anti-aliasing properties, create (or edit, if it
       already exists) the file
-      <filename>/usr/X11R6/etc/fonts/local.conf</filename>.  Several
+      <filename>/usr/local/etc/fonts/local.conf</filename>.  Several
       advanced features of the Xft font system can be tuned using
       this file; this section describes only some simple
       possibilities.  For more details, please see
@@ -830,12 +830,12 @@
     </programlisting>
 
     <para>As previously stated, all fonts in
-      <filename>/usr/X11R6/lib/X11/fonts/</filename> as well as
+      <filename>/usr/local/lib/X11/fonts/</filename> as well as
       <filename>~/.fonts/</filename> are already made available to
       Xft-aware applications.  If you wish to add another directory
       outside of these two directory trees, add a line similar to the
       following to
-      <filename>/usr/X11R6/etc/fonts/local.conf</filename>:</para>
+      <filename>/usr/local/etc/fonts/local.conf</filename>:</para>
 
     <programlisting>&lt;dir&gt;/path/to/my/fonts&lt;/dir&gt;</programlisting>
 
@@ -933,11 +933,11 @@
 	 set of default fonts can be found in the 
 	 <filename role="package">x11-fonts/bitstream-vera</filename>
 	 port.  This port will install a
-	 <filename>/usr/X11R6/etc/fonts/local.conf</filename> file
+	 <filename>/usr/local/etc/fonts/local.conf</filename> file
 	 if one does not exist already.  If the file does exist,
-	 the port will create a <filename>/usr/X11R6/etc/fonts/local.conf-vera
+	 the port will create a <filename>/usr/local/etc/fonts/local.conf-vera
 	 </filename> file.  Merge the contents of this file into
-	 <filename>/usr/X11R6/etc/fonts/local.conf</filename>, and the 
+	 <filename>/usr/local/etc/fonts/local.conf</filename>, and the 
 	 Bitstream fonts will automatically replace the default 
 	 X11 Serif, Sans Serif, and Monospaced
 	 fonts.</para>
@@ -1039,7 +1039,7 @@
       <title>Using XDM</title>
 
       <para>The <application>XDM</application> daemon program is
-        located in <filename>/usr/X11R6/bin/xdm</filename>.  This program
+        located in <filename>/usr/local/bin/xdm</filename>.  This program
         can be run at any time as <username>root</username> and it will
         start managing the X display on the local machine.  If
         <application>XDM</application> is to be run every
@@ -1050,7 +1050,7 @@
         <filename>/etc/ttys</filename> file for running the
         <application>XDM</application> daemon on a virtual terminal:</para>
 
-      <screen>ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  xterm   off secure</screen>
+      <screen>ttyv8   "/usr/local/bin/xdm -nodaemon"  xterm   off secure</screen>
 
       <para>By default this entry is disabled; in order to enable it
         change field 5 from <literal>off</literal> to
@@ -1066,7 +1066,7 @@
       <title>Configuring XDM</title>
 
       <para>The <application>XDM</application> configuration directory
-        is located in <filename>/usr/X11R6/lib/X11/xdm</filename>.  In
+        is located in <filename>/usr/local/lib/X11/xdm</filename>.  In
         this directory there are several files used to change the
         behavior and appearance of
         <application>XDM</application>.  Typically these files will