diff --git a/chapter02/aboutlfs.xml b/chapter02/aboutlfs.xml
index 0d5a5281b..41b50a2a0 100644
--- a/chapter02/aboutlfs.xml
+++ b/chapter02/aboutlfs.xml
@@ -52,17 +52,17 @@
   <envar>LFS</envar> variable needs to be bash to ensure that the
   <filename>/root/.bash_profile</filename> file is incorporated as a part of
   the login process.</para>
-  
+
   <para>Another consideration is the method that is used to log into the
   host system.  If logging in through a graphical display manager, the
   user's <filename>.bash_profile</filename> is not normally used when
   a virtual terminal is started.  In this case, add the export command to
   the <filename>.bashrc</filename> file for the user and
-  <systemitem class="username">root</systemitem>.  In addition, 
-  some distributions have instructions to not run the <filename>.bashrc</filename> 
+  <systemitem class="username">root</systemitem>.  In addition,
+  some distributions have instructions to not run the <filename>.bashrc</filename>
   instructions in a non-interactive bash invocation.  Be sure to add the
   export command before the test for non-interactive use.</para>
-  
+
   </note>
 
 </sect1>
diff --git a/chapter02/creatingfilesystem.xml b/chapter02/creatingfilesystem.xml
index f01b745e9..12529ce8c 100644
--- a/chapter02/creatingfilesystem.xml
+++ b/chapter02/creatingfilesystem.xml
@@ -11,9 +11,9 @@
   <title>Creating a File System on the Partition</title>
 
   <para>Now that a blank partition has been set up, the file system can be
-  created.  LFS can use any file system recognized by the Linux kernel, but the 
-  most common types are ext3 and ext4.  The choice of file system can be 
-  complex and depends on the characteristics of the files and the size of 
+  created.  LFS can use any file system recognized by the Linux kernel, but the
+  most common types are ext3 and ext4.  The choice of file system can be
+  complex and depends on the characteristics of the files and the size of
   the partition.  For example:</para>
 
   <variablelist>
@@ -26,7 +26,7 @@
     <varlistentry>
       <term>ext3</term>
       <listitem><para>is an upgrade to ext2 that includes a journal
-      to help recover the partition's status in the case of an unclean 
+      to help recover the partition's status in the case of an unclean
       shutdown.  It is commonly used as a general purpose file system.
       </para>
       </listitem>
diff --git a/chapter02/creatingpartition.xml b/chapter02/creatingpartition.xml
index efca7ea1c..ac496bbae 100644
--- a/chapter02/creatingpartition.xml
+++ b/chapter02/creatingpartition.xml
@@ -37,7 +37,7 @@
   <para>Start a disk partitioning program such as <command>cfdisk</command>
   or <command>fdisk</command> with a command line option naming the hard
   disk on which the new partition will be created&mdash;for example
-  <filename class="devicefile">/dev/sda</filename> for the primary 
+  <filename class="devicefile">/dev/sda</filename> for the primary
   disk drive. Create a Linux native partition and a
   <systemitem class="filesystem">swap</systemitem> partition, if needed. Please
   refer to <filename>cfdisk(8)</filename> or <filename>fdisk(8)</filename> if
@@ -88,7 +88,7 @@
     swapping.</para>
 
     <para>If you want to use the hibernation feature (suspend-to-disk) of Linux,
-    it writes out the contents of RAM to the swap partition before turning off 
+    it writes out the contents of RAM to the swap partition before turning off
     the machine. In this case the size of the swap partition should be at
     least as large as the system's installed RAM.</para>
 
@@ -114,8 +114,8 @@
     <command>fdisk</command> or have a code of <emphasis>EF02</emphasis> if
     using <command>gdisk</command>.</para>
 
-    <note><para>The Grub Bios partition must be on the drive that the BIOS 
-    uses to boot the system.  This is not necessarily the same drive where the 
+    <note><para>The Grub Bios partition must be on the drive that the BIOS
+    uses to boot the system.  This is not necessarily the same drive where the
     LFS root partition is located. Disks on a system may use different
     partition table types.  The requirement for this partition depends
     only on the partition table type of the boot disk.</para></note>
