Index: BOOK/cross-tools/x86/eglibc.xml
===================================================================
--- BOOK/cross-tools/x86/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
+++ 	(revision )
@@ -1,161 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-eglibc" role="wrap">
-  <?dbhtml filename="eglibc.html"?>
-
-  <title>EGLIBC-&eglibc-version;</title>
-
-  <indexterm zone="ch-cross-tools-eglibc">
-    <primary sortas="a-EGLIBC">EGLIBC</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/eglibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of EGLIBC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; $CLFS_TARGET) -O2" \
-    ../eglibc-&eglibc-version;/configure --prefix=/tools \
-    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
-    --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/eglibc.xml"
-      xpointer="xpointer(//*[@os='dg1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/eglibc.xml"
-      xpointer="xpointer(//*[@os='dg2'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/eglibc.xml"
-      xpointer="xpointer(//*[@os='dg3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/eglibc.xml"
-      xpointer="xpointer(//*[@os='dg4'])"/>
-
-      <varlistentry os="ea2">
-        <term><parameter>CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt;
-        $CLFS_TARGET)" -O2</parameter></term>
-        <listitem>
-          <para>Forces EGLIBC to optimize for our target system.</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/eglibc.xml"
-      xpointer="xpointer(//*[@os='dg5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/eglibc.xml"
-      xpointer="xpointer(//*[@os='dg6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/eglibc.xml"
-      xpointer="xpointer(//*[@os='dg7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/eglibc.xml"
-      xpointer="xpointer(//*[@os='dg8'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/eglibc.xml"
-      xpointer="xpointer(//*[@os='dg9'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/eglibc.xml"
-      xpointer="xpointer(//*[@os='dg10'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/eglibc.xml"
-      xpointer="xpointer(//*[@os='dg11'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-eglibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/x86/glibc.xml
===================================================================
--- BOOK/cross-tools/x86/glibc.xml	(revision cbbd1e403c6b3acc2fa5463f3c54463ea7592b93)
+++ BOOK/cross-tools/x86/glibc.xml	(revision cbbd1e403c6b3acc2fa5463f3c54463ea7592b93)
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-glibc" role="wrap">
+  <?dbhtml filename="glibc.html"?>
+
+  <title>GLIBC-&glibc-version;</title>
+
+  <indexterm zone="ch-cross-tools-glibc">
+    <primary sortas="a-GLIBC">GLIBC</primary>
+    <secondary>cross tools</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../final-system/common/glibc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of GLIBC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/glibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/glibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dd'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='de'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/glibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
+    CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; $CLFS_TARGET) -O2" \
+    ../glibc-&glibc-version;/configure --prefix=/tools \
+    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
+    --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
+    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
+    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+
+    <variablelist os="dg">
+      <title>The meaning of the new configure options:</title>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg1'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg2'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg3'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg4'])"/>
+
+      <varlistentry os="ea2">
+        <term><parameter>CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt;
+        $CLFS_TARGET)" -O2</parameter></term>
+        <listitem>
+          <para>Forces GLIBC to optimize for our target system.</para>
+        </listitem>
+      </varlistentry>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg5'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg6'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg7'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg8'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg9'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg10'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/glibc.xml"
+      xpointer="xpointer(//*[@os='dg11'])"/>
+
+    </variablelist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dh'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='di'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dj'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dk'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dl'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dm'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dn'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-glibc" role="."/></para>
+
+  </sect2>
+
+</sect1>
