Index: basicnet/textweb/links.xml
===================================================================
--- basicnet/textweb/links.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ basicnet/textweb/links.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -71,7 +71,6 @@
     <xref linkend="sdl"/>,
     <ulink url="http://www.svgalib.org/">SVGAlib</ulink>,
-    <ulink url="http://www.directfb.org/">DirectFB</ulink> and
-    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
-    or <xref linkend="xorg7"/>)</para>
+    <ulink url="http://www.directfb.org/">DirectFB</ulink>, and
+    <xref linkend="x-window-system"/></para>
 
   </sect2>
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ general/genutils/imagemagick.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -77,6 +77,5 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+    <para role="recommended"><xref linkend="x-window-system"/></para>
 
     <para>The optional dependencies listed below should be installed if you
Index: general/genutils/xterm.xml
===================================================================
--- general/genutils/xterm.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ general/genutils/xterm.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -62,6 +62,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para>X (<xref linkend="xorg"/>, <xref linkend="xfree86"/>,
-    or <xref linkend="xorg7"/>)</para>
+    <para><xref linkend="x-window-system"/></para>
 
     <bridgehead renderas="sect4">Required</bridgehead>
Index: general/graphlib/aalib.xml
===================================================================
--- general/graphlib/aalib.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ general/graphlib/aalib.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -62,7 +62,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>),
-    <xref linkend="slang"/> and
+    <para role="optional"><xref linkend="x-window-system"/>,
+    <xref linkend="slang"/>, and
     <xref linkend="gpm"/></para>
 
Index: general/graphlib/giflib.xml
===================================================================
--- general/graphlib/giflib.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ general/graphlib/giflib.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -73,6 +73,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+    <para role="optional"><xref linkend="x-window-system"/></para>
 
   </sect2>
Index: general/graphlib/imlib.xml
===================================================================
--- general/graphlib/imlib.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ general/graphlib/imlib.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -70,6 +70,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xorg"/>, <xref linkend="xorg7"/>,
-    or <xref linkend="xfree86"/>) and
+    <para role="optional"><xref linkend="x-window-system"/> and
     <xref linkend="GTK"/></para>
 
Index: general/graphlib/imlib2.xml
===================================================================
--- general/graphlib/imlib2.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ general/graphlib/imlib2.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -67,6 +67,5 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/>, or or <xref linkend="xorg7"/>)</para>
+    <para role="recommended"><xref linkend="x-window-system"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: general/graphlib/libtiff.xml
===================================================================
--- general/graphlib/libtiff.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ general/graphlib/libtiff.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -65,6 +65,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="libjpeg"/>,
-    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>, or
-    <xref linkend="xorg7"/>) and a GLUT library
+    <xref linkend="x-window-system"/> and a GLUT library
     (<xref linkend="mesalib"/> or <xref linkend="freeglut"/>)</para>
 
Index: general/graphlib/libungif.xml
===================================================================
--- general/graphlib/libungif.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ general/graphlib/libungif.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -74,6 +74,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+    <para role="optional"><xref linkend="x-window-system"/></para>
 
   </sect2>
Index: general/prog/jdk.xml
===================================================================
--- general/prog/jdk.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ general/prog/jdk.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -156,8 +156,5 @@
 
     <bridgehead renderas="sect4">Required (to Build JDK from Source)</bridgehead>
-    <para role="required">X
-    (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/> or
-    <xref linkend="xorg7"/>),
+    <para role="required"><xref linkend="x-window-system"/>,
     <xref linkend="zip"/>,
     <xref linkend="unzip"/>,
