Index: BOOK/boot/64/e2fsprogs.xml
===================================================================
--- BOOK/boot/64/e2fsprogs.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/64/e2fsprogs.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -35,6 +35,7 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
---enable-elf-shlibs --disable-evms --host=${LFS_TARGET}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -46,5 +47,7 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make CC="${CC} ${BUILD64}" LDFLAGS="-s"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -66,9 +69,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
+    xpointer="xpointer(//*[@os='ae'])"/>
 
   </sect2>
Index: OK/boot/64/inetutils.xml
===================================================================
--- BOOK/boot/64/inetutils.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ 	(revision )
@@ -1,82 +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-boot-inetutils" role="wrap">
-  <?dbhtml filename="inetutils.html"?>
-
-  <title>Inetutils-&inetutils-version;</title>
-
-  <indexterm zone="ch-boot-inetutils">
-    <primary sortas="a-Inetutils">Inetutils</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/inetutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Inetutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>CC="${CC} ${BUILD64}" \
-   ./configure --prefix=/usr --libexecdir=/usr/sbin \
-   --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
-   --sysconfdir=/etc --disable-logger --disable-syslogd \
-   --disable-whois --disable-servers \
-   --with-ncurses-include-dir=/tools/include/ncurses</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-inetutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/64/module-init-tools.xml
===================================================================
--- BOOK/boot/64/module-init-tools.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ 	(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-boot-module-init-tools" role="wrap">
-  <?dbhtml filename="module-init-tools.html"?>
-
-  <title>Module-Init-Tools-&module-init-tools-version;</title>
-
-  <indexterm zone="ch-boot-module-init-tools">
-    <primary sortas="a-Module-Init-Tools">Module-Init-Tools</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/module-init-tools.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Module-Init-Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/ \
-   --host=${LFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-module-init-tools" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/64/sysvinit.xml
===================================================================
--- BOOK/boot/64/sysvinit.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ 	(revision )
@@ -1,63 +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-boot-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-boot-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sysvinit</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='configuration'])"/>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sysvinit" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/64/udev.xml
===================================================================
--- BOOK/boot/64/udev.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ 	(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-boot-udev" role="wrap">
-  <?dbhtml filename="udev.html"?>
-
-  <title>Udev-&udev-version;</title>
-
-  <indexterm zone="ch-boot-udev">
-    <primary sortas="a-Udev">Udev</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/udev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Udev</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>make CROSS="${LFS_TARGET}-" CC="${CC} ${BUILD64}" LD="${CC} ${BUILD64}" \
-    EXTRAS="extras/firmware extras/run_directory"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-udev" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/64/util-linux.xml
===================================================================
--- BOOK/boot/64/util-linux.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ 	(revision )
@@ -1,101 +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-boot-util-linux" role="wrap">
-  <?dbhtml filename="util-linux.html"?>
-
-  <title>Util-linux-&util-linux-version;</title>
-
-  <indexterm zone="ch-boot-util-linux">
-    <primary sortas="a-Util-linux">Util-linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/util-linux.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='bc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-util-linux" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/boot/alpha-chapter.xml
===================================================================
--- BOOK/boot/alpha-chapter.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/alpha-chapter.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -14,5 +14,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/sysvinit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
Index: OK/boot/alpha/sysvinit.xml
===================================================================
--- BOOK/boot/alpha/sysvinit.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ 	(revision )
@@ -1,111 +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-boot-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-boot-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sysvinit</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-  </sect2>
-
-  <sect2 id="conf-tools-sysvinit" role="configuration">
-    <title>Configuring Sysvinit</title>
-
-    <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="a-Sysvinit">Sysvinit</primary>
-      <secondary>boot, configuring</secondary>
-    </indexterm>
-
-    <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="e-${LFS}/etc/inittab">${LFS}/etc/inittab</primary>
-    </indexterm>
-
-    <para>Create a new file <filename>${LFS}/etc/inittab</filename> by
-    running the following:</para>
-
-<screen><userinput>cat &gt; ${LFS}/etc/inittab &lt;&lt; "EOF"
-<literal># Begin /etc/inittab
-
-id:3:initdefault:
-
-si::sysinit:/etc/rc.d/init.d/rc sysinit
-
-l0:0:wait:/etc/rc.d/init.d/rc 0
-l1:S1:wait:/etc/rc.d/init.d/rc 1
-l2:2:wait:/etc/rc.d/init.d/rc 2
-l3:3:wait:/etc/rc.d/init.d/rc 3
-l4:4:wait:/etc/rc.d/init.d/rc 4
-l5:5:wait:/etc/rc.d/init.d/rc 5
-l6:6:wait:/etc/rc.d/init.d/rc 6
-
-ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
-
-su:S016:once:/sbin/sulogin
-
-# Remove this section if you System only
-# has a console port
-1:2345:respawn:/sbin/agetty -I '\033(K' tty1 9600
-2:2345:respawn:/sbin/agetty -I '\033(K' tty2 9600
-3:2345:respawn:/sbin/agetty -I '\033(K' tty3 9600
-4:2345:respawn:/sbin/agetty -I '\033(K' tty4 9600
-5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600
-6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600
-
-# Uncomment this section if your system has a console
-# port
-#c0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100
-
-# End /etc/inittab</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sysvinit" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/boot/common/e2fsprogs.xml
===================================================================
--- BOOK/boot/common/e2fsprogs.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/common/e2fsprogs.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -35,9 +35,9 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>../configure --prefix=/tools \
+<screen os="aa"><userinput>../configure --prefix=/tools \
     --enable-elf-shlibs --disable-evms \
     --host=${LFS_TARGET}</userinput></screen>
 
-    <variablelist os="aa">
+    <variablelist os="ab">
       <title>The meaning of the configure options:</title>
 
@@ -56,5 +56,5 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make</userinput></screen>
+<screen os="ac"><userinput>make</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -74,7 +74,7 @@
     xpointer="xpointer(//*[@os='k'])"/>
 
-    <para os="ab">Create needed symlinks for a bootable system:</para>
+    <para os="ad">Create needed symlinks for a bootable system:</para>
 
-<screen os="ac"><userinput>install -d ${LFS}/sbin
+<screen os="ae"><userinput>install -d ${LFS}/sbin
 cd ${LFS}/sbin
 ln -sf ../tools/sbin/fsck.ext2 .
Index: BOOK/boot/common/inetutils.xml
===================================================================
--- BOOK/boot/common/inetutils.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/common/inetutils.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -43,5 +43,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \
+<screen os="aa"><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \
     --host=${LFS_TARGET} --sysconfdir=/etc --disable-logger \
     --disable-syslogd --disable-whois --disable-servers \
@@ -56,5 +56,5 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="aa"><userinput>make</userinput></screen>
+<screen os="ab"><userinput>make</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -62,5 +62,5 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="ab"><userinput>make DESTDIR="${LFS}" install</userinput></screen>
+<screen os="ac"><userinput>make DESTDIR="${LFS}" install</userinput></screen>
 
   </sect2>
Index: BOOK/boot/common/module-init-tools.xml
===================================================================
--- BOOK/boot/common/module-init-tools.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/common/module-init-tools.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -35,5 +35,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>./configure --prefix=/ \
+<screen os="d"><userinput>./configure --prefix=/ \
    --host=${LFS_TARGET}</userinput></screen>
 
@@ -42,5 +42,5 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="f"><userinput>make LDFLAGS="-s"</userinput></screen>
+<screen os="f"><userinput>make</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/common/sysvinit.xml
===================================================================
--- BOOK/boot/common/sysvinit.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/common/sysvinit.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -64,8 +64,8 @@
     </indexterm>
 
-    <para>Create a new file <filename>${LFS}/etc/inittab</filename> by
+    <para os="ae">Create a new file <filename>${LFS}/etc/inittab</filename> by
     running the following:</para>
 
-<screen><userinput>cat &gt; ${LFS}/etc/inittab &lt;&lt; "EOF"
+<screen os="af"><userinput>cat &gt; ${LFS}/etc/inittab &lt;&lt; "EOF"
 <literal># Begin /etc/inittab
 
Index: BOOK/boot/common/udev.xml
===================================================================
--- BOOK/boot/common/udev.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/common/udev.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -27,5 +27,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make CROSS="${LFS_TARGET}-" CC="${CC}" LD="${CC}" \
+<screen os="aa"><userinput>make CROSS="${LFS_TARGET}-" CC="${CC}" LD="${CC}" \
     EXTRAS="extras/firmware extras/run_directory"</userinput></screen>
 
@@ -38,5 +38,5 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="aa"><userinput>make DESTDIR=${LFS} EXTRAS="extras/firmware extras/run_directory" install</userinput></screen>
+<screen os="ab"><userinput>make DESTDIR=${LFS} EXTRAS="extras/firmware extras/run_directory" install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -44,5 +44,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="ab"><userinput>cp ../&udev-config-file; ${LFS}/etc/udev/rules.d/25-lfs.rules</userinput></screen>
+<screen os="ac"><userinput>cp ../&udev-config-file; ${LFS}/etc/udev/rules.d/25-lfs.rules</userinput></screen>
 
   </sect2>
Index: BOOK/boot/common/util-linux.xml
===================================================================
--- BOOK/boot/common/util-linux.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/common/util-linux.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -57,5 +57,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>./configure</userinput></screen>
+<screen os="be"><userinput>./configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -63,7 +63,7 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="be"><userinput>make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no CPUOPT="" ARCH="" CPU=""</userinput></screen>
+<screen os="bf"><userinput>make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no CPUOPT="" ARCH="" CPU=""</userinput></screen>
 
-    <variablelist os="bf">
+    <variablelist os="bg">
       <title>The meaning of the make parameters:</title>
 
@@ -106,12 +106,12 @@
     </variablelist>
 
-    <para os="bg">Install the package:</para>
+    <para os="bh">Install the package:</para>
 
-<screen os="bh"><userinput>make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no USE_TTY_GROUP=no CPUOPT="" ARCH="" CPU="" DESTDIR=${LFS} install</userinput></screen>
+<screen os="bi"><userinput>make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no USE_TTY_GROUP=no CPUOPT="" ARCH="" CPU="" DESTDIR=${LFS} install</userinput></screen>
 
-    <para os="bi">Now we will put a copy of mount in <filename
+    <para os="bj">Now we will put a copy of mount in <filename
     class="directory">/tools/bin</filename>:</para>
 
-<screen os="bj"><userinput>cp ${LFS}/bin/mount /tools/bin</userinput></screen>
+<screen os="bk"><userinput>cp ${LFS}/bin/mount /tools/bin</userinput></screen>
 
   </sect2>
Index: BOOK/boot/mips/colo-build.xml
===================================================================
--- BOOK/boot/mips/colo-build.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/mips/colo-build.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -27,5 +27,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>cd tools/elf2rfx
+<screen os="aa"><userinput>cd tools/elf2rfx
 make CC=gcc
 cd ../..
@@ -36,5 +36,5 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="c"><userinput>cp chain/colo-chain.elf ${LFS}/boot/vmlinux
+<screen os="ab"><userinput>cp chain/colo-chain.elf ${LFS}/boot/vmlinux
 gzip -9 ${LFS}/boot/vmlinux</userinput></screen>
 
Index: BOOK/boot/mips/colo.xml
===================================================================
--- BOOK/boot/mips/colo.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/mips/colo.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -28,5 +28,5 @@
   xpointer="xpointer(//*[@os='d'])"/>
 
-<screen><userinput>cat &gt; ${LFS}/boot/default.colo &lt;&lt; "EOF"
+<screen os="aa"><userinput>cat &gt; ${LFS}/boot/default.colo &lt;&lt; "EOF"
 #:CoLo:#
 #
Index: BOOK/boot/mips/module-init-tools.xml
===================================================================
--- BOOK/boot/mips/module-init-tools.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/mips/module-init-tools.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -43,6 +43,7 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>./configure --prefix=/ \
-   --host=${LFS_TARGET}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -50,5 +51,7 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="f"><userinput>make LDFLAGS="-s"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -56,5 +59,7 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="i"><userinput>make DESTDIR="${LFS}" install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
   </sect2>
Index: BOOK/boot/mips64-64-chapter.xml
===================================================================
--- BOOK/boot/mips64-64-chapter.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/mips64-64-chapter.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -16,8 +16,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/module-init-tools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
Index: OK/boot/mips64-64/module-init-tools.xml
===================================================================
--- BOOK/boot/mips64-64/module-init-tools.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ 	(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-boot-module-init-tools" role="wrap">
-  <?dbhtml filename="module-init-tools.html"?>
-
-  <title>Module-Init-Tools-&module-init-tools-version;</title>
-
-  <indexterm zone="ch-boot-module-init-tools">
-    <primary sortas="a-Module-Init-Tools">Module-Init-Tools</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/module-init-tools.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Module-Init-Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/ \
-   --host=${LFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-module-init-tools" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/boot/mips64/colo-build.xml
===================================================================
--- BOOK/boot/mips64/colo-build.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/mips64/colo-build.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -35,8 +35,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>cd tools/elf2rfx
+<screen os="aa"><userinput>cd tools/elf2rfx
 make CC=gcc
 cd ../..
-make CROSS_COMPILE="${LFS_TARGET}-" binary</userinput></screen>
+make CC="${CC} ${BUILD64}" CROSS_COMPILE="${LFS_TARGET}-" binary</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -46,5 +46,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/colo-build.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
   </sect2>
Index: BOOK/boot/mips64/module-init-tools.xml
===================================================================
--- BOOK/boot/mips64/module-init-tools.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/mips64/module-init-tools.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -43,6 +43,7 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/ \
-   --host=${LFS_TARGET}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/mips64/util-linux.xml
===================================================================
--- BOOK/boot/mips64/util-linux.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/mips64/util-linux.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -67,13 +67,11 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/util-linux.xml"
+    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -97,4 +95,8 @@
     xpointer="xpointer(//*[@os='bj'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='bk'])"/>
+
   </sect2>
 
Index: BOOK/boot/multilib/e2fsprogs.xml
===================================================================
--- BOOK/boot/multilib/e2fsprogs.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/multilib/e2fsprogs.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -26,5 +26,5 @@
     <filename class="directory">/tools/lib64</filename>:</para>
 
-<screen><userinput>chmod 0755 configure
+<screen os="m1"><userinput>chmod 0755 configure
 cp configure{,.orig}
 sed -e "/libdir=.*\/lib/s@/lib@/lib64@g" configure.orig > configure</userinput></screen>
@@ -42,5 +42,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
 --enable-elf-shlibs --disable-evms \
 --host=${LFS_TARGET}</userinput></screen>
@@ -48,5 +48,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -54,5 +54,5 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make CC="${CC} ${BUILD64}"</userinput></screen>
+<screen os="ac"><userinput>make CC="${CC} ${BUILD64}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -74,9 +74,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='ad'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
+    xpointer="xpointer(//*[@os='ae'])"/>
 
   </sect2>
Index: BOOK/boot/multilib/inetutils.xml
===================================================================
--- BOOK/boot/multilib/inetutils.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/multilib/inetutils.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -43,5 +43,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
    ./configure --prefix=/usr --libexecdir=/usr/sbin \
    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
@@ -60,5 +60,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -68,5 +68,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='ac'])"/>
 
   </sect2>
Index: BOOK/boot/multilib/module-init-tools.xml
===================================================================
--- BOOK/boot/multilib/module-init-tools.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/multilib/module-init-tools.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -35,5 +35,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/ \
+<screen os="d"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/ \
    --host=${LFS_TARGET}</userinput></screen>
 
Index: BOOK/boot/multilib/udev.xml
===================================================================
--- BOOK/boot/multilib/udev.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/multilib/udev.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -27,5 +27,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make CROSS="${LFS_TARGET}-" CC="${CC} ${BUILD64}" LD="${CC} ${BUILD64}" \
+<screen os="aa"><userinput>make CROSS="${LFS_TARGET}-" CC="${CC} ${BUILD64}" LD="${CC} ${BUILD64}" \
     EXTRAS="extras/firmware extras/run_directory"</userinput></screen>
 
@@ -40,5 +40,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -48,5 +48,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='ac'])"/>
 
   </sect2>
