Index: book/preface.xml
===================================================================
--- book/preface.xml	(revision cc725734f12ab55a1d766f852fc4f917e888d63a)
+++ book/preface.xml	(revision 9f6b04f01d395750eb873ced2c27b781095d9553)
@@ -45,5 +45,5 @@
 <blockquote><literallayout>Mark Hymers
 markh &lt;at&gt; linuxfromscratch.org
-BLFS Editor (July 2001 - March 2003)</literallayout></blockquote>
+BLFS Editor (July 2001&ndash;March 2003)</literallayout></blockquote>
 
 <para>I still remember how I found the <acronym>BLFS</acronym> project
@@ -64,5 +64,25 @@
 <blockquote><literallayout>Larry Lawrence
 larry &lt;at&gt; linuxfromscratch.org
-BLFS Editor (March 2003 - June 2004)</literallayout></blockquote>
+BLFS Editor (March 2003&ndash;June 2004)</literallayout></blockquote>
+
+<para>The <acronym>BLFS</acronym> project is a natural progression of
+<acronym>LFS</acronym>.  Together, these projects provide a unique resource for
+the Open Source Community.  They take the mystery out of the process of
+building a complete, funtional software system from the source code contibuted
+by many talented individuals throughout the world.  They truly allow users 
+to implement the slogan "Your distro, your rules."</para>
+
+<para>Our goal is to continue to provide the best resoure available that shows
+you how to integrate many significant Open Source applications.  Since these
+applications are constantly updated and new applications are developed, this
+book will never be complete.  Additionally, there is always room for
+improvement in explaining the nuances of how to install the different packages.
+To make these improvements, we need your feedback.  I encourcage you to
+participate on the different mailing lists, news groups, and
+<acronym>IRC</acronym> channels to help meet these goals.</para>
+
+<blockquote><literallayout>Bruce Dubbs
+bdubbs &lt;at&gt; linuxfromscratch.org
+BLFS Editor (June 2004&ndash;Present)</literallayout></blockquote>
 
 </sect1>
