Index: appendices/glossary.xml
===================================================================
--- appendices/glossary.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ appendices/glossary.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -152,4 +152,7 @@
 <glossdef><para>Disk Operating System</para></glossdef></glossentry>
 
+<glossentry id="gDRI"><glossterm><acronym>DRI</acronym></glossterm>
+<glossdef><para>Direct Rendering Infrastructure</para></glossdef></glossentry>
+
 <glossentry id="gDSC"><glossterm><acronym>DSC</acronym></glossterm>
 <glossdef><para>Document Structuring Conventions</para></glossdef></glossentry>
Index: ok/book.xml
===================================================================
--- book/book.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ 	(revision )
@@ -1,24 +1,0 @@
-&book-info;
-&book-dedication;
-&preface;
-
-<!-- Parts -->
-
-&introduction;
-&postlfs;
-&general;
-&connect;
-&basicnet;
-&server;
-&content;
-&x;
-&kde;
-&gnome;
-&xsoft;
-&multimedia;
-&pst;
-
-<!-- End parts -->
-
-<!-- Appendices -->
-&glossary;
Index: troduction/welcome/welcome.xml
===================================================================
--- introduction/welcome/welcome.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<chapter id="intro-welcome">
-<?dbhtml filename="welcome.html"?>
-<title>Welcome to <acronym>BLFS</acronym></title>
-<para>The Beyond Linux From Scratch book is designed to carry on from
-where the <acronym>LFS</acronym> book leaves off.  But unlike the <acronym>LFS
-</acronym> book, it isn't designed to be followed straight through.  Reading 
-the <xref linkend="intro-welcome-whichsections"/> part of this chapter should
-help guide you through the book.</para>
-
-<para>Please read most of this part of the book carefully as it explains
-quite a few of the conventions we use throughout the book.</para>
-
-&intro-welcome-acks;
-&intro-welcome-credits;
-&intro-welcome-whichsect;
-&intro-welcome-conventions;
-&intro-welcome-version;
-&intro-welcome-changelog;
-&intro-welcome-mailinglists;
-&intro-welcome-newsserver;
-&intro-welcome-askhelp;
-&intro-welcome-contact;
-</chapter>
Index: kde/add/kde-i18n.xml
===================================================================
--- kde/add/kde-i18n.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kde-i18n.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -23,5 +23,5 @@
 
 <indexterm zone="kde-i18n">
-  <primary sortas="a-kde-i18n">KDE Internationaization</primary>
+  <primary sortas="a-kde-i18n">Kde-i18n</primary>
 </indexterm>
 
Index: kde/add/kdeaccessibility.xml
===================================================================
--- kde/add/kdeaccessibility.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kdeaccessibility.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -24,5 +24,5 @@
 
 <indexterm zone="kdeaccessibility">
-  <primary sortas="a-kdeaccessibility">kdeaccessibility</primary>
+  <primary sortas="a-kdeaccessibility">Kdeaccessibility</primary>
 </indexterm>
 
Index: kde/add/kdeaddons.xml
===================================================================
--- kde/add/kdeaddons.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kdeaddons.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -23,5 +23,5 @@
 
 <indexterm zone="kdeaddons">
-  <primary sortas="a-kdeaddons">kdeaddons</primary>
+  <primary sortas="a-kdeaddons">Kdeaddons</primary>
 </indexterm>
 
Index: kde/add/kdeadmin.xml
===================================================================
--- kde/add/kdeadmin.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kdeadmin.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -24,5 +24,5 @@
 
 <indexterm zone="kdeadmin">
-  <primary sortas="a-kdeadmin">kdeadmin</primary>
+  <primary sortas="a-kdeadmin">Kdeadmin</primary>
 </indexterm>
 
Index: kde/add/kdeartwork.xml
===================================================================
--- kde/add/kdeartwork.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kdeartwork.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -23,5 +23,5 @@
 
 <indexterm zone="kdeartwork">
-  <primary sortas="a-kdeartwork">kdeartwork</primary>
+  <primary sortas="a-kdeartwork">Kdeartwork</primary>
 </indexterm>
 
Index: kde/add/kdebindings.xml
===================================================================
--- kde/add/kdebindings.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kdebindings.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -24,5 +24,5 @@
 
 <indexterm zone="kdebindings">
-  <primary sortas="a-kdebindings">kdebindings</primary>
+  <primary sortas="a-kdebindings">Kdebindings</primary>
 </indexterm>
 
Index: kde/add/kdeedu.xml
===================================================================
--- kde/add/kdeedu.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kdeedu.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -24,5 +24,5 @@
 
 <indexterm zone="kdeedu">
-  <primary sortas="a-kdeedu">kdeedu</primary>
+  <primary sortas="a-kdeedu">Kdeedu</primary>
 </indexterm>
 
