Index: appendices/appendices.xml
===================================================================
--- appendices/appendices.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ appendices/appendices.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -1,3 +1,3 @@
-<part id="appendices">
+<part id="appendices" xreflabel="Appendix">
 <title>Appendices</title>
 
Index: book/book.ent
===================================================================
--- book/book.ent	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ book/book.ent	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -21,5 +21,5 @@
 <!ENTITY ffile-root "ftp://ftp.linuxfromscratch.org/blfs-patches/cvs">
 <!ENTITY hfile-root "http://downloads.linuxfromscratch.org/blfs-patches">
-<!ENTITY hints-root "http://hints.linuxfromscratch.org">
+<!ENTITY hints-root "http://www.linuxfromscratch.org/hints">
 <!ENTITY nbsp " ">
 <!ENTITY publisher "Unknown">
Index: introduction/important/beyond.xml
===================================================================
--- introduction/important/beyond.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ introduction/important/beyond.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -1,10 +1,11 @@
 <sect1 id="intro-important-beyond">
 <?dbhtml filename="beyond.html" dir="introduction"?>
-<title>Going Beyond BLFS</title>
+<title>Going Beyond <acronym>BLFS</acronym></title>
 
 <para>The packages that are installed in this book are only the tip of the
-iceberg. We hope that the experience you gained with the LFS book and the BLFS
-book will give you the background needed to compile, install and configure
-packages that are not included in this book.</para>
+iceberg. We hope that the experience you gained with the <acronym>LFS</acronym> 
+book and the <acronym>BLFS</acronym> book will give you the background needed 
+to compile, install and configure packages that are not included in this book.
+</para>
 
 <para>If you are in search of a package that is not in the book, the following
@@ -20,8 +21,8 @@
 lead to the website for the package.</para></listitem>
 
-<listitem><para>If you know the name of the executable, but not the package that
-the executable belongs to, first try a google
-search with the name of the executable. If the results are overwhelming, try
-searching for the given executable in the debian repository at
+<listitem><para>If you know the name of the executable, but not the package 
+that the executable belongs to, first try a google search with the name of the 
+executable. If the results are overwhelming, try searching for the given 
+executable in the debian repository at
 <ulink url="http://www.debian.org/distrib/packages#search_contents"/>.
 </para></listitem>
@@ -35,7 +36,6 @@
 <listitem><para>Many of the newer packages follow the <command>./configure
 &amp;&amp; make &amp;&amp; make install</command> <emphasis>dance</emphasis>
-routine. Help on the
-options accepted by configure can be obtained via the command
-<command>./configure --help</command>.</para></listitem>
+routine. Help on the options accepted by configure can be obtained via the 
+command <command>./configure --help</command>.</para></listitem>
 
 <listitem><para>Most of the packages contain documentation on compiling and
@@ -51,7 +51,7 @@
 </itemizedlist>
 
-<tip><para>If you have found a package that is only available in .deb or .rpm format,
-there are two small scripts rpm2targz and deb2targz that are available at
-<ulink url="http://www.linuxfromscratch.org/~tushar/downloads/"/> to convert
+<tip><para>If you have found a package that is only available in .deb or .rpm 
+format, there are two small scripts rpm2targz and deb2targz that are available 
+at <ulink url="http://www.linuxfromscratch.org/~tushar/downloads/"/> to convert
 the archives into a simple tar.gz format.</para></tip>
 
Index: introduction/important/bootscripts.xml
===================================================================
--- introduction/important/bootscripts.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ introduction/important/bootscripts.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -5,10 +5,10 @@
 <para>The scripts included for packages such as <xref linkend="gpm"/>
 and <xref linkend="alsa"/> are based around the template supplied with
-the lfs-bootscripts package from version 3.2 and later of the LFS 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 LFS
-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 LFS versions.</para>
+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>
 
 </sect1>
Index: introduction/important/position.xml
===================================================================
--- introduction/important/position.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ introduction/important/position.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -3,18 +3,16 @@
 <title>The /usr versus /usr/local debate</title>
 
-<para><emphasis>Should I install XXX in /usr or
-/usr/local?</emphasis></para>
+<para><emphasis>Should I install XXX in <filename>/usr</filename> or
+<filename>/usr/local</filename>?</emphasis></para>
 
-<para>This is a question without an obvious answer for an LFS based
-system.</para>
+<para>This is a question without an obvious answer for an
+<acronym>LFS</acronym> based system.</para>
 
 <para>In traditional unix systems, <filename>/usr</filename> usually 
-contains files that come
-with the system distribution, and the <filename>/usr/local</filename> tree 
-is free for the local administrator to add things to.  The only 
-really hard and fast
-rule is that unix distributions should not touch
-<filename>/usr/local</filename>, except
-perhaps for creating the basic directories within it.</para>
+contains files that come with the system distribution, and the <filename>
+/usr/local</filename> tree is free for the local administrator to add things 
+to.  The only really hard and fast rule is that unix distributions should not 
+touch <filename>/usr/local</filename>, except perhaps for creating the basic 
+directories within it.</para>
 
 <para>With Linux distributions, like Red Hat, Debian etc. a possible rule is
@@ -24,7 +22,7 @@
 <filename>/usr</filename>.</para>
 
-<para>LFS users build their own system and so deciding where the system ends
-and local files begin is not straightforward.  So the choice should be
-made in order to make things easier to administer.  There are several
+<para><acronym>LFS</acronym> users build their own system and so deciding where 
+the system ends and local files begin is not straightforward.  So the choice 
+should be made in order to make things easier to administer.  There are several
 reasons for dividing files between <filename>/usr</filename> and
 <filename>/usr/local</filename>.</para>
@@ -32,51 +30,46 @@
 <itemizedlist>
 
-<listitem><para>On a network of several machines all running LFS, or mixed 
-LFS and
-other Linux distributions, <filename>/usr/local</filename> could be used to 
-hold packages
+<listitem><para>On a network of several machines all running <acronym>LFS
+</acronym>, or mixed <acronym>LFS</acronym> and other Linux distributions, 
+<filename>/usr/local</filename> could be used to hold packages
 that are common between all the computers in the network.  It can be
-NFS mounted or mirrored from a single server.  Here local indicates
-local to the site.</para></listitem>
+<acronym>NFS</acronym> mounted or mirrored from a single server.  Here local 
+indicates local to the site.</para></listitem>
 
 <listitem><para>On a network of several computers all running an identical 
