Index: BOOK/cross-tools/64/glibc.xml
===================================================================
--- BOOK/cross-tools/64/glibc.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/64/glibc.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -63,5 +63,5 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
@@ -72,10 +72,10 @@
     --cache-file=config.cache</userinput></screen>
 
-    <variablelist>
+    <variablelist os="dg">
       <title>The meaning of the new configure options:</title>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di1'])"/>
+      xpointer="xpointer(//*[@os='dg1'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -85,33 +85,33 @@
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di3'])"/>
+      xpointer="xpointer(//*[@os='dg3'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di4'])"/>
+      xpointer="xpointer(//*[@os='dg4'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di5'])"/>
+      xpointer="xpointer(//*[@os='dg5'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di6'])"/>
+      xpointer="xpointer(//*[@os='dg6'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di7'])"/>
+      xpointer="xpointer(//*[@os='dg7'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di8'])"/>
+      xpointer="xpointer(//*[@os='dg8'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di9'])"/>
+      xpointer="xpointer(//*[@os='dg9'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di10'])"/>
+      xpointer="xpointer(//*[@os='dg10'])"/>
 
     </variablelist>
@@ -119,13 +119,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='df'])"/>
+    xpointer="xpointer(//*[@os='dh'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
+    xpointer="xpointer(//*[@os='di'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -145,4 +141,8 @@
     xpointer="xpointer(//*[@os='dm'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dn'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/common/glibc.xml
===================================================================
--- BOOK/cross-tools/common/glibc.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/common/glibc.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -58,5 +58,5 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
@@ -67,74 +67,81 @@
     --cache-file=config.cache</userinput></screen>
 
-    <variablelist os="di">
+    <variablelist os="dg">
       <title>The meaning of the new configure options:</title>
 
-      <varlistentry os="di1">
+      <varlistentry os="dg1">
         <term><parameter>BUILD_CC="gcc"</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>This sets GLIBC to use the current compiler on our system. This is
+          used to create the tools GLIBC uses durings it's build.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry os="di2">
+      <varlistentry os="dg2">
         <term><parameter>CC="${LFS_TARGET}-gcc"</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>This forces GLIBC to use the GCC complier that we made for our target
+          architecture.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry os="di3">
+      <varlistentry os="dg3">
         <term><parameter>AR="${LFS_TARGET}-ar"</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>This forces GLIBC to use the AR utilitythat we made for our target
+          architecture.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry os="di4">
+      <varlistentry os="dg4">
         <term><parameter>RANLIB="${LFS_TARGET}-ranlib"</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>This forces GLIBC to use the RANLIB utility we made for our target
+          architecture.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry os="di5">
+      <varlistentry os="dg5">
         <term><parameter>--disable-profile</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>This builds the libraries without profiling information. 
+	  Omit this option if profiling on the temporary tools is necessary.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry os="di6">
+      <varlistentry os="dg6">
         <term><parameter>--enable-add-ons</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>This tells GLIBC to utilize all add-on's that are avaialble.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry os="di7">
+      <varlistentry os="dg7">
         <term><parameter>--with-tls</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>This tells GLIBC to use Thread Local Storage.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry os="di8">
+      <varlistentry os="dg8">
         <term><parameter>--with-__thread</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>This tells GLIBC to use use the __thread for libc and
+          libpthread builds.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry os="di9">
+      <varlistentry os="dg9">
         <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>This tells GLIBC to use the Binutils that are specific to
+          our target architecture.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry os="di10">
+      <varlistentry os="dg10">
         <term><parameter>--cache-file=config.cache</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>This tells GLIBC to utilize a premade cache file.</para>
         </listitem>
       </varlistentry>
@@ -142,7 +149,7 @@
     </variablelist>
 
-    <para os="df">During this stage the following warning might appear:</para>
+    <para os="dh">During this stage the following warning might appear:</para>
 
-<blockquote os="dg"><screen><computeroutput>configure: WARNING:
+<blockquote os="di"><screen><computeroutput>configure: WARNING:
 *** These auxiliary programs are missing or
 *** incompatible versions: msgfmt
@@ -150,15 +157,15 @@
 *** Check the INSTALL file for required versions.</computeroutput></screen></blockquote>
 
-    <para os="dh">The missing or incompatible <command>msgfmt</command> program is
+    <para os="dj">The missing or incompatible <command>msgfmt</command> program is
     generally harmless. This <command>msgfmt</command> program is part of the
     Gettext package which the host distribution should provide.</para>
 
-    <para os="dj">Compile the package:</para>
+    <para os="dk">Compile the package:</para>
 