Index: general/prog/pdl.xml
===================================================================
--- general/prog/pdl.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ general/prog/pdl.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -142,6 +142,5 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>OpenGL (<xref linkend="xfree86"/>,
-        <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+        <para>OpenGL (<xref linkend="x-window-system"/>)</para>
       </listitem>
     </itemizedlist>
@@ -176,7 +175,7 @@
             <itemizedlist>
               <listitem>
-                <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+                <para><xref linkend="x-window-system"/>,
                 <xref linkend="lesstif"/>,
-                <xref linkend="tk"/> and
+                <xref linkend="tk"/>, and
                 <xref linkend="gcc"/> (Fortran compiler)</para>
               </listitem>
@@ -198,5 +197,5 @@
           <listitem>
             <para><xref linkend="pkgconfig"/>,
-            X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+            <xref linkend="x-window-system"/>,
             <xref linkend="GTK"/>,
             <xref linkend="freetype2"/>,
@@ -207,7 +206,7 @@
             <xref linkend="tk"/>,
             <xref linkend="python"/> (with the
-            <ulink url="http://www.pfdubois.com/numpy/">Numerical Extension</ulink>),
+            <ulink url="http://www.numpy.org/">Numeric Python</ulink>),
             <xref linkend="gcc"/> (Fortran compiler),
-            <ulink url="http://www.swig.org/">SWIG</ulink>,
+            <ulink url="http://www.swig.org/">SWIG</ulink>, and
             <ulink url="http://sourceforge.net/projects/incrtcl/">iTcl</ulink></para>
           </listitem>
@@ -228,5 +227,5 @@
         <itemizedlist>
           <listitem>
-            <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
+            <para><xref linkend="x-window-system"/></para>
           </listitem>
         </itemizedlist>
@@ -238,5 +237,5 @@
         <itemizedlist>
           <listitem>
-            <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>) and
+            <para><xref linkend="x-window-system"/> and
             <xref linkend="tk"/></para>
           </listitem>
@@ -257,5 +256,5 @@
         <itemizedlist>
           <listitem>
-            <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>)</para>
+            <para><xref linkend="x-window-system"/></para>
           </listitem>
         </itemizedlist>
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ general/prog/php.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -104,6 +104,5 @@
     <xref linkend="libexif"/>,
     <xref linkend="freetype2"/>,
-    X (<xref linkend="xorg"/>, <xref linkend="xorg7"/>, or
-    <xref linkend="xfree86"/>),
+    <xref linkend="x-window-system"/>,
     <ulink url="http://www.fastio.com/">ClibPDF</ulink>,
     <ulink url="http://www.boutell.com/gd/">GD</ulink>,
Index: general/prog/tk.xml
===================================================================
--- general/prog/tk.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ general/prog/tk.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -63,6 +63,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
-    or <xref linkend="xorg7"/>) and
+    <para role="required"><xref linkend="x-window-system"/> and
     <xref linkend="tcl"/></para>
 
Index: general/sysutils/dbus.xml
===================================================================
--- general/sysutils/dbus.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ general/sysutils/dbus.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -74,6 +74,5 @@
     <xref linkend="gtk2"/>,
     <xref linkend="qt"/>,
-    X (<xref linkend="xorg"/>, <xref linkend="xorg7"/>, or
-    <xref linkend="xfree86"/>),
+    <xref linkend="x-window-system"/>,
     <xref linkend="gcc"/> (for the Java compiler and tools),
     <ulink url="http://nz.cosc.canterbury.ac.nz/~greg/python/Pyrex/">Pyrex</ulink>
@@ -81,5 +80,5 @@
     <ulink url="http://go-mono.org">Mono</ulink> (and
     <ulink url="http://www.mono-project.com/GtkSharp">GtkSharp-1.0.x</ulink>),
-    <xref linkend="doxygen"/> and
+    <xref linkend="doxygen"/>, and
     <ulink url="http://cyberelk.net/tim/xmlto/">xmlto</ulink></para>
 
Index: general/sysutils/mc.xml
===================================================================
--- general/sysutils/mc.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ general/sysutils/mc.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -77,6 +77,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="gpm"/>,
-    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
-    or <xref linkend="xorg7"/>),
+    <xref linkend="x-window-system"/>,
     <xref linkend="samba3"/>,
     <xref linkend="slang"/>,
Index: gnome/core/libbonobo.xml
===================================================================
--- gnome/core/libbonobo.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ gnome/core/libbonobo.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -69,6 +69,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>) and
+    <para role="optional"><xref linkend="x-window-system"/> and
     <xref linkend="gtk-doc"/></para>
 
Index: gnome/core/libgtop.xml
===================================================================
--- gnome/core/libgtop.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ gnome/core/libgtop.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -67,6 +67,5 @@
     <para role="optional"><xref linkend="popt"/>,
     <xref linkend="gdbm"/>, and