-LFS system <filename>/usr/local</filename> could hold packages that 
-are different between the machines.  In this case local refers to 
-the individual computers.</para></listitem>
+<acronym>LFS</acronym> system <filename>/usr/local</filename> could hold 
+packages that are different between the machines.  In this case local refers 
+to the individual computers.</para></listitem>
 
 <listitem><para>Even on a single computer <filename>/usr/local</filename> can 
 be useful if you have several distributions installed simultaneously, and want 
-a place to put packages that will be the same on all of
-them.</para></listitem>
+a place to put packages that will be the same on all of them.</para></listitem>
 
-<listitem><para>Or you might regularly rebuild your LFS, but want 
-a place to put files
-that you don't want to rebuild each time.  This way you can wipe the
-LFS filesystem and start from a clean partition every time without losing
-everything.</para></listitem>
+<listitem><para>Or you might regularly rebuild your <acronym>LFS</acronym>, but 
+want a place to put files that you don't want to rebuild each time.  This way 
+you can wipe the <acronym>LFS</acronym> filesystem and start from a clean 
+partition every time without losing everything.</para></listitem>
 
 </itemizedlist>
 
-<para>Some people ask why not use your own directory tree, e.g.
-<filename>/usr/site</filename> rather than
-<filename>/usr/local</filename>?</para>
+<para>Some people ask why not use your own directory tree, e.g. <filename>
+/usr/site</filename> rather than <filename>/usr/local</filename>?</para>
 
-<para>There is nothing stopping you, many sites do make their own trees, however
-it makes installing new software more difficult.  Automatic installers
+<para>There is nothing stopping you, many sites do make their own trees, 
+however it makes installing new software more difficult.  Automatic installers
 often look for dependencies in <filename>/usr</filename> and
 <filename>/usr/local</filename>, and if the file it is looking
 for is in <filename>/usr/site</filename> instead, the installer will 
-probably fail unless
-you specifically tell it where to look.</para>
+probably fail unless you specifically tell it where to look.</para>
 
-<para><emphasis>What is the BLFS position on this?</emphasis></para>
+<para><emphasis>What is the <acronym>BLFS</acronym> position on this?</emphasis>
+</para>
 
-<para>All of the BLFS instructions install programs in
+<para>All of the <acronym>BLFS</acronym> instructions install programs in
 <filename>/usr</filename> unless specifically stated otherwise.  There
 are examples where some files are placed in the
 <filename>/usr/local</filename> hierarchy but these are documented and
 are generally for a good reason. These exceptions should be well documented 
-in the book.  If you think you have
-found one which isn't please tell us!</para>
+in the book.  If you think you have found one which isn't please tell us!</para>
 
 </sect1>
Index: introduction/important/unpacking.xml
===================================================================
--- introduction/important/unpacking.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ introduction/important/unpacking.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -3,14 +3,12 @@
 <title>Getting and unpacking the software</title>
 
-<para>Those people who have built a LFS system will be aware of the
-general principles of downloading and unpacking software.  We will
+<para>Those people who have built a <acronym>LFS</acronym> system will be aware 
+of the general principles of downloading and unpacking software.  We will
 however repeat some of that information here for those new to building
 their own software.</para>
 
-<para>One difference from the LFS book is that we do <emphasis>not</emphasis> 
-mirror the packages on the BLFS website.
-Instead, each set of installation instructions contains a URL from which
-you can download the package.  We do however keep a selection of patches
-available via http/ftp.  These are referenced as needed in the
+<para>Each set of installation instructions contains a <acronym>URL</acronym> 
+from which you can download the package.  We do however keep a selection of 
+patches available via http.  These are referenced as needed in the
 installation instructions.</para>
 
@@ -32,18 +30,16 @@
 the following two commands, depending on the filename:</para>
 
-<screen><userinput>tar -xvzf filename.tar.gz
+<screen><command>tar -xvzf filename.tar.gz
 tar -xvzf filename.tgz
-tar -xvzf filename.tar.Z</userinput></screen>
+tar -xvzf filename.tar.Z</command></screen>
 
 <para>If a file is tar'ed and bzip2'ed, it can usually be unpacked by
 running:</para>
 
-<screen><userinput>tar -jxvf filename.tar.bz2</userinput></screen>
+<screen><command>tar -jxvf filename.tar.bz2</command></screen>
 
-<para>This applies as long as you patched tar to include the j option
-during your LFS install.  If you didn't, you can use a slightly
-different method:</para>
+<para>You can also use a slightly different method:</para>
 
-<screen><userinput>bzcat filename.tar.bz2 | tar -xv</userinput></screen>
+<screen><command>bzcat filename.tar.bz2 | tar -xv</command></screen>
 
 <para>Finally, you need to be able to unpack patches which are generally
@@ -52,6 +48,6 @@
 commands depending on whether the file is .gz or .bz2:</para>
 
-<screen><userinput>gunzip patchname.gz
-bunzip2 patchname.bz2</userinput></screen>
+<screen><command>gunzip patchname.gz
+bunzip2 patchname.bz2</command></screen>
 
 </sect2>
Index: introduction/welcome/acknowledgments.xml
===================================================================
--- introduction/welcome/acknowledgments.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ introduction/welcome/acknowledgments.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -4,5 +4,6 @@
 
 <para>We would like to thank the following people and organizations for their
-contributions toward the BLFS and LFS projects:</para>
+contributions toward the <acronym>BLFS</acronym> and <acronym>LFS</acronym> 
+projects:</para>
 
 <itemizedlist>
@@ -19,33 +20,36 @@
 <listitem><para><ulink url="mailto:gerard@linuxfromscratch.org">Gerard
 Beekmans</ulink> &lt;gerard@linuxfromscratch.org&gt; for starting and
-writing the vast majority of the LFS project.</para></listitem>
+writing the vast majority of the <acronym>LFS</acronym> project.</para>
+</listitem>
 
 <listitem><para><ulink url="mailto:highos@linuxfromscratch.org">Jesse
 Tie-Ten-Quee</ulink> &lt;highos@linuxfromscratch.org&gt; for answering
-many questions on irc, having a great deal of patience and for not
-killing the editor for the joke in the original BLFS
-announcement!</para></listitem>
+many questions on <acronym>irc</acronym>, having a great deal of patience and 
+for not killing the former editor for the joke in the original <acronym>BLFS
+</acronym> announcement!</para></listitem>
 
