Index: BOOK/alpha-index.xml
===================================================================
--- BOOK/alpha-index.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/alpha-index.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -57,5 +57,5 @@
     <?dbhtml filename="part5.html"?>
 
-    <title>Building the LFS System</title>
+    <title>Building the CLFS System</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/alpha-chapter.xml"/>
Index: BOOK/final-preps/creatingcrossdir.xml
===================================================================
--- BOOK/final-preps/creatingcrossdir.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/final-preps/creatingcrossdir.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -14,5 +14,5 @@
   <xref linkend="chapter-cross-tools"/> will be installed under
   <filename class="directory">$LFS/cross-tools</filename> to keep them
-  separate from the host prograrms. The programs compiled here are
+  separate from the host programs. The programs compiled here are
   cross-tools and will not be a part of the final CLFS system or the
   temp-system. By keeping these programs in a separate directory, they
Index: BOOK/final-preps/settingenviron.xml
===================================================================
--- BOOK/final-preps/settingenviron.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/final-preps/settingenviron.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -80,10 +80,11 @@
   the chroot environment.</para>
 
-  <para os="j">By putting <filename class="directory">/cross-tools/bin</filename> ahead
-  of the standard <envar>PATH</envar>, all the programs installed in
-  <xref linkend="chapter-cross-tools"/> are picked up by the cross-compiler
-  immediately after their installation. This, combined with turning off
-  hashing, limits the risk that old programs are used from the host when
-  building a sane set of cross-compiler tools.</para>
+  <para os="j">By putting <filename class="directory">/cross-tools/bin</filename>
+  at the beginning of the <envar>PATH</envar>, the cross-compiler
+  built in <xref linkend="chapter-cross-tools"/> will be picked up by
+  the build process for the temp-system packages before anything that
+  may be installed on the host. This, combined with turning off
+  hashing, helps to ensure that you will be using the cross-compile
+  tools to build the temp-system in /tools.</para>
 
   <para os="k">Finally, to have the environment fully prepared for building the
Index: BOOK/introduction/common/askforhelp.xml
===================================================================
--- BOOK/introduction/common/askforhelp.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/introduction/common/askforhelp.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -59,8 +59,8 @@
     <note>
       <para>Deviating from this book does <emphasis>not</emphasis>
-      mean that we will not help you. After all, LFS is about personal
-      preference. Being upfront about any changes to the established
-      procedure helps us evaluate and determine possible causes of your
-      problem.</para>
+      mean that we will not help you. After all, the LFS project is
+      about personal preference. Being upfront about any changes to
+      the established procedure helps us evaluate and determine
+      possible causes of your problem.</para>
     </note>
 
Index: BOOK/introduction/common/resources.xml
===================================================================
--- BOOK/introduction/common/resources.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/introduction/common/resources.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -84,5 +84,5 @@
 
     <para>Please direct all your questions and comments to one of the LFS
-    mailing lists (see above).</para>
+    or CLFS mailing lists (see above).</para>
 
   </sect2>
Index: BOOK/mips-index.xml
===================================================================
--- BOOK/mips-index.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/mips-index.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -55,5 +55,5 @@
     <?dbhtml filename="part5.html"?>
 
-    <title>Building the LFS System</title>
+    <title>Building the CLFS System</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/mips-chapter.xml"/>
Index: BOOK/mips64-64-index.xml
===================================================================
--- BOOK/mips64-64-index.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/mips64-64-index.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -55,5 +55,5 @@
     <?dbhtml filename="part5.html"?>
 
-    <title>Building the LFS System</title>
+    <title>Building the CLFS System</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/mips64-64-chapter.xml"/>
Index: BOOK/mips64-index.xml
===================================================================
--- BOOK/mips64-index.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/mips64-index.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -55,5 +55,5 @@
     <?dbhtml filename="part5.html"?>
 
-    <title>Building the LFS System</title>
+    <title>Building the CLFS System</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/mips64-chapter.xml"/>
Index: BOOK/ppc-index.xml
===================================================================
--- BOOK/ppc-index.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/ppc-index.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -57,5 +57,5 @@
     <?dbhtml filename="part5.html"?>
 