-<screen os="dk"><userinput>make</userinput></screen>
+<screen os="dl"><userinput>make</userinput></screen>
 
-    <para os="dl">Install the package:</para>
+    <para os="dm">Install the package:</para>
 
-<screen os="dm"><userinput>make install</userinput></screen>
+<screen os="dn"><userinput>make install</userinput></screen>
 
   </sect2>
Index: BOOK/cross-tools/mips/glibc.xml
===================================================================
--- BOOK/cross-tools/mips/glibc.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/mips/glibc.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -59,9 +59,11 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para os="dd"> For NPTL enabled systems we will need to add the following lines to
-    <filename>config.cache</filename>:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dd'])"/>
 
-<screen os="de"><userinput>echo "libc_cv_forced_unwind=yes" &gt; config.cache
-echo "libc_cv_c_cleanup=yes" &gt;&gt; config.cache</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='de'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -69,107 +71,39 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='df'])"/>
 
-    <variablelist os="di">
-      <title>The meaning of the new configure options:</title>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dg'])"/>
 
-      <varlistentry os="di1">
-        <term><parameter>BUILD_CC="gcc"</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dh'])"/>
 
-      <varlistentry os="di2">
-        <term><parameter>CC="${LFS_TARGET}-gcc"</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='di'])"/>
 
-      <varlistentry os="di3">
-        <term><parameter>AR="${LFS_TARGET}-ar"</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dj'])"/>
 
-      <varlistentry os="di4">
-        <term><parameter>RANLIB="${LFS_TARGET}-ranlib"</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dk'])"/>
 
-      <varlistentry os="di5">
-        <term><parameter>--disable-profile</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dl'])"/>
 
-      <varlistentry os="di6">
-        <term><parameter>--enable-add-ons</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dm'])"/>
 
-      <varlistentry os="di7">
-        <term><parameter>--with-tls</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="di8">
-        <term><parameter>--with-__thread</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="di9">
-        <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="di10">
-        <term><parameter>--cache-file=config.cache</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="df">During this stage the following warning might appear:</para>
-
-<blockquote os="dg"><screen><computeroutput>configure: WARNING:
-*** These auxiliary programs are missing or
-*** incompatible versions: msgfmt
-*** some features will be disabled.
-*** Check the INSTALL file for required versions.</computeroutput></screen></blockquote>
-
-    <para os="dh">The missing or incompatible <command>msgfmt</command> program is
-    generally harmless. This <command>msgfmt</command> program is part of the
-    Gettext package which the host distribution should provide.</para>
-
-    <para os="dj">Compile the package:</para>
-
-<screen os="dk"><userinput>make</userinput></screen>
-
-    <para os="dl">Install the package:</para>
-
-<screen os="dm"><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dn'])"/>
 
   </sect2>
Index: BOOK/cross-tools/mips64-64/glibc.xml
===================================================================
--- BOOK/cross-tools/mips64-64/glibc.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/mips64-64/glibc.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -71,64 +71,10 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/glibc-64bit.xml"
-      xpointer="xpointer(//*[@os='fa1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di8'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di9'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di10'])"/>
-
-    </variablelist>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
+    href="../64/glibc.xml"
     xpointer="xpointer(//*[@os='df'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
+    href="../64/glibc.xml"
     xpointer="xpointer(//*[@os='dg'])"/>
 
@@ -136,4 +82,8 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='di'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -153,4 +103,8 @@
     xpointer="xpointer(//*[@os='dm'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dn'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/mips64/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc-64bit.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/mips64/glibc-64bit.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -67,8 +67,11 @@
     xpointer="xpointer(//*[@os='de'])"/>
 
-    <para>Now we make sure the Glibc goes into <filename
-    class="directory">/tools/lib64</filename>:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='n1'])"/>
 
-<screen><userinput>echo "slibdir=/tools/lib64" &gt;&gt; configparms</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='n2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -76,31 +79,19 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} --libdir=/tools/lib64 \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='df'])"/>
 
-    <variablelist os="fa">
-      <title>The meaning of the new configure options:</title>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='dg'])"/>
 
-      <varlistentry os="fa1">
-        <term><parameter>CC="${LFS_TARGET}-gcc ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>This switch do ... .</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='dh'])"/>
 
-      <varlistentry>
-        <term><parameter>--libdir=/tools/lib64</parameter></term>
-        <listitem>
-          <para>This switch do ... .</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='di'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -120,4 +111,8 @@
     xpointer="xpointer(//*[@os='dm'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='dn'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/mips64/glibc-n32.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc-n32.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/mips64/glibc-n32.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -67,8 +67,8 @@
     xpointer="xpointer(//*[@os='de'])"/>
 