-<listitem><para><ulink url="http://www.dreamwvr.com/services">DREAMWVR.COM</ulink> for their ongoing sponsorship by donating various resources to the LFS and
-related sub projects.</para></listitem>
+<listitem><para><ulink url="http://www.dreamwvr.com/services">DREAMWVR.COM
+</ulink> for their ongoing sponsorship by donating various resources to the
+<acronym>LFS</acronym> and related sub projects.</para></listitem>
 
 <listitem><para>Robert Briggs for donating the linuxfromscratch.org and
 linuxfromscratch.com domain names.</para></listitem>
 
-<listitem><para><ulink url="mailto:bkenoah@oswd.org">Frank
-Skettino</ulink> &lt;bkenoah@oswd.org&gt; at <ulink 
-url="http://www.oswd.org">OSWD</ulink> for coming up the initial design 
-of the LFS and BLFS websites.</para></listitem>
+<listitem><para><ulink url="mailto:bkenoah@oswd.org">Frank Skettino</ulink> 
+&lt;bkenoah@oswd.org&gt; at <ulink  url="http://www.oswd.org">OSWD</ulink> for 
+coming up the initial design of the <acronym>LFS</acronym> and <acronym>BLFS
+</acronym> websites.</para></listitem>
 
-<listitem><para><ulink url="mailto:garrett@linux.com">Garrett
-LeSage</ulink> &lt;garrett@linux.com&gt; for creating the LFS 
-banner</para></listitem>
+<listitem><para><ulink url="mailto:garrett@linux.com">Garrett LeSage</ulink> 
+&lt;garrett@linux.com&gt; for creating the <acronym>LFS</acronym> banner</para>
+</listitem>
 
-<listitem><para>Jeff Bauman (former co-editor of the book) for his
-assistance with getting BLFS off the ground.</para></listitem>
+<listitem><para>Jeff Bauman (former co-editor of the book) for his assistance 
+with getting <acronym>BLFS</acronym> off the ground.</para></listitem>
 
-<listitem><para>Countless other people on the various LFS and BLFS 
-mailing lists who are making this book happen by giving their
-suggestions, testing the book and submitting bug reports.</para></listitem>
+<listitem><para>Countless other people on the various <acronym>LFS</acronym> 
+and <acronym>BLFS</acronym> mailing lists who are making this book happen by 
+giving their suggestions, testing the book and submitting bug reports.</para>
+</listitem>
 
 </itemizedlist>
Index: introduction/welcome/askhelp.xml
===================================================================
--- introduction/welcome/askhelp.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ introduction/welcome/askhelp.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -1,15 +1,14 @@
 <sect1 id="intro-welcome-askhelp">
 <?dbhtml filename="askhelp.html" dir="introduction"?>
-<title>Asking for help and the FAQ</title>
+<title>Asking for help and the <acronym>FAQ</acronym></title>
 
 <para>If you encounter a problem while using this book, and your problem
-is not listed in the FAQ (<ulink
-url="http://www.linuxfromscratch.org/faq"/>), you will find that most
-of the people on Internet Relay Chat (IRC) and
-on the mailing lists are willing to help you. An
-overview of the LFS mailing lists can be found in
-<xref linkend="intro-welcome-maillists"/>. To assist us in diagnosing and solving
-your problem, include as much relevant information as possible in your
-request for help.</para>
+is not listed in the <acronym>FAQ</acronym> (<ulink
+url="http://www.linuxfromscratch.org/faq"/>), you will find that most of the 
+people on Internet Relay Chat (<acronym>IRC</acronym>) and on the mailing lists 
+are willing to help you. An overview of the <acronym>LFS</acronym> mailing 
+lists can be found in <xref linkend="intro-welcome-maillists"/>. To assist us 
+in diagnosing and solving your problem, include as much relevant information as 
+possible in your request for help.</para>
 
 <sect2>
@@ -23,23 +22,23 @@
 available as a module to the kernel.  If it is a module, is it configured
 properly in <filename>modules.conf</filename> and has it been loaded.  You
-should use <userinput>lsmod</userinput> to see if it's loaded. Check the
-<filename>sys.log</filename> or run <userinput>modprobe
-&lt;driver&gt;</userinput>
-to review any error message.  If it loads properly, you may need to add
-the <userinput>modprobe</userinput> to your boot scripts.</para></listitem>
+should use <command>lsmod</command> as root to see if it's loaded. Check the
+<filename>sys.log</filename> or run <command>modprobe &lt;driver&gt;
+</command> to review any error message.  If it loads properly, you may need 
+to add the <command>modprobe</command> to your boot scripts.</para></listitem>
 
 <listitem><para>Are your permissions properly set, especially for
-devices.  LFS uses groups to make these settings easier, but it also
-adds the step of adding users to groups to allow access. A simple
-<userinput>moduser -G audio &lt;user&gt;</userinput> may be all that's
-necessary for that user to have access to the sound
-system.  Any question that starts out with "It works as root, but not as
-..." should review permissions throughly prior to asking.</para></listitem>
+devices. <acronym>LFS</acronym> uses groups to make these settings easier, but 
+it also adds the step of adding users to groups to allow access. A simple
+<command>moduser -G audio &lt;user&gt;</command> may be all that's necessary 
+for that user to have access to the sound system.  Any question that starts 
+out with "It works as root, but not as ..." should review permissions throughly
+prior to asking.</para></listitem>
 
