Tagging updates

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@3446 af4574ff-66df-0310-9fd7-8a98e5e911e0

appendices/glossary.xml

@@ -151,6 +151,9 @@ otherterm="gSMB">SMB</glossseealso></glossdef></glossentry>
 <glossentry id="gDOS"><glossterm><acronym>DOS</acronym></glossterm>
 <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>
 

book/book.xml

@@ -1,24 +0,0 @@
-&book-info;
-&book-dedication;
-&preface;
-
-<!-- Parts -->
-
-&introduction;
-&postlfs;
-&general;
-&connect;
-&basicnet;
-&server;
-&content;
-&x;
-&kde;
-&gnome;
-&xsoft;
-&multimedia;
-&pst;
-
-<!-- End parts -->
-
-<!-- Appendices -->
-&glossary;

introduction/welcome/welcome.xml

@@ -1,23 +0,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>

kde/add/kde-i18n.xml

@@ -22,7 +22,7 @@
 <title><application>kde-i18n</application>-&kde-version;</title>
 
 <indexterm zone="kde-i18n">
-  <primary sortas="a-kde-i18n">KDE Internationaization</primary>
+  <primary sortas="a-kde-i18n">Kde-i18n</primary>
 </indexterm>
 
 <sect2>

kde/add/kdeaccessibility.xml

@@ -23,7 +23,7 @@
 <title>kdeaccessibility-&kde-version;</title>
 
 <indexterm zone="kdeaccessibility">
-  <primary sortas="a-kdeaccessibility">kdeaccessibility</primary>
+  <primary sortas="a-kdeaccessibility">Kdeaccessibility</primary>
 </indexterm>
 
 <sect2>

kde/add/kdeaddons.xml

@@ -22,7 +22,7 @@
 <title><application>kdeaddons</application>-&kde-version;</title>
 
 <indexterm zone="kdeaddons">
-  <primary sortas="a-kdeaddons">kdeaddons</primary>
+  <primary sortas="a-kdeaddons">Kdeaddons</primary>
 </indexterm>
 
 <sect2>

kde/add/kdeadmin.xml

@@ -23,7 +23,7 @@
 <title><application>kdeadmin</application>-&kde-version;</title>
 
 <indexterm zone="kdeadmin">
-  <primary sortas="a-kdeadmin">kdeadmin</primary>
+  <primary sortas="a-kdeadmin">Kdeadmin</primary>
 </indexterm>
 
 <sect2>

kde/add/kdeartwork.xml

@@ -22,7 +22,7 @@
 <title><application>kdeartwork</application>-&kde-version;</title>
 
 <indexterm zone="kdeartwork">
-  <primary sortas="a-kdeartwork">kdeartwork</primary>
+  <primary sortas="a-kdeartwork">Kdeartwork</primary>
 </indexterm>
 
 <sect2>

kde/add/kdebindings.xml

@@ -23,7 +23,7 @@
 <title>kdebindings-&kde-version;</title>
 
 <indexterm zone="kdebindings">
-  <primary sortas="a-kdebindings">kdebindings</primary>
+  <primary sortas="a-kdebindings">Kdebindings</primary>
 </indexterm>
 
 <sect2>

kde/add/kdeedu.xml

@@ -23,7 +23,7 @@
 <title><application>kdeedu</application>-&kde-version;</title>
 
 <indexterm zone="kdeedu">
-  <primary sortas="a-kdeedu">kdeedu</primary>
+  <primary sortas="a-kdeedu">Kdeedu</primary>
 </indexterm>
 
 <sect2>

kde/add/kdegames.xml

@@ -22,7 +22,7 @@
 <title><application>kdegames</application>-&kde-version;</title>
 
 <indexterm zone="kdegames">
-  <primary sortas="a-kdegames">kdegames</primary>
+  <primary sortas="a-kdegames">Kdegames</primary>
 </indexterm>
 
 <sect2>

kde/add/kdegraphics.xml

@@ -22,7 +22,7 @@
 <title><application>kdegraphics</application>-&kde-version;</title>
 
 <indexterm zone="kdegraphics">
-  <primary sortas="a-kdegraphics">kdegraphics</primary>
+  <primary sortas="a-kdegraphics">Kdegraphics</primary>
 </indexterm>
 
 

kde/add/kdemultimedia.xml

@@ -23,7 +23,7 @@
 <title><application>kdemultimedia</application>-&kde-version;</title>
 
 <indexterm zone="kdemultimedia">
-  <primary sortas="a-kdemultimedia">kdemultimedia</primary>
+  <primary sortas="a-kdemultimedia">Kdemultimedia</primary>
 </indexterm>
 
 <sect2>

kde/add/kdenetwork.xml

@@ -23,7 +23,7 @@
 <title>kdenetwork-&kde-version;</title>
 
 <indexterm zone="kdenetwork">
-  <primary sortas="a-kdenetwork">kdenetwork</primary>
+  <primary sortas="a-kdenetwork">Kdenetwork</primary>
 </indexterm>
 
 <sect2>

kde/add/kdepim.xml

@@ -25,7 +25,7 @@
 <sect2>
 <title>Introduction to <application>kdepim</application></title>
 <indexterm zone="kdepim">
-  <primary sortas="a-kdepim">kdepim</primary>
+  <primary sortas="a-kdepim">Kdepim</primary>
 </indexterm>
 
 

kde/add/kdesdk.xml