-    <para>Now we make sure the Glibc goes into <filename
+    <para os="n1">Now we make sure the Glibc goes into <filename
     class="directory">/tools/lib32</filename>:</para>
 
-<screen><userinput>echo "slibdir=/tools/lib32" &gt;&gt; configparms</userinput></screen>
+<screen os="n2"><userinput>echo "slibdir=/tools/lib32" &gt;&gt; configparms</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -76,5 +76,5 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILDN32}" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILDN32}" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
@@ -91,5 +91,6 @@
         <term><parameter>CC="${LFS_TARGET}-gcc ${BUILDN32}"</parameter></term>
         <listitem>
-          <para>This switch do ... .</para>
+          <para>Forces GLIBC to utilize our target architecture GCC utilizing
+          the N32 flags.</para>
         </listitem>
       </varlistentry>
@@ -98,9 +99,17 @@
         <term><parameter>--libdir=/tools/lib32</parameter></term>
         <listitem>
-          <para>This switch do ... .</para>
+          <para>Puts GLIBC into a /tools/lib32 instead of /tools/lib.</para>
         </listitem>
       </varlistentry>
 
     </variablelist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='dh'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='di'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -120,4 +129,8 @@
     xpointer="xpointer(//*[@os='dm'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='dn'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/mips64/glibc.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/mips64/glibc.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -71,67 +71,10 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD32}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET32} --build=${LFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di1'])"/>
-
-      <varlistentry os="ea1">
-        <term><parameter>CC="${LFS_TARGET}-gcc ${BUILD32}"</parameter></term>
-        <listitem>
-          <para>This switch do ... .</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di8'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di9'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di10'])"/>
-
-    </variablelist>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
+    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='df'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
+    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='dg'])"/>
 
@@ -139,4 +82,8 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='di'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -156,4 +103,8 @@
     xpointer="xpointer(//*[@os='dm'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dn'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/multilib/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc-64bit.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/multilib/glibc-64bit.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -51,8 +51,8 @@
     xpointer="xpointer(//*[@os='de'])"/>
 
-    <para>Now we make sure the Glibc goes into <filename
+    <para os="n1">Now we make sure the Glibc goes into <filename
     class="directory">/tools/lib64</filename>:</para>
 
-<screen><userinput>echo "slibdir=/tools/lib64" &gt;&gt; configparms</userinput></screen>
+<screen os="n2"><userinput>echo "slibdir=/tools/lib64" &gt;&gt; configparms</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -60,5 +60,5 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
@@ -69,5 +69,5 @@
     --cache-file=config.cache</userinput></screen>
 
-    <variablelist os="fa">
+    <variablelist os="dg">
       <title>The meaning of the new configure options:</title>
 
@@ -75,16 +75,25 @@
         <term><parameter>CC="${LFS_TARGET}-gcc ${BUILD64}"</parameter></term>
         <listitem>
-          <para>This switch do ... .</para>
+          <para>Forces GLIBC to utilize our target architecture GCC utilizing
+          the 64 BIT flags.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry>
+      <varlistentry os="fa2">
         <term><parameter>--libdir=/tools/lib64</parameter></term>
         <listitem>
-          <para>This switch do ... .</para>
+          <para>Puts GLIBC into a /tools/lib64 instead of /tools/lib.</para>
         </listitem>
       </varlistentry>
 
     </variablelist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='dh'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='di'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -104,4 +113,8 @@
     xpointer="xpointer(//*[@os='dm'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='dn'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/multilib/glibc.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/multilib/glibc.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -55,5 +55,5 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD32}" \
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD32}" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
     ../glibc-&glibc-version;/configure --prefix=/tools \
@@ -64,15 +64,16 @@
     --cache-file=config.cache</userinput></screen>
 
-    <variablelist>
+    <variablelist os="dg">
       <title>The meaning of the new configure options:</title>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di1'])"/>
+      xpointer="xpointer(//*[@os='dg1'])"/>
 
       <varlistentry os="ea1">
         <term><parameter>CC="${LFS_TARGET}-gcc ${BUILD32}"</parameter></term>
         <listitem>
-          <para>This switch do ... .</para>
+          <para>Forces GLIBC to utilize our target architecture GCC utilizing
+          the 32 BIT flags.</para>
         </listitem>
       </varlistentry>