-<listitem><para>BLFS liberally uses <filename>/opt/&lt;package&gt;</filename>. The main objection to this centers around the need to
-expand your environment variables for each package placed there (e.g.
+<listitem><para><acronym>BLFS</acronym> liberally uses <filename>
+/opt/&lt;package&gt;</filename>. The main objection to this centers around the 
+need to expand your environment variables for each package placed there (e.g.
 PATH=$PATH:/opt/kde/bin).  In some cases, the package will walk you
-through the changes, but some will not.  <xref linkend="appendices-generic"/> is available to
-help you check.</para></listitem>
+through the changes, but some will not.  <xref linkend="appendices-generic"/> 
+is available to help you check.</para></listitem>
 </itemizedlist></sect2>
 
@@ -57,6 +56,6 @@
 <listitem><para>the exact error message or symptom you are
 receiving,</para></listitem>
-<listitem><para>whether you have deviated from the book or LFS at
-all.</para></listitem>
+<listitem><para>whether you have deviated from the book or
+<acronym>LFS</acronym> at all.</para></listitem>
 </itemizedlist>
 
@@ -66,11 +65,11 @@
 <para>Expect guidance instead of specific instructions. If you are
 instructed to read something, please do so, it generally implies that
-the answer was way too obvious and that the question would not have been asked if a little
-research was done prior to asking. The volunteers in the mailing list
-prefer not to be used as an alternative to doing reasonable research on
-your end.  In addition, the quality of your experience with BLFS is also greatly
-enhanced by this research, and the quality of volunteers is enhanced
-because they don't feel that their time has been abused, so they are
-far more likely to participate.</para>
+the answer was way too obvious and that the question would not have been asked 
+if a little research was done prior to asking. The volunteers in the mailing 
+list prefer not to be used as an alternative to doing reasonable research on
+your end.  In addition, the quality of your experience with <acronym>BLFS
+</acronym> is also greatly enhanced by this research, and the quality of 
+volunteers is enhanced because they don't feel that their time has been abused, 
+so they are far more likely to participate.</para>
 
 <para>An excellent article on asking for help on the Internet in general
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ introduction/welcome/changelog.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -1,3 +1,3 @@
-<sect1 id="intro-welcome-changelog">
+<sect1 id="intro-welcome-changelog" role="dsssl">
 <?dbhtml filename="changelog.html" dir="introduction"?>
 <title>Changelog</title>
@@ -11,5 +11,9 @@
 <itemizedlist>
 
-<listitem><para>September 11th, 2003 [lary]: added imlib2 and
+<listitem><para>September 11th, 2003 [larry]: Arranged Part
+I-Introduction to follow LFS order and, of course,
+tagged.</para></listitem>
+
+<listitem><para>September 11th, 2003 [larry]: added imlib2 and
 openquicktime submitted by Igor.</para></listitem>
 
Index: introduction/welcome/contact.xml
===================================================================
--- introduction/welcome/contact.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ introduction/welcome/contact.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -3,10 +3,10 @@
 <title>Contact information</title>
 
-<para>Please direct your emails to one of the BLFS mailing lists. See
-<xref linkend="intro-welcome-maillists"/> for more information on the
-available mailing lists.</para>
+<para>Please direct your emails to one of the <acronym>BLFS</acronym> mailing 
+lists. See <xref linkend="intro-welcome-maillists"/> for more information on 
+the available mailing lists.</para>
 
-<para>The current BLFS maintainer is &maintainer-fullname;.  If you need
-to reach &maintainer-firstname;, send an email to
+<para>The current <acronym>BLFS</acronym> maintainer is &maintainer-fullname;.  
+If you need to reach &maintainer-firstname;, send an email to
 <ulink url="mailto:&maintainer-address;">&maintainer-address;</ulink>.</para>
 
Index: introduction/welcome/conventions.xml
===================================================================
--- introduction/welcome/conventions.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ introduction/welcome/conventions.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -32,9 +32,9 @@
 websites, etc.</para></blockquote>
 
-<para><screen><userinput>cat &gt; $LFS/etc/group &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; $LFS/etc/group &lt;&lt; "EOF"</command>>
 	root:x:0:
 	bin:x:1:
 	......
-<userinput>EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen>
 
 <blockquote><para>This type of section is used mainly when creating 
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ introduction/welcome/credits.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -3,6 +3,6 @@
 <title>Credits</title>
 
-<para>Many people have contributed both directly and indirectly to BLFS.
-This page lists all of those we can think of.  We may well have
+<para>Many people have contributed both directly and indirectly to <acronym>
+BLFS</acronym>. This page lists all of those we can think of.  We may well have
 missed people out and if you feel this is the case, drop us line.  Many
 thanks to all of the LFS community for their assistance with this
@@ -16,9 +16,10 @@
 <itemizedlist>
 
-<listitem><para><emphasis>Editor:</emphasis> Larry Lawrence <ulink
-url="mailto:&maintainer-address;">&lt;&maintainer-address;&gt;</ulink></para></listitem>
-
-<listitem><para><emphasis>Co-Editors:</emphasis> Bruce 
-Dubbs, Mark Hymers, Billy O'Connor and Tushar Teredesai</para></listitem>
+<listitem><para><emphasis>Editor:</emphasis> Larry Lawrence <ulink 
+url="mailto:&maintainer-address;">&lt;&maintainer-address;&gt;</ulink></para>
+</listitem>
+
+<listitem><para><emphasis>Co-Editors:</emphasis> Bruce Dubbs, Mark Hymers, 
+Billy O'Connor and Tushar Teredesai</para></listitem>
 
 </itemizedlist>
@@ -29,22 +30,22 @@
 <itemizedlist>
 
-<listitem><para>Chapter 01.  Based on the LFS introductory text by
-<emphasis>Gerard Beekmans</emphasis>, modified by <emphasis>Mark
-Hymers</emphasis> for BLFS.</para></listitem>
-
-<listitem><para>Chapter 02: The /usr versus /usr/local
-debate: <emphasis>Andrew McMurry</emphasis>.</para></listitem>
-
-<listitem><para>Chapter 02: Going beyond BLFS: <emphasis>Tushar
-Teredesai</emphasis>.</para></listitem>
-
-<listitem><para>Chapter 03: /etc/inputrc: <emphasis>Chris
-Lynn</emphasis>.</para></listitem>
+<listitem><para>Chapter 01.  Based on the LFS introductory text by <emphasis>
+Gerard Beekmans</emphasis>, modified by <emphasis>Mark Hymers</emphasis>
+for <acronym>BLFS</acronym>.</para></listitem>
+
+<listitem><para>Chapter 02: The /usr versus /usr/local debate: <emphasis>Andrew 
+McMurry</emphasis>.</para></listitem>
+
+<listitem><para>Chapter 02: Going beyond BLFS: <emphasis>Tushar Teredesai
+</emphasis>.</para></listitem>
+
+<listitem><para>Chapter 03: /etc/inputrc: <emphasis>Chris Lynn</emphasis>.
+</para></listitem>
 
 <listitem><para>Chapter 03: Customizing your logon &amp; vimrc: <emphasis>Mark
 Hymers</emphasis>.</para></listitem>
 
-<listitem><para>Chapter 03: Random number script <emphasis>Larry
-Lawrence</emphasis>.</para></listitem>
+<listitem><para>Chapter 03: Random number script <emphasis>Larry Lawrence
+</emphasis>.</para></listitem>
 
 <listitem><para>Chapter 03: Creating a custom bootdisk <emphasis>Mike
@@ -54,7 +55,6 @@
 Robertson</emphasis>.</para></listitem>
 
-<listitem><para>Chapter 04: <!--<xref
-linkend="ch06-firewall"/>-->Firewalling: <emphasis>Henning
-Rohde with thanks to Jeff Bauman</emphasis>.</para></listitem>
+<listitem><para>Chapter 04: <!--<xref linkend="ch06-firewall"/>-->Firewalling: 
+<emphasis>Henning Rohde with thanks to Jeff Bauman</emphasis>.</para></listitem>
 
 <listitem><para>Chapter 11: Which <emphasis>Mark Hymers</emphasis> with
@@ -62,13 +62,15 @@
 Tie-Ten-Quee</emphasis>.</para></listitem>
 
-<listitem><para>Chapter 26: XFree86 <emphasis>Bruce Dubbs</emphasis>.</para></listitem>
-
-<listitem><para>Chapter 28: Intro to Window Managers 
-<emphasis>Bruce Dubbs</emphasis>.</para></listitem>
+<listitem><para>Chapter 26: XFree86 <emphasis>Bruce Dubbs</emphasis>.</para>
+</listitem>
+
+<listitem><para>Chapter 28: Intro to Window Managers <emphasis>Bruce Dubbs
+</emphasis>.</para></listitem>
 
 <listitem><para>Chapter 29: KDE: <emphasis>Bruce Dubbs</emphasis>.</para>
 </listitem>
 
-<listitem><para>Chapter 32: GNOME: <emphasis>Larry Lawrence</emphasis>.</para></listitem>
+<listitem><para>Chapter 32: GNOME: <emphasis>Larry Lawrence</emphasis>.</para>
+</listitem>
 
 </itemizedlist>
@@ -82,33 +84,34 @@
 xvid and xsane: <emphasis>Alex Kloss</emphasis></para></listitem>
 
-<listitem><para>AbiWord, at-spi, ATK, audiofile, avifile, bc, bonobo-activation, bug-buddy,
-cdrdao, cdrtools, cpio, curl, dhcp, enlightenment, eog, esound,
-fcron, fluxbox, FNLIB, gail, galeon, gconf-editor, gdbm, gedit,
-gimp, GLib2, gmp, gnet, gnome-applets, gnome-desktop,
-gnome-games, gnome-icon-theme, gnome-libs,
-gnome-media, gnome-mime-data, gnome-panel, gnome-session,
+<listitem><para>AbiWord, at-spi, ATK, audiofile, avifile, bc, bonobo-activation, 
+bug-buddy, cdrdao, cdrtools, cpio, curl, dhcp, enlightenment, eog, esound, 
+fcron, fluxbox, FNLIB, gail, galeon, gconf-editor, gdbm, gedit, gimp, GLib2, 
+gmp, gnet, gnome-applets, gnome-desktop, gnome-games, gnome-icon-theme, 
+gnome-libs, gnome-media, gnome-mime-data, gnome-panel, gnome-session,
 gnome-system-monitor, gnome-terminal, gnome-themes, gnome-utils, gnome-vfs,
-gnome2-user-docs, gnumeric, GTK+2, gtk-doc, gtk-engines,
-gtk-thinice-engine, eel, imlib, intltool,
-lame, libao, libart_lgpl, libbonobo, libbonoboui, libgail-gnome,
-libglade2, libgnome, libgnomecanvas, libgnomeprint, libgnomeprintui,
-libgnomeui, libgtkhtml, libgtop, libIDL, libogg, librep, librsvg,
-libvorbis, libwnck, libxml2, libxslt, linc, LPRng, Linux_PAM,
+gnome2-user-docs, gnumeric, GTK+2, gtk-doc, gtk-engines, gtk-thinice-engine, 
+eel, imlib, intltool, lame, libao, libart_lgpl, libbonobo, libbonoboui, 
+libgail-gnome, libglade2, libgnome, libgnomecanvas, libgnomeprint, 
+libgnomeprintui, libgnomeui, libgtkhtml, libgtop, libIDL, libogg, librep, 
+librsvg, libvorbis, libwnck, libxml2, libxslt, linc, LPRng, Linux_PAM,
 metacity, MPlayer, mutt, nautilus, nautilus-media, oaf, OpenJade, OpenSP, 
 OpenSSH, ORBit, ORBit2, pan, Pango, pccts, pcre, pkgconfig, postfix,
 procmail, Python, QT, rep-gtk, ruby, sawfish, scrollkeeper, sgml-common,
-sgml-dtd, shadow, startup-notification, unzip,
-vorbis-tools, vte, wget, XFce, xine, xml-dtd, yelp and zip: <emphasis>Larry Lawrence</emphasis></para></listitem>
+sgml-dtd, shadow, startup-notification, unzip, vorbis-tools, vte, wget, XFce, 
+xine, xml-dtd, yelp and zip: <emphasis>Larry Lawrence</emphasis></para>
+</listitem>
 
 <listitem><para>CDParanoia, mpg123, SDL and XMMS: <emphasis>Jeroen
 Coumans</emphasis></para></listitem>
 
-<listitem><para>alsa, cvs, dhcpcd, gpm, hdparm, libjpeg, libmng, libpng, libtiff, libungif, links, lynx, openssl, tcsh, which, zsch, zlib: <emphasis>Mark Hymers</emphasis></para></listitem>
+<listitem><para>alsa, cvs, dhcpcd, gpm, hdparm, libjpeg, libmng, libpng, 
+libtiff, libungif, links, lynx, openssl, tcsh, which, zsch, zlib: <emphasis>
+Mark Hymers</emphasis></para></listitem>
 
 <listitem><para>daemontools, traceroute and ucspi-tcp: <emphasis>Jeff
 Bauman</emphasis></para></listitem>
 
-<listitem><para>db and lcms: <emphasis>Jeremy Jones and Mark
-Hymers</emphasis></para></listitem>
+<listitem><para>db and lcms: <emphasis>Jeremy Jones and Mark Hymers</emphasis>
+</para></listitem>
 
 <listitem><para>aspell, balsa, bind, bonobo, bonobo-conf, cvs server,
@@ -117,40 +120,39 @@
 libesmtp, libfam, libghttp, libglade, pine, portmap, PostgreSQL,
 pspell, qmail, qpopper, readline, reiserfs, Samba, sendmail, slib,
-slrn, soup, tex, tcp-wrappers, and xinetd: <emphasis>Billy O'Connor</emphasis></para></listitem>  
-
-<listitem><para>ProFTPD and rsync: <emphasis>Daniel Baumann</emphasis></para></listitem>
-
-<listitem><para>ESP Ghostscript: <emphasis>Matt Rogers</emphasis></para></listitem>
-
-<listitem><para>fetchmail and wvdial: <emphasis>Paul
-Campbell</emphasis></para></listitem>
-
-<listitem><para>udftools: <emphasis>Richard
-Downing</emphasis></para></listitem>
+slrn, soup, tex, tcp-wrappers, and xinetd: <emphasis>Billy O'Connor</emphasis>
+</para></listitem>  
+
+<listitem><para>ProFTPD and rsync: <emphasis>Daniel Baumann</emphasis></para>
+</listitem>
+
+<listitem><para>ESP Ghostscript: <emphasis>Matt Rogers</emphasis></para>
+</listitem>
+
+<listitem><para>fetchmail and wvdial: <emphasis>Paul Campbell</emphasis></para>
+</listitem>
+
+<listitem><para>udftools: <emphasis>Richard Downing</emphasis></para></listitem>
 
 <listitem><para>directFB, libMPEG3, MySQL-4, NASM and SVGAlib: <emphasis>Igor
 Zivkovic</emphasis></para></listitem>
 
-<listitem><para>tripwire : <emphasis>Manfred
-Glombowski</emphasis></para></listitem>
-
-<listitem><para>alsa-oss, inetutils, gdk, GLib, GTK+, libxml and vim: <emphasis>James
-Iwanek</emphasis></para></listitem>
-
-<listitem><para>iptables: <emphasis>Henning
-Rohde</emphasis></para></listitem>
+<listitem><para>tripwire : <emphasis>Manfred Glombowski</emphasis></para>
+</listitem>
+
+<listitem><para>alsa-oss, inetutils, gdk, GLib, GTK+, libxml and vim: <emphasis>
+James Iwanek</emphasis></para></listitem>
+
+<listitem><para>iptables: <emphasis>Henning Rohde</emphasis></para></listitem>
 
 <listitem><para>joe, nano, nmap, slang, w3m  and whois: <emphasis>Timothy
 Bauscher</emphasis></para></listitem>
 
-<listitem><para>MySQL: <emphasis>Jesse
-Tie-Ten-Quee</emphasis></para></listitem>
+<listitem><para>MySQL: <emphasis>Jesse Tie-Ten-Quee</emphasis></para></listitem>
 
 <listitem><para>fontconfig, gcc, gcc2, j2sdk, mozilla, nas, openoffice,
-STLport, and bind-utils: <emphasis>
-Tushar Teredesai</emphasis></para></listitem>
-
-<listitem><para>ncpfs and RP-PPPoE: <emphasis> DJ Lucas
-</emphasis></para></listitem>
+STLport, and bind-utils: <emphasis>Tushar Teredesai</emphasis></para></listitem>
+
+<listitem><para>ncpfs and RP-PPPoE: <emphasis>DJ Lucas</emphasis></para>
+</listitem>
 
 </itemizedlist>
@@ -163,5 +165,6 @@
 
 <listitem><para><emphasis>Gerard Beekmans</emphasis> for generally
-putting up with us and for running the whole LFS project.</para></listitem>
+putting up with us and for running the whole <acronym>LFS</acronym> project.
+</para></listitem>
 
 <listitem><para><emphasis>Bruce Dubbs</emphasis> for writing the kde.txt
@@ -175,41 +178,41 @@
 
 <listitem><para><emphasis>Jeremy Jones</emphasis> (otherwise known as
-<emphasis>mca</emphasis>) for hacking Makefiles and general
-assistance.</para></listitem>
-
-<listitem><para><emphasis>J_Man</emphasis> for submitting a
-gpm-1.19.3.diff file on which our gpm instructions are
-based.</para></listitem>
+<emphasis>mca</emphasis>) for hacking Makefiles and general assistance.</para>
+</listitem>
+
+<listitem><para><emphasis>J_Man</emphasis> for submitting a gpm-1.19.3.diff 
+file on which our gpm instructions are based.</para></listitem>
 
 <listitem><para><emphasis>Scot Mc Pherson</emphasis> for writing the
 gnome-1.4.txt hint from which was gathered useful information and for