-    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>, or
-    <xref linkend="xorg7"/>)</para>
+    <xref linkend="x-window-system"/></para>
 
   </sect2>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ introduction/welcome/changelog.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -46,4 +46,8 @@
       <itemizedlist>
         <listitem>
+          <para>[randy] - Changed all the references to X Window System links
+          to a common entity displayed as 'X Window System'.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated to Doxygen-1.4.6.</para>
         </listitem>
Index: multimedia/libdriv/gst-plugins.xml
===================================================================
--- multimedia/libdriv/gst-plugins.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ multimedia/libdriv/gst-plugins.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -92,6 +92,5 @@
     <xref linkend="NASM"/>,
     <xref linkend="pango"/>, and
-    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/> or
-    <xref linkend="xorg7"/>)</para>
+    <xref linkend="x-window-system"/></para>
 
     <bridgehead renderas="sect4">Optional Audio Libraries/Drivers/CODECs</bridgehead>
Index: multimedia/libdriv/libao.xml
===================================================================
--- multimedia/libdriv/libao.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ multimedia/libdriv/libao.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -66,10 +66,9 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>
-    or <xref linkend="xorg7"/>),
+    <para role="optional"><xref linkend="x-window-system"/>,
     <xref linkend="esound"/>,
     <xref linkend="alsa"/>,
     <xref linkend="arts"/>,
-    <xref linkend="nas"/> and
+    <xref linkend="nas"/>, and
     <ulink url="http://0pointer.de/lennart/projects/polypaudio/">polypaudio</ulink></para>
 
Index: multimedia/libdriv/libdv.xml
===================================================================
--- multimedia/libdriv/libdv.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ multimedia/libdriv/libdv.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -65,7 +65,6 @@
     <xref linkend="pkgconfig"/>,
     <xref linkend="sdl"/>,
-    <xref linkend="GTK"/> and
-    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
-    or <xref linkend="xorg7"/>)</para>
+    <xref linkend="GTK"/>, and
+    <xref linkend="x-window-system"/></para>
 
   </sect2>
Index: multimedia/libdriv/libmpeg2.xml
===================================================================
--- multimedia/libdriv/libmpeg2.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ multimedia/libdriv/libmpeg2.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -66,7 +66,6 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xorg"/>, <xref linkend="xfree86"/>
-    or <xref linkend="xorg7"/>)
-    and <xref linkend="sdl"/></para>
+    <para role="optional"><xref linkend="x-window-system"/> and
+    <xref linkend="sdl"/></para>
 
   </sect2>
Index: multimedia/libdriv/nas.xml
===================================================================
--- multimedia/libdriv/nas.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ multimedia/libdriv/nas.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -75,6 +75,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/> or <xref linkend="xorg7"/>)</para>
+    <para role="required"><xref linkend="x-window-system"/></para>
 
   </sect2>
Index: multimedia/libdriv/sdl.xml
===================================================================
--- multimedia/libdriv/sdl.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ multimedia/libdriv/sdl.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -76,13 +76,12 @@
     <xref linkend="nas"/>,
     <xref linkend="NASM"/>,
-    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/> or
-    <xref linkend="xorg7"/>),
+    <xref linkend="x-window-system"/>,
     <xref linkend="aalib"/>,
     <ulink url="http://www.directfb.org/">DirectFB</ulink>,
     <ulink url="http://www.svgalib.org/">SVGAlib</ulink>,
-    <ulink url="http://www.gnu.org/software/pth/">GNU Pth</ulink>
-<!-- Dead link,
+    <ulink url="http://www.gnu.org/software/pth/">GNU Pth</ulink>, and
+    <!-- Dead link,
     <ulink url="http://www.trolltech.com/download/qtopia/">Qtopia</ulink>
---> and
+    -->
     <ulink url="http://picogui.org/">PicoGUI</ulink></para>
 
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ multimedia/libdriv/xine-lib.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -64,7 +64,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>
-    or <xref linkend="xorg7"/>)
-    and <xref linkend="esound"/> or OSS or
+    <para role="required"><xref linkend="x-window-system"/>, and
+    <xref linkend="esound"/> or OSS or
     <xref linkend="alsa"/> or <xref linkend="arts"/> or
     <ulink url="http://0pointer.de/lennart/projects/polypaudio/">polypaudio</ulink></para>
