Index: BOOK/cross-tools/common/cflags.xml
===================================================================
--- BOOK/cross-tools/common/cflags.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
+++ BOOK/cross-tools/common/cflags.xml	(revision a8f30b25be928b3688c319923853294af5d2ba93)
@@ -11,5 +11,6 @@
   <title>Build CFLAGS</title>
 
-  <para><envar>CFLAGS</envar> and <envar>CXXFLAGS</envar> must not be set during the building of cross tools.</para>
+  <para><envar>CFLAGS</envar> and <envar>CXXFLAGS</envar> must not be
+  set during the building of cross-tools.</para>
 
   <para>To disable <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>
Index: BOOK/final-preps/addinguser.xml
===================================================================
--- BOOK/final-preps/addinguser.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
+++ BOOK/final-preps/addinguser.xml	(revision a8f30b25be928b3688c319923853294af5d2ba93)
@@ -79,6 +79,5 @@
 
   <para>Grant <systemitem class="username">lfs</systemitem> full access to
-  <filename class="directory">$LFS</filename>,
-  <filename class="directory">$LFS/cross-tools</filename>, 
+  <filename class="directory">$LFS/cross-tools</filename> and
   and <filename class="directory">$LFS/tools</filename> by making <systemitem
   class="username">lfs</systemitem> the directorys' owner:</para>
Index: BOOK/materials/common/introduction.xml
===================================================================
--- BOOK/materials/common/introduction.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
+++ BOOK/materials/common/introduction.xml	(revision a8f30b25be928b3688c319923853294af5d2ba93)
@@ -33,5 +33,5 @@
   as the place to store the tarballs and patches and as a working
   directory. By using this directory, the required elements will be
-  located on the LFS partition and will be available during all stages
+  located on the CLFS partition and will be available during all stages
   of the building process.</para>
 
Index: BOOK/partitioning/common/creatingpartition.xml
===================================================================
--- BOOK/partitioning/common/creatingpartition.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
+++ BOOK/partitioning/common/creatingpartition.xml	(revision a8f30b25be928b3688c319923853294af5d2ba93)
@@ -11,9 +11,9 @@
   <title>Creating a New Partition</title>
 
-  <para os="a">Like most other operating systems, LFS is usually installed on
-  a dedicated partition. The recommended approach to building an LFS
+  <para os="a">Like most other operating systems, CLFS is usually installed on
+  a dedicated partition. The recommended approach to building a CLFS
   system is to use an available empty partition or, if you have enough
-  unpartitioned space, to create one. However, an LFS system (in fact
-  even multiple LFS systems) may also be installed on a partition already
+  unpartitioned space, to create one. However, a CLFS system (in fact
+  even multiple CLFS systems) may also be installed on a partition already
   occupied by another operating system and the different systems will
   co-exist peacefully. The document <ulink
@@ -24,5 +24,5 @@
   <para os="b">A minimal system requires a partition of around 1.3 gigabytes (GB).
   This is enough to store all the source tarballs and compile the packages.
-  However, if the LFS system is intended to be the primary Linux system,
+  However, if the CLFS system is intended to be the primary Linux system,
   additional software will probably be installed which will require
   additional space (2-3 GB). The LFS system itself will not take up this
@@ -49,5 +49,5 @@
   <para os="e">Remember the designation of the new partition (e.g.,
   <filename class="devicefile">hda5</filename>). This book will refer to
-  this as the LFS partition. Also remember the designation of the swap
+  this as the CLFS partition. Also remember the designation of the swap
   partition. These names will be needed later for the
   <filename>/etc/fstab</filename> file.</para>
Index: BOOK/partitioning/common/introduction.xml
===================================================================
--- BOOK/partitioning/common/introduction.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
+++ BOOK/partitioning/common/introduction.xml	(revision a8f30b25be928b3688c319923853294af5d2ba93)
@@ -11,5 +11,5 @@
   <title>Introduction</title>
 
-  <para>In this chapter, the partition which will host the LFS system is
+  <para>In this chapter, the partition which will host the CLFS system is
   prepared. We will create the partition itself, create a file system
   on it, and mount it.</para>
Index: BOOK/partitioning/common/mounting.xml
===================================================================
--- BOOK/partitioning/common/mounting.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
+++ BOOK/partitioning/common/mounting.xml	(revision a8f30b25be928b3688c319923853294af5d2ba93)
@@ -23,5 +23,5 @@
 <screen><userinput>export LFS=/mnt/lfs</userinput></screen>
 
-  <para>Next, create the mount point and mount the LFS file system by
+  <para>Next, create the mount point and mount the CLFS file system by
   running:</para>
 
@@ -30,5 +30,5 @@
 
   <para>Replace <replaceable>[xxx]</replaceable> with the designation of
-  the LFS partition.</para>
+  the CLFS partition.</para>
 
   <para>If using multiple partitions for LFS (e.g., one for <filename
@@ -48,5 +48,5 @@
   that are too restrictive (such as the nosuid, nodev, or noatime options).
   Run the <command>mount</command> command without any parameters to see
-  what options are set for the mounted LFS partition. If
+  what options are set for the mounted CLFS partition. If
   <option>nosuid</option>, <option>nodev</option>, and/or
   <option>noatime</option> are set, the partition will need to be
