Index: x/installing/installing.xml
===================================================================
--- x/installing/installing.xml	(revision 0aeb69629fcd6150828e6deabf8b9c04662f7fd6)
+++ x/installing/installing.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -35,11 +35,21 @@
   <para><application>XFree86</application> continues to be a solid,
   conservative application with excellent driver support.</para>
-
-
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xmono-dummy.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xorg.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xfree86.xml"/>
+  <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"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xfree86.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x7proto.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x7util.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x7lib.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xbitmaps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x7app.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x7data.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x7font.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="luit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x7server.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x7driver.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="xconfig-dummy.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x-setup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x-config.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x-setup.xml"/>
-
 </chapter>
Index: x/installing/luit.xml
===================================================================
--- x/installing/luit.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
+++ x/installing/luit.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY luit-download-http "http://xorg.freedesktop.org/releases/individual/app/luit-&luit-version;.tar.bz2">
+  <!ENTITY luit-download-ftp  "">
+  <!ENTITY luit-md5sum        "fbe44e739590d3d73f711bfc8a0e33fd">
+  <!ENTITY luit-size          "92 KB">
+  <!ENTITY luit-buildsize     "1 MB">
+  <!ENTITY luit-time          "0.1 SBU">
+
+]>
+
+<sect1 id="luit" xreflabel="luit-&luit-version;">
+  <?dbhtml filename="luit.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: dj $</othername>
+    <date>$Date: 2006-04-15 23:04:51 -0500 (Sat, 15 Apr 2006) $</date>
+<!--    <keywordset>
+      <keyword role="package">X11R&xorg7-version;-src.tar</keyword>
+      <keyword role="ftpdir">Xorg7</keyword>
+    </keywordset>
+########## Need a way to fix this on the mirrors ##########
+##### Maybe a single tarball is the way to handle it ######
+-->
+
+
+  </sect1info>
+
+  <title>Luit-&luit-version;</title>
+
+  <indexterm zone="luit">
+    <primary sortas="a-luit">Luit</primary>
+  </indexterm>
+
+  <para><application>Luit</application> provides a filter for displaying and
+  converting UTF-8 characters in text console windows.</para>
+
+  <bridgehead renderas="sect3">Package Information</bridgehead>
+  <itemizedlist spacing="compact">
+    <listitem>
+      <para>Download (HTTP): <ulink url="&luit-download-http;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download (FTP): <ulink url="&luit-download-ftp;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download MD5 sum: &luit-md5sum;</para>
+    </listitem>
+    <listitem>
+      <para>Download size: &luit-size;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated disk space required: &luit-buildsize;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated build time: &luit-time;</para>
+    </listitem>
+  </itemizedlist>
+
+  <bridgehead renderas="sect3">Luit Dependencies</bridgehead>
+
+  <bridgehead renderas="sect4">Required</bridgehead>
+  <para role="required"><xref linkend="xorg7-font"/></para>
+
+  <sect2 role="installation">
+    <title>Installation of Luit</title>
+
+    <para>A patch is required to fix a race condition in
+    <application>luit</application> that was discovered shortly after
+    release.  Download the patch from
+    <ulink url="&patch-root;/luit-&luit-version;-race-1.patch"/>.</para>
+
+    <para>Install luit with the following commands:</para>
+
+<screen><userinput>patch -Np1 -i luit-&luit-version;-race-1.patch &amp;&amp;
+./configure $XORG_CONFIG &amp;&amp;
+make</userinput></screen>
+
+    <para>Now as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
+  </sect2>
+
+</sect1>
+
Index: x/installing/x-setup.xml
===================================================================
--- x/installing/x-setup.xml	(revision 0aeb69629fcd6150828e6deabf8b9c04662f7fd6)
+++ x/installing/x-setup.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -6,6 +6,6 @@
 ]>
 
-<sect1 id="x-setup">
-  <?dbhtml filename="xfree86-setup.html"?>
+<sect1 id="x-setup" xreflabel="X Window System Components">
+  <?dbhtml filename="x-setup.html"?>
 
   <sect1info>
@@ -15,4 +15,173 @@
 
   <title>X Window System Components</title>