-warning us that Gnome2 was a toy.</para></listitem>
+warning us that Gnome Version 2.0 may not be ready to put in the book.</para>
+</listitem>
 
 <listitem><para><emphasis>Tushar Teredesai</emphasis> for writing the
-Compiling Java 2 SDK from Scratch hint on which j2sdk is
-based and for writing the docbook hint used throughout the typesetting
-chapter.</para></listitem>
+Compiling Java 2 SDK from Scratch hint on which j2sdk is based and for writing 
+the docbook hint used throughout the typesetting chapter.</para></listitem>
 
 <listitem><para><emphasis>Oliver Brakmann</emphasis> for developing the
-dhcpcd patch for FHS compliance.</para></listitem>
+dhcpcd patch for <acronym>FHS</acronym> compliance.</para></listitem>
 
 <listitem><para><emphasis>DJ Lucas</emphasis> for contributing to dhcpcd
-patch and many contributions while dhcp section was being
-developed.</para></listitem>
-
-<listitem><para><emphasis>Billy O'Connor</emphasis> for building gnome2
-so many times (I thought my four was a lot) and being very helpful with
-his comments on that section.</para></listitem>
-
-<listitem><para><emphasis>Ted Riley</emphasis> for writing the Linux-PAM
-+ CrackLib + Shadow hint on which reinstalling shadow to use PAM is
-based.</para></listitem>
+patch and many contributions while dhcp section was being developed.</para>
+</listitem>
+
+<listitem><para><emphasis>Billy O'Connor</emphasis> for building GNOME
+2.0 so many times and being very helpful with his comments on that section.
+</para></listitem>
+
+<listitem><para><emphasis>Ted Riley</emphasis> for writing the 
+Linux-<acronym>PAM</acronym> + CrackLib + Shadow hint on which reinstalling 
+shadow to use <acronym>PAM</acronym> is based.</para></listitem>
 
 <listitem><para><emphasis>Fernando Arbeiza</emphasis> for doing great
