Index: BOOK/boot/64/e2fsprogs.xml
===================================================================
--- BOOK/boot/64/e2fsprogs.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/64/e2fsprogs.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/64/udev.xml
===================================================================
--- BOOK/boot/64/udev.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/64/udev.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -24,17 +24,32 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
+    href="../../final-system/common/udev.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" CC="${CC} ${BUILD64}" \
-    LD="${CC} ${BUILD64}"</userinput></screen>
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/usr \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --exec-prefix= --sysconfdir=/etc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
+    href="../../final-system/common/udev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/udev.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/udev.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
+    href="../../final-system/common/udev.xml"
     xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/udev.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
@@ -49,2 +64,5 @@
 
 </sect1>
+
+
+
Index: BOOK/boot/alpha-chapter.xml
===================================================================
--- BOOK/boot/alpha-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/alpha-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.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="sparc/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/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/util-linux-ng.xml"/>
Index: BOOK/boot/alpha/kernel.xml
===================================================================
--- BOOK/boot/alpha/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/alpha/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -29,21 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/common/e2fsprogs.xml
===================================================================
--- BOOK/boot/common/e2fsprogs.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/common/e2fsprogs.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/common/sysvinit.xml
===================================================================
--- BOOK/boot/common/sysvinit.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/common/sysvinit.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -60,8 +60,8 @@
     </indexterm>
 
-    <para os="ae">Create a new file <filename>${CLFS}/etc/inittab</filename> by
-    running the following:</para>
+    <para>Create a new file <filename>/etc/inittab</filename> by running the
+    following:</para>
 
-<screen os="af"><userinput>cat &gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
+<screen><userinput>cat &gt; /etc/inittab &lt;&lt; "EOF"
 <literal># Begin /etc/inittab
 
@@ -81,6 +81,13 @@
 
 su:S016:once:/sbin/sulogin
+</literal>
+EOF</userinput></screen>
 
-1:2345:respawn:/sbin/agetty -I '\033(K' tty1 9600
+    <para>The following command adds the standard virtual terminals to
+    <filename>/etc/inittab</filename>. If your system only has a serial
+    console skip the following command:</para>
+
+<screen><userinput>cat &gt;&gt; /etc/inittab &lt;&lt; "EOF"
+<literal>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
@@ -88,6 +95,19 @@
 5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600
 6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600
+</literal>
+EOF</userinput></screen>
 
-# End /etc/inittab</literal>
+    <para>If your system has a serial console run the following command to add
+    the entry to <filename>/etc/inittab</filename>.</para>
+
+<screen><userinput>cat &gt;&gt; /etc/inittab &lt;&lt; "EOF"
+<literal>c0:12345:respawn:/sbin/agetty 115200 ttyS0 vt100
+</literal>
+EOF</userinput></screen>
+
+   <para>Finally, Add the end line to <filename>/etc/inittab</filename>.</para>
+
+<screen><userinput>cat &gt;&gt; /etc/inittab &lt;&lt; "EOF"
+<literal># End /etc/inittab</literal>
 EOF</userinput></screen>
 
Index: BOOK/boot/common/udev.xml
===================================================================
--- BOOK/boot/common/udev.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/common/udev.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -27,5 +27,15 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" CC="${CC}" LD="${CC}"</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --exec-prefix= --sysconfdir=/etc</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/udev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/udev.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -33,5 +43,13 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/udev.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/udev.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/boot/mips-chapter.xml
===================================================================
--- BOOK/boot/mips-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/mips-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -17,5 +17,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.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="mips/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/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/util-linux-ng.xml"/>
Index: BOOK/boot/mips/kernel.xml
===================================================================
--- BOOK/boot/mips/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/mips/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: OK/boot/mips/sysvinit.xml
===================================================================
--- BOOK/boot/mips/sysvinit.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-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-/etc/inittab">/etc/inittab</primary>
-    </indexterm>
-
-    <para>Create a new file <filename>${CLFS}/etc/inittab</filename> by
-    running the following:</para>
-
-<screen><userinput>cat &gt; ${CLFS}/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 115200 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/mips64-64-chapter.xml
===================================================================
--- BOOK/boot/mips64-64-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/mips64-64-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -17,5 +17,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.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="mips64/sysvinit.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/util-linux-ng.xml"/>
Index: BOOK/boot/mips64-chapter.xml
===================================================================
--- BOOK/boot/mips64-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/mips64-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -17,5 +17,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/createfiles.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/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="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/util-linux-ng.xml"/>
Index: BOOK/boot/mips64/kernel.xml
===================================================================
--- BOOK/boot/mips64/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/mips64/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: OK/boot/mips64/sysvinit.xml
===================================================================
--- BOOK/boot/mips64/sysvinit.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-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="../mips/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: BOOK/boot/multilib/e2fsprogs.xml
===================================================================
--- BOOK/boot/multilib/e2fsprogs.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/multilib/e2fsprogs.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -29,4 +29,12 @@
 cp -v configure{,.orig}
 sed -e "/libdir=.*\/lib/s@/lib@/lib64@g" configure.orig > configure</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/multilib/udev.xml
===================================================================
--- BOOK/boot/multilib/udev.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/multilib/udev.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -24,25 +24,33 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/multilib/udev-64bit.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
+    href="../../final-system/common/udev.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/usr \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --exec-prefix= --sysconfdir=/etc \
+    --with-libdir-name=lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/multilib/udev-64bit.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    href="../../final-system/common/udev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" CC="${CC} ${BUILD64}" \
-    LD="${CC} ${BUILD64}"</userinput></screen>
+    href="../../final-system/common/udev.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
+    href="../../final-system/common/udev.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
+    href="../../final-system/common/udev.xml"
     xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/udev.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
   </sect2>
Index: BOOK/boot/ppc/kernel.xml
===================================================================
--- BOOK/boot/ppc/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/ppc/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/ppc64/e2fsprogs.xml
===================================================================
--- BOOK/boot/ppc64/e2fsprogs.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/ppc64/e2fsprogs.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -30,4 +30,12 @@
     href="../multilib/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='m2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/ppc64/kernel.xml
===================================================================
--- BOOK/boot/ppc64/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/ppc64/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/sparc-chapter.xml
===================================================================
--- BOOK/boot/sparc-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/sparc-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.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="sparc/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/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/util-linux-ng.xml"/>
Index: BOOK/boot/sparc/kernel.xml
===================================================================
--- BOOK/boot/sparc/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/sparc/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: OK/boot/sparc/sysvinit.xml
===================================================================
--- BOOK/boot/sparc/sysvinit.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-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-/etc/inittab">/etc/inittab</primary>
-    </indexterm>
-
-    <para>Create a new file <filename>${CLFS}/etc/inittab</filename> by
-    running the following:</para>
-
-<screen><userinput>cat &gt; ${CLFS}/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/sparc64-64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-64-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/sparc64-64-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.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="sparc64/sysvinit.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/util-linux-ng.xml"/>
Index: BOOK/boot/sparc64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/sparc64-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -16,5 +16,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/createfiles.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/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="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/util-linux-ng.xml"/>
Index: BOOK/boot/sparc64/kernel.xml
===================================================================
--- BOOK/boot/sparc64/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/sparc64/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -29,21 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: OK/boot/sparc64/sysvinit.xml
===================================================================
--- BOOK/boot/sparc64/sysvinit.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-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="../sparc/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: BOOK/boot/x86/kernel.xml
===================================================================
--- BOOK/boot/x86/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/x86/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -32,12 +32,4 @@
       use the resulting kernel image for production systems.</para>
     </warning>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/x86_64/kernel.xml
===================================================================
--- BOOK/boot/x86_64/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/boot/x86_64/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/alpha/kernel.xml
===================================================================
--- BOOK/bootable/alpha/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/bootable/alpha/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -24,18 +24,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
-
-    <para os="a1">The following patch moves the PAGE_SIZE definiton in the
-    headers so it is available for userspace.</para>
-
-<screen os="a2"><userinput>patch -Np1 -i ../&linux-alpha_PAGE_SIZE-patch;</userinput></screen>
 
     <para os="a3">The following sed prevents GCC from treating warnings as
Index: BOOK/bootable/mips/kernel.xml
===================================================================
--- BOOK/bootable/mips/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/bootable/mips/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/mips64/kernel.xml
===================================================================
--- BOOK/bootable/mips64/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/bootable/mips64/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/ppc/kernel.xml
===================================================================
--- BOOK/bootable/ppc/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/bootable/ppc/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/ppc64/kernel.xml
===================================================================
--- BOOK/bootable/ppc64/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/bootable/ppc64/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/sparc/kernel.xml
===================================================================
--- BOOK/bootable/sparc/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/bootable/sparc/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/sparc64-64/kernel.xml
===================================================================
--- BOOK/bootable/sparc64-64/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/bootable/sparc64-64/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -24,21 +24,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/kernel.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/sparc64/kernel.xml
===================================================================
--- BOOK/bootable/sparc64/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/bootable/sparc64/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -24,19 +24,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='a'])"/>
-
-    <para os="s1">The following patch includes spitfire.h outside of kernel
-    space in elf.h. It also adds spitfire.h to the list of headers installed
-    on the system.</para>
-
-<screen os="s2"><userinput>patch -Np1 -i ../&linux-elf_spitfire_fix-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/x86/kernel.xml
===================================================================
--- BOOK/bootable/x86/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/bootable/x86/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -22,10 +22,4 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
-
-    <para os="p1">A number of vulnerabilities have come to light after the
-    stable kernel team stopped supporting 2.6.24.  The following patch addresses
-    them:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&linux-security-patch;</userinput></screen>
 
     <para os="a">Building the kernel involves a few steps&mdash;configuration,
