Index: BOOK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/appendices/dependencies/common.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -12,10 +12,10 @@
   <title>Dependencies</title>
 
-  <para>Every package built in LFS relies on one or more other packages
+  <para>Every package built in CLFS relies on one or more other packages
   in order to build and install properly. Some packages even participate
   in circular dependencies, that is, the first package depends on the second
   which in turn depends on the first. Because of these dependencies, the
-  order in which packages are built in LFS is very important. The purpose
-  of this page is to document the dependencies of each package built in LFS.</para>
+  order in which packages are built in CLFS is very important. The purpose
+  of this page is to document the dependencies of each package built in CLFS.</para>
 
   <para>For each package we build, we have listed three types of dependencies.
@@ -76,5 +76,5 @@
           <seg>Binutils, Bison, Bzip2, DejaGNU, Diffutils, Expect, Findutils,
           Flex, GCC, Gettext, Gzip, Libtool and Tar. Can also use several
-          other packages that are not installed in LFS.</seg>
+          other packages that are not installed in CLFS.</seg>
         </seglistitem>
       </segmentedlist>
Index: BOOK/boot/common/creatingdirs.xml
===================================================================
--- BOOK/boot/common/creatingdirs.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/boot/common/creatingdirs.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -11,5 +11,5 @@
   <title>Creating Directories</title>
 
-  <para os="a">It is time to create some structure in the LFS file system. Create a
+  <para os="a">It is time to create some structure in the CLFS file system. Create a
   standard directory tree by issuing the following commands:</para>
 
Index: BOOK/boot/common/introduction.xml
===================================================================
--- BOOK/boot/common/introduction.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/boot/common/introduction.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -17,5 +17,5 @@
   <para>There are a few additional packages that will need to be
   installed to allow you to boot the minimal system. Some of these
-  packages will be installed onto the root or in /usr on the LFS
+  packages will be installed onto the root or in /usr on the CLFS
   partition ($LFS/bin, $LFS/usr/lib, etc...), rather than /tools, using the
   "DESTDIR" option with make. This will require the
Index: BOOK/boot/x86_64-64/lilo.xml
===================================================================
--- BOOK/boot/x86_64-64/lilo.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/boot/x86_64-64/lilo.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -9,5 +9,5 @@
   <?dbhtml filename="lilo.html"?>
 
-  <title>Making the LFS System Bootable</title>
+  <title>Making the CLFS System Bootable</title>
 
   <indexterm zone="ch-boot-lilo">
Index: BOOK/bootable/alpha-chapter.xml
===================================================================
--- BOOK/bootable/alpha-chapter.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/alpha-chapter.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -6,9 +6,9 @@
 ]>
 
-<chapter id="chapter-bootable" xreflabel="Making the LFS System Bootable">
+<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
   <?dbhtml dir="bootable"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Making the LFS System Bootable</title>
+  <title>Making the CLFS System Bootable</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
Index: BOOK/bootable/alpha/aboot.xml
===================================================================
--- BOOK/bootable/alpha/aboot.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/alpha/aboot.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -9,5 +9,5 @@
   <?dbhtml filename="aboot.html"?>
 
-  <title>Making the LFS System Bootable</title>
+  <title>Making the CLFS System Bootable</title>
 
   <indexterm zone="ch-bootable-aboot">
Index: BOOK/bootable/common/introduction.xml
===================================================================
--- BOOK/bootable/common/introduction.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/common/introduction.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -11,8 +11,8 @@
   <title>Introduction</title>
 
-  <para>It is time to make the LFS system bootable. This chapter
+  <para>It is time to make the CLFS system bootable. This chapter
   discusses creating an <filename>fstab</filename> file, building a
-  kernel for the new LFS system, and installing the boot loader so
-  that the LFS system can be selected for booting at startup.</para>
+  kernel for the new CLFS system, and installing the boot loader so
+  that the CLFS system can be selected for booting at startup.</para>
 
 </sect1>
Index: BOOK/bootable/mips-chapter.xml
===================================================================
--- BOOK/bootable/mips-chapter.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/mips-chapter.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -6,9 +6,9 @@
 ]>
 
-<chapter id="chapter-bootable" xreflabel="Making the LFS System Bootable">
+<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
   <?dbhtml dir="bootable"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Making the LFS System Bootable</title>
+  <title>Making the CLFS System Bootable</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
Index: BOOK/bootable/mips/arcload.xml
===================================================================
--- BOOK/bootable/mips/arcload.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/mips/arcload.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -9,5 +9,5 @@
   <?dbhtml filename="arcload.html"?>
 
-  <title>Making the LFS System Bootable via Arcload</title>
+  <title>Making the CLFS System Bootable via Arcload</title>
 
   <indexterm zone="ch-bootable-arcload">
Index: BOOK/bootable/mips/colo.xml
===================================================================
--- BOOK/bootable/mips/colo.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/mips/colo.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -9,5 +9,5 @@
   <?dbhtml filename="colo.html"?>
 
-  <title>Making the LFS System Bootable via Colo</title>
+  <title>Making the CLFS System Bootable via Colo</title>
 
   <indexterm zone="ch-bootable-colo">