Index: kde/add/kdegames.xml
===================================================================
--- kde/add/kdegames.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kdegames.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -23,5 +23,5 @@
 
 <indexterm zone="kdegames">
-  <primary sortas="a-kdegames">kdegames</primary>
+  <primary sortas="a-kdegames">Kdegames</primary>
 </indexterm>
 
Index: kde/add/kdegraphics.xml
===================================================================
--- kde/add/kdegraphics.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kdegraphics.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -23,5 +23,5 @@
 
 <indexterm zone="kdegraphics">
-  <primary sortas="a-kdegraphics">kdegraphics</primary>
+  <primary sortas="a-kdegraphics">Kdegraphics</primary>
 </indexterm>
 
Index: kde/add/kdemultimedia.xml
===================================================================
--- kde/add/kdemultimedia.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kdemultimedia.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -24,5 +24,5 @@
 
 <indexterm zone="kdemultimedia">
-  <primary sortas="a-kdemultimedia">kdemultimedia</primary>
+  <primary sortas="a-kdemultimedia">Kdemultimedia</primary>
 </indexterm>
 
Index: kde/add/kdenetwork.xml
===================================================================
--- kde/add/kdenetwork.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kdenetwork.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -24,5 +24,5 @@
 
 <indexterm zone="kdenetwork">
-  <primary sortas="a-kdenetwork">kdenetwork</primary>
+  <primary sortas="a-kdenetwork">Kdenetwork</primary>
 </indexterm>
 
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kdepim.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -26,5 +26,5 @@
 <title>Introduction to <application>kdepim</application></title>
 <indexterm zone="kdepim">
-  <primary sortas="a-kdepim">kdepim</primary>
+  <primary sortas="a-kdepim">Kdepim</primary>
 </indexterm>
 
Index: kde/add/kdesdk.xml
===================================================================
--- kde/add/kdesdk.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kdesdk.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -24,5 +24,5 @@
 
 <indexterm zone="kdesdk">
-  <primary sortas="a-kdesdk">kdesdk</primary>
+  <primary sortas="a-kdesdk">Kdesdk</primary>
 </indexterm>
 
Index: kde/add/kdetoys.xml
===================================================================
--- kde/add/kdetoys.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kdetoys.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -23,5 +23,5 @@
 
 <indexterm zone="kdetoys">
-  <primary sortas="a-kdetoys">kdetoys</primary>
+  <primary sortas="a-kdetoys">Kdetoys</primary>
 </indexterm>
 
Index: kde/add/kdeutils.xml
===================================================================
--- kde/add/kdeutils.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kdeutils.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -23,5 +23,5 @@
 
 <indexterm zone="kdeutils">
-  <primary sortas="a-kdeutils">kdeutils</primary>
+  <primary sortas="a-kdeutils">Kdeutils</primary>
 </indexterm>
 
Index: kde/add/kdevelop.xml
===================================================================
--- kde/add/kdevelop.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kdevelop.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -23,5 +23,5 @@
 
 <indexterm zone="kdevelop">
-  <primary sortas="a-kdevelop">kdevelop</primary>
+  <primary sortas="a-kdevelop">Kdevelop</primary>
 </indexterm>
 
Index: kde/add/kdewebdev.xml
===================================================================
--- kde/add/kdewebdev.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/add/kdewebdev.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -24,5 +24,5 @@
 
 <indexterm zone="kdewebdev">
-  <primary sortas="a-kdewebdev">kdewebdev</primary>
+  <primary sortas="a-kdewebdev">Kdewebdev</primary>
 </indexterm>
 
Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/core/kdebase.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -21,5 +21,5 @@
 <title>kdebase-&kde-version;</title>
 <indexterm zone="kdebase">
-  <primary sortas="a-kdebase">KDEbase</primary>
+  <primary sortas="a-kdebase">Kdebase</primary>
 </indexterm>
 
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ kde/core/kdelibs.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -21,5 +21,5 @@
 <title><application>kdelibs</application>-&kde-version;</title>
 <indexterm zone="kdelibs">
-  <primary sortas="a-kdelibs">KDElibs</primary>
+  <primary sortas="a-kdelibs">Kdelibs</primary>
 </indexterm>
 
Index: postlfs/editors/nano.xml
===================================================================
--- postlfs/editors/nano.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ postlfs/editors/nano.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -21,5 +21,5 @@
 <title>nano-&nano-version;</title>
 <indexterm zone="nano"><primary
-sortas="a-nano">nano</primary></indexterm>
+sortas="a-nano">Nano</primary></indexterm>
 
 <sect2>
Index: x/installing/x-setup.xml
===================================================================
--- x/installing/x-setup.xml	(revision 793c1ba06c9c45f7f7a3d31cc469a6d2e61b03d6)
+++ x/installing/x-setup.xml	(revision 0bfe309aff9143f7e52e37b57e5387d03364c944)
@@ -14,6 +14,11 @@
 <title>X Window System Components</title>
 