Index: BOOK/bootable/x86_64-64/kernel.xml
===================================================================
--- BOOK/bootable/x86_64-64/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/bootable/x86_64-64/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/x86_64/kernel.xml
===================================================================
--- BOOK/bootable/x86_64/kernel.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/bootable/x86_64/kernel.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootscripts/mips64-chapter.xml
===================================================================
--- BOOK/bootscripts/mips64-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/bootscripts/mips64-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -13,5 +13,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="multilib/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
Index: OK/bootscripts/multilib/bootscripts.xml
===================================================================
--- BOOK/bootscripts/multilib/bootscripts.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-bootscripts" role="wrap">
-  <?dbhtml filename="bootscripts.html"?>
-
-  <title>CLFS-Bootscripts-&clfs-bootscripts-version;</title>
-
-  <indexterm zone="ch-scripts-bootscripts">
-    <primary sortas="a-Bootscripts">Bootscripts</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/bootscripts.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of CLFS-Bootscripts</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bootscripts.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>make LIBDIR=/lib64 install-bootscripts</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/bootscripts.xml"
-  xpointer="xpointer(id('contents-bootscripts'))"/>
-
-</sect1>
Index: BOOK/bootscripts/ppc64-chapter.xml
===================================================================
--- BOOK/bootscripts/ppc64-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/bootscripts/ppc64-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -13,5 +13,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="multilib/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
Index: BOOK/bootscripts/sparc64-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc64-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/bootscripts/sparc64-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -13,5 +13,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="multilib/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
Index: BOOK/bootscripts/x86_64-chapter.xml
===================================================================
--- BOOK/bootscripts/x86_64-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/bootscripts/x86_64-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -13,5 +13,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="multilib/bootscripts.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
Index: BOOK/chroot/64/e2fsprogs.xml
===================================================================
--- BOOK/chroot/64/e2fsprogs.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/chroot/64/e2fsprogs.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/chroot/common/e2fsprogs.xml
===================================================================
--- BOOK/chroot/common/e2fsprogs.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/chroot/common/e2fsprogs.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/chroot/multilib/e2fsprogs.xml
===================================================================
--- BOOK/chroot/multilib/e2fsprogs.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/chroot/multilib/e2fsprogs.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -30,4 +30,12 @@
     href="../../boot/multilib/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='m2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/alpha/gcc-final.xml
===================================================================
--- BOOK/cross-tools/alpha/gcc-final.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/cross-tools/alpha/gcc-final.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -9,5 +9,5 @@
   <?dbhtml filename="gcc-final.html"?>
 
-  <title>Cross GCC-&version; - Final</title>
+  <title>Cross GCC-&gcc-version; - Final</title>
 
   <indexterm zone="ch-cross-tools-gcc-final">
Index: BOOK/cross-tools/alpha/linux-headers.xml
===================================================================
--- BOOK/cross-tools/alpha/linux-headers.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/cross-tools/alpha/linux-headers.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -28,12 +28,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/alpha/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/alpha/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/linux-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
Index: BOOK/cross-tools/common/gcc-final.xml
===================================================================
--- BOOK/cross-tools/common/gcc-final.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/cross-tools/common/gcc-final.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -9,5 +9,5 @@
   <?dbhtml filename="gcc-final.html"?>
 
-  <title>Cross GCC-&version; - Final</title>
+  <title>Cross GCC-&gcc-version; - Final</title>
 
   <indexterm zone="ch-cross-tools-gcc-final">
Index: BOOK/cross-tools/mips/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips/gcc-final.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/cross-tools/mips/gcc-final.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -9,5 +9,5 @@
   <?dbhtml filename="gcc-final.html"?>
 
-  <title>Cross GCC-&version; - Final</title>
+  <title>Cross GCC-&gcc-version; - Final</title>
 
   <indexterm zone="ch-cross-tools-gcc-final">
Index: BOOK/cross-tools/mips64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips64-64/gcc-final.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/cross-tools/mips64-64/gcc-final.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -9,5 +9,5 @@
   <?dbhtml filename="gcc-final.html"?>
 
-  <title>Cross GCC-&version; - Final</title>
+  <title>Cross GCC-&gcc-version; - Final</title>
 
   <indexterm zone="ch-cross-tools-gcc-final">
Index: BOOK/cross-tools/mips64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips64/gcc-final.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/cross-tools/mips64/gcc-final.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -9,5 +9,5 @@
   <?dbhtml filename="gcc-final.html"?>
 
-  <title>Cross GCC-&version; - Final</title>
+  <title>Cross GCC-&gcc-version; - Final</title>
 
   <indexterm zone="ch-cross-tools-gcc-final">
Index: BOOK/cross-tools/ppc/gcc-final.xml
===================================================================
--- BOOK/cross-tools/ppc/gcc-final.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/cross-tools/ppc/gcc-final.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -9,5 +9,5 @@
   <?dbhtml filename="gcc-final.html"?>
 
-  <title>Cross GCC-&version; - Final</title>
+  <title>Cross GCC-&gcc-version; - Final</title>
 
   <indexterm zone="ch-cross-tools-gcc-final">
Index: BOOK/cross-tools/ppc64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/ppc64/gcc-final.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/cross-tools/ppc64/gcc-final.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -9,5 +9,5 @@
   <?dbhtml filename="gcc-final.html"?>
 
-  <title>Cross GCC-&version; - Final</title>
+  <title>Cross GCC-&gcc-version; - Final</title>
 
   <indexterm zone="ch-cross-tools-gcc-final">
Index: BOOK/cross-tools/sparc/gcc-final.xml
===================================================================
--- BOOK/cross-tools/sparc/gcc-final.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/cross-tools/sparc/gcc-final.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -9,5 +9,5 @@
   <?dbhtml filename="gcc-final.html"?>
 
-  <title>Cross GCC-&version; - Final</title>
+  <title>Cross GCC-&gcc-version; - Final</title>
 
   <indexterm zone="ch-cross-tools-gcc-final">
Index: BOOK/cross-tools/sparc64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/gcc-final.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/cross-tools/sparc64-64/gcc-final.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -9,5 +9,5 @@
   <?dbhtml filename="gcc-final.html"?>
 
-  <title>Cross GCC-&version; - Final</title>
+  <title>Cross GCC-&gcc-version; - Final</title>
 
   <indexterm zone="ch-cross-tools-gcc-final">
Index: BOOK/cross-tools/sparc64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/sparc64/gcc-final.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/cross-tools/sparc64/gcc-final.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -9,5 +9,5 @@
   <?dbhtml filename="gcc-final.html"?>
 
-  <title>Cross GCC-&version; - Final</title>
+  <title>Cross GCC-&gcc-version; - Final</title>
 
   <indexterm zone="ch-cross-tools-gcc-final">
Index: BOOK/cross-tools/sparc64/linux-headers.xml
===================================================================
--- BOOK/cross-tools/sparc64/linux-headers.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/cross-tools/sparc64/linux-headers.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -28,12 +28,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc64/linux-headers.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc64/linux-headers.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/linux-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
Index: BOOK/cross-tools/x86_64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86_64-64/gcc-final.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/cross-tools/x86_64-64/gcc-final.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -9,5 +9,5 @@
   <?dbhtml filename="gcc-final.html"?>
 
-  <title>Cross GCC-&version; - Final</title>
+  <title>Cross GCC-&gcc-version; - Final</title>
 
   <indexterm zone="ch-cross-tools-gcc-final">
Index: BOOK/cross-tools/x86_64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86_64/gcc-final.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/cross-tools/x86_64/gcc-final.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -9,5 +9,5 @@
   <?dbhtml filename="gcc-final.html"?>
 
-  <title>Cross GCC-&version; - Final</title>
+  <title>Cross GCC-&gcc-version; - Final</title>
 
   <indexterm zone="ch-cross-tools-gcc-final">
Index: BOOK/final-system/alpha/linux-headers.xml
===================================================================
--- BOOK/final-system/alpha/linux-headers.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/alpha/linux-headers.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -27,12 +27,4 @@
 
    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/linux-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
Index: BOOK/final-system/common/e2fsprogs.xml
===================================================================
--- BOOK/final-system/common/e2fsprogs.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/common/e2fsprogs.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -27,4 +27,12 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
+
+    <para os="s1">The following command adds <filename>libcom_err.so</filename>
+    to the list of libraries to link <filename>libblkid.so</filename>
+    to:</para>
+
+<screen os="s2"><userinput>cp -v misc/Makefile.in{,.orig}
+sed 's/_BLKID= .*$/&amp; $(LIBCOM_ERR)/' \
+    misc/Makefile.in.orig > misc/Makefile.in</userinput></screen>
 
     <para os="a">The E2fsprogs documentation recommends that the package be
Index: BOOK/final-system/common/inetutils.xml
===================================================================
--- BOOK/final-system/common/inetutils.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/common/inetutils.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -32,4 +32,9 @@
 <screen os="p2"><userinput>patch -Np1 -i ../&inetutils-man_pages-patch;</userinput></screen>
 
+    <para os="s1">One of the source files is missing a header. Add it with the
+    following command:</para>
+
+<screen os="s2"><userinput>sed -i "1i\#include &lt;stdlib.h&gt;" libicmp/icmp_timestamp.c</userinput></screen>
+
     <para os="a">Prepare Inetutils for compilation:</para>
 