@@ -21,5 +21,5 @@
   </note>
 
-  <para os="c">Your shiny new LFS system is almost complete. One of the last
+  <para os="c">Your shiny new CLFS system is almost complete. One of the last
   things to do is ensure you can boot it. The instructions below apply
   only to Cobalt RaQ1/RaQ2/Cube2 servers. Information on <quote>boot
Index: BOOK/bootable/mips64-chapter.xml
===================================================================
--- BOOK/bootable/mips64-chapter.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/mips64-chapter.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -6,9 +6,9 @@
 ]>
 
-<chapter id="chapter-bootable" xreflabel="Making the LFS System Bootable">
+<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
   <?dbhtml dir="bootable"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Making the LFS System Bootable</title>
+  <title>Making the CLFS System Bootable</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
Index: BOOK/bootable/mips64/arcload.xml
===================================================================
--- BOOK/bootable/mips64/arcload.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/mips64/arcload.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -9,5 +9,5 @@
   <?dbhtml filename="arcload.html"?>
 
-  <title>Making the LFS System Bootable via Arcload</title>
+  <title>Making the CLFS System Bootable via Arcload</title>
 
   <indexterm zone="ch-bootable-arcload">
Index: BOOK/bootable/ppc-chapter.xml
===================================================================
--- BOOK/bootable/ppc-chapter.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/ppc-chapter.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -6,9 +6,9 @@
 ]>
 
-<chapter id="chapter-bootable" xreflabel="Making the LFS System Bootable">
+<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
   <?dbhtml dir="bootable"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Making the LFS System Bootable</title>
+  <title>Making the CLFS System Bootable</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
Index: BOOK/bootable/ppc/yaboot.xml
===================================================================
--- BOOK/bootable/ppc/yaboot.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/ppc/yaboot.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -9,5 +9,5 @@
   <?dbhtml filename="yaboot.html"?>
 
-  <title>Making the LFS System Bootable</title>
+  <title>Making the CLFS System Bootable</title>
 
   <indexterm zone="ch-bootable-yaboot">
@@ -15,5 +15,5 @@
   <secondary>configuring</secondary></indexterm>
 
-  <para os="a">Your shiny new LFS system is almost complete. One of the last
+  <para os="a">Your shiny new CLFS system is almost complete. One of the last
   things to do is to ensure that the system can be properly booted. The
   instructions below apply only to NewWorld Macintoshes.</para>
@@ -107,5 +107,5 @@
 fgcolor=light-green
 
-# The first entry is for LFS.
+# The first entry is for CLFS.
 # For all images, the pathname is relative to the filesystem
 # on which they are situated and can include at most one
Index: BOOK/bootable/ppc64-chapter.xml
===================================================================
--- BOOK/bootable/ppc64-chapter.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/ppc64-chapter.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -6,9 +6,9 @@
 ]>
 
-<chapter id="chapter-bootable" xreflabel="Making the LFS System Bootable">
+<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
   <?dbhtml dir="bootable"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Making the LFS System Bootable</title>
+  <title>Making the CLFS System Bootable</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
Index: BOOK/bootable/sparc-chapter.xml
===================================================================
--- BOOK/bootable/sparc-chapter.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/sparc-chapter.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -6,9 +6,9 @@
 ]>
 
-<chapter id="chapter-bootable" xreflabel="Making the LFS System Bootable">
+<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
   <?dbhtml dir="bootable"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Making the LFS System Bootable</title>
+  <title>Making the CLFS System Bootable</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
Index: BOOK/bootable/sparc/silo.xml
===================================================================
--- BOOK/bootable/sparc/silo.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/sparc/silo.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -9,5 +9,5 @@
   <?dbhtml filename="silo.html"?>
 
-  <title>Making the LFS System Bootable</title>
+  <title>Making the CLFS System Bootable</title>
 
   <indexterm zone="ch-bootable-silo">
Index: BOOK/bootable/x86-chapter.xml
===================================================================
--- BOOK/bootable/x86-chapter.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/x86-chapter.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -6,9 +6,9 @@
 ]>
 
-<chapter id="chapter-bootable" xreflabel="Making the LFS System Bootable">
+<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
   <?dbhtml dir="bootable"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Making the LFS System Bootable</title>
+  <title>Making the CLFS System Bootable</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
Index: BOOK/bootable/x86/grub.xml
===================================================================
--- BOOK/bootable/x86/grub.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/x86/grub.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -9,5 +9,5 @@
   <?dbhtml filename="grub.html"?>
 
-  <title>Making the LFS System Bootable</title>
+  <title>Making the CLFS System Bootable</title>
 
   <indexterm zone="ch-bootable-grub">
@@ -16,5 +16,5 @@
   </indexterm>
 
-  <para os="a">Your shiny new LFS system is almost complete. One of the last
+  <para os="a">Your shiny new CLFS system is almost complete. One of the last
   things to do is to ensure that the system can be properly booted. The
   instructions below apply only to computers of IA-32 architecture,