@@ -80,33 +81,33 @@
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di3'])"/>
+      xpointer="xpointer(//*[@os='dg3'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di4'])"/>
+      xpointer="xpointer(//*[@os='dg4'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di5'])"/>
+      xpointer="xpointer(//*[@os='dg5'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di6'])"/>
+      xpointer="xpointer(//*[@os='dg6'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di7'])"/>
+      xpointer="xpointer(//*[@os='dg7'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di8'])"/>
+      xpointer="xpointer(//*[@os='dg8'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di9'])"/>
+      xpointer="xpointer(//*[@os='dg9'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di10'])"/>
+      xpointer="xpointer(//*[@os='dg10'])"/>
 
     </variablelist>
@@ -114,13 +115,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='df'])"/>
+    xpointer="xpointer(//*[@os='dh'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
+    xpointer="xpointer(//*[@os='di'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -140,4 +137,8 @@
     xpointer="xpointer(//*[@os='dm'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dn'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/ppc/glibc.xml
===================================================================
--- BOOK/cross-tools/ppc/glibc.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/ppc/glibc.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -55,5 +55,5 @@
     xpointer="xpointer(//*[@os='dd'])"/>
 
-<screen><userinput>echo "libc_cv_forced_unwind=yes" &gt; config.cache
+<screen os="de"><userinput>echo "libc_cv_forced_unwind=yes" &gt; config.cache
 echo "libc_cv_c_cleanup=yes" &gt;&gt; config.cache
 echo "libc_cv_ppc_machine=yes" &gt;&gt; config.cache</userinput></screen>
@@ -63,107 +63,39 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='df'])"/>
 
-    <variablelist os="di">
-      <title>The meaning of the new configure options:</title>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dg'])"/>
 
-      <varlistentry os="di1">
-        <term><parameter>BUILD_CC="gcc"</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dh'])"/>
 
-      <varlistentry os="di2">
-        <term><parameter>CC="${LFS_TARGET}-gcc"</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='di'])"/>
 
-      <varlistentry os="di3">
-        <term><parameter>AR="${LFS_TARGET}-ar"</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dj'])"/>
 
-      <varlistentry os="di4">
-        <term><parameter>RANLIB="${LFS_TARGET}-ranlib"</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dk'])"/>
 
-      <varlistentry os="di5">
-        <term><parameter>--disable-profile</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dl'])"/>
 
-      <varlistentry os="di6">
-        <term><parameter>--enable-add-ons</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dm'])"/>
 
-      <varlistentry os="di7">
-        <term><parameter>--with-tls</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="di8">
-        <term><parameter>--with-__thread</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="di9">
-        <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="di10">
-        <term><parameter>--cache-file=config.cache</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="df">During this stage the following warning might appear:</para>
-
-<blockquote os="dg"><screen><computeroutput>configure: WARNING:
-*** These auxiliary programs are missing or
-*** incompatible versions: msgfmt
-*** some features will be disabled.
-*** Check the INSTALL file for required versions.</computeroutput></screen></blockquote>
-
-    <para os="dh">The missing or incompatible <command>msgfmt</command> program is
-    generally harmless. This <command>msgfmt</command> program is part of the
-    Gettext package which the host distribution should provide.</para>
-
-    <para os="dj">Compile the package:</para>
-
-<screen os="dk"><userinput>make</userinput></screen>
-
-    <para os="dl">Install the package:</para>
-
-<screen os="dm"><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dn'])"/>
 
   </sect2>
Index: BOOK/cross-tools/sparc/glibc.xml
===================================================================
--- BOOK/cross-tools/sparc/glibc.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/sparc/glibc.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -59,9 +59,11 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para os="dd"> For NPTL enabled systems we will need to add the following lines to
-    <filename>config.cache</filename>:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dd'])"/>
 
-<screen os="de"><userinput>echo "libc_cv_forced_unwind=yes" &gt; config.cache
-echo "libc_cv_c_cleanup=yes" &gt;&gt; config.cache</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='df'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -69,107 +71,35 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dg'])"/>
 
-    <variablelist os="di">
-      <title>The meaning of the new configure options:</title>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dh'])"/>
 
-      <varlistentry os="di1">
-        <term><parameter>BUILD_CC="gcc"</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='di'])"/>
 
-      <varlistentry os="di2">
-        <term><parameter>CC="${LFS_TARGET}-gcc"</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dj'])"/>
 
-      <varlistentry os="di3">
-        <term><parameter>AR="${LFS_TARGET}-ar"</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dk'])"/>
 
-      <varlistentry os="di4">
-        <term><parameter>RANLIB="${LFS_TARGET}-ranlib"</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dl'])"/>
 
-      <varlistentry os="di5">
-        <term><parameter>--disable-profile</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dm'])"/>
 
