Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision c3b84a7242f9c0781bd43bd85e04c730a3444033)
+++ x/installing/installing.xml	(revision abfff1a51a79c9a2ba70d126e1cb002a14395203)
@@ -26,7 +26,10 @@
   decided to use the <application>Xorg</application> package.</para>
 
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xmono-dummy.xml"/> -->
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xorg.xml"/> -->
-  <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xfree86.xml"/> -->
+<!-- XFREE86 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xmono-dummy.xml"/> 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xorg.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xfree86.xml"/>
+XFREE86 -->
+
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xorg7-dummy.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xorg7.xml"/>
Index: x/installing/x-config.xml
===================================================================
--- x/installing/x-config.xml	(revision c3b84a7242f9c0781bd43bd85e04c730a3444033)
+++ x/installing/x-config.xml	(revision abfff1a51a79c9a2ba70d126e1cb002a14395203)
@@ -16,11 +16,19 @@
   <title>Additional X Window System Configuration</title>
 
+<!-- XFREE86
   <para>Below you will find information on fine tuning the components of both
   variants of the <application>X Window System</application>. The documentation
   links are specifically for <application>XFree86</application>, however, the
+XFREE86 -->
+  <para>Below you will find information on fine tuning the components
+  of the <application>X Window System</application>. The documentation
+  links are specifically for <application>XFree86</application>,
+  which has been retired in BLFS, however, the
   information contained in those documents usually pertains to
   <application>Xorg</application> as well.  Detailed descriptions are also
-  located in the <filename>xorg.conf</filename> or
-  <filename>XF86Config</filename> man pages.</para>
+  located in the <filename>xorg.conf</filename> man page.</para>
+<!-- XFREE86
+  or <filename>XF86Config</filename> man pages.</para>
+XFREE86 -->
 
   <sect2 id='xinput'>
Index: x/installing/x-setup.xml
===================================================================
--- x/installing/x-setup.xml	(revision c3b84a7242f9c0781bd43bd85e04c730a3444033)
+++ x/installing/x-setup.xml	(revision abfff1a51a79c9a2ba70d126e1cb002a14395203)
@@ -79,13 +79,18 @@
     <para>As the <systemitem class="username">root</systemitem> user
     create a basic X Window System configuration file with the following
-    commands:</para>
-
+    command:</para>
+
+<!-- XFREE86
     <para>For <application>Xorg</application>:</para>
+XFREE86 -->
+
 <screen><userinput>cd ~ &amp;&amp;
 Xorg -configure</userinput></screen>
 
+<!-- XFREE86
     <para>For <application>XFree86</application>:</para>
 <screen><userinput>cd ~ &amp;&amp;
 XFree86 -configure</userinput></screen>
+XFREE86 -->
 
     <indexterm zone="x-setup xconfig">
@@ -93,7 +98,9 @@
     </indexterm>
 
+<!-- XFREE86
     <indexterm zone="x-setup xconfig">
       <primary sortas="e-etc-X11-XF86Config">/etc/X11/XF86Config</primary>
     </indexterm>
+XFREE86 -->
 
     <para>The screen will go black and you may hear some clicking of the
@@ -105,6 +112,10 @@
     <para>Edit the newly created configuration file to suit your system. The
     details of the files are located in the <filename>xorg.conf.5x</filename>
+    man page.  Some things you may want to do are:</para>
+
+<!-- XFREE86
     and <filename>XF86Config.5x</filename> man
     pages. Some things you may want to do are:</para>
+XFREE86 -->
 
     <itemizedlist>
@@ -142,18 +153,32 @@
     </itemizedlist>
 
+<!-- XFREE86
     <para>Test the system with one of the following commands:</para>
-
+XFREE86 -->
+
+    <para>Test the system with the following command:</para>
+
+<!-- XFREE86
     <para>For <application>Xorg</application>:</para>
+XFREE86 -->
+
 <screen><userinput>X -config ~/xorg.conf.new</userinput></screen>
 
+<!-- XFREE86
     <para>For <application>XFree86</application>:</para>
 <screen><userinput>XFree86 -xf86config ~/XF86Config.new</userinput></screen>
+XFREE86 -->
 
     <para>You will only get a gray background with an X-shaped mouse cursor,
     but it confirms the system is working. Exit with
     <keycap>Control+Alt+Backspace</keycap>. If the system does not work, take
+    a look at <filename>/var/log/Xorg.0.log</filename> to see what went
+    wrong.</para>
+
+<!-- XFREE86
     a look at <filename>/var/log/Xorg.0.log</filename> or
     <filename>/var/log/XFree86.0.log</filename> to see what went
     wrong.</para>
+XFREE86 -->
 
     <para>As the <systemitem class="username">root</systemitem> user, create
@@ -161,9 +186,14 @@
     directory:</para>
 
+<!-- XFREE86
     <para>For <application>Xorg</application>:</para>
+XFREE86 -->
+
 <screen role="root"><userinput>install -v -m644 -D ~/xorg.conf.new /etc/X11/xorg.conf</userinput></screen>
 
+<!-- XFREE86
     <para>For <application>XFree86</application>:</para>
 <screen role="root"><userinput>install -v -m644 -D ~/XF86Config.new /etc/X11/XF86Config</userinput></screen>
+XFREE86 -->
 
     <para>As the <systemitem class="username">root</systemitem> user, create
@@ -224,6 +254,8 @@
     System</application> should be displayed.</para>
 