Index: BOOK/final-system/common/iproute2.xml
===================================================================
--- BOOK/final-system/common/iproute2.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/common/iproute2.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -38,5 +38,6 @@
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make SBINDIR=/sbin</userinput></screen>
+<screen os="b"><userinput>make DESTDIR=/ DOCDIR=/usr/share/doc/iproute2 \
+    MANDIR=/usr/share/man SBINDIR=/sbin</userinput></screen>
 
     <variablelist os="c">
@@ -58,5 +59,6 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make SBINDIR=/sbin install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=/ DOCDIR=/usr/share/doc/iproute2 \
+    MANDIR=/usr/share/man SBINDIR=/sbin</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/kbd.xml
===================================================================
--- BOOK/final-system/common/kbd.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/common/kbd.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -26,7 +26,19 @@
     <title>Installation of Kbd</title>
 
+    <para os="s1">While installing Kbd the Makefile will attempt to execute
+    install with the strip option on all of the installed files. This will
+    create errors when installing shell scripts. Prevent the strip argument
+    from being passed to install with the following command:</para>
+
+<screen os="s2"><userinput>sed -i "/install -s/s/ -s//" src/Makefile.in</userinput></screen>
+
+    <para os="aa">The Kbd tarball does not include a pre-generated configure
+    script. Generate it with the following command:</para>
+
+<screen os="ab"><userinput>autoconf</userinput></screen>
+
     <para os="a">Prepare Kbd for compilation:</para>
 
-<screen os="b"><userinput>./configure --datadir=/lib/kbd</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr --datadir=/lib/kbd</userinput></screen>
 
     <variablelist os="c">
Index: BOOK/final-system/common/mpfr.xml
===================================================================
--- BOOK/final-system/common/mpfr.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/common/mpfr.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -26,8 +26,4 @@
   <sect2 role="installation">
     <title>Installation of MPFR</title>
-
-    <para os="p1">The following patch contains updates from upstream:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&mpfr-cumulative-patch;</userinput></screen>
 
     <para os="a">Prepare MPFR for compilation:</para>
Index: BOOK/final-system/common/perl.xml
===================================================================
--- BOOK/final-system/common/perl.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/common/perl.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -56,5 +56,5 @@
    -Dman3dir=/usr/share/man/man3 \
    -Dpager="/bin/less -isR" \
-   -Dusethreads</userinput></screen>
+   -Dusethreads -Duseshrplib</userinput></screen>
 
     <variablelist os="c">
@@ -68,4 +68,5 @@
         </listitem>
       </varlistentry>
+
       <varlistentry os="c2">
         <term><parameter>-Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/man/man3</parameter></term>
@@ -76,4 +77,5 @@
         </listitem>
       </varlistentry>
+
       <varlistentry os="c3">
         <term><parameter>-Dusethreads</parameter></term>
@@ -82,4 +84,12 @@
         </listitem>
       </varlistentry>
+
+      <varlistentry os="c4">
+        <term><parameter>-Duseshrplib</parameter></term>
+        <listitem>
+          <para>This tells Perl to build a shared libperl.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
Index: BOOK/final-system/common/sysvinit.xml
===================================================================
--- BOOK/final-system/common/sysvinit.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/common/sysvinit.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -82,6 +82,13 @@
 
 su:S016:once:/sbin/sulogin
-
-1:2345:respawn:/sbin/agetty -I '\033(K' tty1 9600
+</literal>
+EOF</userinput></screen>
+
+    <para>The following command adds the standard virtual terminals to
+    <filename>/etc/inittab</filename>. If your system only has a serial
+    console skip the following command:</para>
+
+<screen><userinput>cat &gt;&gt; /etc/inittab &lt;&lt; "EOF"
+<literal>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
@@ -89,6 +96,19 @@
 5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600
 6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600
-
-# End /etc/inittab</literal>
+</literal>
+EOF</userinput></screen>
+
+    <para>If your system has a serial console run the following command to add
+    the entry to <filename>/etc/inittab</filename>.</para>
+
+<screen><userinput>cat &gt;&gt; /etc/inittab &lt;&lt; "EOF"
+<literal>c0:12345:respawn:/sbin/agetty 115200 ttyS0 vt100
+</literal>
+EOF</userinput></screen>
+
+   <para>Finally, Add the end line to <filename>/etc/inittab</filename>.</para>
+
+<screen><userinput>cat &gt;&gt; /etc/inittab &lt;&lt; "EOF"
+<literal># End /etc/inittab</literal>
 EOF</userinput></screen>
 
Index: BOOK/final-system/common/udev.xml
===================================================================
--- BOOK/final-system/common/udev.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/common/udev.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -26,62 +26,26 @@
     <title>Installation of Udev</title>
 
-    <para os="a">Compile the package:</para>
-
-<screen os="b"><userinput>make EXTRAS="extras/ata_id extras/cdrom_id extras/collect \
-    extras/edd_id extras/firmware extras/floppy extras/path_id extras/rule_generator \
-    extras/scsi_id extras/usb_id extras/volume_id" udevdir=/dev</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the make parameter:</title>
-
-      <varlistentry>
-      <term><parameter>EXTRAS="extras/ata_id extras/cdrom_id extras/collect
-      extras/edd_id extras/firmware extras/floppy extras/path_id extras/rule_generator
-      extras/scsi_id extras/usb_id extras/volume_id"</parameter></term>
-        <listitem>
-          <para>This builds the helper applications that are used with
-          udev. The helper programs assist in correct handling of devices.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="d">If you want to run the testsuite, you need to change
-    a hardcoded reference to the <command>test</command> program:</para>
-
-    <screen os="e"><userinput>sed -i 's@/usr/bin/test@/bin/test@' test/udev-test.pl</userinput></screen>
-
-    <para os="f">To test the results, issue:
-    <userinput>make test</userinput>.</para>
+    <para os="a">Prepare Udev for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr --exec-prefix= \
+    --sysconfdir=/etc</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
 
     <para os="g">Install the package:</para>
 
-<screen os="h"><userinput>make EXTRAS="extras/ata_id extras/cdrom_id extras/collect \
-    extras/edd_id extras/firmware extras/floppy extras/path_id extras/rule_generator \
-    extras/scsi_id extras/usb_id extras/volume_id" DESTDIR=/ udevdir=/dev install</userinput></screen>
-
-    <variablelist os="i">
-      <title>The meaning of the make parameter:</title>
-
-      <varlistentry>
-      <term><parameter>DESTDIR=/</parameter></term>
-        <listitem>
-          <para>This prevents the Udev build process from killing any
-          <command>udevd</command> processes that may be running on the
-          system.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="j">Install documentation:</para>
-
-<screen os="k"><userinput>install -v -m644 -D docs/writing_udev_rules/index.html \
+<screen os="h"><userinput>make install</userinput></screen>
+
+    <para os="i">Install documentation:</para>
+
+<screen os="j"><userinput>install -v -m644 -D docs/writing_udev_rules/index.html \
     /usr/share/doc/udev-&udev-version;/index.html</userinput></screen>
 
-    <para os="l">Create a directory for storing firmware that can be
+    <para os="k">Create a directory for storing firmware that can be
     loaded by <command>udev</command>:</para>
 
-<screen os="m"><userinput>install -dv /lib/firmware</userinput></screen>
+<screen os="l"><userinput>install -dv /lib/firmware</userinput></screen>
 
   </sect2>
@@ -96,7 +60,6 @@
 
       <seglistitem>
-        <seg>udevadm, udevd, udevinfo (symlink to udevadm),
-        udevsettle (symlink to udevadm)</seg>
-        <seg>libvolume_id</seg>
+        <seg>udevadm, udevd</seg>
+        <seg>libvolume_id, libudev</seg>
         <seg>/etc/udev, /lib/udev</seg>
       </seglistitem>
@@ -111,22 +74,8 @@
         <term><command>udevadm</command></term>
         <listitem>
-          <para>This program combines <command>udevinfo</command>,
-          <command>udevtrigger</command>, <command>udevsettle</command>,
-          <command>udevcontrol</command>, <command>udevmonitor</command>,
-          and <command>udevtest</command> into one command.</para>
+        <para>udevadm controls the runtime behavior of udev, requests kernel
+        events, manages the event queue, and provides simple debugging.</para>
           <indexterm zone="ch-system-udev udevadm">
             <primary sortas="b-udevadm">udevadm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevadm-control">
-        <term><command>udevadm control</command></term>
-        <listitem>
-          <para>Configures a number of options for the running
-          <command>udevd</command> daemon, such as the log level. (Symlink to
-          udevadm)</para>
-          <indexterm zone="ch-system-udev udevadm-control">
-            <primary sortas="b-udevadm-control">udevadm control</primary>
           </indexterm>
         </listitem>
@@ -145,63 +94,4 @@
       </varlistentry>
 
