Index: BOOK/boot/64/e2fsprogs.xml
===================================================================
--- BOOK/boot/64/e2fsprogs.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/boot/64/e2fsprogs.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -65,4 +65,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='ad'])"/>
 
Index: BOOK/boot/common/e2fsprogs.xml
===================================================================
--- BOOK/boot/common/e2fsprogs.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/boot/common/e2fsprogs.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -39,5 +39,5 @@
     --host=${LFS_TARGET}</userinput></screen>
 
-    <variablelist os="ab">
+    <variablelist os="e">
       <title>The meaning of the configure options:</title>
 
@@ -51,8 +51,4 @@
 
     </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
 
 <screen os="ac"><userinput>make</userinput></screen>
@@ -73,4 +69,8 @@
     href="../../final-system/common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
 
     <para os="ad">Create needed symlinks for a bootable system:</para>
Index: BOOK/boot/common/introduction.xml
===================================================================
--- BOOK/boot/common/introduction.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/boot/common/introduction.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -11,7 +11,7 @@
   <title>Introduction</title>
 
-  <para>This chapter shows how to complete the temporaly tools to create
+  <para>This chapter shows how to complete the temporary tools to create
   a minimal system that will be used to boot the target machine and to build
-  them the final system packages.</para>
+  the final system packages.</para>
 
 </sect1>
Index: BOOK/boot/common/module-init-tools.xml
===================================================================
--- BOOK/boot/common/module-init-tools.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/boot/common/module-init-tools.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -31,8 +31,4 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
 <screen os="d"><userinput>./configure --prefix=/ \
    --host=${LFS_TARGET}</userinput></screen>
Index: BOOK/boot/common/util-linux.xml
===================================================================
--- BOOK/boot/common/util-linux.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/boot/common/util-linux.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -70,7 +70,11 @@
       <title>The meaning of the make parameters:</title>
 
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../../final-system/common/util-linux.xml"
-      xpointer="xpointer(//*[@os='e1'])"/>
+      <varlistentry>
+        <term><parameter>HAVE_KILL=yes</parameter></term>
+        <listitem>
+          <para>This prevents the <command>kill</command> program 
+          from being built.</para>
+        </listitem>
+      </varlistentry>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/mips/module-init-tools.xml
===================================================================
--- BOOK/boot/mips/module-init-tools.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/boot/mips/module-init-tools.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -40,8 +40,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
     xpointer="xpointer(//*[@os='d'])"/>
Index: BOOK/boot/mips64/module-init-tools.xml
===================================================================
--- BOOK/boot/mips64/module-init-tools.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/boot/mips64/module-init-tools.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -40,8 +40,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/module-init-tools.xml"
     xpointer="xpointer(//*[@os='d'])"/>
Index: BOOK/boot/multilib/e2fsprogs.xml
===================================================================
--- BOOK/boot/multilib/e2fsprogs.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/boot/multilib/e2fsprogs.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -48,8 +48,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
@@ -74,4 +70,8 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='ad'])"/>
 
Index: BOOK/boot/multilib/module-init-tools.xml
===================================================================
--- BOOK/boot/multilib/module-init-tools.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/boot/multilib/module-init-tools.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -31,8 +31,4 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
 <screen os="d"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/ \
    --host=${LFS_TARGET}</userinput></screen>
Index: BOOK/boot/x86/kernel.xml
===================================================================
--- BOOK/boot/x86/kernel.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/boot/x86/kernel.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -24,5 +24,5 @@
 
     <warning os="aa">
-      <para>Here a temporaly cross-compiled kernel will be builded. When
+      <para>Here a temporary cross-compiled kernel will be built. When
       configuring it, select the minimal amount of options required to can
       boot the target machine and build the final system. I.e., not support
@@ -49,5 +49,5 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-    <para os="ab">If your keyboard isn't an US one, you may whant to build
+    <para os="ab">If your keyboard isn't an US one, you may want to build
     the proper keymap for your keyboard layout inside the kernel. Do it by
     running the following command:</para>
Index: BOOK/boot/x86_64-64/grub-build.xml
===================================================================
--- BOOK/boot/x86_64-64/grub-build.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/boot/x86_64-64/grub-build.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -66,10 +66,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
+    href="../x86_64/grub-build.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
+    href="../x86_64/grub-build.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
Index: BOOK/boot/x86_64/grub-build.xml
===================================================================
--- BOOK/boot/x86_64/grub-build.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/boot/x86_64/grub-build.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -51,10 +51,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
+    href="../../final-system/x86_64/grub.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
+    href="../../final-system/x86_64/grub.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
Index: BOOK/boot/x86_64/kernel.xml
===================================================================
--- BOOK/boot/x86_64/kernel.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/boot/x86_64/kernel.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -32,5 +32,5 @@
 
     <para os="t1">To ensure that your system boots and you can properly run both
-    32bit and 64bit binaries, Please make sure that you enable support for
+    32 bits and 64 bits binaries, please make sure that you enable support for
     ELF and emulations for 32bit ELF into the kernel.</para>
 
