Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/introduction/common/changelog.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -43,4 +43,7 @@
           <para>[jim] - Text updates to glibc in all sections.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Text updates to temp-system.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: OK/temp-system/64/bash.xml
===================================================================
--- BOOK/temp-system/64/bash.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-bash" role="wrap">
-  <?dbhtml filename="bash.html"?>
-
-  <title>Bash-&bash-version;</title>
-
-  <indexterm zone="ch-temp-system-bash">
-    <primary sortas="a-Bash">Bash</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/bash.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bash</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-   ./configure --prefix=/tools --with-curses \
-   --without-bash-malloc --host=${LFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bash" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/bison.xml
===================================================================
--- BOOK/temp-system/64/bison.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-bison" xreflabel="Bison" role="wrap">
-  <?dbhtml filename="bison.html"?>
-
-  <title>Bison-&bison-version;</title>
-
-  <indexterm zone="ch-temp-system-bison">
-    <primary sortas="a-Bison">Bison</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/bison.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bison</title>
-
-    <para>Prepare Bison for compilation:</para>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --host=${LFS_TARGET}</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bison" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/64/bzip2.xml
===================================================================
--- BOOK/temp-system/64/bzip2.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/64/bzip2.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -35,9 +35,13 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>make CC="${CC} ${BUILD64}" AR="${AR}" RANLIB="${RANLIB}"</userinput></screen>
+<screen os="cc"><userinput>make CC="${CC} ${BUILD64}" AR="${AR}" RANLIB="${RANLIB}"</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='cd'])"/>
 
-<screen><userinput>make PREFIX=/tools install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='ce'])"/>
 
   </sect2>
Index: OK/temp-system/64/coreutils.xml
===================================================================
--- BOOK/temp-system/64/coreutils.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-coreutils" role="wrap">
-  <?dbhtml filename="coreutils.html"?>
-
-  <title>Coreutils-&coreutils-version;</title>
-
-  <indexterm zone="ch-temp-system-coreutils">
-    <primary sortas="a-Coreutils">Coreutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/coreutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Coreutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-<screen><userinput>CC="${CC} ${BUILD64}" \
-   ./configure --prefix=/tools --cache-file=config.cache \
-   --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-coreutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/diffutils.xml
===================================================================
--- BOOK/temp-system/64/diffutils.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-diffutils" role="wrap">
-  <?dbhtml filename="diffutils.html"?>
-
-  <title>Diffutils-&diffutils-version;</title>
-
-  <indexterm zone="ch-temp-system-diffutils">
-    <primary sortas="a-Diffutils">Diffutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/diffutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Diffutils</title>
-
-    <para>Prepare Diffutils for compilation:</para>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-  --host=${LFS_TARGET}</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-diffutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/findutils.xml
===================================================================
--- BOOK/temp-system/64/findutils.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-findutils" role="wrap">
-  <?dbhtml filename="findutils.html"?>
-
-  <title>Findutils-&findutils-version;</title>
-
-  <indexterm zone="ch-temp-system-findutils">
-    <primary sortas="a-Findutils">Findutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/findutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Findutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bzip2" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/flex.xml
===================================================================
--- BOOK/temp-system/64/flex.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-flex" role="wrap">
-  <?dbhtml filename="flex.html"?>
-
-  <title>Flex-&flex-version;</title>
-
-  <indexterm zone="ch-temp-system-flex">
-    <primary sortas="a-Flex">Flex</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --host=${LFS_TARGET} --disable-nls</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-flex" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/gawk.xml
===================================================================
--- BOOK/temp-system/64/gawk.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gawk" role="wrap">
-  <?dbhtml filename="gawk.html"?>
-
-  <title>Gawk-&gawk-version;</title>
-
-  <indexterm zone="ch-temp-system-gawk">
-    <primary sortas="a-Gawk">Gawk</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gawk.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gawk</title>
-
-    <para>Prepare Gawk for compilation:</para>
-
-<screen><userinput>CC="${CC} ${BUILD64}" \
-   ./configure --prefix=/tools --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gawk" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/64/gettext.xml
===================================================================
--- BOOK/temp-system/64/gettext.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/64/gettext.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -31,7 +31,9 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<para>Prepare Gettext for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+<screen os="d"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools \
    --host=${LFS_TARGET} --disable-libasprintf \
@@ -40,13 +42,21 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
   </sect2>