+
+    <sect2 role="configuration" id='xconfig'>
+    <title>Configuring The X Window System</title>
+
+    <para>If you've installed the X Window System in any prefix other
+    than <filename>/usr</filename>, as the 
+    <systemitem class="username">root</systemitem> user, add
+    <filename class="directory">
+    <replaceable>&lt;/usr/X11R6&gt;</replaceable>/lib</filename> to 
+    the <filename>/etc/ld.so.conf</filename> file and run 
+    <command>ldconfig</command>.  Additionally, While still the 
+    <systemitem class="username">root</systemitem> user, ensure 
+    <filename class="directory">
+    <replaceable>&lt;/usr/X11R6&gt;</replaceable>/bin</filename>
+    and <filename class="directory">
+    <replaceable>&lt;/usr/X11R6&gt;</replaceable>/lib/pkgconfig</filename>
+    are added to your <envar>PATH</envar> and <envar>PKG_CONFIG_PATH</envar>
+    environment variables, respectively. Instructions for doing this are
+    described in the section <xref linkend='postlfs-config-profile'/>.</para>
+
+    <para>As the <systemitem class="username">root</systemitem> user
+    create a basic X Window System configuration file with the following
+    commands:</para>
+
+    <para>For <application>Xorg</application>:</para>
+<screen><userinput>cd ~ &amp;&amp;
+Xorg -configure</userinput></screen>
+
+    <para>For <application>XFree86</application>:</para>
+<screen><userinput>cd ~ &amp;&amp;
+XFree86 -configure</userinput></screen>
+
+    <indexterm zone="x-setup xconfig">
+      <primary sortas="e-etc-X11-xorg-conf">/etc/X11/xorg.conf</primary>
+    </indexterm>
+
+    <indexterm zone="x-setup xconfig">
+      <primary sortas="e-etc-X11-XF86Config">/etc/X11/XF86Config</primary>
+    </indexterm>
+
+    <para>The screen will go black and you may hear some clicking of the 
+    monitor.  This command will create a file in your
+    home directory, <filename>xorg.conf.new</filename> for 
+    <application>Xorg</application>, or <filename>XF86Config.new</filename> 
+    for <application>XFree86</application>.</para>
+
+    <para>Edit the newly created configuration file to suit your system. The
+    details of the files are located in the xorg.conf and XF86Config man 
+    pages. Some things you may want to do are:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Section "Files". Change the order of the font paths searched.
+        You may want to put 100dpi fonts ahead of 75dpi fonts if your system
+        normally comes up closer to 100 dots per inch. You may want to remove
+        some font directories completely.</para>
+      </listitem>
+      <listitem>
+        <para>Section "Module". If you are going to install NVidia
+        drivers, remove the "dri" line.</para>
+      </listitem>
+      <listitem>
+        <para>Sections "InputDevice". You may want to change the
+        keyboard autorepeat rate by adding
+        <option>Option "Autorepeat" "250 30"</option>.</para>
+      </listitem>
+      <listitem>
+        <para>Section "Monitor". Specify the <option>VertRefresh</option>
+        and <option>HorizSync</option> values if the system does not
+        automatically detect the monitor and its values.</para>
+      </listitem>
+      <listitem>
+        <para>Section "Device". You may want to set some of the options
+        available for your selected video driver. A description of the driver
+        parameters is in the man page for your driver.</para>
+      </listitem>
+      <listitem><para>Section "Screen". Add a DefaultDepth statement such as:
+        <option>DefaultDepth 24</option>. In the SubSection for your
+        default depth, add a modes line such as:
+        <option>Modes "1600x1200" "1280x1024" "1024x768"</option>. The first
+        mode listed will normally be the starting resolution.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Test the system with one of the following commands:</para>
+
+    <para>For <application>Xorg</application>:</para>
+<screen><userinput>X -config ~/xorg.conf.new</userinput></screen>
+
+    <para>For <application>XFree86</application>:</para>
+<screen><userinput>XFree86 -xf86config ~/XF86Config.new</userinput></screen>
+
+    <para>You will only get a gray background with an X-shaped mouse cursor,
+    but it confirms the system is working. Exit with
+    <keycap>Control+Alt+Backspace</keycap>. If the system does not work, take
+    a look at <filename>/var/log/Xorg.0.log</filename> or 
+    <filename>/var/log/XFree86.0.log</filename> to see what went
+    wrong.</para>
+
+    <para>As the <systemitem class="username">root</systemitem> user, create
+    the configuration directory and move the configuration file to the new 
+    directory:</para>
+
+    <para>For <application>Xorg</application>:</para>
+<screen role="root"><userinput>install -v -m755 -D ~/xorg.conf.new /etc/X11/xorg.conf</userinput></screen>
+
+    <para>For <application>XFree86</application>:</para>
+<screen role="root"><userinput>install -v -m755 -D ~/XF86Config.new /etc/X11/XF86Config</userinput></screen>
+
+    <para>As the <systemitem class="username">root</systemitem> user, create
+    <filename>.xinitrc</filename>:</para>
+
+<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
+<literal># Begin .xinitrc file
+xterm  -g 80x40+0+0   &amp;
+xclock -g 100x100-0+0 &amp;
+twm</literal>
+EOF</userinput></screen>
+
+    <para>This provides an initial screen with a small clock that is
+    managed by a simple window manager, Tab Window Manager. For details of
+    <command>twm</command>, see the man page.</para>
+
+    <note>
+      <para>The default configuration for <application>Xorg</application> 
+      includes <application>xterm</application>.  
+      <application>Xorg</application>'s modular distribution no longer includes 
+      <application>xterm</application>, and 
+      as a result, the <command>startx</command> command will fail if you have 
+      not installed <xref linkend="xterm2"/> when using the modular X Window
+      System.</para>
+    </note>
+
+    <indexterm zone="x-setup xconfig">
+      <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
+    </indexterm>
+
+    <para>When needed, the X Window System creates the directory
+    <filename class='directory'>/tmp/.ICE-unix</filename> if it does not
+    exist. If this directory is not owned by
+    <systemitem class="username">root</systemitem>,
+    the X Window System delays startup by a few seconds and also
+    appends a warning to the logfile. This also affects startup of other
+    applications. To improve performance, it is advisable to manually create
+    the directory before the X Window System uses it. Add the file creation 
+    to <filename>/etc/sysconfig/createfiles</filename> that is sourced by 
+    the <filename>/etc/rc.d/init.d/cleanfs</filename> startup script.</para>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/sysconfig/createfiles &lt;&lt; "EOF"
+/tmp/.ICE-unix dir 1777 root root
+EOF</userinput></screen>
+
+    <indexterm zone="x-setup xconfig">
+      <primary
+      sortas="e-etc-sysconfig-createfiles">/etc/sysconfig/createfiles</primary>
+    </indexterm>
+
+    <para>Start <application>X</application> with:</para>
+
+<screen><userinput>startx</userinput></screen>
+
+    <para>and a basic functional <application>X Window
+    System</application> should be displayed.</para>
+
+    <para>For a list of the package contents and a description of the commands,
+    see the sections in the <xref linkend='xfree86-contents'/>.</para>
+
+  </sect2>
+
 
   <sect2 id='dri'>
Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
+++ x/installing/x7app.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY x7apps-download-http "http://xorg.freedesktop.org/releases/individual/app/">
+  <!ENTITY x7apps-download-ftp  "">
+  <!ENTITY x7apps-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
+  <!ENTITY x7apps-size          "9.0 MB">
+  <!ENTITY x7apps-buildsize     "30.6 MB">
+  <!ENTITY x7apps-time          "2.1 SBU">
+
+]>
+
+<sect1 id="xorg7-app" xreflabel="Xorg Applications">
+  <?dbhtml filename="x7app.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: dj $</othername>
+    <date>$Date: 2006-04-15 23:04:51 -0500 (Sat, 15 Apr 2006) $</date>
+<!--    <keywordset>
+      <keyword role="package">X11R&xorg7-version;-src.tar</keyword>
+      <keyword role="ftpdir">Xorg7</keyword>
+    </keywordset>
+########## Need a way to fix this on the mirrors ##########
+##### Maybe a single tarball is the way to handle it ######
+-->
+
+  </sect1info>
+
+  <title>Xorg Applications</title>
+
+  <indexterm zone="xorg7-app">
+    <primary sortas="a-xorg7-app">Xorg-&xorg7-version; Applications</primary>
+  </indexterm>
+
+  <para>The <application>Xorg</application> applications provide the
+  expected applications available in previous X Window
+  implementations.</para>
+
+  <bridgehead renderas="sect3">Package Information</bridgehead>
+  <itemizedlist spacing="compact">
+    <listitem>
+      <para>Download (HTTP): <ulink url="&x7apps-download-http;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download (FTP): <ulink url="&x7apps-download-ftp;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download MD5 sum: <ulink url="&x7apps-md5sum;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download size: &x7apps-size;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated disk space required: &x7apps-buildsize;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated build time: &x7apps-time;</para>
+    </listitem>
+  </itemizedlist>
+
+  <bridgehead renderas="sect3">Xorg Applications Dependencies</bridgehead>
+
+  <bridgehead renderas="sect4">Required</bridgehead>
+  <para role="required"><xref linkend="xbitmaps"/></para>
+
+  <bridgehead renderas="sect4">Recommended</bridgehead>
+  <para><xref linkend="mesalib"/></para>
+
+  <sect2>
+    <title>Downloading Xorg Applicatons</title>
+
+    <para>To download the needed files using <application>wget</application>,
+    use the following commands:</para>
+
+<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/app.wget &amp;&amp;
+mkdir app &amp;&amp;
+cd app &amp;&amp;
+wget -B http://xorg.freedesktop.org/releases/individual/app/ -i ../app.wget</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Xorg Applications</title>
+
+    <para>Install the applications by running the following commands for each
+    chosen package:</para>
+
+<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
+make</userinput></screen>
+
+    <para>Now as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
+  </sect2>
+
+</sect1>
+
+
Index: x/installing/x7data.xml
===================================================================
--- x/installing/x7data.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
+++ x/installing/x7data.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/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  "">
+  <!ENTITY x7data-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
+  <!ENTITY x7data-size          "2.5 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: dj $</othername>
+    <date>$Date: 2006-04-15 23:04:51 -0500 (Sat, 15 Apr 2006) $</date>
+<!--    <keywordset>
+      <keyword role="package">X11R&xorg7-version;-src.tar</keyword>
+      <keyword role="ftpdir">Xorg7</keyword>
+    </keywordset>
+########## Need a way to fix this on the mirrors ##########
+##### Maybe a single tarball is the way to handle it ######
+-->
+
+
+  </sect1info>
+
+  <title>Xorg Data</title>
+
+  <indexterm zone="xorg7">
+    <primary sortas="a-xorg7-data">Xorg Data</primary>
+  </indexterm>
+
+  <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">Xorg Data Dependencies</bridgehead>
+
+  <bridgehead renderas="sect4">Required</bridgehead>
+  <para role="required"><xref linkend="xorg7-app"/></para>
+
+  <sect2>
+    <title>Downloading Xorg Data</title>
+
+    <para>To download the needed files using <application>wget</application>,
+    use the following commands:</para>
+
+<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/data.wget &amp;&amp;
+mkdir data &amp;&amp;
+cd data &amp;&amp;
+wget -B http://xorg.freedesktop.org/releases/individual/data/ -i ../data.wget</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>Install the packages as the 
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
+  </sect2>
+
+</sect1>
+
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
+++ x/installing/x7driver.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY x7drivers-download-http "http://xorg.freedesktop.org/releases/individual/driver/">
+  <!ENTITY x7drivers-download-ftp  "">
+  <!ENTITY x7drivers-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
+  <!ENTITY x7drivers-size          "17.3 MB">
+  <!ENTITY x7drivers-buildsize     "53.8 MB">
+  <!ENTITY x7drivers-time          "4.6 SBU">
+
+]>
+
+<sect1 id="xorg7-driver" xreflabel="Xorg Drivers">
+  <?dbhtml filename="x7driver.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: dj $</othername>
+    <date>$Date: 2006-04-15 23:04:51 -0500 (Sat, 15 Apr 2006) $</date>
+<!--    <keywordset>
+      <keyword role="package">X11R&xorg7-version;-src.tar</keyword>
+      <keyword role="ftpdir">Xorg7</keyword>
+    </keywordset>
+########## Need a way to fix this on the mirrors ##########
+##### Maybe a single tarball is the way to handle it ######
+-->
+
+
+  </sect1info>
+
+  <title>Xorg Drivers</title>
+
+  <indexterm zone="xorg7-driver">
+    <primary sortas="a-xorg7-driver">Xorg Drivers</primary>
+  </indexterm>
+
+  <para>The <application>Xorg</application> drivers provide the means
+  for the xserver to take advantage of installed hardware.</para>
+
+  <bridgehead renderas="sect3">Package Information</bridgehead>
+  <itemizedlist spacing="compact">
+    <listitem>
+      <para>Download (HTTP): <ulink url="&x7drivers-download-http;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download (FTP): <ulink url="&x7drivers-download-ftp;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download MD5 sum: <ulink url="&x7drivers-md5sum;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download size: &x7drivers-size;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated disk space required: &x7drivers-buildsize;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated build time: &x7drivers-time;</para>
+    </listitem>
+  </itemizedlist>
+
+  <bridgehead renderas="sect3">Xorg Drivers Dependencies</bridgehead>
+
+  <bridgehead renderas="sect4">Required</bridgehead>
+  <para role="required"><xref linkend="xorg7-server"/></para>
+
+  <bridgehead renderas="sect4">Optional</bridgehead>
+  <para><xref linkend="mesalib"/></para>
+
+  <sect2>
+    <title>Downloading Xorg Drivers</title>
+
+    <para>To download the needed files using <application>wget</application>,
+    use the following commands:</para>
+
+<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/driver.wget &amp;&amp;
+mkdir driver &amp;&amp;
+cd driver &amp;&amp;
+wget -B http://xorg.freedesktop.org/releases/individual/driver/ -i ../driver.wget</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Xorg Drivers</title>
+
+    <warning><para>It is very important not to build display drivers that
+    cannot be used with your hardware.  For instance, do not build Sun drivers
+    for an x86 PC as the Sun drivers will expect to see SPARC symbols
+    exported from the kernel.  Failure to follow this warning will result
+    in a display lockup, which requires a hard reboot, when configuring
+    <application>Xorg</application> for the first time.</para></warning>
+
+    <para>Install the drivers by running the following commands for each
+    package:</para>
+
+<screen><userinput>./configure $XORG_CONFIG \
+    --with-xorg-module-dir=$XORG_PREFIX/lib/X11/modules &amp;&amp;
+make</userinput></screen>
+
+    <para>Now as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--with-xorg-module-dir=...</parameter>: This switch
+    ensures that the drivers are installed into the correct directory.</para>
+
+  </sect2>
+
+</sect1>
Index: x/installing/x7font.xml
===================================================================
--- x/installing/x7font.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
+++ x/installing/x7font.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY x7fonts-download-http "http://xorg.freedesktop.org/releases/individual/font/">
+  <!ENTITY x7fonts-download-ftp  "">
+  <!ENTITY x7fonts-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
+  <!ENTITY x7fonts-size          "13.5 MB">
+  <!ENTITY x7fonts-buildsize     "90.4 MB">
+  <!ENTITY x7fonts-time          "1.82 SBU">
+]>
+
+<sect1 id="xorg7-font" xreflabel="Xorg Fonts">
+  <?dbhtml filename="x7font.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: dj $</othername>
+    <date>$Date: 2006-04-15 23:04:51 -0500 (Sat, 15 Apr 2006) $</date>
+<!--    <keywordset>
+      <keyword role="package">X11R&xorg7-version;-src.tar</keyword>
+      <keyword role="ftpdir">Xorg7</keyword>
+    </keywordset>
+########## Need a way to fix this on the mirrors ##########
+##### Maybe a single tarball is the way to handle it ######
+-->
+
+
+  </sect1info>
+
+  <title>Xorg Fonts</title>
+
+  <indexterm zone="xorg7-font">
+    <primary sortas="a-xorg7-font">Xorg Fonts</primary>
+  </indexterm>
+
+  <para>The <application>Xorg</application> font packages provide
+  needed fonts to the <application>Xorg</application> applications.</para>
+
+  <bridgehead renderas="sect3">Package Information</bridgehead>
+  <itemizedlist spacing="compact">
+    <listitem>
+      <para>Download (HTTP): <ulink url="&x7fonts-download-http;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download (FTP): <ulink url="&x7fonts-download-ftp;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download MD5 sum: <ulink url="&x7fonts-md5sum;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download size: &x7fonts-size;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated disk space required: &x7fonts-buildsize;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated build time: &x7fonts-time;</para>
+    </listitem>
+  </itemizedlist>
+
+  <bridgehead renderas="sect4">Required</bridgehead>
+  <para role="required"><xref linkend="xorg7-data"/></para>
+
+  <sect2>
+    <title>Downloading Xorg Fonts</title>
+
+    <para>To download the needed files using <application>wget</application>,
+    use the following commands:</para>
+
+<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/font.wget &amp;&amp;
+mkdir font &amp;&amp;
+cd font &amp;&amp;
+wget -B http://xorg.freedesktop.org/releases/individual/font/ -i ../font.wget</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Xorg Fonts</title>
+
+    <para>Run the following commands for each package:</para>
+
+    <note>
+      <para>You should install encodings first, and then font-util before all
+      other font packages.</para>
+    </note>
+
+<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
+make</userinput></screen>
+
+    <para>Now as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
+    <para>When all of the fonts have been installed, the system must be
+    configured so that <application>Fontconfig</application> can find the
+    TrueType fonts since they are outside of the default search path of
+    <filename class="directory">/usr/share/fonts</filename>.  Make symlinks
+    to the <application>Xorg</application> TrueType font directories by
+    running the following commands as the
+    <systemitem class="username">root</systemitem> user:</para>
+
+<screen><userinput role="root">install -d -m755 /usr/share/fonts &amp;&amp;
+ln -svn $XORG_PREFIX/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF &amp;&amp;
+ln -svn $XORG_PREFIX/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF</userinput></screen>
+
+  </sect2>
+
+</sect1>
+
Index: x/installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
+++ x/installing/x7lib.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY x7libs-download-http "http://xorg.freedesktop.org/releases/individual/lib/">
+  <!ENTITY x7libs-download-ftp  "">
+  <!ENTITY x7libs-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
+  <!ENTITY x7libs-size          "12 MB">
+  <!ENTITY x7libs-buildsize     "186 MB">
+  <!ENTITY x7libs-time          "5.8 SBU">
+
+]>
+
+<sect1 id="xorg7-lib" xreflabel="Xorg Libraries">
+  <?dbhtml filename="x7lib.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: dj $</othername>
+    <date>$Date: 2006-04-15 23:04:51 -0500 (Sat, 15 Apr 2006) $</date>
+<!--    <keywordset>
+      <keyword role="package">X11R&xorg7-version;-src.tar</keyword>
+      <keyword role="ftpdir">Xorg7</keyword>
+    </keywordset>
+########## Need a way to fix this on the mirrors ##########
+##### Maybe a single tarball is the way to handle it ######
+-->
+
+  </sect1info>
+
+  <title>Xorg Libraries</title>
+
+  <indexterm zone="xorg7-lib">
+    <primary sortas="a-xorg7-lib">Xorg Libraries</primary>
+  </indexterm>
+
+  <para>The <application>Xorg</application> libraries provide library
+  routines that are used within all X Window applications.</para>
+
+  <bridgehead renderas="sect3">Package Information</bridgehead>
+  <itemizedlist spacing="compact">
+    <listitem>
+      <para>Download (HTTP): <ulink url="&x7libs-download-http;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download (FTP): <ulink url="&x7libs-download-ftp;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download MD5 sum: <ulink url="&x7libs-md5sum;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download size: &x7libs-size;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated disk space required: &x7libs-buildsize;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated build time: &x7libs-time;</para>
+    </listitem>
+  </itemizedlist>
+
+  <bridgehead renderas="sect3">Xorg Libraries Dependencies</bridgehead>
+
+  <bridgehead renderas="sect4">Required</bridgehead>
+  <para role="required"><xref linkend="ed"/>,
+  <xref linkend="fontconfig"/>,
+  <xref linkend="libpng"/>,
+  <xref linkend="pkgconfig"/>, and
+  <xref linkend="xorg7-proto"/></para>
+
+  <bridgehead renderas="sect4">Optional</bridgehead>
+  <para role="optional"><xref linkend="linux-pam"/></para>
+
+  <sect2>
+    <title>Downloading Xorg Libraries</title>
+
+    <para>To download the needed files using <application>wget</application>,
+    use the following commands:</para>
+
+<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/lib.wget &amp;&amp;
+mkdir lib &amp;&amp;
+cd lib &amp;&amp;
+wget -B http://xorg.freedesktop.org/releases/individual/lib/ -i ../lib.wget</userinput></screen>
+
+  </sect2>
+
+  <sect2>
+    <title>Meeting Library Dependencies</title>
+
+    <para>These 17 libraries must be built first, in the order provided,
+    to cover the dependencies of the other library packages:</para>
+
+<screen>xtrans-1.0.0
+libXau-1.0.0
+libXdmcp-1.0.0
+libX11-1.0.0
+libXext-1.0.0
+libICE-1.0.0
+libSM-1.0.0
+libXt-1.0.0
+libXmu-1.0.0
+libXpm-3.5.4.2
+libXp-1.0.0
+libXfixes-3.0.1.2
+libXrender-0.9.0.2
+libfontenc-1.0.1
+libxkbfile-1.0.2
+libXprintUtil-1.0.1
+libXv-1.0.1</screen>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Xorg Libraries</title>
+
+    <para>Install the libraries by running the following commands for each
+    of the chosen packages:</para>
+
+<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
+make</userinput></screen>
+
+    <para>Now as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput role="root">make install &amp;&amp;
+ldconfig</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuration of Xorg Libraries</title>
+
+    <para>If you've chosen to install <application>Xorg</application> into
+    <filename class="directory">/usr</filename>, then no further
+    configuration is necessary and you can skip the rest of this section.
+    If you've opted for an alternate prefix, you should create two symlinks
+    to satisfy the expected environment of several packages.
+    Execute the following commands as the root user:</para>
+
+<screen role="root"><userinput>ln -sv $XORG_PREFIX/lib/X11 /usr/lib/X11 &amp;&amp;
+ln -sv $XORG_PREFIX/include/X11 /usr/include/X11</userinput></screen>
+
+  </sect2>
+
+</sect1>
+
Index: x/installing/x7proto.xml
===================================================================
--- x/installing/x7proto.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
+++ x/installing/x7proto.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY x7proto-download-http "http://xorg.freedesktop.org/releases/individual/proto/">
+  <!ENTITY x7proto-download-ftp  "">
+  <!ENTITY x7proto-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
+  <!ENTITY x7proto-size          "1.5 MB">
+<!-- Editors note:  Because we recommend a scripted build that removes 
+     the source directories after installation, the xorg buildsizes are 
+     determined by the sum of all package source tarballs, the size of 
+     installed files, and the size of the largest package's build 
+     directory after running make install. -->
+  <!ENTITY x7proto-buildsize     "3.5 MB">
+  <!ENTITY x7proto-time          "0.2 SBU">
+
+]>
+
+<sect1 id="xorg7-proto" xreflabel="Xorg Protocol Headers">
+  <?dbhtml filename="x7proto.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: dj $</othername>
+    <date>$Date: 2006-04-15 23:04:51 -0500 (Sat, 15 Apr 2006) $</date>
+<!--    <keywordset>
+      <keyword role="package">X11R&xorg7-version;-src.tar</keyword>
+      <keyword role="ftpdir">Xorg7</keyword>
+    </keywordset>
+########## Need a way to fix this on the mirrors ##########
+##### Maybe a single tarball is the way to handle it ######
+-->
+
+  </sect1info>
+
+  <title>Xorg Protocol Headers</title>
+
+  <indexterm zone="xorg7-proto">
+    <primary sortas="a-xorg7-proto">Xorg Protocol Headers</primary>
+  </indexterm>
+
+  <para>The <application>Xorg</application> protocol headers provide the
+  header files required to build the system, and to allow other
+  applications to build against the installed X Window system.</para>
+
+  <bridgehead renderas="sect3">Package Information</bridgehead>
+  <itemizedlist spacing="compact">
+    <listitem>
+      <para>Download (HTTP): <ulink url="&x7proto-download-http;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download (FTP): <ulink url="&x7proto-download-ftp;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download MD5 sum: <ulink url="&x7proto-md5sum;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download size: &x7proto-size;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated disk space required: &x7proto-buildsize;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated build time: &x7proto-time;</para>
+    </listitem>
+  </itemizedlist>
+
+  <sect2>
+    <title>Downloading Xorg Protocol Headers</title>
+
+    <para>To download the needed files using <application>wget</application>,
+    use the following commands:</para>
+
+<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/proto.wget &amp;&amp;
+mkdir proto &amp;&amp;
+cd proto &amp;&amp;
+wget -B http://xorg.freedesktop.org/releases/individual/proto/ -i ../proto.wget</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Xorg Protocol Headers</title>
+
+    <para>Install the <application>Xorg</application> protocol headers
+    by running the following commands for each package to be installed.</para>
+
+<screen><userinput>./configure $XORG_CONFIG</userinput></screen>
+
+    <para>Now as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
+  </sect2>
+
+</sect1>
+
Index: x/installing/x7server.xml
===================================================================
--- x/installing/x7server.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
+++ x/installing/x7server.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY xorg-server-download-http "http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-&xorg-server-version;.tar.bz2">
+  <!ENTITY xorg-server-download-ftp  "">
+  <!ENTITY xorg-server-md5sum        "5cd3316f07ed32a05cbd69e73a71bc74">
+  <!ENTITY xorg-server-size          "5.8 MB">
+  <!ENTITY xorg-server-buildsize     "413 MB">
+  <!ENTITY xorg-server-time          "5.96 SBU">
+
+]>
+
+<sect1 id="xorg7-server" xreflabel="Xorg-Server-&xorg-server-version;">
+  <?dbhtml filename="x7server.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: dj $</othername>
+    <date>$Date: 2006-04-15 23:04:51 -0500 (Sat, 15 Apr 2006) $</date>
+<!--    <keywordset>
+      <keyword role="package">X11R&xorg7-version;-src.tar</keyword>
+      <keyword role="ftpdir">Xorg7</keyword>
+    </keywordset>
+########## Need a way to fix this on the mirrors ##########
+##### Maybe a single tarball is the way to handle it ######
+-->
+
+
+  </sect1info>
+
+  <title>Xorg-Server-&xorg-server-version;</title>
+
+  <indexterm zone="xorg7-server">
+    <primary sortas="a-xorg7-server">Xorg Server</primary>
+  </indexterm>
+
+  <para>The <application>Xorg</application> Server is the core
+  of the X Window system.</para>
+
+  <bridgehead renderas="sect3">Package Information</bridgehead>
+  <itemizedlist spacing="compact">
+    <listitem>
+      <para>Download (HTTP): <ulink url="&xorg-server-download-http;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download (FTP): <ulink url="&xorg-server-download-ftp;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download MD5 sum: &xorg-server-md5sum;</para>
+    </listitem>
+    <listitem>
+      <para>Download size: &xorg-server-size;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated disk space required: &xorg-server-buildsize;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated build time: &xorg-server-time;</para>
+    </listitem>
+  </itemizedlist>
+
+  <bridgehead renderas="sect3">Xorg Server Dependencies</bridgehead>
+
+  <bridgehead renderas="sect4">Required</bridgehead>
+  <para role="required"><xref linkend="xorg7-font"/></para>
+
+  <bridgehead renderas="sect4">Optional</bridgehead>
+  <para><xref linkend="mesalib"/> and
+  <xref linkend="luit"/></para>
+
+  <sect2 role="installation">
+    <title>Installation of Xorg Server</title>
+
+    <note>
+      <para>If you intend to build with <application>Mesa</application>,
+      you must have the <application>Mesa</application> source
+      directory available when building the
+      <application>Xorg-server</application>.</para>
+    </note>
+
+    <para>A serious security vulnerability was recently discovered that will
+    allow a malicious user to execute code as the root user.  Fix the
+    vulnerability with the following command:</para>
+
+<screen><userinput>sed -i 's/ntri &amp; sizeof/ntri * sizeof/' render/mitri.c</userinput></screen>
+
+    <para>Install the server by running the following commands:</para>
+
+<screen><userinput>./configure $XORG_CONFIG \
+    --with-mesa-source='<replaceable>&lt;/path/to&gt;</replaceable>/Mesa-&mesalib-version;' \
+    --with-fontdir=$XORG_PREFIX/lib/X11/fonts \
+    --with-module-dir=$XORG_PREFIX/lib/X11/modules \
+    --enable-install-setuid &amp;&amp;
+make</userinput></screen>
+
+    <para>Now as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>--with-mesa-source=...</parameter>: This switch directs
+    the build system to the location of the <application>Mesa</application>
+    source directory.  If you wish to build without 
+    <application>Mesa</application>, omit this switch.</para>
+
+    <para><parameter>--enable-install-setuid</parameter>: The Xorg binary must
+    run as the root user.  This switch ensures that the binary is installed 
+    setuid when the build is done by an un-privelaged user.</para>
+
+  </sect2>
+
+</sect1>
+
Index: x/installing/x7util.xml
===================================================================
--- x/installing/x7util.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
+++ x/installing/x7util.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY x7utils-download-http "http://xorg.freedesktop.org/releases/individual/util/">
+  <!ENTITY x7utils-download-ftp  "">
+  <!ENTITY x7utils-md5sum        "http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/files/md5sums">
+  <!ENTITY x7utils-size          "656 KB">
+  <!ENTITY x7utils-buildsize     "6.8 MB">
+  <!ENTITY x7utils-time          "0.1 SBU">
+
+]>
+
+<sect1 id="xorg7-util" xreflabel="Xorg Utilitites">
+  <?dbhtml filename="x7util.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: dj $</othername>
+    <date>$Date: 2006-04-15 23:04:51 -0500 (Sat, 15 Apr 2006) $</date>
+<!--    <keywordset>
+      <keyword role="package">X11R&xorg7-version;-src.tar</keyword>
+      <keyword role="ftpdir">Xorg7</keyword>
+    </keywordset>
+########## Need a way to fix this on the mirrors ##########
+##### Maybe a single tarball is the way to handle it ######
+-->
+
+
+  </sect1info>
+
+  <title>Xorg Utilities</title>
+
+  <indexterm zone="xorg7-util">
+    <primary sortas="a-xorg7-util">Xorg Utilities</primary>
+  </indexterm>
+
+  <para>The <application>Xorg</application> utility packages provide
+  needed utilities, not for the <application>Xorg</application>
+  installation itself, but for other applications that make use of
+  legacy X11R6 installation methods.</para>
+
+  <bridgehead renderas="sect3">Package Information</bridgehead>
+  <itemizedlist spacing="compact">
+    <listitem>
+      <para>Download (HTTP): <ulink url="&x7utils-download-http;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download (FTP): <ulink url="&x7utils-download-ftp;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download MD5 sum: <ulink url="&x7utils-md5sum;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download size: &x7utils-size;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated disk space required: &x7utils-buildsize;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated build time: &x7utils-time;</para>
+    </listitem>
+  </itemizedlist>
+
+  <bridgehead renderas="sect3">Xorg Utilities Dependencies</bridgehead>
+
+  <bridgehead renderas="sect4">Required</bridgehead>
+  <para role="required"><xref linkend="pkgconfig"/></para>
+
+  <sect2>
+    <title>Downloading Xorg Utilities</title>
+
+    <para>To download the needed files using <application>wget</application>,
+    use the following commands:</para>
+
+<screen><userinput>wget http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/util.wget &amp;&amp;
+mkdir util &amp;&amp;
+cd util &amp;&amp;
+wget -B http://xorg.freedesktop.org/releases/individual/util/ -i ../util.wget</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Xorg Utilities</title>
+
+    <para>First install the <application>xorg-cf-files</application> package
+    with the following commands:</para>
+
+<screen><userinput>sed -i "s@/usr/X11R6@$XORG_PREFIX@" site.def &amp;&amp;
+sed -i "s@/usr/X11R6@$XORG_PREFIX@" X11.tmpl &amp;&amp;
+./configure $XORG_CONFIG --with-config-dir=$XORG_PREFIX/lib/X11/config</userinput></screen>
+
+    <para>Now as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
+    <para>Next, install the <application>Imake</application> package with
+    these commands:</para>
+
+<screen><userinput>./configure $XORG_CONFIG --with-config-dir=$XORG_PREFIX/lib/X11/config &amp;&amp;
+make</userinput></screen>
+
+    <para>Now as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
+    <para>Finally, build the three remaining packages with the standard build
+    commands:</para>
+
+<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
+make</userinput></screen>
+
+    <para>Now as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
+  </sect2>
+
+</sect1>
+
Index: x/installing/xbitmaps.xml
===================================================================
--- x/installing/xbitmaps.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
+++ x/installing/xbitmaps.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY xbitmaps-download-http "http://xorg.freedesktop.org/releases/individual/data/xbitmaps-&xbitmaps-version;.tar.bz2">
+  <!ENTITY xbitmaps-download-ftp  "">
+  <!ENTITY xbitmaps-md5sum        "b28a9840cde3c38d7c09716372fea257">
+  <!ENTITY xbitmaps-size          "56 KB">
+  <!ENTITY xbitmaps-buildsize     "1.2 MB">
+  <!ENTITY xbitmaps-time          "0.01 SBU">
+
+]>
+
+<sect1 id="xbitmaps" xreflabel="xbitmpas-&xbitmaps-version;">
+  <?dbhtml filename="xbitmaps.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: dj $</othername>
+    <date>$Date: 2006-04-15 23:04:51 -0500 (Sat, 15 Apr 2006) $</date>
+<!--    <keywordset>
+      <keyword role="package">X11R&xorg7-version;-src.tar</keyword>
+      <keyword role="ftpdir">Xorg7</keyword>
+    </keywordset>
+########## Need a way to fix this on the mirrors ##########
+##### Maybe a single tarball is the way to handle it ######
+-->
+
+
+  </sect1info>
+
+  <title>Xbitmaps-&xbitmaps-version;</title>
+
+  <indexterm zone="xbitmaps">
+    <primary sortas="a-xbitmaps">Luit</primary>
+  </indexterm>
+
+  <para>Xbitmaps provides static graphics needed by xorg applications to 
+  draw screen elements.</para>
+
+  <bridgehead renderas="sect3">Package Information</bridgehead>
+  <itemizedlist spacing="compact">
+    <listitem>
+      <para>Download (HTTP): <ulink url="&xbitmaps-download-http;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download (FTP): <ulink url="&xbitmaps-download-ftp;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download MD5 sum: &xbitmaps-md5sum;</para>
+    </listitem>
+    <listitem>
+      <para>Download size: &xbitmaps-size;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated disk space required: &xbitmaps-buildsize;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated build time: &xbitmaps-time;</para>
+    </listitem>
+  </itemizedlist>
+
+  <bridgehead renderas="sect3">Xbitmaps Dependencies</bridgehead>
+
+  <bridgehead renderas="sect4">Required</bridgehead>
+  <para><xref linkend="xorg7-util"/></para>
+
+  <sect2 role="installation">
+    <title>Installation of Xbitmaps</title>
+
+    <para>First, configure the xbitmaps package by running the following
+    command:</para>
+
+<screen><userinput>./configure $XORG_CONFIG</userinput></screen>
+
+    <para>Now install as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen><userinput role="root">make install</userinput></screen>
+
+  </sect2>
+
+</sect1>
+
+
Index: x/installing/xconfig-dummy.xml
===================================================================
--- x/installing/xconfig-dummy.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
+++ x/installing/xconfig-dummy.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<sect1 role="dummy">
+
+  <sect1info>
+    <othername>$LastChangedBy: manuel $</othername>
+    <date>$Date: 2005-11-29 13:07:13 -0600 (Tue, 29 Nov 2005) $</date>
+  </sect1info>
+
+  <title>Configuring X Window System</title>
+  <para/>
+</sect1>
+
Index: x/installing/xfree86.xml
===================================================================
--- x/installing/xfree86.xml	(revision 0aeb69629fcd6150828e6deabf8b9c04662f7fd6)
+++ x/installing/xfree86.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -445,4 +445,8 @@
 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>
 
