Index: general.ent
===================================================================
--- general.ent	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ general.ent	(revision 852f51465010c162880f650ef7ef01564df00cad)
@@ -4,5 +4,5 @@
 -->
 
-<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY day          "03">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2008">
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "December &day;st, &year;">
+<!ENTITY releasedate  "December &day;rd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
Index: general/genlib/libdrm.xml
===================================================================
--- general/genlib/libdrm.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ general/genlib/libdrm.xml	(revision 852f51465010c162880f650ef7ef01564df00cad)
@@ -64,7 +64,4 @@
     <title>Installation of libdrm</title>
 
-    <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../xincludes/xorg7-only.xml"/> -->
-
     <para>Install <application>libdrm</application> by running the following
     commands:</para>
Index: general/genutils/rman.xml
===================================================================
--- general/genutils/rman.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ general/genutils/rman.xml	(revision 852f51465010c162880f650ef7ef01564df00cad)
@@ -64,7 +64,4 @@
     <title>Installation of rman</title>
 
-    <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../xincludes/xorg7-only.xml"/> -->
-
     <para>rman is no longer part of the <application>Xorg</application>
     distribution, however, packages that use it may expect it to be in the
Index: general/genutils/xterm.xml
===================================================================
--- general/genutils/xterm.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ general/genutils/xterm.xml	(revision 852f51465010c162880f650ef7ef01564df00cad)
@@ -73,7 +73,4 @@
   <sect2 role="installation">
     <title>Installation of xterm</title>
-
-    <!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../xincludes/xorg7-only.xml"/> -->
 
     <para>Install <application>xterm</application> by running the
Index: general/graphlib/fontconfig.xml
===================================================================
--- general/graphlib/fontconfig.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ general/graphlib/fontconfig.xml	(revision 852f51465010c162880f650ef7ef01564df00cad)
@@ -209,14 +209,4 @@
       </para>
 
-<!-- XFREE86
-      <note>
-        <para><application>XFree86</application> also includes an internal (and
-        older) version of <application>Fontconfig</application> and unless it
-        is explicitly disabled, the internal version is created leaving two
-        slightly incompatible libraries on your system. It is recommended that
-        you only install one version.</para>
-      </note>
-XFREE86 -->
-
     </sect3>
 
Index: gnome/add/gnome-mag.xml
===================================================================
--- gnome/add/gnome-mag.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ gnome/add/gnome-mag.xml	(revision 852f51465010c162880f650ef7ef01564df00cad)
@@ -74,22 +74,4 @@
     <para role="optional"><xref linkend="intltool"/> and
     <xref linkend="doxygen"/></para>
-
-<!-- XFREE86
-    <bridgehead renderas="sect4">Optional (For
-    <application>XFree86</application> Only)</bridgehead>
-    <para role="optional"><ulink
-    url="http://www.freedesktop.org/wiki/Software_2fxlibs">Xdamage</ulink>
-    (requires <ulink
-    url="http://www.freedesktop.org/wiki/Software_2fxlibs">FixesExt</ulink>*
-    then <ulink
-    url="http://www.freedesktop.org/wiki/Software_2fxlibs">Xfixes</ulink>
-    then <ulink
-    url="http://www.freedesktop.org/wiki/Software_2fxlibs">DamageExt</ulink>)
-    </para>
-
-    <para>* Ensure you created the
-    <filename>xextensions.pc</filename> file as shown in the
-    <xref linkend="xfree86"/> instructions.</para>
-XFREE86 -->
 
     <para condition="html" role="usernotes">User Notes:
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ introduction/welcome/changelog.xml	(revision 852f51465010c162880f650ef7ef01564df00cad)
@@ -42,4 +42,13 @@
 -->
     <listitem>
+      <para>December 3rd, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Removed all XFree86 and monlithic Xorg references.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 2nd, 2008</para>
       <itemizedlist>
Index: multimedia/libdriv/nas.xml
===================================================================
--- multimedia/libdriv/nas.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ multimedia/libdriv/nas.xml	(revision 852f51465010c162880f650ef7ef01564df00cad)
@@ -169,16 +169,4 @@
 <screen role="root"><userinput>make install-nas</userinput></screen>
 
-<!-- XFREE86
-      <para>The init script uses a default prefix of
-      <filename class="directory">/usr/X11R6</filename>.  If you've installed
-      the <application>X Window System</application> into any other prefix,
-      execute the following command, replacing
-      <replaceable>&lt;PREFIX&gt;</replaceable> with the installation
-      prefix of the <application>X Window System</application>.</para>
-
-<screen role="root"><userinput>sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@' /etc/rc.d/init.d/nas</userinput></screen>
-
-XFREE86 -->
-
       <para>The init script uses a default parameter to allow access to all
       hosts on the network. Review the <command>nasd</command> man page for
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ multimedia/libdriv/xine-lib.xml	(revision 852f51465010c162880f650ef7ef01564df00cad)
@@ -89,9 +89,4 @@
     <ulink url="http://www.wavpack.com/">WavPack</ulink>,
     <ulink url="http://dxr3.sourceforge.net/">libdxr3</ulink>,
-
-<!-- XFREE86
-    <ulink url="http://sourceforge.net/projects/unichrome/">XvMC Wrapper</ulink>
-    (only if you have XFree86 installed),
-XFREE86 -->
 
     <ulink url="http://sourceforge.net/projects/sgmltools-lite/">sgmltools-lite</ulink>,
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ multimedia/videoutils/mplayer.xml	(revision 852f51465010c162880f650ef7ef01564df00cad)
@@ -204,9 +204,4 @@
     <ulink url="http://vidix.sourceforge.net/">VIDIX</ulink>, and
     <xref linkend="x-window-system"/></para>
-
-<!-- XFREE86
-    <ulink url="http://sourceforge.net/projects/unichrome/">XvMC Wrapper</ulink>
-      (only needed if you have XFree86 installed)</para>
-XFREE86 -->
 
     <bridgehead renderas="sect4">Optional CODECs</bridgehead>
Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ x/installing/installing.xml	(revision 852f51465010c162880f650ef7ef01564df00cad)
@@ -26,10 +26,4 @@
   decided to use the <application>Xorg</application> package.</para>
 
