Index: BOOK/bootable/arm/kernel.xml
===================================================================
--- BOOK/bootable/arm/kernel.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/bootable/arm/kernel.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -54,5 +54,5 @@
     url="&blfs-root;view/svn/longindex.html#kernel-config-index"/>:</para>
 
-<screen os="i"><userinput>make ARCH=arm CROSS_COMPILE=${LFS_TARGET}- menuconfig</userinput></screen>
+<screen os="i"><userinput>make ARCH=arm CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
 
     <para os="j">Alternatively, <command>make oldconfig</command> may be more
@@ -69,5 +69,5 @@
     <para os="m">Compile the kernel image and modules:</para>
 
-<screen os="n"><userinput>make ARCH=arm CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen os="n"><userinput>make ARCH=arm CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <para os="o">If using kernel modules, an
@@ -97,14 +97,14 @@
     them:</para>
 
-<screen os="t"><userinput>make ARCH=arm CROSS_COMPILE=${LFS_TARGET}- \
-    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+<screen os="t"><userinput>make ARCH=arm CROSS_COMPILE=${CLFS_TARGET}- \
+    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <para os="u">After kernel compilation is complete, additional steps are
     required to complete the installation. Some files need to be copied to
-    the <filename class="directory">${LFS}/boot</filename> directory.</para>
+    the <filename class="directory">${CLFS}/boot</filename> directory.</para>
 
     <para os="v">Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp arch/i386/boot/bzImage ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp arch/i386/boot/bzImage ${CLFS}/boot/lfskernel-&linux-version;</userinput></screen>
 
     <para os="w"><filename>System.map</filename> is a symbol file for the kernel.
@@ -113,5 +113,5 @@
     kernel. Issue the following command to install the map file:</para>
 
-<screen os="w1"><userinput>cp System.map ${LFS}/boot/System.map-&linux-version;</userinput></screen>
+<screen os="w1"><userinput>cp System.map ${CLFS}/boot/System.map-&linux-version;</userinput></screen>
 
     <para os="x">The kernel configuration file <filename>.config</filename>
@@ -120,5 +120,5 @@
     It is a good idea to keep this file for future reference:</para>
 
-<screen os="x1"><userinput>cp .config ${LFS}/boot/config-&linux-version;</userinput></screen>
+<screen os="x1"><userinput>cp .config ${CLFS}/boot/config-&linux-version;</userinput></screen>
 
     <warning os="z">
Index: BOOK/bootable/common/chowning.xml
===================================================================
--- BOOK/bootable/common/chowning.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/bootable/common/chowning.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -19,7 +19,7 @@
     <para>The commands in the remainder of this book must be performed while
     logged in as <systemitem class="username">root</systemitem>. Check that
-    $LFS is still set:</para>
+    $CLFS is still set:</para>
 
-    <screen><userinput>echo $LFS</userinput></screen>
+    <screen><userinput>echo $CLFS</userinput></screen>
 
   </important>
@@ -28,22 +28,22 @@
   entire lfs system.</para>
 
-<screen><userinput>chown -Rv root:root ${LFS}</userinput></screen>
+<screen><userinput>chown -Rv root:root ${CLFS}</userinput></screen>
 
   <para>The following files are not the be owned by
   <systemitem class="username">root</systemitem>.</para>
 
-<screen><userinput>chgrp -v utmp ${LFS}/var/run/utmp ${LFS}/var/log/lastlog</userinput></screen>
+<screen><userinput>chgrp -v utmp ${CLFS}/var/run/utmp ${CLFS}/var/log/lastlog</userinput></screen>
 
   <para>The following device nodes need to be created for the system to
   boot.</para>
 
-<screen><userinput>mknod -m 0666 ${LFS}/dev/null c 1 3
-mknod -m 0600 ${LFS}/dev/console c 5 1</userinput></screen>
+<screen><userinput>mknod -m 0666 ${CLFS}/dev/null c 1 3
+mknod -m 0600 ${CLFS}/dev/console c 5 1</userinput></screen>
 
   <para>If you did not create the following rules in <xref linkend="ch-scripts-udev-rules"/>. You
   need to create them now.</para>
 
-<screen><userinput>mknod -m 0666 ${LFS}/lib/udev/devices/null c 1 3
-mknod -m 0600 ${LFS}/lib/udev/devices/console c 5 1</userinput></screen>
+<screen><userinput>mknod -m 0666 ${CLFS}/lib/udev/devices/null c 1 3
+mknod -m 0600 ${CLFS}/lib/udev/devices/console c 5 1</userinput></screen>
 
 </sect1>
Index: BOOK/bootable/common/fstab.xml
===================================================================
--- BOOK/bootable/common/fstab.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/bootable/common/fstab.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -20,5 +20,5 @@
   to mounting. Create a new file systems table like this:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/fstab &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/fstab &lt;&lt; "EOF"
 <literal># Begin /etc/fstab
 
Index: BOOK/bootscripts/common/bootscripts.xml
===================================================================
--- BOOK/bootscripts/common/bootscripts.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/bootscripts/common/bootscripts.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -28,5 +28,5 @@
     <para>Install the package:</para>
 
-<screen><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/bootscripts/common/console.xml
===================================================================
--- BOOK/bootscripts/common/console.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/bootscripts/common/console.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -35,5 +35,5 @@
   the configuration file with the following command:</para>
 
-<screen><userinput>cat &gt;${LFS}/etc/sysconfig/console &lt;&lt;"EOF"
+<screen><userinput>cat &gt;${CLFS}/etc/sysconfig/console &lt;&lt;"EOF"
 <literal>KEYMAP="<replaceable>[arguments for loadkeys]</replaceable>"
 FONT="<replaceable>[arguments for setfont]</replaceable>"</literal>
@@ -44,5 +44,5 @@
   correct:</para>
 
-<screen><userinput>cat &gt;${LFS}/etc/sysconfig/console &lt;&lt;"EOF"
+<screen><userinput>cat &gt;${CLFS}/etc/sysconfig/console &lt;&lt;"EOF"
 <literal>KEYMAP="es euro2"
 FONT="lat9-16 -u iso01"</literal>
@@ -74,5 +74,5 @@
   following keymap snippet to fix this issue:</para>
 
-<screen><userinput>mkdir -p ${LFS}/etc/kbd &amp;&amp; cat &gt; ${LFS}/etc/kbd/bs-sends-del &lt;&lt;"EOF"
+<screen><userinput>mkdir -p ${CLFS}/etc/kbd &amp;&amp; cat &gt; ${CLFS}/etc/kbd/bs-sends-del &lt;&lt;"EOF"
 <literal>                  keycode  14 = Delete Delete Delete Delete
               alt keycode  14 = Meta_Delete
@@ -87,5 +87,5 @@
   snippet after the main keymap:</para>
 
-<screen><userinput>cat &gt;&gt; ${LFS}/etc/sysconfig/console &lt;&lt;"EOF"
+<screen><userinput>cat &gt;&gt; ${CLFS}/etc/sysconfig/console &lt;&lt;"EOF"
 <literal>KEYMAP_CORRECTIONS="/etc/kbd/bs-sends-del"</literal>
 EOF</userinput></screen>
Index: BOOK/bootscripts/common/hostname.xml
===================================================================
--- BOOK/bootscripts/common/hostname.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/bootscripts/common/hostname.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -22,5 +22,5 @@
   and enter a hostname by running:</para>
 
-  <screen><userinput>echo "HOSTNAME=<replaceable>[lfs]</replaceable>" &gt; ${LFS}/etc/sysconfig/network</userinput></screen>
+  <screen><userinput>echo "HOSTNAME=<replaceable>[lfs]</replaceable>" &gt; ${CLFS}/etc/sysconfig/network</userinput></screen>
 
   <para><replaceable>[lfs]</replaceable> needs to be replaced with the
Index: BOOK/bootscripts/common/hosts.xml
===================================================================
--- BOOK/bootscripts/common/hosts.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/bootscripts/common/hosts.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -50,5 +50,5 @@
   <para>Create the  <filename>/etc/hosts</filename> file by running:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/hosts &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/hosts &lt;&lt; "EOF"
 <literal># Begin /etc/hosts (network card version)
 
@@ -69,5 +69,5 @@
   <filename>/etc/hosts</filename> file by running:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/hosts &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/hosts &lt;&lt; "EOF"
 <literal># Begin /etc/hosts (no network card version)
 
Index: BOOK/bootscripts/common/inputrc.xml
===================================================================
--- BOOK/bootscripts/common/inputrc.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/bootscripts/common/inputrc.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -37,5 +37,5 @@
   using the following command:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/inputrc &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/inputrc &lt;&lt; "EOF"
 <literal># Begin /etc/inputrc
 # Modified by Chris Lynn &lt;roryo@roryo.dynup.net&gt;
Index: BOOK/bootscripts/common/network.xml
===================================================================
--- BOOK/bootscripts/common/network.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/bootscripts/common/network.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -39,5 +39,5 @@
     file for the <filename class="devicefile">eth0</filename> device:</para>
 
-<screen><userinput>cd ${LFS}/etc/sysconfig/network-devices &amp;&amp;
+<screen><userinput>cd ${CLFS}/etc/sysconfig/network-devices &amp;&amp;
 mkdir ifconfig.eth0 &amp;&amp;
 cat &gt; ifconfig.eth0/ipv4 &lt;&lt; "EOF"
@@ -95,5 +95,5 @@
     Create the file by running the following:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/resolv.conf &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/resolv.conf &lt;&lt; "EOF"
 <literal># Begin /etc/resolv.conf
 
Index: BOOK/bootscripts/common/profile.xml
===================================================================
--- BOOK/bootscripts/common/profile.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/bootscripts/common/profile.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -140,5 +140,5 @@
   <filename>/etc/profile</filename> file:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/profile &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/profile &lt;&lt; "EOF"
 <literal># Begin /etc/profile
 
Index: BOOK/bootscripts/common/setclock.xml
===================================================================
--- BOOK/bootscripts/common/setclock.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/bootscripts/common/setclock.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -42,5 +42,5 @@
   the following:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/sysconfig/clock &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/sysconfig/clock &lt;&lt; "EOF"
 <literal># Begin /etc/sysconfig/clock
 
Index: BOOK/bootscripts/common/udev-rules.xml
===================================================================
--- BOOK/bootscripts/common/udev-rules.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/bootscripts/common/udev-rules.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -30,9 +30,9 @@
     sets:</para>
 