Index: OK/temp-system/64/grep.xml
===================================================================
--- BOOK/temp-system/64/grep.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-grep" role="wrap">
-  <?dbhtml filename="grep.html"?>
-
-  <title>Grep-&grep-version;</title>
-
-  <indexterm zone="ch-temp-system-grep">
-    <primary sortas="a-Grep">Grep</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/grep.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Grep</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --host=${LFS_TARGET} --disable-perl-regexp</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-  <para>Details on this package are located in <xref
-  linkend="contents-grep" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/gzip.xml
===================================================================
--- BOOK/temp-system/64/gzip.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gzip" role="wrap">
-  <?dbhtml filename="gzip.html"?>
-
-  <title>Gzip-&gzip-version;</title>
-
-  <indexterm zone="ch-temp-system-gzip">
-    <primary sortas="a-Gzip">Gzip</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gzip.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gzip</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-  --host=${LFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gzip" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/m4.xml
===================================================================
--- BOOK/temp-system/64/m4.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-m4" role="wrap">
-  <?dbhtml filename="m4.html"?>
-
-  <title>M4-&m4-version;</title>
-
-  <indexterm zone="ch-temp-system-m4">
-    <primary sortas="a-M4">M4</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/m4.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of M4</title>
-
-    <para>Prepare M4 for compilation:</para>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --host=${LFS_TARGET}</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-m4" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/make.xml
===================================================================
--- BOOK/temp-system/64/make.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-make" role="wrap">
-  <?dbhtml filename="make.html"?>
-
-  <title>Make-&make-version;</title>
-
-  <indexterm zone="ch-temp-system-make">
-    <primary sortas="a-Make">Make</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/make.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Make</title>
-
-    <para>Prepare Make for compilation:</para>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --host=${LFS_TARGET}</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-make" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/64/ncurses.xml
===================================================================
--- BOOK/temp-system/64/ncurses.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/64/ncurses.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -27,5 +27,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools --with-shared \
    --host=${LFS_TARGET} --without-debug --without-ada \
Index: OK/temp-system/64/patch.xml
===================================================================
--- BOOK/temp-system/64/patch.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-patch" role="wrap">
-  <?dbhtml filename="patch.html"?>
-
-  <title>Patch-&patch-version;</title>
-
-  <indexterm zone="ch-temp-system-patch">
-    <primary sortas="a-Patch">Patch</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/patch.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Patch</title>
-
-    <para>Prepare Patch for compilation:</para>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --host=${LFS_TARGET}</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-patch" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/sed.xml
===================================================================
--- BOOK/temp-system/64/sed.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-sed" role="wrap">
-  <?dbhtml filename="sed.html"?>
-
-  <title>Sed-&sed-version;</title>
-
-  <indexterm zone="ch-temp-system-sed">
-    <primary sortas="a-Sed">Sed</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/sed.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sed</title>
-
-    <para>Prepare Sed for compilation:</para>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --host=${LFS_TARGET}</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sed" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/tar.xml
===================================================================
--- BOOK/temp-system/64/tar.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-tar" role="wrap">
-  <?dbhtml filename="tar.html"?>
-
-  <title>Tar-&tar-version;</title>
-
-  <indexterm zone="ch-temp-system-tar">
-    <primary sortas="a-Tar">Tar</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/tar.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Tar</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-tar" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/64/zlib.xml
===================================================================
--- BOOK/temp-system/64/zlib.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/64/zlib.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -31,10 +31,10 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/tools --shared</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/alpha-chapter.xml
===================================================================
--- BOOK/temp-system/alpha-chapter.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/alpha-chapter.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -23,9 +23,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
Index: BOOK/temp-system/common/bash.xml
===================================================================
--- BOOK/temp-system/common/bash.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/common/bash.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -40,8 +40,8 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>./configure --prefix=/tools --with-curses \
+<screen os="ac"><userinput>./configure --prefix=/tools --with-curses \
    --without-bash-malloc --host=${LFS_TARGET}</userinput></screen>
 
-    <variablelist os="ac">
+    <variablelist os="ad">
       <title>The meaning of the configure options:</title>
 
@@ -81,8 +81,8 @@
     xpointer="xpointer(//*[@os='m'])"/>
 
-    <para os="ad">Make a link for the programs that use <command>sh</command> for
+    <para os="ae">Make a link for the programs that use <command>sh</command> for
     a shell:</para>
 
-<screen os="ae"><userinput>ln -s bash /tools/bin/sh</userinput></screen>
+<screen os="af"><userinput>ln -s bash /tools/bin/sh</userinput></screen>
 
   </sect2>
Index: OK/temp-system/common/bison.xml
===================================================================
--- BOOK/temp-system/common/bison.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-bison" xreflabel="Bison" role="wrap">
-  <?dbhtml filename="bison.html"?>
-
-  <title>Bison-&bison-version;</title>
-
-  <indexterm zone="ch-temp-system-bison">
-    <primary sortas="a-Bison">Bison</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/bison.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bison</title>
-
-    <para>Prepare Bison for compilation:</para>
-
-<screen><userinput>./configure --prefix=/tools \
-   --host=${LFS_TARGET}</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bison" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/common/bzip2.xml
===================================================================
--- BOOK/temp-system/common/bzip2.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/common/bzip2.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -33,9 +33,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>make CC="${CC}" AR="${AR}" RANLIB="${RANLIB}"</userinput></screen>
+<screen os="cc"><userinput>make CC="${CC}" AR="${AR}" RANLIB="${RANLIB}"</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="cd">Install the package:</para>
 
-<screen><userinput>make PREFIX=/tools install</userinput></screen>
+<screen os="ce"><userinput>make PREFIX=/tools install</userinput></screen>
 
   </sect2>
Index: BOOK/temp-system/common/coreutils.xml
===================================================================
--- BOOK/temp-system/common/coreutils.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/common/coreutils.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -30,8 +30,8 @@
     <para os="bd">Prepare Coreutils for compilation:</para>
 
-<screen><userinput>./configure --prefix=/tools --cache-file=config.cache \
+<screen os="be"><userinput>./configure --prefix=/tools --cache-file=config.cache \
    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
 
-    <variablelist os="be">
+    <variablelist os="bf">
       <title>The meaning of the configure options:</title>
 
@@ -45,11 +45,11 @@
     </variablelist>
 
-    <para os="bf">Compile the package:</para>
+    <para os="bg">Compile the package:</para>
 
-<screen os="bg"><userinput>make</userinput></screen>
+<screen os="bh"><userinput>make</userinput></screen>
 
-    <para os="bh">Install the package:</para>
+    <para os="bi">Install the package:</para>
 
-<screen os="bi"><userinput>make install</userinput></screen>
+<screen os="bj"><userinput>make install</userinput></screen>
 
   </sect2>
Index: BOOK/temp-system/common/diffutils.xml
===================================================================
--- BOOK/temp-system/common/diffutils.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/common/diffutils.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -23,16 +23,16 @@
     <title>Installation of Diffutils</title>
 
-    <para>Prepare Diffutils for compilation:</para>
+    <para os="a">Prepare Diffutils for compilation:</para>
 
-<screen><userinput>./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
     --host=${LFS_TARGET}</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="e">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="f"><userinput>make install</userinput></screen>
 
   </sect2>
Index: BOOK/temp-system/common/findutils.xml
===================================================================
--- BOOK/temp-system/common/findutils.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/common/findutils.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -32,5 +32,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>./configure --prefix=/tools \
+<screen os="ac"><userinput>./configure --prefix=/tools \
    --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
 
Index: OK/temp-system/common/flex.xml
===================================================================
--- BOOK/temp-system/common/flex.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-flex" role="wrap">
-  <?dbhtml filename="flex.html"?>
-
-  <title>Flex-&flex-version;</title>
-
-  <indexterm zone="ch-temp-system-flex">
-    <primary sortas="a-Flex">Flex</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen><userinput>./configure --prefix=/tools \
-   --host=${LFS_TARGET} --disable-nls</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-flex" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/common/gawk.xml
===================================================================
--- BOOK/temp-system/common/gawk.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/common/gawk.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -23,16 +23,16 @@
     <title>Installation of Gawk</title>
 
-    <para>Prepare Gawk for compilation:</para>
+    <para os="a">Prepare Gawk for compilation:</para>
 
-<screen><userinput>./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="e">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="f"><userinput>make install</userinput></screen>
 
   </sect2>
Index: BOOK/temp-system/common/gettext.xml
===================================================================
--- BOOK/temp-system/common/gettext.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/common/gettext.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -28,14 +28,14 @@
 <screen os="b"><userinput>echo "am_cv_func_working_getline=yes" &gt;&gt; config.cache</userinput></screen>
 
-    <para>Prepare Gettext for compilation:</para>
+    <para os="c">Prepare Gettext for compilation:</para>
 
-<screen><userinput>./configure --prefix=/tools \
+<screen os="d"><userinput>./configure --prefix=/tools \
    --host=${LFS_TARGET} --disable-libasprintf \
    --without-csharp --cache-file=config.cache</userinput></screen>
 
-    <variablelist os="c">
+    <variablelist os="e">
       <title>The meaning of the configure options:</title>
 
-      <varlistentry os="c1">
+      <varlistentry os="e1">
         <term><parameter>--disable-libasprintf</parameter></term>
         <listitem>
@@ -48,5 +48,5 @@
       </varlistentry>
 
-      <varlistentry os="c2">
+      <varlistentry os="e2">
         <term><parameter>--without-csharp</parameter></term>
         <listitem>
@@ -59,11 +59,11 @@
     </variablelist>
 
-    <para>Compile the package:</para>
+    <para os="f">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="g"><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="h">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="i"><userinput>make install</userinput></screen>
 
   </sect2>
Index: BOOK/temp-system/common/grep.xml
===================================================================
--- BOOK/temp-system/common/grep.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/common/grep.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -27,8 +27,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>./configure --prefix=/tools \
+<screen os="ca"><userinput>./configure --prefix=/tools \
    --host=${LFS_TARGET} --disable-perl-regexp</userinput></screen>
 
-    <variablelist os="ca">
+    <variablelist os="cb">
       <title>The meaning of the configure options:</title>
 
Index: BOOK/temp-system/common/gzip.xml
===================================================================
--- BOOK/temp-system/common/gzip.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/common/gzip.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -33,5 +33,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>./configure --prefix=/tools \
+<screen os="ac"><userinput>./configure --prefix=/tools \
    --host=${LFS_TARGET}</userinput></screen>
 
Index: OK/temp-system/common/m4.xml
===================================================================
--- BOOK/temp-system/common/m4.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-m4" role="wrap">
-  <?dbhtml filename="m4.html"?>
-
-  <title>M4-&m4-version;</title>
-
-  <indexterm zone="ch-temp-system-m4">
-    <primary sortas="a-M4">M4</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/m4.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of M4</title>
-
-    <para>Prepare M4 for compilation:</para>
-
-<screen><userinput>./configure --prefix=/tools \
-   --host=${LFS_TARGET}</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-m4" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/common/make.xml
===================================================================
--- BOOK/temp-system/common/make.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/common/make.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -27,7 +27,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Prepare Make for compilation:</para>
+    <para os="aa">Prepare Make for compilation:</para>
 
-<screen><userinput>./configure --prefix=/tools \
+<screen os="ab"><userinput>./configure --prefix=/tools \
    --host=${LFS_TARGET}</userinput></screen>
 
Index: BOOK/temp-system/common/ncurses.xml
===================================================================
--- BOOK/temp-system/common/ncurses.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/common/ncurses.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -27,5 +27,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>./configure --prefix=/tools --with-shared \
+<screen os="aa"><userinput>./configure --prefix=/tools --with-shared \
    --host=${LFS_TARGET} --without-debug --without-ada \
    --enable-overwrite --with-build-cc=gcc</userinput></screen>
Index: BOOK/temp-system/common/patch.xml
===================================================================
--- BOOK/temp-system/common/patch.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/common/patch.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -23,15 +23,15 @@
     <title>Installation of Patch</title>
 
-    <para>Prepare Patch for compilation:</para>
+    <para os="a">Prepare Patch for compilation:</para>
 
-<screen><userinput>./configure --prefix=/tools --host=${LFS_TARGET}</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/tools --host=${LFS_TARGET}</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="e">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="f"><userinput>make install</userinput></screen>
 
   </sect2>
Index: BOOK/temp-system/common/sed.xml
===================================================================
--- BOOK/temp-system/common/sed.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/common/sed.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -23,16 +23,16 @@
     <title>Installation of Sed</title>
 
-    <para>Prepare Sed for compilation:</para>
+    <para os="a">Prepare Sed for compilation:</para>
 
-<screen><userinput>./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
    --host=${LFS_TARGET}</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para os="c">Compile the package:</para>
 
-<screen><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="e">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="f"><userinput>make install</userinput></screen>
 
   </sect2>
Index: BOOK/temp-system/common/tar.xml
===================================================================
--- BOOK/temp-system/common/tar.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/common/tar.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -32,5 +32,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>./configure --prefix=/tools \
+<screen os="ac"><userinput>./configure --prefix=/tools \
    --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
 
Index: BOOK/temp-system/common/zlib.xml
===================================================================
--- BOOK/temp-system/common/zlib.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/common/zlib.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -31,13 +31,13 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>./configure --prefix=/tools --shared</userinput></screen>
+<screen os="aa"><userinput>./configure --prefix=/tools --shared</userinput></screen>
 
-    <variablelist os="aa">
+    <variablelist os="ab">
       <title>The meaning of the configure options:</title>
 
-      <varlistentry os="aa1">
+      <varlistentry os="ab1">
         <term><parameter>--shared</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>Tells zlib to build shared libraries.</para>
         </listitem>
       </varlistentry>
Index: BOOK/temp-system/mips-chapter.xml
===================================================================
--- BOOK/temp-system/mips-chapter.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/mips-chapter.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -23,9 +23,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/grep.xml"/>
Index: BOOK/temp-system/mips/grep.xml
===================================================================
--- BOOK/temp-system/mips/grep.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/mips/grep.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -35,10 +35,11 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>./configure --prefix=/tools \
-   --host=${LFS_TARGET} --disable-perl-regexp</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/grep.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
+    xpointer="xpointer(//*[@os='cb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/mips/make.xml
===================================================================
--- BOOK/temp-system/mips/make.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/mips/make.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -35,8 +35,11 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Prepare Make for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/make.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
-<screen><userinput>./configure --prefix=/tools \
-   --host=${LFS_TARGET}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/make.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/mips64-64-chapter.xml
===================================================================
--- BOOK/temp-system/mips64-64-chapter.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/mips64-64-chapter.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -17,23 +17,18 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/findutils.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/flex.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: OK/temp-system/mips64-64/grep.xml
===================================================================
--- BOOK/temp-system/mips64-64/grep.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-grep" role="wrap">
-  <?dbhtml filename="grep.html"?>
-
-  <title>Grep-&grep-version;</title>
-
-  <indexterm zone="ch-temp-system-grep">
-    <primary sortas="a-Grep">Grep</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/grep.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Grep</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/grep.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/grep.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --host=${LFS_TARGET} --disable-perl-regexp</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-  <para>Details on this package are located in <xref
-  linkend="contents-grep" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/mips64-64/make.xml
===================================================================
--- BOOK/temp-system/mips64-64/make.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-make" role="wrap">
-  <?dbhtml filename="make.html"?>
-
-  <title>Make-&make-version;</title>
-
-  <indexterm zone="ch-temp-system-make">
-    <primary sortas="a-Make">Make</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/make.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Make</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/make.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/make.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <para>Prepare Make for compilation:</para>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --host=${LFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-make" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/mips64-chapter.xml
===================================================================
--- BOOK/temp-system/mips64-chapter.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/mips64-chapter.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -25,9 +25,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
-  -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/grep.xml"/>
Index: BOOK/temp-system/mips64/grep.xml
===================================================================
--- BOOK/temp-system/mips64/grep.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/mips64/grep.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -35,10 +35,11 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --host=${LFS_TARGET} --disable-perl-regexp</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/grep.xml"
+    xpointer="xpointer(//*[@os='ca'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
+    xpointer="xpointer(//*[@os='cb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/mips64/make.xml
===================================================================
--- BOOK/temp-system/mips64/make.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/mips64/make.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -35,8 +35,11 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Prepare Make for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/make.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --host=${LFS_TARGET}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/make.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/multilib/bash.xml
===================================================================
--- BOOK/temp-system/multilib/bash.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/bash.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -43,5 +43,5 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+<screen os="ac"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools --with-curses \
    --without-bash-malloc --host=${LFS_TARGET}</userinput></screen>
@@ -49,5 +49,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
+    xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -69,9 +69,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
+    xpointer="xpointer(//*[@os='ae'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
+    xpointer="xpointer(//*[@os='af'])"/>
 
   </sect2>
Index: OK/temp-system/multilib/bison.xml
===================================================================
--- BOOK/temp-system/multilib/bison.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-bison" xreflabel="Bison" role="wrap">
-  <?dbhtml filename="bison.html"?>
-
-  <title>Bison-&bison-version;</title>
-
-  <indexterm zone="ch-temp-system-bison">
-    <primary sortas="a-Bison">Bison</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/bison.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bison</title>
-
-    <para>Prepare Bison for compilation:</para>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --host=${LFS_TARGET} --libdir=/tools/lib64</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bison" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/multilib/bzip2.xml
===================================================================
--- BOOK/temp-system/multilib/bzip2.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/bzip2.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -35,9 +35,13 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>make CC="${CC} ${BUILD64}" AR="${AR}" RANLIB="${RANLIB}"</userinput></screen>
+<screen os="cc"><userinput>make CC="${CC} ${BUILD64}" AR="${AR}" RANLIB="${RANLIB}"</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='cd'])"/>
 