Index: BOOK/boot/multilib/util-linux.xml
===================================================================
--- BOOK/boot/multilib/util-linux.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/multilib/util-linux.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -59,13 +59,9 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure</userinput></screen>
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -89,4 +85,8 @@
     xpointer="xpointer(//*[@os='bj'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/util-linux.xml"
+    xpointer="xpointer(//*[@os='bk'])"/>
+
   </sect2>
 
Index: BOOK/boot/sparc/silo-build.xml
===================================================================
--- BOOK/boot/sparc/silo-build.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/sparc/silo-build.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -35,5 +35,5 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>make CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
+<screen os="aa"><userinput>make CROSS_COMPILE=${LFS_TARGET}-</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -41,5 +41,5 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="e"><userinput>make install DESTDIR=${LFS}</userinput></screen>
+<screen os="ab"><userinput>make install DESTDIR=${LFS}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -47,5 +47,5 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="g"><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${LFS}</userinput></screen>
+<screen os="ac"><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${LFS}</userinput></screen>
 
   </sect2>
Index: BOOK/boot/sparc64-64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-64-chapter.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/sparc64-64-chapter.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -15,8 +15,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/elftoaout.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
@@ -24,5 +24,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/silo-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/fstab.xml"/>
Index: OK/boot/sparc64-64/silo-build.xml
===================================================================
--- BOOK/boot/sparc64-64/silo-build.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ 	(revision )
@@ -1,65 +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-boot-silo-build" role="wrap">
-  <?dbhtml filename="silo-build.html"?>
-
-  <title>Silo-&silo-version;</title>
-
-  <indexterm zone="ch-boot-silo-build">
-    <primary sortas="a-Silo">Silo</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/sparc/silo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Silo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo-build.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo-build.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo-build.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>make CROSS_COMPILE="sparc64-unknown-linux-gnu-"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo-build.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo-build.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo-build.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo-build.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-silo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/boot/sparc64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-chapter.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/sparc64-chapter.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -25,5 +25,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/silo-build.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo-build.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/fstab.xml"/>
Index: BOOK/boot/sparc64/e2fsprogs-libs.xml
===================================================================
--- BOOK/boot/sparc64/e2fsprogs-libs.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/sparc64/e2fsprogs-libs.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -35,9 +35,9 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD32}" ../configure --prefix=/tools \
+<screen os="aa"><userinput>CC="${CC} ${BUILD32}" ../configure --prefix=/tools \
     --enable-elf-shlibs --disable-evms \
     --host=${LFS_TARGET}</userinput></screen>
 