@@ -492,145 +496,4 @@
   </sect2>
 
-  <sect2 role="configuration" id="xfree86-config">
-    <title>Configuring XFree86</title>
-
-    <para>As the <systemitem class="username">root</systemitem> user: Edit
-    <filename>/etc/ld.so.conf</filename> and add
-    <filename class="directory">/usr/X11R6/lib</filename>, then run:</para>
-
-<screen role="root"><userinput>ldconfig</userinput></screen>
-
-    <indexterm zone="xfree86 xfree86-config">
-      <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para>Ensure <filename class="directory">/usr/X11R6/bin</filename>
-    and <filename class="directory">/usr/X11R6/lib/pkgconfig</filename>
-    are added to your <envar>PATH</envar> and <envar>PKG_CONFIG_PATH</envar>
-    environment variables, respectively. Instructions for doing this are
-    described in the section <xref linkend='postlfs-config-profile'/>.</para>
-
-    <indexterm zone="xfree86 xfree86-config">
-      <primary sortas="e-etc-X11-XF86Config">/etc/X11/XF86Config</primary>
-    </indexterm>
-
-    <para>Create the <filename>XF86Config</filename> file with:</para>
-
-<screen><userinput>cd ~ &amp;&amp;
-XFree86 -configure</userinput></screen>
-
-    <para>The screen will go black and you may hear some clicking of the monitor.
-    This command will create a file, <filename>XF86Config.new</filename> in your
-    home directory.</para>
-
-    <para>Edit <filename>XF86Config.new</filename> to suit your system.
-    The details of the file are located in the man page <command>man
-    XF86Config</command>. Some things you may want to do are:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>Section "Files". Change the order of the font paths searched.
-        You may want to put 100dpi fonts ahead of 75dpi fonts if your system
-        normally comes up closer to 100 dots per inch.  You may want to remove
-        some font directories completely.</para>
-      </listitem>
-      <listitem>
-        <para>Section "Module". If you are going to install NVidia
-        drivers, remove the "dri" line.</para>
-      </listitem>
-      <listitem>
-        <para>Sections "InputDevice". You may want to change the
-        keyboard autorepeat rate by adding
-        <option>Option "Autorepeat" "250 30"</option>.</para>
-      </listitem>
-      <listitem>
-        <para>Section "Monitor". Specify the <option>VertRefresh</option>
-        and <option>HorizSync</option> values if the system does not
-        automatically detect the monitor and its values.</para>
-      </listitem>
-      <listitem>
-        <para>Section "Device". You may want to set some of the options
-        available for your selected video driver.  A description of the
-        driver parameters is in the man page for your driver.</para>
-      </listitem>
-      <listitem>
-        <para>Section "Screen". Add a DefaultDepth statement such as:
-        <option>DefaultDepth 24</option>. In the SubSection for your
-        default depth, add a modes line such as:
-        <option>Modes "1600x1200" "1280x1024" "1024x768"</option>. The
-        first mode listed will normally be the starting resolution.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>Test the system with:</para>
-
-<screen><userinput>XFree86 -xf86config ~/XF86Config.new</userinput></screen>
-
-    <para>You will only get a gray background with an X-shaped mouse cursor,
-    but it confirms the system is working. Exit with
-    <keycap>Control+Alt+Backspace</keycap>. If the system does not work,
-    examine <filename>/var/log/XFree86.0.log</filename> to see what went
-    wrong.</para>
-
-    <para>As the <systemitem class="username">root</systemitem> user:
-    move the configuration file to its final location:</para>
-
-<screen role="root"><userinput>mv ~/XF86Config.new /etc/X11/XF86Config</userinput></screen>
-
-    <para>Create <filename>.xinitrc</filename>:</para>
-
-<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal># Begin .xinitrc file
-xterm  -g 80x40+0+0   &amp;
-xclock -g 100x100-0+0 &amp;
-twm</literal>
-EOF</userinput></screen>
-
-    <para>This provides an initial screen with an xterm and a clock that is
-    managed by a simple window manager, Tab Window Manager. For details of
-    <command>twm</command>, see the man page.</para>
-
-    <indexterm zone="xfree86 xfree86-config">
-      <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
-    </indexterm>
-
-    <note>
-      <para>When needed, <application>XFree86</application> creates the
-      directory <filename>/tmp/.ICE-unix</filename> if it does not exist.
-      If this directory is not owned by <systemitem
-      class="username">root</systemitem>, <application>XFree86</application>
-      delays startup by a few seconds and also appends a warning to the
-      logfile. This also affects startup of other applications. To improve
-      performance, it is advisable to manually create the directory before
-      <application>XFree86</application> uses it. Add the file creation to
-      <filename>/etc/sysconfig/createfiles</filename> that is sourced by
-      the <filename>/etc/rc.d/init.d/cleanfs</filename> startup script.</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/sysconfig/createfiles &lt;&lt; "EOF"
-<literal>/tmp/.ICE-unix dir 1777 root root</literal>
-EOF</userinput></screen>
-
-    </note>
-
-    <indexterm zone="xfree86 xfree86-config">
-      <primary
-      sortas="e-etc-sysconfig-createfiles">/etc/sysconfig/createfiles</primary>
-    </indexterm>
-
-    <para>Start <application>X</application> with:</para>
-
-<screen><userinput>startx</userinput></screen>
-
-    <para>to get a basic functional <application>X Window
-    System</application>.</para>
-
-    <para>At this point, you should check out <xref linkend='x-setup'/>
-    for the necessary configuration to make <application>X</application>
-    fully functional. Additionally, you can have a look at <xref
-    linkend='x-config'/> for information on fine tuning your
-    <application>X</application> configuration.</para>
-
-  </sect2>
-
   <sect2 id="xfree86-contents" role="content"
   xreflabel="XFree86 Contents and Descriptions">