-      <varlistentry os="di6">
-        <term><parameter>--enable-add-ons</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="di7">
-        <term><parameter>--with-tls</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="di8">
-        <term><parameter>--with-__thread</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="di9">
-        <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="di10">
-        <term><parameter>--cache-file=config.cache</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="df">During this stage the following warning might appear:</para>
-
-<blockquote os="dg"><screen><computeroutput>configure: WARNING:
-*** These auxiliary programs are missing or
-*** incompatible versions: msgfmt
-*** some features will be disabled.
-*** Check the INSTALL file for required versions.</computeroutput></screen></blockquote>
-
-    <para os="dh">The missing or incompatible <command>msgfmt</command> program is
-    generally harmless. This <command>msgfmt</command> program is part of the
-    Gettext package which the host distribution should provide.</para>
-
-    <para os="dj">Compile the package:</para>
-
-<screen os="dk"><userinput>make</userinput></screen>
-
-    <para os="dl">Install the package:</para>
-
-<screen os="dm"><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dn'])"/>
 
   </sect2>
Index: BOOK/cross-tools/sparc64-64/glibc.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/glibc.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/sparc64-64/glibc.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -63,7 +63,7 @@
     xpointer="xpointer(//*[@os='dd'])"/>
 
-<screen><userinput>echo "libc_cv_forced_unwind=yes" &gt; config.cache
-echo "libc_cv_c_cleanup=yes" &gt;&gt; config.cache
-echo "libc_cv_sparc64_tls=yes" &gt;&gt; config.cache</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc64/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='de'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -71,64 +71,10 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/glibc-64bit.xml"
-      xpointer="xpointer(//*[@os='fa1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di8'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di9'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di10'])"/>
-
-    </variablelist>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='df'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
+    href="../multilib/glibc-64bit.xml"
     xpointer="xpointer(//*[@os='dg'])"/>
 
@@ -136,4 +82,8 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='di'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -153,4 +103,8 @@
     xpointer="xpointer(//*[@os='dm'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dn'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/sparc64/glibc-64bit.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/sparc64/glibc-64bit.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -63,12 +63,15 @@
     xpointer="xpointer(//*[@os='dd'])"/>
 
-<screen><userinput>echo "libc_cv_forced_unwind=yes" &gt; config.cache
+<screen os="de"><userinput>echo "libc_cv_forced_unwind=yes" &gt; config.cache
 echo "libc_cv_c_cleanup=yes" &gt;&gt; config.cache
 echo "libc_cv_sparc64_tls=yes" &gt;&gt; config.cache</userinput></screen>
 
-    <para>Now we make sure the Glibc goes into <filename
-    class="directory">/tools/lib64</filename>:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='n1'])"/>
 
-<screen><userinput>echo "slibdir=/tools/lib64" &gt;&gt; configparms</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='n2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -76,31 +79,19 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD64}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} --libdir=/tools/lib64 \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='df'])"/>
 
-    <variablelist os="fa">
-      <title>The meaning of the new configure options:</title>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='dg'])"/>
 
-      <varlistentry os="fa1">
-        <term><parameter>CC="${LFS_TARGET}-gcc ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>This switch do ... .</para>
-        </listitem>
-      </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='dh'])"/>
 
-      <varlistentry>
-        <term><parameter>--libdir=/tools/lib64</parameter></term>
-        <listitem>
-          <para>This switch do ... .</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='di'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -120,4 +111,8 @@
     xpointer="xpointer(//*[@os='dm'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='dn'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/sparc64/glibc.xml
===================================================================
--- BOOK/cross-tools/sparc64/glibc.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/sparc64/glibc.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -71,67 +71,10 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc ${BUILD32}" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET32} --build=${LFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di1'])"/>
-
-      <varlistentry os="ea1">
-        <term><parameter>CC="${LFS_TARGET}-gcc ${BUILD32}"</parameter></term>
-        <listitem>
-          <para>This switch do ... .</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di8'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di9'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='di10'])"/>
-
-    </variablelist>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
+    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='df'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
+    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='dg'])"/>
 
@@ -139,4 +82,8 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dh'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='di'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -156,4 +103,8 @@
     xpointer="xpointer(//*[@os='dm'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dn'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/x86/glibc-headers.xml
===================================================================
--- BOOK/cross-tools/x86/glibc-headers.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/x86/glibc-headers.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -43,5 +43,5 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CC=gcc ../glibc-&glibc-version;/configure --prefix=/tools \
+<screen os="s3"><userinput>CC=gcc ../glibc-&glibc-version;/configure --prefix=/tools \
     --host=${LFS_TARGET} --build=${LFS_HOST} \
     --disable-sanity-checks --enable-kernel=2.6.0 \
@@ -50,5 +50,5 @@
 
    <warning os="e1">