@@ -71,5 +71,5 @@
     a third party boot manager to manage the Master Boot Record (MBR).
     In this scenario, it would make more sense to install GRUB into the
-    <quote>boot sector</quote> of the LFS partition. In this case, this
+    <quote>boot sector</quote> of the CLFS partition. In this case, this
     next command would become <userinput>setup (hd0,3)</userinput>.</para>
   </warning>
@@ -101,6 +101,6 @@
 color green/black light-green/black
 
-# The first entry is for LFS.
-title LFS &version;
+# The first entry is for CLFS.
+title CLFS &version;
 root (hd0,3)
 kernel /boot/lfskernel-&linux-version; root=/dev/hda4</literal>
Index: BOOK/bootable/x86/kernel.xml
===================================================================
--- BOOK/bootable/x86/kernel.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/x86/kernel.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -51,5 +51,5 @@
     enabled and built into the kernel, not as modules. BLFS has
     some information regarding particular kernel configuration requirements of
-    packages outside of LFS at <ulink
+    packages outside of CLFS at <ulink
     url="&blfs-root;view/svn/longindex.html#kernel-config-index"/>:</para>
 
@@ -144,7 +144,7 @@
       <filename class="symlink">/usr/src/linux</filename> pointing to the
       kernel source directory. This is specific to kernels prior to the
-      2.6 series and <emphasis>must not</emphasis> be created on an LFS
+      2.6 series and <emphasis>must not</emphasis> be created on a CLFS
       system as it can cause problems for packages you may wish to build
-      once your base LFS system is complete.</para>
+      once your base CLFS system is complete.</para>
 
       <para>Also, the headers in the system's <filename
Index: BOOK/bootable/x86_64-64-chapter.xml
===================================================================
--- BOOK/bootable/x86_64-64-chapter.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/x86_64-64-chapter.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -6,9 +6,9 @@
 ]>
 
-<chapter id="chapter-bootable" xreflabel="Making the LFS System Bootable">
+<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
   <?dbhtml dir="bootable"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Making the LFS System Bootable</title>
+  <title>Making the CLFS System Bootable</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
Index: BOOK/bootable/x86_64-64/lilo.xml
===================================================================
--- BOOK/bootable/x86_64-64/lilo.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/x86_64-64/lilo.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -9,5 +9,5 @@
   <?dbhtml filename="lilo.html"?>
 
-  <title>Making the LFS System Bootable</title>
+  <title>Making the CLFS System Bootable</title>
 
   <indexterm zone="ch-bootable-lilo">
@@ -16,5 +16,5 @@
   </indexterm>
 
-    <para os="a">Your shiny new LFS system is almost complete. One of the
+    <para os="a">Your shiny new CLFS system is almost complete. One of the
       last things to do is to ensure that the system can be properly
       booted. The instructions below apply only to computers using lilo,
Index: BOOK/bootable/x86_64-chapter.xml
===================================================================
--- BOOK/bootable/x86_64-chapter.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootable/x86_64-chapter.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -6,9 +6,9 @@
 ]>
 
-<chapter id="chapter-bootable" xreflabel="Making the LFS System Bootable">
+<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
   <?dbhtml dir="bootable"?>
   <?dbhtml filename="chapter.html"?>
 
-  <title>Making the LFS System Bootable</title>
+  <title>Making the CLFS System Bootable</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
Index: BOOK/bootscripts/common/console.xml
===================================================================
--- BOOK/bootscripts/common/console.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootscripts/common/console.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -27,5 +27,5 @@
   url="http://www.tldp.org/HOWTO/HOWTO-INDEX/other-lang.html"/>. A pre-made
   <filename>/etc/sysconfig/console</filename> file with known settings for
-  several countries was installed with the LFS-Bootscripts package, so the
+  several countries was installed with the CLFS-Bootscripts package, so the
   relevant section can be uncommented if the country is supported. If still
   in doubt, look in the <filename class="directory">/usr/share/kbd</filename>
Index: BOOK/bootscripts/common/introduction.xml
===================================================================
--- BOOK/bootscripts/common/introduction.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootscripts/common/introduction.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -11,5 +11,5 @@
   <title>Introduction</title>
 
-  <para>This chapter details how to install and configure the LFS-Bootscripts
+  <para>This chapter details how to install and configure the CLFS-Bootscripts
   package. Most of these scripts will work without modification, but a few
   require additional configuration files because they deal with
Index: BOOK/bootscripts/common/network.xml
===================================================================
--- BOOK/bootscripts/common/network.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootscripts/common/network.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -58,5 +58,5 @@
 
     <para>The <envar>SERVICE</envar> variable defines the method used for
-    obtaining the IP address. The LFS-Bootscripts package has a modular IP
+    obtaining the IP address. The CLFS-Bootscripts package has a modular IP
     assignment format, and creating additional files in the <filename
     class="directory">/etc/sysconfig/network-devices/services</filename>
Index: BOOK/bootscripts/common/profile.xml
===================================================================
--- BOOK/bootscripts/common/profile.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootscripts/common/profile.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -119,5 +119,5 @@
   from Glibc.</para>
 