Index: x/installing/xmono-dummy.xml
===================================================================
--- x/installing/xmono-dummy.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
+++ x/installing/xmono-dummy.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+<sect1 role="dummy">
+
+  <sect1info>
+    <othername>$LastChangedBy: manuel $</othername>
+    <date>$Date: 2005-11-29 13:07:13 -0600 (Tue, 29 Nov 2005) $</date>
+  </sect1info>
+
+  <title>Traditional X Window System</title>
+  <para/>
+</sect1>
+
Index: x/installing/xorg.xml
===================================================================
--- x/installing/xorg.xml	(revision 0aeb69629fcd6150828e6deabf8b9c04662f7fd6)
+++ x/installing/xorg.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -419,4 +419,8 @@
 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>
 
@@ -463,146 +467,8 @@
     by users only.</quote></para>
 
+    <para>For a list of the package contents, see the sections in the 
+    <xref linkend='xfree86-contents'/>.</para>
+
   </sect2>
 
-  <sect2 role="configuration" id='xorg-config'>
-    <title>Configuring Xorg</title>
-
-    <para>Edit <filename>/etc/ld.so.conf</filename> and add
-    <filename class="directory">/usr/X11R6/lib</filename>. Run:</para>
-
-    <indexterm zone="xorg xorg-config">
-      <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-<screen role="root"><userinput>ldconfig</userinput></screen>
-
-    <para>Ensure <filename class="directory">/usr/X11R6/bin</filename>
-    and <filename class="directory">/usr/X11R6/lib/pkgconfig</filename>
-    are added to your <envar>PATH</envar> and <envar>PKG_CONFIG_PATH</envar>
-    environment variables, respectively. Instructions for doing this are
-    described in the section <xref linkend='postlfs-config-profile'/>.</para>
-
-    <para>Create the <filename>xorg.conf</filename> file with:</para>
-
-<screen><userinput>cd ~ &amp;&amp;
-Xorg -configure</userinput></screen>
-
-    <para>The screen will go black and you may hear some clicking of the monitor.
-    This command will create a file, <filename>xorg.conf.new</filename> in your
-    home directory.</para>
-
-    <indexterm zone="xorg xorg-config">
-      <primary sortas="e-etc-X11-xorg-conf">/etc/X11/xorg.conf</primary>
-    </indexterm>
-
-    <para>Edit <filename>xorg.conf.new</filename> to suit your system. The
-    details of the file are located in the xorg.conf man page. Some things
-    you may want to do are:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>Section "Files". Change the order of the font paths searched.
-        You may want to put 100dpi fonts ahead of 75dpi fonts if your system
-        normally comes up closer to 100 dots per inch. You may want to remove
-        some font directories completely.</para>
-      </listitem>
-      <listitem>
-        <para>Section "Module". If you are going to install NVidia
-        drivers, remove the "dri" line.</para>
-      </listitem>
-      <listitem>
-        <para>Sections "InputDevice". You may want to change the
-        keyboard autorepeat rate by adding
-        <option>Option "Autorepeat" "250 30"</option>.</para>
-      </listitem>
-      <listitem>
-        <para>Section "Monitor". Specify the <option>VertRefresh</option>
-        and <option>HorizSync</option> values if the system does not
-        automatically detect the monitor and its values.</para>
-      </listitem>
-      <listitem>
-        <para>Section "Device". You may want to set some of the options
-        available for your selected video driver. A description of the driver
-        parameters is in the man page for your driver.</para>
-      </listitem>
-      <listitem><para>Section "Screen". Add a DefaultDepth statement such as:
-        <option>DefaultDepth 24</option>. In the SubSection for your
-        default depth, add a modes line such as:
-        <option>Modes "1600x1200" "1280x1024" "1024x768"</option>. The first
-        mode listed will normally be the starting resolution.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>Test the system with:</para>
-
-<screen><userinput>X -config ~/xorg.conf.new</userinput></screen>
-
-    <para>You will only get a gray background with an X-shaped mouse cursor,
-    but it confirms the system is working. Exit with
-    <keycap>Control+Alt+Backspace</keycap>. If the system does not work, take
-    a look at <filename>/var/log/Xorg.0.log</filename> to see what went
-    wrong.</para>
-
-    <para>Move the configuration file to its final location:</para>
-
-<screen role="root"><userinput>mv ~/xorg.conf.new /etc/X11/xorg.conf</userinput></screen>
-
-    <para>Create <filename>.xinitrc</filename>:</para>
-
-<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal># Begin .xinitrc file
-xterm  -g 80x40+0+0   &amp;
-xclock -g 100x100-0+0 &amp;
-twm</literal>
-EOF</userinput></screen>
-
-    <para>This provides an initial screen with an xterm and a clock that is
-    managed by a simple window manager, Tab Window Manager. For details of
-    <command>twm</command>, see the man page.</para>
-
-    <indexterm zone="xorg xorg-config">
-      <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
-    </indexterm>
-
-    <note>
-      <para>When needed, <application>Xorg</application> creates the directory
-      <filename>/tmp/.ICE-unix</filename> if it does not exist. If this
-      directory is not owned by <systemitem class="username">root</systemitem>,
-      <application>Xorg</application> delays startup by a few seconds and also
-      appends a warning to the logfile. This also affects startup of other
-      applications. To improve performance, it is advisable to manually create
-      the directory before <application>Xorg</application> uses it. Add the
-      file creation to <filename>/etc/sysconfig/createfiles</filename> that is
-      sourced by the <filename>/etc/rc.d/init.d/cleanfs</filename> startup
-      script.</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/sysconfig/createfiles &lt;&lt; "EOF"
-<literal>/tmp/.ICE-unix dir 1777 root root</literal>
-EOF</userinput></screen>
-
-    </note>
-
-    <indexterm zone="xorg xorg-config">
-      <primary
-      sortas="e-etc-sysconfig-createfiles">/etc/sysconfig/createfiles</primary>
-    </indexterm>
-
-    <para>Start <application>X</application> with:</para>
-
-<screen><userinput>startx</userinput></screen>
-
-    <para>to get a basic functional <application>X Window
-    System</application>.</para>
-
-    <para>At this point, you should check out <xref linkend='x-setup'/> for
-    the necessary configuration to make <application>X</application> fully
-    functional. Additionally, you can have a look at <xref linkend='x-config'/>
-    for information on fine tuning your <application>X</application>
-    configuration.</para>
-
-    <para>For a list of the package contents and a description of the commands,
-    see the sections in the <xref linkend='xfree86-contents'/>.</para>
-
-  </sect2>
-
 </sect1>