-    <variablelist os="aa">
+    <variablelist os="ab">
       <title>The meaning of the configure options:</title>
 
@@ -56,5 +56,5 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen><userinput>make CC="${CC} ${BUILD32}" libs</userinput></screen>
+<screen os="ac"><userinput>make CC="${CC} ${BUILD32}" libs</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -62,8 +62,5 @@
     xpointer="xpointer(//*[@os='j'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
+<screen os="ad"><userinput>make CC="${CC} ${BUILD32}" install-libs</userinput></screen>
 
   </sect2>
Index: OK/boot/sparc64/silo-build.xml
===================================================================
--- BOOK/boot/sparc64/silo-build.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ 	(revision )
@@ -1,65 +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-boot-silo-build" role="wrap">
-  <?dbhtml filename="silo-build.html"?>
-
-  <title>Silo-&silo-version;</title>
-
-  <indexterm zone="ch-boot-silo-build">
-    <primary sortas="a-Silo">Silo</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/sparc/silo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Silo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo-build.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo-build.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo-build.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>make CROSS_COMPILE="sparc64-unknown-linux-gnu-"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo-build.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo-build.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo-build.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo-build.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-silo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/boot/x86/grub-build.xml
===================================================================
--- BOOK/boot/x86/grub-build.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/x86/grub-build.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -31,5 +31,5 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>./configure --prefix=${LFS}/usr \
+<screen os="aa"><userinput>./configure --prefix=${LFS}/usr \
    --host=${LFS_TARGET}</userinput></screen>
 