-      <varlistentry id="udevinfo">
-        <term><command>udevinfo</command></term>
-        <listitem>
-          <para>Allows users to query the <command>udev</command> database for
-          information on any device currently present on the system; it also
-          provides a way to query any device in the <systemitem
-          class="filesystem">sysfs</systemitem> tree to help create udev
-          rules. (Symlink to udevadm)</para>
-          <indexterm zone="ch-system-udev udevinfo">
-            <primary sortas="b-udevinfo">udevinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevadm-monitor">
-        <term><command>udevadm monitor</command></term>
-        <listitem>
-          <para>Prints the event received from the kernel and the event which
-          <command>udev</command> sends out after rule processing</para>
-          <indexterm zone="ch-system-udev udevadm-monitor">
-            <primary sortas="b-udevadm-monitor">udevadm monitor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevsettle">
-        <term><command>udevsettle</command></term>
-        <listitem>
-          <para>Watches the Udev event queue and exits if all current uevents
-          have been handled. (Symlink to udevadm)</para>
-          <indexterm zone="ch-system-udev udevsettle">
-            <primary sortas="b-udevsettle">udevsettle</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevadm-test">
-        <term><command>udevadm test</command></term>
-        <listitem>
-          <para>Simulates a <command>udev</command> run for the given device,
-          and prints out the name of the node the real <command>udev</command>
-          would have created or the name of the renamed network interface</para>
-          <indexterm zone="ch-system-udev udevadm-test">
-            <primary sortas="b-udevadm-test">udevadm test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevadm-trigger">
-        <term><command>udevadm trigger</command></term>
-        <listitem>
-          <para>Walks the sysfs tree for devices that need to be added to the
-          system.</para>
-          <indexterm zone="ch-system-udev udevadm-trigger">
-            <primary sortas="b-udeadm-vtrigger">udevadm trigger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>     
-
  <!-- Start of Helpers -->
       <varlistentry id="ata_id">
@@ -226,4 +116,14 @@
       </varlistentry>
 
+      <varlistentry id="collect">
+        <term><command>collect</command></term>
+        <listitem>
+          <para>DESCRIPTION REQUIRED</para>
+          <indexterm zone="ch-system-udev collect">
+            <primary sortas="b-collect">collect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="create_floppy_devices">
         <term><command>create_floppy_devices</command></term>
@@ -236,14 +136,4 @@
       </varlistentry>
 
-      <varlistentry id="dasd_id">
-        <term><command>dasd_id</command></term>
-        <listitem>
-          <para>Read the label from an s390 block device.</para>
-          <indexterm zone="ch-system-udev dasd_id">
-            <primary sortas="b-dasd_id">dasd_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="edd_id">
         <term><command>edd_id</command></term>
@@ -262,4 +152,14 @@
           <indexterm zone="ch-system-udev firmware.sh">
             <primary sortas="b-firmware.sh">firmware.sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fstab_import">
+        <term><command>fstab_import</command></term>
+        <listitem>
+          <para>DESCRIPTION REQUIRED</para>
+          <indexterm zone="ch-system-udev fstab_import">
+            <primary sortas="b-fstab_import">fstab_import</primary>
           </indexterm>
         </listitem>
@@ -303,4 +203,24 @@
           <indexterm zone="ch-system-udev vol_id">
             <primary sortas="b-vol_id">vol_id</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="write_cd_rules">
+        <term><command>write_cd_rules</command></term>
+        <listitem>
+          <para>DESCRIPTION REQUIRED</para>
+          <indexterm zone="ch-system-udev write_cd_rules">
+            <primary sortas="b-write_cd_rules">write_cd_rules</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="write_net_rules">
+        <term><command>write_net_rules</command></term>
+        <listitem>
+          <para>DESCRIPTION REQUIRED</para>
+          <indexterm zone="ch-system-udev write_net_rules">
+            <primary sortas="b-write_net_rules">write_net_rules</primary>
           </indexterm>
         </listitem>
@@ -320,4 +240,14 @@
       </varlistentry>
 
+      <varlistentry id="libudev">
+        <term><filename class="libraryfile">libudev</filename></term>
+        <listitem>
+          <para>DESCRIPTION REQUIRED</para>
+          <indexterm zone="ch-system-udev libudev">
+            <primary sortas="b-libudev">libudev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="etc-udev">
         <term><filename class="directory">/etc/udev</filename></term>
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/mips-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -60,5 +60,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.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/texinfo.xml"/>
Index: OK/final-system/mips/sysvinit.xml
===================================================================
--- BOOK/final-system/mips/sysvinit.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ 	(revision )
@@ -1,106 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-system-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../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='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <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='d'])"/>
-
-    <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='f'])"/>
-
-  </sect2>
-
-  <sect2 id="conf-sysvinit" role="configuration">
-    <title>Configuring Sysvinit</title>
-
-    <indexterm zone="conf-sysvinit">
-      <primary sortas="a-Sysvinit">Sysvinit</primary>
-      <secondary>configuring</secondary>
-    </indexterm>
-
-    <indexterm zone="conf-sysvinit">
-      <primary sortas="e-/etc/inittab">/etc/inittab</primary>
-    </indexterm>
-
-    <para>Create a new file <filename>/etc/inittab</filename> by running
-    the following:</para>
-
-<screen><userinput>cat &gt; /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 115200 ttyS0 vt100
-
-# End /etc/inittab</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('contents-sysvinit'))"/>
-
-</sect1>
Index: BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/mips64-64-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -60,5 +60,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.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/texinfo.xml"/>
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/mips64-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -91,5 +91,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysklogd.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="multilib/sysvinit.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/texinfo.xml"/>
Index: OK/final-system/mips64/sysvinit.xml
===================================================================
--- BOOK/final-system/mips64/sysvinit.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-system-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../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='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <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='d'])"/>
-
-    <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='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/sysvinit.xml"
-  xpointer="xpointer(id('conf-sysvinit'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('contents-sysvinit'))"/>
-
-</sect1>
Index: BOOK/final-system/multilib/bash.xml
===================================================================
--- BOOK/final-system/multilib/bash.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/multilib/bash.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -37,4 +37,9 @@
     href="../common/bash.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+
+    <para os="m1">The following sed points configure towards the correct
+    library directory while searching for Readline:</para>
+
+<screen os="m2"><userinput>sed -i "/ac_cv_rl_libdir/s@/lib@&amp;64@" configure</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/e2fsprogs-64bit.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs-64bit.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/multilib/e2fsprogs-64bit.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -26,4 +26,12 @@
 
 <screen os="m4"><userinput>sed -i '/libdir=.*\/lib/s@/lib@/lib64@g' configure</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/e2fsprogs-n32.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs-n32.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/multilib/e2fsprogs-n32.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -27,4 +27,12 @@
 
 <screen os="m4"><userinput>sed -i '/libdir=.*\/lib/s@/lib@/lib32@g' configure</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/e2fsprogs.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/multilib/e2fsprogs.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of E2fsprogs</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/inetutils.xml
===================================================================
--- BOOK/final-system/multilib/inetutils.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/multilib/inetutils.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -29,4 +29,12 @@
     href="../common/inetutils.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/iproute2.xml
===================================================================
--- BOOK/final-system/multilib/iproute2.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/multilib/iproute2.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -38,5 +38,7 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CC="gcc ${BUILD64}" LIBDIR=/usr/lib64 VARLIB=/var/lib64 SBINDIR=/sbin</userinput></screen>
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR=/ LIBDIR=/usr/lib64 \
+    DOCDIR=/usr/share/doc/iproute2 \
+    MANDIR=/usr/share/man SBINDIR=/sbin</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -52,5 +54,8 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="f"><userinput>make LIBDIR=/usr/lib64 VARLIB=/var/lib64 SBINDIR=/sbin install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=/ LIBDIR=/usr/lib64 \
+    DOCDIR=/usr/share/doc/iproute2 \
+    MANDIR=/usr/share/man SBINDIR=/sbin \
+    install</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/multilib/kbd.xml
===================================================================
--- BOOK/final-system/multilib/kbd.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/multilib/kbd.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -24,7 +24,24 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --datadir=/lib64/kbd</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+    --datadir=/lib64/kbd</userinput></screen>
 
     <variablelist os="c">
Index: BOOK/final-system/multilib/mpfr-64bit.xml
===================================================================
--- BOOK/final-system/multilib/mpfr-64bit.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/multilib/mpfr-64bit.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of MPFR</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/mpfr-n32.xml
===================================================================
--- BOOK/final-system/multilib/mpfr-n32.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/multilib/mpfr-n32.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -22,12 +22,4 @@
   <sect2 role="installation">
     <title>Installation of MPFR</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/mpfr.xml
===================================================================
--- BOOK/final-system/multilib/mpfr.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/multilib/mpfr.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -22,12 +22,4 @@
   <sect2 role="installation">
     <title>Installation of MPFR</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mpfr.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/perl-64bit.xml
===================================================================
--- BOOK/final-system/multilib/perl-64bit.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/multilib/perl-64bit.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -56,5 +56,5 @@
    -Dlibpth="/usr/local/lib64 /lib64 /usr/lib64" \
    -Dcc="gcc ${BUILD64}" \
-   -Dusethreads</userinput></screen>
+   -Dusethreads -Duseshrplib</userinput></screen>
 
     <variablelist os="m4">
@@ -79,4 +79,8 @@
     href="../common/perl.xml"
     xpointer="xpointer(//*[@os='c3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='c4'])"/>
 
     </variablelist>
@@ -106,6 +110,6 @@
     xpointer="xpointer(//*[@os='l'])"/>
 
-<screen os="m"><userinput>mv /usr/bin/perl{,-64}
-mv /usr/bin/perl&perl-version;{,-64}</userinput></screen>
+<screen os="m"><userinput>mv -v /usr/bin/perl{,-64}
+mv -v /usr/bin/perl&perl-version;{,-64}</userinput></screen>
 
     <para os="n">Now we need to create a link to the multiarch wrapper that