-<screen><userinput>make PREFIX=/tools install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bzip2.xml"
+    xpointer="xpointer(//*[@os='ce'])"/>
 
   </sect2>
Index: BOOK/temp-system/multilib/coreutils.xml
===================================================================
--- BOOK/temp-system/multilib/coreutils.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/coreutils.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -35,11 +35,7 @@
     xpointer="xpointer(//*[@os='bd'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" \
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/tools --cache-file=config.cache \
    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -59,4 +55,8 @@
     xpointer="xpointer(//*[@os='bi'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
+
   </sect2>
 
Index: BOOK/temp-system/multilib/diffutils.xml
===================================================================
--- BOOK/temp-system/multilib/diffutils.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/diffutils.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -23,16 +23,26 @@
     <title>Installation of Diffutils</title>
 
-    <para>Prepare Diffutils for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
   --host=${LFS_TARGET}</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
Index: BOOK/temp-system/multilib/findutils.xml
===================================================================
--- BOOK/temp-system/multilib/findutils.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/findutils.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -35,5 +35,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="ac"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
 
Index: OK/temp-system/multilib/flex.xml
===================================================================
--- BOOK/temp-system/multilib/flex.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-flex" role="wrap">
-  <?dbhtml filename="flex.html"?>
-
-  <title>Flex-&flex-version;</title>
-
-  <indexterm zone="ch-temp-system-flex">
-    <primary sortas="a-Flex">Flex</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --host=${LFS_TARGET} --disable-nls --libdir=/tools/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-flex" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/multilib/gawk.xml
===================================================================
--- BOOK/temp-system/multilib/gawk.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/gawk.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -23,17 +23,27 @@
     <title>Installation of Gawk</title>
 
