Index: boot/common/creatingdirs.xml
===================================================================
--- boot/common/creatingdirs.xml	(revision 4deac5ac9bee25049f1b14cc189836612aa79c72)
+++ boot/common/creatingdirs.xml	(revision a6bba28d00866d776a52c3f3c348b4f4f7156191)
@@ -35,9 +35,9 @@
 
   <para os="d">The first mode change ensures that not just anybody can enter
-  the <filename class="directory">${CLFS}/root</filename> directory&mdash;the
+  the <filename class="directory">/root</filename> directory&mdash;the
   same as a normal user would do with his or her home directory. The
   second mode change makes sure that any user can write to the
-  <filename class="directory">${CLFS}/tmp</filename> and
-  <filename class="directory">${CLFS}/var/tmp</filename> directories, but
+  <filename class="directory">/tmp</filename> and
+  <filename class="directory">/var/tmp</filename> directories, but
   cannot remove another user's files from them. The latter is prohibited
   by the so-called <quote>sticky bit,</quote> the highest bit (1) in the
Index: boot/common/devices.xml
===================================================================
--- boot/common/devices.xml	(revision 4deac5ac9bee25049f1b14cc189836612aa79c72)
+++ boot/common/devices.xml	(revision a6bba28d00866d776a52c3f3c348b4f4f7156191)
@@ -9,8 +9,8 @@
   <?dbhtml filename="devices.html"?>
 
-  <title>Populating ${CLFS}/dev</title>
+  <title>Populating /dev</title>
 
   <indexterm zone="ch-boot-devices">