-      <para><emphasis>Any</emphasis> error message you see about nptl at this point\
+      <para><emphasis>Any</emphasis> error message you see about nptl at this point
        can safely be ignored.</para>
    </warning>
@@ -57,12 +57,12 @@
       <title>The meaning of the configure options:</title>
 
-      <varlistentry>
+      <varlistentry os="ca1">
         <term><parameter>CC=gcc</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>Tells GLIBC to use the hosts GCC compiler.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry os="ca1">
+      <varlistentry os="ca2">
         <term><parameter>--prefix=/tools</parameter></term>
         <listitem>
@@ -73,26 +73,28 @@
       </varlistentry>
 
-      <varlistentry os="ca2">
-        <term><parameter>--host=${LFS_TARGET}</parameter></term>
+      <varlistentry os="ca3">
+        <term><parameter>--host=${LFS_HOST}</parameter></term>
         <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="ca3">
-        <term><parameter>--build=${LFS_HOST}</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-sanity-checks</parameter></term>
-        <listitem>
-          <para>This switch do ... .</para>
+          <para>When used injunction with --target, this creates a cross-architecture
+          executable that creates files for ${LFS_TARGET} but runs on ${LFS_HOST).</para>
         </listitem>
       </varlistentry>
 
       <varlistentry os="ca4">
+        <term><parameter>--target=${LFS_TARGET}</parameter></term>
+        <listitem>
+          <para>When used injunction with --host, this creates a cross-architecture
+          executable that creates files for ${LFS_TARGET} but runs on ${LFS_HOST).</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="ca5">
+        <term><parameter>--disable-sanity-checks</parameter></term>
+        <listitem>
+          <para>This switch disables any checks that are in place.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="ca6">
         <term><parameter>--enable-kernel=2.6.0</parameter></term>
         <listitem>
@@ -102,5 +104,5 @@
       </varlistentry>
 
-      <varlistentry os="ca5">
+      <varlistentry os="ca7">
         <term><parameter>--with-headers=/tools/include</parameter></term>
         <listitem>
@@ -112,8 +114,8 @@
       </varlistentry>
 
-      <varlistentry>
+      <varlistentry os="ca8">
         <term><parameter>--with-binutils=/cross-tools/${LFS_TARGET}/bin</parameter></term>
         <listitem>
-          <para>This switch do ... .</para>
+          <para>This tells GLIBC to use the binutils for our specific target architecture.</para>
         </listitem>
       </varlistentry>
@@ -144,5 +146,5 @@
     <para os="cl">Now we copy the architecture specific header over:</para>
 
-<screen><userinput>cp ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h /tools/include/bits/</userinput></screen>
+<screen os="cm"><userinput>cp ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h /tools/include/bits/</userinput></screen>
 
   </sect2>
Index: BOOK/cross-tools/x86_64-64/glibc-headers.xml
===================================================================
--- BOOK/cross-tools/x86_64-64/glibc-headers.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/x86_64-64/glibc-headers.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -43,9 +43,7 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CC=gcc ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} \
-    --disable-sanity-checks --enable-kernel=2.6.0 \
-    --with-headers=/tools/include \
-    --with-binutils=/cross-tools/${LFS_TARGET}/bin</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc-headers.xml"
+    xpointer="xpointer(//*[@os='s3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -97,5 +95,7 @@
     xpointer="xpointer(//*[@os='cl'])"/>
 
-<screen><userinput>cp ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h /tools/include/bits/</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/glibc-headers.xml"
+    xpointer="xpointer(//*[@os='cm'])"/>
 
   </sect2>
Index: BOOK/cross-tools/x86_64/glibc-headers.xml
===================================================================
--- BOOK/cross-tools/x86_64/glibc-headers.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/cross-tools/x86_64/glibc-headers.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -43,9 +43,7 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CC=gcc ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} \
-    --disable-sanity-checks --enable-kernel=2.6.0 \
-    --with-headers=/tools/include \
-    --with-binutils=/cross-tools/${LFS_TARGET}/bin</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/glibc-headers.xml"
+    xpointer="xpointer(//*[@os='s3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -97,5 +95,5 @@
     xpointer="xpointer(//*[@os='cl'])"/>
 
-<screen><userinput>cp ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h /tools/include/bits/</userinput></screen>
+<screen os="cm"><userinput>cp ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h /tools/include/bits/</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/mips64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/mips64/glibc-64bit.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/final-system/mips64/glibc-64bit.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -50,8 +50,11 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Now we make sure the Glibc goes into
-    <filename class="directory">/lib64</filename>:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen><userinput>echo "slibdir=/lib64" &gt;&gt; configparms</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='m2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -59,22 +62,11 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <variablelist>
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--libexecdir=/usr/lib64/glibc</parameter></term>
-        <listitem>
-          <para>This changes the location of the <command>pt_chown</command>
-          program from its default of <filename
-          class="directory">/usr/libexec</filename> to <filename
-          class="directory">/usr/lib64/glibc</filename>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -94,37 +86,15 @@
     xpointer="xpointer(//*[@os='m'])"/>
 