Index: x/installing/xorg7-dummy.xml
===================================================================
--- x/installing/xorg7-dummy.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
+++ x/installing/xorg7-dummy.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+   "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<sect1 role="dummy">
+
+  <sect1info>
+    <othername>$LastChangedBy: manuel $</othername>
+    <date>$Date: 2005-11-29 13:07:13 -0600 (Tue, 29 Nov 2005) $</date>
+  </sect1info>
+
+  <title>Modular X Window System</title>
+  <para/>
+</sect1>
Index: x/installing/xorg7.xml
===================================================================
--- x/installing/xorg7.xml	(revision 0aeb69629fcd6150828e6deabf8b9c04662f7fd6)
+++ x/installing/xorg7.xml	(revision afb1341ce1916b20458bde3da0e2e0dddf1ca977)
@@ -4,16 +4,4 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
 ]>
 
@@ -32,8 +20,7 @@
 -->
 
-
   </sect1info>
 
-  <title>Xorg-&xorg7-version;</title>
+  <title>Introduction to Xorg-&xorg7-version;</title>
 
   <indexterm zone="xorg7">
@@ -41,97 +28,82 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title>Introduction to Xorg</title>
 
-    <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>
+  <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">Xorg Dependencies</bridgehead>
+  <para condition="html" role="usernotes">User Notes:
+  <ulink url='&blfs-wiki;/Xorg-&xorg7-version;'/></para>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="fontconfig"/>,
-    <xref linkend="libpng"/>, and
-    <xref linkend="pkgconfig"/></para>
+  <bridgehead renderas="sect3">Xorg Download and Installation
+  Instructions</bridgehead>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="linux-pam"/></para>
+  <para>Xorg-7.0.0 introduced a completly auto-tooled, modular build system.
+  The code is otherwise identical to that in the Xorg-6.9.0 release.
+  With the new modular build system, it is no longer possible to download
+  the entire package in a single file.  In fact, there may be as many as
+  280 files that need to be fetched from the download location.  To assist
+  with such a large task, installing <xref linkend="wget"/> is strongly 
+  recommended for downloading the needed files.  A complete
+  <application>wget</application> file list is provided for each section 
+  that includes multiple packages.</para>
 
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url='&blfs-wiki;/Xorg-&xorg7-version;'/></para>
+  <para>Given the number of packages available, deciding which packages you
+  need to install for your particular setup may seem a bit overwhelming at
+  first.  Take a look at 
+  <ulink url="http://lists.x.org/archives/xorg-modular/2005-November/000801.html">this thread</ulink> 
+  to get an idea of what you will need.  If you are
+  unsure, you should install all packages at the cost of extra
+  disk space.</para>
 