-    <para>Prepare Gawk for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gawk.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/tools \
    --build=${LFS_HOST} --host=${LFS_TARGET}</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gawk.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gawk.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gawk.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gawk.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
Index: BOOK/temp-system/multilib/gettext-64bit.xml
===================================================================
--- BOOK/temp-system/multilib/gettext-64bit.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/gettext-64bit.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -30,18 +30,28 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Prepare Gettext for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gettext.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+<screen os="d"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools --libdir=/tools/lib64 \
    --host=${LFS_TARGET} --disable-libasprintf \
    --without-csharp --cache-file=config.cache</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gettext.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gettext.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gettext.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gettext.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
   </sect2>
Index: BOOK/temp-system/multilib/gettext-n32.xml
===================================================================
--- BOOK/temp-system/multilib/gettext-n32.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/gettext-n32.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -30,12 +30,14 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-    <para>Prepare Gettext for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gettext.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILDN32}" CXX="${CXX} ${BUILDN32}" \
+<screen os="d"><userinput>CC="${CC} ${BUILDN32}" CXX="${CXX} ${BUILDN32}" \
    ./configure --prefix=/tools --libdir=/tools/lib32 \
    --host=${LFS_TARGET} --disable-libasprintf \
    --without-csharp --cache-file=config.cache</userinput></screen>
 