@@ -46,5 +46,5 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="h"><userinput>make install
+<screen os="ab"><userinput>make install
 mkdir ${LFS}/boot/grub
 cp ${LFS}/usr/lib/grub/i386-pc/stage{1,2} ${LFS}/boot/grub</userinput></screen>
@@ -54,5 +54,5 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <para os="j">The <filename class="directory">i386-pc</filename> directory
+    <para os="ac">The <filename class="directory">i386-pc</filename> directory
     contains a number of <filename>*stage1_5</filename> files, different
     ones for different file systems. Review the files available and copy
Index: BOOK/boot/x86_64-64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-64-chapter.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/x86_64-64-chapter.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -14,9 +14,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/udev.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
Index: BOOK/boot/x86_64-64/grub-build.xml
===================================================================
--- BOOK/boot/x86_64-64/grub-build.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/x86_64-64/grub-build.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -47,5 +47,5 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>./configure --prefix=${LFS}/usr</userinput></screen>
+<screen><userinput>./configure --prefix=${LFS} --host=${LFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -71,5 +71,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    xpointer="xpointer(//*[@os='ac'])"/>
 
   </sect2>
Index: BOOK/boot/x86_64/grub-build.xml
===================================================================
--- BOOK/boot/x86_64/grub-build.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/boot/x86_64/grub-build.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -31,5 +31,5 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD32}" ./configure --prefix=${LFS}/usr \
+<screen os="aa"><userinput>CC="${CC} ${BUILD32}" ./configure --prefix=${LFS}/usr \
    --host=${LFS_TARGET}</userinput></screen>
 
@@ -46,5 +46,5 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="h"><userinput>make install
+<screen os="ab"><userinput>make install
 mkdir ${LFS}/boot/grub
 cp ${LFS}/usr/lib/grub/x86_64-pc/stage{1,2} ${LFS}/boot/grub</userinput></screen>
@@ -56,5 +56,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    xpointer="xpointer(//*[@os='ac'])"/>
 
   </sect2>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 19a6071479819d45947b26466bb4cbd852c00943)
+++ BOOK/introduction/common/changelog.xml	(revision 308a04c46c715e9d413b9a5f38147129474978c0)
@@ -43,4 +43,7 @@
           <para>[jim] - Text updates to chroot.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Text updates to boot.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
