Index: appendices/old/old.xml
===================================================================
--- appendices/old/old.xml	(revision 36f9a236ceb00ea274d7b1c11fa78b40886ff57e)
+++ appendices/old/old.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
@@ -1,11 +1,11 @@
 <appendix role="dsssl" id="appendices-old">
 <?dbhtml filename="old.html" dir="appendices"?>
-<title>Packages which are no longer in the main BLFS Book</title>
+<title>Packages which are no longer in the main <acronym>BLFS</acronym> Book</title>
 
 <para>This appendix contains packages which have been deprecated from the
-main BLFS book for one reason or another.  The reason for their removal has
-been added to the top of the package instructions.  Note that in general
-these instructions are no longer maintained and will probably be removed in
-future releases.</para>
+main <acronym>BLFS</acronym> book for one reason or another.  The reason for 
+their removal has been added to the top of the package instructions.  Note that 
+in general these instructions are no longer maintained and will probably be 
+removed in future releases.</para>
 
 &gnome-common;
Index: appendices/symlinks/symlinks.xml
===================================================================
--- appendices/symlinks/symlinks.xml	(revision 36f9a236ceb00ea274d7b1c11fa78b40886ff57e)
+++ appendices/symlinks/symlinks.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
@@ -1,12 +1,12 @@
 <appendix role="dsssl" id="appendices-symlinks">
 <?dbhtml filename="symlinks.html" dir="appendices"?>
-<title>List of rc?.d symlinks used in LFS/BLFS</title>
+<title>List of rc?.d symlinks used in <acronym>LFS</acronym>/<acronym>BLFS</acronym></title>
 
 <para>This section lists all of the symlinks used by the lfs-bootscripts
 package (correct as of version <userinput>1.9</userinput>) and all of
-the scripts in the BLFS book.  This is for two reasons:  first, so that
-you can see at a glance which number we have used for each package, and
-second so that <emphasis>we</emphasis> can see which number we have
-used for each package!  Without this, it would make our lives more
+the scripts in the <acronym>BLFS</acronym> book.  This is for two reasons:  
+first, so that you can see at a glance which number we have used for each 
+package, and second so that <emphasis>we</emphasis> can see which number we 
+have used for each package!  Without this, it would make our lives more
 difficult (as we'd probably end up with conflicts).</para>
 
Index: book/legalnotice.xml
===================================================================
--- book/legalnotice.xml	(revision 36f9a236ceb00ea274d7b1c11fa78b40886ff57e)
+++ book/legalnotice.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
@@ -1,5 +1,5 @@
 <legalnotice>
 
-<para>Copyright (c) 2001-2003, BLFS Development Team</para>
+<para>Copyright (c) 2001-2003, <acronym>BLFS</acronym> Development Team</para>
 
 <para>All rights reserved.</para>
Index: connect/dhcp/dhcpcd/dhcpcd-exp.xml
===================================================================
--- connect/dhcp/dhcpcd/dhcpcd-exp.xml	(revision 36f9a236ceb00ea274d7b1c11fa78b40886ff57e)
+++ connect/dhcp/dhcpcd/dhcpcd-exp.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
@@ -2,25 +2,27 @@
 <title>Command explanations</title>
 
-<para><userinput>patch -Np1 -i ../dhcpcd-&dhcpcd-version;.patch
-</userinput> : Dhcpcd unpatched puts all configuration and temporary
-files in <filename>/etc/dhcpc</filename>. This becomes very annoying
-when dhcpcd tells you it's running and it's not.  You look in
-<filename>/var/run</filename> for the pid file, but it's not there, the
-pid file that needs deleting is in <filename>/etc/dhcpc</filename>. This
-patch brings this program into FHS compliance, but more importantly,
-puts files where you expect them to be.</para>
+<para><command>patch -Np1 -i ../dhcpcd-&dhcpcd-version;.patch
+</command> : <application>Dhcpcd</application> unpatched puts all configuration 
+and temporary files in <filename>/etc/dhcpc</filename>. This becomes very 
+annoying when <application>dhcpcd</application> tells you it's running and it's 
+not.  You look in <filename>/var/run</filename> for the pid file, but it's not 
+there, the pid file that needs deleting is in <filename>/etc/dhcpc</filename>. 
+This patch brings this program into <acronym>FHS</acronym> compliance, but more 
+importantly, puts files where you expect them to be.</para>
 
-<para><userinput>--prefix=""</userinput> : There may be a good reason for
-abandoning the normal BLFS convention of using --prefix=/usr here.  If
-you are installing DHCP, it is likely that it is required during the
-boot process and <filename>/usr</filename> may be network mounted in which case, dhcpcd
-wouldn't be available due to being on the network!  Therefore, depending
-on your situation, you may want it to be installed in <filename>/sbin</filename> or <filename>/usr/sbin</filename>.  This command installs to <filename>/sbin</filename>.</para>
+<para><command>--prefix=""</command> : There may be a good reason for
+abandoning the normal <acronym>BLFS</acronym> convention of using --prefix=/usr 
+here.  If you are installing <acronym>DHCP</acronym>, it is likely that it is 
+required during the boot process and <filename>/usr</filename> may be network 
+mounted in which case, <command>dhcpcd</command> wouldn't be available due to 
+being on the network!  Therefore, depending on your situation, you may want it 
+to be installed in <filename>/sbin</filename> or <filename>/usr/sbin
+</filename>.  This command installs to <filename>/sbin</filename>.</para>
 
-<para><userinput>--sysconfdir=/var/lib</userinput> : This command install
+<para><command>--sysconfdir=/var/lib</command> : This command install
 configuration files in the <filename>/var/lib</filename>
 directory.</para>
 
-<para><userinput>--mandir=/usr/share/man</userinput> : This command
+<para><command>--mandir=/usr/share/man</command> : This command
 install the man pages to the <filename>/usr/share/man</filename>
 directory.</para>
Index: general/graphlib/imlib2.xml
===================================================================
--- general/graphlib/imlib2.xml	(revision 36f9a236ceb00ea274d7b1c11fa78b40886ff57e)
+++ general/graphlib/imlib2.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
@@ -1,4 +1,4 @@
 <sect1 id="imlib2" xreflabel="Imlib2-&imlib2-version;">
-<?dbhtml filename="imlib2.html" dir="basicnet"?>
+<?dbhtml filename="imlib2.html" dir="general"?>
 <title>Imlib2-&imlib2-version;</title>
 
Index: introduction/important/bootscripts.xml
===================================================================
--- introduction/important/bootscripts.xml	(revision 36f9a236ceb00ea274d7b1c11fa78b40886ff57e)
+++ introduction/important/bootscripts.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
@@ -1,5 +1,5 @@
 <sect1 id="intro-important-bootscripts">
 <?dbhtml filename="bootscripts.html" dir="introduction"?>
-<title>Using BLFS bootscripts</title>
+<title>Using <acronym>BLFS</acronym> bootscripts</title>
 
 <para>The scripts included for packages such as <xref linkend="gpm"/>
@@ -7,8 +7,8 @@
 the lfs-bootscripts package from version 3.2 and later of the <acronym>
 LFS</acronym> book. Note that this is lfs-bootscripts-1.6 and later (the old 
-numbering changed as of LFS-3.2).  The scripts won't work with versions
-of <acronym>LFS</acronym> before 3.2 because of a change in their organization 
-with the new scripts.  However, it should be trivial to adapt the scripts if 
-needed for older <acronym>LFS</acronym> versions.</para>
+numbering changed as of <acronym>LFS</acronym>-3.2).  The scripts won't work 
+with versions of <acronym>LFS</acronym> before 3.2 because of a change in their 
+organization with the new scripts.  However, it should be trivial to adapt the 
+scripts if needed for older <acronym>LFS</acronym> versions.</para>
 
 </sect1>