-    <variablelist>
+    <variablelist os="e">
       <title>The meaning of the configure options:</title>
 
@@ -43,5 +45,6 @@
         <term><parameter>CXX="${CXX} ${BUILDN32}"</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>Forces Gettext is use our Target Architecture g++ compiler
+          with our N32 flags.</para>
         </listitem>
       </varlistentry>
@@ -49,11 +52,19 @@
     </variablelist>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gettext.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gettext.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gettext.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gettext.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
   </sect2>
Index: BOOK/temp-system/multilib/gettext.xml
===================================================================
--- BOOK/temp-system/multilib/gettext.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/gettext.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -31,12 +31,14 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<para>Prepare Gettext for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD32}" CXX="${CXX} ${BUILD32}" \
+<screen os="d"><userinput>CC="${CC} ${BUILD32}" CXX="${CXX} ${BUILD32}" \
    ./configure --prefix=/tools \
    --host=${LFS_TARGET} --disable-libasprintf \
    --without-csharp --cache-file=config.cache</userinput></screen>
 
-    <variablelist>
+    <variablelist os="e">
       <title>The meaning of the configure options:</title>
 
@@ -44,5 +46,6 @@
         <term><parameter>CXX="${CXX} ${BUILD32}"</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>Forces Gettext is use our Target Architecture g++ compiler