-    <primary sortas="e-${CLFS}/dev/*">${CLFS}/dev/*</primary>
+    <primary sortas="e-/dev/*">/dev/*</primary>
   </indexterm>
 
Index: boot/common/fstab.xml
===================================================================
--- boot/common/fstab.xml	(revision 4deac5ac9bee25049f1b14cc189836612aa79c72)
+++ boot/common/fstab.xml	(revision a6bba28d00866d776a52c3f3c348b4f4f7156191)
@@ -9,11 +9,11 @@
   <?dbhtml filename="fstab.html"?>
 
-  <title>Creating the ${CLFS}/etc/fstab File</title>
+  <title>Creating the /etc/fstab File</title>
 
   <indexterm zone="ch-boot-fstab">
-    <primary sortas="e-${CLFS}/etc/fstab">${CLFS}/etc/fstab</primary>
+    <primary sortas="e-/etc/fstab">/etc/fstab</primary>
   </indexterm>
 
-  <para os="a">The <filename>${CLFS}/etc/fstab</filename> file is used by some
+  <para os="a">The <filename>/etc/fstab</filename> file is used by some
   programs to determine where file systems are to be mounted by default,
   which must be checked, and in which order. Create a new file systems
Index: boot/common/pwdgroup.xml
===================================================================
--- boot/common/pwdgroup.xml	(revision 4deac5ac9bee25049f1b14cc189836612aa79c72)
+++ boot/common/pwdgroup.xml	(revision a6bba28d00866d776a52c3f3c348b4f4f7156191)
@@ -12,31 +12,31 @@
 
   <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${CLFS}/etc/passwd">${CLFS}/etc/passwd</primary>
-  </indexterm>
-
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${CLFS}/etc/group">${CLFS}/etc/group</primary>
-  </indexterm>
-
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${CLFS}/var/run/utmp">${CLFS}/var/run/utmp</primary>
-  </indexterm>
-
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${CLFS}/var/log/btmp">${CLFS}/var/log/btmp</primary>
-  </indexterm>
-
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${CLFS}/var/log/lastlog">${CLFS}/var/log/lastlog</primary>
-  </indexterm>
-
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${CLFS}/var/log/wtmp">${CLFS}/var/log/wtmp</primary>
+    <primary sortas="e-/etc/passwd">/etc/passwd</primary>
+  </indexterm>
+
+  <indexterm zone="ch-boot-pwdgroup">
+    <primary sortas="e-/etc/group">/etc/group</primary>
+  </indexterm>
+
+  <indexterm zone="ch-boot-pwdgroup">
+    <primary sortas="e-/var/run/utmp">/var/run/utmp</primary>
+  </indexterm>
+
+  <indexterm zone="ch-boot-pwdgroup">
+    <primary sortas="e-/var/log/btmp">/var/log/btmp</primary>
+  </indexterm>
+
+  <indexterm zone="ch-boot-pwdgroup">
+    <primary sortas="e-/var/log/lastlog">/var/log/lastlog</primary>
+  </indexterm>
+
+  <indexterm zone="ch-boot-pwdgroup">
+    <primary sortas="e-/var/log/wtmp">/var/log/wtmp</primary>
   </indexterm>
 
   <para>In order for user <systemitem class="username">root</systemitem> to
   be able to login and for the name <quote>root</quote> to be recognized,
-  there must be relevant entries in the <filename>${CLFS}/etc/passwd</filename>
-  and <filename>${CLFS}/etc/group</filename> files.</para>
+  there must be relevant entries in the <filename>/etc/passwd</filename>
+  and <filename>/etc/group</filename> files.</para>
 
   <para>Create the <filename>${CLFS}/etc/passwd</filename> file by running
@@ -221,9 +221,9 @@
 chmod -v 600 ${CLFS}/var/log/btmp</userinput></screen>
 
-  <para>The <filename>${CLFS}/var/run/utmp</filename> file records the users
-  that are currently logged in. The <filename>${CLFS}/var/log/wtmp</filename>
+  <para>The <filename>/var/run/utmp</filename> file records the users
+  that are currently logged in. The <filename>/var/log/wtmp</filename>
   file records all logins and logouts. The
-  <filename>${CLFS}/var/log/lastlog</filename> file records when
-  each user last logged in. The <filename>${CLFS}/var/log/btmp</filename> file
+  <filename>/var/log/lastlog</filename> file records when
+  each user last logged in. The <filename>/var/log/btmp</filename> file
   records the bad login attempts.</para>
 
Index: boot/common/sysvinit.xml
===================================================================
--- boot/common/sysvinit.xml	(revision 4deac5ac9bee25049f1b14cc189836612aa79c72)
+++ boot/common/sysvinit.xml	(revision a6bba28d00866d776a52c3f3c348b4f4f7156191)
@@ -57,5 +57,5 @@
 
     <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="e-${CLFS}/etc/inittab">${CLFS}/etc/inittab</primary>
+      <primary sortas="e-/etc/inittab">/etc/inittab</primary>
     </indexterm>
 
Index: boot/mips/sysvinit.xml
===================================================================
--- boot/mips/sysvinit.xml	(revision 4deac5ac9bee25049f1b14cc189836612aa79c72)
+++ boot/mips/sysvinit.xml	(revision a6bba28d00866d776a52c3f3c348b4f4f7156191)
@@ -58,5 +58,5 @@
 
     <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="e-${CLFS}/etc/inittab">${CLFS}/etc/inittab</primary>
+      <primary sortas="e-/etc/inittab">/etc/inittab</primary>
     </indexterm>
 
Index: boot/sparc/fstab.xml
===================================================================
--- boot/sparc/fstab.xml	(revision 4deac5ac9bee25049f1b14cc189836612aa79c72)
+++ boot/sparc/fstab.xml	(revision a6bba28d00866d776a52c3f3c348b4f4f7156191)
@@ -9,8 +9,8 @@
   <?dbhtml filename="fstab.html"?>
 
-  <title>Creating the ${CLFS}/etc/fstab File</title>
+  <title>Creating the /etc/fstab File</title>
 
   <indexterm zone="ch-boot-fstab">
-    <primary sortas="e-${CLFS}/etc/fstab">${CLFS}/etc/fstab</primary>
+    <primary sortas="e-/etc/fstab">/etc/fstab</primary>
   </indexterm>
 
Index: boot/sparc/sysvinit.xml
===================================================================
--- boot/sparc/sysvinit.xml	(revision 4deac5ac9bee25049f1b14cc189836612aa79c72)
+++ boot/sparc/sysvinit.xml	(revision a6bba28d00866d776a52c3f3c348b4f4f7156191)
@@ -58,5 +58,5 @@
 
     <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="e-${CLFS}/etc/inittab">${CLFS}/etc/inittab</primary>
+      <primary sortas="e-/etc/inittab">/etc/inittab</primary>
     </indexterm>
 
Index: boot/x86/grub.xml
===================================================================
--- boot/x86/grub.xml	(revision 4deac5ac9bee25049f1b14cc189836612aa79c72)
+++ boot/x86/grub.xml	(revision a6bba28d00866d776a52c3f3c348b4f4f7156191)
@@ -64,5 +64,5 @@
 
   <para os="n">If all went well, GRUB will have reported finding its files
-  in <filename class="directory">${CLFS}/boot/grub</filename>. That's
+  in <filename class="directory">/boot/grub</filename>. That's
   all there is to it. Quit the <command>grub</command> shell:</para>
 
Index: boot/x86/kernel.xml
===================================================================
--- boot/x86/kernel.xml	(revision 4deac5ac9bee25049f1b14cc189836612aa79c72)
+++ boot/x86/kernel.xml	(revision a6bba28d00866d776a52c3f3c348b4f4f7156191)
@@ -72,5 +72,5 @@
 
     <para os="af">If the use of kernel modules can't be avoided, an
-    <filename>${CLFS}/etc/modprobe.conf</filename> file may be needed.
+    <filename>/etc/modprobe.conf</filename> file may be needed.
     Information pertaining to modules and kernel configuration is
     located in the kernel documentation in the <filename
Index: chroot/common/creatingdirs.xml
===================================================================
--- chroot/common/creatingdirs.xml	(revision 4deac5ac9bee25049f1b14cc189836612aa79c72)
+++ chroot/common/creatingdirs.xml	(revision a6bba28d00866d776a52c3f3c348b4f4f7156191)
@@ -33,13 +33,7 @@
   xpointer="xpointer(//*[@os='c'])"/>
 
-  <para os="d">The first mode change ensures that not just anybody can enter
-  the <filename class="directory">/root</filename> directory&mdash;the
-  same as a normal user would do with his or her home directory. The
-  second mode change makes sure that any user can write to the
-  <filename class="directory">/tmp</filename> and
-  <filename class="directory">/var/tmp</filename> directories, but
-  cannot remove another user's files from them. The latter is prohibited
-  by the so-called <quote>sticky bit,</quote> the highest bit (1) in the
-  1777 bit mask.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../boot/common/creatingdirs.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: introduction/common/changelog.xml
===================================================================
--- introduction/common/changelog.xml	(revision 4deac5ac9bee25049f1b14cc189836612aa79c72)
+++ introduction/common/changelog.xml	(revision a6bba28d00866d776a52c3f3c348b4f4f7156191)
@@ -44,9 +44,13 @@
                 linux-headers-2.6.17.4-07072006.</para>
         </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>July 6, 2006</para>
+        <listitem>
+          <para>[Chris] - Removed many "${CLFS}" references from explanatory
+          text in boot section.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>July 7, 2006</para>
       <itemizedlist>
         <listitem>