Index: BOOK/final-system/multilib/perl-n32.xml
===================================================================
--- BOOK/final-system/multilib/perl-n32.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/multilib/perl-n32.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -59,5 +59,5 @@
    -Dlibpth="/usr/local/lib32 /lib32 /usr/lib32" \
    -Dcc="gcc ${BUILDN32}" \
-   -Dusethreads</userinput></screen>
+   -Dusethreads -Duseshrplib</userinput></screen>
 
     <variablelist os="m4">
@@ -82,4 +82,8 @@
     href="../common/perl.xml"
     xpointer="xpointer(//*[@os='c3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='c4'])"/>
 
     </variablelist>
@@ -109,6 +113,6 @@
     xpointer="xpointer(//*[@os='l'])"/>
 
-<screen os="m"><userinput>mv /usr/bin/perl{,-n32}
-mv /usr/bin/perl&perl-version;{,-n32}</userinput></screen>
+<screen os="m"><userinput>mv -v /usr/bin/perl{,-n32}
+mv -v /usr/bin/perl&perl-version;{,-n32}</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/multilib/perl.xml
===================================================================
--- BOOK/final-system/multilib/perl.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/multilib/perl.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -52,5 +52,5 @@
    -Dpager="/bin/less -isR" \
    -Dcc="gcc ${BUILD32}" \
-   -Dusethreads</userinput></screen>
+   -Dusethreads -Duseshrplib</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -81,6 +81,6 @@
     be used by the multiarch wrapper:</para>
 
-<screen os="m"><userinput>mv /usr/bin/perl{,-32}
-mv /usr/bin/perl&perl-version;{,-32}</userinput></screen>
+<screen os="m"><userinput>mv -v /usr/bin/perl{,-32}
+mv -v /usr/bin/perl&perl-version;{,-32}</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/multilib/udev-64bit.xml
===================================================================
--- BOOK/final-system/multilib/udev-64bit.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/multilib/udev-64bit.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -22,17 +22,11 @@
     <title>Installation of Udev</title>
 
-    <para os="p1">This patch moves /lib/udev to /lib64/udev, to keep
-    system consistency:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&udev-lib64-patch;</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/udev.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CC="gcc ${BUILD64}" LD="gcc ${BUILD64}" \
-    EXTRAS="extras/ata_id extras/cdrom_id extras/collect \
-    extras/edd_id extras/firmware extras/floppy extras/path_id extras/rule_generator \
-    extras/scsi_id extras/usb_id extras/volume_id" udevdir=/dev</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+    --exec-prefix= --sysconfdir=/etc \
+    --with-libdir-name=lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -43,12 +37,4 @@
     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='e'])"/>
-
-    <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"
@@ -72,9 +58,5 @@
     xpointer="xpointer(//*[@os='k'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-<screen os="m"><userinput>install -dv /lib64/firmware</userinput></screen>
+<screen os="l"><userinput>install -dv /lib64/firmware</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/multilib/udev-n32.xml
===================================================================
--- BOOK/final-system/multilib/udev-n32.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/multilib/udev-n32.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -23,15 +23,26 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="udev.xml"
+    href="../common/udev.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>cd extras/volume_id/lib
-make CC="gcc ${BUILDN32}" AR=ar RANLIB=ranlib E=@echo Q=@</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
+    --exec-prefix= --sysconfdir=/etc \
+    --with-libdir-name=lib32</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="udev.xml"
+    href="../common/udev.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>make libdir=/lib32 usrlibdir=/usr/lib32 install</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='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
Index: BOOK/final-system/multilib/udev.xml
===================================================================
--- BOOK/final-system/multilib/udev.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/multilib/udev.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -9,5 +9,5 @@
   <?dbhtml filename="udev.html"?>
 
-  <title>Udev-&udev-version;</title>
+  <title>Udev-&udev-version; 32 Bit Libraries</title>
 
   <indexterm zone="ch-system-udev-32">
@@ -22,14 +22,27 @@
     <title>Installation of Udev</title>
 
-    <para os="a">Udev only provides one library, libvolume_id. Instead of
-    building the entire udev package for one library, We're just going to
-    compile the single library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>cd extras/volume_id/lib
-make CC="gcc ${BUILD32}" AR=ar RANLIB=ranlib E=@echo Q=@</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
+    --exec-prefix= --sysconfdir=/etc \
+    --with-libdir-name=lib</userinput></screen>
 
-    <para os="c">Install the library:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>make install</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='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/udev.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
   </sect2>
Index: BOOK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/sparc-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -60,5 +60,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.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/sysvinit.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/texinfo.xml"/>
Index: OK/final-system/sparc/sysvinit.xml
===================================================================
--- BOOK/final-system/sparc/sysvinit.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ 	(revision )
@@ -1,106 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-system-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../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='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <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='d'])"/>
-
-    <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='f'])"/>
-
-  </sect2>
-
-  <sect2 id="conf-sysvinit" role="configuration">
-    <title>Configuring Sysvinit</title>
-
-    <indexterm zone="conf-sysvinit">
-      <primary sortas="a-Sysvinit">Sysvinit</primary>
-      <secondary>configuring</secondary>
-    </indexterm>
-
-    <indexterm zone="conf-sysvinit">
-      <primary sortas="e-/etc/inittab">/etc/inittab</primary>
-    </indexterm>
-
-    <para>Create a new file <filename>/etc/inittab</filename> by running
-    the following:</para>
-
-<screen><userinput>cat &gt; /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>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('contents-sysvinit'))"/>
-
-</sect1>
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/sparc64-64-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -60,5 +60,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.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/sysvinit.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/texinfo.xml"/>
Index: BOOK/final-system/sparc64-64/inetutils.xml
===================================================================
--- BOOK/final-system/sparc64-64/inetutils.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/sparc64-64/inetutils.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -37,4 +37,12 @@
     href="../sparc64/inetutils.xml"
     xpointer="xpointer(//*[@os='ap2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/sparc64-chapter.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -76,5 +76,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysklogd.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="multilib/sysvinit.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/texinfo.xml"/>
Index: BOOK/final-system/sparc64/inetutils.xml
===================================================================
--- BOOK/final-system/sparc64/inetutils.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/sparc64/inetutils.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -34,4 +34,12 @@
 
 <screen os="ap2"><userinput>patch -Np1 -i ../&inetutils-memcpy_sparc64-patch;</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/inetutils.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64/linux-headers.xml
===================================================================
--- BOOK/final-system/sparc64/linux-headers.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/final-system/sparc64/linux-headers.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -27,12 +27,4 @@
 
    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/linux-headers.xml"
     xpointer="xpointer(//*[@os='b'])"/>
Index: OK/final-system/sparc64/sysvinit.xml
===================================================================
--- BOOK/final-system/sparc64/sysvinit.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-system-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../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='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <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='d'])"/>
-
-    <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='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/sysvinit.xml"
-  xpointer="xpointer(id('conf-sysvinit'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('contents-sysvinit'))"/>
-
-</sect1>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/introduction/common/changelog.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -36,4 +36,91 @@
     </listitem>
 -->
+
+    <listitem>
+      <para>September 14, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated Bootscripts to 1.2-pre1.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Use a Common inittab across all
+          architectures.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Formatting fixes on multiple pages.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Add -Duseshrplib to the perl configure command.
+          This causes perl to build a shared libperl.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Applied fixes to Expect to make it compatible with
+          TCL 8.5.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated Linux to 2.6.26.5.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated Udev to 128.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated MPFR to 2.3.2.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated Vim to 7.2.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated Texinfo to 4.12.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated Module-Init-Tools to 3.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated Libtool to 2.2.6a.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated IPRoute2 to 2.6.26.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated Shadow to 4.1.2.1.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated Man to 1.6f.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated Man-Pages to 3.09.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated Findutils to 4.4.0.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated Autoconf to 2.63.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated Bzip2 to 1.0.5.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated Kbd to 1.14.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated M4 to 1.4.11.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated E2fsprogs to 1.41.1.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated TCL to 8.5.4.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated Util-Linux-NG to 2.14.1.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated Tree to 1.5.2.1.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Checked and Updated Download Locations.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: BOOK/materials/alpha/patches.xml
===================================================================
--- BOOK/materials/alpha/patches.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/materials/alpha/patches.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -35,13 +35,4 @@
     </varlistentry>
 
-    <varlistentry>
-      <term>Linux PAGE_SIZE Patch - <token>&linux-alpha_PAGE_SIZE-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&linux-alpha_PAGE_SIZE-patch;"/></para>
-        <para>MD5 sum: <literal>&linux-alpha_PAGE_SIZE-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
   </variablelist>
 
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/materials/common/patches.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -56,4 +56,13 @@
 
     <varlistentry>
+      <term>Expect Avoid TCL Internals Patch - <token>&expect-avoid_tcl_internals-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&expect-avoid_tcl_internals-patch;"/></para>
+        <para>MD5 sum: <literal>&expect-avoid_tcl_internals-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Expect Spawn Patch - <token>&expect-spawn-patch-size;</token>:</term>
       <listitem>
@@ -119,22 +128,4 @@
 
     <varlistentry>