+          with our 32 bit build flags.</para>
         </listitem>
       </varlistentry>
@@ -50,19 +53,27 @@
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/gettext.xml"
-      xpointer="xpointer(//*[@os='c1'])"/>
+      xpointer="xpointer(//*[@os='e1'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/gettext.xml"
-      xpointer="xpointer(//*[@os='c2'])"/>
+      xpointer="xpointer(//*[@os='e2'])"/>
 
     </variablelist>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gettext.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
   </sect2>
Index: BOOK/temp-system/multilib/grep.xml
===================================================================
--- BOOK/temp-system/multilib/grep.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/grep.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -27,10 +27,10 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="ca"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    --host=${LFS_TARGET} --disable-perl-regexp</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
+    xpointer="xpointer(//*[@os='cb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/multilib/gzip.xml
===================================================================
--- BOOK/temp-system/multilib/gzip.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/gzip.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -35,5 +35,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="ac"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
   --host=${LFS_TARGET}</userinput></screen>
 
Index: OK/temp-system/multilib/m4.xml
===================================================================
--- BOOK/temp-system/multilib/m4.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-m4" role="wrap">
-  <?dbhtml filename="m4.html"?>
-
-  <title>M4-&m4-version;</title>
-
-  <indexterm zone="ch-temp-system-m4">
-    <primary sortas="a-M4">M4</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/m4.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of M4</title>
-
-    <para>Prepare M4 for compilation:</para>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --host=${LFS_TARGET}</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-m4" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/multilib/make.xml
===================================================================
--- BOOK/temp-system/multilib/make.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/make.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -27,7 +27,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-    <para>Prepare Make for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/make.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="ab"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    --host=${LFS_TARGET}</userinput></screen>
 