diff --git a/chapter02/hostreqs.xml b/chapter02/hostreqs.xml
index e513bd92d..dc3073b33 100644
--- a/chapter02/hostreqs.xml
+++ b/chapter02/hostreqs.xml
@@ -150,8 +150,8 @@
   </important>
 
   <!-- Use an empty sect2 element to prevent a pdf warning.  -->
-  <bridgehead renderas="sect2" 
-              id="version-check" 
+  <bridgehead renderas="sect2"
+              id="version-check"
               xreflabel="Host System Requirements">
   </bridgehead>
   <!--<title> </title>-->
@@ -177,7 +177,7 @@ if [ -h /usr/bin/yacc ]; then
 elif [ -x /usr/bin/yacc ]; then
   echo yacc is `/usr/bin/yacc --version | head -n1`
 else
-  echo "yacc not found" 
+  echo "yacc not found"
 fi
 
 bzip2 --version 2&gt;&amp;1 &lt; /dev/null | head -n1 | cut -d" " -f1,6-
@@ -190,8 +190,8 @@ if [ -h /usr/bin/awk ]; then
   echo "/usr/bin/awk -&gt; `readlink -f /usr/bin/awk`";
 elif [ -x /usr/bin/awk ]; then
   echo awk is `/usr/bin/awk --version | head -n1`
-else 
-  echo "awk not found" 
+else
+  echo "awk not found"
 fi
 
 gcc --version | head -n1
diff --git a/chapter02/introduction.xml b/chapter02/introduction.xml
index 8dad0ceb8..bddcfec61 100644
--- a/chapter02/introduction.xml
+++ b/chapter02/introduction.xml
@@ -11,8 +11,8 @@
   <title>Introduction</title>
 
   <para>In this chapter, the host tools needed for building LFS
-  are checked and, if necessary, installed.  Then a partition which will 
-  host the LFS system is prepared. We will create the partition 
+  are checked and, if necessary, installed.  Then a partition which will
+  host the LFS system is prepared. We will create the partition
   itself, create a file system on it, and mount it.</para>
 
 </sect1>
diff --git a/chapter02/mounting.xml b/chapter02/mounting.xml
index 45f222485..a4408c94f 100644
--- a/chapter02/mounting.xml
+++ b/chapter02/mounting.xml
@@ -47,8 +47,8 @@ mount -v -t ext4 /dev/<replaceable>&lt;yyy&gt;</replaceable> $LFS/home</userinpu
 
   <warning><para>The above instructions assume that you will not be restarting
   your computer throughout the LFS process.  If you shut down your system,
-  you will either need to remount the LFS partition each time you restart 
-  the build process or modify your host system's /etc/fstab file to automatically 
+  you will either need to remount the LFS partition each time you restart
+  the build process or modify your host system's /etc/fstab file to automatically
   remount it upon boot.  For example:
 
 <screen role="nodump">/dev/<replaceable>&lt;xxx&gt;</replaceable>  /mnt/lfs ext4   defaults      1     1</screen>
diff --git a/chapter02/stages.xml b/chapter02/stages.xml
index b15b9446e..a873370b2 100644
--- a/chapter02/stages.xml
+++ b/chapter02/stages.xml
@@ -22,7 +22,7 @@
 
     <para>These chapters are accomplished on the host system.  When
     restarting, be careful of the following:</para>
-  
+
     <itemizedlist>
       <listitem>
         <para>Procedures done as the
@@ -32,7 +32,7 @@
       </listitem>
     </itemizedlist>
   </sect2>
-  
+ 
   <sect2>
   <title>Chapter&nbsp;5&ndash;6</title>
 
@@ -85,8 +85,8 @@
          <para> The virtual file systems must be mounted.  This can be done
          before or after entering chroot by changing to a host virtual terminal
          and, as <systemitem class="username">root</systemitem>, running the
-         commands in 
-         <xref linkend='ch-tools-bindmount'/> and 
+         commands in
+         <xref linkend='ch-tools-bindmount'/> and
          <xref linkend='ch-tools-kernfsmount'/>.</para>
       </listitem>
     </itemizedlist>