-  <para>Some packages beyond LFS may also lack support for your chosen locale.
+  <para>Some packages beyond CLFS may also lack support for your chosen locale.
   One example is the X library (part of the X Window System), which outputs
   the following error message:</para>
@@ -161,6 +161,6 @@
   require additional steps and additional patches because many applications
   tend to not work properly under such conditions. These steps and patches
-  are not included in the LFS book and such locales are not yet supported
-  by LFS.</para>
+  are not included in the CLFS book and such locales are not yet supported
+  by CLFS.</para>
 
 </sect1>
Index: BOOK/bootscripts/common/udev.xml
===================================================================
--- BOOK/bootscripts/common/udev.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootscripts/common/udev.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -9,5 +9,5 @@
   <?dbhtml filename="udev.html"?>
 
-  <title>Device and Module Handling on an LFS System</title>
+  <title>Device and Module Handling on a CLFS System</title>
 
   <indexterm zone="ch-scripts-udev">
@@ -99,5 +99,5 @@
     the rules specified in the files within the <filename
     class="directory">/etc/udev/rules.d/</filename> directory. These are
-    numbered in a similar fashion to the LFS-Bootscripts package. If
+    numbered in a similar fashion to the CLFS-Bootscripts package. If
     <command>udev</command> can't find a rule for the device it is creating,
     it will default permissions to <emphasis>660</emphasis> and ownership to
@@ -129,5 +129,5 @@
     this method will not work because the device node does not exist until
     the module is loaded. To solve this, the <command>S05modules</command>
-    bootscript was added to the LFS-Bootscripts package, along with the
+    bootscript was added to the CLFS-Bootscripts package, along with the
     <filename>/etc/sysconfig/modules</filename> file. By adding module
     names to the <filename>modules</filename> file, these modules will be
Index: BOOK/bootscripts/common/usage.xml
===================================================================
--- BOOK/bootscripts/common/usage.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootscripts/common/usage.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -19,5 +19,5 @@
   different from one system to another, so it cannot be assumed that
   because things worked in one particular Linux distribution, they should work
-  the same in LFS too. LFS has its own way of doing things, but it
+  the same in CLFS too. CLFS has its own way of doing things, but it
   respects generally accepted standards.</para>
 
@@ -124,5 +124,5 @@
 
   <para>Feel free to modify the way the boot process works (after all,
-  it is your own LFS system). The files given here are an example of how
+  it is your own CLFS system). The files given here are an example of how
   it can be done.</para>
 
Index: BOOK/bootscripts/mips/bootscripts.xml
===================================================================
--- BOOK/bootscripts/mips/bootscripts.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/bootscripts/mips/bootscripts.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -9,5 +9,5 @@
   <?dbhtml filename="bootscripts.html"?>
 
-  <title>LFS-Bootscripts-&lfs-bootscripts-version;</title>
+  <title>CLFS-Bootscripts-&lfs-bootscripts-version;</title>
 
   <indexterm zone="ch-scripts-bootscripts">
@@ -20,5 +20,5 @@
 
   <sect2 role="installation">
-    <title>Installation of LFS-Bootscripts</title>
+    <title>Installation of CLFS-Bootscripts</title>
 
     <para>Need to update the current bootscripts to handle LCD
Index: BOOK/chroot/common/changingowner.xml
===================================================================
--- BOOK/chroot/common/changingowner.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/chroot/common/changingowner.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -17,6 +17,6 @@
     class="directory">/tools</filename> and <filename
     class="directory">/cross-tools</filename> directories can be deleted
-    once the LFS system has been finished, they can be retained to build
-    additional LFS systems. If the <filename class="directory">/tools</filename>
+    once the CLFS system has been finished, they can be retained to build
+    additional CLFS systems. If the <filename class="directory">/tools</filename>
     and <filename class="directory">/cross-tools</filename> directories are
     kept as is, the files are owned by a user ID without a corresponding
@@ -27,5 +27,5 @@
 
     <para os="b">To avoid this issue, add the <systemitem
-    class="username">lfs</systemitem> user to the new LFS system later when
+    class="username">lfs</systemitem> user to the new CLFS system later when
     creating the <filename>/etc/passwd</filename> file, taking care to assign
     it the same user and group IDs as on the host system. Alternatively,
Index: BOOK/chroot/common/chroot.xml
===================================================================
--- BOOK/chroot/common/chroot.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/chroot/common/chroot.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -12,5 +12,5 @@
 
   <para>It is time to enter the chroot environment to begin building
-  and installing the final LFS system. As user <systemitem
+  and installing the final CLFS system. As user <systemitem
   class="username">root</systemitem>, run the following command to
   enter the realm that is, at the moment, populated with only the
@@ -37,5 +37,5 @@
   <para>From this point on, there is no need to use the
   <envar>LFS</envar> variable anymore, because all work will be
-  restricted to the LFS file system.  This is because the Bash shell is
+  restricted to the CLFS file system.  This is because the Bash shell is
   told that <filename class="directory">$LFS</filename> is now the root
   (<filename class="directory">/</filename>) directory.</para>