Index: BOOK/temp-system/multilib/ncurses-64bit.xml
===================================================================
--- BOOK/temp-system/multilib/ncurses-64bit.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/ncurses-64bit.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -27,5 +27,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools --with-shared \
    --host=${LFS_TARGET} --without-debug --without-ada \
Index: BOOK/temp-system/multilib/ncurses-n32.xml
===================================================================
--- BOOK/temp-system/multilib/ncurses-n32.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/ncurses-n32.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -27,5 +27,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="${CC} ${BUILDN32}" CXX="${CXX} ${BUILDN32}" \
+<screen os="aa"><userinput>CC="${CC} ${BUILDN32}" CXX="${CXX} ${BUILDN32}" \
    ./configure --prefix=/tools --with-shared \
    --host=${LFS_TARGET} --without-debug --without-ada \
Index: BOOK/temp-system/multilib/ncurses.xml
===================================================================
--- BOOK/temp-system/multilib/ncurses.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/ncurses.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -27,5 +27,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD32}" CXX="${CXX} ${BUILD32}" \
+<screen os="aa"><userinput>CC="${CC} ${BUILD32}" CXX="${CXX} ${BUILD32}" \
    ./configure --prefix=/tools --with-shared \
    --host=${LFS_TARGET} --without-debug --without-ada \
Index: BOOK/temp-system/multilib/patch.xml
===================================================================
--- BOOK/temp-system/multilib/patch.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/patch.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -23,16 +23,26 @@
     <title>Installation of Patch</title>
 
-    <para>Prepare Patch for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --host=${LFS_TARGET}</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/patch.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
Index: BOOK/temp-system/multilib/sed.xml
===================================================================
--- BOOK/temp-system/multilib/sed.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/sed.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -23,16 +23,26 @@
     <title>Installation of Sed</title>
 
-    <para>Prepare Sed for compilation:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sed.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    --host=${LFS_TARGET}</userinput></screen>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sed.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sed.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+	
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sed.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/sed.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
   </sect2>
