Index: general.ent
===================================================================
--- general.ent	(revision 9c36a3651bf83a27d6579147a7adbc0c9eb3fa0e)
+++ general.ent	(revision 25a6c5c2d7c482c48a9c04e13701d68c1af8deea)
@@ -364,5 +364,4 @@
 <!-- Part VII -->
 <!-- Chapter 25 -->
-<!ENTITY xorg-version                 "6.9.0">
 <!ENTITY xfree86-version              "4.6.0">
 <!ENTITY xorg7-version                "7.1">
@@ -375,4 +374,6 @@
 <!ENTITY rman-version                 "3.2">
 
+<!-- Obsolete -->
+<!ENTITY xorg-version                 "6.9.0">
 
 <!-- Chapter 26 -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 9c36a3651bf83a27d6579147a7adbc0c9eb3fa0e)
+++ introduction/welcome/changelog.xml	(revision 25a6c5c2d7c482c48a9c04e13701d68c1af8deea)
@@ -43,4 +43,14 @@
 
     <listitem>
+      <para>February 4th, 2007</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Removed the obsolete and unmaintained Xorg-6.9
+          package.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>February 3rd, 2007</para>
       <itemizedlist>
Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision 9c36a3651bf83a27d6579147a7adbc0c9eb3fa0e)
+++ x/installing/installing.xml	(revision 25a6c5c2d7c482c48a9c04e13701d68c1af8deea)
@@ -17,12 +17,14 @@
 
   <para>This chapter contains instructions to build and configure a graphical
-  user environment. You will need to choose one of the three packages in BLFS
+  user environment. You will need to choose one of the two packages in BLFS
   that implements the <application>X Window System</application>:
-  <application>Xorg</application> X11R6 or X11R7 (<xref linkend="xorg"/> or
-  <xref linkend="xorg7"/>), or <application>XFree86</application>
-  (<xref linkend="xfree86"/>). These packages are all quite similar. In fact,
-  the base system of <application>Xorg</application> is
-  <application>XFree86</application>-4.4.0RC2. Differences in the licensing
-  philosophies was the original reason for the split.</para>
+  <application>Xorg</application> X11R7 (<xref linkend="xorg7"/>), or
+  <application>XFree86</application> (<xref linkend="xfree86"/>). The
+  functionality of these two packages is quite similar. In fact,
+  the base system of <application>Xorg</application> was derived from the
+  <application>XFree86</application>-4.4.0RC2 code (note that the
+  <application>Xorg</application> build system has changed, but the underlying
+  core code is the same). Differences in the licensing philosophies was the
+  original reason for the split.</para>
 
   <para>A second reason for the forking of <application>X</application>
@@ -33,13 +35,16 @@
 
   <para><application>Xorg</application>-&xorg7-version; introduces a completely
-  autotooled build system, but is otherwise the same codebase as
-  <application>Xorg</application>-&xorg-version;. Most large commercial
-  distributions have decided to use the <application>Xorg</application>
-  package, but several still provide <application>XFree86</application>.</para>
+  autotooled build system which means that the packages build and install
+  using the conventional <command>configure</command>, <command>make</command>
+  and <command>make install</command> commands, but it now requires installing
+  more than 100 different packages. Most large commercial distributions have
+  decided to use the <application>Xorg</application> package, but several still
+  provide <application>XFree86</application>.</para>
 
   <para><application>XFree86</application> continues to be a solid,
   conservative application with excellent driver support.</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="xorg.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xfree86.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xorg7-dummy.xml"/>
@@ -58,3 +63,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x-setup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x-config.xml"/>
+
 </chapter>
Index: x/installing/x-setup.xml
===================================================================
--- x/installing/x-setup.xml	(revision 9c36a3651bf83a27d6579147a7adbc0c9eb3fa0e)
+++ x/installing/x-setup.xml	(revision 25a6c5c2d7c482c48a9c04e13701d68c1af8deea)
@@ -217,5 +217,5 @@
     To enable direct rendering using the OpenGL implementation from
     <xref linkend="mesalib"/> (built separately with <xref linkend="xorg7"/>
-    or included with <xref linkend="xorg"/> and <xref linkend="xfree86"/>),
+    or included with <xref linkend="xfree86"/>),
     the "glx" and "dri" modules must be loaded.  Additionally, the created
     device nodes in <filename class="directory">/dev/dri</filename> must
Index: x/lib/mesalib.xml
===================================================================
--- x/lib/mesalib.xml	(revision 9c36a3651bf83a27d6579147a7adbc0c9eb3fa0e)
+++ x/lib/mesalib.xml	(revision 25a6c5c2d7c482c48a9c04e13701d68c1af8deea)
@@ -67,6 +67,5 @@
     <note>
       <para>It is not recommended to build a newer version of
-      <application>Mesa</application> with <xref linkend="xfree86"/> or
-      <xref linkend="xorg"/>.</para>
+      <application>Mesa</application> with <xref linkend="xfree86"/>.</para>
     </note>
 
Index: xincludes/xorg7-only.xml
===================================================================
--- xincludes/xorg7-only.xml	(revision 9c36a3651bf83a27d6579147a7adbc0c9eb3fa0e)
+++ xincludes/xorg7-only.xml	(revision 25a6c5c2d7c482c48a9c04e13701d68c1af8deea)
@@ -9,6 +9,5 @@
     <para>This package should only be built if you are installing
     <xref linkend="xorg7"/>. If you have installed or will be
-    installing <xref linkend="xorg"/> or <xref linkend="xfree86"/>,
-    it is provided by those packages and should not be installed
-    here.</para>
+    installing <xref linkend="xfree86"/>, it is already installed
+    (or will be) and should not be installed here.</para>
 </note>