Index: BOOK/chroot/common/kernfs.xml
===================================================================
--- BOOK/chroot/common/kernfs.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/chroot/common/kernfs.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -30,5 +30,5 @@
 mount -vt sysfs sysfs $LFS/sys</userinput></screen>
 
-  <para>Remember that if for any reason you stop working on the LFS system
+  <para>Remember that if for any reason you stop working on the CLFS system
   and start again later, it is important to check that these file systems
   are mounted again before entering the chroot environment.</para>
@@ -44,7 +44,7 @@
   nodes are created by the Udev package.  Since this package is not
   available to us right now, we must take other steps to provide device
-  nodes under on the LFS filesystem.  We will use the <quote>bind</quote>
+  nodes under on the CLFS filesystem.  We will use the <quote>bind</quote>
   option in the mount command to make our host system's /dev structure
-  appear in the new LFS filesystem:</para>
+  appear in the new CLFS filesystem:</para>
 
 <screen><userinput>/tools/bin/mount -o bind /dev $LFS/dev</userinput></screen>
Index: BOOK/final-preps/creatingtoolsdir.xml
===================================================================
--- BOOK/final-preps/creatingtoolsdir.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/final-preps/creatingtoolsdir.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -28,5 +28,5 @@
   <para>The next step is to create a <filename class="symlink">/tools</filename>
   symlink on the host system. This will point to the newly-created directory
-  on the LFS partition. Run this command as <systemitem
+  on the CLFS partition. Run this command as <systemitem
   class="username">root</systemitem> as well:</para>
 
Index: BOOK/final-system/common/coreutils.xml
===================================================================
--- BOOK/final-system/common/coreutils.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/final-system/common/coreutils.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -81,5 +81,5 @@
 ln -svf ../../bin/install /usr/bin</userinput></screen>
 
-    <para os="t">Some of the scripts in the LFS-Bootscripts package depend on
+    <para os="t">Some of the scripts in the CLFS-Bootscripts package depend on
     <command>head</command> and <command>sleep</command>. As <filename
     class="directory">/usr</filename> may not be available during the early
Index: BOOK/final-system/common/e2fsprogs.xml
===================================================================
--- BOOK/final-system/common/e2fsprogs.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/final-system/common/e2fsprogs.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -70,5 +70,5 @@
           Management System (EVMS) plugin. This plugin is not up-to-date with
           the latest EVMS internal interfaces and EVMS is not installed as part
-          of a base LFS system, so the plugin is not required. See the EVMS
+          of a base CLFS system, so the plugin is not required. See the EVMS
           website at <ulink url="http://evms.sourceforge.net/"/> for more
           information regarding EVMS.</para>
Index: BOOK/final-system/common/glibc.xml
===================================================================
--- BOOK/final-system/common/glibc.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/final-system/common/glibc.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -125,9 +125,9 @@
       </listitem>
       <listitem>
-        <para>If you have mounted the LFS partition with the
+        <para>If you have mounted the CLFS partition with the
         <parameter>noatime</parameter> option, the <emphasis>atime</emphasis> test
         will fail. As mentioned in <xref linkend="ch-partitioning-mounting"/>,
         do not use the <parameter>noatime</parameter> option while building
-        LFS.</para>
+        CLFS.</para>
       </listitem>
       <listitem>
@@ -186,10 +186,10 @@
     <para>Some locales installed by the <command>make
     localedata/install-locales</command> command above are not properly
-    supported by some applications that are in the LFS and BLFS books. Because
+    supported by some applications that are in the CLFS and BLFS books. Because
     of the various problems that arise due to application programmers making
-    assumptions that break in such locales, LFS should not be used in locales
+    assumptions that break in such locales, CLFS should not be used in locales
     that utilize multibyte character sets (including UTF-8) or right-to-left
     writing order.  Numerous unofficial and unstable patches are required to
-    fix these problems, and it has been decided by the LFS developers not to
+    fix these problems, and it has been decided by the CLFS developers not to
     support such complex locales at this time. This applies to the ja_JP and
     fa_IR locales as well&mdash;they have been installed only for GCC and
Index: BOOK/final-system/common/inetutils.xml
===================================================================
--- BOOK/final-system/common/inetutils.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/final-system/common/inetutils.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -79,5 +79,5 @@
           <para>This disables the installation of the various network
           servers included as part of the Inetutils package. These servers are
-          deemed not appropriate in a basic LFS system. Some are insecure by
+          deemed not appropriate in a basic CLFS system. Some are insecure by
           nature and are only considered safe on trusted networks. More
           information can be found at <ulink
Index: BOOK/final-system/common/iproute2.xml
===================================================================
--- BOOK/final-system/common/iproute2.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/final-system/common/iproute2.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -49,5 +49,5 @@
           <filename class="directory">/sbin</filename>. This is the correct
           location according to the FHS, because some of the IPRoute2 binaries
-          are used by the LFS-Bootscripts package.</para>
+          are used by the CLFS-Bootscripts package.</para>
         </listitem>
       </varlistentry>