-      <term>Linux Security Fixes Patch - <token>&linux-security-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&linux-security-patch;"/></para>
-        <para>MD5 sum: <literal>&linux-security-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>MPFR Cumulative Patch - <token>&mpfr-cumulative-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&mpfr-cumulative-patch;"/></para>
-        <para>MD5 sum: <literal>&mpfr-cumulative-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Module-Init-Tools Manpages Patch - <token>&module-init-tools-manpages-patch-size;</token>:</term>
       <listitem>
@@ -179,13 +170,4 @@
         <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
       </listitem>
-    </varlistentry>
-
-    <varlistentry>
-       <term>Texinfo mbstate Fix Patch - <token>&texinfo-mbstate_fix-patch-size;</token>:</term>
-       <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&texinfo-mbstate_fix-patch;"/></para>
-        <para>MD5 sum: <literal>&texinfo-mbstate_fix-patch-md5;</literal></para>
-       </listitem>
     </varlistentry>
 
Index: BOOK/materials/mips64/patches.xml
===================================================================
--- BOOK/materials/mips64/patches.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/materials/mips64/patches.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -49,8 +49,4 @@
     xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='udev-lib64-patch'])"/>
-
   </variablelist>
 
Index: BOOK/materials/ppc64/patches.xml
===================================================================
--- BOOK/materials/ppc64/patches.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/materials/ppc64/patches.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -57,8 +57,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='udev-lib64-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../ppc/patches.xml"
     xpointer="xpointer(//*[@os='yaboot-fix-patch'])"/>
Index: BOOK/materials/sparc64-64/patches.xml
===================================================================
--- BOOK/materials/sparc64-64/patches.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/materials/sparc64-64/patches.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -30,8 +30,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/patches.xml"
-    xpointer="xpointer(//*[@os='linux-elf-spitfire-fix-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc/patches.xml"
     xpointer="xpointer(//*[@os='silo-fixes-patch'])"/>
Index: BOOK/materials/sparc64/patches.xml
===================================================================
--- BOOK/materials/sparc64/patches.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/materials/sparc64/patches.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -34,13 +34,4 @@
     </varlistentry>
 
-    <varlistentry os="linux-elf-spitfire-fix-patch">
-      <term>Linux Elf Spitfire Fix Patch - <token>&linux-elf_spitfire_fix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&linux-elf_spitfire_fix-patch;"/></para>
-        <para>MD5 sum: <literal>&linux-elf_spitfire_fix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/patches.xml"
@@ -55,8 +46,4 @@
     xpointer="xpointer(//*[@os='silo-fixes-patch'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='udev-lib64-patch'])"/>
-
   </variablelist>
 
Index: BOOK/materials/x86_64/patches.xml
===================================================================
--- BOOK/materials/x86_64/patches.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/materials/x86_64/patches.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -61,13 +61,4 @@
     </varlistentry>
 
-    <varlistentry os="udev-lib64-patch">
-      <term>Udev Lib64 Patch - <token>&udev-lib64-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&udev-lib64-patch;"/></para>
-        <para>MD5 sum: <literal>&udev-lib64-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
   </variablelist>
 
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/packages.ent	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -18,8 +18,8 @@
 <!ENTITY arcload-home "http://www.linux-mips.org/wiki/ARCLoad">
 
-<!ENTITY autoconf-version "2.61">
-<!ENTITY autoconf-size "1,024 KB">
+<!ENTITY autoconf-version "2.63">
+<!ENTITY autoconf-size "1,172 KB">
 <!ENTITY autoconf-url "&gnu;autoconf/autoconf-&autoconf-version;.tar.bz2">
-<!ENTITY autoconf-md5 "36d3fe706ad0950f1be10c46a429efe0">
+<!ENTITY autoconf-md5 "7565809ed801bb5726da0631ceab3699">
 <!ENTITY autoconf-home "&gnu-software;autoconf">
 
@@ -61,14 +61,14 @@
 <!ENTITY bison-home "&gnu-software;bison">
 
-<!ENTITY bzip2-version "1.0.4">
+<!ENTITY bzip2-version "1.0.5">
 <!ENTITY bzip2-size "828 KB">
 <!ENTITY bzip2-url "http://www.bzip.org/&bzip2-version;/bzip2-&bzip2-version;.tar.gz">
-<!ENTITY bzip2-md5 "fc310b254f6ba5fbb5da018f04533688">
+<!ENTITY bzip2-md5 "3c15a0c8d1d3ee1c46a1634d00617b1a">
 <!ENTITY bzip2-home "http://www.bzip.org/">
 
-<!ENTITY clfs-bootscripts-version "1.1-pre10">
+<!ENTITY clfs-bootscripts-version "1.2-pre1">
 <!ENTITY clfs-bootscripts-size "40 KB">
 <!ENTITY clfs-bootscripts-url "&packages-root;bootscripts-cross-lfs-&clfs-bootscripts-version;.tar.bz2">
-<!ENTITY clfs-bootscripts-md5 "80ae8e7bbb0f8ea2391f7f15a413aee4">
+<!ENTITY clfs-bootscripts-md5 "d8a094d1f59d594ba703e79bafebd823">
 <!ENTITY clfs-bootscripts-home " ">
 
@@ -103,8 +103,8 @@
 <!ENTITY dvhtool-home "http://packages.qa.debian.org/d/dvhtool.html">
 
-<!ENTITY e2fsprogs-version "1.40.4">
-<!ENTITY e2fsprogs-size "3,960 KB">
+<!ENTITY e2fsprogs-version "1.41.1">
+<!ENTITY e2fsprogs-size "4,264 KB">
 <!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "124d744bdf9d443591eb8193c085944b">
+<!ENTITY e2fsprogs-md5 "ddf13b3c9ece247c457db20ca9a10c3c">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net">
 
@@ -131,8 +131,8 @@
 <!ENTITY file-home "http://www.darwinsys.com/file">
 
-<!ENTITY findutils-version "4.2.32">
-<!ENTITY findutils-size "1,404 KB">
+<!ENTITY findutils-version "4.4.0">
+<!ENTITY findutils-size "1,988 KB">
 <!ENTITY findutils-url "&gnu;findutils/findutils-&findutils-version;.tar.gz">
-<!ENTITY findutils-md5 "aaa6beeb41a6f04963dff58f24a55b96">
+<!ENTITY findutils-md5 "49e769ac4382fae6f104f99d54d0a112">
 <!ENTITY findutils-home "&gnu-software;findutils">
 
@@ -222,14 +222,14 @@
 <!ENTITY inetutils-home "&gnu-software;inetutils">
 
-<!ENTITY iproute2-version "2.6.23">
-<!ENTITY iproute2-size "340 KB">
+<!ENTITY iproute2-version "2.6.26">
+<!ENTITY iproute2-size "356 KB">
 <!ENTITY iproute2-url "http://developer.osdl.org/dev/iproute2/download/iproute2-&iproute2-version;.tar.bz2">
-<!ENTITY iproute2-md5 "2e59da739ef19990408cf0a5cb0cae3e">
+<!ENTITY iproute2-md5 "7d221e735cba05709341cd46401c4ecd">
 <!ENTITY iproute2-home "http://linux-net.osdl.org/index.php/Iproute2">
 
-<!ENTITY kbd-version "1.13">
-<!ENTITY kbd-size "625 KB">
-<!ENTITY kbd-url "http://ftp.altlinux.com/pub/people/legion/kbd/kbd-&kbd-version;.tar.bz2">
-<!ENTITY kbd-md5 "2639fdfe2412b29cbf6936d7db91cee3">
+<!ENTITY kbd-version "1.14">
+<!ENTITY kbd-size "884 KB">
+<!ENTITY kbd-url "http://ftp.altlinux.com/pub/people/legion/kbd/kbd-&kbd-version;.tar.gz">
+<!ENTITY kbd-md5 "3705719cd3c769152be1a896efb34ef8">
 <!ENTITY kbd-home " ">
 
@@ -240,8 +240,8 @@
 <!ENTITY less-home "http://www.greenwoodsoftware.com/less">
 
-<!ENTITY libtool-version "1.5.26">
-<!ENTITY libtool-size "2,900 KB">
+<!ENTITY libtool-version "2.2.6a">
+<!ENTITY libtool-size "2,808 KB">
 <!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.gz">
-<!ENTITY libtool-md5 "aa9c5107f3ec9ef4200eb6556f3b3c29">
+<!ENTITY libtool-md5 "8ca1ea241cd27ff9832e045fe9afe4fd">
 <!ENTITY libtool-home "&gnu-software;libtool">
 
@@ -254,14 +254,14 @@
 <!ENTITY linux-dl-version "2.6">
 
-<!ENTITY linux-version "2.6.24.7">
-<!ENTITY linux-size "45,638 KB">
+<!ENTITY linux-version "2.6.26.5">
+<!ENTITY linux-size "48,344 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "40a73780d51525d28d36dec852c680c4">
+<!ENTITY linux-md5 "98261b39a558cf0739703ffea7db9f43">
 <!ENTITY linux-home "http://www.kernel.org">
 
-<!ENTITY m4-version "1.4.10">
-<!ENTITY m4-size "728 KB">
+<!ENTITY m4-version "1.4.11">
+<!ENTITY m4-size "912 KB">
 <!ENTITY m4-url "&gnu;m4/m4-&m4-version;.tar.bz2">
-<!ENTITY m4-md5 "0a35bab2f5d605e08083d7e3cbd4b8b0">
+<!ENTITY m4-md5 "96ec473c2a6f203976c028e896a01b28">
 <!ENTITY m4-home "&gnu-software;m4">
 