-<!-- items n,o,p here are now the master, not multilib, because
- the tests are known to all pass on multilib_64 -->
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
 
-<screen os="n"><userinput>make check</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
 
-    <para os="o">The Glibc test suite is highly dependent on certain functions of
-    the host system, in particular the kernel. In general, the Glibc test
-    suite is always expected to pass. However, in certain circumstances,
-    some failures are unavoidable. This is a list of the most common
-    issues:</para>
-
-    <itemizedlist os="p">
-      <listitem>
-        <para>The <emphasis>math</emphasis> tests sometimes fail.
-        Certain optimization settings are known to be a
-        factor here.</para>
-      </listitem>
-      <listitem>
-        <para>The <emphasis>gettext</emphasis> test sometimes fails due to
-        host system issues. The exact reasons are not yet clear.</para>
-      </listitem>
-      <listitem>
-        <para>If you have mounted the LFS partition with the
-        <parameter>noatime</parameter> option, the <emphasis>atime</emphasis> test
-        will fail. As mentioned in <xref linkend="ch-partitioning-mounting"/>,
-        do not use the <parameter>noatime</parameter> option while building
-        LFS.</para>
-      </listitem>
-      <listitem>
-        <para>When running on older and slower hardware, some tests
-        can fail because of test timeouts being exceeded.</para>
-      </listitem>
-    </itemizedlist>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/glibc-n32.xml
===================================================================
--- BOOK/final-system/mips64/glibc-n32.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/final-system/mips64/glibc-n32.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -50,8 +50,8 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Now we make sure the Glibc goes into
+    <para os="m1">Now we make sure the Glibc goes into
     <filename class="directory">/lib32</filename>:</para>
 
-<screen><userinput>echo "slibdir=/lib32" &gt;&gt; configparms</userinput></screen>
+<screen os="m2"><userinput>echo "slibdir=/lib32" &gt;&gt; configparms</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -59,10 +59,10 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
+<screen os="h"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
     ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
     --libexecdir=/usr/lib32/glibc --libdir=/usr/lib32</userinput></screen>
 
-    <variablelist>
+    <variablelist os="i">
       <title>The meaning of the new configure option:</title>
 
@@ -94,37 +94,15 @@
     xpointer="xpointer(//*[@os='m'])"/>
 
-<!-- items n,o,p here are now the master, not multilib, because
- the tests are known to all pass on multilib_64 -->
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
 
-<screen os="n"><userinput>make check</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
 
-    <para os="o">The Glibc test suite is highly dependent on certain functions of
-    the host system, in particular the kernel. In general, the Glibc test
-    suite is always expected to pass. However, in certain circumstances,
-    some failures are unavoidable. This is a list of the most common
-    issues:</para>
-
-    <itemizedlist os="p">
-      <listitem>
-        <para>The <emphasis>math</emphasis> tests sometimes fail.
-        Certain optimization settings are known to be a
-        factor here.</para>
-      </listitem>
-      <listitem>
-        <para>The <emphasis>gettext</emphasis> test sometimes fails due to
-        host system issues. The exact reasons are not yet clear.</para>
-      </listitem>
-      <listitem>
-        <para>If you have mounted the LFS partition with the
-        <parameter>noatime</parameter> option, the <emphasis>atime</emphasis> test
-        will fail. As mentioned in <xref linkend="ch-partitioning-mounting"/>,
-        do not use the <parameter>noatime</parameter> option while building
-        LFS.</para>
-      </listitem>
-      <listitem>
-        <para>When running on older and slower hardware, some tests
-        can fail because of test timeouts being exceeded.</para>
-      </listitem>
-    </itemizedlist>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/glibc.xml
===================================================================
--- BOOK/final-system/mips64/glibc.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/final-system/mips64/glibc.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -59,8 +59,7 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc --host=${LFS_TARGET32}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <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 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/final-system/multilib/glibc-64bit.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -42,8 +42,8 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Now we make sure the Glibc goes into
+    <para os="m1">Now we make sure the Glibc goes into
     <filename class="directory">/lib64</filename>:</para>
 
-<screen><userinput>echo "slibdir=/lib64" &gt;&gt; configparms</userinput></screen>
+<screen os="m2"><userinput>echo "slibdir=/lib64" &gt;&gt; configparms</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -51,10 +51,10 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
     ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
     --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64</userinput></screen>
 