Index: eface/preface.ent
===================================================================
--- preface/preface.ent	(revision cc725734f12ab55a1d766f852fc4f917e888d63a)
+++ 	(revision )
@@ -1,6 +1,0 @@
-<!ENTITY preface SYSTEM "preface.xml">
-<!ENTITY preface-foreword SYSTEM "foreword.xml">
-<!ENTITY preface-whoread SYSTEM "whoread.xml">
-
-<!ENTITY preface-organization SYSTEM "organization.xml">
-<!ENTITY preface-organization-temp SYSTEM "organtemp.xml">
Index: eface/preface.xml
===================================================================
--- preface/preface.xml	(revision cc725734f12ab55a1d766f852fc4f917e888d63a)
+++ 	(revision )
@@ -1,182 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<preface id="preface">
-<?dbhtml filename="preface.html" dir="preface"?>
-<title>Preface</title>
-
-<sect1 id="preface-foreword">
-<?dbhtml filename="foreword.html"?>
-<title>Foreword</title>
-
-<para>Having helped out with Linux From Scratch for a short time, I
-noticed that we were getting many queries as to how to do things beyond
-the base <acronym>LFS</acronym> system.  At the time, the only assistance 
-specifically offered relating to <acronym>LFS</acronym> were the
-<acronym>LFS</acronym> hints (<ulink url="&hints-root;">&hints-root;</ulink>). 
-Most of the <acronym>LFS</acronym> hints are extremely good and well written 
-but I (and others) could still see a need for more comprehensive help to 
-go Beyond <acronym>LFS</acronym> - hence <acronym>BLFS</acronym>.</para>
-
-<para><acronym>BLFS</acronym> aims to be more than the
-<acronym>LFS</acronym>-hints converted to <acronym>XML</acronym> although
-much of our work is based around the hints and indeed some authors write
-both hints and the relevant <acronym>BLFS</acronym> sections.  We hope that 
-we can provide you with enough information to not only manage to build your 
-system up to what you want, whether it be a web server or a multimedia desktop
-system, but also that you will learn a lot about system configuration as
-you go.</para>
-
-<para>Thanks as ever go to everyone in the <acronym>LFS</acronym>/<acronym>BLFS</acronym> 
-community; especially those who have contributed instructions, written text, 
-answered questions and generally shouted when things were wrong!</para>
-
-<para>Finally, we encourage you to become involved in the community; ask 
-questions on the mailing list or news gateway and join in the fun on #lfs at 
-irc.linuxfromscratch.org. You can find more details about all of these in the 
-<xref linkend="introduction"/> section of the book.</para>
-
-<para>Enjoy using <acronym>BLFS</acronym>.</para>
-
-<blockquote><literallayout>Mark Hymers
-markh &lt;at&gt; linuxfromscratch.org
-BLFS Editor (July 2001&ndash;March 2003)</literallayout></blockquote>
-
-<para>I still remember how I found the <acronym>BLFS</acronym> project
-and started using the instructions that were completed at the time.  I could 
-not believe how wonderful it was to get an application up and running very 
-quickly, with explanations as to why things were done a certain way.
-Unfortunately, for me, it wasn't long before I was opening applications that 
-had nothing more  than "To be done" on the page.  I did what most would do, 
-I waited for someone else to do it.  It wasn't too long before I am looking 
-through  <application>Bugzilla</application> for something easy to do.
-As with any learning experience, the definition of what was easy kept
-changing.</para>
-
-<para>We still encourage you to become involved as <acronym>BLFS</acronym> is 
-never really finished.  Contributing or just using, we hope you enjoy
-your <acronym>BLFS</acronym> experience.</para>
-
-<blockquote><literallayout>Larry Lawrence
-larry &lt;at&gt; linuxfromscratch.org
-BLFS Editor (March 2003&ndash;June 2004)</literallayout></blockquote>
-
-<para>The <acronym>BLFS</acronym> project is a natural progression of
-<acronym>LFS</acronym>.  Together, these projects provide a unique resource for
-the Open Source Community.  They take the mystery out of the process of
-building a complete, funtional software system from the source code contibuted
-by many talented individuals throughout the world.  They truly allow users 
-to implement the slogan "Your distro, your rules."</para>
-
-<para>Our goal is to continue to provide the best resoure available that shows
-you how to integrate many significant Open Source applications.  Since these
-applications are constantly updated and new applications are developed, this
-book will never be complete.  Additionally, there is always room for
-improvement in explaining the nuances of how to install the different packages.
-To make these improvements, we need your feedback.  I encourcage you to
-participate on the different mailing lists, news groups, and
-<acronym>IRC</acronym> channels to help meet these goals.</para>
-
-<blockquote><literallayout>Bruce Dubbs
-bdubbs &lt;at&gt; linuxfromscratch.org
-BLFS Editor (June 2004&ndash;Present)</literallayout></blockquote>
-
-</sect1>
-
-<sect1 id="preface-whoread">
-<?dbhtml filename="whoread.html"?>
-<title>Who would want to read this book</title>
-
-<para>This book is mainly aimed at those who have built a system based
-on the <acronym>LFS</acronym> book.  It will also be useful for those who are 
-using other distributions, but for one reason or another want to manually build
-software and are in need of some assistance.  <acronym>BLFS</acronym> can be 
-used to create a range of diverse systems and so the target audience is 
-probably nearly as wide as that of the <acronym>LFS</acronym> book.  If you 
-found <acronym>LFS</acronym> useful, you should also like this!</para>
-
-<para>Since Release 5.0, the <acronym>BLFS</acronym> book version matches
-the <acronym>LFS</acronym> book version. This book may be incompatible with
-a previous or latter release of the <acronym>LFS</acronym> book.</para>
-
-</sect1>
-
-<sect1 id="preface-organization">
-<?dbhtml filename="organization.html"?>
-<title>Organization</title>
-
-<para>This book is divided into the following parts.</para>
-
-<sect2><title>Part I - Introduction</title>
-<para>This part contains information which is essential to
-the rest of the book.</para></sect2>
-
-<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, file systems and shells which aren't covered in
-the main <acronym>LFS</acronym> book.</para></sect2>
-
-<sect2><title>Part III - General Libraries and Utilities</title>
-<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>
-
-<sect2><title>Part IV - Connecting to a Network</title>
-<para>Here we cover how to connect to a network when you aren't using 
-the simple static <acronym>IP</acronym> setup given in the main
-<acronym>LFS</acronym> book.</para></sect2>
-
-<sect2><title>Part V - Basic Networking</title>
-<para>Networking libraries and command-line networking tools make up the
-bulk of this part.</para></sect2>
-
-<sect2><title>Part VI - Server Networking</title>
-<para>Here we deal with setting up mail and other servers (such as
-<application><acronym>SSH</acronym></application>, <application><acronym>CVS
-</acronym></application>, etc.).</para></sect2>
-
-<sect2><title>Part VII - Content Serving</title>
-<para>In this part we deal with databases and web server software.</para></sect2>
-
-<sect2><title>Part VIII - X + Window Managers</title>
-<para>This part explains how to set up a basic
-X Window System installation along
-with some generic <application>X</application> libraries and Window managers.</para></sect2>
-
-<sect2><title>Part IX - KDE</title>
-<para>For those who want to use the K Desktop Environment or some parts of
-it, this part covers it.</para></sect2>
-
-<sect2><title>Part X - GNOME</title>
-<para>GNOME is the main alternative to KDE 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>
-
-<sect2><title>Part XII - Multimedia</title>
-<para>Here we cover setting multimedia libraries and drivers along with some
-audio, video and <acronym>CD</acronym>-writing programs.</para></sect2>
-
-<sect2><title>Part XIII - Printing, Scanning and Typesetting</title>
-<para>The <acronym>PST</acronym> part of the book covers things from
-<application>Ghostscript</application>, <application><acronym>CUPS</acronym>
-</application> and <application>DocBook</application> 
-to installing <application>TeX</application>.</para></sect2>
-
-<sect2><title>Appendices</title>
-<para>The Appendices cover information which doesn't belong in the main
-book; they are mainly there as a reference.</para></sect2>
-
-</sect1>
-
-</preface>
Index: stylesheets/xhtml/lfs-navigational.xsl
===================================================================
--- stylesheets/xhtml/lfs-navigational.xsl	(revision cc725734f12ab55a1d766f852fc4f917e888d63a)
+++ stylesheets/xhtml/lfs-navigational.xsl	(revision 9f6b04f01d395750eb873ced2c27b781095d9553)
@@ -2,4 +2,5 @@
 
 <!-- Version 0.9 - Manuel Canales Esparcia <macana@lfs-es.org> -->