Index: multimedia/videoutils/ffmpeg.xml
===================================================================
--- multimedia/videoutils/ffmpeg.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ multimedia/videoutils/ffmpeg.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -84,6 +84,5 @@
     <xref linkend="lame"/>,
     <xref linkend="imlib2"/>,
-    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
-    or <xref linkend="xorg7"/>),
+    <xref linkend="x-window-system"/>,
     <xref linkend="sdl"/>,
     <xref linkend="freetype2"/>,
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ multimedia/videoutils/mplayer.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -196,6 +196,5 @@
 
     <bridgehead renderas="sect4">Optional Video Output Drivers and Libraries</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
-    or <xref linkend="xorg7"/>),
+    <para role="optional"><xref linkend="x-window-system"/>,
     <xref linkend="libpng"/>,
     <xref linkend="libjpeg"/>,
Index: multimedia/videoutils/transcode.xml
===================================================================
--- multimedia/videoutils/transcode.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ multimedia/videoutils/transcode.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -73,6 +73,5 @@
     <command>configure</command> Script Looks for Them)</bridgehead>
     <para role="optional"><xref linkend="pkgconfig"/>,
-    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
-    or <xref linkend="xorg7"/>),
+    <xref linkend="x-window-system"/>,
     <xref linkend="xvid"/>,
     <!-- Adding this comment in case this package gets any momentum and
Index: postlfs/editors/emacs.xml
===================================================================
--- postlfs/editors/emacs.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ postlfs/editors/emacs.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -62,11 +62,12 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>),
+    <para role="optional"><xref linkend="x-window-system"/>,
     <xref linkend="libjpeg"/>,
     <xref linkend="libpng"/>,
     <xref linkend="libtiff"/>, and
     <!-- <xref linkend="libungif"/> or -->
-    <xref linkend="giflib"/></para>
+    <ulink
+    url="http://sourceforge.net/projects/libungif">libungif</ulink></para>
+    <!-- <xref linkend="giflib"/></para> -->
 
   </sect2>
Index: postlfs/editors/vim.xml
===================================================================
--- postlfs/editors/vim.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ postlfs/editors/vim.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -80,6 +80,5 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+    <para role="recommended"><xref linkend="x-window-system"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -88,6 +87,6 @@
     <xref linkend="python"/>,
     <xref linkend="tcl"/>,
-    <xref linkend="ruby"/>
-    and <xref linkend="gpm"/></para>
+    <xref linkend="ruby"/>, and
+    <xref linkend="gpm"/></para>
 
   </sect2>
Index: postlfs/security/heimdal.xml
===================================================================
--- postlfs/security/heimdal.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ postlfs/security/heimdal.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -94,6 +94,5 @@
     <para role="optional"><xref linkend="linux-pam"/>,
     <xref linkend="openldap"/>,
-    X (<xref linkend="xorg"/>, <xref linkend="xfree86"/>,
-    or <xref linkend="xorg7"/>),
+    <xref linkend="x-window-system"/>,
     <xref linkend="cracklib"/> (compiled with the <filename>heimdal</filename>
     patch), and
Index: pst/printing/espgs.xml
===================================================================
--- pst/printing/espgs.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ pst/printing/espgs.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -106,6 +106,5 @@
     <xref linkend="libjpeg"/>,
     <xref linkend="libpng"/>,
-    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>, or
-    <xref linkend="xorg7"/>), and
+    <xref linkend="x-window-system"/>, and
     <xref linkend="GTK"/></para>
 
Index: pst/printing/gs.xml
===================================================================
--- pst/printing/gs.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ pst/printing/gs.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -101,7 +101,6 @@
     <para role="optional"><xref linkend="libjpeg"/>,
     <xref linkend="libpng"/>,
-    <xref linkend="GTK"/> and
-    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>, or
-    <xref linkend="xorg7"/>)</para>
+    <xref linkend="GTK"/>, and
+    <xref linkend="x-window-system"/></para>
 
     <bridgehead renderas="sect3">Conflicts</bridgehead>