Index: BOOK/temp-system/multilib/tar.xml
===================================================================
--- BOOK/temp-system/multilib/tar.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/tar.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -35,5 +35,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="ac"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    --host=${LFS_TARGET} --cache-file=config.cache</userinput></screen>
 
Index: BOOK/temp-system/multilib/zlib-64bit.xml
===================================================================
--- BOOK/temp-system/multilib/zlib-64bit.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/zlib-64bit.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -31,5 +31,5 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/tools --shared --libdir=/tools/lib64</userinput></screen>
 
Index: BOOK/temp-system/multilib/zlib-n32.xml
===================================================================
--- BOOK/temp-system/multilib/zlib-n32.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/zlib-n32.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -31,8 +31,8 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>CC="${CC} ${BUILDN32}" \
+<screen os="aa"><userinput>CC="${CC} ${BUILDN32}" \
    ./configure --prefix=/tools --shared --libdir=/tools/lib32</userinput></screen>
 
-    <variablelist>
+    <variablelist os="ab">
       <title>The meaning of the new configure options:</title>
 
@@ -40,5 +40,6 @@
         <term><parameter>CC="${CC} ${BUILDN32}"</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>Tell ZLIB to use our architecutre specific gcc and use
+          our N32 build flags.</para>
         </listitem>
       </varlistentry>
Index: BOOK/temp-system/multilib/zlib.xml
===================================================================
--- BOOK/temp-system/multilib/zlib.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/multilib/zlib.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -31,8 +31,9 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD32}" \
-   ./configure --prefix=/tools --shared</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/zlib.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
-    <variablelist>
+    <variablelist os="ab">
       <title>The meaning of the configure options:</title>
 
@@ -40,5 +41,6 @@
         <term><parameter>CC="${CC} ${BUILD32}"</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>Tell ZLIB to use our architecutre specific gcc and use
+          our 32 bit build flags.</para>
         </listitem>
       </varlistentry>
@@ -46,5 +48,5 @@
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../common/zlib.xml"
-      xpointer="xpointer(//*[@os='aa1'])"/>
+      xpointer="xpointer(//*[@os='ab1'])"/>
 
     </variablelist>
Index: BOOK/temp-system/ppc-chapter.xml
===================================================================
--- BOOK/temp-system/ppc-chapter.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/ppc-chapter.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -23,9 +23,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
@@ -33,5 +28,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
Index: OK/temp-system/ppc/patch.xml
===================================================================
--- BOOK/temp-system/ppc/patch.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-patch" role="wrap">
-  <?dbhtml filename="patch.html"?>
-
-  <title>Patch-&patch-version;</title>
-
-  <indexterm zone="ch-temp-system-patch">
-    <primary sortas="a-Patch">Patch</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/patch.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Patch</title>
-
-    <para>Prepare Patch for compilation:</para>
-
-<screen><userinput>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/tools \
-   --host=${LFS_TARGET}</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>CPPFLAGS=-D_GNU_SOURCE</parameter></term>
-        <listitem>
-          <para>This do ...</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-patch" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/sparc-chapter.xml
===================================================================
--- BOOK/temp-system/sparc-chapter.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/sparc-chapter.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -23,9 +23,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
Index: BOOK/temp-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/temp-system/sparc64-64-chapter.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/sparc64-64-chapter.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -17,23 +17,18 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/findutils.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/flex.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/sparc64-chapter.xml
===================================================================
--- BOOK/temp-system/sparc64-chapter.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/sparc64-chapter.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -24,9 +24,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
-  -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
Index: BOOK/temp-system/x86-chapter.xml
===================================================================
--- BOOK/temp-system/x86-chapter.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/x86-chapter.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -23,9 +23,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
Index: BOOK/temp-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/temp-system/x86_64-64-chapter.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/x86_64-64-chapter.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -17,23 +17,18 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/coreutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/findutils.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/flex.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
 
Index: BOOK/temp-system/x86_64-chapter.xml
===================================================================
--- BOOK/temp-system/x86_64-chapter.xml	(revision a1a07620a3ca96bbb77159f67989d9529ed4b732)
+++ BOOK/temp-system/x86_64-chapter.xml	(revision 1bc8e5f316a7460c436574a854be81a4c6789b90)
@@ -24,9 +24,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
-  -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