-quality assurance on Shadow utilizing PAM.  The machine access he saved
-may have been yours.</para></listitem>
-
-<listitem><para><emphasis>Jim Harris</emphasis> for writing the
-dig-nslookup-host.txt hint on which the bind-utils instructions are based.</para></listitem>
+quality assurance on Shadow utilizing <acronym>PAM</acronym>.  The machine 
+access he saved may have been yours.</para></listitem>
+
+<listitem><para><emphasis>Jim Harris</emphasis> for writing the 
+dig-nslookup-host.txt hint on which the bind-utils instructions are based.
+</para></listitem>
 
 </itemizedlist>
Index: introduction/welcome/maillists.xml
===================================================================
--- introduction/welcome/maillists.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ introduction/welcome/maillists.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -174,7 +174,7 @@
 
 <para>To unsubscribe from a list, send an email 
-to <ulink url="mailto:listar@linuxfromscratch.org"/> and 
-write <emphasis>unsubscribe listname</emphasis> as the subject header of 
-the message.</para>
+to <ulink url="mailto:listar@linuxfromscratch.org">listar@linuxfromscratch.org
+</ulink> and write <emphasis>unsubscribe listname</emphasis> as the subject 
+header of the message.</para>
 
 <para>Multiple lists can be unsubscribed at the same time
