r1882 - / trunk/BOOK trunk/BOOK/boot/alpha trunk/BOOK/boot/common trunk/BOOK/boot/mips trunk/BOOK/boot/mips64 trunk/BOOK/boot/mips64-64 trunk/BOOK/boot/multilib trunk/BOOK/boot/ppc trunk/BOOK/boot/ppc64 trunk/BOOK/boot/sparc trunk/BOOK/boot/sparc64 trunk/BOOK/boot/sparc64-64 trunk/BOOK/boot/x86 trunk/BOOK/boot/x86_64 trunk/BOOK/boot/x86_64-64 trunk/BOOK/bootable/alpha trunk/BOOK/bootable/ppc trunk/BOOK/bootable/ppc64 trunk/BOOK/bootable/sparc trunk/BOOK/bootable/x86 trunk/BOOK/bootable/x86_64 trunk/BOOK/bootable/x86_64-64 trunk/BOOK/cross-tools/common trunk/BOOK/introduction/common trunk/BOOK/materials/common trunk/BOOK/temp-system/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sun Jul 2 00:14:26 PDT 2006


Author: jim
Date: 2006-07-02 01:14:21 -0600 (Sun, 02 Jul 2006)
New Revision: 1882

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/boot/alpha/aboot-build.xml
   trunk/BOOK/boot/alpha/aboot.xml
   trunk/BOOK/boot/common/bootscripts.xml
   trunk/BOOK/boot/common/changingowner.xml
   trunk/BOOK/boot/common/createfiles.xml
   trunk/BOOK/boot/common/creatingdirs.xml
   trunk/BOOK/boot/common/devices.xml
   trunk/BOOK/boot/common/e2fsprogs.xml
   trunk/BOOK/boot/common/fstab.xml
   trunk/BOOK/boot/common/introduction.xml
   trunk/BOOK/boot/common/module-init-tools.xml
   trunk/BOOK/boot/common/pwdgroup.xml
   trunk/BOOK/boot/common/settingenviron.xml
   trunk/BOOK/boot/common/sysvinit.xml
   trunk/BOOK/boot/common/udev-rules.xml
   trunk/BOOK/boot/common/udev.xml
   trunk/BOOK/boot/common/util-linux.xml
   trunk/BOOK/boot/common/whatnext.xml
   trunk/BOOK/boot/mips/colo-build.xml
   trunk/BOOK/boot/mips/colo.xml
   trunk/BOOK/boot/mips/creatingdirs.xml
   trunk/BOOK/boot/mips/kernel.xml
   trunk/BOOK/boot/mips/sysvinit.xml
   trunk/BOOK/boot/mips64-64/flags.xml
   trunk/BOOK/boot/mips64/createfiles.xml
   trunk/BOOK/boot/mips64/creatingdirs.xml
   trunk/BOOK/boot/mips64/flags.xml
   trunk/BOOK/boot/mips64/kernel.xml
   trunk/BOOK/boot/multilib/createfiles.xml
   trunk/BOOK/boot/multilib/creatingdirs.xml
   trunk/BOOK/boot/ppc/kernel.xml
   trunk/BOOK/boot/ppc/yaboot-build.xml
   trunk/BOOK/boot/ppc64/kernel.xml
   trunk/BOOK/boot/ppc64/yaboot-build.xml
   trunk/BOOK/boot/sparc/fstab.xml
   trunk/BOOK/boot/sparc/kernel.xml
   trunk/BOOK/boot/sparc/silo-build.xml
   trunk/BOOK/boot/sparc/silo.xml
   trunk/BOOK/boot/sparc/sysvinit.xml
   trunk/BOOK/boot/sparc64-64/flags.xml
   trunk/BOOK/boot/sparc64-64/silo-build.xml
   trunk/BOOK/boot/sparc64/flags.xml
   trunk/BOOK/boot/sparc64/kernel.xml
   trunk/BOOK/boot/x86/grub-build.xml
   trunk/BOOK/boot/x86/grub.xml
   trunk/BOOK/boot/x86/kernel.xml
   trunk/BOOK/boot/x86_64-64/flags.xml
   trunk/BOOK/boot/x86_64-64/lilo.xml
   trunk/BOOK/boot/x86_64/flags.xml
   trunk/BOOK/boot/x86_64/grub-build.xml
   trunk/BOOK/boot/x86_64/kernel.xml
   trunk/BOOK/bootable/alpha/aboot.xml
   trunk/BOOK/bootable/alpha/kernel.xml
   trunk/BOOK/bootable/ppc/kernel.xml
   trunk/BOOK/bootable/ppc/yaboot.xml
   trunk/BOOK/bootable/ppc64/kernel.xml
   trunk/BOOK/bootable/sparc/kernel.xml
   trunk/BOOK/bootable/sparc/silo.xml
   trunk/BOOK/bootable/x86/grub.xml
   trunk/BOOK/bootable/x86/kernel.xml
   trunk/BOOK/bootable/x86_64-64/lilo.xml
   trunk/BOOK/bootable/x86_64/kernel.xml
   trunk/BOOK/cross-tools/common/introduction.xml
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/common/askforhelp.xml
   trunk/BOOK/introduction/common/resources.xml
   trunk/BOOK/materials/common/introduction.xml
   trunk/BOOK/temp-system/common/introduction.xml
Log:
 r4232 at server (orig r1964):  jim | 2006-07-01 23:52:01 -0700
  r4227 at server:  jim | 2006-07-01 23:46:16 -0700
  More LFS to CLFS Updates
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:1963
   + b6734a72-470d-0410-b049-f317dca95413:/:1964


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:4214
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:4227
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/boot/alpha/aboot-build.xml
===================================================================
--- trunk/BOOK/boot/alpha/aboot-build.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/alpha/aboot-build.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -32,7 +32,7 @@
 
     <para>Install the package:</para>
 
-<screen><userinput>make root="${LFS}" bindir=/cross-tools/bin install</userinput></screen>
+<screen><userinput>make root="${CLFS}" bindir=/cross-tools/bin install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/boot/alpha/aboot.xml
===================================================================
--- trunk/BOOK/boot/alpha/aboot.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/alpha/aboot.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -20,7 +20,7 @@
 
 <screen><userinput>cat > /etc/aboot.conf << "EOF"
 <literal># Begin /etc/aboot.conf
-0:1/boot/lfskernel-&linux-version; root=/dev/sda1
+0:1/boot/clfskernel-&linux-version; root=/dev/sda1
 # End /etc/aboot.conf</literal>
 EOF</userinput></screen>
 

Modified: trunk/BOOK/boot/common/bootscripts.xml
===================================================================
--- trunk/BOOK/boot/common/bootscripts.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/common/bootscripts.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -24,7 +24,7 @@
 
     <para>Install the package:</para>
 
-<screen><userinput>make ETCDIR=${LFS}/etc minimal</userinput></screen>
+<screen><userinput>make ETCDIR=${CLFS}/etc minimal</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootscripts/common/setclock.xml"
@@ -41,7 +41,7 @@
     href="../../bootscripts/common/setclock.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>cat > ${LFS}/etc/sysconfig/clock << "EOF"
+<screen><userinput>cat > ${CLFS}/etc/sysconfig/clock << "EOF"
 <literal># Begin /etc/sysconfig/clock
 
 UTC=1

Modified: trunk/BOOK/boot/common/changingowner.xml
===================================================================
--- trunk/BOOK/boot/common/changingowner.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/common/changingowner.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -12,12 +12,12 @@
 
   <para os="a">Currently, the <filename class="directory">$CLFS</filename>
   directory and all of its subdirectories  are owned by the user
-  <systemitem class="username">lfs</systemitem>, a user that exists only
+  <systemitem class="username">clfs</systemitem>, a user that exists only
   on the host system. For security reasons, the $CLFS root directory and
   all of it subdirectories should be owned by
   <systemitem class="username">root</systemitem>. Change the ownership
   for $CLFS and its subdirectories by running this command:</para>
 
-<screen os="b"><userinput>chown -Rv root:root ${LFS}</userinput></screen>
+<screen os="b"><userinput>chown -Rv root:root ${CLFS}</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/boot/common/createfiles.xml
===================================================================
--- trunk/BOOK/boot/common/createfiles.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/common/createfiles.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -15,9 +15,9 @@
   links which will be replaced by real files throughout the course of
   the next chapter after the software has been installed.</para>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,grep,pwd,stty} ${LFS}/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${LFS}/usr/lib
-ln -sv /tools/lib/libstd* ${LFS}/usr/lib
-ln -sv bash ${LFS}/bin/sh</userinput></screen>
+<screen><userinput>ln -sv /tools/bin/{bash,cat,grep,pwd,stty} ${CLFS}/bin
+ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
+ln -sv /tools/lib/libstd* ${CLFS}/usr/lib
+ln -sv bash ${CLFS}/bin/sh</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/boot/common/creatingdirs.xml
===================================================================
--- trunk/BOOK/boot/common/creatingdirs.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/common/creatingdirs.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -13,19 +13,19 @@
   <para os="a">It is time to create some structure in the CLFS file system. Create a
   standard directory tree by issuing the following commands:</para>
 