+<!-- Updates by Bruce Dubbs <bdubbs@linuxfromscratch.org> -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -31,5 +32,5 @@
             <p>
               <xsl:apply-templates select="$home" mode="object.title.markup"/>
-              <xsl:text> - </xsl:text>
+              <xsl:text> &#8211; </xsl:text> <!-- ndash -->
               <xsl:apply-templates select="$home" mode="object.subtitle.markup"/>
             </p>
@@ -42,6 +43,6 @@
         </xsl:if>
         <div class="headerlinks">
-          <xsl:if test="count($prev)&gt;0 and $prev != $home">
-            <div class='prev'>
+          <div class='prev'>
+            <xsl:if test="count($prev)&gt;0 and $prev != $home">
               <a accesskey="p">
                 <xsl:attribute name="href">
@@ -52,8 +53,8 @@
                 <xsl:text>Prev</xsl:text>
               </a>
-            </div>
-          </xsl:if>
-          <xsl:if test="count($next)&gt;0">
-            <div class='next'>
+            </xsl:if>
+          <xsl:text>&#160;</xsl:text></div>  <!-- nbsp -->
+          <div class='next'><xsl:text>&#160;</xsl:text>
+            <xsl:if test="count($next)&gt;0">
               <a accesskey="n">
                 <xsl:attribute name="href">
@@ -64,6 +65,6 @@
                 <xsl:text>Next</xsl:text>
               </a>
-            </div>
-          </xsl:if>
+            </xsl:if>
+          </div>
           <div class='home'>
             <a accesskey="h">
@@ -92,6 +93,6 @@
     <xsl:if test="$row">
       <div class="navfooter">
-          <xsl:if test="count($prev)&gt;0 and $prev != $home">
-            <div class='prev'>
+          <div class='prev'>
+            <xsl:if test="count($prev)&gt;0 and $prev != $home">
               <a accesskey="p">
                 <xsl:attribute name="href">
@@ -104,8 +105,9 @@
               <!-- <xsl:text> </xsl:text> -->
               <xsl:apply-templates select="$prev" mode="object.title.markup"/>
-            </div>
-          </xsl:if>
+            </xsl:if>
+            <xsl:text>&#160;</xsl:text>
+          </div> <!-- nbsp -->
+          <div class='next'><xsl:text>&#160;</xsl:text>
           <xsl:if test="count($next)&gt;0">
-            <div class='next'>
               <a accesskey="n">
                 <xsl:attribute name="href">
@@ -118,6 +120,6 @@
               <!-- <xsl:text> </xsl:text> -->
               <xsl:apply-templates select="$next" mode="object.title.markup"/>
-            </div>
-          </xsl:if>
+            </xsl:if>
+          </div>
           <xsl:if test="count($up)&gt;0 and $up != $home">
             <div class='up'>
@@ -132,6 +134,6 @@
             </div>
           </xsl:if>
-          <xsl:if  test="$home != .">
-            <div class='home'>
+          <div class='home'>
+            <xsl:if  test="$home != .">
               <a accesskey="h">
                 <xsl:attribute name="href">
@@ -142,6 +144,6 @@
                 <xsl:text>Home</xsl:text>
               </a>
-            </div>
-          </xsl:if>
+            </xsl:if>
+          </div>
       </div>
     </xsl:if>