Index: introduction/welcome/welcome.xml
===================================================================
--- introduction/welcome/welcome.xml	(revision 36f9a236ceb00ea274d7b1c11fa78b40886ff57e)
+++ introduction/welcome/welcome.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
@@ -1,5 +1,5 @@
 <chapter id="intro-welcome">
 <?dbhtml filename="welcome.html" dir="introduction"?>
-<title>Welcome to BLFS</title>
+<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.  Unlike the <acronym>LFS
Index: postlfs/config/config.xml
===================================================================
--- postlfs/config/config.xml	(revision 36f9a236ceb00ea274d7b1c11fa78b40886ff57e)
+++ postlfs/config/config.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
@@ -1,9 +1,9 @@
 <chapter id="postlfs-config">
 <?dbhtml filename="config.html" dir="postlfs"?>
-<title>After LFS Configuration Issues</title>
+<title>After <acronym>LFS</acronym> Configuration Issues</title>
 
-<para>The intention of LFS is to provide a basic system which you can
-build upon.  There are several things, about tidying up the system,
-which many people wonder about once they have done the base install.
+<para>The intention of <acronym>LFS</acronym> is to provide a basic system 
+which you can build upon.  There are several things, about tidying up the 
+system, which many people wonder about once they have done the base install.
 We hope to cover these issues in this chapter.</para>
 
Index: postlfs/postlfs.xml
===================================================================
--- postlfs/postlfs.xml	(revision 36f9a236ceb00ea274d7b1c11fa78b40886ff57e)
+++ postlfs/postlfs.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
@@ -1,5 +1,5 @@
 <part id="postlfs" xreflabel="Post LFS Configuration and Extra Software">
 <?dbhtml filename="postlfs.html" dir="postlfs"?>
-<title>Post LFS Configuration and Extra Software</title>
+<title>Post <acronym>LFS</acronym> Configuration and Extra Software</title>
 
 &postlfs-config;
Index: pst/typesetting/sgml.xml
===================================================================
--- pst/typesetting/sgml.xml	(revision 36f9a236ceb00ea274d7b1c11fa78b40886ff57e)
+++ pst/typesetting/sgml.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
@@ -1,5 +1,5 @@
 <chapter id="pst-sgml">
 <?dbhtml filename="sgml.html" dir="pst"?>
-<title>Standard Generalized Markup Language (SGML)</title>
+<title>Standard Generalized Markup Language (<acronym>SGML</acronym>)</title>
 
 &sgml-common;
Index: pst/typesetting/xml.xml
===================================================================
--- pst/typesetting/xml.xml	(revision 36f9a236ceb00ea274d7b1c11fa78b40886ff57e)
+++ pst/typesetting/xml.xml	(revision b2a9f854ce57247e2d0307fff24bc23f98810c9e)
@@ -1,5 +1,5 @@
 <chapter id="pst-xml">
 <?dbhtml filename="xml.html" dir="pst"?>
-<title>Extensible Markup Language (XML)</title>
+<title>Extensible Markup Language (<acronym>XML</acronym>)</title>
 
 &DocBook;