@@ -272,26 +272,26 @@
 <!ENTITY make-home "&gnu-software;make">
 
-<!ENTITY man-version "1.6e">
-<!ENTITY man-size "248 KB">
+<!ENTITY man-version "1.6f">
+<!ENTITY man-size "256 KB">
 <!ENTITY man-url "http://primates.ximian.com/~flucifredi/man/man-&man-version;.tar.gz">
-<!ENTITY man-md5 "d8187cd756398baefc48ba7d60ff6a8a">
+<!ENTITY man-md5 "67aaaa6df35215e812fd7d89472c44b6">
 <!ENTITY man-home "http://primates.ximian.com/~flucifredi/man">
 
-<!ENTITY man-pages-version "3.01">
-<!ENTITY man-pages-size "904 KB">
+<!ENTITY man-pages-version "3.09">
+<!ENTITY man-pages-size "968 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/manpages/Archive/man-pages-&man-pages-version;.tar.bz2">
-<!ENTITY man-pages-md5 "ef311ffb0c4f43bad822345fb88498f7">
+<!ENTITY man-pages-md5 "a04a1676e2c0676f047a525184e3320b">
 <!ENTITY man-pages-home "http://www.win.tue.nl/~aeb/linux/man">
 
-<!ENTITY mpfr-version "2.3.1">
-<!ENTITY mpfr-size "876 KB">
+<!ENTITY mpfr-version "2.3.2">
+<!ENTITY mpfr-size "968 KB">
 <!ENTITY mpfr-url "http://www.mpfr.org/mpfr-current/mpfr-&mpfr-version;.tar.bz2">
-<!ENTITY mpfr-md5 "8352b619e04dcc73411a38b39dd855f6">
+<!ENTITY mpfr-md5 "527147c097874340cb9cee0579dacf3b">
 <!ENTITY mpfr-home "http://www.mpfr.org/">
 
-<!ENTITY module-init-tools-version "3.4">
-<!ENTITY module-init-tools-size "192 KB">
+<!ENTITY module-init-tools-version "3.4.1">
+<!ENTITY module-init-tools-size "196 KB">
 <!ENTITY module-init-tools-url "http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2">
-<!ENTITY module-init-tools-md5 "db6ac059e80e8dd4389dbe81ee61f3c6">
+<!ENTITY module-init-tools-md5 "e253b066a1bab1d727ca0d54f001b49c">
 <!ENTITY module-init-tools-home "http://www.kerneltools.org/KernelTools.org">
 
@@ -350,8 +350,8 @@
 <!ENTITY sed-home "&gnu-software;sed">
 
-<!ENTITY shadow-version "4.1.2">
-<!ENTITY shadow-size "1,660 KB">
+<!ENTITY shadow-version "4.1.2.1">
+<!ENTITY shadow-size "1,664 KB">
 <!ENTITY shadow-url "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-&shadow-version;.tar.bz2">
-<!ENTITY shadow-md5 "ce90cbe9cba7f6673cb10cad49083c1c">
+<!ENTITY shadow-md5 "c178e49c45495e296dabbe4ae01a0fbe">
 <!ENTITY shadow-home "http://pkg-shadow.alioth.debian.org">
 
@@ -383,26 +383,27 @@
 <!ENTITY tar-home "&gnu-software;tar">
 
-<!ENTITY tcl-version "8.4.16">
-<!ENTITY tcl-size "3,560 KB">
+<!ENTITY tcl-version2 "8.5">
+<!ENTITY tcl-version "&tcl-version2;.4">
+<!ENTITY tcl-size "4,312 KB">
 <!ENTITY tcl-url "&sourceforge;tcl/tcl&tcl-version;-src.tar.gz">
-<!ENTITY tcl-md5 "f1c783a49547778d160e10be2fb5d76f">
+<!ENTITY tcl-md5 "15032a6a43f3bfbe9223b95186849472">
 <!ENTITY tcl-home "http://www.tcl.tk">
 
-<!ENTITY texinfo-version "4.11">
-<!ENTITY texinfo-size "1628 KB">
-<!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.bz2">
-<!ENTITY texinfo-md5 "c6bf13df4fbeff8ce874aacd6a51e814">
+<!ENTITY texinfo-version "4.12">
+<!ENTITY texinfo-size "2,424 KB">
+<!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.gz">
+<!ENTITY texinfo-md5 "e9216fb657e1555a289a14a74dac8f4f">
 <!ENTITY texinfo-home "&gnu-software;texinfo">
 
-<!ENTITY tree-version "1.5.1.1">
-<!ENTITY tree-size "32 KB">
+<!ENTITY tree-version "1.5.2.1">
+<!ENTITY tree-size "36 KB">
 <!ENTITY tree-url "ftp://mama.indstate.edu/linux/tree/tree-&tree-version;.tgz">
-<!ENTITY tree-md5 "f8fc70a9260b50bf8b4613e9d5f5e589">
+<!ENTITY tree-md5 "73d5fa220dfef1ee9c1876c3966f1c18">
 <!ENTITY tree-home "http://mama.indstate.edu/users/ice/tree">
 
-<!ENTITY udev-version "124">
-<!ENTITY udev-size "204 KB">
+<!ENTITY udev-version "128">
+<!ENTITY udev-size "436 KB">
 <!ENTITY udev-url "&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2">
-<!ENTITY udev-md5 "4da0471c0ca3a2a2a77692f67120c03d">
+<!ENTITY udev-md5 "a21a954bb1306bc9c6c3f27792c6e508">
 <!ENTITY udev-home "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html">
 
@@ -415,8 +416,8 @@
 <!ENTITY util-linux-ng-dl-version "2.14">
 
-<!ENTITY util-linux-ng-version "2.14">
-<!ENTITY util-linux-ng-size "2,804 KB">
+<!ENTITY util-linux-ng-version "2.14.1">
+<!ENTITY util-linux-ng-size "2,868 KB">
 <!ENTITY util-linux-ng-url "&kernel;linux/utils/util-linux-ng/v&util-linux-ng-dl-version;/util-linux-ng-&util-linux-ng-version;.tar.bz2">
-<!ENTITY util-linux-ng-md5 "23f227da49df36f33fe47e917e332cd8">
+<!ENTITY util-linux-ng-md5 "9aab772ee9b1f4e67dff98169f3cb380">
 <!ENTITY util-linux-ng-home "http://userweb.kernel.org/~kzak/util-linux-ng/">
 
@@ -427,13 +428,13 @@
 <!ENTITY yaboot-home "http://yaboot.ozlabs.org">
 
-<!ENTITY vim-version "7.1">
-<!ENTITY vim-version2 "71">
-<!ENTITY vim-size "6,728 KB">
+<!ENTITY vim-version "7.2">
+<!ENTITY vim-version2 "72">
+<!ENTITY vim-size "7,048 KB">
 <!ENTITY vim-url "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
-<!ENTITY vim-md5 "44c6b4914f38d6f9aa959640b89da329">
+<!ENTITY vim-md5 "f0901284b338e448bfd79ccca0041254">
 <!ENTITY vim-home "http://www.vim.org">
-<!ENTITY vim-language-size "1,168 KB">
+<!ENTITY vim-language-size "1,340 KB">
 <!ENTITY vim-language-url "ftp://ftp.vim.org/pub/vim/extra/vim-&vim-version;-lang.tar.gz">
-<!ENTITY vim-language-md5 "144aa049ba70621acf4247f0459f3ee7">
+<!ENTITY vim-language-md5 "d8884786979e0e520c112faf2e176f05">
 <!ENTITY vim-language-home " ">
 
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/patches.ent	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -21,4 +21,8 @@
 <!ENTITY coreutils-uname-patch-size "8 KB">
 
+<!ENTITY expect-avoid_tcl_internals-patch "expect-&expect-version;-avoid-tcl-internals-1.patch">
+<!ENTITY expect-avoid_tcl_internals-patch-md5 "5661004ca23ddc9592f488142367c2f5">
+<!ENTITY expect-avoid_tcl_internals-patch-size "4 KB">
+
 <!ENTITY expect-spawn-patch "expect-&expect-version;-spawn-2.patch">
 <!ENTITY expect-spawn-patch-md5 "7706e1e8238c72eed8dc905d6f3b6aa9">
@@ -53,12 +57,4 @@
 <!ENTITY inetutils-man_pages-patch-size "8 KB">
 
-<!ENTITY linux-security-patch "linux-&linux-version;-security_fixes-1.patch">
-<!ENTITY linux-security-patch-md5 "7f244856cc40e478f5f66a6a6267d4c6">
-<!ENTITY linux-security-patch-size "15.5 KB">
-
-<!ENTITY mpfr-cumulative-patch "mpfr-&mpfr-version;-cumulative-1.patch">
-<!ENTITY mpfr-cumulative-patch-md5 "99c647dfe7f63005db6c0c1b28198ef9">
-<!ENTITY mpfr-cumulative-patch-size "12KB">
-
 <!ENTITY module-init-tools-manpages-patch "module-init-tools-&module-init-tools-version;-manpages-1.patch">
 <!ENTITY module-init-tools-manpages-patch-md5 "2271047586981ae23adf01cc13d97791">
@@ -81,11 +77,7 @@
 <!ENTITY readline-fixes-patch-size "20 KB">
 