-    <variablelist>
+    <variablelist os="i">
       <title>The meaning of the new configure option:</title>
 
Index: BOOK/final-system/multilib/glibc.xml
===================================================================
--- BOOK/final-system/multilib/glibc.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/final-system/multilib/glibc.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -51,5 +51,5 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
+<screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
     ../glibc-&glibc-version;/configure --prefix=/usr \
     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
Index: BOOK/final-system/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/glibc-64bit.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/final-system/sparc64/glibc-64bit.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -50,8 +50,11 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Now we make sure the Glibc goes into
-    <filename class="directory">/lib64</filename>:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen><userinput>echo "slibdir=/lib64" &gt;&gt; configparms</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='m2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -59,22 +62,11 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <variablelist>
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--libexecdir=/usr/lib64/glibc</parameter></term>
-        <listitem>
-          <para>This changes the location of the <command>pt_chown</command>
-          program from its default of <filename
-          class="directory">/usr/libexec</filename> to <filename
-          class="directory">/usr/lib64/glibc</filename>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -94,37 +86,15 @@
     xpointer="xpointer(//*[@os='m'])"/>
 
-<!-- items n,o,p here are now the master, not multilib, because
- the tests are known to all pass on multilib_64 -->
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
 
-<screen os="n"><userinput>make check</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
 
-    <para os="o">The Glibc test suite is highly dependent on certain functions of
-    the host system, in particular the kernel. In general, the Glibc test
-    suite is always expected to pass. However, in certain circumstances,
-    some failures are unavoidable. This is a list of the most common
-    issues:</para>
-
-    <itemizedlist os="p">
-      <listitem>
-        <para>The <emphasis>math</emphasis> tests sometimes fail.
-        Certain optimization settings are known to be a
-        factor here.</para>
-      </listitem>
-      <listitem>
-        <para>The <emphasis>gettext</emphasis> test sometimes fails due to
-        host system issues. The exact reasons are not yet clear.</para>
-      </listitem>
-      <listitem>
-        <para>If you have mounted the LFS partition with the
-        <parameter>noatime</parameter> option, the <emphasis>atime</emphasis> test
-        will fail. As mentioned in <xref linkend="ch-partitioning-mounting"/>,
-        do not use the <parameter>noatime</parameter> option while building
-        LFS.</para>
-      </listitem>
-      <listitem>
-        <para>When running on older and slower hardware, some tests
-        can fail because of test timeouts being exceeded.</para>
-      </listitem>
-    </itemizedlist>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -146,46 +116,7 @@
   xpointer="xpointer(id('conf-glibc'))"/>
 
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring Dynamic Loader</title>
-
-    <indexterm zone="conf-ld">
-      <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para>By default, the dynamic loader (<filename
-    class="libraryfile">/lib/ld-linux.so.2</filename>) searches through
-    <filename class="directory">/lib</filename> and <filename
-    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
-    added to the <filename>/etc/ld.so.conf</filename> file in order
-    for the dynamic loader to find them. Some directories that are commonly
-    known to contain additional libraries are
-    <filename class="directory">/usr/local/lib</filename>,
-    <filename class="directory">/usr/local/lib32</filename>,
-    <filename class="directory">/usr/local/lib64</filename>,
-    <filename class="directory">/opt/lib</filename>,
-    <filename class="directory">/opt/lib32</filename>,
-    and <filename class="directory">/opt/lib64</filename>,
-    so add those directories to the dynamic loader's search path.</para>
-
-    <para>Create a new file <filename>/etc/ld.so.conf</filename> by running the
-    following:</para>
-
-<screen><userinput>cat &gt; /etc/ld.so.conf &lt;&lt; "EOF"
-<literal># Begin /etc/ld.so.conf
-
-/usr/local/lib
-/usr/local/lib32
-/usr/local/lib64
-/opt/lib
-/opt/lib32
-/opt/lib64
-
-# End /etc/ld.so.conf</literal>
-EOF</userinput></screen>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../multilib/glibc-64bit.xml"
+  xpointer="xpointer(id('conf-ld'))"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64/glibc.xml
===================================================================
--- BOOK/final-system/sparc64/glibc.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/final-system/sparc64/glibc.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -59,11 +59,10 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc --host=${LFS_TARGET32}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
+    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 834aff7a84db3ff2ca2419c974508dc04f7b578d)
+++ BOOK/introduction/common/changelog.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -38,4 +38,13 @@
 
    <listitem>
+      <para>November 28 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Text updates to glibc in all sections.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+   <listitem>
       <para>November 27 2005</para>
       <itemizedlist>