Index: BOOK/cross-tools/common/binutils.xml
===================================================================
--- BOOK/cross-tools/common/binutils.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/cross-tools/common/binutils.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -59,5 +59,5 @@
         <term><parameter>--host=${LFS_HOST}</parameter></term>
         <listitem>
-          <para>When used injunction with --target, this creates a cross-architecture
+          <para>When used with --target, this creates a cross-architecture
           executable that creates files for ${LFS_TARGET} but runs on ${LFS_HOST).</para>
         </listitem>
@@ -67,5 +67,5 @@
         <term><parameter>--target=${LFS_TARGET}</parameter></term>
         <listitem>
-          <para>When used injunction with --host, this creates a cross-architecture
+          <para>When used with --host, this creates a cross-architecture
           executable that creates files for ${LFS_TARGET} but runs on ${LFS_HOST).</para>
         </listitem>
Index: BOOK/cross-tools/common/glibc.xml
===================================================================
--- BOOK/cross-tools/common/glibc.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/cross-tools/common/glibc.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -89,5 +89,5 @@
         <term><parameter>AR="${LFS_TARGET}-ar"</parameter></term>
         <listitem>
-          <para>This forces GLIBC to use the AR utilitythat we made for our target
+          <para>This forces GLIBC to use the AR utility we made for our target
           architecture.</para>
         </listitem>
Index: BOOK/cross-tools/common/variables-multilib.xml
===================================================================
--- BOOK/cross-tools/common/variables-multilib.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/cross-tools/common/variables-multilib.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -14,148 +14,73 @@
   architecture tools</bridgehead>
 
-  <para>This method is recommended for all LiveCD based distro's.</para>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../common/variables.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
 
-  <para>During the building of the cross-compile tools you will need to
-  set a few variables that will be dependent on your particular needs.
-  The first variable will be the triplet of the <envar>HOST</envar> machine.
-  You will need to set the <envar>CHOST</envar> triplet to match your
-  particular needs. To set this information you can issue the following
-  command:</para>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../common/variables.xml"
+     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>export LFS_HOST="${MACHTYPE}"</userinput></screen>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../common/variables.xml"
+     xpointer="xpointer(//*[@os='c'])"/>
 
-  <para>Now you will need to set the target triplet for the target
-  architecure. You can do this by running the same command as above, just
-  running it on the target machine. If you can't run the command on the
-  target machine, you can use the table at the bottom of this page. Set
-  the command using the method listed below:</para>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../common/variables.xml"
+     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>export LFS_TARGET="{target triplet}"</userinput></screen>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../common/variables.xml"
+     xpointer="xpointer(//*[@os='e'])"/>
 
   <bridgehead renderas="sect4">Configuration # 2 - Creating same
   architecture tools</bridgehead>
 
-  <para>You can also create <quote>clean</quote> tools on your current
-  distro. This will ensure that you have all the prerequisites for the
-  LFS build.</para>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../common/variables.xml"
+     xpointer="xpointer(//*[@os='f'])"/>
+	
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../common/variables.xml"
+     xpointer="xpointer(//*[@os='g'])"/>
 
-  <para>You will need to set your host target triplet a little differently.
-  To set this information you can issue the following commands:</para>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../common/variables.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>export LFS_HOST="`echo ${MACHTYPE} | sed -e 's/unknown/cross/g' -e 's/-pc-/-cross-/g'`"</userinput></screen>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../common/variables.xml"
+     xpointer="xpointer(//*[@os='i'])"/>
 
-  <para>Now you will need to set the target triplet for the target, which
-  in this case is very simple. Set the command using the method listed
-  below:</para>
-
-<screen><userinput>export LFS_TARGET="${MACHTYPE}"</userinput></screen>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../common/variables.xml"
+     xpointer="xpointer(//*[@os='j'])"/>
 
   <bridgehead renderas="sect4">Sanity Check</bridgehead>
 
-  <para>Let's perform a sanity check to prevent build issues. If our LFS_HOST matches our
-  target, we will get some failures during our cross-compile:</para>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../common/variables.xml"
+     xpointer="xpointer(//*[@os='k'])"/>
 
-<screen><userinput>if [ "${LFS_HOST}" = "${LFS_TARGET}" ]; then \
-  echo "Host and Target can't be the same. Use the Other Configuration Method" ; fi</userinput></screen>
- 
-  <para>If you received an message, "Host and Target can't be the same."
-  You will need to use the other Configuration Method. This will prevent build
-  issues during the early phases of the build.</para>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../common/variables.xml"
+     xpointer="xpointer(//*[@os='l'])"/>
+
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../common/variables.xml"
+     xpointer="xpointer(//*[@os='m'])"/>
 
   <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
 
-  <para>Now we will add these to <filename>~/.bashrc</filename>, just in
-  case you have to exit and restart building later:</para>
+  <para os="n">Now we will add ${LFS_TARGET} to <filename>~/.bashrc</filename>, just in
+  case you have to exit and restart building later: We will add ${LFS_HOST} after
+  it performs another sanity check in the next section</para>
 