-    <bridgehead renderas="sect3">Xorg Download and Installation
-    Instructions</bridgehead>
+  <note>
+    <para>Even if you intend to download only the necessary packages, you
+    should download the wget file lists and use the package versions in the
+    file.  Newer packages are likey intended for the next release of
+    <application>Xorg</application> and have already proven to be
+    incompatible with the current version of
+    <application>GTK+</application>.  The installed size of 
+    <application>Xorg</application> can be reduced considerably by 
+    installing only the packages that you will need and use, however, the 
+    BLFS book cannot account for all dependencies and build options for 
+    the individual <application>Xorg</application> packages.  The 
+    instructions assume that all packages have been built.  A
+    <ulink url="http://wiki.linuxfromscratch.org/blfs/wiki/Xorg-&xorg7-version;">wiki</ulink> 
+    page containing dependency information, is under development.  You are 
+    encouraged to add to these pages if you discover additional information 
+    that may be helpful to other users who selectively install individual 
+    packages.</para>
+  </note>
 
-    <para>With the modular build system, it is no longer possible to download
-    the entire package in a single file.  In fact, there may be as many as
-    280 files that need to be fetched from the download location.  To assist
-    with such a large task, it is strongly recommended to install
-    <xref linkend="wget"/> for downloading the needed files.  A complete
-    <application>wget</application> script is available for each section at
-    <ulink
-    url="http://anduin.linuxfromscratch.org/sources/BLFS/svn/x/wget/"/>.</para>
+  <para>Additionally, because of the large number of repetitive commands,
+  you are encouraged to script the build.  For most sections, you can use
+  a script with commands similar to the following, to compile and install 
+  all packages in a wget file list:</para>
 
-    <note>
-      <para>Even if you intend to download only the necessary packages, you 
-      should download the wget scripts and use the package versions listed.
-      Newer packages are likey intended for the next release of 
-      <application>Xorg</application> and have already proven to be
-      incompatible with the current version of 
-      <application>GTK+</application>.</para>
-    </note>
-
-    <para>Given the number of packages available, deciding which packages you
-    need to install for your particular setup may seem a bit overwhelming at
-    first.  Take a look at<ulink
-    url="http://lists.x.org/archives/xorg-modular/2005-November/000801.html">
-    this thread</ulink> to get an idea of what you will need.  If you are
-    unsure, you should install all packages at the cost of extra
-    disk space.</para>
-
-    <note>
-      <para>The installed size of <application>Xorg</application> can
-      be reduced considerably by installing only the packages that you will
-      need and use. However, the BLFS book cannot account for all dependencies
-      and build options for individual <application>Xorg</application>
-      packages.  The instructions assume that all packages have been built
-      from a particular group unless otherwise noted. A
-      <ulink url="http://wiki.linuxfromscratch.org/blfs/wiki/Xorg-&xorg7-version;">
-      wiki</ulink> page containing dependency information, for users who wish
-      to cut down on the installed size of <application>Xorg</application>, is
-      under development.  You are encouraged to add to these
-      pages if you discover additional information that may be helpful to
-      other users.</para>
-    </note>
-
-    <para>Additionally, because of the large number of repetitive commands,
-    you are encouraged to script the build.  For most sections, you can use
-    the following commands to compile and install all packages in your build
-    directory:</para>
-
-<screen>for package in *.tar.bz2
+<screen>bash -e #exit on all errors
+for package in $(cat ../wgetlist.wget)
 do
-  packagedir=`echo $package | sed 's/.tar.bz2//'`
-  tar -xf $package &amp;&amp;
-  cd $packagedir &amp;&amp;
-  ./configure $XORG_CONFIG &amp;&amp;
-  make &amp;&amp;
+  packagedir=$(echo $package | sed 's/.tar.bz2//')
+  tar -xf $package
+  cd $packagedir
+  ./configure $XORG_CONFIG
+  make
   make install
-  if [ $? -ne 0 ]; then
-    break #stop the build if the previous command failed
-  fi
-  cd .. &amp;&amp;
+  cd ..
   rm -rf $packagedir