Index: pst/ps/a2ps.xml
===================================================================
--- pst/ps/a2ps.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ pst/ps/a2ps.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -72,6 +72,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>),
+    <para role="optional"><xref linkend="x-window-system"/>,
     <xref linkend="psutils"/>,
     <xref linkend="tex"/>,
@@ -80,5 +79,5 @@
     url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink>,
     <ulink url="http://www.adobe.com/products/acrobat/readstep2.html">Adobe
-    Reader</ulink> and
+    Reader</ulink>, and
     <ulink
     url="http://www.gnu.org/software/ghostview/ghostview.html">Ghostview</ulink></para>
Index: pst/scanning/sane.xml
===================================================================
--- pst/scanning/sane.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ pst/scanning/sane.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -107,6 +107,5 @@
 
     <bridgehead renderas="sect4">Optional (Front Ends)</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>),
+    <para role="optional"><xref linkend="x-window-system"/>,
     <xref linkend="gtk2"/>, and
     <xref linkend="gimp"/></para>
Index: pst/typesetting/tex.xml
===================================================================
--- pst/typesetting/tex.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ pst/typesetting/tex.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -133,5 +133,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="libpng"/>,
-    <xref linkend="x-installing"/>,
+    <xref linkend="x-window-system"/>,
     <xref linkend="tk-perl"/>,
     <ulink url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.1.0.tar.gz">
Index: server/mail/exim.xml
===================================================================
--- server/mail/exim.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ server/mail/exim.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -77,6 +77,5 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>),
+    <para role="optional"><xref linkend="x-window-system"/>,
     <xref linkend="openldap"/>,
     <xref linkend="openssl"/> or
Index: server/major/openssh.xml
===================================================================
--- server/major/openssh.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ server/major/openssh.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -69,6 +69,5 @@
     <para role="optional"><xref linkend="linux-pam"/>,
     <xref linkend="tcpwrappers"/>,
-    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
-    or <xref linkend="xorg7"/>),
+    <xref linkend="x-window-system"/>,
     <xref linkend="mitkrb"/> or <xref linkend="heimdal"/>,
     <xref linkend="jdk"/>,
Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ x/installing/installing.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -6,10 +6,34 @@
 ]>
 
-<chapter id="x-installing">
+<chapter id="x-window-system" xreflabel="X Window System">
   <?dbhtml filename="installing.html" ?>
 
   <title>X Window System Environment</title>
 
-  <para>This chapter contains a graphical user environment.</para>
+  <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
+  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>
+
+  <para>A second reason for the forking of <application>X</application>
+  packages is the stated goals of the developers. Some developers were unhappy
+  with the administration and progress of <application>XFree86</application>.
+  The X.org Foundation's future plans include significant improvements to the
+  internals of the system and more frequent releases.</para>
+
+  <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>
+
+  <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="xorg.xml"/>
Index: x/installing/xorg.xml
===================================================================
--- x/installing/xorg.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ x/installing/xorg.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="xorg" xreflabel="X.org-&xorg-version;">
+<sect1 id="xorg" xreflabel="Xorg-&xorg-version;">
   <?dbhtml filename="xorg.html"?>
 
@@ -34,5 +34,5 @@
     <title>Introduction to Xorg</title>
 
-    <note>
+    <!-- <note>
       <para>There are three packages in BLFS that implement the <application>X
       Window System</application>: <application>Xorg</application>
@@ -57,6 +57,5 @@
       <para><application>XFree86</application> continues to be a solid,
       conservative application with excellent driver support.</para>
-
-    </note>
+    </note> -->
 
     <para><application>Xorg</application> is a freely redistributable open-source
Index: x/installing/xorg7.xml
===================================================================
--- x/installing/xorg7.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ x/installing/xorg7.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="xorg7" xreflabel="X.org-&xorg7-version;">
+<sect1 id="xorg7" xreflabel="Xorg-&xorg7-version;">
   <?dbhtml filename="xorg7.html"?>
 