-<!-- 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 5886225d7b48a0322630d06c864f912a974e88b6)
+++ x/installing/x-config.xml	(revision 852f51465010c162880f650ef7ef01564df00cad)
@@ -16,9 +16,4 @@
   <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
@@ -28,7 +23,4 @@
   <application>Xorg</application> as well.  Detailed descriptions are also
   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 5886225d7b48a0322630d06c864f912a974e88b6)
+++ x/installing/x-setup.xml	(revision 852f51465010c162880f650ef7ef01564df00cad)
@@ -95,26 +95,10 @@
     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">
       <primary sortas="e-etc-X11-xorg-conf">/etc/X11/xorg.conf</primary>
     </indexterm>
-
-<!-- XFREE86
-    <indexterm zone="x-setup xconfig">
-      <primary sortas="e-etc-X11-XF86Config">/etc/X11/XF86Config</primary>
-    </indexterm>
-XFREE86 -->
 
     <para>The screen will go blank and you may hear some clicking of the
@@ -139,9 +123,4 @@
     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>
@@ -179,20 +158,7 @@
     </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,
@@ -202,24 +168,9 @@
     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
     the configuration directory and move the configuration file to the new
     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
@@ -280,9 +231,4 @@
     System</application> should be displayed.</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>
 
@@ -299,14 +245,8 @@
     To enable direct rendering using the OpenGL implementation from
     <xref linkend="mesalib"/> (built separately with <xref linkend="xorg7"/>
-    <!-- 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
     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"
@@ -336,15 +276,7 @@
 
     <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
@@ -357,8 +289,4 @@
     running <command>LIBGL_DEBUG=verbose glxinfo</command>.  This will
     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
@@ -400,10 +328,4 @@
     </indexterm>
 
-<!-- XFREE86
-    <indexterm zone="x-setup fonts">
-      <primary sortas="e-etc-X11-XF86Config">/etc/X11/XF86Config</primary>
-    </indexterm>
-XFREE86 -->
-
     <sect3>
       <title>Core X Font Protocol</title>
@@ -414,7 +336,4 @@
 
       <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
@@ -452,7 +371,4 @@
       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>
-XFREE86 -->
       <filename>xorg.conf</filename> file by adding it to the "Module"
       section:</para>
@@ -632,7 +548,4 @@
     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>
-XFREE86 -->
     of the <filename>xorg.conf</filename> file. For example:</para>
 
Index: installing/x7data.xml
===================================================================
--- x/installing/x7data.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ 	(revision )
@@ -1,127 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY x7data-download-http "http://xorg.freedesktop.org/releases/individual/data/">
-  <!ENTITY x7data-download-ftp  "ftp://ftp.x.org/pub/individual/data/">
-  <!ENTITY x7data-wget          "&files-anduin;/xorg/data-&xorg7-version;.wget">
-  <!ENTITY x7data-md5sum        "&files-anduin;/xorg/data-&xorg7-version;.md5">
-  <!ENTITY x7data-size          "2.1 MB">
-  <!ENTITY x7data-buildsize     "19.5 MB">
-  <!ENTITY x7data-time          "0.1 SBU">
-
-]>
-
-<sect1 id="xorg7-data" xreflabel="Xorg Data">
-  <?dbhtml filename="x7data.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Xorg Data</title>
-
-  <indexterm zone="xorg7">
-    <primary sortas="a-xorg7-data">Xorg Data</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xorg Data</title>
-
-    <para>The <application>Xorg</application> data packages provide
-    static data such as images and keymaps to the
-    <application>Xorg</application> applications.</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&x7data-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&x7data-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: <ulink url="&x7data-md5sum;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download size: &x7data-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &x7data-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &x7data-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required download list: <ulink url="&x7data-wget;"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xorg Data Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="xorg7-app"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url='&blfs-wiki;/Xorg7Data'/></para>
-
-  </sect2>
-
-  <sect2>
-    <title>Downloading Xorg Data</title>
-
-    <para>To download the needed files using <application>wget</application>,
-    use the following commands:</para>
-
-<screen><userinput>mkdir data &amp;&amp;
-cd data &amp;&amp;
-grep -v '^#' ../data-&xorg7-version;.wget | wget -i- -c \
-    -B http://xorg.freedesktop.org/releases/individual/data/ &amp;&amp;
-md5sum -c ../data-&xorg7-version;.md5</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xorg Data</title>
-
-    <para>Compile the selected packages with the following commands:</para>
-
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-    <para>These packages do not provide test suites.</para>
-
-    <para>Install the packages as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>None</seg>
-        <seg>The following subdirectories of <envar>$XORG_PREFIX</envar>/:
-        share/X11/xkb and
-        share/icons/{handhelds,redglass,whiteglass}/cursors</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: installing/xfree86.xml
===================================================================
--- x/installing/xfree86.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ 	(revision )
@@ -1,651 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY xfree86-download-http "http://gnu.kookel.org/ftp/XFree86/&xfree86-version;/source/">
-  <!ENTITY xfree86-download-ftp  "ftp://ftp.xfree86.org/pub/XFree86/&xfree86-version;/source/">
-  <!ENTITY xfree86-md5sum        "ftp://ftp.xfree86.org/pub/XFree86/&xfree86-version;/source/SUMS.md5sum">
-  <!ENTITY xfree86-size          "51 MB">
-  <!ENTITY xfree86-buildsize     "740 MB">
-  <!ENTITY xfree86-time          "12 SBU">
-]>
-
-<sect1 id="xfree86" xreflabel="XFree86">
-  <?dbhtml filename="xfree86.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>XFree86-&xfree86-version;</title>
-
-  <indexterm zone="xfree86">
-    <primary sortas="a-xfree86">XFree86</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to XFree86</title>
-
-    <para><application>XFree86</application> is a freely redistributable
-    open-source implementation of the <application>X Window
-    System</application>. <application>XFree86</application> 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>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&xfree86-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&xfree86-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &xfree86-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &xfree86-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &xfree86-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xfree86-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/XFree86-&xfree86-version;-freetype_internals-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">XFree86 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libpng"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="linux-pam"/>; the
-    following packages are included in the <application>XFree86</application>
-    package, however they are updated more often than the
-    <application>XFree86</application> package and are highly recommended:
-    <xref linkend="expat"/>, <xref linkend="freetype2"/>,
-    <xref linkend="fontconfig"/>.</para>
-
-    <note>
-      <para>If you choose not to install <application>expat</application>,
-      <application>FreeType2</application>, and
-      <application>Fontconfig</application>, the
-      <filename>host.def</filename> file below will have to be modified to
-      instruct <application>XFree86</application> to build them.</para>
-    </note>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url='&blfs-wiki;/XFree86'/></para>
-
-    <bridgehead renderas="sect3">Download Instructions</bridgehead>
-
-    <para>There are several files that need to be fetched from the download
-    location:</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><filename>XFree86-&xfree86-version;-src-1.tgz</filename></para>
-      </listitem>
-      <listitem>
-        <para><filename>XFree86-&xfree86-version;-src-2.tgz</filename></para>
-      </listitem>
-      <listitem>
-        <para><filename>XFree86-&xfree86-version;-src-3.tgz</filename></para>
-      </listitem>
-      <listitem>
-        <para><filename>XFree86-&xfree86-version;-src-4.tgz</filename></para>
-      </listitem>
-      <listitem>
-        <para><filename>XFree86-&xfree86-version;-src-5.tgz</filename></para>
-      </listitem>
-      <listitem>
-        <para><filename>XFree86-&xfree86-version;-src-6.tgz</filename></para>
-      </listitem>
-      <listitem>
-        <para><filename>XFree86-&xfree86-version;-src-7.tgz</filename></para>
-      </listitem>
-    </itemizedlist>
-
-    <para>The first three packages are the <application>XFree86</application>
-    programs, the fourth and fifth are fonts, the sixth is normal documentation,
-    and the seventh is hardcopy documentation.</para>
-
-    <para>To check your downloads for integrity, download the
-    <filename>SUMS.md5sum</filename> file. Then:</para>
-
-<screen><userinput>md5sum -c SUMS.md5sum</userinput></screen>
-
-    <para>The only errors you should see are for <filename>README</filename>,
-    <filename>doctools-1.3.x.tgz</filename>, <filename>utils-1.1.x.tgz</filename>
-    and <filename>XFree86-xtest-4.0.x.tar.bz2</filename> files if you did not
-    download them.</para>
-
-  </sect2>
-
-  <sect2 role="kernel" id='xfree86-kernel'>
-    <title>Kernel Configuration</title>
-
-    <para>If you have an Intel P6 (Pentium Pro, Pentium II and later), it is
-    recommended that you compile MTRR (Memory Type Range Registers) support
-    into the kernel.  The kernel can map Cyrix and AMD CPUs to the MTRR
-    interface, so selecting this option is useful for those processors also.
-    This option is found in the "Processor type and features" menu. It can
-    increase performance of image write operations 2.5 times or more on PCI
-    or AGP video cards.</para>
-
-    <indexterm zone="xfree86 xfree86-kernel">
-      <primary sortas="d-xfree86">XFree86</primary>
-    </indexterm>
-
-    <para>In the "Character Devices" section, enable AGP Support and select
-    the chipset support on your motherboard. If you do not know the chipset,
-    you may select all the chip types at the expense of extra kernel size.
-    You can usually determine your motherboard's chipset by running the
-    command <command>lspci</command>, a program from the
-    <xref linkend="pciutils"/> package.</para>
-
-    <para>In the "Character Devices" section, <emphasis>disable</emphasis>
-    Direct Rendering Manager unless you have a Direct Rendering Infrastructure
-    (DRI) supported video card.  A complete list of DRI supported video cards
-    can be found at <ulink url="http://dri.sourceforge.net" /> in the Status
-    section. Currently, supported cards include those from 3dfx (Voodoo,
-    Banshee), 3Dlabs, ATI (Rage Pro, Rage 128, Radeon 7X00, Radeon 2), Intel
-    (i810, i815), and Matrox (G200, G400, G450).</para>
-
-    <para>Additionally NVidia provides their own closed source binary drivers,
-    which do not make use of DRI. If you intend to use these drivers, do not
-    enable DRI.</para>
-
-    <para>If you made any changes to the kernel configuration, recompile and
-    install the new kernel.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of XFree86</title>
-
-    <sect3>
-
-      <title>Preparing the Sources</title>
-
-      <para>Three fixes are needed for <application>XFree86</application>.
-      First, a patch is needed to build against newer <application>FreeType</application>
-      releases. Second, the macro "PAGE_MASK" is manually defined because
-      including <filename>asm/page.h</filename> from the Linux kernel headers
-      does not work when compiling with <parameter>-ansi</parameter>. Third,
-      the Linux kernel headers no longer install the unneeded header
-      <filename>linux/config.h</filename>. A <command>sed</command> is used
-      to remove all usage of this header. Finally, one of the input drivers
-      will not build with the <parameter>-ansi</parameter> setting, so the
-      <application>GCC</application> default is restored. Perform these
-      actions with the following commands:</para>
-
-<screen><userinput>patch -Np1 -i ../XFree86-&xfree86-version;-freetype_internals-1.patch &amp;&amp;
-sed -i '/page.h/c #define PAGE_MASK (~(getpagesize() - 1))' \
-    programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c &amp;&amp;
-grep -rl '^#include &lt;linux/config.h&gt;' . | \
-    xargs sed -i '\@^#include &lt;linux/config.h&gt;@d' &amp;&amp;
-echo 'CCOPTIONS += -std=gnu89' &gt;&gt; \
-    programs/Xserver/hw/xfree86/input/ur98/Imakefile</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-
-      <title>Setting Up a Shadow Directory</title>
-
-      <para>When building <application>XFree86</application>, you should create
-      a shadow directory of symbolic links for the compiled code. To do that,
-      first make <command>lndir</command>. Starting from the
-      <filename class='directory'>xc</filename> directory:</para>
-
-<screen><userinput>make -C config/util -f Makefile.ini lndir</userinput></screen>
-
-      <para>Now create the shadow tree:</para>
-
-<screen><userinput>mkdir ../xcbuild &amp;&amp;
-cd ../xcbuild &amp;&amp;
-../xc/config/util/lndir ../xc</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Creating 'host.def'</title>
-
-      <para>Although <application>XFree86</application> will compile without
-      a <filename>host.def</filename> file, the following file is recommended
-      for customizing the installation. Start from the
-      <filename class="directory">xcbuild</filename> directory.</para>
-
-      <note>
-        <para>The <filename>host.def</filename> file is a
-        <application>C</application> file, not the usual configuration file.
-        If you make any changes, be sure the comment characters (/* and */)
-        are balanced.  Most of the entries in the file below are commented
-        out with the default settings shown.</para>
-      </note>
-
-<screen><?dbfo keep-together="auto"?><userinput>cat &gt; config/cf/host.def &lt;&lt; "EOF"
-<literal>/* Begin XFree86 host.def file */
-
-/* COMPILER SETTINGS
- * The default compiler settings for x86 are shown below. These settings
- * and those for other architectures can be found in config/cf/xfree86.cf.
-#define DefaultGcc2i386Opt  -O2 -fno-strength-reduce -fno-strict-aliasing
- */
-
-/* INPUT DRIVERS
- * The build will pick the correct drivers for your platform, but a shorter
- * list can be defined to reduce compile time if they will not all be needed.
- * The list below shows the default input drivers from config/cf/xfree86.cf.
- *
-#define XInputDrivers    mouse keyboard acecad calcomp citron \
-                         digitaledge dmc dynapro elographics tek4957 \
-                         microtouch mutouch penmount spaceorb summa \
-                         wacom void magellan magictouch hyperpen \
-                         jamstudio fpit palmax \
-                         OSXInputDrivers ExtraXInputDrivers
- */
-
-/* VIDEO DRIVERS
- * The build will pick the correct drivers for your platform, but a shorter
- * list can be defined to reduce compile time if they will not all be needed.
- * The list below shows the default input drivers from config/cf/xfree86.cf.
- *
-#define XF86CardDrivers  mga glint nv tga s3 s3virge sis xgi rendition \
-                         neomagic i740 tdfx savage cirrus vmware tseng \
-                         trident chips aspeed apm GlideDriver i128 \
-                         NscDriver ati i810 AgpGartDrivers DevelDrivers ark \
-                         cyrix siliconmotion via fbdev vesa vga dummy \
-                         XF86OSCardDrivers XF86ExtraCardDrivers
- */
-
-/* SYSTEM LIBRARIES
- * These settings ensure we use our libraries. Comment them if you prefer to
- * use the versions shipped with XFree86.
- */
-#define HasFreetype2        YES
-#define HasFontconfig       YES
-#define HasExpat            YES
-#define HasLibpng           YES
-#define HasZlib             YES
-
-/* Use Linux-PAM with xdm
-#define HasPam              YES
- */
-
-/* GENERAL SETTINGS
- */
-#define ManPath             /usr/share/man
-#define DocDir              /usr/share/doc/xfree86-4.6.0
-
-/* INSTALLATION PREFIX
- * The default is to install into /usr/X11R6. If you would like to install
- * into /usr, uncomment these options.
-#define ProjectRoot         /usr
-#define LinkGLToUsrLib      NO
-#define LinkGLToUsrInclude  NO
- */
-
-/* End XFree86 host.def file */</literal>
-EOF</userinput></screen>
-
-      <para>Edit the file for your hardware and desires. You can find more
-      options by reading the other files in
-      <filename class="directory">xc/config/cf</filename> and on the
-      <ulink url='&blfs-wiki;/XFree86'>wiki</ulink>.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Build Commands</title>
-
-      <para>Install <application>XFree86</application> by running the
-      following commands:</para>
-
-<screen><userinput>( make World 2&gt;&amp;1 | tee xfree-compile.log &amp;&amp; exit $PIPESTATUS )</userinput></screen>
-
-      <para>This package does not come with a test suite.</para>
-
-      <para>Now, as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen role="root"><userinput>make install install.man</userinput></screen>
-
-      <para>If you installed <application>XFree86</application> into the default
-      prefix, <filename class="directory">/usr/X11R6</filename>, make these
-      symlinks to work around some applications which look for things in the
-      wrong place. As <systemitem class="username">root</systemitem>:</para>
-
-<screen role="root"><userinput>ln -v -s ../X11R6/bin /usr/bin/X11 &amp;&amp;
-ln -v -s ../X11R6/lib/X11 /usr/lib/X11 &amp;&amp;
-ln -v -s ../X11R6/include/X11 /usr/include/X11</userinput></screen>
-
-      <para>The <application>XFree86</application> fonts have been installed
-      outside of <application>Fontconfig</application>'s default search path
-      of <filename class="directory">/usr/share/fonts</filename>. In order
-      for <application>Fontconfig</application> to find the installed TrueType
-      fonts, you should make symlinks to their directories. If you installed
-      <application>XFree86</application> with the prefix
-      <filename class="directory">/usr</filename>, omit /X11R6 from the
-      following commands. As <systemitem class="username">root</systemitem>:
-      </para>
-
-<screen role="root"><userinput>install -d -m755 /usr/share/fonts &amp;&amp;
-ln -svn /usr/X11R6/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF &amp;&amp;
-ln -svn /usr/X11R6/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF</userinput></screen>
-
-      <para><application>XFree86</application> installs the
-      <application>XRender</application> and
-      <application>XExtensions</application> extension libraries but does not
-      install the corresponding <application>pkg-config</application> files.
-      Create the files with these commands. If you installed
-      <application>XFree86</application> with the prefix
-      <filename class="directory">/usr</filename>, omit /X11R6 from the
-      paths. As <systemitem class="username">root</systemitem>:</para>
-
-<screen role="root"><userinput>cat &gt; /usr/X11R6/lib/pkgconfig/xrender.pc &lt;&lt; "EOF"
-<literal>prefix=/usr/X11R6
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Xrender
-Description: X Render Library
-Version: 0.8.3
-Cflags: -I${includedir} -I/usr/X11R6/include
-Libs: -L${libdir} -lXrender  -L/usr/X11R6/lib -lX11</literal>
-
-EOF
-
-cat &gt; /usr/X11R6/lib/pkgconfig/xextensions.pc &lt;&lt; "EOF"
-<literal>prefix=/usr/X11R6
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: XExtensions
-Description: Sundry X extension headers
-Version: 1.0.1
-Cflags: -I${includedir}</literal>
-
-EOF</userinput></screen>
-
-      <para>You should now continue on to the <xref linkend="x-setup"/> section
-      to complete the configuration of
-      <application>XFree86</application>.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>( make World 2&gt;&amp;1 | tee xfree-compile.log
-      &amp;&amp; exit $PIPESTATUS )</command>:
-    This command runs multiple <filename>Makefile</filename>s to completely
-    rebuild the system. <option>2&gt;&amp;1</option>
-    redirects error messages to the same location as standard output. The
-    <command>tee</command> command allows viewing of the output while logging
-    the results to a file. The parentheses around the command runs the entire
-    command in a subshell and finally the <command>exit $PIPESTATUS</command>
-    ensures the result of the <command>make</command> is returned as the result
-    and not the result of the <command>tee</command> command.</para>
-
-    <note>
-      <para>When rebuilding <application>XFree86</application>, a separate
-      command that may be used if only minor changes are made to the sources
-      is <command>make Everything</command>. This does not automatically
-      remove generated files and only rebuilds those files or programs that
-      are out of date.</para>
-    </note>
-
-    <para><command>ln -v -s ...</command>: These commands are present to
-    enable other (broken) packages to build against
-    <application>XFree86</application>, even though the Filesystem Hierarchy
-    Standard says: <quote>In general, software must not be installed or managed
-    via the above symbolic links. They are intended for utilization by
-    users only.</quote></para>
-
-  </sect2>
-
-  <sect2 id="xfree86-contents" role="content"
-  xreflabel="XFree86 Contents and Descriptions">
-    <title>Contents</title>
-
-    <para>The <application>XFree86</application> package contains the
-    <application>X Window System</application> for Linux (and other operating
-    systems). It includes the <application>X</application> server, fonts,
-    <command>xterm</command>, a simple window manager (<command>twm</command>),
-    various utilities, video output drivers, and various input drivers
-    including the mouse and keyboard.</para>
-
-    <para><application>XFree86</application> also contains libraries and header
-    files for development of the <application>X Window System</application>
-    programs.</para>
-
-    <note>
-      <para>The following lists are not comprehensive. The full list of
-      programs is (if you install into
-      <filename class="directory">/usr/X11R6</filename>) in
-      <filename class="directory">/usr/X11R6/bin</filename>.
-      For additional information about these programs, see the respective
-      man page.</para>
-    </note>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>XFree86, xf86config, xf86cfg, startx, xinit, twm, xterm,
-        xwininfo, x11perf, xlsfonts, xvidtune, xload, xcalc, xclock,
-        oclock, and xmodmap</seg>
-        <seg>libGL.so, libGLU.so, libSM.so, libXi.so, libXrender.so,
-        libXt.so, and libXfont.so</seg>
-        <seg>/usr/X11R6/ and /etc/X11/</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="XFree86">
-        <term><command>XFree86</command></term>
-        <listitem>
-          <para>is the X11R6 implementation of the <application>X Window
-          System</application> server.</para>
-          <indexterm zone="xfree86 XFree86">
-            <primary sortas="b-XFree86">XFree86</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xf86config">
-        <term><command>xf86config</command></term>
-        <listitem>
-          <para>is an interactive program for generating an
-          <filename>XF86Config</filename> file for use with
-          <application>XFree86</application> <application>X</application>
-          servers.</para>
-          <indexterm zone="xfree86 xf86config">
-            <primary sortas="b-xf86config">xf86config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xf86cfg">
-        <term><command>xf86cfg</command></term>
-        <listitem>
-          <para>is a tool to configure <application>XFree86</application>
-          that can be used to either write the initial configuration file
-          or make customizations to the current configuration.</para>
-          <indexterm zone="xfree86 xf86cfg">
-            <primary sortas="b-xf86cfg">xf86cfg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="startx">
-        <term><command>startx</command></term>
-        <listitem>
-          <para>is a script to initialize the <application>X</application>
-          session. It runs <command>xinit</command>.</para>
-          <indexterm zone="xfree86 startx">
-            <primary sortas="b-startx">startx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xinit">
-        <term><command>xinit</command></term>
-        <listitem>
-          <para>is used to start the <application>X Window
-          System</application> server.</para>
-          <indexterm zone="xfree86 xinit">
-            <primary sortas="b-xinit">xinit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="twm">
-        <term><command>twm</command></term>
-        <listitem>
-          <para>(Tab Window Manager) is a window manager included with the
-          <application>X Window System</application>.</para>
-          <indexterm zone="xfree86 twm">
-            <primary sortas="b-twm">twm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xterm">
-        <term><command>xterm</command></term>
-        <listitem>
-          <para>is a terminal emulator for <application>X</application>.</para>
-          <indexterm zone="xfree86 xterm">
-            <primary sortas="b-xterm">xterm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xwininfo">
-        <term><command>xwininfo</command></term>
-        <listitem>
-          <para>is a window information utility for
-          <application>X</application>.</para>
-          <indexterm zone="xfree86 xwininfo">
-            <primary sortas="b-xwininfo">xwininfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="x11perf">
-        <term><command>x11perf</command></term>
-        <listitem>
-          <para>is an <application>X</application>11 server performance
-          test program.</para>
-          <indexterm zone="xfree86 x11perf">
-            <primary sortas="b-x11perf">x11perf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xlsfonts">
-        <term><command>xlsfonts</command></term>
-        <listitem>
-          <para>is a program to list fonts available to the
-          <application>X</application> server.</para>
-          <indexterm zone="xfree86 xlsfonts">
-            <primary sortas="b-xlsfonts">xlsfonts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xvidtune">
-        <term><command>xvidtune</command></term>
-        <listitem>
-          <para>is a video mode tuner for
-          <application>XFree86</application>.</para>
-          <indexterm zone="xfree86 xvidtune">
-            <primary sortas="b-xvidtune">xvidtune</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xload">
-        <term><command>xload</command></term>
-        <listitem>
-          <para> is a system load average display for
-          <application>X</application>.</para>
-          <indexterm zone="xfree86 xload">
-            <primary sortas="b-xload">xload</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xcalc">
-        <term><command>xcalc</command></term>
-        <listitem>
-          <para>is a scientific calculator for
-          <application>X</application>.</para>
-          <indexterm zone="xfree86 xcalc">
-            <primary sortas="b-xcalc">xcalc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xclock">
-        <term><command>xclock</command></term>
-        <listitem>
-          <para>is a clock programs for <application>X</application>.</para>
-          <indexterm zone="xfree86 xclock">
-            <primary sortas="b-xclock">xclock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="oclock">
-        <term><command>oclock</command></term>
-        <listitem>
-          <para>is a clock programs for <application>X</application>.</para>
-          <indexterm zone="xfree86 oclock">
-            <primary sortas="b-oclock">oclock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmodmap">
-        <term><command>xmodmap</command></term>
-        <listitem>
-          <para>is a utility for modifying keymaps and pointer button
-          mappings in <application>X</application>.</para>
-          <indexterm zone="xfree86 xmodmap">
-            <primary sortas="b-xmodmap">xmodmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: installing/xmono-dummy.xml
===================================================================
--- x/installing/xmono-dummy.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sect1 role="dummy">
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Traditional X Window System</title>
-  <para/>
-</sect1>
-
Index: installing/xorg.xml
===================================================================
--- x/installing/xorg.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ 	(revision )
@@ -1,455 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY xorg-download-http "http://xorg.freedesktop.org/releases/X11R&xorg-version;/src-single/X11R&xorg-version;-src.tar.bz2 ">
-  <!ENTITY xorg-download-ftp  "ftp://ftp.x.org/pub/X11R&xorg-version;/src-single/X11R&xorg-version;-src.tar.bz2">
-  <!ENTITY xorg-md5sum        "52ad69832db5c36c7041f90625ed4598">
-  <!ENTITY xorg-size          "45 MB">
-  <!ENTITY xorg-buildsize     "864 MB">
-  <!ENTITY xorg-time          "11.68 SBU">
-]>
-
-<sect1 id="xorg" xreflabel="Xorg-&xorg-version;">
-  <?dbhtml filename="xorg.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Xorg-&xorg-version;</title>
-
-  <indexterm zone="xorg">
-    <primary sortas="a-xorg">Xorg</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xorg</title>
-
-<!-- XFREE86
-      <note>
-      <para>There are three packages in BLFS that implement the <application>X
-      Window System</application>: <application>Xorg</application>
-      (X11R6 and X11R7) and  <application>XFree86</application>. These
-      packages are all quite similar.  In fact, the base system of
-      <application>Xorg</application> is
-      <application>XFree86</application>-4.4.0RC2. Licensing was the original
-      reason for the split.  <application>Xorg-&xorg7-version;</application>
-      introduces a completely autotooled build system, but is otherwise the
-      same codebase as <application>Xorg-&xorg-version;</application>.
-      Most large commercial distributions have decided to use the
-      <application>Xorg</application> package, but several still provide
-      <application>XFree86</application>.</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>. X.org's future plans include
-      significant improvements to the internals of the system and more
-      frequent releases.</para>
-
-      <para><application>XFree86</application> continues to be a solid,
-      conservative application with excellent driver support.</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>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&xorg-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&xorg-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &xorg-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &xorg-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &xorg-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &xorg-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/xorg-&xorg-version;-luit_race-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/xorg-&xorg-version;-security-4.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xorg Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="libpng"/> and
-    <xref linkend="fontconfig"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="linux-pam"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url='&blfs-wiki;/Xorg'/></para>
-
-    <bridgehead renderas="sect3">Download Instructions</bridgehead>
-
-    <para>As an alternative to downloading the entire source tree in a single
-    file, there are several smaller files that can be fetched from the
-    download location (directory /pub/X11R&xorg-version;/src/):</para>
-
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para><filename>X11R&xorg-version;-src1.tar.gz</filename></para>
-      </listitem>
-      <listitem>
-        <para><filename>X11R&xorg-version;-src2.tar.gz</filename></para>
-      </listitem>
-      <listitem>
-        <para><filename>X11R&xorg-version;-src3.tar.gz</filename></para>
-      </listitem>
-      <listitem>
-        <para><filename>X11R&xorg-version;-src4.tar.gz</filename></para>
-      </listitem>
-      <listitem>
-        <para><filename>X11R&xorg-version;-src5.tar.gz</filename></para>
-      </listitem>
-      <listitem>
-        <para><filename>X11R&xorg-version;-src6.tar.gz</filename></para>
-      </listitem>
-      <listitem>
-        <para><filename>X11R&xorg-version;-src7.tar.gz</filename></para>
-      </listitem>
-    </itemizedlist>
-
-    <para>The first package contains the <application>Xorg</application>
-    libraries and support programs, the second contains standard
-    <application>X</application> programs, the third contains the
-    <application>X</application> server, the fourth and fifth are fonts,
-    the sixth is normal documentation, and the seventh is hardcopy
-    documentation.</para>
-
-    <para>To check the files for integrity, download the
-    <filename>md5sums</filename> file. Then:</para>
-
-<screen><userinput>md5sum -c md5sums</userinput></screen>
-
-    <para>For each file you downloaded, an
-    <computeroutput>OK</computeroutput> status should be displayed.</para>
-
-  </sect2>
-
-  <sect2 role="kernel" id='xorg-kernel'>
-    <title>Kernel Configuration</title>
-
-    <indexterm zone="xorg xorg-kernel">
-    <primary sortas="d-Xorg">Xorg</primary>
-    </indexterm>
-
-    <para>If you have an Intel P6 (Pentium Pro, Pentium II and later), it is
-    recommended that you compile MTRR (Memory Type Range Registers) support
-    into the kernel. The kernel can map Cyrix and AMD CPUs to the MTRR
-    interface, so selecting this option is useful for those processors also.
-    This option is found in the "Processor type and features" menu. It can
-    increase performance of image write operations 2.5 times or more on PCI or
-    AGP video cards.</para>
-
-    <para>In the "Character Devices" section of the "Device Drivers" menu,
-    enable AGP Support and select the chipset support on your motherboard. If
-    you do not know the chipset, you may select all the chip types at the
-    expense of extra kernel size.  You can usually determine your motherboard's
-    chipset by running the command <command>lspci</command>, a program from the
-    <xref linkend="pciutils"/> package.</para>
-
-    <para>In the "Character Devices" section, <emphasis>disable</emphasis>
-    Direct Rendering Manager unless you have a Direct Rendering Infrastructure
-    (DRI) supported video card. A complete list of DRI supported video cards
-    can be found at <ulink url="http://dri.sourceforge.net" /> in the "Status"
-    section. Currently, supported cards include those from 3dfx (Voodoo,
-    Banshee), 3Dlabs, ATI (Rage Pro, Rage 128, Radeon 7X00, Radeon 2), Intel
-    (i810, i815), and Matrox (G200, G400, G450).</para>
-
-    <para>Additionally, NVidia provides their own closed source binary drivers,
-    which do not make use of DRI. If you intend to use these drivers, do not
-    enable DRI.</para>
-
-    <para>If you made any changes to the kernel configuration, recompile and
-    install the new kernel.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xorg</title>
-
-    <sect3>
-      <title>Various build fixes</title>
-
-      <para>The <application>Xorg</application> sources must be patched in
-      order to avoid a race condition with the <application>luit</application>
-      program.  Additionally, <application>Xorg</application> contains 5
-      <ulink url="http://wiki.x.org/wiki/SecurityPage">security
-      vulnerabilities</ulink>. Fix these issues with the following
-      commands:</para>
-
-<screen><userinput>patch -Np1 -i ../xorg-&xorg-version;-luit_race-1.patch &amp;&amp;
-patch -Np1 -i ../xorg-&xorg-version;-security-4.patch</userinput></screen>
-
-      <para>Additionally, if you choose to install
-      <application>Xorg</application> to any prefix other than
-      <filename class="directory">/usr/X11R6</filename>, the
-      <application>luit</application> package
-      needs another correction to fix a hard coded path.  Execute the
-      following command:</para>
-
-<screen><userinput>sed -i 's@/usr/X11R6@<replaceable>&lt;/usr&gt;</replaceable>@' programs/luit/parser.h</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Suppressing Xprint-related Modification to '/etc'</title>
-
-      <para><application>Xorg</application> insists on putting
-      its boot and profile scripts into the <filename
-      class="directory">/etc</filename> directory even if specifically told
-      not to compile anything Xprint server or client related (see
-      <filename>host.def</filename> below). The following command will
-      suppress any such modifications:</para>
-
-<screen><userinput>sed -i '/^SUBDIRS =/s/ etc$//' programs/Xserver/Xprint/Imakefile</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Setting Up a Shadow Directory</title>
-
-      <para>When building <application>Xorg</application>, you should create
-      a shadow directory of symbolic links for the compiled code. To do that,
-      first make <command>lndir</command>. Starting from the
-      <filename class='directory'>xc</filename> directory:</para>
-
-<screen><userinput>pushd config/util &amp;&amp;
-make -f Makefile.ini lndir
-popd</userinput></screen>
-
-      <para>Now create the shadow tree:</para>
-
-<screen><userinput>mkdir ../xcbuild &amp;&amp;
-cd ../xcbuild &amp;&amp;
-../xc/config/util/lndir ../xc</userinput></screen>
-
-    </sect3>
-
-    <sect3>
-      <title>Creating 'host.def'</title>
-
-      <para>The next step is to create the
-      <filename>config/cf/host.def</filename> file. The documentation for
-      <application>Xorg</application> indicates that the application will
-      build without a <filename>host.def</filename> file, but the included
-      libraries for <application>Fontconfig</application> and
-      <application>FreeType2</application> do not build properly on a base
-      LFS system. Therefore, you must specify that these libraries, as well
-      as others, should be imported from the system.</para>
-
-      <note>
-        <para><filename>config/cf/host.def</filename> is a C file, not a
-        shell script. Ensure the comments delimited by /* ... */ are balanced
-        when modifying the file.</para>
-      </note>
-
-<screen><userinput>cat &gt; config/cf/host.def &lt;&lt; "EOF"
-<literal>/* Begin Xorg host.def file */
-
-/* System Related Information.  If you read and configure only one
- * section then it should be this one.  The Intel architecture defaults
- * are set for a i686 and higher.  Axp is for the Alpha architecture
- * and Ppc is for the Power PC.  AMD64 is for the Opteron processor.
- * Note that there have been reports that the Ppc optimization line
- * causes segmentation faults during build.  If that happens, try
- * building without the DefaultGcc2PpcOpt line.  ***********/
-
-/* #define DefaultGcc2i386Opt  -O2 -fno-strength-reduce \
-                               -fno-strict-aliasing -march=i686 */
-/* #define DefaultGcc2AMD64Opt -O2 -fno-strength-reduce \
-                               -fno-strict-aliasing */
-/* #define DefaultGcc2AxpOpt   -O2 -mcpu=ev6 */
-/* #define DefaultGcc2PpcOpt   -O2 -mcpu=750 */
-
-#define HasFreetype2            YES
-#define HasFontconfig           YES
-#define HasExpat                YES
-#define HasLibpng               YES
-#define HasZlib                 YES
-
-/* Uncomment the following define if you'd like
- * xdm to use Linux-PAM
-#define HasPam                  YES
- */
-
-/*
- * Which drivers to build.  When building a static server, each of
- * these will be included in it.  When building the loadable server
- * each of these modules will be built.
- *
-#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
-                                neomagic i740 tdfx savage \
-                                cirrus vmware tseng trident chips apm \
-                                GlideDriver fbdev i128 \
-                                ati DevelDrivers ark \
-                                cyrix siliconmotion vesa vga \
-                                XF86OSCardDrivers XF86ExtraCardDrivers
-*/
-
-/*
- * Select the XInput devices you want by uncommenting this.
- *
-#define XInputDrivers           mouse keyboard acecad calcomp citron \
-                                digitaledge dmc dynapro elographics \
-                                microtouch mutouch penmount spaceorb \
-                                summa wacom void magictouch aiptek
- */
-
-/* Most installs will only need this */
-
-#define XInputDrivers           mouse keyboard
-
-/* Xterm is no longer built by default */
-#define BuildXterm              YES
-
-/* Disable building Xprint server and clients until we get them figured
- * out but build Xprint libraries to allow precompiled binaries such as
- * Acrobat Reader to run.
- */
-
-#define XprtServer              NO
-#define BuildXprintClients      NO
-
-/* Uncomment the following define if you would prefer to install X into
- * /usr or change it to any other location that you prefer.
- * The GL related defines disable compatibility symlinks (the links
- * are not needed when X is installed in /usr).
-#define ProjectRoot             /usr
-#define LinkGLToUsrInclude      NO
-#define LinkGLToUsrLib          NO
- */
-
-/* End Xorg host.def file */</literal>
-EOF</userinput></screen>
-
-      <para>There are several other options that you may want to consider.
-      A well documented example file is
-      <filename>config/cf/xorgsite.def</filename>.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Build Commands</title>
-
-      <para>Install <application>Xorg</application> by running the
-      following commands:</para>
-
-<screen><userinput>sed -i -e "s@^#include &lt;linux/config.h&gt;@/* &amp; */@" \
-    `grep -lr linux/config.h *` &amp;&amp;
-( make World 2&gt;&amp;1 | tee xorg-compile.log &amp;&amp; exit $PIPESTATUS )</userinput></screen>
-
-      <para>This package does not come with a test suite.</para>
-
-      <para>Now, as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-make install.man</userinput></screen>
-
-      <para>If you've installed <application>Xorg</application> in the default
-      prefix listed above, run the following commands as the
-      <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>ln -v -s ../X11R6/bin /usr/bin/X11 &amp;&amp;
-ln -v -s ../X11R6/lib/X11 /usr/lib/X11 &amp;&amp;
-ln -v -s ../X11R6/include/X11 /usr/include/X11</userinput></screen>
-
-      <para>The <application>Xorg</application> fonts have been installed
-      outside of <application>Fontconfig</application>'s default search path
-      of <filename class="directory">/usr/share/fonts</filename>.  In order
-      for <application>Fontconfig</application> to find the installed TrueType
-      fonts, you should make symlinks to their directories.  Assuming you've
-      installed <application>Xorg</application> in the default prefix, run the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen role="root"><userinput>install -v -d -m755 /usr/share/fonts &amp;&amp;
-ln -svn /usr/X11R6/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF</userinput></screen>
-
-      <para>You should now continue on to the <xref linkend="x-setup"/> section
-      to complete the configuration of
-      <application>Xorg</application>.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i -e "s@^#include &lt;linux/config.h&gt;@...</command>:
-    The <application>Linux-Libc-Headers</application> package installed in
-    LFS installs a <filename>/usr/include/linux/config.h</filename> file
-    which is not compatible with userspace applications. The recommended fix
-    for applications including this file is to remove it (see <ulink
-    url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/doc/FAQ">
-    linux-libc-headers FAQ</ulink>). The <command>sed</command> uses
-    <command>grep -lr</command> to replace all occurrences. If you desire, just
-    remove (comment) the line in the appropriate video driver file if you
-    customized <filename>host.def</filename>.</para>
-
-    <para><command>( make World 2&gt;&amp;1 | tee xorg-compile.log
-    &amp;&amp; exit $PIPESTATUS )</command>: This command runs multiple
-    <filename>Makefile</filename>s to completely rebuild the system.
-    <parameter>2&gt;&amp;1</parameter> redirects error messages to the
-    same location as standard output. The <command>tee</command> command
-    allows viewing of the output while logging the results to a file. The
-    parentheses around the command runs the entire command in a subshell
-    and finally the <command>exit $PIPESTATUS</command> ensures the result
-    of the <command>make</command> is returned as the result and not the
-    result of the <command>tee</command> command.</para>
-
-    <note>
-      <para>When rebuilding <application>Xorg</application>, a separate
-      command that may be used if only minor changes are made to the sources
-      is <command>make Everything</command>. This does not automatically
-      remove generated files and only rebuilds those files or programs that
-      are out of date.</para>
-    </note>
-
-    <para><command>ln -v -s ...</command>: These commands are present to
-    enable other (broken) packages to build against
-    <application>Xorg</application>, even though the Filesystem Hierarchy
-    Standard says: <quote>In general, software must not be installed or
-    managed via the above symbolic links. They are intended for utilization
-    by users only.</quote></para>
-
-<!-- XFREE86
-    <para>For a list of the package contents, see the sections in the
-    <xref linkend="xfree86-contents"/>.</para>
-XFREE86 -->
-
-  </sect2>
-
-</sect1>
Index: x/lib/cairo.xml
===================================================================
--- x/lib/cairo.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ x/lib/cairo.xml	(revision 852f51465010c162880f650ef7ef01564df00cad)
@@ -108,13 +108,4 @@
     <title>Installation of cairo</title>
 