Index: introduction/welcome/newsserver.xml
===================================================================
--- introduction/welcome/newsserver.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ introduction/welcome/newsserver.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -7,5 +7,5 @@
 will be copied to its correspondent newsgroup, and vice versa.</para>
 
-<para>The news server can be reached at <ulink
+<para>The news server can be reached at <ulink 
 url="news:news.linuxfromscratch.org"/>.</para>
 
Index: introduction/welcome/version.xml
===================================================================
--- introduction/welcome/version.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ introduction/welcome/version.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -1,78 +1,23 @@
-<sect1 id="intro-welcome-version" xreflabel="Book Version">
+<sect1 id="intro-welcome-version" xreflabel="Book Version" role="dsssl">
 <?dbhtml filename="version.html" dir="introduction"?>
 <title>Book version</title>
 
-<para>This is BLFS-BOOK version &version; dated &releasedate;. If this 
-version is older than a month a newer version is probably already available 
-for download. Check one of the mirror sites below for updated
+<para>This is <acronym>BLFS</acronym>-BOOK version &version; dated &releasedate;. 
+If this version is older than a month a newer version is probably already 
+available for download. Check one of the mirror sites below for updated
 versions.</para>
-
-<para>Below is a list of our current HTTP and FTP mirror sites as
-of September 29th 2002. This list might not be accurate anymore. 
-The latest info can be found on our website at
-<ulink url="http://beyond.linuxfromscratch.org"/>.</para>
-
-<sect2>
-<title>HTTP Mirrors</title>
-
-<sect3>
-<title>North America</title>
-
-<itemizedlist>
-
-<listitem><para>Ottawa, Ontario, Canada [100 Mbps] - <ulink
-url="http://beyond.linuxfromscratch.org/blfs/intro.shtml"/></para></listitem>
-
-<listitem><para>Calgary, Alberta, Canada [10 Mbps] - <ulink
-url="http://beyond.ca.linuxfromscratch.org/blfs/intro.shtml"/></para></listitem>
-
-<listitem><para>Columbus, Ohio, USA [1 Mbit] - <ulink
-url="http://beyond.us.linuxfromscratch.org/blfs/intro.shtml"/></para></listitem>
-
-</itemizedlist>
-
-</sect3>
-
-<sect3>
-<title>Europe</title>
-
-<itemizedlist>
-
-<listitem><para>Amsterdam, The Netherlands [100 Mbps] - <ulink
-url="http://beyond.nl.linuxfromscratch.org/blfs/intro.shtml"/></para></listitem>
-
-<listitem><para>Oslo, Norway [100 Mbit] - <ulink
-url="http://beyond.no.linuxfromscratch.org/blfs/intro.shtml"/></para></listitem>
-
-<listitem><para>Karlsruhe/Germany [100 Mbit] - <ulink 
-url="http://blfs.netservice-neuss.de/blfs/intro.shtml"/></para></listitem>
-
-<listitem><para>Vienna Univ. of Technology, Austria [64 Mbit] - <ulink
-url="http://beyond.at.linuxfromscratch.org/blfs/intro.shtml"/></para></listitem>
-
-<listitem><para>Karlskrona, Sweden [10 Mbit] - <ulink
-url="http://beyond.se.linuxfromscratch.org/blfs/intro.shtml"/></para></listitem>
-
-<listitem><para>Teeside, United Kingdom [256 Kbit] - <ulink
-url="http://beyond.linuxfromscratch.co.uk/blfs/intro.shtml"/></para></listitem>
-
-</itemizedlist>
-
-</sect3>
-
-<sect3>
-<title>Australia</title>
-
-<itemizedlist>
-
-<listitem><para>Brisbane, Australia [155 Mbit] - <ulink
-url="http://beyond.au.linuxfromscratch.org/blfs/intro.shtml"/></para></listitem>
-
-</itemizedlist>
-
-</sect3>
-
-</sect2>
 
 </sect1>
 
+<sect1 id="intro-welcome-mirrors" xreflabel="Mirrors">
+<title>Mirror sites</title>
+
+<para>The <acronym>BLFS</acronym> project has a number of mirrors setup
+world-wide to make it easier and more convenient for you to access the
+website.  Please visit the <ulink url="http://www.linuxfromscratch.org/blfs">
+http://www.linuxfromscratch.org/blfs</ulink> website for the list of current
+mirrors.</para>
+
+</sect1>
+
+
Index: introduction/welcome/welcome.xml
===================================================================
--- introduction/welcome/welcome.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ introduction/welcome/welcome.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -2,8 +2,8 @@
 <?dbhtml filename="welcome.html" dir="introduction"?>
 <title>Welcome to BLFS</title>
-<para>The Beyond LinuxFromScratch book is designed to carry on from
-where the LFS book leaves off.  Unlike the LFS book, it isn't designed
-to be followed straight through.  Reading the <xref
-linkend="intro-welcome-whichsections"/> part of this chapter should
+<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
+</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>
 
@@ -11,13 +11,13 @@
 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-acks;
-&intro-welcome-credits;
 &intro-welcome-changelog;
-&intro-welcome-whichsect;
 &intro-welcome-mailinglists;
 &intro-welcome-newsserver;
+&intro-welcome-askhelp;
 &intro-welcome-contact;
-&intro-welcome-askhelp;
 </chapter>
Index: introduction/welcome/which.xml
===================================================================
--- introduction/welcome/which.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ introduction/welcome/which.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -3,10 +3,11 @@
 <title>Which sections of the book do I want?</title>
 
-<para>Unlike the LinuxFromScratch book, BLFS isn't designed to be
-followed in a linear manner.  This is because LFS provides instructions
-on how to create a base system which is capable of turning into anything 
-from a web server to a multimedia desktop system.  BLFS is where we try
-to guide you through going from the base system to your intended
-destination and so choice is very much involved.</para>
+<para>Unlike the Linux From Scratch book, <acronym>BLFS</acronym> isn't 
+designed to be followed in a linear manner.  This is because <acronym>LFS
+</acronym> provides instructions on how to create a base system which is 
+capable of turning into anything from a web server to a multimedia desktop 
+system.  <acronym>BLFS</acronym> is where we try to guide you through going 
+from the base system to your intended destination and so choice is very much 
+involved.</para>
 
 <para>Everyone who reads the book will want to read certain sections.  The