Index: BOOK/final-system/common/kbd.xml
===================================================================
--- BOOK/final-system/common/kbd.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/final-system/common/kbd.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -296,5 +296,5 @@
         <listitem>
           <para>Puts the keyboard and console in UNICODE mode. Never use it on
-          LFS, because applications are not configured to support UNICODE.</para>
+          CLFS, because applications are not configured to support UNICODE.</para>
           <indexterm zone="ch-system-kbd unicode_start">
             <primary sortas="b-unicode_start">unicode_start</primary>
Index: BOOK/final-system/common/man.xml
===================================================================
--- BOOK/final-system/common/man.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/final-system/common/man.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -103,5 +103,5 @@
     non-ISO 8859-1 locales. Also, it does not work with multibyte
     character sets. The first problem does not currently have a solution.
-    The second issue is not of concern because the LFS installation does
+    The second issue is not of concern because the CLFS installation does
     not support multibyte character sets.</para>
 
Index: BOOK/final-system/common/psmisc.xml
===================================================================
--- BOOK/final-system/common/psmisc.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/final-system/common/psmisc.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -40,5 +40,5 @@
           <filename class="directory">/usr/bin</filename>. This is the
           correct location according to the FHS, because some of the Psmisc
-          binaries are used by the LFS-Bootscripts package.</para>
+          binaries are used by the CLFS-Bootscripts package.</para>
         </listitem>
       </varlistentry>
Index: BOOK/final-system/common/sysvinit.xml
===================================================================
--- BOOK/final-system/common/sysvinit.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/final-system/common/sysvinit.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -98,5 +98,5 @@
     character set to a user-defined one, which can be modified by running
     the <command>setfont</command> program. The <command>console</command>
-    initscript from the LFS-Bootscripts package calls the
+    initscript from the CLFS-Bootscripts package calls the
     <command>setfont</command> program during system startup. Sending this
     escape sequence is necessary for people who use non-ISO 8859-1 screen
Index: BOOK/final-system/common/udev.xml
===================================================================
--- BOOK/final-system/common/udev.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/final-system/common/udev.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -177,5 +177,5 @@
           <para>Simulates a <command>udev</command> run for the given device,
           and prints out the name of the node the real <command>udev</command>
-          would have created or (not in LFS) the name of the renamed network
+          would have created or (not in CLFS) the name of the renamed network
           interface</para>
           <indexterm zone="ch-system-udev udevtest">
Index: BOOK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/final-system/common/util-linux.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -91,5 +91,5 @@
     <para os="g">Install the package and move the <command>logger</command> binary
     to <filename class="directory">/bin</filename> as it is needed by the
-    LFS-Bootscripts package:</para>
+    CLFS-Bootscripts package:</para>
 
 <screen os="h"><userinput>make HAVE_KILL=yes HAVE_SLN=yes install
Index: BOOK/final-system/common/vim.xml
===================================================================
--- BOOK/final-system/common/vim.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/final-system/common/vim.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -100,5 +100,5 @@
 <screen os="o"><userinput>ln -sv ../vim/vim&vim-version2;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
 
-    <para os="p">If an X Window System is going to be installed on the LFS
+    <para os="p">If an X Window System is going to be installed on the CLFS
     system, you may want to recompile Vim after installing X. Vim
     comes with a GUI version of the editor that requires X and some
@@ -376,5 +376,5 @@
           necessary to highlight in <command>vim</command>. This script
           requires the old Unix <command>spell</command> command, which
-          is provided neither in LFS nor in BLFS</para>
+          is provided neither in CLFS nor in BLFS</para>
           <indexterm zone="ch-system-vim vimspell.sh">
             <primary sortas="b-vimspell.sh">vimspell.sh</primary>
Index: BOOK/final-system/multilib/glibc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/glibc-64bit.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/final-system/multilib/glibc-64bit.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -124,9 +124,9 @@
       </listitem>
       <listitem>
-        <para>If you have mounted the LFS partition with the
+        <para>If you have mounted the CLFS partition with the
         <parameter>noatime</parameter> option, the <emphasis>atime</emphasis> test
         will fail. As mentioned in <xref linkend="ch-partitioning-mounting"/>,
         do not use the <parameter>noatime</parameter> option while building
-        LFS.</para>
+        CLFS.</para>
       </listitem>
       <listitem>
Index: BOOK/final-system/ppc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/ppc64/glibc-64bit.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/final-system/ppc64/glibc-64bit.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -135,9 +135,9 @@
       </listitem>
       <listitem>
-        <para>If you have mounted the LFS partition with the
+        <para>If you have mounted the CLFS partition with the
         <parameter>noatime</parameter> option, the <emphasis>atime</emphasis> test
         will fail. As mentioned in <xref linkend="ch-partitioning-mounting"/>,
         do not use the <parameter>noatime</parameter> option while building
-        LFS.</para>
+        CLFS.</para>
       </listitem>
       <listitem>
Index: BOOK/introduction/common/askforhelp.xml
===================================================================
--- BOOK/introduction/common/askforhelp.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/introduction/common/askforhelp.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -44,5 +44,5 @@
       <listitem>
         <para>The host distribution and version being used to