-    <title>Building the LFS System</title>
+    <title>Building the CLFS System</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/ppc-chapter.xml"/>
Index: BOOK/ppc64-index.xml
===================================================================
--- BOOK/ppc64-index.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/ppc64-index.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -57,5 +57,5 @@
     <?dbhtml filename="part5.html"?>
 
-    <title>Building the LFS System</title>
+    <title>Building the CLFS System</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/ppc64-chapter.xml"/>
Index: BOOK/sparc-index.xml
===================================================================
--- BOOK/sparc-index.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/sparc-index.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -57,5 +57,5 @@
     <?dbhtml filename="part5.html"?>
 
-    <title>Building the LFS System</title>
+    <title>Building the CLFS System</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/sparc-chapter.xml"/>
Index: BOOK/sparc64-64-index.xml
===================================================================
--- BOOK/sparc64-64-index.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/sparc64-64-index.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -57,5 +57,5 @@
     <?dbhtml filename="part5.html"?>
 
-    <title>Building the LFS System</title>
+    <title>Building the CLFS System</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/sparc64-64-chapter.xml"/>
Index: BOOK/sparc64-index.xml
===================================================================
--- BOOK/sparc64-index.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/sparc64-index.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -57,5 +57,5 @@
     <?dbhtml filename="part5.html"?>
 
-    <title>Building the LFS System</title>
+    <title>Building the CLFS System</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/sparc64-chapter.xml"/>
Index: BOOK/the-end/reboot.xml
===================================================================
--- BOOK/the-end/reboot.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/the-end/reboot.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -59,5 +59,5 @@
 
   <para>Assuming the boot loader was set up as outlined earlier,
-  <emphasis>LFS &version;</emphasis> will boot automatically.</para>
+  <emphasis>CLFS &version;</emphasis> will boot automatically.</para>
 
   <para>When the reboot is complete, the LFS system is ready for use and
Index: BOOK/the-end/theend.xml
===================================================================
--- BOOK/the-end/theend.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/the-end/theend.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -15,14 +15,14 @@
   </indexterm>
 
-  <para>Well done! The new LFS system is installed! We wish you much
+  <para>Well done! The new CLFS system is installed! We wish you much
   success with your shiny new custom-built Linux system.</para>
 
   <para>It may be a good idea to create an
-  <filename>/etc/lfs-release</filename> file. By having this file, it is
+  <filename>/etc/clfs-release</filename> file. By having this file, it is
   very easy for you (and for us if you need to ask for help at some
-  point) to find out which LFS version is installed on the system.
+  point) to find out which CLFS version is installed on the system.
   Create this file by running:</para>
 
-<screen><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
+<screen><userinput>echo &version; &gt; /etc/clfs-release</userinput></screen>
 
 </sect1>
Index: BOOK/x86-index.xml
===================================================================
--- BOOK/x86-index.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/x86-index.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -57,5 +57,5 @@
     <?dbhtml filename="part5.html"?>
 
-    <title>Building the LFS System</title>
+    <title>Building the CLFS System</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/x86-chapter.xml"/>
Index: BOOK/x86_64-64-index.xml
===================================================================
--- BOOK/x86_64-64-index.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/x86_64-64-index.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -57,5 +57,5 @@
     <?dbhtml filename="part5.html"?>
 
-    <title>Building the LFS System</title>
+    <title>Building the CLFS System</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/x86_64-64-chapter.xml"/>
Index: BOOK/x86_64-index.xml
===================================================================
--- BOOK/x86_64-index.xml	(revision 802056d3e58d88b3deb4c8e3eaf4556b05103d04)
+++ BOOK/x86_64-index.xml	(revision e97d7d38a1c90c746d99e21fd9f6e5766d5b4cd9)
@@ -57,5 +57,5 @@
     <?dbhtml filename="part5.html"?>
 
-    <title>Building the LFS System</title>
+    <title>Building the CLFS System</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/x86_64-chapter.xml"/>