@@ -23,13 +24,14 @@
 linkend="postlfs-editors"/>) and Shells (<xref linkend="postlfs-shells"/>).
 Indeed, you may wish to reference certain parts of this chapter (especially
-the sections on Editors and Filesystems) while building your LFS system.</para>
+the sections on Editors and Filesystems) while building your <acronym>LFS
+</acronym> system.</para>
 
 <para>Following these basic items, most people will want to at least browse 
 through the <xref linkend="general"/> part of the book.  This part contains
 information on many items which are prerequisites for other sections of the
-book as well as some items (such as Programming (<xref
-linkend="general-prog"/>) which are useful in their own right.  Note 
-that you don't have to install all of these libraries and packages found in
-this part to start with, each BLFS install procedure tells you which packages 
+book as well as some items (such as Programming (<xref linkend="general-prog"/>) 
+which are useful in their own right.  Note that you don't have to install all 
+of these libraries and packages found in this part to start with, each
+<acronym>BLFS</acronym> install procedure tells you which packages 
 it depends upon so you can choose the program you want to install and see 
 what it needs.</para>
@@ -37,10 +39,10 @@
 <para>Likewise, most people will probably want to look at the <xref 
 linkend="connect"/> and <xref linkend="basicnet"/> parts.  The first of
-these deals with connecting to the Internet or your local LAN using a variety 
-of methods such as DHCP (<xref linkend="connect-dhcp"/>) and Dial-Up
-Connections (<xref linkend="connect-dialup"/>).  The second of these parts
-deals with items such as Networking Libraries (<xref
-linkend="basicnet-netlibs"/>) and various basic networking programs and
-utilities.</para>
+these deals with connecting to the Internet or your <acronym>LAN
+</acronym> using a variety of methods such as <acronym>DHCP</acronym> 
+(<xref linkend="connect-dhcp"/>) and Dial-Up Connections (<xref 
+linkend="connect-dialup"/>).  The second of these parts deals with items 
+such as Networking Libraries (<xref linkend="basicnet-netlibs"/>) and various 
+basic networking programs and utilities.</para>
 
 <para>Once you have dealt with these basics, you may wish to configure
@@ -59,9 +61,9 @@
 <para>We then move on to deal with <xref linkend="multimedia"/> packages.
 Note that many people may want to use the <xref linkend="alsa"/>
-instructions from this chapter quite near the start of their BLFS journey;
-they are placed here simply because it is the most logical place for
-them.</para>
+instructions from this chapter quite near the start of their <acronym>BLFS
+</acronym> journey; they are placed here simply because it is the most logical 
+place for them.</para>
 
-<para>The final part of the main BLFS book deals with <xref 
+<para>The final part of the main <acronym>BLFS</acronym> book deals with <xref 
 linkend="pst"/>.  This is useful for most people with desktop systems and 
 even those who are creating mainly server systems will find it useful.</para>
@@ -70,5 +72,5 @@
 useful information which you may need to use as a reference.</para> 
 
-<para>We hope you enjoy using BLFS and find it useful.</para>
+<para>We hope you enjoy using <acronym>BLFS</acronym> and find it useful.</para>
 
 </sect1>
Index: preface/foreword.xml
===================================================================
--- preface/foreword.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ preface/foreword.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -32,6 +32,7 @@
 <para>Enjoy using <acronym>BLFS</acronym>.</para>
 
-<para>Mark Hymers &lt;markh@linuxfromscratch.org&gt;
-BLFS Editor (July 2001 - March 2003)</para>
+<blockquote><literallayout>Mark Hymers
+markh@linuxfromscratch.org
+BLFS Editor (July 2001 - March 2003)</literallayout></blockquote>
 
 
@@ -51,6 +52,7 @@
 your <acronym>BLFS</acronym> experience.</para>
 
-<para>Larry Lawrence &lt;larry@linuxfromscratch.org&gt; BLFS Editor
-(March 2003 - present)</para>
+<blockquote><literallayout>Larry Lawrence
+larry@linuxfromscratch.org
+BLFS Editor (March 2003 - present)</literallayout></blockquote>
 
 </sect1>
Index: preface/organization.xml
===================================================================
--- preface/organization.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ preface/organization.xml	(revision acfc391b8a6c7950d4ff494e9e78e24ab505f004)
@@ -9,5 +9,6 @@
 the rest of the book.</para></sect2>
 
-<sect2><title>Part II - Post LFS Configuration and Extra Software</title>
+<sect2><title>Part II - Post <acronym>LFS</acronym> Configuration and Extra 
+Software</title>
 <para>Here we introduce basic configuration and security issues.  We also
 discuss a range of editors, filesystems and shells which aren't covered in
@@ -17,6 +18,6 @@
 <para>In this section we cover libraries which are often needed by the rest
 of the book as well as system utilities.  Information on Programming
-(including recompiling <application>gcc</application> to support its full range of languages) concludes
-this part.</para></sect2>
+(including recompiling <application>gcc</application> to support its full range 
+of languages) concludes this part.</para></sect2>
 
 <sect2><title>Part IV - Connecting to a Network</title>
@@ -31,6 +32,5 @@
 <sect2><title>Part VI - Server Networking</title>
 <para>Here we deal with setting up mail and other servers (such as
-<application>SSH</application>,
-<application>CVS</application>, etc.).</para></sect2>
+<application>SSH</application>, <application>CVS</application>, etc.).</para></sect2>
 
 <sect2><title>Part VII - Content Serving</title>
@@ -48,11 +48,12 @@
 
 <sect2><title>Part X - GNOME</title>
-<para><application>GNOME</application> is the main alternative to <application>KDE</application> in the Desktop Environment arena
-and we cover both gnome-1.4 and gnome-&gnome-version; here.</para></sect2>
+<para><application>GNOME</application> is the main alternative to <application>
+KDE</application> in the Desktop Environment arena and we cover both gnome-1.4 
+and gnome-&gnome-version; here.</para></sect2>
 
 <sect2><title>Part XI - X Software</title>
-<para>Office programs and graphical web browsers are important to most
-people.  They, along with some generic <application>X</application> software can be found in this part
-of the book.</para></sect2>
+<para>Office programs and graphical web browsers are important to most people.  
+They, along with some generic <application>X</application> software can be 
+found in this part of the book.</para></sect2>
 
 <sect2><title>Part XII - Multimedia</title>