-<!-- XFREE86
-    <para><application>cairo</application> will look for an
-    <application>X Render</application> <application>pkg-config</application>
-    file. If you use <application>XFree86</application> as your
-    <application>X</application> Window system, ensure this file exists
-    (<filename>/usr/X11R6/lib/pkgconfig/xrender.pc</filename>) before beginning
-    the installation.</para>
-XFREE86 -->
-
     <para>Install <application>cairo</application> by running the following
     commands:</para>
Index: x/wm/metacity.xml
===================================================================
--- x/wm/metacity.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ x/wm/metacity.xml	(revision 852f51465010c162880f650ef7ef01564df00cad)
@@ -70,13 +70,4 @@
     <ulink url="&gnome-download-http;/libcm/">libcm</ulink></para>
 
-<!-- XFREE86
-    <para>* Xorg <application>X</application> installations only.
-    <application>libcm</application> is used to build the
-    <application>Metacity</application> composite manager and it also requires
-    <application>libXcomposite</application> &gt;= 2.0. Xorg ships with
-    the required <application>libXcomposite</application> (XFree86 does not)
-    and there is not a stand-alone version that works.</para>
-XFREE86 -->
-
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/metacity"/></para>
@@ -86,10 +77,4 @@
   <sect2 role="installation">
     <title>Installation of Metacity</title>
-
-    <!-- <para><application>Metacity</application> will look for an
-    <application>X Render</application> <application>pkg-config</application>
-    file. If you use <application>XFree86</application> as your
-    <application>X</application> Window system, ensure this file exists
-    (<filename>/usr/X11R6/lib/pkgconfig/xrender.pc</filename>).</para> -->
 
     <para>Install <application>Metacity</application> by running the following
Index: ncludes/xorg7-only.xml
===================================================================
--- xincludes/xorg7-only.xml	(revision 5886225d7b48a0322630d06c864f912a974e88b6)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
-
-<!-- $LastChangedBy$
-     $Date$ -->
-
-<note>
-    <para>This package should only be built if you are installing
-    <xref linkend="xorg7"/>. If you have installed or will be
-    installing <xref linkend="xfree86"/>, it is already installed
-    (or will be) and should not be installed here. Ensure that you
-    have the <envar>XORG_CONFIG</envar> and <envar>XORG_PREFIX</envar>
-    variables set as described in the <xref linkend="xorg7"/> page.</para>
-</note>