-<screen os="b"><userinput>rm -vf ${LFS}/etc/udev/rules.d/*</userinput></screen>
+<screen os="b"><userinput>rm -vf ${CLFS}/etc/udev/rules.d/*</userinput></screen>
 
     <para os="c">Install the package:</para>
 
-<screen os="d"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="d"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/cross-tools/arm/glibc-headers.xml
===================================================================
--- BOOK/cross-tools/arm/glibc-headers.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/cross-tools/arm/glibc-headers.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -68,6 +68,6 @@
 
 <screen os="i"><userinput>CC=gcc ../glibc-&glibc-version;/configure --prefix=/usr \
-   --host=${LFS_TARGET} --build=${LFS_HOST} \
-   --with-headers=${LFS}/usr/include --cache-file=config.cache</userinput></screen>
+   --host=${CLFS_TARGET} --build=${CLFS_HOST} \
+   --with-headers=${CLFS}/usr/include --cache-file=config.cache</userinput></screen>
 
     <variablelist os="dj">
@@ -82,8 +82,8 @@
  	
        <varlistentry os="dj2">
-           <term><parameter>--with-headers=${LFS}/usr/include</parameter></term>
+           <term><parameter>--with-headers=${CLFS}/usr/include</parameter></term>
            <listitem>
               <para>This tells Glibc to compile itself against the headers
-              recently installed to the <filename class="directory">${LFS}/usr/include</filename>
+              recently installed to the <filename class="directory">${CLFS}/usr/include</filename>
               directory, so that it knows exactly what features the kernel has
               and can optimize itself accordingly.</para>
@@ -101,17 +101,17 @@
 
    <para os="n">First we will copy a common file over to <filename 
-   class="directory">${LFS}/usr/include</filename>:</para>
+   class="directory">${CLFS}/usr/include</filename>:</para>
 
-<screen os="o"><userinput>install -dv ${LFS}/usr/include/bits
-cp -v bits/stdio_lim.h ${LFS}/usr/include/bits</userinput></screen>
+<screen os="o"><userinput>install -dv ${CLFS}/usr/include/bits
+cp -v bits/stdio_lim.h ${CLFS}/usr/include/bits</userinput></screen>
 
    <para os="p">Now we will create a blank stub file:</para>
 
-<screen os="q"><userinput>touch ${LFS}/usr/include/gnu/stubs.h</userinput></screen>
+<screen os="q"><userinput>touch ${CLFS}/usr/include/gnu/stubs.h</userinput></screen>
 
    <para os="r">For NPTL we use the following command:</para>
    
 <screen os="s"><userinput>cp -v ../glibc-&glibc-version;/ports/sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h \
-    ${LFS}/usr/include/bits</userinput></screen>
+    ${CLFS}/usr/include/bits</userinput></screen>
 
   </sect2>
Index: BOOK/cross-tools/arm/linux-headers.xml
===================================================================
--- BOOK/cross-tools/arm/linux-headers.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/cross-tools/arm/linux-headers.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -37,20 +37,20 @@
     <para os="b">Install the header files that are common to all architectures:</para>
 
-<screen os="c"><userinput>install -dv ${LFS}/usr/include/{asm,asm-generic,linux,net,mtd,scsi,sound}
-cp -av include/asm-generic/* ${LFS}/usr/include/asm-generic
-cp -av include/linux/* ${LFS}/usr/include/linux
-cp -av include/mtd/* ${LFS}/usr/include/mtd
-cp -av include/net/* ${LFS}/usr/include/net
-cp -av include/scsi/* ${LFS}/usr/include/scsi
-cp -av include/sound/* ${LFS}/usr/include/sound</userinput></screen>
+<screen os="c"><userinput>install -dv ${CLFS}/usr/include/{asm,asm-generic,linux,net,mtd,scsi,sound}
+cp -av include/asm-generic/* ${CLFS}/usr/include/asm-generic
+cp -av include/linux/* ${CLFS}/usr/include/linux
+cp -av include/mtd/* ${CLFS}/usr/include/mtd
+cp -av include/net/* ${CLFS}/usr/include/net
+cp -av include/scsi/* ${CLFS}/usr/include/scsi
+cp -av include/sound/* ${CLFS}/usr/include/sound</userinput></screen>
 
     <para os="d">Install the header files that are specific to this architecture:</para>
 
-<screen><userinput>cp -av include/asm-arm/* ${LFS}/usr/include/asm</userinput></screen>
+<screen><userinput>cp -av include/asm-arm/* ${CLFS}/usr/include/asm</userinput></screen>
 
     <para os="e">Make sure the users can read the headers:</para>
 
-<screen os="f"><userinput>find ${LFS}/usr/include/{asm,asm-generic,linux,mtd,net,scsi,sound} -type d -exec chmod -v 755 {} \;
-find ${LFS}/usr/include/{asm,asm-generic,linux,mtd,net,scsi,sound} -type f -exec chmod -v 644 {} \;</userinput></screen>
+<screen os="f"><userinput>find ${CLFS}/usr/include/{asm,asm-generic,linux,mtd,net,scsi,sound} -type d -exec chmod -v 755 {} \;
+find ${CLFS}/usr/include/{asm,asm-generic,linux,mtd,net,scsi,sound} -type f -exec chmod -v 644 {} \;</userinput></screen>
 
   </sect2>
Index: BOOK/cross-tools/arm/variables.xml
===================================================================
--- BOOK/cross-tools/arm/variables.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/cross-tools/arm/variables.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -35,6 +35,6 @@
   case you have to exit and restart building later:</para>
 
-<screen os="f"><userinput>echo export LFS_HOST=\""${LFS_HOST}\"" &gt;&gt; ~/.bashrc
-echo export LFS_TARGET=\""${LFS_TARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+<screen os="f"><userinput>echo export LFS_HOST=\""${CLFS_HOST}\"" &gt;&gt; ~/.bashrc
+echo export LFS_TARGET=\""${CLFS_TARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
 
 </sect1>
Index: BOOK/cross-tools/common/binutils.xml
===================================================================
--- BOOK/cross-tools/common/binutils.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/cross-tools/common/binutils.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -48,6 +48,6 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="bc"><userinput>../binutils-&binutils-version;/configure --prefix=${LFS}/cross-tools \
-   --host=${LFS_HOST} --target=${LFS_TARGET} --with-sysroot=${LFS} \
+<screen os="bc"><userinput>../binutils-&binutils-version;/configure --prefix=${CLFS}/cross-tools \
+   --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-sysroot=${CLFS} \
    --disable-nls --enable-shared --disable-multilib</userinput></screen>
 
@@ -56,8 +56,8 @@
 
       <varlistentry os="bd1">
-        <term><parameter>--prefix=${LFS}/cross-tools</parameter></term>
+        <term><parameter>--prefix=${CLFS}/cross-tools</parameter></term>
         <listitem>
           <para>This tells the configure script to prepare to install the
-          package in the <filename class="directory">${LFS}/cross-tools</filename>
+          package in the <filename class="directory">${CLFS}/cross-tools</filename>
           directory.</para>
         </listitem>
@@ -65,24 +65,24 @@
 
       <varlistentry os="bd2">
-        <term><parameter>--host=${LFS_HOST}</parameter></term>
+        <term><parameter>--host=${CLFS_HOST}</parameter></term>
         <listitem>
           <para>When used with --target, this creates a cross-architecture
-          executable that creates files for ${LFS_TARGET} but runs on ${LFS_HOST).</para>
+          executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST).</para>
         </listitem>
       </varlistentry>
 
       <varlistentry os="bd3">
-        <term><parameter>--target=${LFS_TARGET}</parameter></term>
+        <term><parameter>--target=${CLFS_TARGET}</parameter></term>
         <listitem>
           <para>When used with --host, this creates a cross-architecture
-          executable that creates files for ${LFS_TARGET} but runs on ${LFS_HOST).</para>
+          executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST).</para>
         </listitem>
       </varlistentry>
 
       <varlistentry os="bd4">
-        <term><parameter>--with-sysroot=${LFS}</parameter></term>
+        <term><parameter>--with-sysroot=${CLFS}</parameter></term>
         <listitem>
-          <para>This tells configure that ${LFS} is going to be the root
-          of our system. It will now use the specified sysroot, ${LFS} as
+          <para>This tells configure that ${CLFS} is going to be the root
+          of our system. It will now use the specified sysroot, ${CLFS} as
           a prefix of the default search paths.</para>
         </listitem>
@@ -137,7 +137,7 @@
 
     <para os="bj">Copy the <filename class="headerfile">libiberty.h</filename> file to
-    <filename class="directory">${LFS}/usr/include</filename> directory:</para>
+    <filename class="directory">${CLFS}/usr/include</filename> directory:</para>
 
-<screen os="bk"><userinput>cp -v ../binutils-&binutils-version;/include/libiberty.h ${LFS}/usr/include</userinput></screen>
+<screen os="bk"><userinput>cp -v ../binutils-&binutils-version;/include/libiberty.h ${CLFS}/usr/include</userinput></screen>
 
   </sect2>
Index: BOOK/cross-tools/common/file.xml
===================================================================
--- BOOK/cross-tools/common/file.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/cross-tools/common/file.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -19,5 +19,5 @@
     <para>Prepare File for compilation:</para>
 
-<screen><userinput>./configure --prefix=${LFS}/cross-tools</userinput></screen>
+<screen><userinput>./configure --prefix=${CLFS}/cross-tools</userinput></screen>
 
     <para>Compile the Package:</para>
Index: BOOK/cross-tools/common/gcc-final.xml
===================================================================
--- BOOK/cross-tools/common/gcc-final.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/cross-tools/common/gcc-final.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -59,7 +59,7 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="ae"><userinput>../gcc-&gcc-version;/configure --prefix=${LFS}/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} --disable-multilib \
-    --with-sysroot=${LFS} --disable-nls --enable-shared \
+<screen os="ae"><userinput>../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \
+    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-multilib \
+    --with-sysroot=${CLFS} --disable-nls --enable-shared \
     --enable-languages=c,c++ --enable-__cxa_atexit \
     --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
Index: BOOK/cross-tools/common/gcc-static.xml
===================================================================
--- BOOK/cross-tools/common/gcc-static.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/cross-tools/common/gcc-static.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -51,7 +51,7 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="ae"><userinput>../gcc-&gcc-version;/configure --prefix=${LFS}/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} --disable-multilib \
-    --with-sysroot=${LFS} --disable-nls --disable-shared \
+<screen os="ae"><userinput>../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \
+    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-multilib \
+    --with-sysroot=${CLFS} --disable-nls --disable-shared \
     --enable-languages=c</userinput></screen>
 
Index: BOOK/cross-tools/common/glibc.xml
===================================================================
--- BOOK/cross-tools/common/glibc.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/cross-tools/common/glibc.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -74,15 +74,15 @@
     <filename>configparms</filename> to adjust instalation paths:</para>
 
-<screen os="g"><userinput>echo "install_root=${LFS}" &gt; configparms</userinput></screen>
+<screen os="g"><userinput>echo "install_root=${CLFS}" &gt; configparms</userinput></screen>
 
     <para os="h">Prepare Glibc for compilation:</para>
 
-<screen os="i"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
+<screen os="i"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/usr --libexecdir=/usr/lib/glibc \
-    --host=${LFS_TARGET} --build=${LFS_HOST} \
+    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=${LFS}/cross-tools/bin --with-headers=${LFS}/usr/include \
+    --with-binutils=${CLFS}/cross-tools/bin --with-headers=${CLFS}/usr/include \
     --cache-file=config.cache</userinput></screen>
 
@@ -99,5 +99,5 @@
 
       <varlistentry os="j2">
-        <term><parameter>CC="${LFS_TARGET}-gcc"</parameter></term>
+        <term><parameter>CC="${CLFS_TARGET}-gcc"</parameter></term>
         <listitem>
           <para>This forces Glibc to use the GCC compiler that we made for our target
@@ -107,5 +107,5 @@
 
       <varlistentry os="j3">
-        <term><parameter>AR="${LFS_TARGET}-ar"</parameter></term>
+        <term><parameter>AR="${CLFS_TARGET}-ar"</parameter></term>
         <listitem>
           <para>This forces Glibc to use the <command>ar</command> utility
@@ -115,5 +115,5 @@
 
       <varlistentry os="j4">
-        <term><parameter>RANLIB="${LFS_TARGET}-ranlib"</parameter></term>
+        <term><parameter>RANLIB="${CLFS_TARGET}-ranlib"</parameter></term>
         <listitem>
           <para>This forces Glibc to use the <command>ranlib</command> utility
@@ -154,5 +154,5 @@
 
       <varlistentry os="j9">
-        <term><parameter>--with-binutils=${LFS}/cross-tools/bin</parameter></term>
+        <term><parameter>--with-binutils=${CLFS}/cross-tools/bin</parameter></term>
         <listitem>
           <para>This tells Glibc to use the Binutils that are specific to
@@ -214,5 +214,5 @@
     successfully:</para>
 
-<screen role="nodump"><userinput>mkdir -pv ${LFS}/usr/lib/locale
+<screen role="nodump"><userinput>mkdir -pv ${CLFS}/usr/lib/locale
 localedef -i de_DE -f ISO-8859-1 de_DE
 localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
@@ -263,5 +263,5 @@
     the following:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/nsswitch.conf &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/nsswitch.conf &lt;&lt; "EOF"
 <literal># Begin /etc/nsswitch.conf
 
@@ -283,5 +283,5 @@
     <para>To determine the local time zone, run the following script:</para>
 
-<screen role="nodump"><userinput>${LFS}/usr/bin/tzselect</userinput></screen>
+<screen role="nodump"><userinput>${CLFS}/usr/bin/tzselect</userinput></screen>
 
     <para>After answering a few questions about the location, the script will
@@ -290,6 +290,6 @@
     <filename>/etc/localtime</filename> file by running:</para>
 
-<screen><userinput>cp -v --remove-destination ${LFS}/usr/share/zoneinfo/<replaceable>[xxx]</replaceable> \
-    ${LFS}/etc/localtime</userinput></screen>
+<screen><userinput>cp -v --remove-destination ${CLFS}/usr/share/zoneinfo/<replaceable>[xxx]</replaceable> \
+    ${CLFS}/etc/localtime</userinput></screen>
 
     <para>Replace <replaceable>[xxx]</replaceable> with the name of the time zone
@@ -337,5 +337,5 @@
     following:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/ld.so.conf &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/ld.so.conf &lt;&lt; "EOF"
 <literal># Begin /etc/ld.so.conf
 
Index: BOOK/final-preps/aboutclfs.xml
===================================================================
--- BOOK/final-preps/aboutclfs.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
+++ BOOK/final-preps/aboutclfs.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-final-preps-aboutlfs">
+  <?dbhtml filename="aboutlfs.html"?>
+
+  <title>About $CLFS</title>
+
+  <para>Throughout this book, the environment variable <envar>LFS</envar> will
+  be used several times. It is paramount that this variable is always defined.
+  It should be set to the mount point chosen for the CLFS partition.
+  Check that the <envar>LFS</envar> variable is set up properly with:</para>
+
+<screen><userinput>echo $CLFS</userinput></screen>
+
+  <para>Make sure the output shows the path to the CLFS partition's mount
+  point, which is <filename class="directory">/mnt/lfs</filename> if the
+  provided example was followed. If the output is incorrect, the
+  variable can be set with:</para>
+
+<screen><userinput>export CLFS=/mnt/lfs</userinput></screen>
+
+  <para>Having this variable set is beneficial in that commands such as
+  <command>install -d $CLFS/tools</command> can be typed literally. The shell
+  will automatically replace <quote>$CLFS</quote> with
+  <quote>/mnt/lfs</quote> (or whatever the variable was set to) when it
+  processes the command line.</para>
+
+  <para>If you haven't created the <filename class="directory">$CLFS</filename>
+  directory, do so at this time by issuing the following commands:</para>
+
+<screen><userinput>install -dv $CLFS</userinput></screen>
+
+  <para>Do not forget to check that <envar>$CLFS</envar> is set whenever
+  you leave and reenter the current working environment (as when doing a
+  <quote>su</quote> to <systemitem class="username">root</systemitem> or
+  another user).</para>
+
+</sect1>
Index: OK/final-preps/aboutlfs.xml
===================================================================
--- BOOK/final-preps/aboutlfs.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-aboutlfs">
-  <?dbhtml filename="aboutlfs.html"?>
-
-  <title>About $LFS</title>
-
-  <para>Throughout this book, the environment variable <envar>LFS</envar> will
-  be used several times. It is paramount that this variable is always defined.
-  It should be set to the mount point chosen for the CLFS partition.
-  Check that the <envar>LFS</envar> variable is set up properly with:</para>
-
-<screen><userinput>echo $LFS</userinput></screen>
-
-  <para>Make sure the output shows the path to the CLFS partition's mount
-  point, which is <filename class="directory">/mnt/lfs</filename> if the
-  provided example was followed. If the output is incorrect, the
-  variable can be set with:</para>
-
-<screen><userinput>export LFS=/mnt/lfs</userinput></screen>
-
-  <para>Having this variable set is beneficial in that commands such as
-  <command>install -d $LFS/tools</command> can be typed literally. The shell
-  will automatically replace <quote>$LFS</quote> with
-  <quote>/mnt/lfs</quote> (or whatever the variable was set to) when it
-  processes the command line.</para>
-
-  <para>If you haven't created the <filename class="directory">$LFS</filename>
-  directory, do so at this time by issuing the following commands:</para>
-
-<screen><userinput>install -dv $LFS</userinput></screen>
-
-  <para>Do not forget to check that <envar>$LFS</envar> is set whenever
-  you leave and reenter the current working environment (as when doing a
-  <quote>su</quote> to <systemitem class="username">root</systemitem> or
-  another user).</para>
-
-</sect1>
Index: BOOK/final-preps/addinguser.xml
===================================================================
--- BOOK/final-preps/addinguser.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-preps/addinguser.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -9,5 +9,5 @@
   <?dbhtml filename="addinguser.html"?>
 
-  <title>Adding the LFS User</title>
+  <title>Adding the CLFS User</title>
 
   <para>When logged in as user <systemitem class="username">root</systemitem>,
@@ -16,11 +16,11 @@
   You could use your own user name, but to make it easier to set up a clean
   work environment, create a new user called <systemitem
-  class="username">lfs</systemitem> as a member of a new group (also named
-  <systemitem class="groupname">lfs</systemitem>) and use this user during
+  class="username">clfs</systemitem> as a member of a new group (also named
+  <systemitem class="groupname">clfs</systemitem>) and use this user during
   the installation process. As <systemitem class="username">root</systemitem>,
   issue the following commands to add the new user:</para>
 
-<screen><userinput>groupadd lfs
-useradd -s /bin/bash -g lfs -m -k /dev/null lfs</userinput></screen>
+<screen><userinput>groupadd clfs
+useradd -s /bin/bash -g clfs -m -k /dev/null clfs</userinput></screen>
 
   <variablelist>
@@ -31,13 +31,13 @@
       <listitem>
         <para>This makes <command>bash</command> the default shell for
-        user <systemitem class="username">lfs</systemitem>.</para>
+        user <systemitem class="username">clfs</systemitem>.</para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term><parameter>-g lfs</parameter></term>
+      <term><parameter>-g clfs</parameter></term>
       <listitem>
-        <para>This option adds user <systemitem class="username">lfs</systemitem>
-        to group <systemitem class="groupname">lfs</systemitem>.</para>
+        <para>This option adds user <systemitem class="username">clfs</systemitem>
+        to group <systemitem class="groupname">clfs</systemitem>.</para>
       </listitem>
     </varlistentry>
@@ -47,5 +47,5 @@
       <listitem>
         <para>This creates a home directory for <systemitem
-        class="username">lfs</systemitem>.</para>
+        class="username">clfs</systemitem>.</para>
       </listitem>
     </varlistentry>
@@ -69,24 +69,24 @@
   </variablelist>
 
-  <para>To log in as <systemitem class="username">lfs</systemitem> (as
-  opposed to switching to user <systemitem class="username">lfs</systemitem>
+  <para>To log in as <systemitem class="username">clfs</systemitem> (as
+  opposed to switching to user <systemitem class="username">clfs</systemitem>
   when logged in as <systemitem class="username">root</systemitem>, which
-  does not require the <systemitem class="username">lfs</systemitem> user
-  to have a password), give <systemitem class="username">lfs</systemitem>
+  does not require the <systemitem class="username">clfs</systemitem> user
+  to have a password), give <systemitem class="username">clfs</systemitem>
   a password:</para>
 
-<screen><userinput>passwd lfs</userinput></screen>
+<screen><userinput>passwd clfs</userinput></screen>
 
-  <para>Grant <systemitem class="username">lfs</systemitem> full access to
-  <filename class="directory">$LFS</filename> by making <systemitem
+  <para>Grant <systemitem class="username">clfs</systemitem> full access to
+  <filename class="directory">$CLFS</filename> by making <systemitem
   class="username">lfs</systemitem> the directory's owner:</para>
 
-<screen><userinput>chown -Rv lfs $LFS</userinput></screen>
+<screen><userinput>chown -Rv clfs $CLFS</userinput></screen>
 
-  <para>Next, login as user <systemitem class="username">lfs</systemitem>.
+  <para>Next, login as user <systemitem class="username">clfs</systemitem>.
   This can be done via a virtual console, through a display manager, or
   with the following substitute user command:</para>
 
-<screen><userinput>su - lfs</userinput></screen>
+<screen><userinput>su - clfs</userinput></screen>
 
   <para>The <quote><parameter>-</parameter></quote> instructs
Index: BOOK/final-preps/chapter.xml
===================================================================
--- BOOK/final-preps/chapter.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-preps/chapter.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -12,5 +12,5 @@
   <title>Final Preparations</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="aboutlfs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="aboutclfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="addinguser.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="settingenviron.xml"/>
Index: BOOK/final-preps/creatingdirs.xml
===================================================================
--- BOOK/final-preps/creatingdirs.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-preps/creatingdirs.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -14,17 +14,17 @@
   standard directory tree by issuing the following commands:</para>
 
-<screen><userinput>mkdir -pv ${LFS}/{bin,boot,dev,etc/opt,home,lib,mnt,opt}
-mkdir -pv ${LFS}/{proc,media/{floppy,cdrom},sbin,srv,sys,var}
-install -dv -m 0750 ${LFS}/root
-install -dv -m 1777 ${LFS}{/var,}/tmp
-mkdir -pv ${LFS}/usr/{,local/}{bin,include,lib,sbin,src}
-mkdir -pv ${LFS}/usr/{,local/}share/{doc,info,locale,man}
-mkdir -v  ${LFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv ${LFS}/usr/{,local/}share/man/man{1..8}
-for dir in ${LFS}/usr{,/local}; do
+<screen><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,etc/opt,home,lib,mnt,opt}
+mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},sbin,srv,sys,var}
+install -dv -m 0750 ${CLFS}/root
+install -dv -m 1777 ${CLFS}{/var,}/tmp
+mkdir -pv ${CLFS}/usr/{,local/}{bin,include,lib,sbin,src}
+mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
+mkdir -v  ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
+mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1..8}
+for dir in ${CLFS}/usr{,/local}; do
   ln -sv share/{man,doc,info} $dir
 done
-mkdir -v ${LFS}/var/{lock,log,mail,run,spool}
-mkdir -pv ${LFS}/var/{opt,cache,lib/{misc,locate},local}</userinput></screen>
+mkdir -v ${CLFS}/var/{lock,log,mail,run,spool}
+mkdir -pv ${CLFS}/var/{opt,cache,lib/{misc,locate},local}</userinput></screen>
 
   <para>Directories are, by default, created with permission mode 755, but
Index: BOOK/final-preps/creatingfiles.xml
===================================================================
--- BOOK/final-preps/creatingfiles.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-preps/creatingfiles.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -24,5 +24,5 @@
 
   <indexterm zone="ch-final-preps-creatingfiles">
-    <primary sortas="e-${LFS}/var/log/btmp">/var/log/btmp</primary>
+    <primary sortas="e-${CLFS}/var/log/btmp">/var/log/btmp</primary>
   </indexterm>
 
@@ -41,5 +41,5 @@
   utilities that expect the presence of <filename>/etc/mtab</filename>:</para>
 
-<screen><userinput>touch ${LFS}/etc/mtab</userinput></screen>
+<screen><userinput>touch ${CLFS}/etc/mtab</userinput></screen>
 
   <para>In order for user <systemitem class="username">root</systemitem> to be
@@ -51,5 +51,5 @@
   command:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/passwd &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/passwd &lt;&lt; "EOF"
 <literal>root:x:0:0:root:/root:/bin/bash</literal>
 EOF</userinput></screen>
@@ -58,8 +58,74 @@
   (the <quote>x</quote> used here is just a placeholder) will be set later.</para>
 
+  <variablelist os="b">TO BE WRITTEN: more text describing additional users
+  
+    <title>Additional users you may want to add:</title>
+
+    <varlistentry>
+      <term><literal>bin:x:1:1:bin:/bin:/bin/false</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>daemon:x:2:6:daemon:/sbin:/bin/false</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>adm:x:3:16:adm:/var/adm:/bin/false</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>lp:x:10:9:lp:/var/spool/lp:/bin/false</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>mail:x:30:30:mail:/var/mail:/bin/false</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>news:x:31:31:news:/var/spool/news:/bin/false</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>uucp:x:32:32:uucp:/var/spool/uucp:/bin/false</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>operator:x:50:0:operator:/root:/bin/bash</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>postmaster:x:51:30:postmaster:/var/spool/mail:/bin/false</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>nobody:x:65534:65534:nobody:/:/bin/false</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+
   <para>Create the <filename>/etc/group</filename> file by running the following
   command:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/group &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/group &lt;&lt; "EOF"
 <literal>root:x:0:
 bin:x:1:
@@ -80,4 +146,64 @@
 EOF</userinput></screen>
 
+  <variablelist os="c">
+ 
+    <title>Additional groups you may want to add</title>
+
+    <varlistentry>
+      <term><literal>adm:x:16:root,adm,daemon</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>console:x:17:</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>cdrw:x:18:</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>mail:x:30:mail</literal></term>
+      <listitem>
+        <para>Used by MTAs (Mail Transport Agents)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>news:x:31:news</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>uucp:x:32:uucp</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>users:x:100:</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>nogroup:x:65533:</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term><literal>nobody:x:65534:</literal></term>
+      <listitem>
+        <para>To be written</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+
   <para>The created groups are not part of any standard&mdash;they are groups
   decided on in part by the requirements of the Udev configuration in this
@@ -98,6 +224,6 @@
   proper permissions:</para>
 
-<screen><userinput>touch ${LFS}/var/run/utmp ${LFS}/var/log/{btmp,lastlog,wtmp}
-chmod -v 664 ${LFS}/var/run/utmp ${LFS}/var/log/lastlog</userinput></screen>
+<screen><userinput>touch ${CLFS}/var/run/utmp ${CLFS}/var/log/{btmp,lastlog,wtmp}
+chmod -v 664 ${CLFS}/var/run/utmp ${CLFS}/var/log/lastlog</userinput></screen>
 
   <para>The <filename>/var/run/utmp</filename> file records the users
Index: BOOK/final-preps/settingenviron.xml
===================================================================
--- BOOK/final-preps/settingenviron.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-preps/settingenviron.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -13,5 +13,5 @@
   <para os="a">Set up a good working environment by creating two new startup
   files for the <command>bash</command> shell. While logged in as user
-  <systemitem class="username">lfs</systemitem>, issue the following
+  <systemitem class="username">clfs</systemitem>, issue the following
   command to create a new <filename>.bash_profile</filename>:</para>
 
@@ -20,5 +20,5 @@
 EOF</userinput></screen>
 
-  <para os="c">When logged on as user <systemitem class="username">lfs</systemitem>,
+  <para os="c">When logged on as user <systemitem class="username">clfs</systemitem>,
   the initial shell is usually a <emphasis>login</emphasis> shell which
   reads the <filename>/etc/profile</filename> of the host (probably
@@ -42,7 +42,7 @@
 <literal>set +h
 umask 022
-LFS=/mnt/lfs
+CLFS=/mnt/clfs
 LC_ALL=POSIX
-PATH=${LFS}/cross-tools/bin:/bin:/usr/bin
+PATH=${CLFS}/cross-tools/bin:/bin:/usr/bin
 export LFS LC_ALL PATH</literal>
 EOF</userinput></screen>
@@ -56,5 +56,5 @@
   the shell will always search the <envar>PATH</envar> when a program is to
   be run. As such, the shell will find the newly compiled tools in
-  <filename class="directory">$LFS${LFS}/cross-tools</filename> as soon as they are
+  <filename class="directory">$CLFS${CLFS}/cross-tools</filename> as soon as they are
   available without remembering a previous version of the same program in a
   different location.</para>
@@ -66,5 +66,5 @@
   mode 644 and directories with mode 755).</para>
 
-  <para os="h">The <envar>LFS</envar> variable should be set to the
+  <para os="h">The <envar>CLFS</envar> variable should be set to the
   chosen mount point.</para>
 
@@ -80,5 +80,5 @@
   the chroot environment.</para>
 
-  <para os="j">By putting <filename class="directory">${LFS}/cross-tools/bin</filename>
+  <para os="j">By putting <filename class="directory">${CLFS}/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
Index: BOOK/final-system/arm/perl.xml
===================================================================
--- BOOK/final-system/arm/perl.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/arm/perl.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -46,5 +46,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>make ARCH=arm CROSS_COMPILE="${LFS_TARGET}-"</userinput></screen>
+<screen os="d"><userinput>make ARCH=arm CROSS_COMPILE="${CLFS_TARGET}-"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/common/autoconf.xml
===================================================================
--- BOOK/final-system/common/autoconf.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/autoconf.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -28,5 +28,5 @@
     <para os="a">Prepare Autoconf for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --host=${LFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -36,5 +36,5 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/automake.xml
===================================================================
--- BOOK/final-system/common/automake.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/automake.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -28,5 +28,5 @@
     <para os="a">Prepare Automake for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --host=${LFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -36,5 +36,5 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/bash.xml
===================================================================
--- BOOK/final-system/common/bash.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/bash.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -47,5 +47,5 @@
 
 <screen os="f"><userinput>./configure --prefix=/usr --bindir=/bin \
-    --host=${LFS_TARGET} --cache-file=config.cache \
+    --host=${CLFS_TARGET} --cache-file=config.cache \
     --without-bash-malloc --with-installed-readline</userinput></screen>
 
@@ -70,9 +70,9 @@
     <para os="j">Install the package:</para>
 
-<screen os="k"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
     <para os="l">Create /bin/sh:</para>
 
-<screen os="m" role="nodump"><userinput>ln -sv bash ${LFS}/bin/sh</userinput></screen>
+<screen os="m" role="nodump"><userinput>ln -sv bash ${CLFS}/bin/sh</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/binutils.xml
===================================================================
--- BOOK/final-system/common/binutils.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/binutils.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -40,6 +40,6 @@
 
 <screen os="d"><userinput>../binutils-&binutils-version;/configure --prefix=/usr \
-    --build=${LFS_HOST} --host=${LFS_TARGET} \
-    --target=${LFS_TARGET} --enable-shared</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --target=${CLFS_TARGET} --enable-shared</userinput></screen>
 
     <para os="e">Compile the package:</para>
@@ -76,10 +76,10 @@
     <para os="j">Install the package:</para>
 
-<screen os="k"><userinput>make DESTDIR=${LFS} tooldir=/usr install</userinput></screen>
+<screen os="k"><userinput>make DESTDIR=${CLFS} tooldir=/usr install</userinput></screen>
 
     <para os="l">Install the <filename class="headerfile">libiberty</filename> header
     file that is needed by some packages:</para>
 
-<screen os="m"><userinput>cp -v ../binutils-&binutils-version;/include/libiberty.h ${LFS}/usr/include</userinput></screen>
+<screen os="m"><userinput>cp -v ../binutils-&binutils-version;/include/libiberty.h ${CLFS}/usr/include</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/bison.xml
===================================================================
--- BOOK/final-system/common/bison.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/bison.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -27,5 +27,5 @@
     <para os="a">Prepare Bison for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --host=${LFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="b1">The configure system causes bison to be built without support
@@ -42,5 +42,5 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/bzip2.xml
===================================================================
--- BOOK/final-system/common/bzip2.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/bzip2.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -68,11 +68,11 @@
     <note os="f">
     <para>If reinstalling Bzip2, perform
-    <userinput>rm -vf ${LFS}/usr/bin/bz*</userinput> first, otherwise the
-    following <command>make PREFIX=${LFS}/usr install</command> will fail.</para>
+    <userinput>rm -vf ${CLFS}/usr/bin/bz*</userinput> first, otherwise the
+    following <command>make PREFIX=${CLFS}/usr install</command> will fail.</para>
     </note>
 
     <para os="g">Install the programs:</para>
 
-<screen os="h"><userinput>make PREFIX=${LFS}/usr install</userinput></screen>
+<screen os="h"><userinput>make PREFIX=${CLFS}/usr install</userinput></screen>
 
     <para os="i">Install the shared <command>bzip2</command> binary into the
@@ -80,10 +80,10 @@
     some necessary symbolic links, and clean up:</para>
 
-<screen os="j"><userinput>cp -v bzip2-shared ${LFS}/bin/bzip2
-cp -av libbz2.so* ${LFS}/lib
-ln -sv ../../lib/libbz2.so.1.0 ${LFS}/usr/lib/libbz2.so
-rm -v ${LFS}/usr/bin/{bunzip2,bzcat,bzip2}
-ln -sv bzip2 ${LFS}/bin/bunzip2
-ln -sv bzip2 ${LFS}/bin/bzcatt</userinput></screen>
+<screen os="j"><userinput>cp -v bzip2-shared ${CLFS}/bin/bzip2
+cp -av libbz2.so* ${CLFS}/lib
+ln -sv ../../lib/libbz2.so.1.0 ${CLFS}/usr/lib/libbz2.so
+rm -v ${CLFS}/usr/bin/{bunzip2,bzcat,bzip2}
+ln -sv bzip2 ${CLFS}/bin/bunzip2
+ln -sv bzip2 ${CLFS}/bin/bzcatt</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/coreutils.xml
===================================================================
--- BOOK/final-system/common/coreutils.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/coreutils.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -40,5 +40,5 @@
 
 <screen os="d"><userinput>./configure --prefix=/usr --cache-file=config.cache \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="e">Compile the package:</para>
@@ -48,21 +48,21 @@
     <para os="g">Install the package:</para>
 
-<screen os="h"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
     <para os="i">Move programs to the locations specified by the FHS:</para>
 
-<screen os="j"><userinput>mv -v ${LFS}/usr/bin/{[,basename,cat,chgrp,chmod,chown,cp} ${LFS}/bin
-mv -v ${LFS}/usr/bin/{date,dd,df,echo,false,hostname,install,ln} ${LFS}/bin
-mv -v ${LFS}/usr/bin/{ls,mkdir,mknod,mv,nice,pwd,readlink,rm,rmdir,sync} ${LFS}/bin
-mv -v ${LFS}/usr/bin/{stty,test,touch,true,uname} ${LFS}/bin
-mv -v ${LFS}/usr/bin/chroot ${LFS}/usr/sbin
-ln -svf ../../bin/install ${LFS}/usr/bin</userinput></screen>
-
-    <para os="k">Some of the scripts in the LFS-Bootscripts package depend on
-    <command>head</command> and <command>sleep</command>. As <filename
+<screen os="j"><userinput>mv -v ${CLFS}/usr/bin/{cat,chgrp,chmod,chown,cp,date} ${CLFS}/bin
+mv -v ${CLFS}/usr/bin/{dd,df,echo,false,hostname,ln,ls,mkdir,mknod} ${CLFS}/bin
+mv -v ${CLFS}/usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} ${CLFS}/bin
+mv -v ${CLFS}/usr/bin/chroot ${CLFS}/usr/sbin</userinput></screen>
+
+    <para os="k">Other Coreutils programs are used by some of the scripts
+    in the CLFS-Bootscripts pacakge. As <filename
     class="directory">/usr</filename> may not be available during the early
     stages of booting, those binaries need to be on the root partition:</para>
 
-<screen os="l"><userinput>mv -v ${LFS}/usr/bin/{head,sleep} ${LFS}/bin</userinput></screen>
+<screen os="l"><userinput>mv -v ${CLFS}/usr/bin/{[,basename,head,install,nice} ${CLFS}/bin
+mv -v ${CLFS}/usr/bin/{readlink,sleep,sync,test,touch} ${CLFS}/bin
+ln -svf ../../bin/install ${CLFS}/usr/bin</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/diffutils.xml
===================================================================
--- BOOK/final-system/common/diffutils.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/diffutils.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -28,5 +28,5 @@
     <para os="a">Prepare Diffutils for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --host=${LFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -36,5 +36,5 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/e2fsprogs.xml
===================================================================
--- BOOK/final-system/common/e2fsprogs.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/e2fsprogs.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -38,5 +38,5 @@
 <screen os="d"><userinput>../configure --prefix=/usr --with-root-prefix="" \
     --enable-elf-shlibs --disable-evms \
-    --host=${LFS_TARGET}</userinput></screen>
+    --host=${CLFS_TARGET}</userinput></screen>
 
     <variablelist os="e">
@@ -85,9 +85,9 @@
     <para os="h">Install the binaries and documentation:</para>
 
-<screen os="i"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="i"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
     <para os="j">Install the shared libraries:</para>
 
-<screen os="k"><userinput>make DESTDIR=${LFS} install-libs</userinput></screen>
+<screen os="k"><userinput>make DESTDIR=${CLFS} install-libs</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/file.xml
===================================================================
--- BOOK/final-system/common/file.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/file.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -28,5 +28,5 @@
     <para os="a">Prepare File for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --host=${LFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -36,5 +36,5 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/findutils.xml
===================================================================
--- BOOK/final-system/common/findutils.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/findutils.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -30,5 +30,5 @@
     <para os="a">Prepare Findutils for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --host=${LFS_TARGET} \
+<screen os="b"><userinput>./configure --prefix=/usr --host=${CLFS_TARGET} \
     --libexecdir=/usr/lib/locate --localstatedir=/var/lib/locate</userinput></screen>
 
@@ -53,5 +53,5 @@
     <para os="f">Install the package:</para>
 
-<screen os="g"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/flex.xml
===================================================================
--- BOOK/final-system/common/flex.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/flex.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -33,5 +33,5 @@
     <para os="c">Prepare Flex for compilation:</para>
 
-<screen os="d"><userinput>./configure --prefix=/usr --host=${LFS_TARGET}</userinput></screen>
+<screen os="d"><userinput>./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="e">Compile the package:</para>
@@ -41,5 +41,5 @@
     <para os="g">Install the package:</para>
 
-<screen os="h"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
     <para os="i">There are some packages that expect to find the
@@ -48,5 +48,5 @@
     this:</para>
 
-<screen os="j"><userinput>ln -sv libfl.a ${LFS}/usr/lib/libl.a</userinput></screen>
+<screen os="j"><userinput>ln -sv libfl.a ${CLFS}/usr/lib/libl.a</userinput></screen>
 
     <para os="k">A few programs do not know about <command>flex</command> yet and
@@ -56,5 +56,5 @@
     mode:</para>
 
-<screen os="l"><userinput>cat &gt; ${LFS}/usr/bin/lex &lt;&lt; "EOF"
+<screen os="l"><userinput>cat &gt; ${CLFS}/usr/bin/lex &lt;&lt; "EOF"
 <literal>#!/bin/sh
 # Begin /usr/bin/lex
@@ -64,5 +64,5 @@
 # End /usr/bin/lex</literal>
 EOF
-chmod -v 755 ${LFS}/usr/bin/lex</userinput></screen>
+chmod -v 755 ${CLFS}/usr/bin/lex</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/gawk.xml
===================================================================
--- BOOK/final-system/common/gawk.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/gawk.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -34,5 +34,5 @@
 
 <screen os="d"><userinput>./configure --prefix=/usr --libexecdir=/usr/lib \
-    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="e">Compile the package:</para>
@@ -42,5 +42,5 @@
     <para os="g">Install the package:</para>
 
-<screen os="h"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/gcc.xml
===================================================================
--- BOOK/final-system/common/gcc.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/gcc.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -62,5 +62,5 @@
 
 <screen os="f"><userinput>../gcc-&gcc-version;/configure --prefix=/usr --libexecdir=/usr/lib \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
     --enable-shared --enable-threads=posix --enable-__cxa_atexit \
     --enable-c99 --enable-long-long --enable-clocale=gnu \
@@ -73,5 +73,5 @@
     <para os="i">Install the package:</para>
 
-<screen os="j"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="j"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
     <para os="k">Some packages expect the C preprocessor to be installed in the
@@ -79,10 +79,10 @@
     To support those packages, create this symlink:</para>
 
-<screen os="l"><userinput>ln -sv ../usr/bin/cpp ${LFS}/lib</userinput></screen>
+<screen os="l"><userinput>ln -sv ../usr/bin/cpp ${CLFS}/lib</userinput></screen>
 
     <para os="m">Many packages use the name <command>cc</command> to call the C
     compiler. To satisfy those packages, create a symlink:</para>
 
-<screen os="o"><userinput>ln -sv gcc ${LFS}/usr/bin/cc</userinput></screen>
+<screen os="o"><userinput>ln -sv gcc ${CLFS}/usr/bin/cc</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/gettext.xml
===================================================================
--- BOOK/final-system/common/gettext.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/gettext.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -30,5 +30,5 @@
     <para os="a">Prepare Gettext for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --host=${LFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -38,5 +38,5 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
@@ -54,6 +54,6 @@
         msgexec, msgfilter, msgfmt, msggrep, msginit, msgmerge, msgunfmt, msguniq,
         ngettext, and xgettext</seg>
-        <seg>libasprintf.[a,so], libgettextlib,so, libgettextpo.[a,so], and
-        libgettextsrc,so</seg>
+        <seg>libasprintf.[a,so], libgettextlib.so, libgettextpo.[a,so], and
+        libgettextsrc.so</seg>
       </seglistitem>
     </segmentedlist>
Index: BOOK/final-system/common/grep.xml
===================================================================
--- BOOK/final-system/common/grep.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/grep.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -29,5 +29,5 @@
 
 <screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
-    --host=${LFS_TARGET} --disable-perl-regexp</userinput></screen>
+    --host=${CLFS_TARGET} --disable-perl-regexp</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -37,5 +37,5 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/groff.xml
===================================================================
--- BOOK/final-system/common/groff.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/groff.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -33,5 +33,5 @@
     <para os="b">Prepare Groff for compilation:</para>
 
-<screen os="c"><userinput>PAGE=<replaceable>[paper_size]</replaceable> ./configure --prefix=/usr --host=${LFS_TARGET}</userinput></screen>
+<screen os="c"><userinput>PAGE=<replaceable>[paper_size]</replaceable> ./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="d">Compile the package:</para>
@@ -41,12 +41,12 @@
     <para os="f">Install the package:</para>
 
-<screen os="g"><userinput>make prefix=${LFS}/usr install</userinput></screen>
+<screen os="g"><userinput>make prefix=${CLFS}/usr install</userinput></screen>
 
     <para os="h">Some documentation programs, such as <command>xman</command>,
     will not work properly without the following symlinks:</para>
 
-<screen os="i"><userinput>ln -sv soelim ${LFS}/usr/bin/zsoelim
-ln -sv eqn ${LFS}/usr/bin/geqn
-ln -sv tbl ${LFS}/usr/bin/gtbl</userinput></screen>
+<screen os="i"><userinput>ln -sv soelim ${CLFS}/usr/bin/zsoelim
+ln -sv eqn ${CLFS}/usr/bin/geqn
+ln -sv tbl ${CLFS}/usr/bin/gtbl</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/gzip.xml
===================================================================
--- BOOK/final-system/common/gzip.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/gzip.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -35,5 +35,5 @@
     <para os="a">Prepare Gzip for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --host=${LFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">The <command>gzexe</command> script has the location of the
@@ -52,5 +52,5 @@
     <para os="g">Install the package:</para>
 
-<screen os="h"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
     <para os="i">Move the <command>gzip</command> program to the <filename
@@ -58,10 +58,10 @@
     used symlinks to it:</para>
 
-<screen os="j"><userinput>mv -v ${LFS}/usr/bin/gzip ${LFS}/bin
-rm -v ${LFS}/usr/bin/{gunzip,zcat}
-ln -sv gzip ${LFS}/bin/gunzip
-ln -sv gzip ${LFS}/bin/zcat
-ln -sv gzip ${LFS}/bin/compress
-ln -sv gunzip ${LFS}/bin/uncompress</userinput></screen>
+<screen os="j"><userinput>mv -v ${CLFS}/usr/bin/gzip ${CLFS}/bin
+rm -v ${CLFS}/usr/bin/{gunzip,zcat}
+ln -sv gzip ${CLFS}/bin/gunzip
+ln -sv gzip ${CLFS}/bin/zcat
+ln -sv gzip ${CLFS}/bin/compress
+ln -sv gunzip ${CLFS}/bin/uncompress</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/iana-etc.xml
===================================================================
--- BOOK/final-system/common/iana-etc.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/iana-etc.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -34,5 +34,5 @@
     <para os="c">Install the package:</para>
 
-<screen os="d"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="d"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/inetutils.xml
===================================================================
--- BOOK/final-system/common/inetutils.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/inetutils.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -45,5 +45,5 @@
     <para os="a">Prepare Inetutils for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --host=${LFS_TARGET} \
+<screen os="b"><userinput>./configure --prefix=/usr --host=${CLFS_TARGET} \
     --libexecdir=/usr/sbin --sysconfdir=/etc \
     --localstatedir=/var --disable-logger \
@@ -102,10 +102,10 @@
     <para os="f">Install the package:</para>
 
-<screen os="g"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
     <para os="h">Move the <command>ping</command> program to its FHS-compliant
     place:</para>
 
-<screen os="i"><userinput>mv -v ${LFS}/usr/bin/ping ${LFS}/bin</userinput></screen>
+<screen os="i"><userinput>mv -v ${CLFS}/usr/bin/ping ${CLFS}/bin</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/iproute2.xml
===================================================================
--- BOOK/final-system/common/iproute2.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/iproute2.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -66,5 +66,5 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} SBINDIR=/sbin install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS} SBINDIR=/sbin install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/kbd.xml
===================================================================
--- BOOK/final-system/common/kbd.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/kbd.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -52,5 +52,5 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/less.xml
===================================================================
--- BOOK/final-system/common/less.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/less.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -28,5 +28,5 @@
 
 <screen os="b"><userinput>./configure --prefix=/usr --sysconfdir=/etc \
-    --host=${LFS_TARGET}</userinput></screen>
+    --host=${CLFS_TARGET}</userinput></screen>
 
     <variablelist os="c">
@@ -49,9 +49,9 @@
     <para os="f">Install the package:</para>
 
-<screen os="g"><userinput>make prefix=${LFS}/usr install</userinput></screen>
+<screen os="g"><userinput>make prefix=${CLFS}/usr install</userinput></screen>
 
     <para os="h">Move less to /bin:</para>
 
-<screen os="i"><userinput>mv -v ${LFS}/usr/bin/less ${LFS}/bin</userinput></screen>
+<screen os="i"><userinput>mv -v ${CLFS}/usr/bin/less ${CLFS}/bin</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/libtool.xml
===================================================================
--- BOOK/final-system/common/libtool.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/libtool.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -29,5 +29,5 @@
     <para os="a">Prepare Libtool for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --host=${LFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -37,5 +37,5 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/m4.xml
===================================================================
--- BOOK/final-system/common/m4.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/m4.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -27,5 +27,5 @@
     <para os="a">Prepare M4 for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --host=${LFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -35,5 +35,5 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/make.xml
===================================================================
--- BOOK/final-system/common/make.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/make.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -27,5 +27,5 @@
     <para os="a">Prepare Make for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --host=${LFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -35,5 +35,5 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/man-pages.xml
===================================================================
--- BOOK/final-system/common/man-pages.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/man-pages.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -27,5 +27,5 @@
     <para os="a">Install Man-pages by running:</para>
 
-<screen os="b"><userinput>make prefix=${LFS} install</userinput></screen>
+<screen os="b"><userinput>make prefix=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/man.xml
===================================================================
--- BOOK/final-system/common/man.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/man.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -77,5 +77,5 @@
     <para os="o">Install the package:</para>
 
-<screen os="p"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="p"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
     <note os="q">
Index: BOOK/final-system/common/mktemp.xml
===================================================================
--- BOOK/final-system/common/mktemp.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/mktemp.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -40,5 +40,5 @@
     <para os="c">Prepare Mktemp for compilation:</para>
 
-<screen os="d"><userinput>./configure --prefix=/usr --with-libc  --host=${LFS_TARGET}</userinput></screen>
+<screen os="d"><userinput>./configure --prefix=/usr --with-libc  --host=${CLFS_TARGET}</userinput></screen>
 
     <variablelist os="e">
@@ -61,6 +61,6 @@
     <para os="h">Install the package:</para>
 
-<screen os="i"><userinput>make prefix=${LFS}/usr install
-make prefix=${LFS}/usr install-tempfile</userinput></screen>
+<screen os="i"><userinput>make prefix=${CLFS}/usr install
+make prefix=${CLFS}/usr install-tempfile</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/module-init-tools.xml
===================================================================
--- BOOK/final-system/common/module-init-tools.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/module-init-tools.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -28,5 +28,5 @@
     <para os="a">Prepare Module-Init-Tools for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/ --enable-zlib --host=${LFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/ --enable-zlib --host=${CLFS_TARGET}</userinput></screen>
 
     <variablelist os="c">
@@ -49,5 +49,5 @@
     <para os="f">Install the package:</para>
 
-<screen os="g"><userinput>make DESTDIR=${LFS} INSTALL=install install</userinput></screen>
+<screen os="g"><userinput>make DESTDIR=${CLFS} INSTALL=install install</userinput></screen>
 
     <variablelist os="h">
Index: BOOK/final-system/common/ncurses.xml
===================================================================
--- BOOK/final-system/common/ncurses.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/ncurses.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -29,5 +29,5 @@
 
 <screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib \
-   --host=${LFS_TARGET} --with-shared \
+   --host=${CLFS_TARGET} --with-shared \
    --without-debug --without-ada --with-build-cc=gcc</userinput></screen>
 
@@ -38,22 +38,22 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
     <para os="g">Move the Ncurses static libraries to the proper location:</para>
 
-<screen os="h"><userinput>mv -v ${LFS}/lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a ${LFS}/usr/lib</userinput></screen>
+<screen os="h"><userinput>mv -v ${CLFS}/lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a ${CLFS}/usr/lib</userinput></screen>
 
     <para os="i">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
 
-<screen os="j"><userinput>rm -v ${LFS}/lib/lib{ncurses,menu,panel,form,curses}.so
-ln -svf ../../lib/libncurses.so.5 ${LFS}/usr/lib/libcurses.so
-ln -svf ../../lib/libncurses.so.5 ${LFS}/usr/lib/libncurses.so
-ln -svf ../../lib/libmenu.so.5 ${LFS}/usr/lib/libmenu.so
-ln -svf ../../lib/libpanel.so.5 ${LFS}/usr/lib/libpanel.so
-ln -svf ../../lib/libform.so.5 ${LFS}/usr/lib/libform.so</userinput></screen>
+<screen os="j"><userinput>rm -v ${CLFS}/lib/lib{ncurses,menu,panel,form,curses}.so
+ln -svf ../../lib/libncurses.so.5 ${CLFS}/usr/lib/libcurses.so
+ln -svf ../../lib/libncurses.so.5 ${CLFS}/usr/lib/libncurses.so
+ln -svf ../../lib/libmenu.so.5 ${CLFS}/usr/lib/libmenu.so
+ln -svf ../../lib/libpanel.so.5 ${CLFS}/usr/lib/libpanel.so
+ln -svf ../../lib/libform.so.5 ${CLFS}/usr/lib/libform.so</userinput></screen>
 
     <para os="k">Give the Ncurses libraries execute permissions:</para>
 
-<screen os="l"><userinput>chmod -v 755 ${LFS}/lib/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
+<screen os="l"><userinput>chmod -v 755 ${CLFS}/lib/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/patch.xml
===================================================================
--- BOOK/final-system/common/patch.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/patch.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -29,5 +29,5 @@
     <para os="a">Prepare Patch for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --host=${LFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -37,5 +37,5 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make prefix=${LFS}/usr install</userinput></screen>
+<screen os="f"><userinput>make prefix=${CLFS}/usr install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/perl.xml
===================================================================
--- BOOK/final-system/common/perl.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/perl.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -37,9 +37,9 @@
     <para os="c">Compile the package:</para>
 
-<screen os="d"><userinput>make ARCH= CROSS_COMPILE="${LFS_TARGET}-"</userinput></screen>
+<screen os="d"><userinput>make ARCH= CROSS_COMPILE="${CLFS_TARGET}-"</userinput></screen>
 
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/procps.xml
===================================================================
--- BOOK/final-system/common/procps.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/procps.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -40,5 +40,5 @@
     <para os="c">Install the package:</para>
 
-<screen os="d"><userinput>make DESTDIR=${LFS} lib64=lib install</userinput></screen>
+<screen os="d"><userinput>make DESTDIR=${CLFS} lib64=lib install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/psmisc.xml
===================================================================
--- BOOK/final-system/common/psmisc.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/psmisc.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -28,5 +28,5 @@
     <para os="a">Prepare Psmisc for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --exec-prefix="" --host=${LFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --exec-prefix="" --host=${CLFS_TARGET}</userinput></screen>
 
     <variablelist os="c">
@@ -51,5 +51,5 @@
     <para os="f">Install the package:</para>
 
-<screen os="g"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
     <para os="h">There is no reason for the <command>pstree</command> and
@@ -58,5 +58,5 @@
     class="directory">/usr/bin</filename>:</para>
 
-<screen os="i"><userinput>mv -v ${LFS}/bin/pstree* ${LFS}/usr/bin</userinput></screen>
+<screen os="i"><userinput>mv -v ${CLFS}/bin/pstree* ${CLFS}/usr/bin</userinput></screen>
 
     <para os="j">By default, Psmisc's <command>pidof</command> program is not installed.
@@ -66,5 +66,5 @@
     of Psmisc by creating the following symlink:</para>
 
-<screen os="k" role="nodump"><userinput>ln -sv killall ${LFS}/bin/pidof</userinput></screen>
+<screen os="k" role="nodump"><userinput>ln -sv killall ${CLFS}/bin/pidof</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/readline.xml
===================================================================
--- BOOK/final-system/common/readline.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/readline.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -33,5 +33,5 @@
     <para os="a">Prepare Readline for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib --host=${LFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -53,14 +53,14 @@
     <para os="f">Install the package:</para>
 
-<screen os="g"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
     <para os="h">Give Readline's dynamic libraries more appropriate
     permissions:</para>
 
-<screen os="i"><userinput>chmod -v 755 ${LFS}/lib/lib{readline,history}.so*</userinput></screen>
+<screen os="i"><userinput>chmod -v 755 ${CLFS}/lib/lib{readline,history}.so*</userinput></screen>
 
     <para os="j">Now move the static libraries to a more appropriate location:</para>
 
-<screen os="k"><userinput>mv -v ${LFS}/lib/lib{readline,history}.a ${LFS}/usr/lib</userinput></screen>
+<screen os="k"><userinput>mv -v ${CLFS}/lib/lib{readline,history}.a ${CLFS}/usr/lib</userinput></screen>
 
     <para os="l">Next, remove the <filename class="extension">.so</filename>
@@ -68,7 +68,7 @@
     <filename class="directory">/usr/lib</filename>.</para>
 
-<screen os="m"><userinput>rm -v ${LFS}/lib/lib{readline,history}.so
-ln -svf ../../lib/libreadline.so.5 ${LFS}/usr/lib/libreadline.so
-ln -svf ../../lib/libhistory.so.5 ${LFS}/usr/lib/libhistory.so</userinput></screen>
+<screen os="m"><userinput>rm -v ${CLFS}/lib/lib{readline,history}.so
+ln -svf ../../lib/libreadline.so.5 ${CLFS}/usr/lib/libreadline.so
+ln -svf ../../lib/libhistory.so.5 ${CLFS}/usr/lib/libhistory.so</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/sed.xml
===================================================================
--- BOOK/final-system/common/sed.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/sed.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -28,5 +28,5 @@
 
 <screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
-    --host=${LFS_TARGET} --enable-html</userinput></screen>
+    --host=${CLFS_TARGET} --enable-html</userinput></screen>
 
     <variablelist os="c">
@@ -48,5 +48,5 @@
     <para os="f">Install the package:</para>
 
-<screen os="g"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/shadow.xml
===================================================================
--- BOOK/final-system/common/shadow.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/shadow.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -43,5 +43,5 @@
 <screen os="e"><userinput>./configure --libdir=/lib --sysconfdir=/etc --enable-shared \
     --without-libpam --without-audit --without-selinux \
-    --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
+    --host=${CLFS_TARGET} --cache-file=config.cache</userinput></screen>
 
 <para os="f">The meaning of the configure options:</para>
@@ -84,5 +84,5 @@
     <para os="l">Install the package:</para>
 
-<screen os="m"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="m"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
     <para id="shadow-login_defs" os="r">Instead of using the default
@@ -100,8 +100,8 @@
     </indexterm>
 
-<screen os="t"><userinput>cp ${LFS}/etc/login.defs login.defs.orig
+<screen os="t"><userinput>cp ${CLFS}/etc/login.defs login.defs.orig
 sed -e's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
     -e 's@/var/spool/mail@/var/mail@' \
-    login.defs.orig &gt; ${LFS}/etc/login.defs</userinput></screen>
+    login.defs.orig &gt; ${CLFS}/etc/login.defs</userinput></screen>
 
     <note os="u">
@@ -111,17 +111,17 @@
 
 <screen><userinput>cp {LFS}/etc/login.defs login.defs.orig
-sed 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' login.defs.orig &gt; ${LFS}/etc/login.defs</userinput></screen>
+sed 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' login.defs.orig &gt; ${CLFS}/etc/login.defs</userinput></screen>
     </note>
 
     <para os="v">Move a misplaced program to its proper location:</para>
 
-<screen os="w"><userinput>mv -v ${LFS}/usr/bin/passwd ${LFS}/bin</userinput></screen>
+<screen os="w"><userinput>mv -v ${CLFS}/usr/bin/passwd ${CLFS}/bin</userinput></screen>
 
     <para os="x">Move Shadow's dynamic libraries to a more appropriate
     location:</para>
 
-<screen os="y"><userinput>mv -v ${LFS}/lib/libshadow.*a ${LFS}/usr/lib
-rm -v ${LFS}/lib/libshadow.so
-ln -svf ../../lib/libshadow.so.0 ${LFS}/usr/lib/libshadow.so</userinput></screen>
+<screen os="y"><userinput>mv -v ${CLFS}/lib/libshadow.*a ${CLFS}/usr/lib
+rm -v ${CLFS}/lib/libshadow.so
+ln -svf ../../lib/libshadow.so.0 ${CLFS}/usr/lib/libshadow.so</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/stripping.xml
===================================================================
--- BOOK/final-system/common/stripping.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/stripping.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -23,6 +23,6 @@
   backup of the current situation.</para>
 
-<screen os="c"><userinput>find ${LFS}/{,usr/}{bin,lib,sbin} -type f \
-   -exec ${LFS_TARGET}-strip --strip-debug '{}' ';'</userinput></screen>
+<screen os="c"><userinput>find ${CLFS}/{,usr/}{bin,lib,sbin} -type f \
+   -exec ${CLFS_TARGET}-strip --strip-debug '{}' ';'</userinput></screen>
 
     <para os="i">A large number of files will be reported as having their file
Index: BOOK/final-system/common/sysklogd.xml
===================================================================
--- BOOK/final-system/common/sysklogd.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/sysklogd.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -43,5 +43,5 @@
     <para os="f">Install the package:</para>
 
-<screen os="g"><userinput>make prefix=${LFS} install</userinput></screen>
+<screen os="g"><userinput>make prefix=${CLFS} install</userinput></screen>
 
   </sect2>
@@ -61,5 +61,5 @@
     the following:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/syslog.conf &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/syslog.conf &lt;&lt; "EOF"
 <literal># Begin /etc/syslog.conf
 
Index: BOOK/final-system/common/sysvinit.xml
===================================================================
--- BOOK/final-system/common/sysvinit.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/sysvinit.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -52,9 +52,9 @@
 
 <screen os="d"><userinput>make -C src clobber
-make -C src ROOT=${LFS} CC="${CC}"</userinput></screen>
+make -C src ROOT=${CLFS} CC="${CC}"</userinput></screen>
 
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make -C src ROOT=${LFS} INSTALL="install" install</userinput></screen>
+<screen os="f"><userinput>make -C src ROOT=${CLFS} INSTALL="install" install</userinput></screen>
 
   </sect2>
@@ -74,5 +74,5 @@
     following:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/inittab &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
 <literal># Begin /etc/inittab
 
Index: BOOK/final-system/common/tar.xml
===================================================================
--- BOOK/final-system/common/tar.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/tar.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -43,5 +43,5 @@
 
 <screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin \
-    --libexecdir=/usr/sbin --host=${LFS_TARGET}</userinput></screen>
+    --libexecdir=/usr/sbin --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -51,5 +51,5 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/texinfo.xml
===================================================================
--- BOOK/final-system/common/texinfo.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/texinfo.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -33,5 +33,5 @@
     <para os="a">Prepare Texinfo for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --host=${LFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -41,10 +41,10 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
     <para os="g">Optionally, install the components belonging in a TeX
     installation:</para>
 
-<screen os="h"><userinput>make DESTDIR=${LFS} TEXMF=/usr/share/texmf install-tex</userinput></screen>
+<screen os="h"><userinput>make DESTDIR=${CLFS} TEXMF=/usr/share/texmf install-tex</userinput></screen>
 
     <variablelist os="i">
@@ -70,5 +70,5 @@
     the following optional commands will accomplish the task:</para>
 
-<screen os="k" role="nodump"><userinput>cd ${LFS}/usr/share/info
+<screen os="k" role="nodump"><userinput>cd ${CLFS}/usr/share/info
 rm dir
 for f in *
Index: BOOK/final-system/common/udev.xml
===================================================================
--- BOOK/final-system/common/udev.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/udev.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -28,5 +28,5 @@
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make CROSS_COMPILE="${LFS_TARGET}-" CC="${CC}" LD="${CC}" \
+<screen os="b"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" CC="${CC}" LD="${CC}" \
     EXTRAS="extras/floppy extras/cdrom_id extras/firmware \
     extras/scsi_id extras/volume_id extras/ata_id extras/usb_id \
@@ -50,5 +50,5 @@
     <para os="c">Install the package:</para>
 
-<screen os="d"><userinput>make DESTDIR="${LFS}" \
+<screen os="d"><userinput>make DESTDIR="${CLFS}" \
     EXTRAS="extras/floppy extras/cdrom_id extras/firmware \
     extras/scsi_id extras/volume_id extras/ata_id extras/usb_id \
@@ -57,5 +57,5 @@
     <para os="e">Install necessary helpers.</para>
 
-<screen os="f"><userinput>install -v extras/eventrecorder.sh ${LFS}/lib/udev</userinput></screen>
+<screen os="f"><userinput>install -v extras/eventrecorder.sh ${CLFS}/lib/udev</userinput></screen>
 
     <para os="g">Install the documentation that explains how to create
@@ -63,10 +63,10 @@
 
 <screen os="h"><userinput>install -v -m644 -D docs/writing_udev_rules/index.html \
-    ${LFS}/usr/share/doc/udev-&udev-version;/index.html</userinput></screen>
+    ${CLFS}/usr/share/doc/udev-&udev-version;/index.html</userinput></screen>
 
     <para os="i">Create a directory for storing firmware that can be
     loaded by <command>udev</command>:</para>
 
-<screen os="j"><userinput>install -dv ${LFS}/lib/firmware</userinput></screen>
+<screen os="j"><userinput>install -dv ${CLFS}/lib/firmware</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/util-linux.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -37,5 +37,5 @@
 sed 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
     hwclock/hwclock.c.orig &gt; hwclock/hwclock.c
-mkdir -pv ${LFS}/var/lib/hwclock</userinput></screen>
+mkdir -pv ${CLFS}/var/lib/hwclock</userinput></screen>
 
   </sect2>
@@ -121,6 +121,6 @@
 
 <screen os="g"><userinput>make HAVE_KILL=yes HAVE_SLN=yes \
-CPUOPT="" ARCH="" CPU="" USE_TTY_GROUP=no DESTDIR=${LFS} install
-mv -v ${LFS}/usr/bin/logger ${LFS}/bin</userinput></screen>
+CPUOPT="" ARCH="" CPU="" USE_TTY_GROUP=no DESTDIR=${CLFS} install
+mv -v ${CLFS}/usr/bin/logger ${CLFS}/bin</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/variables.xml
===================================================================
--- BOOK/final-system/common/variables.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/variables.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -14,11 +14,11 @@
   and linkers:</para>
 
-<screen><userinput>export CC="${LFS_TARGET}-gcc"
-export CXX="${LFS_TARGET}-g++"
-export AR="${LFS_TARGET}-ar"
-export AS="${LFS_TARGET}-as"
-export RANLIB="${LFS_TARGET}-ranlib"
-export LD="${LFS_TARGET}-ld"
-export STRIP="${LFS_TARGET}-strip"</userinput></screen>
+<screen><userinput>export CC="${CLFS_TARGET}-gcc"
+export CXX="${CLFS_TARGET}-g++"
+export AR="${CLFS_TARGET}-ar"
+export AS="${CLFS_TARGET}-as"
+export RANLIB="${CLFS_TARGET}-ranlib"
+export LD="${CLFS_TARGET}-ld"
+export STRIP="${CLFS_TARGET}-strip"</userinput></screen>
 
   <para>Then add the build variables to <filename>~/.bashrc</filename> to
Index: BOOK/final-system/common/vim.xml
===================================================================
--- BOOK/final-system/common/vim.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/vim.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -56,5 +56,5 @@
     <para os="d">Prepare Vim for compilation:</para>
 
-<screen os="e"><userinput>./configure --prefix=/usr --host=${LFS_TARGET} \
+<screen os="e"><userinput>./configure --prefix=/usr --host=${CLFS_TARGET} \
     --enable-multibyte --enable-gui=no \
     --disable-gtktest --disable-xim \
@@ -86,5 +86,5 @@
     <para os="i">Install the package:</para>
 
-<screen os="j"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="j"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
     <para os="k">Many users are accustomed to using <command>vi</command>
@@ -95,5 +95,5 @@
     and allow programs that use <command>vi</command> to work:</para>
 
-<screen os="l"><userinput>ln -sv vim ${LFS}/usr/bin/vi</userinput></screen>
+<screen os="l"><userinput>ln -sv vim ${CLFS}/usr/bin/vi</userinput></screen>
 
 <para os="m">By default, Vim's documentation is installed in
@@ -103,5 +103,5 @@
 it consistent with the location of documentation for other packages:</para>
 
-<screen os="n"><userinput>ln -sv ../vim/vim&vim-version2;/doc ${LFS}/usr/share/doc/vim-&vim-version;</userinput></screen>
+<screen os="n"><userinput>ln -sv ../vim/vim&vim-version2;/doc ${CLFS}/usr/share/doc/vim-&vim-version;</userinput></screen>
 
     <para os="o">If an X Window System is going to be installed on the LFS
@@ -132,5 +132,5 @@
     following:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/vimrc &lt;&lt; "EOF"
+<screen><userinput>cat &gt; ${CLFS}/etc/vimrc &lt;&lt; "EOF"
 <literal>" Begin /etc/vimrc
 
Index: BOOK/final-system/common/zlib.xml
===================================================================
--- BOOK/final-system/common/zlib.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/final-system/common/zlib.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -41,5 +41,5 @@
     <para os="e">Install the pacakge:</para>
 
-<screen os="f"><userinput>make prefix=${LFS}/usr install</userinput></screen>
+<screen os="f"><userinput>make prefix=${CLFS}/usr install</userinput></screen>
 
     <para os="g">The previous command installed a <filename
@@ -49,10 +49,10 @@
     to <filename class="directory">/usr/lib</filename>:</para>
 
-<screen os="h"><userinput>mv -v ${LFS}/usr/lib/libz.so.* ${LFS}/lib
-ln -svf ../../lib/libz.so.1 ${LFS}/usr/lib/libz.so</userinput></screen>
+<screen os="h"><userinput>mv -v ${CLFS}/usr/lib/libz.so.* ${CLFS}/lib
+ln -svf ../../lib/libz.so.1 ${CLFS}/usr/lib/libz.so</userinput></screen>
 
     <para os="i">Now we fix the permissions on the static library:</para>
 
-<screen os="j"><userinput>chmod -v 644 ${LFS}/usr/lib/libz.a</userinput></screen>
+<screen os="j"><userinput>chmod -v 644 ${CLFS}/usr/lib/libz.a</userinput></screen>
 
   </sect2>
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/general.ent	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY month "06"> <!-- Use two digits -->
-<!ENTITY month_name "June">
-<!ENTITY day "28"> <!-- Use two digits -->
+<!ENTITY month "07"> <!-- Use two digits -->
+<!ENTITY month_name "July">
+<!ENTITY day "02"> <!-- Use two digits -->
 <!ENTITY year "2006"> <!-- Use four digits -->
 
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/introduction/common/changelog.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -38,4 +38,19 @@
 
     <listitem>
+      <para>July 2, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated passwd and group file creation
+                to only create minimal users and groups and
+                include information on other users/groups.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated to Cross-LFS Bootscripts. Added check for
+	  for /etc/sysconfig/createfiles.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>June 28, 2006</para>
       <itemizedlist>
Index: BOOK/introduction/common/how.xml
===================================================================
--- BOOK/introduction/common/how.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/introduction/common/how.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -45,7 +45,7 @@
 
   <para>The process of building cross-compile tools first involves installing
-  binutils into ${LFS}/cross-tools, so that we have an asembler and a linker
+  binutils into ${CLFS}/cross-tools, so that we have an asembler and a linker
   for our target architecture. GCC is then compiled statically and installed
-  into ${LFS}/cross-tools, this cross-compiler is used to build glibc for the
+  into ${CLFS}/cross-tools, this cross-compiler is used to build glibc for the
   final-system. The GCC cross-compiler is then rebuilt dynamically - this final
   cross-compiler is what will be used to build the final-system.</para>
Index: BOOK/introduction/common/resources.xml
===================================================================
--- BOOK/introduction/common/resources.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/introduction/common/resources.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -76,5 +76,7 @@
     accessing the website and downloading the required packages more
     convenient. Please visit the LFS website at <ulink
-    url="&lfs-root;mirrors.html"/> for a list of current mirrors.</para>
+    url="&lfs-root;mirrors.html"/> for a list of current mirrors of
+    the LFS website, or <ulink url="&clfs-root;wiki/mirrors"/> for
+    mirrors of CLFS.</para>
 
   </sect2>
Index: BOOK/materials/common/introduction.xml
===================================================================
--- BOOK/materials/common/introduction.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/materials/common/introduction.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -30,5 +30,5 @@
   that is conveniently available throughout the entire build. A working
   directory is also required to unpack the sources and build them.
-  <filename class="directory">$LFS/sources</filename> can be used both
+  <filename class="directory">$CLFS/sources</filename> can be used both
   as the place to store the tarballs and patches and as a working
   directory. By using this directory, the required elements will be
@@ -40,5 +40,5 @@
   starting the download session:</para>
 
-<screen><userinput>mkdir -v $LFS/sources</userinput></screen>
+<screen><userinput>mkdir -v $CLFS/sources</userinput></screen>
 
   <para>Make this directory writable and sticky. <quote>Sticky</quote>
@@ -48,5 +48,5 @@
   sticky modes:</para>
 
-<screen><userinput>chmod -v a+wt $LFS/sources</userinput></screen>
+<screen><userinput>chmod -v a+wt $CLFS/sources</userinput></screen>
 
 </sect1>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/materials/common/patches.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -308,5 +308,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/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/packages.ent	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -67,8 +67,8 @@
 <!ENTITY bzip2-home "http://www.bzip.org/">
 
-<!ENTITY clfs-bootscripts-version "0.1">
-<!ENTITY clfs-bootscripts-size "24 KB">
+<!ENTITY clfs-bootscripts-version "0.2">
+<!ENTITY clfs-bootscripts-size "28 KB">
 <!ENTITY clfs-bootscripts-url "http://ftp.jg555.com/bootscripts/bootscripts-cross-lfs-&clfs-bootscripts-version;.tar.bz2">
-<!ENTITY clfs-bootscripts-md5 "cf9e749b476a9eed6a644506fff50804">
+<!ENTITY clfs-bootscripts-md5 "cbb353e5c5e52c1e72851310275d8d9d">
 <!ENTITY clfs-bootscripts-home " ">
 
Index: BOOK/partitioning/common/mounting.xml
===================================================================
--- BOOK/partitioning/common/mounting.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/partitioning/common/mounting.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -21,11 +21,11 @@
   environment variable by running:</para>
 
-<screen><userinput>export LFS=/mnt/lfs</userinput></screen>
+<screen><userinput>export CLFS=/mnt/lfs</userinput></screen>
 
   <para>Next, create the mount point and mount the CLFS file system by
   running:</para>
 
-<screen><userinput>mkdir -pv $LFS
-mount -v /dev/<replaceable>[xxx]</replaceable> $LFS</userinput></screen>
+<screen><userinput>mkdir -pv $CLFS
+mount -v /dev/<replaceable>[xxx]</replaceable> $CLFS</userinput></screen>
 
   <para>Replace <replaceable>[xxx]</replaceable> with the designation of
@@ -36,8 +36,8 @@
   class="directory">/usr</filename>), mount them using:</para>
 
-<screen><userinput>mkdir -pv $LFS
-mount -v /dev/<replaceable>[xxx]</replaceable> $LFS
-mkdir -v $LFS/usr
-mount -v /dev/<replaceable>[yyy]</replaceable> $LFS/usr</userinput></screen>
+<screen><userinput>mkdir -pv $CLFS
+mount -v /dev/<replaceable>[xxx]</replaceable> $CLFS
+mkdir -v $CLFS/usr
+mount -v /dev/<replaceable>[yyy]</replaceable> $CLFS/usr</userinput></screen>
 
   <para>Replace <replaceable>[xxx]</replaceable> and
Index: BOOK/prologue/common/foreword.xml
===================================================================
--- BOOK/prologue/common/foreword.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/prologue/common/foreword.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -35,10 +35,10 @@
   allowed me to create compact and streamlined Linux systems which are
   faster and take up less space than traditional operating systems. I
-  called this system a Linux From Scratch system, or an LFS system for
+  called this system a Linux From Scratch system, or an CLFS system for
   short.</para>
 
   <para>As I shared my goals and experiences with other members of the
   Linux community, it became apparent that there was sustained interest
-  in the ideas set forth in my Linux adventures. Such custom-built LFS
+  in the ideas set forth in my Linux adventures. Such custom-built CLFS
   systems serve not only to meet user specifications and requirements, but
   also serve as an ideal learning opportunity for programmers and system
@@ -57,5 +57,5 @@
   system.</para>
 
-  <para>I hope you will have a great time working on your own LFS
+  <para>I hope you will have a great time working on your own CLFS
   system, and enjoy the numerous benefits of having a system that is
   truly <emphasis>your own</emphasis>.</para>
Index: BOOK/prologue/common/prerequisites.xml
===================================================================
--- BOOK/prologue/common/prerequisites.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/prologue/common/prerequisites.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -51,5 +51,5 @@
       <para>This is an LFS Hint written specifically for users new to Linux.
       It includes a list of links to excellent sources of information on a
-      wide range of topics. Anyone attempting to install LFS should have an
+      wide range of topics. Anyone attempting to install CLFS should have an
       understanding of many of the topics in this hint.</para>
     </listitem>
Index: BOOK/prologue/common/typography.xml
===================================================================
--- BOOK/prologue/common/typography.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/prologue/common/typography.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -23,5 +23,5 @@
   referenced.</para>
 
-<screen><computeroutput>install-info: unknown option '--dir-file=/mnt/lfs/usr/info/dir'</computeroutput></screen>
+<screen><computeroutput>install-info: unknown option '--dir-file=/mnt/clfs/usr/info/dir'</computeroutput></screen>
 
   <para>This form of text (fixed-width text) shows screen output,
@@ -34,5 +34,5 @@
   Its main purpose is to emphasize important points or items.</para>
 
-  <para><ulink url="&lfs-root;"/></para>
+  <para><ulink url="&clfs-root;"/></para>
 
   <para>This format is used for hyperlinks, both within the LFS
@@ -40,5 +40,5 @@
   and websites.</para>
 
-<screen role="nodump"><userinput>cat &gt; $LFS/etc/group &lt;&lt; "EOF"
+<screen role="nodump"><userinput>cat &gt; $CLFS/etc/group &lt;&lt; "EOF"
 <literal>root:x:0:
 bin:x:1:
@@ -48,5 +48,5 @@
   <para>This format is used when creating configuration files. The first
   command tells the system to create the file
-  <filename>$LFS/etc/group</filename> from whatever is typed on the
+  <filename>$CLFS/etc/group</filename> from whatever is typed on the
   following lines until the sequence end of file (EOF) is encountered.
   Therefore, this entire section is generally typed as seen.</para>
Index: BOOK/the-end/reboot.xml
===================================================================
--- BOOK/the-end/reboot.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/the-end/reboot.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -37,20 +37,20 @@
   <para>Then unmount the virtual file systems:</para>
 
-<screen><userinput>umount $LFS/dev/pts
-umount $LFS/dev/shm
-umount $LFS/dev
-umount $LFS/proc
-umount $LFS/sys</userinput></screen>
+<screen><userinput>umount $CLFS/dev/pts
+umount $CLFS/dev/shm
+umount $CLFS/dev
+umount $CLFS/proc
+umount $CLFS/sys</userinput></screen>
 
   <para>Unmount the LFS file system itself:</para>
 
-<screen><userinput>umount $LFS</userinput></screen>
+<screen><userinput>umount $CLFS</userinput></screen>
 
   <para>If multiple partitions were created, unmount the other
   partitions before unmounting the main one, like this:</para>
 
-<screen><userinput>umount $LFS/usr
-umount $LFS/home
-umount $LFS</userinput></screen>
+<screen><userinput>umount $CLFS/usr
+umount $CLFS/home
+umount $CLFS</userinput></screen>
 
   <para>Now, reboot the system with:</para>
Index: BOOK/the-end/theend.xml
===================================================================
--- BOOK/the-end/theend.xml	(revision 89c10a942fad952f648ae41148013cafebe49803)
+++ BOOK/the-end/theend.xml	(revision 586feb78b379b4fe653074e6a79b8d443176860f)
@@ -24,5 +24,5 @@
   Create this file by running:</para>
 
-<screen><userinput>echo &version; &gt; ${LFS}/etc/clfs-release</userinput></screen>
+<screen><userinput>echo &version; &gt; ${CLFS}/etc/clfs-release</userinput></screen>
 
 </sect1>