-<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 os="b">Directories are, by default, created with permission mode 755,
   but this is not desirable for all directories. In the commands above,
@@ -34,11 +34,11 @@
   directories for temporary files.</para>
 
   <para os="c">The first mode change ensures that not just anybody can enter
-  the <filename class="directory">${LFS}/root</filename> directory—the
+  the <filename class="directory">${CLFS}/root</filename> directory—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">${LFS}/tmp</filename> and
-  <filename class="directory">${LFS}/var/tmp</filename> directories, but
+  <filename class="directory">${CLFS}/tmp</filename> and
+  <filename class="directory">${CLFS}/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>

Modified: trunk/BOOK/boot/common/devices.xml
===================================================================
--- trunk/BOOK/boot/common/devices.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/common/devices.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -8,10 +8,10 @@
 <sect1 id="ch-boot-devices">
   <?dbhtml filename="devices.html"?>
 
-  <title>Populating ${LFS}/dev</title>
+  <title>Populating ${CLFS}/dev</title>
 
   <indexterm zone="ch-boot-devices">
-    <primary sortas="e-${LFS}/dev/*">${LFS}/dev/*</primary>
+    <primary sortas="e-${CLFS}/dev/*">${CLFS}/dev/*</primary>
   </indexterm>
 
   <sect2>
@@ -34,8 +34,8 @@
     <filename class="devicefile">console</filename>). Create these by running
     the following commands:</para>
 
-<screen><userinput>mknod -m 600 ${LFS}/dev/console c 5 1
-mknod -m 666 ${LFS}/dev/null c 1 3</userinput></screen>
+<screen><userinput>mknod -m 600 ${CLFS}/dev/console c 5 1
+mknod -m 666 ${CLFS}/dev/null c 1 3</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/boot/common/e2fsprogs.xml
===================================================================
--- trunk/BOOK/boot/common/e2fsprogs.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/common/e2fsprogs.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -61,13 +61,13 @@
 
     <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>
 
     <variablelist os="j">
       <title>The meaning of the make option:</title>
 
       <varlistentry>
-        <term><parameter>DESTDIR=${LFS}</parameter></term>
+        <term><parameter>DESTDIR=${CLFS}</parameter></term>
         <listitem>
           <para>The Makefile for e2fsprogs hard-codes a path to the 
           <filename>mke2fs.conf</filename> file, causing the installation to
@@ -86,7 +86,7 @@
 
     <para os="ad">Create needed symlinks for a bootable system:</para>
 
-<screen os="ae"><userinput>ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,e2fsck} ${LFS}/sbin</userinput></screen>
+<screen os="ae"><userinput>ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,e2fsck} ${CLFS}/sbin</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/boot/common/fstab.xml
===================================================================
--- trunk/BOOK/boot/common/fstab.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/common/fstab.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -8,18 +8,18 @@
 <sect1 id="ch-boot-fstab">
   <?dbhtml filename="fstab.html"?>
 
-  <title>Creating the ${LFS}/etc/fstab File</title>
+  <title>Creating the ${CLFS}/etc/fstab File</title>
 
   <indexterm zone="ch-boot-fstab">
-    <primary sortas="e-${LFS}/etc/fstab">${LFS}/etc/fstab</primary>
+    <primary sortas="e-${CLFS}/etc/fstab">${CLFS}/etc/fstab</primary>
   </indexterm>
 
-  <para os="a">The <filename>${LFS}/etc/fstab</filename> file is used by some
+  <para os="a">The <filename>${CLFS}/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
   table like this:</para>
 
-<screen><userinput>cat > ${LFS}/etc/fstab << "EOF"
+<screen><userinput>cat > ${CLFS}/etc/fstab << "EOF"
 <literal># Begin /etc/fstab
 
 # file system  mount-point  type   options          dump  fsck

Modified: trunk/BOOK/boot/common/introduction.xml
===================================================================
--- trunk/BOOK/boot/common/introduction.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/common/introduction.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -19,12 +19,12 @@
   packages will be installed onto the root or in /usr on the CLFS
   partition ($CLFS/bin, $CLFS/usr/lib, etc...), rather than /tools, using the
   "DESTDIR" option with make. This will require the
-  <systemitem class="username">lfs</systemitem> user to have write access to
+  <systemitem class="username">clfs</systemitem> user to have write access to
   the rest of the $CLFS partition, so you will need to temporarily change the
-  ownership of $CLFS to the <systemitem class="username">lfs</systemitem> user.
+  ownership of $CLFS to the <systemitem class="username">clfs</systemitem> user.
   Run the following command as <systemitem
   class="username">root</systemitem>:</para>
 
-<screen><userinput>chown -v lfs $CLFS</userinput></screen>
+<screen><userinput>chown -v clfs $CLFS</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/boot/common/module-init-tools.xml
===================================================================
--- trunk/BOOK/boot/common/module-init-tools.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/common/module-init-tools.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -41,7 +41,7 @@
     href="../../final-system/common/module-init-tools.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
-<screen os="k"><userinput>make DESTDIR="${LFS}" install</userinput></screen>
+<screen os="k"><userinput>make DESTDIR="${CLFS}" install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/boot/common/pwdgroup.xml
===================================================================
--- trunk/BOOK/boot/common/pwdgroup.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/common/pwdgroup.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -11,38 +11,38 @@
   <title>Creating the passwd, group, and log Files</title>
 
   <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${LFS}/etc/passwd">${LFS}/etc/passwd</primary>
+    <primary sortas="e-${CLFS}/etc/passwd">${CLFS}/etc/passwd</primary>
   </indexterm>
 
   <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${LFS}/etc/group">${LFS}/etc/group</primary>
+    <primary sortas="e-${CLFS}/etc/group">${CLFS}/etc/group</primary>
   </indexterm>
 
   <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${LFS}/var/run/utmp">${LFS}/var/run/utmp</primary>
+    <primary sortas="e-${CLFS}/var/run/utmp">${CLFS}/var/run/utmp</primary>
   </indexterm>
 
   <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${LFS}/var/log/btmp">${LFS}/var/log/btmp</primary>
+    <primary sortas="e-${CLFS}/var/log/btmp">${CLFS}/var/log/btmp</primary>
   </indexterm>
 
   <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${LFS}/var/log/lastlog">${LFS}/var/log/lastlog</primary>
+    <primary sortas="e-${CLFS}/var/log/lastlog">${CLFS}/var/log/lastlog</primary>
   </indexterm>
 
   <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-${LFS}/var/log/wtmp">${LFS}/var/log/wtmp</primary>
+    <primary sortas="e-${CLFS}/var/log/wtmp">${CLFS}/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>${LFS}/etc/passwd</filename>
-  and <filename>${LFS}/etc/group</filename> files.</para>
+  there must be relevant entries in the <filename>${CLFS}/etc/passwd</filename>
+  and <filename>${CLFS}/etc/group</filename> files.</para>
 
-  <para>Create the <filename>${LFS}/etc/passwd</filename> file by running
+  <para>Create the <filename>${CLFS}/etc/passwd</filename> file by running
   the following command:</para>
 
-<screen><userinput>cat > ${LFS}/etc/passwd << "EOF"
+<screen><userinput>cat > ${CLFS}/etc/passwd << "EOF"
 <literal>root:x:0:0:root:/root:/bin/bash</literal>
 EOF</userinput></screen>
 
@@ -50,76 +50,10 @@
   (the <quote>x</quote> used here is just a placeholder) will be set
   later.</para>
 
-  <variablelist os="b">
-  
-    <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>${LFS}/etc/group</filename> file by running
+  <para>Create the <filename>${CLFS}/etc/group</filename> file by running
   the following command:</para>
 
-<screen><userinput>cat > ${LFS}/etc/group << "EOF"
+<screen><userinput>cat > ${CLFS}/etc/group << "EOF"
 <literal>root:x:0:
 bin:x:1:
 sys:x:2:
@@ -216,15 +150,15 @@
   do not already exist. Initialize the log files and give them
   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
-chmod -v 600 ${LFS}/var/log/btmp</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
+chmod -v 600 ${CLFS}/var/log/btmp</userinput></screen>
 
-  <para>The <filename>${LFS}/var/run/utmp</filename> file records the users
-  that are currently logged in. The <filename>${LFS}/var/log/wtmp</filename>
+  <para>The <filename>${CLFS}/var/run/utmp</filename> file records the users
+  that are currently logged in. The <filename>${CLFS}/var/log/wtmp</filename>
   file records all logins and logouts. The
-  <filename>${LFS}/var/log/lastlog</filename> file records when
-  each user last logged in. The <filename>${LFS}/var/log/btmp</filename> file
+  <filename>${CLFS}/var/log/lastlog</filename> file records when
+  each user last logged in. The <filename>${CLFS}/var/log/btmp</filename> file
   records the bad login attempts.</para>
 
 </sect1>

Modified: trunk/BOOK/boot/common/settingenviron.xml
===================================================================
--- trunk/BOOK/boot/common/settingenviron.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/common/settingenviron.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -14,7 +14,7 @@
   shell, which will read <filename>.bash_profile</filename> file. Create the
   <filename>.bash_profile</filename> file now:</para>
 
-<screen><userinput>cat > ${LFS}/root/.bash_profile << "EOF"
+<screen><userinput>cat > ${CLFS}/root/.bash_profile << "EOF"
 <literal>set +h
 PS1='\u:\w\$ '
 LC_ALL=POSIX

Modified: trunk/BOOK/boot/common/sysvinit.xml
===================================================================
--- trunk/BOOK/boot/common/sysvinit.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/common/sysvinit.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -27,7 +27,7 @@
 
 <screen os="ab"><userinput>cp -v src/Makefile src/Makefile.orig
 sed -e 's at root@0 at g' \
-    -e "s@/dev/initctl@${LFS}&@g" \
+    -e "s@/dev/initctl@${CLFS}&@g" \
     -e 's@\(mknod \)-m \([0-9]* \)\(.* \)p@\1\3p; chmod \2\3 at g' \
     -e "s@/usr/lib@/tools/lib@" \
     src/Makefile.orig > src/Makefile</userinput></screen>
@@ -43,7 +43,7 @@
     href="../../final-system/common/sysvinit.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="ad"><userinput>make -C src install INSTALL="install" ROOT="${LFS}"</userinput></screen>
+<screen os="ad"><userinput>make -C src install INSTALL="install" ROOT="${CLFS}"</userinput></screen>
 
   </sect2>
 
@@ -56,13 +56,13 @@
     </indexterm>
 
     <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="e-${LFS}/etc/inittab">${LFS}/etc/inittab</primary>
+      <primary sortas="e-${CLFS}/etc/inittab">${CLFS}/etc/inittab</primary>
     </indexterm>
 
-    <para os="ae">Create a new file <filename>${LFS}/etc/inittab</filename> by
+    <para os="ae">Create a new file <filename>${CLFS}/etc/inittab</filename> by
     running the following:</para>
 
-<screen os="af"><userinput>cat > ${LFS}/etc/inittab << "EOF"
+<screen os="af"><userinput>cat > ${CLFS}/etc/inittab << "EOF"
 <literal># Begin /etc/inittab
 
 id:3:initdefault:

Modified: trunk/BOOK/boot/common/udev-rules.xml
===================================================================
--- trunk/BOOK/boot/common/udev-rules.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/common/udev-rules.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -8,7 +8,7 @@
 <sect1 id="ch-boot-udev-rules" role="wrap">
   <?dbhtml filename="udev-rules.html"?>
 
-  <title>Udev Rules-&udev-cross-lfs-version;</title>
+  <title>Udev Rules-&udev-cross-CLFS-version;</title>
 
   <indexterm zone="ch-boot-udev-rules">
     <primary sortas="a-Udev Rules">Udev Rules</primary>
@@ -25,13 +25,13 @@
     href="../../bootscripts/common/udev-rules.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>rm -vf ${LFS}/etc/udev/rules.d/*</userinput></screen>
+<screen><userinput>rm -vf ${CLFS}/etc/udev/rules.d/*</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootscripts/common/udev-rules.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make DESTDIR=${LFS} install-minimal</userinput></screen>
+<screen><userinput>make DESTDIR=${CLFS} install-minimal</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/boot/common/udev.xml
===================================================================
--- trunk/BOOK/boot/common/udev.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/common/udev.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -32,7 +32,7 @@
     href="../../final-system/common/udev.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="h"><userinput>make DESTDIR=${LFS} udevdir=/dev install</userinput></screen>
+<screen os="h"><userinput>make DESTDIR=${CLFS} udevdir=/dev install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/boot/common/util-linux.xml
===================================================================
--- trunk/BOOK/boot/common/util-linux.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/common/util-linux.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -124,7 +124,7 @@
 
 <screen os="bi"><userinput>make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no \
     USE_TTY_GROUP=no CPUOPT="" ARCH="" \
-    CPU="" DESTDIR=${LFS} install</userinput></screen>
+    CPU="" DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/boot/common/whatnext.xml
===================================================================
--- trunk/BOOK/boot/common/whatnext.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/common/whatnext.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -11,10 +11,10 @@
   <title>What to do next</title>
 
   <para>Now you're at the point to get your <filename
-  class="directory">${LFS}</filename> directory copied over to your target
+  class="directory">${CLFS}</filename> directory copied over to your target
   machine. The easiest method would be to tar it up and copy the file.</para>
 
-<screen><userinput>tar -jcvf ${LFS}.tar.bz2 ${LFS}</userinput></screen>
+<screen><userinput>tar -jcvf ${CLFS}.tar.bz2 ${CLFS}</userinput></screen>
 
   <para>Some others have came up with other ideas on how to do this.
   Below is a table with the method and link to where the information

Modified: trunk/BOOK/boot/mips/colo-build.xml
===================================================================
--- trunk/BOOK/boot/mips/colo-build.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/mips/colo-build.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -39,8 +39,8 @@
     href="../../final-system/mips/colo.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="ab"><userinput>cp -v chain/colo-chain.elf ${LFS}/boot/vmlinux
-gzip -9 ${LFS}/boot/vmlinux</userinput></screen>
+<screen os="ab"><userinput>cp -v chain/colo-chain.elf ${CLFS}/boot/vmlinux
+gzip -9 ${CLFS}/boot/vmlinux</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/boot/mips/colo.xml
===================================================================
--- trunk/BOOK/boot/mips/colo.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/mips/colo.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -27,7 +27,7 @@
   href="../../bootable/mips/colo.xml"
   xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="aa"><userinput>cat > ${LFS}/boot/default.colo << "EOF"
+<screen os="aa"><userinput>cat > ${CLFS}/boot/default.colo << "EOF"
 #:CoLo:#
 #
 # load linux

Modified: trunk/BOOK/boot/mips/creatingdirs.xml
===================================================================
--- trunk/BOOK/boot/mips/creatingdirs.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/mips/creatingdirs.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -14,30 +14,30 @@
   href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>install -dv ${LFS}/{bin,boot,dev,etc/opt,home,lib,mnt}
-install -dv ${LFS}/{sbin,srv,usr/local,var,opt,proc,sys}
-install -dv ${LFS}/root -m 0750
-install -dv ${LFS}/tmp ${LFS}/var/tmp -m 1777
-install -dv ${LFS}/media/{floppy,cdrom}
-install -dv ${LFS}/usr/{bin,include,lib,sbin,share,src}
-ln -sv share/{man,doc,info} ${LFS}/usr
-install -dv ${LFS}/usr/share/{doc,info,locale,man}
-install -dv ${LFS}/usr/share/{misc,terminfo,zoneinfo}
-install -dv ${LFS}/usr/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${LFS}/usr/local/{bin,etc,include,lib,sbin,share,src}
-ln -sv share/{man,doc,info} ${LFS}/usr/local
-install -dv ${LFS}/usr/local/share/{doc,info,locale,man}
-install -dv ${LFS}/usr/local/share/{misc,terminfo,zoneinfo}
-install -dv ${LFS}/usr/local/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${LFS}/var/{lock,log,mail,run,spool}
-install -dv ${LFS}/var/{opt,cache,lib/{misc,locate},local}
-install -dv ${LFS}/opt/{bin,doc,include,info}
-install -dv ${LFS}/opt/{lib,man/man{1,2,3,4,5,6,7,8}}</userinput></screen>
+<screen><userinput>install -dv ${CLFS}/{bin,boot,dev,etc/opt,home,lib,mnt}
+install -dv ${CLFS}/{sbin,srv,usr/local,var,opt,proc,sys}
+install -dv ${CLFS}/root -m 0750
+install -dv ${CLFS}/tmp ${CLFS}/var/tmp -m 1777
+install -dv ${CLFS}/media/{floppy,cdrom}
+install -dv ${CLFS}/usr/{bin,include,lib,sbin,share,src}
+ln -sv share/{man,doc,info} ${CLFS}/usr
+install -dv ${CLFS}/usr/share/{doc,info,locale,man}
+install -dv ${CLFS}/usr/share/{misc,terminfo,zoneinfo}
+install -dv ${CLFS}/usr/share/man/man{1,2,3,4,5,6,7,8}
+install -dv ${CLFS}/usr/local/{bin,etc,include,lib,sbin,share,src}
+ln -sv share/{man,doc,info} ${CLFS}/usr/local
+install -dv ${CLFS}/usr/local/share/{doc,info,locale,man}
+install -dv ${CLFS}/usr/local/share/{misc,terminfo,zoneinfo}
+install -dv ${CLFS}/usr/local/share/man/man{1,2,3,4,5,6,7,8}
+install -dv ${CLFS}/var/{lock,log,mail,run,spool}
+install -dv ${CLFS}/var/{opt,cache,lib/{misc,locate},local}
+install -dv ${CLFS}/opt/{bin,doc,include,info}
+install -dv ${CLFS}/opt/{lib,man/man{1,2,3,4,5,6,7,8}}</userinput></screen>
 
    <para>These entries are needed for the RaQ2 bootloader. Only use these
    if you are utilizing the Colo bootloader:</para>
 
-<screen><userinput>cd /${LFS}/boot 
+<screen><userinput>cd /${CLFS}/boot 
 ln -svf . boot</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/mips/kernel.xml
===================================================================
--- trunk/BOOK/boot/mips/kernel.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/mips/kernel.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -91,7 +91,7 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET)- \
-   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
@@ -101,8 +101,8 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${LFS}/boot/vmlinux-&linux-version;
-gzip -9 ${LFS}/boot/vmlinux-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux ${CLFS}/boot/vmlinux-&linux-version;
+gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/boot/mips/sysvinit.xml
===================================================================
--- trunk/BOOK/boot/mips/sysvinit.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/mips/sysvinit.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -57,13 +57,13 @@
     </indexterm>
 
     <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="e-${LFS}/etc/inittab">${LFS}/etc/inittab</primary>
+      <primary sortas="e-${CLFS}/etc/inittab">${CLFS}/etc/inittab</primary>
     </indexterm>
 
-    <para>Create a new file <filename>${LFS}/etc/inittab</filename> by
+    <para>Create a new file <filename>${CLFS}/etc/inittab</filename> by
     running the following:</para>
 
-<screen><userinput>cat > ${LFS}/etc/inittab << "EOF"
+<screen><userinput>cat > ${CLFS}/etc/inittab << "EOF"
 <literal># Begin /etc/inittab
 
 id:3:initdefault:

Modified: trunk/BOOK/boot/mips64/createfiles.xml
===================================================================
--- trunk/BOOK/boot/mips64/createfiles.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/mips64/createfiles.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -14,13 +14,13 @@
   href="../common/createfiles.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,pwd,stty} ${LFS}/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${LFS}/usr/lib
-ln -sv /tools/lib32/libgcc_s.so{,.1} ${LFS}/usr/lib32
-ln -sv /tools/lib64/libgcc_s.so{,.1} ${LFS}/usr/lib64
-ln -sv /tools/lib/libstd* ${LFS}/usr/lib
-ln -sv /tools/lib32/libstd* ${LFS}/usr/lib32
-ln -sv /tools/lib64/libstd* ${LFS}/usr/lib64
-ln -sv bash ${LFS}/bin/sh</userinput></screen>
+<screen><userinput>ln -sv /tools/bin/{bash,cat,pwd,stty} ${CLFS}/bin
+ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
+ln -sv /tools/lib32/libgcc_s.so{,.1} ${CLFS}/usr/lib32
+ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
+ln -sv /tools/lib/libstd* ${CLFS}/usr/lib
+ln -sv /tools/lib32/libstd* ${CLFS}/usr/lib32
+ln -sv /tools/lib64/libstd* ${CLFS}/usr/lib64
+ln -sv bash ${CLFS}/bin/sh</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/boot/mips64/creatingdirs.xml
===================================================================
--- trunk/BOOK/boot/mips64/creatingdirs.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/mips64/creatingdirs.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -14,33 +14,33 @@
   href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>install -dv ${LFS}/{bin,boot,dev,etc/opt,home,lib{,32,64},mnt}
-install -dv ${LFS}/{sbin,srv,usr/local,var,opt,proc,sys}
-install -dv ${LFS}/root -m 0750
-install -dv ${LFS}/tmp ${LFS}/var/tmp -m 1777
-install -dv ${LFS}/media/{floppy,cdrom}
-install -dv ${LFS}/usr/{bin,include,lib{,32,64},sbin,share,src}
-ln -sv share/{man,doc,info} ${LFS}/usr
-install -dv ${LFS}/usr/share/{doc,info,locale,man}
-install -dv ${LFS}/usr/share/{misc,terminfo,zoneinfo}
-install -dv ${LFS}/usr/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${LFS}/usr/local/{bin,etc,include,lib{,32,64},sbin,share,src}
-ln -sv share/{man,doc,info} ${LFS}/usr/local
-install -dv ${LFS}/usr/local/share/{doc,info,locale,man}
-install -dv ${LFS}/usr/local/share/{misc,terminfo,zoneinfo}
-install -dv ${LFS}/usr/local/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${LFS}/var/{lock,log,mail,run,spool}
-install -dv ${LFS}/var/{opt,cache,lib{,32,64}/{misc,locate},local}
-install -dv ${LFS}/opt/{bin,doc,include,info}
-install -dv ${LFS}/opt/{lib{,32,64},man/man{1,2,3,4,5,6,7,8}}
-install -dv ${LFS}/usr/lib/locale
-ln -sv ../lib/locale ${LFS}/usr/lib32
-ln -sv ../lib/locale ${LFS}/usr/lib64</userinput></screen>
+<screen><userinput>install -dv ${CLFS}/{bin,boot,dev,etc/opt,home,lib{,32,64},mnt}
+install -dv ${CLFS}/{sbin,srv,usr/local,var,opt,proc,sys}
+install -dv ${CLFS}/root -m 0750
+install -dv ${CLFS}/tmp ${CLFS}/var/tmp -m 1777
+install -dv ${CLFS}/media/{floppy,cdrom}
+install -dv ${CLFS}/usr/{bin,include,lib{,32,64},sbin,share,src}
+ln -sv share/{man,doc,info} ${CLFS}/usr
+install -dv ${CLFS}/usr/share/{doc,info,locale,man}
+install -dv ${CLFS}/usr/share/{misc,terminfo,zoneinfo}
+install -dv ${CLFS}/usr/share/man/man{1,2,3,4,5,6,7,8}
+install -dv ${CLFS}/usr/local/{bin,etc,include,lib{,32,64},sbin,share,src}
+ln -sv share/{man,doc,info} ${CLFS}/usr/local
+install -dv ${CLFS}/usr/local/share/{doc,info,locale,man}
+install -dv ${CLFS}/usr/local/share/{misc,terminfo,zoneinfo}
+install -dv ${CLFS}/usr/local/share/man/man{1,2,3,4,5,6,7,8}
+install -dv ${CLFS}/var/{lock,log,mail,run,spool}
+install -dv ${CLFS}/var/{opt,cache,lib{,32,64}/{misc,locate},local}
+install -dv ${CLFS}/opt/{bin,doc,include,info}
+install -dv ${CLFS}/opt/{lib{,32,64},man/man{1,2,3,4,5,6,7,8}}
+install -dv ${CLFS}/usr/lib/locale
+ln -sv ../lib/locale ${CLFS}/usr/lib32
+ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
 
    <para>These entries are needed for the RaQ2 bootloader. Only use these
    if you are utilizing the Colo bootloader:</para>
 
-<screen><userinput>cd /${LFS}/boot
+<screen><userinput>cd /${CLFS}/boot
 ln -svf . boot</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/mips64/flags.xml
===================================================================
--- trunk/BOOK/boot/mips64/flags.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/mips64/flags.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -13,9 +13,9 @@
   <para>We will need to copy our BUILD Variables into our new system. So when
   we boot-up they will be there:</para>
 
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" >> ${LFS}/root/.bash_profile
-echo export BUILDN32=\""${BUILDN32}\"" >> ${LFS}/root/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" >> ${LFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ${LFS}/root/.bash_profile</userinput></screen>
+<screen><userinput>echo export BUILD32=\""${BUILD32}\"" >> ${CLFS}/root/.bash_profile
+echo export BUILDN32=\""${BUILDN32}\"" >> ${CLFS}/root/.bash_profile
+echo export BUILD64=\""${BUILD64}\"" >> ${CLFS}/root/.bash_profile
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ${CLFS}/root/.bash_profile</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/boot/mips64/kernel.xml
===================================================================
--- trunk/BOOK/boot/mips64/kernel.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/mips64/kernel.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -95,7 +95,7 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
 <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
@@ -105,8 +105,8 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${LFS}/boot/vmlinux-&linux-version;
-gzip -9 ${LFS}/boot/vmlinux-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux ${CLFS}/boot/vmlinux-&linux-version;
+gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/boot/mips64-64/flags.xml
===================================================================
--- trunk/BOOK/boot/mips64-64/flags.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/mips64-64/flags.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -13,6 +13,6 @@
   <para>We will need to copy our BUILD Variables into our new system. So when
   we boot-up they will be there:</para>
 
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" >> ${LFS}/root/.bash_profile</userinput></screen>
+<screen><userinput>echo export BUILD64=\""${BUILD64}\"" >> ${CLFS}/root/.bash_profile</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/boot/multilib/createfiles.xml
===================================================================
--- trunk/BOOK/boot/multilib/createfiles.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/multilib/createfiles.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -14,11 +14,11 @@
   href="../common/createfiles.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>ln -sv /tools/bin/{bash,cat,pwd,stty} ${LFS}/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${LFS}/usr/lib
-ln -sv /tools/lib64/libgcc_s.so{,.1} ${LFS}/usr/lib64
-ln -sv /tools/lib/libstd* ${LFS}/usr/lib
-ln -sv /tools/lib64/libstd* ${LFS}/usr/lib64
-ln -sv bash ${LFS}/bin/sh</userinput></screen>
+<screen><userinput>ln -sv /tools/bin/{bash,cat,pwd,stty} ${CLFS}/bin
+ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
+ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
+ln -sv /tools/lib/libstd* ${CLFS}/usr/lib
+ln -sv /tools/lib64/libstd* ${CLFS}/usr/lib64
+ln -sv bash ${CLFS}/bin/sh</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/boot/multilib/creatingdirs.xml
===================================================================
--- trunk/BOOK/boot/multilib/creatingdirs.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/multilib/creatingdirs.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -14,27 +14,27 @@
   href="../common/creatingdirs.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>install -dv ${LFS}/{bin,boot,dev,etc/opt,home,lib{,64},mnt}
-install -dv ${LFS}/{sbin,srv,usr/local,var,opt,proc,sys}
-install -dv ${LFS}/root -m 0750
-install -dv ${LFS}/tmp ${LFS}/var/tmp -m 1777
-install -dv ${LFS}/media/{floppy,cdrom}
-install -dv ${LFS}/usr/{bin,include,lib{,64},sbin,share,src}
-ln -sv share/{man,doc,info} ${LFS}/usr
-install -dv ${LFS}/usr/share/{doc,info,locale,man}
-install -dv ${LFS}/usr/share/{misc,terminfo,zoneinfo}
-install -dv ${LFS}/usr/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${LFS}/usr/local/{bin,etc,include,lib{,64},sbin,share,src}
-ln -sv share/{man,doc,info} ${LFS}/usr/local
-install -dv ${LFS}/usr/local/share/{doc,info,locale,man}
-install -dv ${LFS}/usr/local/share/{misc,terminfo,zoneinfo}
-install -dv ${LFS}/usr/local/share/man/man{1,2,3,4,5,6,7,8}
-install -dv ${LFS}/var/{lock,log,mail,run,spool}
-install -dv ${LFS}/var/{opt,cache,lib{,64}/{misc,locate},local}
-install -dv ${LFS}/opt/{bin,doc,include,info}
-install -dv ${LFS}/opt/{lib{,64},man/man{1,2,3,4,5,6,7,8}}
-install -dv ${LFS}/usr/lib/locale
-ln -sv ../lib/locale ${LFS}/usr/lib64</userinput></screen>
+<screen><userinput>install -dv ${CLFS}/{bin,boot,dev,etc/opt,home,lib{,64},mnt}
+install -dv ${CLFS}/{sbin,srv,usr/local,var,opt,proc,sys}
+install -dv ${CLFS}/root -m 0750
+install -dv ${CLFS}/tmp ${CLFS}/var/tmp -m 1777
+install -dv ${CLFS}/media/{floppy,cdrom}
+install -dv ${CLFS}/usr/{bin,include,lib{,64},sbin,share,src}
+ln -sv share/{man,doc,info} ${CLFS}/usr
+install -dv ${CLFS}/usr/share/{doc,info,locale,man}
+install -dv ${CLFS}/usr/share/{misc,terminfo,zoneinfo}
+install -dv ${CLFS}/usr/share/man/man{1,2,3,4,5,6,7,8}
+install -dv ${CLFS}/usr/local/{bin,etc,include,lib{,64},sbin,share,src}
+ln -sv share/{man,doc,info} ${CLFS}/usr/local
+install -dv ${CLFS}/usr/local/share/{doc,info,locale,man}
+install -dv ${CLFS}/usr/local/share/{misc,terminfo,zoneinfo}
+install -dv ${CLFS}/usr/local/share/man/man{1,2,3,4,5,6,7,8}
+install -dv ${CLFS}/var/{lock,log,mail,run,spool}
+install -dv ${CLFS}/var/{opt,cache,lib{,64}/{misc,locate},local}
+install -dv ${CLFS}/opt/{bin,doc,include,info}
+install -dv ${CLFS}/opt/{lib{,64},man/man{1,2,3,4,5,6,7,8}}
+install -dv ${CLFS}/usr/lib/locale
+ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/creatingdirs.xml"

Modified: trunk/BOOK/boot/ppc/kernel.xml
===================================================================
--- trunk/BOOK/boot/ppc/kernel.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/ppc/kernel.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -88,7 +88,7 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
 <screen><userinput>make ARCH=ppc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
@@ -98,7 +98,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/boot/ppc/yaboot-build.xml
===================================================================
--- trunk/BOOK/boot/ppc/yaboot-build.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/ppc/yaboot-build.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -47,7 +47,7 @@
     <para>The Makefile is already set to do kernel-style cross-compiling,
     but it will try to use <command>strip</command> to strip the second-stage
     loader.  It also expects to be running as root for the install, and to
-    install for the root user, which user LFS cannot do.  The following command
+    install for the root user, which user CLFS cannot do.  The following command
     will fix this:</para>
 
 <screen><userinput>cp Makefile,{.orig}

Modified: trunk/BOOK/boot/ppc64/kernel.xml
===================================================================
--- trunk/BOOK/boot/ppc64/kernel.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/ppc64/kernel.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -87,7 +87,7 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
 <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
@@ -97,7 +97,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/boot/ppc64/yaboot-build.xml
===================================================================
--- trunk/BOOK/boot/ppc64/yaboot-build.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/ppc64/yaboot-build.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -49,7 +49,7 @@
     <para>The Makefile is already set to do kernel-style cross-compiling,
     but it will try to use <command>strip</command> to strip the second-stage
     loader.  It also expects to be running as root for the install, and to
-    install for the root user, which user LFS cannot do.  We also need to use
+    install for the root user, which user CLFS cannot do.  We also need to use
     the 32-bit compiler, and to force <command>ld</command> to use a 32-bit
     emulation. The following commands will fix and achieve this:</para>
 

Modified: trunk/BOOK/boot/sparc/fstab.xml
===================================================================
--- trunk/BOOK/boot/sparc/fstab.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/sparc/fstab.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -8,17 +8,17 @@
 <sect1 id="ch-boot-fstab">
   <?dbhtml filename="fstab.html"?>
 
-  <title>Creating the ${LFS}/etc/fstab File</title>
+  <title>Creating the ${CLFS}/etc/fstab File</title>
 
   <indexterm zone="ch-boot-fstab">
-    <primary sortas="e-${LFS}/etc/fstab">${LFS}/etc/fstab</primary>
+    <primary sortas="e-${CLFS}/etc/fstab">${CLFS}/etc/fstab</primary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/fstab.xml"
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>cat > ${LFS}/etc/fstab << "EOF"
+<screen><userinput>cat > ${CLFS}/etc/fstab << "EOF"
 <literal># Begin /etc/fstab
 
 # file system  mount-point     type        options          dump  fsck

Modified: trunk/BOOK/boot/sparc/kernel.xml
===================================================================
--- trunk/BOOK/boot/sparc/kernel.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/sparc/kernel.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -83,7 +83,7 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
 <screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
@@ -93,7 +93,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/boot/sparc/silo-build.xml
===================================================================
--- trunk/BOOK/boot/sparc/silo-build.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/sparc/silo-build.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -40,7 +40,7 @@
     href="../../final-system/sparc/silo.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="ab"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="ab"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/boot/sparc/silo.xml
===================================================================
--- trunk/BOOK/boot/sparc/silo.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/sparc/silo.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -18,13 +18,13 @@
   <para os="a">This is for the configuration of <command>silo</command>, similar
   to what is in bootscripts.</para>
 
-<screen><userinput>cat > ${LFS}/etc/silo.conf << "EOF"
+<screen><userinput>cat > ${CLFS}/etc/silo.conf << "EOF"
 <literal># Begin /etc/silo.conf
 partition = 1         # Boot partition (= root partition)
 root = /dev/sda1      # Root partition
 timeout = 150         # Wait 15 seconds before booting the default section
 
-image = /boot/lfskernel-&linux-version;
+image = /boot/clfskernel-&linux-version;
   label = linux
 # End /etc/silo.conf</literal>
 EOF</userinput></screen>

Modified: trunk/BOOK/boot/sparc/sysvinit.xml
===================================================================
--- trunk/BOOK/boot/sparc/sysvinit.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/sparc/sysvinit.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -57,13 +57,13 @@
     </indexterm>
 
     <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="e-${LFS}/etc/inittab">${LFS}/etc/inittab</primary>
+      <primary sortas="e-${CLFS}/etc/inittab">${CLFS}/etc/inittab</primary>
     </indexterm>
 
-    <para>Create a new file <filename>${LFS}/etc/inittab</filename> by
+    <para>Create a new file <filename>${CLFS}/etc/inittab</filename> by
     running the following:</para>
 
-<screen><userinput>cat > ${LFS}/etc/inittab << "EOF"
+<screen><userinput>cat > ${CLFS}/etc/inittab << "EOF"
 <literal># Begin /etc/inittab
 
 id:3:initdefault:

Modified: trunk/BOOK/boot/sparc64/flags.xml
===================================================================
--- trunk/BOOK/boot/sparc64/flags.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/sparc64/flags.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -13,8 +13,8 @@
   <para>We will need to copy our BUILD Variables into our new system. So when
   we boot-up they will be there:</para>
 
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" >> ${LFS}/root/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" >> ${LFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ${LFS}/root/.bash_profile</userinput></screen>
+<screen><userinput>echo export BUILD32=\""${BUILD32}\"" >> ${CLFS}/root/.bash_profile
+echo export BUILD64=\""${BUILD64}\"" >> ${CLFS}/root/.bash_profile
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ${CLFS}/root/.bash_profile</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/boot/sparc64/kernel.xml
===================================================================
--- trunk/BOOK/boot/sparc64/kernel.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/sparc64/kernel.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -84,7 +84,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
-<screen><userinput>make INSTALL_MOD_PATH=${LFS} ARCH=sparc64 \
+<screen><userinput>make INSTALL_MOD_PATH=${CLFS} ARCH=sparc64 \
    CROSS_COMPILE=${CLFS_TARGET}- modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -95,7 +95,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/boot/sparc64-64/flags.xml
===================================================================
--- trunk/BOOK/boot/sparc64-64/flags.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/sparc64-64/flags.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -13,6 +13,6 @@
   <para>We will need to copy our BUILD Variables into our new system. So when
   we boot-up they will be there:</para>
 
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" >> ${LFS}/root/.bash_profile</userinput></screen>
+<screen><userinput>echo export BUILD64=\""${BUILD64}\"" >> ${CLFS}/root/.bash_profile</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/boot/sparc64-64/silo-build.xml
===================================================================
--- trunk/BOOK/boot/sparc64-64/silo-build.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/sparc64-64/silo-build.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -50,7 +50,7 @@
     href="../../final-system/sparc/silo.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="ac"><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${LFS}</userinput></screen>
+<screen os="ac"><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${CLFS}</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/boot/x86/grub-build.xml
===================================================================
--- trunk/BOOK/boot/x86/grub-build.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/x86/grub-build.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -53,15 +53,15 @@
     href="../../final-system/x86/grub.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="ab"><userinput>make DESTDIR=${LFS} install
-mkdir -v ${LFS}/boot/grub
-cp -v ${LFS}/usr/lib/grub/i386-pc/stage{1,2} ${LFS}/boot/grub</userinput></screen>
+<screen os="ab"><userinput>make DESTDIR=${CLFS} install
+mkdir -v ${CLFS}/boot/grub
+cp -v ${CLFS}/usr/lib/grub/i386-pc/stage{1,2} ${CLFS}/boot/grub</userinput></screen>
 
     <para os="ac">The <filename class="directory">i386-pc</filename> directory
     contains a number of <filename>*stage1_5</filename> files, different
     ones for different file systems. Review the files available and copy
     the appropriate ones to the <filename
-    class="directory">${LFS}/boot/grub</filename> directory. Most users will
+    class="directory">${CLFS}/boot/grub</filename> directory. Most users will
     copy the <filename>e2fs_stage1_5</filename> and/or
     <filename>reiserfs_stage1_5</filename> files.</para>
 

Modified: trunk/BOOK/boot/x86/grub.xml
===================================================================
--- trunk/BOOK/boot/x86/grub.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/x86/grub.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -23,8 +23,8 @@
   href="../../bootable/x86/grub.xml"
   xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>dd if=${LFS}/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
-dd if=${LFS}/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
+<screen os="d"><userinput>dd if=${CLFS}/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
+dd if=${CLFS}/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../bootable/x86/grub.xml"
@@ -63,7 +63,7 @@
   xpointer="xpointer(//*[@os='m'])"/>
 
   <para os="n">If all went well, GRUB will have reported finding its files
-  in <filename class="directory">${LFS}/boot/grub</filename>. That's
+  in <filename class="directory">${CLFS}/boot/grub</filename>. That's
   all there is to it. Quit the <command>grub</command> shell:</para>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -74,7 +74,7 @@
   href="../../bootable/x86/grub.xml"
   xpointer="xpointer(//*[@os='p'])"/>
 
-<screen><userinput>cat > ${LFS}/boot/grub/menu.lst << "EOF"
+<screen><userinput>cat > ${CLFS}/boot/grub/menu.lst << "EOF"
 <literal># Begin /boot/grub/menu.lst
 
 # By default boot the first menu entry.
@@ -89,14 +89,14 @@
 # The first entry is for CLFS.
 title CLFS &version;
 root (hd0,3)
-kernel /boot/lfskernel-&linux-version; root=/dev/hda4</literal>
+kernel /boot/clfskernel-&linux-version; root=/dev/hda4</literal>
 EOF</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../../bootable/x86/grub.xml"
   xpointer="xpointer(//*[@os='q'])"/>
 
-<screen os="r"><userinput>cat >> ${LFS}/boot/grub/menu.lst << "EOF"
+<screen os="r"><userinput>cat >> ${CLFS}/boot/grub/menu.lst << "EOF"
 <literal>title Red Hat
 root (hd0,2)
 kernel /boot/kernel-2.6.5 root=/dev/hda3

Modified: trunk/BOOK/boot/x86/kernel.xml
===================================================================
--- trunk/BOOK/boot/x86/kernel.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/x86/kernel.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -71,7 +71,7 @@
 <screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
 
     <para os="af">If the use of kernel modules can't be avoided, an
-    <filename>${LFS}/etc/modprobe.conf</filename> file may be needed.
+    <filename>${CLFS}/etc/modprobe.conf</filename> file may be needed.
     Information pertaining to modules and kernel configuration is
     located in the kernel documentation in the <filename
     class="directory">Documentation</filename> directory of the kernel
@@ -91,29 +91,29 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
 <screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
-    INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+    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>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v arch/i386/boot/bzImage ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v arch/i386/boot/bzImage ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen os="w1"><userinput>cp -v System.map ${LFS}/boot/System.map-&linux-version;</userinput></screen>
+<screen os="w1"><userinput>cp -v System.map ${CLFS}/boot/System.map-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../bootable/x86/kernel.xml"
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen os="x1"><userinput>cp -v .config ${LFS}/boot/config-&linux-version;</userinput></screen>
+<screen os="x1"><userinput>cp -v .config ${CLFS}/boot/config-&linux-version;</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/boot/x86_64/flags.xml
===================================================================
--- trunk/BOOK/boot/x86_64/flags.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/x86_64/flags.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -13,8 +13,8 @@
   <para>We will need to copy our BUILD Variables into our new system. So when
   we boot-up they will be there:</para>
 
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" >> ${LFS}/root/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" >> ${LFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ${LFS}/root/.bash_profile</userinput></screen>
+<screen><userinput>echo export BUILD32=\""${BUILD32}\"" >> ${CLFS}/root/.bash_profile
+echo export BUILD64=\""${BUILD64}\"" >> ${CLFS}/root/.bash_profile
+echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" >> ${CLFS}/root/.bash_profile</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/boot/x86_64/grub-build.xml
===================================================================
--- trunk/BOOK/boot/x86_64/grub-build.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/x86_64/grub-build.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -45,9 +45,9 @@
     href="../x86/grub-build.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="ab"><userinput>make DESTDIR=${LFS} install
-mkdir -v ${LFS}/boot/grub
-cp -v ${LFS}/usr/lib/grub/x86_64-pc/stage{1,2} ${LFS}/boot/grub</userinput></screen>
+<screen os="ab"><userinput>make DESTDIR=${CLFS} install
+mkdir -v ${CLFS}/boot/grub
+cp -v ${CLFS}/usr/lib/grub/x86_64-pc/stage{1,2} ${CLFS}/boot/grub</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/x86_64/grub.xml"
@@ -57,7 +57,7 @@
     directory contains a number of <filename>*stage1_5</filename>
     files, different ones for different file systems. Review the files
     available and copy the appropriate ones to the <filename
-    class="directory">${LFS}/boot/grub</filename> directory. Most
+    class="directory">${CLFS}/boot/grub</filename> directory. Most
     users will copy the <filename>e2fs_stage1_5</filename> and/or
     <filename>reiserfs_stage1_5</filename> files.</para>
 

Modified: trunk/BOOK/boot/x86_64/kernel.xml
===================================================================
--- trunk/BOOK/boot/x86_64/kernel.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/x86_64/kernel.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -87,7 +87,7 @@
     xpointer="xpointer(//*[@os='s'])"/>
 
 <screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${LFS} modules_install</userinput></screen>
+   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
@@ -97,7 +97,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v arch/x86_64/boot/bzImage ${LFS}/boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v arch/x86_64/boot/bzImage ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/boot/x86_64-64/flags.xml
===================================================================
--- trunk/BOOK/boot/x86_64-64/flags.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/x86_64-64/flags.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -13,6 +13,6 @@
   <para>We will need to copy our BUILD Variables into our new system. So when
   we boot-up they will be there:</para>
 
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" >> ${LFS}/root/.bash_profile</userinput></screen>
+<screen><userinput>echo export BUILD64=\""${BUILD64}\"" >> ${CLFS}/root/.bash_profile</userinput></screen>
 
 </sect1>

Modified: trunk/BOOK/boot/x86_64-64/lilo.xml
===================================================================
--- trunk/BOOK/boot/x86_64-64/lilo.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/boot/x86_64-64/lilo.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -53,7 +53,7 @@
   key layout.  For a British keyboard layout, the following command will
   achieve this:</para> 
 
-<screen os="f" role="nodump"><userinput>keytab-lilo.pl uk >i${LFS}/boot/uk.ktl</userinput></screen>
+<screen os="f" role="nodump"><userinput>keytab-lilo.pl uk >i${CLFS}/boot/uk.ktl</userinput></screen>
 
   <para os="g">The argument to the command is the name of the keymap, or if
     necessary you can specify the full path to the keymap.  Use whatever
@@ -61,7 +61,7 @@
 
   <para os="i">The next step is to create /etc/lilo.conf</para>
 
-<screen os="j" role="nodump"><userinput>cat > ${LFS}/etc/lilo.conf << "EOF"
+<screen os="j" role="nodump"><userinput>cat > ${CLFS}/etc/lilo.conf << "EOF"
 <literal># Begin /etc/lilo.conf
 # lilo.conf
 #
@@ -73,11 +73,11 @@
 prompt
 
 # set the name of the default image to boot
-default=lfs
+default=clfs
 
 # define an image
-image=/boot/lfskernel
-    label=lfs
+image=/boot/clfskernel
+    label=clfs
     root=/dev/<partition>
     read-only
 # optionally add parameters to pass, e.g.

Modified: trunk/BOOK/bootable/alpha/aboot.xml
===================================================================
--- trunk/BOOK/bootable/alpha/aboot.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/bootable/alpha/aboot.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -20,7 +20,7 @@
 
 <screen><userinput>cat > /etc/aboot.conf << "EOF"
 <literal># Begin /etc/aboot.conf
-0:1/boot/lfskernel-&linux-version; root=/dev/sda1
+0:1/boot/clfskernel-&linux-version; root=/dev/sda1
 # End /etc/aboot.conf</literal>
 EOF</userinput></screen>
 

Modified: trunk/BOOK/bootable/alpha/kernel.xml
===================================================================
--- trunk/BOOK/bootable/alpha/kernel.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/bootable/alpha/kernel.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -109,7 +109,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/ppc/kernel.xml
===================================================================
--- trunk/BOOK/bootable/ppc/kernel.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/bootable/ppc/kernel.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -112,7 +112,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/ppc/yaboot.xml
===================================================================
--- trunk/BOOK/bootable/ppc/yaboot.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/bootable/ppc/yaboot.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -60,7 +60,7 @@
   to the image(s), such as
   <filename class="devicefile">device=/ht at 0,f2000000/pci at 3/k2-sata-root at c/k2-sata at 0/disk at 0:
   </filename> for the disk, and
-  <filename class="partition">image=/ht at 0,f2000000/pci at 3/k2-sata-root at c/k2-sata at 0/disk at 0:9,/boot/lfskernel-&linux-version;
+  <filename class="partition">image=/ht at 0,f2000000/pci at 3/k2-sata-root at c/k2-sata at 0/disk at 0:9,/boot/clfskernel-&linux-version;
   </filename> which definitely works.</para>
 
   <para os="k">Create a <quote>yaboot.conf</quote> file defining yaboot's boot
@@ -110,7 +110,7 @@
 # For all images, the pathname is relative to the filesystem
 # on which they are situated and can include at most one
 # directory
-image=/boot/lfskernel-&linux-version;
+image=/boot/clfskernel-&linux-version;
     label=&version;
     read-only</literal>
 EOF</userinput></screen>

Modified: trunk/BOOK/bootable/ppc64/kernel.xml
===================================================================
--- trunk/BOOK/bootable/ppc64/kernel.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/bootable/ppc64/kernel.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -105,7 +105,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/sparc/kernel.xml
===================================================================
--- trunk/BOOK/bootable/sparc/kernel.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/bootable/sparc/kernel.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -105,7 +105,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/sparc/silo.xml
===================================================================
--- trunk/BOOK/bootable/sparc/silo.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/bootable/sparc/silo.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -24,7 +24,7 @@
 root = /dev/sda1      # Root partition
 timeout = 150         # Wait 15 seconds before booting the default section
 
-image = /boot/lfskernel-&linux-version;
+image = /boot/clfskernel-&linux-version;
   label = linux
 # End /etc/silo.conf</literal>
 EOF</userinput></screen>

Modified: trunk/BOOK/bootable/x86/grub.xml
===================================================================
--- trunk/BOOK/bootable/x86/grub.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/bootable/x86/grub.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -103,7 +103,7 @@
 # The first entry is for CLFS.
 title CLFS &version;
 root (hd0,3)
-kernel /boot/lfskernel-&linux-version; root=/dev/hda4</literal>
+kernel /boot/clfskernel-&linux-version; root=/dev/hda4</literal>
 EOF</userinput></screen>
 
 

Modified: trunk/BOOK/bootable/x86/kernel.xml
===================================================================
--- trunk/BOOK/bootable/x86/kernel.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/bootable/x86/kernel.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -104,7 +104,7 @@
 
     <para os="v">Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp arch/i386/boot/bzImage /boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp arch/i386/boot/bzImage /boot/clfskernel-&linux-version;</userinput></screen>
 
     <para os="w"><filename>System.map</filename> is a symbol file for the kernel.
     It maps the function entry points of every function in the kernel API,
@@ -163,7 +163,7 @@
       <segtitle>Installed files</segtitle>
 
       <seglistitem>
-        <seg>config-[linux-version], lfskernel-[linux-version],
+        <seg>config-[linux-version], clfskernel-[linux-version],
         and System.map-[linux-version]</seg>
       </seglistitem>
     </segmentedlist>
@@ -183,8 +183,8 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="lfskernel">
-        <term><filename>lfskernel-[linux-version]</filename></term>
+      <varlistentry id="clfskernel">
+        <term><filename>clfskernel-[linux-version]</filename></term>
         <listitem>
           <para>The engine of the Linux system. When turning on the
           computer, the kernel is the first part of the operating system
@@ -193,8 +193,8 @@
           as a tree of files to the software and turns a single CPU into
           a multitasking machine capable of running scores of programs
           seemingly at the same time.</para>
-          <indexterm zone="ch-bootable-kernel lfskernel">
-            <primary sortas="b-lfskernel">lfskernel-[linux-version]</primary>
+          <indexterm zone="ch-bootable-kernel clfskernel">
+            <primary sortas="b-clfskernel">clfskernel-[linux-version]</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/bootable/x86_64/kernel.xml
===================================================================
--- trunk/BOOK/bootable/x86_64/kernel.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/bootable/x86_64/kernel.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -105,7 +105,7 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp arch/x86_64/boot/bzImage /boot/lfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp arch/x86_64/boot/bzImage /boot/clfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"

Modified: trunk/BOOK/bootable/x86_64-64/lilo.xml
===================================================================
--- trunk/BOOK/bootable/x86_64-64/lilo.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/bootable/x86_64-64/lilo.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -59,7 +59,7 @@
       or if necessary you can specify the full path to the keymap.  Use
       whatever is appropriate for your keyboard.</para>
 
-    <para os="h">When the x86 LFS book used to include Lilo, it
+    <para os="h">When the x86 CLFS book used to include Lilo, it
     advised against running it from chroot in case the MBR became
     corrupted. Provided you have /proc mounted and have device special
     files for the disks, it seems to be safe to run recent versions of
@@ -81,11 +81,11 @@
 prompt
 
 # set the name of the default image to boot
-default=lfs
+default=clfs
 
 # define an image
-image=/boot/lfskernel
-    label=lfs
+image=/boot/clfskernel
+    label=clfs
     root=/dev/<partition>
     read-only
 # optionally add parameters to pass, e.g.

Modified: trunk/BOOK/cross-tools/common/introduction.xml
===================================================================
--- trunk/BOOK/cross-tools/common/introduction.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/cross-tools/common/introduction.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -13,7 +13,7 @@
   <para>This chapter shows you how to create cross platform tools.</para>
 
   <para>If for some reason you have to stop and come back later, remember
-  to use the <command>su - lfs</command> command, and it will setup the
+  to use the <command>su - clfs</command> command, and it will setup the
   build environment that you left.</para>
 
   <sect2>
@@ -21,7 +21,7 @@
 
     <important>
       <para>Before issuing the build instructions for a package, the package
-      should be unpacked as user <systemitem class="username">lfs</systemitem>,
+      should be unpacked as user <systemitem class="username">clfs</systemitem>,
       and a <command>cd</command> into the created directory should be
       performed. The build instructions assume that the <command>bash</command>
       shell is in use.</para>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/general.ent	2006-07-02 07:14:21 UTC (rev 1882)
@@ -31,7 +31,7 @@
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
 <!ENTITY clfs-root "http:/trac.cross-lfs.org/">
 <!ENTITY blfs-root "&lfs-root;blfs/">
-<!ENTITY faq-root "&lfs-root;faq/">
+<!ENTITY faq-root "&clfs-root;/wiki/faq">
 <!ENTITY hints-root "&lfs-root;hints/downloads/files/">
 <!ENTITY hints-index "&lfs-root;hints/list.html">
 <!ENTITY livecd-root "&lfs-root;livecd/">

Modified: trunk/BOOK/introduction/common/askforhelp.xml
===================================================================
--- trunk/BOOK/introduction/common/askforhelp.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/introduction/common/askforhelp.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -17,10 +17,7 @@
   following hint will give you some guidance for troubleshooting:
   <ulink url="&hints-root;errors.txt"/>.</para>
 
-  <para>If you cannot find your problem listed in the FAQ, search the mailing
-  lists at <ulink url="&lfs-root;search.html"/>.</para>
-
-  <para>We also have a wonderful LFS community that is willing to offer
+  <para>We also have a wonderful CLFS community that is willing to offer
   assistance through the mailing lists and IRC (see the <xref
   linkend="ch-intro-resources"/> section of this book). However, we
   get several support questions everyday and many of them can be easily
@@ -46,6 +43,9 @@
         create CLFS</para>
       </listitem>
       <listitem>
+        <para>The architecture of the target and host.</para>
+      </listitem>
+      <listitem>
         <para>The package or section the problem was encountered in</para>
       </listitem>
       <listitem>
@@ -58,7 +58,7 @@
 
     <note>
       <para>Deviating from this book does <emphasis>not</emphasis>
-      mean that we will not help you. After all, the LFS project is
+      mean that we will not help you. After all, the CLFS project is
       about personal preference. Being upfront about any changes to
       the established procedure helps us evaluate and determine
       possible causes of your problem.</para>
@@ -88,23 +88,23 @@
     information. Below is an example of the type of information to include
     from the screen output from <command>make</command>:</para>
 
-<screen><computeroutput>gcc -DALIASPATH=\"/mnt/lfs/usr/share/locale:.\"
--DLOCALEDIR=\"/mnt/lfs/usr/share/locale\"
--DLIBDIR=\"/mnt/lfs/usr/lib\"
--DINCLUDEDIR=\"/mnt/lfs/usr/include\" -DHAVE_CONFIG_H -I. -I.
+<screen><computeroutput>gcc -DALIASPATH=\"/mnt/clfs/usr/share/locale:.\"
+-DLOCALEDIR=\"/mnt/clfs/usr/share/locale\"
+-DLIBDIR=\"/mnt/clfs/usr/lib\"
+-DINCLUDEDIR=\"/mnt/clfs/usr/include\" -DHAVE_CONFIG_H -I. -I.
 -g -O2 -c getopt1.c
 gcc -g -O2 -static -o make ar.o arscan.o commands.o dir.o
 expand.o file.o function.o getopt.o implicit.o job.o main.o
 misc.o read.o remake.o rule.o signame.o variable.o vpath.o
 default.o remote-stub.o version.o opt1.o
 -lutil job.o: In function `load_too_high':
-/lfs/tmp/make-3.79.1/job.c:1565: undefined reference
+/clfs/tmp/make-3.79.1/job.c:1565: undefined reference
 to `getloadavg'
 collect2: ld returned 1 exit status
 make[2]: *** [make] Error 1
-make[2]: Leaving directory `/lfs/tmp/make-3.79.1'
+make[2]: Leaving directory `/clfs/tmp/make-3.79.1'
 make[1]: *** [all-recursive] Error 1
-make[1]: Leaving directory `/lfs/tmp/make-3.79.1'
+make[1]: Leaving directory `/clfs/tmp/make-3.79.1'
 make: *** [all-recursive-am] Error 2</computeroutput></screen>
 
     <para>In this case, many people would just include the bottom

Modified: trunk/BOOK/introduction/common/resources.xml
===================================================================
--- trunk/BOOK/introduction/common/resources.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/introduction/common/resources.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -23,26 +23,30 @@
   <sect2 id="ch-intro-maillists" xreflabel="Chapter 1 - Mailing Lists">
     <title>Mailing Lists</title>
 
-    <para>The <uri>linuxfromscratch.org</uri> server hosts a number of
-    mailing lists used for the development of the LFS project. These lists
+    <para>The <uri>cross-lfs.org</uri> server hosts a number of
+    mailing lists used for the development of the CLFS project. These lists
     include the main development and support lists, among others. If the
-    FAQ does not solve the problem you are having, the next step would be to
-    search the mailing lists at <ulink url="&lfs-root;search.html"/>.</para>
+    FAQ does not contain your answer, you can search the CLFS lists via
+    The Mail Archive <ulink url="http://www.mail-archive.com"/>. You can
+    find the mail lists with the following link:</para>
 
+    <para><ulink url="http://www.mail-archive.com/index.php?hunt=clfs"/></para>
+   
     <para>For information on the different lists, how to subscribe, archive
-    locations, and additional information, visit
-    <ulink url="&lfs-root;mail.html"/>. For mailing lists specifically
-    for CLFS, visit <ulink url="&clfs-root;wiki/lists"/>.</para>
+    locations, and additional information, visit <ulink url="&clfs-root;wiki/lists"/>.</para>
 
   </sect2>
 
   <sect2 id="ch-intro-newsserver">
     <title>News Server</title>
 
-    <para> The Linux From Scratch News Server is no longer available.
-    Please use the other support methods listed on this page
-    </para>
+    <para>Cross-LFS does not maintain it's own News Server, but we do provide
+    access via <uri>gmane.org</uri> <ulink url="http://gmane.org"/>. If you want to subscribe
+    to the Cross-LFS via a newsreader you can utilize <uri>gmane.org</uri>.
+    You can find the game search for CLFS with the following link:</para>
 
+   <para><ulink url="http://dir.gmane.org/search.php?match=clfs"/></para>
+
   </sect2>
 
   <sect2 id="ch-intro-irc">
@@ -52,7 +56,7 @@
     community Internet Relay Chat (IRC) network. Before using this support,
     please make sure that your question is not already answered in the LFS
     FAQ or the mailing list archives. You can find the IRC network at
-    <uri>irc.linuxfromscratch.org</uri>. The support channel for cross-lfs is
+    <uri>chat.freenode.net</uri>. The support channel for cross-lfs is
     named #cross-lfs. For support on the standard LFS the support channel
     is named #lfs-support. If you need to show people the output of your
     problems, please use http://pastebin.cross-lfs.org and reference
@@ -60,32 +64,21 @@
 
   </sect2>
 
-  <sect2 id="ch-intro-references">
-    <title>References</title>
-
-    <para>For additional information on the packages, useful tips are
-    available in the LFS Package Reference page located at <ulink
-    url="&lfs-root;~matthew/LFS-references.html"/>.</para>
-
-  </sect2>
-
   <sect2 id="ch-intro-mirrors" xreflabel="Chapter 1 - Mirror sites">
     <title>Mirror Sites</title>
 
-    <para>The LFS project has a number of world-wide mirrors to make
+    <para>The CLFS project has a number of world-wide mirrors to make
     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 of
-    the LFS website, or <ulink url="&clfs-root;wiki/mirrors"/> for
-    mirrors of CLFS.</para>
+    convenient. Please visit the CLFS website at
+    <ulink url="&clfs-root;wiki/mirrors"/> for mirrors of CLFS.</para>
 
   </sect2>
 
   <sect2 id="ch-intro-contactinfo">
     <title>Contact Information</title>
 
-    <para>Please direct all your questions and comments to one of the LFS
-    or CLFS mailing lists (see above).</para>
+    <para>Please direct all your questions and comments to the
+    CLFS mailing lists (see above).</para>
 
   </sect2>
 

Modified: trunk/BOOK/materials/common/introduction.xml
===================================================================
--- trunk/BOOK/materials/common/introduction.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/materials/common/introduction.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -24,7 +24,7 @@
   url="http://www.google.com/"/>) provides a useful search engine for
   most packages. If this search is unsuccessful, try one of the
   alternative means of downloading discussed at <ulink
-  url="&lfs-root;lfs/packages.html"/>.</para>
+  url="&cfs-root;wiki/download"/>.</para>
 
   <para>Downloaded packages and patches will need to be stored somewhere
   that is conveniently available throughout the entire build. A working

Modified: trunk/BOOK/temp-system/common/introduction.xml
===================================================================
--- trunk/BOOK/temp-system/common/introduction.xml	2006-07-02 07:14:13 UTC (rev 1881)
+++ trunk/BOOK/temp-system/common/introduction.xml	2006-07-02 07:14:21 UTC (rev 1882)
@@ -24,13 +24,13 @@
   Since the packages compiled here are temporary, we do not want them to
   pollute the soon-to-be CLFS system.</para>
 
-  <para>Check one last time that the <envar>LFS</envar> environment
+  <para>Check one last time that the <envar>CLFS</envar> environment
   variable is set up properly:</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>, using
+  point, which is <filename class="directory">/mnt/clfs</filename>, using
   our example.</para>
 
   <para>During this section of the build you will see several WARNING




More information about the cross-lfs mailing list