Index: x/lib/cairo.xml
===================================================================
--- x/lib/cairo.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ x/lib/cairo.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -73,7 +73,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xorg"/>, <xref linkend="xorg7"/>,
-    or <xref linkend="xfree86"/>)
-    and <xref linkend="pkgconfig"/></para>
+    <para role="required"><xref linkend="x-window-system"/> and
+    <xref linkend="pkgconfig"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: x/lib/freeglut.xml
===================================================================
--- x/lib/freeglut.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ x/lib/freeglut.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -65,6 +65,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+    <para role="required"><xref linkend="x-window-system"/></para>
 
   </sect2>
Index: x/lib/gtk+.xml
===================================================================
--- x/lib/gtk+.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ x/lib/gtk+.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -65,6 +65,5 @@
     <xref linkend="libtiff"/>,
     <xref linkend="libjpeg"/>, and
-    X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
-    or <xref linkend="xorg7"/>)</para>
+    <xref linkend="x-window-system"/></para>
 
   </sect2>
Index: x/lib/lesstif.xml
===================================================================
--- x/lib/lesstif.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ x/lib/lesstif.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -70,6 +70,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+    <para role="required"><xref linkend="x-window-system"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: x/lib/libxklavier.xml
===================================================================
--- x/lib/libxklavier.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ x/lib/libxklavier.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -62,7 +62,6 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
-    or <xref linkend="xorg7"/>),
-    <xref linkend="pkgconfig"/> and
+    <para role="required"><xref linkend="x-window-system"/>,
+    <xref linkend="pkgconfig"/>, and
     <xref linkend="libxml2"/></para>
 
Index: x/lib/mesalib.xml
===================================================================
--- x/lib/mesalib.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ x/lib/mesalib.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -65,7 +65,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para>X (<xref linkend="xorg"/>, <xref linkend="xfree86"/>, or
-    <xref linkend="xorg7"/> Libs and Utilities), and
-    <xref linkend="libdrm"/></para>
+    <para><xref linkend="x-window-system"/> or
+    <xref linkend="xorg7"/> Libs and Utilities and <xref linkend="libdrm"/>
+    </para>
 
     <bridgehead renderas="sect3">Optional Downloads</bridgehead>
Index: x/lib/pango.xml
===================================================================
--- x/lib/pango.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ x/lib/pango.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -75,7 +75,6 @@
     <bridgehead renderas="sect4">Optional (If <application>cairo</application>
     is Not Installed)</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/>, <xref linkend="xorg"/>,
-    or <xref linkend="xorg7"/>)
-    and <xref linkend="fontconfig"/></para>
+    <para role="optional"><xref linkend="x-window-system"/> and
+    <xref linkend="fontconfig"/></para>
 
     <bridgehead renderas="sect4">Optional (To Rebuild the API Documentation)</bridgehead>
Index: x/lib/qt.xml
===================================================================
--- x/lib/qt.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ x/lib/qt.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -68,6 +68,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+    <para role="required"><xref linkend="x-window-system"/></para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
Index: x/lib/startup-notification.xml
===================================================================
--- x/lib/startup-notification.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ x/lib/startup-notification.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -65,6 +65,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="optional">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/>, xref linkend="xorg7"/>)</para>
+    <para role="required"><xref linkend="x-window-system"/></para>
 
   </sect2>
Index: x/wm/fluxbox.xml
===================================================================
--- x/wm/fluxbox.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ x/wm/fluxbox.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -62,6 +62,5 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">X (<xref linkend="xfree86"/>,
-    <xref linkend="xorg"/>, or <xref linkend="xorg7"/>)</para>
+    <para role="required"><xref linkend="x-window-system"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: x/wm/other-wms.xml
===================================================================
--- x/wm/other-wms.xml	(revision 76e4c4f9d332faab104e60612be214a55f7e9472)
+++ x/wm/other-wms.xml	(revision e77976fb27d965b0ae8ccb30a2513e7e57988201)
@@ -17,7 +17,6 @@
 
   <para><command>twm</command> is the Tab Window Manager. This is the default
-  window manager installed by the <xref linkend="xorg"/>,
-  <xref linkend="xorg7"/>, and <xref linkend="xfree86"/> <application>X
-  Window Systems</application>.</para>
+  window manager installed by the <xref linkend="x-window-system"/>
+  packages.</para>
 
   <para><command>mwm</command> is the Motif® Window Manager. It is an