-    <!-- <para>For a list of the package contents and a description of the commands,
-    see the sections in the <xref linkend="xfree86-contents"/>.</para> -->
+<!-- XFREE86
+    <para>For a list of the package contents and a description of the commands,
+    see the sections in the <xref linkend="xfree86-contents"/>.</para>
+XFREE86 -->
 
   </sect2>
@@ -245,6 +277,10 @@
     device nodes in <filename class="directory">/dev/dri</filename> must
     have proper permissions for your users.  A sample
+    <filename>xorg.conf</filename> file might look like this:</para>
+
+<!-- XFREE86
     <filename>XF86config</filename> or <filename>xorg.conf</filename>
     file might look like this:</para>
+XFREE86 -->
 
 <screen><literal>Section "Module"
@@ -274,11 +310,19 @@
 
     <para>To check if DRI is installed properly, check the log file
+<!-- XFREE86
     <filename>/var/log/XFree86.0.log</filename> or
+XFREE86 -->
     <filename>/var/log/Xorg.0.log</filename> for statements like:</para>
 
 <screen><literal>(II) R128(0): Direct rendering enabled</literal></screen>
 
+<!-- XFREE86
     <para>From an <command>xterm</command>, run <command>glxinfo</command>
     and look for the phrase:</para>
+XFREE86 -->
+
+    <para>If you elected to install the Mesa-Demos package when installing
+    <xref linkend="mesalib"/>, from an <command>xterm</command>, run
+    <command>glxinfo</command> and look for the phrase:</para>
 
 <screen><computeroutput>direct rendering: Yes</computeroutput></screen>
@@ -288,5 +332,10 @@
     show the drivers, device nodes and files used by the DRI system.</para>
 
+<!-- XFREE86
     <para>You can also run the test program <command>glxgears</command>.
+XFREE86 -->
+
+    <para>Again, if you have added the Mesa-Demos package, you can also
+    run the test program <command>glxgears</command>.
     This program brings up a window with three gears turning.  The
     <command>xterm</command> will display how many frames were drawn every
@@ -325,7 +374,9 @@
     </indexterm>
 
+<!-- XFREE86
     <indexterm zone="x-setup fonts">
       <primary sortas="e-etc-X11-XF86Config">/etc/X11/XF86Config</primary>
     </indexterm>
+XFREE86 -->
 
     <sect3>
@@ -337,5 +388,8 @@
 
       <para>The core X font protocol finds fonts from the server configuration
+<!-- XFREE86
       file (<filename>xorg.conf</filename> or <filename>XF86Config</filename>).
+XFREE86 -->
+      file (<filename>xorg.conf</filename>).
       If no font paths exist in the configuration file, the server will fall
       back to an internal hard-coded path.  Assuming the prefix for your
@@ -372,6 +426,9 @@
       system uses the "freetype" module for non-antialiased rendering of these
       fonts.  Ensure that the "freetype" module is loaded in the
+<!-- XFREE86
       <filename>XF86config</filename> or <filename>xorg.conf</filename>
-      file by adding it to the "Module" section:</para>
+XFREE86 -->
+      <filename>xorg.conf</filename> file by adding it to the "Module"
+      section:</para>
 
 <screen><literal>Section "Module"
@@ -549,6 +606,8 @@
     practice. To set up a keyboard for Latin and non-Latin input, change
     the XkbLayout keyboard driver option in the InputDevice section
+<!-- XFREE86
     of the <filename>XF86Config</filename> or <filename>xorg.conf</filename>
-    file. For example:</para>
+XFREE86 -->
+    of the <filename>xorg.conf</filename> file. For example:</para>
 
 <screen><literal>Section "InputDevice"
Index: x/installing/xorg.xml
===================================================================
--- x/installing/xorg.xml	(revision c3b84a7242f9c0781bd43bd85e04c730a3444033)
+++ x/installing/xorg.xml	(revision abfff1a51a79c9a2ba70d126e1cb002a14395203)
@@ -30,5 +30,6 @@
     <title>Introduction to Xorg</title>
 
-    <!-- <note>
+<!-- XFREE86
+      <note>
       <para>There are three packages in BLFS that implement the <application>X
       Window System</application>: <application>Xorg</application>
@@ -53,12 +54,13 @@
       <para><application>XFree86</application> continues to be a solid,
       conservative application with excellent driver support.</para>
-    </note> -->
-
-    <para><application>Xorg</application> is a freely redistributable open-source
-    implementation of the <application>X</application> Window System. This
-    system provides a client/server interface between display hardware (the
-    mouse, keyboard, and video displays) and the desktop environment, while also
-    providing both the windowing infrastructure and a standardized application
-    interface (API).</para>
+    </note>
+XFREE86 -->
+
+    <para><application>Xorg</application> is a freely redistributable
+    open-source implementation of the <application>X</application> Window
+    System. This system provides a client/server interface between display
+    hardware (the mouse, keyboard, and video displays) and the desktop
+    environment, while also providing both the windowing infrastructure and
+    a standardized application interface (API).</para>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -444,6 +446,8 @@
     by users only.</quote></para>
 
-    <!-- <para>For a list of the package contents, see the sections in the
-    <xref linkend="xfree86-contents"/>.</para> -->
+<!-- XFREE86
+    <para>For a list of the package contents, see the sections in the
+    <xref linkend="xfree86-contents"/>.</para>
+XFREE86 -->
 
   </sect2>