@@ -23,7 +23,7 @@
 <title><application>kdesdk</application>-&kde-version;</title>
 
 <indexterm zone="kdesdk">
-  <primary sortas="a-kdesdk">kdesdk</primary>
+  <primary sortas="a-kdesdk">Kdesdk</primary>
 </indexterm>
 
 <sect2>

kde/add/kdetoys.xml

@@ -22,7 +22,7 @@
 <title><application>kdetoys</application>-&kde-version;</title>
 
 <indexterm zone="kdetoys">
-  <primary sortas="a-kdetoys">kdetoys</primary>
+  <primary sortas="a-kdetoys">Kdetoys</primary>
 </indexterm>
 
 <sect2>

kde/add/kdeutils.xml

@@ -22,7 +22,7 @@
 <title><application>kdeutils</application>-&kde-version;</title>
 
 <indexterm zone="kdeutils">
-  <primary sortas="a-kdeutils">kdeutils</primary>
+  <primary sortas="a-kdeutils">Kdeutils</primary>
 </indexterm>
 
 <sect2>

kde/add/kdevelop.xml

@@ -22,7 +22,7 @@
 <title><application>kdevelop</application>-&kdevelop-version;</title>
 
 <indexterm zone="kdevelop">
-  <primary sortas="a-kdevelop">kdevelop</primary>
+  <primary sortas="a-kdevelop">Kdevelop</primary>
 </indexterm>
 
 <sect2>

kde/add/kdewebdev.xml

@@ -23,7 +23,7 @@
 <title><application>kdewebdev</application>-&kde-version;</title>
 
 <indexterm zone="kdewebdev">
-  <primary sortas="a-kdewebdev">kdewebdev</primary>
+  <primary sortas="a-kdewebdev">Kdewebdev</primary>
 </indexterm>
 
 

kde/core/kdebase.xml

@@ -20,7 +20,7 @@
 <?dbhtml filename="kdebase.html"?>
 <title>kdebase-&kde-version;</title>
 <indexterm zone="kdebase">
-  <primary sortas="a-kdebase">KDEbase</primary>
+  <primary sortas="a-kdebase">Kdebase</primary>
 </indexterm>
 
 <sect2>

kde/core/kdelibs.xml

@@ -20,7 +20,7 @@
 <?dbhtml filename="kdelibs.html"?>
 <title><application>kdelibs</application>-&kde-version;</title>
 <indexterm zone="kdelibs">
-  <primary sortas="a-kdelibs">KDElibs</primary>
+  <primary sortas="a-kdelibs">Kdelibs</primary>
 </indexterm>
 
 <sect2>

postlfs/editors/nano.xml

@@ -20,7 +20,7 @@
 <?dbhtml filename="nano.html"?>
 <title>nano-&nano-version;</title>
 <indexterm zone="nano"><primary
-sortas="a-nano">nano</primary></indexterm>
+sortas="a-nano">Nano</primary></indexterm>
 
 <sect2>
 <title>Introduction to <application>nano</application></title>

x/installing/x-setup.xml

@@ -13,8 +13,13 @@
 <?dbhtml filename="xfree86-setup.html"?>
 <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
 <application>X</application> by default if 
@@ -33,7 +38,16 @@ This program brings up a window with three gears turning.  The
 five seconds, so this is a reasonable benchmark.  The window is scalable, and
 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"/>.
 </para>
@@ -41,7 +55,7 @@ the window.</para>
 
 <!-- ================================================== -->
 
-<sect2>
+<sect2 id='fonts'>
 <title>Adding <application>TrueType</application> fonts to
 <application>X</application></title>
 
@@ -49,6 +63,10 @@ the window.</para>
 <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>
 
 <listitem><para>Establish a directory for the fonts and move any 
@@ -71,6 +89,14 @@ directory.</para></listitem>
 <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>
 
 </itemizedlist>
@@ -131,6 +157,10 @@ EndSection</screen></para>
 <filename>/etc/fonts/local.conf</filename>, inside the fontconfig
 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;\
 &lt;dir&gt;/usr/X11R6/lib/X11/fonts/Type1&lt;/dir&gt;' /etc/fonts/local.conf</command></userinput></screen>
@@ -138,10 +168,15 @@ tags:</para>
 <para>The <command>fc-cache</command> program will automatically search
 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
 <application>TrueType</application> fonts when it is restarted.
 You can check to see if the new fonts are available with the
@@ -206,7 +241,7 @@ following command instead:</para>
 </sect2>
 
 <!-- ================================================== -->
-<sect2>
+<sect2 id='xdm'>
 <title>Setting up XDM</title>
 <para><command>xdm</command> provides a graphical logon capability and is
 normally set up in <filename>/etc/inittab</filename>.  Most of the information 
@@ -214,6 +249,10 @@ you need to customize <command>xdm</command> is found in its man page.  To
 execute <command>xdm</command> during bootup, change the initdefault level to 5 
 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>
 
@@ -226,7 +265,7 @@ using the following command:</para>
 </sect2>
 
 <!-- ================================================== -->
-<sect2>
+<sect2 id='x-resources'>
 <title>Using <application>X</application> Resources</title>
 <para>There are many options that can be set in
 <application>X</application> and <application>X</application> clients via
@@ -236,6 +275,10 @@ file.</para>
 <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>
 
 <para>Components of a resource specification are linked together 
@@ -272,7 +315,11 @@ resources are loaded, you use:</para>
 <para>The <command>xrdb</command> instruction is usually placed in 
 <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>