-<!ENTITY texinfo-mbstate_fix-patch "texinfo-&texinfo-version;-mbstate_fix-1.patch">
-<!ENTITY texinfo-mbstate_fix-patch-md5 "37e3d170d809bb1c90e9741864839f66">
-<!ENTITY texinfo-mbstate_fix-patch-size "4 KB">
-
-<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-2.patch">
-<!ENTITY vim-branch_update-patch-md5 "bd5ee693b6ed59567dc0e7c003d22694">
-<!ENTITY vim-branch_update-patch-size "284 KB">
+<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-1.patch">
+<!ENTITY vim-branch_update-patch-md5 "b8d3ec6d9b1123d4c92044db590f3218">
+<!ENTITY vim-branch_update-patch-size "20 KB">
 
 <!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">
@@ -100,5 +92,5 @@
 
 <!ENTITY iproute2-libdir-patch "iproute2-&iproute2-version;-libdir-1.patch">
-<!ENTITY iproute2-libdir-patch-md5 "161768813d904b958c76af1e8f4974ac">
+<!ENTITY iproute2-libdir-patch-md5 "0ec074f33dd867dd146a55077f9d5d6e">
 <!ENTITY iproute2-libdir-patch-size "4 KB">
 
@@ -107,8 +99,4 @@
 <!ENTITY perl-multilib-patch-size "4 KB">
 
-<!ENTITY udev-lib64-patch "udev-&udev-version;-lib64-2.patch">
-<!ENTITY udev-lib64-patch-md5 "8e80d66bb1a19638bfb49548a780c86c">
-<!ENTITY udev-lib64-patch-size "12 KB">
-
 <!-- Start of Pure64 patches -->
 
@@ -137,8 +125,4 @@
 <!ENTITY glibc-alpha_ptr_mangle_fix-patch-size "4 KB">
 
-<!ENTITY linux-alpha_PAGE_SIZE-patch "linux-&linux-version;-alpha_PAGE_SIZE-2.patch">
-<!ENTITY linux-alpha_PAGE_SIZE-patch-md5 "70bf07c2ae964c45108ad6a52044164b">
-<!ENTITY linux-alpha_PAGE_SIZE-patch-size "2 KB">
-
 <!-- Start of mips/mips64 patches -->
 
@@ -187,8 +171,4 @@
 <!ENTITY elftoaout-fixes-patch-size "6.7 KB">
 
-<!ENTITY linux-elf_spitfire_fix-patch "linux-&linux-version;-elf_spitfire_fix-1.patch">
-<!ENTITY linux-elf_spitfire_fix-patch-md5 "e0198bd54b7d1a2cd142d1bb22ae61f8">
-<!ENTITY linux-elf_spitfire_fix-patch-size "4 KB">
-
 <!ENTITY inetutils-memcpy_sparc64-patch "inetutils-&inetutils-version;-memcpy_sparc64-1.patch">
 <!ENTITY inetutils-memcpy_sparc64-patch-md5 "04ed919685f6790931eaa8684452a755">
Index: BOOK/temp-system/common/findutils.xml
===================================================================
--- BOOK/temp-system/common/findutils.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/temp-system/common/findutils.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -23,4 +23,10 @@
     <title>Installation of Findutils</title>
 
+    <para os="t1">The following cache entries set the values for tests that do
+    not run while cross-compiling:</para>
+
+<screen os="t2"><userinput>echo "gl_cv_func_wcwidth_works=yes" &gt; config.cache
+echo "ac_cv_func_fnmatch_gnu=yes" &gt;&gt; config.cache</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/findutils.xml"
@@ -28,5 +34,6 @@
 
 <screen os="ac"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/common/texinfo.xml
===================================================================
--- BOOK/temp-system/common/texinfo.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/temp-system/common/texinfo.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -22,9 +22,4 @@
   <sect2 role="installation">
     <title>Installation of Texinfo</title>
-
-    <para os="p1">The following patch fixes a build error due to mbstate
-    being undefined:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&texinfo-mbstate_fix-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/multilib/findutils.xml
===================================================================
--- BOOK/temp-system/multilib/findutils.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/temp-system/multilib/findutils.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -25,8 +25,17 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/findutils.xml"
+    xpointer="xpointer(//*[@os='t1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/findutils.xml"
+    xpointer="xpointer(//*[@os='t2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/findutils.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="ac"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/multilib/gawk.xml
===================================================================
--- BOOK/temp-system/multilib/gawk.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/temp-system/multilib/gawk.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -27,6 +27,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
-   ./configure --prefix=/tools \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
Index: BOOK/temp-system/multilib/texinfo.xml
===================================================================
--- BOOK/temp-system/multilib/texinfo.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/temp-system/multilib/texinfo.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -22,12 +22,4 @@
   <sect2 role="installation">
     <title>Installation of Texinfo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/testsuite-tools/common/expect.xml
===================================================================
--- BOOK/testsuite-tools/common/expect.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/testsuite-tools/common/expect.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -30,4 +30,20 @@
 
 <screen os="s2"><userinput>sed -i '/EXP_LIB_SPEC=/s@${exec_prefix}/lib@${libdir}@' configure</userinput></screen>
+
+    <para os="t1">The following sed adds a missing include to
+    <filename>Dbg.c</filename>:</para>
+
+<screen os="t2"><userinput>sed -i '1i\#include &lt;expect_cf.h&gt;' Dbg.c</userinput></screen>
+
+    <para os="t3">The following sed causes one of the source files to include
+    the correct header</para>
+
+<screen os="t4"><userinput>sed -i "s/tcl.h/tclInt.h/" exp_inter.c</userinput></screen>
+
+    <para os="p1">The following patch prevents Expect from using functions
+    that are internal to TCL and are no longer available for expect to
+    link against:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&expect-avoid_tcl_internals-patch;</userinput></screen>
 
     <para os="a">Fix a bug that can result in false failures during the GCC
Index: BOOK/testsuite-tools/common/tcl.xml
===================================================================
--- BOOK/testsuite-tools/common/tcl.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/testsuite-tools/common/tcl.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -45,5 +45,5 @@
     <para os="i">Now make a necessary symbolic link:</para>
 
-<screen os="j"><userinput>ln -sv tclsh8.4 /tools/bin/tclsh</userinput></screen>
+<screen os="j"><userinput>ln -sv tclsh&tcl-version2; /tools/bin/tclsh</userinput></screen>
 
   </sect2>
@@ -57,6 +57,6 @@
 
       <seglistitem>
-        <seg>tclsh (link to tclsh8.4) and tclsh8.4</seg>
-        <seg>libtcl8.4.so</seg>
+        <seg>tclsh (link to tclsh&tcl-version2;) and tclsh&tcl-version2;</seg>
+        <seg>libtcl&tcl-version2;.so</seg>
       </seglistitem>
     </segmentedlist>
@@ -67,10 +67,10 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="tclsh8.4">
-        <term><command>tclsh8.4</command></term>
+      <varlistentry id="tclsh&tcl-version2;">
+        <term><command>tclsh&tcl-version2;</command></term>
         <listitem>
           <para>The Tcl command shell</para>
-          <indexterm zone="ch-testsuite-tools-tcl tclsh8.4">
-            <primary sortas="b-tclsh8.4">tclsh8.4</primary>
+          <indexterm zone="ch-testsuite-tools-tcl tclsh&tcl-version2;">
+            <primary sortas="b-tclsh&tcl-version2;">tclsh&tcl-version2;</primary>
           </indexterm>
         </listitem>
@@ -80,5 +80,5 @@
         <term><command>tclsh</command></term>
         <listitem>
-          <para>A link to tclsh8.4</para>
+          <para>A link to tclsh&tcl-version2;</para>
           <indexterm zone="ch-testsuite-tools-tcl tclsh">
             <primary sortas="b-tclsh">tclsh</primary>
@@ -87,10 +87,10 @@
       </varlistentry>
 
-      <varlistentry id="libtcl8.4.so">
-        <term><filename class="libraryfile">libtcl8.4.so</filename></term>
+      <varlistentry id="libtcl&tcl-version2;.so">
+        <term><filename class="libraryfile">libtcl&tcl-version2;.so</filename></term>
         <listitem>
           <para>The Tcl library</para>
-          <indexterm zone="ch-testsuite-tools-tcl libtcl8.4.so">
-            <primary sortas="c-libtcl8.4.so">libtcl8.4.so</primary>
+          <indexterm zone="ch-testsuite-tools-tcl libtcl&tcl-version2;.so">
+            <primary sortas="c-libtcl&tcl-version2;.so">libtcl&tcl-version2;.so</primary>
           </indexterm>
         </listitem>
Index: BOOK/testsuite-tools/mips/expect.xml
===================================================================
--- BOOK/testsuite-tools/mips/expect.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/testsuite-tools/mips/expect.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -33,4 +33,28 @@
     href="../common/expect.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='t1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='t2'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='t3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='t4'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/testsuite-tools/mips64/expect.xml
===================================================================
--- BOOK/testsuite-tools/mips64/expect.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/testsuite-tools/mips64/expect.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -29,4 +29,28 @@
     href="../common/expect.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='t1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='t2'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='t3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='t4'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/testsuite-tools/multilib/expect.xml
===================================================================
--- BOOK/testsuite-tools/multilib/expect.xml	(revision 9d32016c24ab889e53a742d5ab35a5dfd8b79dc0)
+++ BOOK/testsuite-tools/multilib/expect.xml	(revision 1da2a8453aaf00f444d633fc0e0159920de953f3)
@@ -29,4 +29,28 @@
     href="../common/expect.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='t1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='t2'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='t3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='t4'])"/>
+
+   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/expect.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