-<sect2>
+<sect2 id='dri'>
 <title>Checking Direct Rendering Infrastructure (<acronym>DRI</acronym>) Installation</title>
+
+<indexterm zone="x-setup dri">
+  <primary sortas="g-x-setup">DRI</primary>
+</indexterm>
+
 <para><acronym>DRI</acronym> is a framework for allowing software to access graphics hardware
 in a safe and efficient manner.  It is installed in
@@ -34,5 +39,14 @@
 the frames drawn per second is highly dependent on the size of
 the window.</para>
- 
+
+<indexterm zone="x-setup dri">
+  <primary sortas="b-glxgears">glxgears</primary>
+</indexterm>
+
+<indexterm zone="x-setup dri">
+  <primary sortas="b-glxinfo">glxinfo</primary>
+</indexterm>
+
+
 <para>For troubleshooting problems, check the <acronym>DRI</acronym> Users Guide at
 <ulink url="http://dri.sourceforge.net/doc/DRIuserguide.html"/>.
@@ -42,5 +56,5 @@
 <!-- ================================================== -->
 
-<sect2>
+<sect2 id='fonts'>
 <title>Adding <application>TrueType</application> fonts to
 <application>X</application></title>
@@ -49,4 +63,8 @@
 <application>X</application>.  The following items need to 
 be completed to make the fonts available.</para>
+
+<indexterm zone="x-setup fonts">
+  <primary sortas="g-truetype">TrueType</primary>
+</indexterm>
 
 <itemizedlist>
@@ -71,4 +89,12 @@
 <filename>XF86Config</filename> or <filename>xorg.conf</filename> contains the
 <application>TrueType</application> font directory.</para></listitem>
+
+<indexterm zone="x-setup fonts">
+  <primary sortas="e-etc-X11-xorg.conf">/etc/X11/xorg.conf</primary>
+</indexterm>
+
+<indexterm zone="x-setup fonts">
+  <primary sortas="e-etc-Xll-XF86Config">/etc/X11/XF86Config</primary>
+</indexterm>
 
 <listitem><para>Update the font cache files</para></listitem>
@@ -132,4 +158,8 @@
 tags:</para>
 
+<indexterm zone="x-setup fonts">
+  <primary sortas="e-etc-fonts-local.conf">/etc/fonts/local.conf</primary>
+</indexterm>
+
 <screen><userinput><command>sed -i -e '/^&lt;\/fontconfig&gt;/i\
 &lt;dir&gt;/usr/X11R6/lib/X11/fonts/TTF&lt;/dir&gt;\
@@ -139,7 +169,12 @@
 the above directories and all subdirectories for needed fonts.</para>
     
-<para>Finally, to update all the font
-cache files, run</para>
+<para>Finally, to update all the font cache files, run</para>
+
 <screen><userinput><command>fc-cache</command></userinput></screen>
+
+<indexterm zone="x-setup fonts">
+  <primary sortas="b-fc-cache">fc-cache</primary>
+</indexterm>
+
 
 <para><application>X</application> will now be able to use
@@ -207,5 +242,5 @@
 
 <!-- ================================================== -->
-<sect2>
+<sect2 id='xdm'>
 <title>Setting up XDM</title>
 <para><command>xdm</command> provides a graphical logon capability and is
@@ -215,4 +250,8 @@
 and add the following lines to <filename>/etc/inittab</filename>:</para>
 
+<indexterm zone="x-setup xdm">
+  <primary sortas="b-xdm">xdm</primary>
+</indexterm>
+
 <para><screen><userinput># Run xdm as a separate service
 x:5:respawn:/usr/X11R6/bin/xdm -nodaemon</userinput></screen></para>
@@ -227,5 +266,5 @@
 
 <!-- ================================================== -->
-<sect2>
+<sect2 id='x-resources'>
 <title>Using <application>X</application> Resources</title>
 <para>There are many options that can be set in
@@ -236,4 +275,8 @@
 <para>The layout of the <filename>~/.Xresources</filename> file consists
 of a list of specifications in the form of</para>
+
+<indexterm zone="x-setup x-resources">
+  <primary sortas="e-AA-.xresources">~/.Xresources</primary>
+</indexterm>
 
 <screen>object.subobject[.subobject...].attribute: value</screen>
@@ -273,6 +316,10 @@
 <filename>~/.xinitrc</filename> or <filename>~/.xsession</filename>.
 To get more information, see the xrdb man page.</para>
-</sect2>
-
+
+<indexterm zone="x-setup x-resources">
+  <primary sortas="b-xrdb">xrdb</primary>
+</indexterm>
+
+</sect2>
 </sect1>
 