+  rm -f $package
 done 2&gt;&amp;1 | tee -a ../xorg-compile.log #log the entire loop</screen>
 
-  </sect2>
+  <para>The above shell will exit immediately on error.  If it runs to
+  completion, you should manually exit the shell before continuing onto
+  the next set of instructions.</para>
 
   <sect2>
     <title>Setting up the Xorg Build Environment</title>
 
-      <para>First, you'll need to create a working directory:</para>
+    <para>First, you'll need to create a working directory:</para>
 
 <screen><userinput>mkdir xc &amp;&amp;
@@ -156,5 +128,5 @@
     command:</para>
 
-<screen><userinput>export XORG_PREFIX="<replaceable>&lt;/usr&gt;</replaceable>"</userinput></screen>
+<screen><userinput>export XORG_PREFIX="<replaceable>&lt;PREFIX&gt;</replaceable>"</userinput></screen>
 
     <para>Throughout these instructions, you will use the same three
@@ -164,585 +136,14 @@
 <screen><userinput>export XORG_CONFIG="--prefix=$XORG_PREFIX --sysconfdir=/etc --localstatedir=/var"</userinput></screen>
 
-    <note>
-      <para>If you've decided to use an alternate prefix, be sure to add
-      <filename class="directory"><replaceable>&lt;/usr&gt;</replaceable>/lib/pkgconfig</filename>
-      to your <envar>PKG_CONFIG_PATH</envar> variable.</para>
-    </note>
-
-  </sect2>
-
-  <sect2>
-    <title>Xorg Protocol Headers</title>
-
-    <indexterm zone="xorg7">
-      <primary sortas="a-xorg7-proto">Xorg Protocol Headers</primary>
-    </indexterm>
-
-      <para>The <application>Xorg</application> protocol headers provide the
-      header files required to build the system, and to allow other
-      applications to build against the installed X Window system.</para>
-
-      <para><application>Xorg</application> Proto packages can be downloaded
-      individually from <ulink
-      url="http://xorg.freedesktop.org/releases/individual/proto/"/>.</para>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Protocol Headers</title>
-
-      <para>Install the <application>Xorg</application> protocol headers
-      by running the following commands for each package to be installed.</para>
-
-<screen><userinput>./configure $XORG_CONFIG</userinput></screen>
-
-      <para>Now as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen><userinput role="root">make install</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Xorg Utilities</title>
-
-    <indexterm zone="xorg7">
-      <primary sortas="a-xorg7-data">Xorg Utilities</primary>
-    </indexterm>
-
-      <para>The <application>Xorg</application> utility packages provide
-      needed utilities, not for the <application>Xorg</application>
-      installation itself, but for other applications that make use of
-      legacy X11R6 installation methods.</para>
-
-      <para><application>Xorg</application> Utility packages can be downloaded
-      individually from <ulink
-      url="http://xorg.freedesktop.org/releases/individual/util/"/>.</para>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Utilities</title>
-
-      <para>First install the <application>xorg-cf-files</application> package
-      with the following commands:</para>
-
-<screen><userinput>sed -i "s@/usr/X11R6@$XORG_PREFIX@" site.def &amp;&amp;
-sed -i "s@/usr/X11R6@$XORG_PREFIX@" X11.tmpl &amp;&amp;
-./configure $XORG_CONFIG --with-config-dir=$XORG_PREFIX/lib/X11/config &amp;&amp;
-make</userinput></screen>
-
-      <para>Now as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen><userinput role="root">make install</userinput></screen>
-
-      <para>Next, install the <application>Imake</application> package with
-      these commands:</para>
-
-<screen><userinput>./configure $XORG_CONFIG --with-config-dir=$XORG_PREFIX/lib/X11/config &amp;&amp;
-make</userinput></screen>
-
-      <para>Now as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen><userinput role="root">make install</userinput></screen>
-
-
-      <para>Finally, build the three remaining packages with the standard build
-      commands:</para>
-
-
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-      <para>Now as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen><userinput role="root">make install</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Xorg Libraries</title>
-
-    <indexterm zone="xorg7">
-      <primary sortas="a-xorg7-lib">Xorg Libraries</primary>
-    </indexterm>
-
-      <para>The <application>Xorg</application> libraries provide library
-      routines that are used within all X Window applications.</para>
-
-      <para><application>Xorg</application> Library packages can be downloaded
-      individually from <ulink
-      url="http://xorg.freedesktop.org/releases/individual/lib/"/>.</para>
-
-    <sect3>
-      <title>Meeting Library Dependencies</title>
-
-      <para>These 17 libraries must be built first, in the order provided,
-      to cover the dependencies of the other library packages:</para>
-
-<screen>xtrans-1.0.0
-libXau-1.0.0
-libXdmcp-1.0.0
-libX11-1.0.0
-libXext-1.0.0
-libICE-1.0.0
-libSM-1.0.0
-libXt-1.0.0
-libXmu-1.0.0
-libXpm-3.5.4.2
-libXp-1.0.0
-libXfixes-3.0.1.2
-libXrender-0.9.0.2
-libfontenc-1.0.1
-libxkbfile-1.0.2
-libXprintUtil-1.0.1
-libXv-1.0.1</screen>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Libraries</title>
-
-      <para>Install the libraries by running the following commands for each
-      of the chosen packages:</para>
-
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-      <para>Now as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen><userinput role="root">make install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="configuration">
-      <title>Configuration of Xorg Libraries</title>
-
-        <para>If you've chosen to install <application>Xorg</application> into
-        <filename class="directory">/usr</filename>, then no further
-        configuration is necessary and you can skip the rest of this section.
-        If you've opted for an alternate prefix, you should create two symlinks
-        to satisfy the expected environment of several packages.
-        Execute the following commands as the root user:</para>
-
-<screen role="root"><userinput>ln -sv $XORG_PREFIX/lib/X11 /usr/lib/X11 &amp;&amp;
-ln -sv $XORG_PREFIX/include/X11 /usr/include/X11</userinput></screen>
-
-        <para>As with other library directories, as the root user you must add
-        <filename class="directory">$XORG_PREFIX/lib</filename> to
-        <filename>/etc/ld.so.conf</filename> and execute
-        <command>/sbin/ldconfig</command>.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Xorg Data</title>
-
-    <indexterm zone="xorg7">
-      <primary sortas="a-xorg7-data">Xorg Data</primary>
-    </indexterm>
-
-      <para>The <application>Xorg</application> data packages provide
-      static data such as images and keymaps to the
-      <application>Xorg</application> applications.</para>
-
-      <para><application>Xorg</application> Data packages can be downloaded
-      individually from <ulink
-      url="http://xorg.freedesktop.org/releases/individual/data/"/>.</para>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Data</title>
-
-      <para>First, configure the xbitmap package by running the following
-      command:</para>
-
-<screen><userinput>./configure $XORG_CONFIG</userinput></screen>
-
-      <para>Now install as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen><userinput role="root">make install</userinput></screen>
-
-      <note>
-        <para>At this point, you should continue to the applications
-        installation.  After the applications installation has completed, you
-        should return here and install the xcursor-themes and xkb-data 
-        packages.</para>
-      </note>
-
-      <para>Compile the xcursor-themes and xkb-data packages with the 
-      following commands:</para>
-
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-      <para>Install the packages as the 
-      <systemitem class="username">root</systemitem> user:</para>
-
-<screen><userinput role="root">make install</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Xorg Applications</title>
-
-    <indexterm zone="xorg7">
-      <primary sortas="a-xorg7-app">Xorg Applications</primary>
-    </indexterm>
-
-    <note>
-      <para>You must install <xref linkend="mesalib"/> before you install
-      Xorg Applications.</para>
-    </note>
-
-      <para>The <application>Xorg</application> applications provide the
-      expected applications available in previous X Window
-      implementations.</para>
-
-      <para><application>Xorg</application> applications can be downloaded
-      individually from <ulink
-      url="http://xorg.freedesktop.org/releases/individual/app/"/>.</para>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Applications</title>
-
-      <para>Install the applications by running the following commands for each
-      chosen package:</para>
-
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-      <para>Now as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen><userinput role="root">make install</userinput></screen>
-
-      <note>
-        <para>Remember to return to the data packages and install the
-        xcursor-themes and xkb-data packages.</para>
-      </note>
-
-</sect3>
-
-    <sect3 role="installation">
-
-      <title>Installation of luit</title>
-
-      <note>
-        <para>The luit package should not be compiled at this point.  You
-        should install the luit application after the fonts have been
-        installed.</para>
-      </note>
-
-      <para>A patch is required to fix a race condition in
-      <application>luit</application> that was discovered shortly after
-      release.  Download the patch from
-      <ulink url="&patch-root;/luit-1.0.1-race-1.patch"/>.</para>
-
-      <para>Install luit with the following commands:</para>
-
-<screen><userinput>patch -Np1 -i luit-1.0.1-race-1.patch &amp;&amp;
-./configure $XORG_CONFIG &amp;&amp;
-make</userinput></screen>
-
-      <para>Now as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen><userinput role="root">make install</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Xorg Fonts</title>
-
-    <indexterm zone="xorg7">
-      <primary sortas="a-xorg7-fonts">Xorg Fonts</primary>
-    </indexterm>
-
-      <para>The <application>Xorg</application> font packages provide
-      needed fonts to the <application>Xorg</application> applications.</para>
-
-      <para><application>Xorg</application> Font packages can be downloaded
-      individually from <ulink
-      url="http://xorg.freedesktop.org/releases/individual/font/"/>.</para>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Fonts</title>
-
-      <para>Run the following commands for each package:</para>
-
-      <note>
-        <para>You should install encodings and font-util before all
-        other font packages.</para>
-      </note>
-
-
-<screen><userinput>./configure $XORG_CONFIG</userinput></screen>
-
-      <para>Now as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen><userinput role="root">make install</userinput></screen>
-
-      <para>When all of the fonts have been installed, the system must be
-      configured so that <application>Fontconfig</application> can find the
-      TrueType fonts since they are outside of the default search path of
-      <filename class="directory">/usr/share/fonts</filename>.  Make symlinks
-      to the <application>Xorg</application> TrueType font directories by
-      running the following commands as the
-      <systemitem class="username">root</systemitem> user:</para>
-
-<screen><userinput role="root">install -d -m755 /usr/share/fonts &amp;&amp;
-ln -svn $XORG_PREFIX/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF &amp;&amp;
-ln -svn $XORG_PREFIX/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF</userinput></screen>
-
-      <note>
-        <para>If you haven't done so, and intend to install
-        <application>luit</application>, do so now.</para>
-      </note>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Xorg Server</title>
-
-    <indexterm zone="xorg7">
-      <primary sortas="a-xorg7-server">Xorg Server</primary>
-    </indexterm>
-
-    <para>The <application>Xorg</application> Server is the core
-    of the X Window system.</para>
-
-      <para>The Xorg Server is a single download.  Get it from
-      <ulink url="http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.0.2.tar.bz2"/>.</para>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Server</title>
-
-      <note>
-        <para>You must have the <application>Mesa</application> source
-        directory available when building the
-        <application>Xorg-server</application>.</para>
-      </note>
-
-<!-- To be removed if/when proposed glibc patch is added to LFS SVN
-     Leave in in for a couple of weeks with 'you may need' and a testcase
-     around it to save the support list silly questions.  Should remove in
-     a couple of weeks -->
-      <para>Recent glibc may have a problem with it's installed sys/kd.h file.  
-      This has recently been fixed in LFS svn.  Execute the 
-      following commands to work around a broken kd.h file.  The commands will 
-      only make the modification if needed:</para>
-
-<screen><userinput>grep "__undef_LINUX" \
-    /usr/include/sys/kd.h 2&gt;&amp;1 &gt; /dev/null || \
-    sed -i.bak '/CONFIG_H/i #include &lt;linux/types.h&gt;' \
-        hw/xfree86/os-support/linux/lnx_agp.c</userinput></screen>
-<!-- End remove -->
-
-      <para>Install the server by running the following commands:</para>
-
-<screen><userinput>./configure $XORG_CONFIG \
-    --with-mesa-source='<replaceable>&lt;/path/to&gt;</replaceable>/Mesa-&mesalib-version;' \
-    --with-fontdir=$XORG_PREFIX/lib/X11/fonts \
-    --with-module-dir=$XORG_PREFIX/lib/X11/modules &amp;&amp;
-make</userinput></screen>
-
-      <para>Now as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen><userinput role="root">make install</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Xorg Drivers</title>
-
-    <indexterm zone="xorg7">
-      <primary sortas="a-xorg7-driver">Xorg Drivers</primary>
-    </indexterm>
-
-      <para>The <application>Xorg</application> drivers provide the means
-      for the xserver to take advantage of installed hardware.</para>
-
-      <para><application>Xorg</application> Driver packages can be downloaded
-      individually from <ulink
-      url="http://xorg.freedesktop.org/releases/individual/driver/"/>.</para>
-
-    <sect3 role="installation">
-      <title>Installation of Xorg Drivers</title>
-
-      <warning><para>It is very important not to build display drivers that
-      cannot be used with your hardware.  For instance, do not build Sun drivers
-      for an x86 PC as the Sun drivers will expect to see SPARC symbols
-      exported from the kernel.  Failure to follow this warning will result
-      in a display lockup, which requires a hard reboot, when configuring
-      <application>Xorg</application> for the first time.</para></warning>
-
-      <para>Install the drivers by running the following commands for each
-      package:</para>
-
-<screen><userinput>./configure $XORG_CONFIG \
-    --with-xorg-module-dir=$XORG_PREFIX/lib/X11/modules &amp;&amp;
-make</userinput></screen>
-
-      <para>Now as the <systemitem class="username">root</systemitem>
-      user:</para>
-
-<screen><userinput role="root">make install</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="configuration" id='xorg7-config'>
-    <title>Configuring Xorg</title>
-
-    <para>As the <systemitem class="username">root</systemitem> user ensure you
-    have executed <command>ldconfig</command> and
-    create the <filename>xorg.conf</filename> file with:</para>
-
-<screen><userinput>cd ~ &amp;&amp;
-Xorg -configure</userinput></screen>
-
-    <para>The screen will go black and you may hear some clicking of the monitor.
-    This command will create a file, <filename>xorg.conf.new</filename>, in your
-    home directory.</para>
-
-    <indexterm zone="xorg7 xorg7-config">
-      <primary sortas="e-etc-X11-xorg-conf">/etc/X11/xorg.conf</primary>
-    </indexterm>
-
-    <para>Edit <filename>xorg.conf.new</filename> to suit your system. The
-    details of the file are located in the xorg.conf man page. Some things
-    you may want to do are:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>Section "Files". Change the order of the font paths searched.
-        You may want to put 100dpi fonts ahead of 75dpi fonts if your system
-        normally comes up closer to 100 dots per inch. You may want to remove
-        some font directories completely.</para>
-      </listitem>
-      <listitem>
-        <para>Section "Module". If you are going to install NVidia
-        drivers, remove the "dri" line.</para>
-      </listitem>
-      <listitem>
-        <para>Sections "InputDevice". You may want to change the
-        keyboard autorepeat rate by adding
-        <option>Option "Autorepeat" "250 30"</option>.</para>
-      </listitem>
-      <listitem>
-        <para>Section "Monitor". Specify the <option>VertRefresh</option>
-        and <option>HorizSync</option> values if the system does not
-        automatically detect the monitor and its values.</para>
-      </listitem>
-      <listitem>
-        <para>Section "Device". You may want to set some of the options
-        available for your selected video driver. A description of the driver
-        parameters is in the man page for your driver.</para>
-      </listitem>
-      <listitem><para>Section "Screen". Add a DefaultDepth statement such as:
-        <option>DefaultDepth 24</option>. In the SubSection for your
-        default depth, add a modes line such as:
-        <option>Modes "1600x1200" "1280x1024" "1024x768"</option>. The first
-        mode listed will normally be the starting resolution.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>Test the system with:</para>
-
-<screen><userinput>X -config ~/xorg.conf.new</userinput></screen>
-
-    <para>You will only get a gray background with an X-shaped mouse cursor,
-    but it confirms the system is working. Exit with
-    <keycap>Control+Alt+Backspace</keycap>. If the system does not work, take
-    a look at <filename>/var/log/Xorg.0.log</filename> to see what went
-    wrong.</para>
-
-    <para>As the <systemitem class="username">root</systemitem> user, create
-    the configuration directory and move the configuration file to the new 
-    directory:</para>
-
-<screen role="root"><userinput>install -v -m755 -D ~/xorg.conf.new /etc/X11/xorg.conf</userinput></screen>
-
-    <para>As the <systemitem class="username">root</systemitem> user, create
-    <filename>.xinitrc</filename>:</para>
-
-<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
-<literal># Begin .xinitrc file
-xterm  -g 80x40+0+0   &amp;
-xclock -g 100x100-0+0 &amp;
-twm</literal>
-EOF</userinput></screen>
-
-    <para>This provides an initial screen with a small clock that is
-    managed by a simple window manager, Tab Window Manager. For details of
-    <command>twm</command>, see the man page.</para>
-
-    <note>
-      <para>The above file is the default configuration for Xorg.  Xorg's
-      distribution no longer includes <command>xterm</command>, and as such the
-      <command>startx</command> command will fail if you have not yet
-      installed <xref linkend="xterm2"/>.</para>
-    </note>
-
-    <indexterm zone="xorg7 xorg7-config">
-      <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
-    </indexterm>
-
-    <note>
-      <para>When needed, <application>Xorg</application> creates the directory
-      <filename class='directory'>/tmp/.ICE-unix</filename> if it does not
-      exist. If this directory is not owned by
-      <systemitem class="username">root</systemitem>,
-      <application>Xorg</application> delays startup by a few seconds and also
-      appends a warning to the logfile. This also affects startup of other
-      applications. To improve performance, it is advisable to manually create
-      the directory before <application>Xorg</application> uses it. Add the
-      file creation to <filename>/etc/sysconfig/createfiles</filename> that is
-      sourced by the <filename>/etc/rc.d/init.d/cleanfs</filename> startup
-      script.</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/sysconfig/createfiles &lt;&lt; "EOF"
-<literal>/tmp/.ICE-unix dir 1777 root root</literal>
-EOF</userinput></screen>
-    </note>
-
-    <indexterm zone="xorg7 xorg7-config">
-      <primary
-      sortas="e-etc-sysconfig-createfiles">/etc/sysconfig/createfiles</primary>
-    </indexterm>
-
-    <para>Start <application>X</application> with:</para>
-
-<screen><userinput>startx</userinput></screen>
-
-    <para>and a basic functional <application>X Window
-    System</application> should be displayed.</para>
-
-    <para>At this point, you should check out <xref linkend='x-setup'/> for
-    the necessary configuration to make <application>X</application> fully
-    functional. Additionally, you can have a look at <xref linkend='x-config'/>
-    for information on fine tuning your <application>X</application>
-    configuration.</para>
-
-    <para>For a list of the package contents and a description of the commands,
-    see the sections in the <xref linkend='xfree86-contents'/>.</para>
+    <para>If you've decided to use an alternate prefix, be sure to add
+    <filename class="directory">
+    <replaceable>&lt;PREFIX&gt;</replaceable>/bin</filename> to your
+    <envar>PATH</envar> environment variable and  <filename class="directory">
+    <replaceable>&lt;PREFIX&gt;</replaceable>/lib/pkgconfig</filename>
+    to your <envar>PKG_CONFIG_PATH</envar> variable.  For detailed instrucitons,
+    see <xref linkend="postlfs-config-profile"/>.  You should also add
+    <filename class="directory">
+    <replaceable>&lt;PREFIX&gt;</replaceable>/lib</filename> to the 
+    <filename>/etc/ld.so.conf</filename> file.</para>
 
   </sect2>
