Index: cross-tools/common/binutils.xml
===================================================================
--- cross-tools/common/binutils.xml	(revision 360c931501129e1483236ea20b352850f4a68b69)
+++ cross-tools/common/binutils.xml	(revision f32f5378b3e509e29cc5e940bc44a037cf8243b3)
@@ -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: cross-tools/common/glibc.xml
===================================================================
--- cross-tools/common/glibc.xml	(revision 360c931501129e1483236ea20b352850f4a68b69)
+++ cross-tools/common/glibc.xml	(revision f32f5378b3e509e29cc5e940bc44a037cf8243b3)
@@ -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: cross-tools/common/variables-multilib.xml
===================================================================
--- cross-tools/common/variables-multilib.xml	(revision 360c931501129e1483236ea20b352850f4a68b69)
+++ cross-tools/common/variables-multilib.xml	(revision f32f5378b3e509e29cc5e940bc44a037cf8243b3)
@@ -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: cross-tools/common/variables.xml
===================================================================
--- cross-tools/common/variables.xml	(revision 360c931501129e1483236ea20b352850f4a68b69)
+++ cross-tools/common/variables.xml	(revision f32f5378b3e509e29cc5e940bc44a037cf8243b3)
@@ -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: cross-tools/mips64-64/flags.xml
===================================================================
--- cross-tools/mips64-64/flags.xml	(revision 360c931501129e1483236ea20b352850f4a68b69)
+++ cross-tools/mips64-64/flags.xml	(revision f32f5378b3e509e29cc5e940bc44a037cf8243b3)
@@ -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: cross-tools/mips64/flags.xml
===================================================================
--- cross-tools/mips64/flags.xml	(revision 360c931501129e1483236ea20b352850f4a68b69)
+++ cross-tools/mips64/flags.xml	(revision f32f5378b3e509e29cc5e940bc44a037cf8243b3)
@@ -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: cross-tools/multilib/glibc-64bit.xml
===================================================================
--- cross-tools/multilib/glibc-64bit.xml	(revision 360c931501129e1483236ea20b352850f4a68b69)
+++ cross-tools/multilib/glibc-64bit.xml	(revision f32f5378b3e509e29cc5e940bc44a037cf8243b3)
@@ -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: cross-tools/sparc64-64/flags.xml
===================================================================
--- cross-tools/sparc64-64/flags.xml	(revision 360c931501129e1483236ea20b352850f4a68b69)
+++ cross-tools/sparc64-64/flags.xml	(revision f32f5378b3e509e29cc5e940bc44a037cf8243b3)
@@ -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: cross-tools/sparc64/flags.xml
===================================================================
--- cross-tools/sparc64/flags.xml	(revision 360c931501129e1483236ea20b352850f4a68b69)
+++ cross-tools/sparc64/flags.xml	(revision f32f5378b3e509e29cc5e940bc44a037cf8243b3)
@@ -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: cross-tools/x86/gcc-final.xml
===================================================================
--- cross-tools/x86/gcc-final.xml	(revision 360c931501129e1483236ea20b352850f4a68b69)
+++ cross-tools/x86/gcc-final.xml	(revision f32f5378b3e509e29cc5e940bc44a037cf8243b3)
@@ -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: cross-tools/x86/gcc-static.xml
===================================================================
--- cross-tools/x86/gcc-static.xml	(revision 360c931501129e1483236ea20b352850f4a68b69)
+++ cross-tools/x86/gcc-static.xml	(revision f32f5378b3e509e29cc5e940bc44a037cf8243b3)
@@ -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: cross-tools/x86/glibc-headers.xml
===================================================================
--- cross-tools/x86/glibc-headers.xml	(revision 360c931501129e1483236ea20b352850f4a68b69)
+++ cross-tools/x86/glibc-headers.xml	(revision f32f5378b3e509e29cc5e940bc44a037cf8243b3)
@@ -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: cross-tools/x86_64-64/flags.xml
===================================================================
--- cross-tools/x86_64-64/flags.xml	(revision 360c931501129e1483236ea20b352850f4a68b69)
+++ cross-tools/x86_64-64/flags.xml	(revision f32f5378b3e509e29cc5e940bc44a037cf8243b3)
@@ -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: cross-tools/x86_64/flags.xml
===================================================================
--- cross-tools/x86_64/flags.xml	(revision 360c931501129e1483236ea20b352850f4a68b69)
+++ cross-tools/x86_64/flags.xml	(revision f32f5378b3e509e29cc5e940bc44a037cf8243b3)
@@ -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