-        create LFS</para>
+        create CLFS</para>
       </listitem>
       <listitem>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/introduction/common/changelog.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -37,4 +37,13 @@
 -->
 
+    <listitem>
+      <para>June 21, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Text updates to the book, including replacing
+          "LFS" with "CLFS".</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: BOOK/introduction/common/resources.xml
===================================================================
--- BOOK/introduction/common/resources.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/introduction/common/resources.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -14,5 +14,5 @@
     <title>FAQ</title>
 
-    <para>If during the building of the LFS system you encounter any
+    <para>If during the building of the CLFS system you encounter any
     errors, have any questions, or think there is a typo in the book,
     please start by consulting the Frequently Asked Questions (FAQ)
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/materials/common/patches.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -15,5 +15,5 @@
   fixed by the maintainer. The patches also make small modifications to
   make the packages easier to work with. The following patches will be
-  needed to build an LFS system:</para>
+  needed to build an CLFS system:</para>
 
   <variablelist role="materials">
@@ -299,5 +299,5 @@
 
   <para>In addition to the above required patches, there exist a number of
-  optional patches created by the LFS community. These optional patches
+  optional patches created by the CLFS community. These optional patches
   solve minor problems or enable functionality that is not enabled by
   default. Feel free to peruse the patches database located at
Index: BOOK/partitioning/common/creatingfilesystem.xml
===================================================================
--- BOOK/partitioning/common/creatingfilesystem.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/partitioning/common/creatingfilesystem.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -20,9 +20,9 @@
 
   <para os="b">To create an <systemitem class="filesystem">ext2</systemitem> file
-  system on the LFS partition, run the following:</para>
+  system on the CLFS partition, run the following:</para>
 
 <screen os="c"><userinput>mke2fs /dev/<replaceable>[xxx]</replaceable></userinput></screen>
 
-  <para os="d">Replace <replaceable>[xxx]</replaceable> with the name of the LFS
+  <para os="d">Replace <replaceable>[xxx]</replaceable> with the name of the CLFS
   partition (<filename class="devicefile">hda5</filename> in our previous
   example).</para>
@@ -31,9 +31,9 @@
     <para>Some host distributions use custom features in their filesystem
     creation tools (E2fsprogs). This can cause problems when booting into
-    your new LFS, as those features will not be supported by the LFS-installed
-    E2fsprogs; you will get an error similar to <computeroutput>unsupported
-    filesystem features, upgrade your e2fsprogs</computeroutput>. To check
-    if your host system uses custom enhancements, run the following
-    command:</para>
+    your new CLFS system, as those features will not be supported by the
+    CLFS-installed E2fsprogs; you will get an error similar to
+    <computeroutput>unsupported filesystem features, upgrade your
+    e2fsprogs</computeroutput>. To check if your host system uses custom
+    enhancements, run the following command:</para>
 
 <screen os="f"><userinput>debugfs -R feature /dev/<replaceable>[xxx]</replaceable></userinput></screen>
@@ -43,5 +43,5 @@
     enhancements.  In that case, to avoid later problems, you should compile the
     stock E2fsprogs package and use the resulting binaries to re-create the
-    filesystem on your LFS partition:</para>
+    filesystem on your CLFS partition:</para>
 
 <screen os="g"><userinput>cd /tmp
Index: BOOK/partitioning/common/creatingpartition.xml
===================================================================
--- BOOK/partitioning/common/creatingpartition.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/partitioning/common/creatingpartition.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -26,5 +26,5 @@
   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
+  additional space (2-3 GB). The CLFS system itself will not take up this
   much room. A large portion of this requirement is to provide sufficient
   free temporary storage. Compiling packages can require a lot of disk space
@@ -35,5 +35,5 @@
   partition as swap space. This is used by the kernel to store seldom-used
   data and leave more memory available for active processes. The swap
-  partition for an LFS system can be the same as the one used by the host
+  partition for an CLFS system can be the same as the one used by the host
   system, in which case it is not necessary to create another one.</para>
 
Index: BOOK/partitioning/common/mounting.xml
===================================================================
--- BOOK/partitioning/common/mounting.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/partitioning/common/mounting.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -32,5 +32,5 @@
   the CLFS partition.</para>
 