-<screen><userinput>echo export LFS_TARGET=\""${LFS_TARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+<screen os="o"><userinput>echo export LFS_TARGET=\""${LFS_TARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
 
-
-  <table>
-    <title>List of architectures, target triplets, and recommended book</title>
-    <tgroup cols="2" align="center">
-      <colspec colname="Processor"/>
-      <colspec colname="Triplet"/>
-      <colspec colname="Book"/>
-      <thead>
-        <row>
-          <entry>Architecture</entry>
-          <entry>Target Triplet</entry>
-          <entry>32 Bit, 64 Bit, 32/64 Bit</entry>
-        </row>
-      </thead>
-      <tbody>
-        <row>
-          <entry>Pentium, K6, 586 Compatibles</entry>
-          <entry>i586-pc-linux-gnu</entry>
-          <entry>32 Bit</entry>
-        </row>
-        <row>
-          <entry>Pentium II, Pentium III, Pentium 4</entry>
-          <entry>i686-pc-linux-gnu</entry>
-          <entry>32 Bit</entry>
-        </row>
-        <row>
-          <entry>Athlon, Duron</entry>
-          <entry>i686-pc-linux-gnu</entry>
-          <entry>32 Bit</entry>
-        </row>
-        <row>
-          <entry>Athlon64</entry>
-          <entry>x86_64-pc-linux-gnu</entry>
-          <entry>32/64 Bit</entry>
-        </row>
-        <row>
-          <entry>PowerPC</entry>
-          <entry>powerpc-unknown-linux-gnu</entry>
-          <entry>32 Bit</entry>
-        </row>
-        <row>
-          <entry>PowerPC64</entry>
-          <entry>ppc64-unknown-linux-gnu</entry>
-          <entry>64 Bit</entry>
-        </row>
-        <row>
-          <entry>MIPS</entry>
-          <entry>mips-unknown-linux-gnu</entry>
-          <entry>32 Bit</entry>
-        </row>
-        <row>
-          <entry>MIPS Little Endian</entry>
-          <entry>mipsel-unknown-linux-gnu</entry>
-          <entry>32 Bit</entry>
-        </row>
-        <row>
-          <entry>MIPS 64</entry>
-          <entry>mips64-unknown-linux-gnu</entry>
-          <entry>64 Bit</entry>
-        </row>
-        <row>
-          <entry>MIPS 64 Little Endian</entry>
-          <entry>mips64el-unknown-linux-gnu</entry>
-          <entry>64 Bit</entry>
-        </row>
-        <row>
-          <entry>Cypress</entry>
-          <entry>sparc-unknown-linux-gnu</entry>
-          <entry>32 Bit</entry>
-        </row>
-        <row>
-          <entry>Supersparc and Hypersparc</entry>
-          <entry>sparc-unknown-linux-gnu</entry>
-          <entry>32 Bit</entry>
-        </row>
-        <row>
-          <entry>Ultrasparc</entry>
-          <entry>sparc64-unknown-linux-gnu</entry>
-          <entry>32/64 Bit</entry>
-        </row>
-        <row>
-          <entry>Alpha</entry>
-          <entry>alpha-unknown-linux-gnu</entry>
-          <entry>64 Bit</entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </table>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../common/variables.xml"
+     xpointer="xpointer(//*[@os='p'])"/>
 
 </sect1>
+
Index: BOOK/cross-tools/common/variables.xml
===================================================================
--- BOOK/cross-tools/common/variables.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/cross-tools/common/variables.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -14,7 +14,7 @@
   architecture tools</bridgehead>
 
-  <para>This method is recommended for all LiveCD based distro's.</para>
+  <para os="a">This method is recommended for all LiveCD based distro's.</para>
 
-  <para>During the building of the cross-compile tools you will need to
+  <para os="b">During the building of the cross-compile tools you will need to
   set a few variables that will be dependent on your particular needs.
   The first variable will be the triplet of the <envar>HOST</envar> machine.
@@ -23,41 +23,41 @@
   command:</para>
 
-<screen><userinput>export LFS_HOST="${MACHTYPE}"</userinput></screen>
+<screen os="c"><userinput>export LFS_HOST="${MACHTYPE}"</userinput></screen>
 
-  <para>Now you will need to set the target triplet for the target
-  architecure. You can do this by running the same command as above, just
+  <para os="d">Now you will need to set the target triplet for the target
+  architecture. You can do this by running the same command as above, just
   running it on the target machine. If you can't run the command on the
   target machine, you can use the table at the bottom of this page. Set
   the command using the method listed below:</para>
 
-<screen><userinput>export LFS_TARGET="{target triplet}"</userinput></screen>
+<screen os="e"><userinput>export LFS_TARGET="{target triplet}"</userinput></screen>
 
   <bridgehead renderas="sect4">Configuration # 2 - Creating same
   architecture tools</bridgehead>
 
-  <para>You can also create <quote>clean</quote> tools on your current
+  <para os="f">You can also create <quote>clean</quote> tools on your current
   distro. This will ensure that you have all the prerequisites for the
   LFS build.</para>
 
-  <para>You will need to set your host target triplet a little differently.
+  <para os="g">You will need to set your host target triplet a little differently.
   To set this information you can issue the following commands:</para>
 
-<screen><userinput>export LFS_HOST="`echo ${MACHTYPE} | sed -e 's/unknown/cross/g' -e 's/-pc-/-cross-/g'`"</userinput></screen>
+<screen os="h"><userinput>export LFS_HOST="`echo ${MACHTYPE} | sed -e 's/unknown/cross/g' -e 's/-pc-/-cross-/g'`"</userinput></screen>
 
-  <para>Now you will need to set the target triplet for the target, which
+  <para os="i">Now you will need to set the target triplet for the target, which
   in this case is very simple. Set the command using the method listed
   below:</para>
 
-<screen><userinput>export LFS_TARGET="${MACHTYPE}"</userinput></screen>
+<screen os="j"><userinput>export LFS_TARGET="${MACHTYPE}"</userinput></screen>
 
   <bridgehead renderas="sect4">Sanity Check</bridgehead>
 
-  <para>Let's perform a sanity check to prevent build issues. If our LFS_HOST matches our
+  <para os="k">Let's perform a sanity check to prevent build issues. If our LFS_HOST matches our
   target, we will get some failures during our cross-compile:</para>
 
-<screen><userinput>if [ "${LFS_HOST}" = "${LFS_TARGET}" ]; then \
+<screen os="l"><userinput>if [ "${LFS_HOST}" = "${LFS_TARGET}" ]; then \
   echo "Host and Target can't be the same." ; fi</userinput></screen>
  
-  <para>If you received an message, "Host and Target can't be the same."
+  <para os="m">If you received an message, "Host and Target can't be the same."
   You will need to use the other Configuration Method. This will prevent build
   issues during the early phases of the build.</para>
@@ -65,11 +65,11 @@
   <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
 
-  <para>Now we will add these to <filename>~/.bashrc</filename>, just in
+  <para os="n">Now we will add these to <filename>~/.bashrc</filename>, just in
   case you have to exit and restart building later:</para>
 
-<screen><userinput>echo export LFS_HOST=\""${LFS_HOST}\"" &gt;&gt; ~/.bashrc
+<screen os="o"><userinput>echo export LFS_HOST=\""${LFS_HOST}\"" &gt;&gt; ~/.bashrc
 echo export LFS_TARGET=\""${LFS_TARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
 
-  <table>
+  <table os="p">
     <title>List of architectures, target triplets, and recommended book</title>
     <tgroup cols="2" align="center">
Index: BOOK/cross-tools/mips64-64/flags.xml
===================================================================
--- BOOK/cross-tools/mips64-64/flags.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/cross-tools/mips64-64/flags.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -11,13 +11,17 @@
   <title>Build Flags</title>
 
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86_64-64/flags.xml"
+   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>export BUILD64="-mabi=64"</userinput></screen>
+<screen os="b"><userinput>export BUILD64="-mabi=64"</userinput></screen>
 
-  <para>Lets add the build flags to <filename>~/.bashrc</filename> to
-  prevent issues if we stop and come back later.</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86_64-64/flags.xml"
+   xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86_64-64/flags.xml"
+   xpointer="xpointer(//*[@os='d'])"/>
 
 </sect1>
Index: BOOK/cross-tools/mips64/flags.xml
===================================================================
--- BOOK/cross-tools/mips64/flags.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/cross-tools/mips64/flags.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -11,27 +11,39 @@
   <title>Build Flags</title>
 
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../x86_64/flags.xml"
+     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>export BUILD32="-mabi=32"
+<screen os="b"><userinput>export BUILD32="-mabi=32"
 export BUILDN32="-mabi=n32"
 export BUILD64="-mabi=64"</userinput></screen>
 
-  <para>You will need to set your host target triplet for o32 bit:</para>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../x86_64/flags.xml"
+     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>export LFS_TARGET32="`echo ${LFS_TARGET}| sed -e 's/64//g'`"</userinput></screen>
+<screen os="d"><userinput>export LFS_TARGET32="`echo ${LFS_TARGET}| sed -e 's/64//g'`"</userinput></screen>
 
-<screen><userinput>if [ "${LFS_HOST}" = "${LFS_TARGET32}" ]; then \
-  echo "Host and Target can't be the same." ; fi</userinput></screen>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../x86_64/flags.xml"
+     xpointer="xpointer(//*[@os='e'])"/>
 
-  <para>If the above test gave you "Host and Target can't be the same", you will need to change your LFS_HOST to a
-  a different target triplet:</para>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../x86_64/flags.xml"
+     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>export LFS_HOST="`echo ${MACHTYPE} | sed -e 's/unknown/cross/g' -e 's/-pc-/-cross-/g'`"</userinput></screen>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../x86_64/flags.xml"
+     xpointer="xpointer(//*[@os='g'])"/>
 
-  <para>Lets add the build flags to <filename>~/.bashrc</filename> to
-  prevent issues if we stop and come back later.</para>
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../x86_64/flags.xml"
+     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bashrc
+     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+     href="../x86_64/flags.xml"
+     xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bashrc
 echo export BUILDN32=\""${BUILDN32}\"" &gt;&gt; ~/.bashrc
 echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc
Index: BOOK/cross-tools/multilib/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc-64bit.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/cross-tools/multilib/glibc-64bit.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -83,5 +83,5 @@
         <term><parameter>--libdir=/tools/lib64</parameter></term>
         <listitem>
-          <para>Puts GLIBC into a /tools/lib64 instead of /tools/lib.</para>
+          <para>Puts GLIBC into /tools/lib64 instead of /tools/lib.</para>
         </listitem>
       </varlistentry>
Index: BOOK/cross-tools/sparc64-64/flags.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/flags.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/cross-tools/sparc64-64/flags.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -10,21 +10,22 @@
   <?dbhtml filename="flags.html"?>
 
-  <para>We will need to setup target specific flags for the compiler
-  and linkers. You can choose the appropriate BUILD32 and BUILD64
-  from the table at the bottom of the page.</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86_64-64/flags.xml"
+   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>export BUILD64="[BUILD64 entries]"
+<screen os="b"><userinput>export BUILD64="[BUILD64 entries]"
 export GCCTARGET="[GCCTARGET entries]"</userinput></screen>
 
-  <para>Lets add the build flags to <filename>~/.bashrc</filename> to
-  prevent issues if we stop and come back later.</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86_64-64/flags.xml"
+   xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc
+<screen os="d"><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc
 echo export GCCTARGET=\""${GCCTARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
 
-  <para>The following table gives the entires for different Sparc 64 capable
+  <para os="e">The following table gives the entires for different Sparc 64 capable
   processors. Pick the processor that matches your system.</para>
 
-  <table>
+  <table os="f">
     <title>List of architectures, target triplets, and recommended book</title>
     <tgroup cols="2" align="center">
Index: BOOK/cross-tools/sparc64/flags.xml
===================================================================
--- BOOK/cross-tools/sparc64/flags.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/cross-tools/sparc64/flags.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -10,31 +10,39 @@
   <?dbhtml filename="flags.html"?>
 
-  <para>We will need to setup target specific flags for the compiler
+  <para os="a">We will need to setup target specific flags for the compiler
   and linkers. You can choose the appropriate BUILD32 and BUILD64
   from the table at the bottom of the page.</para>
 
-<screen><userinput>export BUILD32="[BUILD32 entries]"
+<screen os="b"><userinput>export BUILD32="[BUILD32 entries]"
 export BUILD64="[BUILD64 entries]"
 export GCCTARGET="[GCCTARGET entries]"</userinput></screen>
 
-  <para>You will need to set your host target triplet for 32 bit:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86_64/flags.xml"
+   xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>export LFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export LFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
 
-  <para>Let's perform a sanity check to prevent build issues. If our LFS_HOST matches our
-  target, we will get some failures during our cross-compile:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86_64/flags.xml"
+   xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>if [ "${LFS_HOST}" = "${LFS_TARGET32}" ]; then \
-  echo "Host and Target can't be the same." ; fi</userinput></screen>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86_64/flags.xml"
+   xpointer="xpointer(//*[@os='f'])"/>
 
-  <para>If the above test gave you "Host and Target can't be the same", you will need to change your LFS_HOST to a
-  a different target triplet:</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86_64/flags.xml"
+   xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>export LFS_HOST="`echo ${MACHTYPE} | sed -e 's/unknown/cross/g' -e 's/-pc-/-cross-/g'`"</userinput></screen>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86_64/flags.xml"
+   xpointer="xpointer(//*[@os='h'])"/>
 
-  <para>Lets add the build flags to <filename>~/.bashrc</filename> to
-  prevent issues if we stop and come back later.</para>
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+   href="../x86_64/flags.xml"
+   xpointer="xpointer(//*[@os='i'])"/>
 
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bashrc
+<screen os="j"><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bashrc
 echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc
 echo export GCCTARGET=\""${GCCTARGET}\"" &gt;&gt; ~/.bashrc
@@ -42,8 +50,8 @@
 echo export LFS_HOST=\""${LFS_HOST}\"" &gt;&gt; ~/.bashrc</userinput></screen>
 
-  <para>The following table gives the entires for different Sparc 64 capable
+  <para os="k">The following table gives the entires for different Sparc 64 capable
   processors. Pick the processor that matches your system.</para>
 
-  <table>
+  <table os="l">
     <title>List of architectures, target triplets, and recommended book</title>
     <tgroup cols="2" align="center">
Index: BOOK/cross-tools/x86/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86/gcc-final.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/cross-tools/x86/gcc-final.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -97,5 +97,5 @@
         <term><parameter>--enable-languages=c,c++</parameter></term>
         <listitem>
-          <para>This option ensures that only the C and C++ compilers is built.</para>
+          <para>This option ensures that only the C and C++ compilers are built.</para>
         </listitem>
       </varlistentry>
Index: BOOK/cross-tools/x86/gcc-static.xml
===================================================================
--- BOOK/cross-tools/x86/gcc-static.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/cross-tools/x86/gcc-static.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -37,5 +37,5 @@
     search the <filename class="directory">/usr</filename> directory for
     <filename class="libraryfile">libgcc_s.so</filename> when
-    cross-compling:</para>
+    cross-compiling:</para>
 
 <screen os="af"><userinput>patch -Np1 -i ../&gcc-cross_search-patch;</userinput></screen>
Index: BOOK/cross-tools/x86/glibc-headers.xml
===================================================================
--- BOOK/cross-tools/x86/glibc-headers.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/cross-tools/x86/glibc-headers.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -76,5 +76,5 @@
         <term><parameter>--host=${LFS_HOST}</parameter></term>
         <listitem>
-          <para>When used injunction with --target, this creates a cross-architecture
+          <para>When used with --target, this creates a cross-architecture
           executable that creates files for ${LFS_TARGET} but runs on ${LFS_HOST).</para>
         </listitem>
@@ -84,5 +84,5 @@
         <term><parameter>--target=${LFS_TARGET}</parameter></term>
         <listitem>
-          <para>When used injunction with --host, this creates a cross-architecture
+          <para>When used with --host, this creates a cross-architecture
           executable that creates files for ${LFS_TARGET} but runs on ${LFS_HOST).</para>
         </listitem>
Index: BOOK/cross-tools/x86_64-64/flags.xml
===================================================================
--- BOOK/cross-tools/x86_64-64/flags.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/cross-tools/x86_64-64/flags.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -11,13 +11,13 @@
   <title>Build Flags</title>
 
-  <para>We will need to setup target specific flags for the compiler
+  <para os="a">We will need to setup target specific flags for the compiler
   and linkers.</para>
 
-<screen><userinput>export BUILD64="-m64"</userinput></screen>
+<screen os="b"><userinput>export BUILD64="-m64"</userinput></screen>
 
-  <para>Lets add the build flags to <filename>~/.bashrc</filename> to
+  <para os="c">Lets add the build flags to <filename>~/.bashrc</filename> to
   prevent issues if we stop and come back later.</para>
 
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+<screen os="d"><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc</userinput></screen>
 
 </sect1>
Index: BOOK/cross-tools/x86_64/flags.xml
===================================================================
--- BOOK/cross-tools/x86_64/flags.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/cross-tools/x86_64/flags.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -11,32 +11,29 @@
   <title>Build Flags</title>
 
-  <para>We will need to setup target specific flags for the compiler
+  <para os="a">We will need to setup target specific flags for the compiler
   and linkers.</para>
 
-<screen><userinput>export BUILD32="-m32"
+<screen os="b"><userinput>export BUILD32="-m32"
 export BUILD64="-m64"</userinput></screen>
 
-  <para>You will need to set your host target triplet for 32 bit:</para>
+  <para os="c">You will need to set your host target triplet for 32 bits:</para>
 
-<screen><userinput>export LFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export LFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
 
-  <para>Let's perform a sanity check to prevent build issues. If our LFS_HOST matches our
+  <para os="e">Let's perform a sanity check to prevent build issues. If our LFS_HOST matches our
   target, we will get some failures during our cross-compile:</para>
 
-<screen><userinput>if [ "${LFS_HOST}" = "${LFS_TARGET32}" ]; then \
+<screen os="f"><userinput>if [ "${LFS_HOST}" = "${LFS_TARGET32}" ]; then \
   echo "Host and Target can't be the same." ; fi</userinput></screen>
 
-  <para>If the above test gave you "Host and Target can't be the same", you will need to change your LFS_HOST to a
+  <para os="g">If the above test gave you "Host and Target can't be the same", you will need to change your LFS_HOST to a
   a different target triplet:</para>
 
-  <para>If the above test gave you an error, you will need to change your LFS_HOST to a
-  a different target triplet:</para>
+<screen os="h"><userinput>export LFS_HOST="`echo ${MACHTYPE} | sed -e 's/unknown/cross/g' -e 's/-pc-/-cross-/g'`"</userinput></screen>
 
-<screen><userinput>export LFS_HOST="`echo ${MACHTYPE} | sed -e 's/unknown/cross/g' -e 's/-pc-/-cross-/g'`"</userinput></screen>
-
-  <para>Lets add the build flags to <filename>~/.bashrc</filename> to
+  <para os="i">Lets add the build flags to <filename>~/.bashrc</filename> to
   prevent issues if we stop and come back later.</para>
 
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bashrc
+<screen os="j"><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bashrc
 echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc
 echo export LFS_TARGET32=\""${LFS_TARGET32}\"" &gt;&gt; ~/.bashrc
Index: BOOK/final-system/common/bash.xml
===================================================================
--- BOOK/final-system/common/bash.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/final-system/common/bash.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -47,5 +47,5 @@
 <screen os="d"><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
 
-    <para os="e">Bash also has issues when compiled against newer versions of Glibc.
+    <para os="e">Bash also has an issue when compiled against newer versions of Glibc.
     The following patch resolves this problem:</para>
 
Index: BOOK/final-system/common/inetutils.xml
===================================================================
--- BOOK/final-system/common/inetutils.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/final-system/common/inetutils.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -41,5 +41,5 @@
 <screen os="p2"><userinput>patch -Np1 -i ../&inetutils-man_pages-patch;</userinput></screen>
 
-    <para os="p3">The following patches addresses build issues with GCC 4.x:</para>
+    <para os="p3">This patch addresses build issues with GCC 4.x:</para>
 
 <screen os="p4"><userinput>patch -Np1 -i ../&inetutils-gcc4_fixes-patch;</userinput></screen>
Index: BOOK/final-system/common/readline.xml
===================================================================
--- BOOK/final-system/common/readline.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/final-system/common/readline.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -66,5 +66,5 @@
 <screen os="i"><userinput>make install</userinput></screen>
 
-    <para os="j">Give Readline's dynamic libraries to a more appropriate
+    <para os="j">Give Readline's dynamic libraries more appropriate
     permissions:</para>
 
Index: BOOK/final-system/multilib/findutils.xml
===================================================================
--- BOOK/final-system/multilib/findutils.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/final-system/multilib/findutils.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -29,7 +29,17 @@
     --libexecdir=/usr/lib64/locate --localstatedir=/var/lib64/locate</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    <variablelist os="c">
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--localstatedir</parameter></term>
+        <listitem>
+          <para>This option changes the location of the <command>locate</command>
+          database to be in <filename class="directory">/var/lib64/locate</filename>,
+          which is FHS-compliant.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/glibc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/glibc-64bit.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/final-system/multilib/glibc-64bit.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -150,6 +150,8 @@
     class="directory">/usr/lib</filename> for dynamic libraries that are
     needed by programs as they are run. However, if there are libraries in
-    directories other than <filename class="directory">/lib</filename> and
-    <filename class="directory">/usr/lib</filename>, these need to be
+    directories other than <filename class="directory">/lib</filename>,
+    <filename class="directory">/lib64</filename>,
+    <filename class="directory">/usr/lib</filename>, and
+    <filename class="directory">/usr/lib64</filename>, these need to be
     added to the <filename>/etc/ld.so.conf</filename> file in order
     for the dynamic loader to find them. Some directories that are commonly
Index: BOOK/final-system/x86_64-64/grub.xml
===================================================================
--- BOOK/final-system/x86_64-64/grub.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/final-system/x86_64-64/grub.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -64,9 +64,9 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
+    href="../x86_64/grub.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
+    href="../x86_64/grub.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
Index: BOOK/final-system/x86_64/grub.xml
===================================================================
--- BOOK/final-system/x86_64/grub.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/final-system/x86_64/grub.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -51,11 +51,14 @@
 cp /usr/lib/grub/x86_64-pc/stage{1,2} /boot/grub</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    <para os="i">Replace <filename class="directory">x86_64-pc</filename> with whatever
+    directory is appropriate for the hardware in use.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    <para os="j">The <filename class="directory">x86_64-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">/boot/grub</filename> directory. Most users will
+    copy the <filename>e2fs_stage1_5</filename> and/or
+    <filename>reiserfs_stage1_5</filename> files.</para>
 
   </sect2>
Index: BOOK/temp-system/common/bash.xml
===================================================================
--- BOOK/temp-system/common/bash.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/temp-system/common/bash.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -23,5 +23,5 @@
     <title>Installation of Bash</title>
 
-    <para os="aa">Fix a minor issue during the build when cross-compling:</para>
+    <para os="aa">Fix a minor issue during the build when cross-compiling:</para>
 
 <screen os="ab"><userinput>cp Makefile.in Makefile.in.orig
@@ -58,5 +58,5 @@
           <para>This options turns off the use of Bash's memory allocation
           (malloc) function which is known to cause segmentation faults.
-          By turning this option off, Bash will use the malloc functions
+          By turning this option off, Bash will use the malloc function
           from Glibc which are more stable.</para>
         </listitem>
Index: BOOK/temp-system/common/choose.xml
===================================================================
--- BOOK/temp-system/common/choose.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/temp-system/common/choose.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -12,5 +12,5 @@
 
   <para>TO BE WRITTEN...
-  Introductory text about the diferecies between the boot and chroot method
+  Introductory text about the differencies between the boot and chroot methods
   and who can use any of them or who can use only one.</para>
 
Index: BOOK/temp-system/common/gettext.xml
===================================================================
--- BOOK/temp-system/common/gettext.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/temp-system/common/gettext.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -42,6 +42,6 @@
           <para>This flag tells Gettext not to build the <filename
           class="libraryfile">asprintf</filename> library. Because
-          nothing in this chapter or the next requires this library a
-          nd Gettext gets rebuilt later, exclude it to save time
+          nothing in this chapter or the next requires this library
+          and Gettext gets rebuilt later, exclude it to save time
           and space.</para>
         </listitem>
Index: BOOK/temp-system/common/gzip.xml
===================================================================
--- BOOK/temp-system/common/gzip.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/temp-system/common/gzip.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -52,8 +52,4 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
   </sect2>
 
Index: BOOK/temp-system/common/zlib.xml
===================================================================
--- BOOK/temp-system/common/zlib.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/temp-system/common/zlib.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -39,5 +39,5 @@
         <term><parameter>--shared</parameter></term>
         <listitem>
-          <para>Tells zlib to build shared libraries.</para>
+          <para>Tells zlib to build shared library.</para>
         </listitem>
       </varlistentry>
Index: BOOK/temp-system/multilib/binutils.xml
===================================================================
--- BOOK/temp-system/multilib/binutils.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/temp-system/multilib/binutils.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -67,5 +67,5 @@
         <term><parameter>CC="${CC} ${BUILD64}"</parameter></term>
         <listitem>
-          <para>Tell the compiler to use our 64 bit Build flags.</para>
+          <para>Tell the compiler to use our 64 bits Build flags.</para>
         </listitem>
       </varlistentry>
Index: BOOK/temp-system/multilib/gettext.xml
===================================================================
--- BOOK/temp-system/multilib/gettext.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/temp-system/multilib/gettext.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -47,5 +47,5 @@
         <listitem>
           <para>Forces Gettext is use our Target Architecture g++ compiler
-          with our 32 bit build flags.</para>
+          with our 32 bits build flags.</para>
         </listitem>
       </varlistentry>
Index: BOOK/temp-system/multilib/gzip.xml
===================================================================
--- BOOK/temp-system/multilib/gzip.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/temp-system/multilib/gzip.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -54,8 +54,4 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
   </sect2>
 
Index: BOOK/temp-system/multilib/zlib.xml
===================================================================
--- BOOK/temp-system/multilib/zlib.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/temp-system/multilib/zlib.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -41,5 +41,5 @@
         <listitem>
           <para>Tell ZLIB to use our architecutre specific gcc and use
-          our 32 bit build flags.</para>
+          our 32 bits build flags.</para>
         </listitem>
       </varlistentry>
Index: BOOK/temp-system/x86/gcc.xml
===================================================================
--- BOOK/temp-system/x86/gcc.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/temp-system/x86/gcc.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -61,5 +61,5 @@
    gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
 
-    <para os="ch">Use our cross-complier instead of the one GCC builds, named
+    <para os="ch">Use our cross-compiler instead of the one GCC builds, named
     <command>xgcc</command>:</para>
 
Index: BOOK/temp-tools/common/expect.xml
===================================================================
--- BOOK/temp-tools/common/expect.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/temp-tools/common/expect.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -48,5 +48,5 @@
       <title>The meaning of the configure options:</title>
 
-      <varlistentry>
+      <varlistentry os="e1">
         <term><parameter>--with-tcl=/tools/lib</parameter></term>
         <listitem>
@@ -56,5 +56,5 @@
       </varlistentry>
 
-      <varlistentry>
+      <varlistentry os="e2">
         <term><parameter>--with-tclinclude=/tools/include</parameter></term>
         <listitem>
@@ -66,5 +66,5 @@
       </varlistentry>
 
-      <varlistentry>
+      <varlistentry os="e3">
         <term><parameter>--with-x=no</parameter></term>
         <listitem>
Index: BOOK/temp-tools/common/texinfo.xml
===================================================================
--- BOOK/temp-tools/common/texinfo.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/temp-tools/common/texinfo.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -43,5 +43,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
Index: BOOK/temp-tools/multilib/expect-64bit.xml
===================================================================
--- BOOK/temp-tools/multilib/expect-64bit.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/temp-tools/multilib/expect-64bit.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -38,7 +38,24 @@
    --libdir=/tools/lib64 --with-x=no</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    <variablelist os="e">
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry os="e1">
+        <term><parameter>--with-tcl=/tools/lib64</parameter></term>
+        <listitem>
+          <para>This ensures that the configure script finds the Tcl
+          installation in the temporary temp-tools location.</para>
+        </listitem>
+      </varlistentry>
+
+       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+        href="../common/expect.xml"
+        xpointer="xpointer(//*[@os='e2'])"/>
+
+       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+        href="../common/expect.xml"
+        xpointer="xpointer(//*[@os='e3'])"/>
+
+    </variablelist>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-tools/multilib/texinfo.xml
===================================================================
--- BOOK/temp-tools/multilib/texinfo.xml	(revision e47ec163213e393a0c145e08199da158bf7342b4)
+++ BOOK/temp-tools/multilib/texinfo.xml	(revision 6bb43b3e34eddf03e1925cf8dc6baa1792b91a87)
@@ -43,5 +43,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
   </sect2>