-  <para>If using multiple partitions for LFS (e.g., one for <filename
+  <para>If using multiple partitions for CLFS (e.g., one for <filename
   class="directory">/</filename> and another for <filename
   class="directory">/usr</filename>), mount them using:</para>
Index: BOOK/prologue/common/errata.xml
===================================================================
--- BOOK/prologue/common/errata.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/prologue/common/errata.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -13,10 +13,11 @@
   <para>The software used to create a CLFS system is constantly being
   updated and enhanced. Security warnings and bug fixes may become
-  available after the LFS book has been released. To check whether the
-  package versions or instructions in this release of CLFS need any
-  modifications to accommodate security vulnerabilities or other bug fixes,
-  please visit <ulink url="&errata;"/> before proceeding with your build.
-  You should note any changes shown and apply them to the relevant section
-  of the book as you progress with building the LFS system.</para>
+  available after the CLFS book has been released. Some host systems may
+  also have problems building CLFS. To check whether the package versions
+  or instructions in this release of CLFS need any modifications to
+  accommodate security vulnerabilities, other bug fixes, or host-specific
+  issues, please visit <ulink url="&errata;"/> before proceeding with your
+  build. You should note any changes shown and apply them to the relevant
+  section of the book as you progress with building the CLFS system.</para>
 
 </sect1>
Index: BOOK/prologue/common/prerequisites.xml
===================================================================
--- BOOK/prologue/common/prerequisites.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/prologue/common/prerequisites.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -23,5 +23,5 @@
 
   <para>Because the CLFS book assumes <emphasis>at least</emphasis> this basic
-  level of skill, the various LFS support forums are unlikely to be able to
+  level of skill, the various CLFS support forums are unlikely to be able to
   provide you with much assistance; you will find that your questions regarding
   such basic knowledge will likely go unanswered, or you will simply be referred
Index: BOOK/prologue/common/typography.xml
===================================================================
--- BOOK/prologue/common/typography.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/prologue/common/typography.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -13,6 +13,6 @@
   <para>To make things easier to follow, there are a few typographical
   conventions used throughout this book. This section contains some
-  examples of the typographical format found throughout Linux From
-  Scratch.</para>
+  examples of the typographical format found throughout Cross-Compiled
+  Linux From Scratch.</para>
 
 <screen role="nodump"><userinput>./configure --prefix=/usr</userinput></screen>
@@ -36,5 +36,5 @@
   <para><ulink url="&lfs-root;"/></para>
 
-  <para>This format is used for hyperlinks, both within the LFS
+  <para>This format is used for hyperlinks, both within the CLFS
   community and to external pages. It includes HOWTOs, download locations,
   and websites.</para>
@@ -62,5 +62,5 @@
   referred to simply as a <quote>man</quote> page). The number inside
   parentheses indicates a specific section inside of <command>man</command>.
-  For example, <command>passwd</command> has two man pages. Per LFS
+  For example, <command>passwd</command> has two man pages. Per CLFS
   installation instructions, those two man pages will be located at
   <filename>/usr/share/man/man1/passwd.1</filename> and
Index: BOOK/the-end/reboot.xml
===================================================================
--- BOOK/the-end/reboot.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/the-end/reboot.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -21,5 +21,5 @@
   book while still in our current chroot environment, you can leave
   yourself in a much better position to continue on once you reboot
-  into your new LFS installation. Installing a text mode web browser,
+  into your new CLFS installation. Installing a text mode web browser,
   such as Lynx, you can easily view the BLFS book in one virtual terminal,
   while building packages in another. The GPM package will also allow you
@@ -30,5 +30,5 @@
 
   <para>Now that we have said that, lets move on to booting our shiny
-  new LFS installation for the first time! First exit from the chroot
+  new CLFS installation for the first time! First exit from the chroot
   environment:</para>
 
@@ -43,5 +43,5 @@
 umount $LFS/sys</userinput></screen>
 
-  <para>Unmount the LFS file system itself:</para>
+  <para>Unmount the CLFS file system itself:</para>
 
 <screen><userinput>umount $LFS</userinput></screen>
@@ -61,5 +61,5 @@
   <emphasis>CLFS &version;</emphasis> will boot automatically.</para>
 
-  <para>When the reboot is complete, the LFS system is ready for use and
+  <para>When the reboot is complete, the CLFS system is ready for use and
   more software may be added to suit your needs.</para>
 
Index: BOOK/the-end/whatnow.xml
===================================================================
--- BOOK/the-end/whatnow.xml	(revision 0de816f848f5ea52395bba37a358936bba9ebd34)
+++ BOOK/the-end/whatnow.xml	(revision fb40919e2f519cdebc9b859c24331db4552df36e)
@@ -11,9 +11,9 @@
   <title>What Now?</title>
 
-  <para>Thank you for reading this LFS book. We hope that you have
+  <para>Thank you for reading this CLFS book. We hope that you have
   found this book helpful and have learned more about the system
   creation process.</para>
 
-  <para>Now that the LFS system is installed, you may be wondering
+  <para>Now that the CLFS system is installed, you may be wondering
   <quote>What next?</quote> To answer that question, we have compiled
   a list of resources for you.</para>
@@ -25,5 +25,5 @@
 
       <para>Bugs and security notices are reported regularly for all software.
-      Since an LFS system is compiled from source, it is up to you to keep
+      Since a CLFS system is compiled from source, it is up to you to keep
       abreast of such reports.  There are several online resources that track
       such reports, some of which are shown below:</para>
@@ -65,5 +65,5 @@
 
       <para>The Beyond Linux From Scratch book covers installation
-      procedures for a wide range of software beyond the scope of the LFS
+      procedures for a wide range of software beyond the scope of the CLFS
       Book. The BLFS project is located at <ulink url="&blfs-root;"/>.</para>
     </listitem>
