Index: BOOK/appendices/acknowledgments.xml
===================================================================
--- BOOK/appendices/acknowledgments.xml	(revision 4fc026ef671b8cdd8c60814e135dc362072ac718)
+++ BOOK/appendices/acknowledgments.xml	(revision 02095ae2677b1a04865e7362509b6a5c1647e4e2)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
Index: BOOK/appendices/acronymlist.xml
===================================================================
--- BOOK/appendices/acronymlist.xml	(revision 4fc026ef671b8cdd8c60814e135dc362072ac718)
+++ BOOK/appendices/acronymlist.xml	(revision 02095ae2677b1a04865e7362509b6a5c1647e4e2)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
@@ -122,4 +122,11 @@
 
     <varlistentry>
+      <term><emphasis role="bold">CVS</emphasis></term>
+      <listitem>
+        <para>Concurrent Versions System</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term><emphasis role="bold">DHCP</emphasis></term>
       <listitem>
@@ -241,4 +248,11 @@
 
     <varlistentry>
+      <term><emphasis role="bold">GPG</emphasis></term>
+      <listitem>
+        <para>GNU Privacy Guard</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term><emphasis role="bold">HTML</emphasis></term>
       <listitem>
@@ -416,4 +430,11 @@
 
     <varlistentry>
+      <term><emphasis role="bold">PLFS</emphasis></term>
+      <listitem>
+        <para>Pure Linux From Scratch</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term><emphasis role="bold">PTY</emphasis></term>
       <listitem>
Index: BOOK/appendices/dependencies/alpha.xml
===================================================================
--- BOOK/appendices/dependencies/alpha.xml	(revision 4fc026ef671b8cdd8c60814e135dc362072ac718)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix 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;
-]>
-
-<appendix id="appendixc-alpha" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
-  <?dbhtml filename="alpha-dependencies.html"?>
-
-  <title>Alpha Dependencies</title>
-
-  <para>This page contains dependency information for packages specific to Alpha.</para>
-
-</appendix>
Index: BOOK/appendices/dependencies/arm.xml
===================================================================
--- BOOK/appendices/dependencies/arm.xml	(revision 4fc026ef671b8cdd8c60814e135dc362072ac718)
+++ BOOK/appendices/dependencies/arm.xml	(revision 02095ae2677b1a04865e7362509b6a5c1647e4e2)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
Index: BOOK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml	(revision 4fc026ef671b8cdd8c60814e135dc362072ac718)
+++ BOOK/appendices/dependencies/common.xml	(revision 02095ae2677b1a04865e7362509b6a5c1647e4e2)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
@@ -12,10 +12,10 @@
   <title>Dependencies</title>
 
-  <para>Every package built in CLFS relies on one or more other packages
+  <para>Every package built in LFS relies on one or more other packages
   in order to build and install properly. Some packages even participate
   in circular dependencies, that is, the first package depends on the second
   which in turn depends on the first. Because of these dependencies, the
-  order in which packages are built in CLFS is very important. The purpose
-  of this page is to document the dependencies of each package built in CLFS.</para>
+  order in which packages are built in LFS is very important. The purpose
+  of this page is to document the dependencies of each package built in LFS.</para>
 
   <para>For each package we build, we have listed three types of dependencies.
@@ -38,13 +38,13 @@
 
         <seglistitem>
-          <seg>Bash, Coreutils, Gawk, Grep, M4, Make, Perl, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Automake, Binutils, Diffutils, Findutils, GCC and Libtool</seg>
+          <seg>Bash, Coreutils, Grep, M4, Make, Perl, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Automake, Diffutils, Findutils, GCC and Libtool</seg>
         </seglistitem>
       </segmentedlist>
@@ -65,5 +65,5 @@
 
         <seglistitem>
-          <seg>Autoconf, Bash, Binutils, Coreutils, Gawk, Grep, M4, Make, Perl,
+          <seg>Autoconf, Bash, Coreutils, Gettext, Grep, M4, Make, Perl,
           Sed and Texinfo</seg>
         </seglistitem>
@@ -74,7 +74,7 @@
 
         <seglistitem>
-          <seg>Bison, Bzip2, DejaGNU, Diffutils, Expect, Findutils,
-          Flex, GCC, Gettext, Gzip, Libtool, XZ-Utils and Tar. Can also use several
-          other packages that are not installed in CLFS.</seg>
+          <seg>Binutils, Bison, Bzip2, DejaGNU, Diffutils, Expect, Findutils,
+          Flex, GCC, Gettext, Gzip, Libtool and Tar. Can also use several
+          other packages that are not installed in LFS.</seg>
         </seglistitem>
       </segmentedlist>
@@ -95,14 +95,14 @@
 
         <seglistitem>
-          <seg>Bash, Bison, Coreutils, Diffutils, Gawk, EGLIBC, GCC, Grep, Make,
-          Ncurses, Patch, Readline, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
+          <seg>Bash, Bison, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
+	  Ncurses, Patch, Readline, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Diffutils and Gawk</seg>
         </seglistitem>
       </segmentedlist>
@@ -123,6 +123,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, File, Gawk, EGLIBC, GCC,
-         Grep, Make, Perl, Sed, Texinfo and Zlib</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep,
+         Make, Perl, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -151,5 +151,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, EGLIBC, GCC,
+         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc,
          Grep, M4, Make and Sed</seg>
         </seglistitem>
@@ -160,5 +160,5 @@
 
         <seglistitem>
-          <seg>Diffutils, Findutils and Gawk</seg>
+          <seg>Diffutils and Findutils</seg>
         </seglistitem>
       </segmentedlist>
@@ -179,13 +179,13 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Make and Patch</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
@@ -233,22 +233,22 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, EGLIBC, GCC, GMP, Grep, Make,
-         Patch, Perl, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, E2fsprogs, Findutils, Util-linux-ng</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Bash, Diffutils, Findutils, Man and Udev</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
+	 Patch, Perl, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Diffutils</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Bash, Diffutils, Findutils, Man-DB and Udev</seg>
         </seglistitem>
       </segmentedlist>
@@ -281,31 +281,4 @@
       </segmentedlist>
 
-<!-- Begin DHCPCD dependency info -->
-  <bridgehead renderas="sect2" id="dhcpcd-dep">DHCPCD</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Coreutils, GCC, Make, Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Diffutils dependency info -->
   <bridgehead renderas="sect2" id="diffutils-dep">Diffutils</bridgehead>
@@ -315,6 +288,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
-         Make, Patch, Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep,
+	 Make, Patch, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -343,6 +316,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC, Grep, Make,
-         Patch, Sed and Tcl</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
+	 Patch, Sed and Tcl</seg>
         </seglistitem>
       </segmentedlist>
@@ -371,22 +344,22 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Gettext, Grep, Gzip,
-         Make, Sed, Texinfo and Util-linux-ng</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Bzip2 and Diffutils</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
+         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Gettext, Glibc, Grep, Gzip,
+	 Make, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Diffutils</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Util-Linux</seg>
         </seglistitem>
       </segmentedlist>
@@ -399,6 +372,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, EGLIBC, GCC, Grep,
-         Make, Sed and Zlib</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
+	 Make, Sed and Zlib</seg>
         </seglistitem>
       </segmentedlist>
@@ -427,6 +400,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
-         Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
+	 Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -455,22 +428,22 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, M4, Make,
-         Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Bison, Diffutils and Gawk</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>IPRoute2, Kbd and Man</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, M4, Make,
+	 Patch, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Bison and Gawk</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>IPRoute2, Kbd and Man-DB</seg>
         </seglistitem>
       </segmentedlist>
@@ -483,5 +456,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make, Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
+	 Patch, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -510,6 +484,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
-         GCC, GMP, Grep, Make, MPFR, Patch, Perl, Sed, Tar and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
+	 Gettext, Glibc, Grep, Make, Patch, Perl, Sed, Tar and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -538,14 +512,14 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
-         GCC, Grep, Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Tar and Tcl</seg>
+         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make,
+	 Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Diffutils, Perl and Tcl</seg>
         </seglistitem>
       </segmentedlist>
@@ -559,6 +533,6 @@
       </segmentedlist>
 
-<!-- Begin EGLIBC dependency info -->
-  <bridgehead renderas="sect2" id="eglibc-dep">EGLIBC</bridgehead>
+<!-- Begin Glibc dependency info -->
+  <bridgehead renderas="sect2" id="glibc-dep">Glibc</bridgehead>
 
       <segmentedlist>
@@ -587,32 +561,4 @@
       </segmentedlist>
 
-<!-- Begin GMP dependency info -->
-  <bridgehead renderas="sect2" id="gmp-dep">GMP</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, EGLIBC, GCC, Grep, M4, Make,
-         Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>MPFR, GCC</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Grep dependency info -->
   <bridgehead renderas="sect2" id="grep-dep">Grep</bridgehead>
@@ -622,6 +568,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
-         Make, Patch, Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Make,
+	 Patch, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -639,5 +585,5 @@
 
         <seglistitem>
-          <seg>Man</seg>
+          <seg>Man-DB</seg>
         </seglistitem>
       </segmentedlist>
@@ -650,6 +596,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, EGLIBC, GCC, Grep, Make, Perl
-         Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Bison, Coreutils,  Gawk, GCC, Glibc, Grep, Make,
+	 Patch, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -678,22 +624,22 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
-         Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Man</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
+	 Patch, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Man-DB</seg>
         </seglistitem>
       </segmentedlist>
@@ -726,4 +672,32 @@
       </segmentedlist>
 
+<!-- Begin Inetutils dependency info -->
+  <bridgehead renderas="sect2" id="inetutils-dep">Inetutils</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Ncurses,
+	 Patch, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Tar</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin IProute2 dependency info -->
   <bridgehead renderas="sect2" id="iproute2-dep">IProute2</bridgehead>
@@ -733,33 +707,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, Findutils, Flex, EGLIBC, GCC,
-         Make, Linux-Headers and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin IPutils dependency info -->
-  <bridgehead renderas="sect2" id="iputils-dep">IPutils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC and Make</seg>
+         <seg>Bash, Berkeley DB, Bison, Coreutils, Flex, GCC, Glibc, Make
+	 and Linux-Headers</seg>
         </seglistitem>
       </segmentedlist>
@@ -788,5 +735,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, EGLIBC, GCC, Gzip, Make and Sed</seg>
+         <seg>Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext, Glibc,
+	 Gzip, Make, Patch and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -815,6 +763,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
-         Ncurses and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
+	 Ncurses and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -843,14 +791,14 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, EGLIBC, GCC, Grep,
-         Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Autoconf</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
+	 Make, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Findutils</seg>
         </seglistitem>
       </segmentedlist>
@@ -871,5 +819,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Findutils, GCC, Grep, Make, Perl and Sed</seg>
+         <seg>Coreutils and Findutils</seg>
         </seglistitem>
       </segmentedlist>
@@ -898,6 +846,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, EGLIBC, GCC, Grep,
-         Gzip, Make, Module-Init-Tools, Ncurses, Perl and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, GCC, Glibc, Grep,
+	 Gzip, Make, Module-Init-Tools, Ncurses and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -926,6 +874,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, EGLIBC, GCC, Grep, Make, Sed
-         and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -944,4 +891,32 @@
         <seglistitem>
           <seg>Autoconf and Bison</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Man dependency info -->
+  <bridgehead renderas="sect2" id="man-dep">Man-DB</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Bzip2, Coreutils, Flex, GCC, Gettext,
+	 Glibc, Grep, Groff, Gzip, Less, Make and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
@@ -954,105 +929,49 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
-         Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Perl and Procps</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Man dependency info -->
-  <bridgehead renderas="sect2" id="man-dep">Man</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Bzip2, Coreutils, EGLIBC, Gawk, GCC,
-         Grep, Groff, Gzip, Less, XZ-Utils, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Man-Pages dependency info -->
-  <bridgehead renderas="sect2" id="man-pages-dep">Man-Pages</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Coreutils, and Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin MPFR dependency info -->
-  <bridgehead renderas="sect2" id="mpfr-dep">MPFR</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, EGLIBC, GCC, Grep, GMP,
-         Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>GCC</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep,
+	 Make, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Perl</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Mktemp dependency info -->
+  <bridgehead renderas="sect2" id="mktemp-dep">Mktemp</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Patch and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
@@ -1065,14 +984,13 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Findutils, EGLIBC, GCC, Grep, Make,
-         Sed and Zlib</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, File, Gawk and Gzip</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Sed and Zlib</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>File, Findutils and Gawk</seg>
         </seglistitem>
       </segmentedlist>
@@ -1093,6 +1011,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, EGLIBC, GCC, Grep,
-         Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
+	 Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1111,5 +1029,5 @@
         <seglistitem>
           <seg>Bash, GRUB, Inetutils, Less, Procps, Psmisc, Readline, Texinfo,
-          Util-linux-ng and Vim</seg>
+	  Util-Linux and Vim</seg>
         </seglistitem>
       </segmentedlist>
@@ -1122,5 +1040,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1149,14 +1067,14 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, EGLIBC, GCC, Grep,
-         Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Gzip, Iana-Etc and Procps, Tar</seg>
+         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep,
+	 Groff, Make and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Iana-Etc and Procps</seg>
         </seglistitem>
       </segmentedlist>
@@ -1177,5 +1095,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make and Ncurses</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make and Ncurses</seg>
         </seglistitem>
       </segmentedlist>
@@ -1204,6 +1122,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make, Ncurses
-         and Sed</seg>
+         <seg>Bash, Coreutils, GCC, Gettext, Glibc, Grep, Make, Ncurses
+	 and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1232,5 +1150,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make, Ncurses,
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Ncurses,
          Patch, Sed and Texinfo</seg>
         </seglistitem>
@@ -1250,32 +1168,4 @@
         <seglistitem>
           <seg>Bash</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Rsyslog dependency info -->
-  <bridgehead renderas="sect2" id="rsyslog-dep">Rsyslog</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, Gawk, EGLIBC, GCC, Grep, Make
-         and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
@@ -1288,6 +1178,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
-         Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
+	 Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -1316,6 +1206,33 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
-         GCC, Gettext, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
+	 Gettext, Glibc, Grep, Make and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Sysklogd dependency info -->
+  <bridgehead renderas="sect2" id="sysklogd-dep">Sysklogd</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Binutils, Coreutils, GCC, Glibc, Make and Patch</seg>
         </seglistitem>
       </segmentedlist>
@@ -1344,5 +1261,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, EGLIBC, GCC, Make and Sed</seg>
+         <seg>Binutils, Coreutils, GCC, Glibc, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1371,14 +1288,14 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, EGLIBC, GCC,
-         Grep, Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, Findutils, Gawk and Gzip</seg>
+         <seg>Bash, Binutils, Bison, Coreutils, GCC, Gettext, Glibc,
+	 Grep, Inetutils, Make, Patch, Sed and Texinfo</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Diffutils, Findutils and Gawk</seg>
         </seglistitem>
       </segmentedlist>
@@ -1399,6 +1316,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC, Grep,
-         Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep,
+	 Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1427,14 +1344,41 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, EGLIBC, GCC, Grep, Make,
-         Ncurses and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils and Gzip</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
+	 Ncurses, Patch and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Tree dependency info -->
+  <bridgehead renderas="sect2" id="tree-dep">Tree</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Coreutils, GCC and Make</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
@@ -1455,50 +1399,76 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, Gawk, EGLIBC, GCC, Grep,
-         Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Util-linux-ng dependency info -->
-  <bridgehead renderas="sect2" id="util-linux-ng-dep">Util-linux-ng</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
-         Make, Ncurses, Sed, Texinfo and Zlib</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>E2fsprogs</seg>
+         <seg>Binutils, Coreutils, GCC, Glibc and Make</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>Findutils, Perl and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Udev Rules dependency info -->
+  <bridgehead renderas="sect2" id="udev-rules-dep">Udev Rules</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Coreutils, Make and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+<!-- Begin Util-Linux dependency info -->
+  <bridgehead renderas="sect2" id="util-linux-dep">Util-Linux</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Coreutils, E2fprogs, GCC, Gettext, Glibc, Grep,
+	 Make, Ncurses, Patch, Sed and Zlib</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No testsuite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
@@ -1511,34 +1481,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
-         GCC, Gettext, Grep, Make, Ncurses, Perl and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Gzip</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin XZ-Utils dependency info -->
-  <bridgehead renderas="sect2" id="xz-utils-dep">XZ-Utils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
-         GCC, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
+	 Ncurses and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1567,21 +1509,21 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>File, Module-Init-Tools and Util-linux-ng</seg>
+         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make and Sed</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>File, Module-Init-Tools and Util-Linux</seg>
         </seglistitem>
       </segmentedlist>
Index: BOOK/appendices/dependencies/hppa.xml
===================================================================
--- BOOK/appendices/dependencies/hppa.xml	(revision 4fc026ef671b8cdd8c60814e135dc362072ac718)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix 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;
-]>
-
-<appendix id="appendixc-hppa" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
-  <?dbhtml filename="hppa-dependencies.html"?>
-
-  <title>PA-RISC Dependencies</title>
-
-  <para>This page contains dependency information for packages specific to PA-RISC.</para>
-
-</appendix>
Index: BOOK/appendices/dependencies/x86.xml
===================================================================
--- BOOK/appendices/dependencies/x86.xml	(revision 4fc026ef671b8cdd8c60814e135dc362072ac718)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix 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;
-]>
-
-<appendix id="appendixc-x86" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
-  <?dbhtml filename="x86-dependencies.html"?>
-
-  <title>x86 Dependencies</title>
-
-  <para>This page contains dependency information for packages specific to x86.</para>
-
-</appendix>
Index: BOOK/appendices/license.xml
===================================================================
--- BOOK/appendices/license.xml	(revision 4fc026ef671b8cdd8c60814e135dc362072ac718)
+++ 	(revision )
@@ -1,188 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix 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;
-]>
-
-<appendix id="license" xreflabel="Open Publication License">
-  <?dbhtml dir="appendices"?>
-  <?dbhtml filename="license.html"?>
-
-  <title>Open Publication License</title>
-  <bridgehead renderas="sect3">v1.0, 8 June 1999</bridgehead>
-
-
-  <bridgehead renderas="sect2">I. REQUIREMENTS ON BOTH UNMODIFIED AND
-  MODIFIED VERSIONS</bridgehead>
-
-  <para>The Open Publication works may be reproduced and distributed in
-  whole or in part, in any medium physical or electronic, provided that
-  the terms of this license are adhered to, and that this license or an
-  incorporation of it by reference (with any options elected by the
-  author(s) and/or publisher) is displayed in the reproduction.</para>
-
-  <para>Proper form for an incorporation by reference is as follows:</para>
-
-  <blockquote>
-    <para>Copyright &copy; &lt;year&gt; by &lt;author's name or designee&gt;.
-    This material may be distributed only subject to the terms and conditions
-    set forth in the Open Publication License, vX.Y or later (the latest
-    version is presently available at <ulink
-    url="http://www.opencontent.org/openpub/"/>).</para>
-  </blockquote>
-
-  <para>The reference must be immediately followed with any options elected
-  by the author(s) and/or publisher of the document (see section VI).</para>
-
-  <para>Commercial redistribution of Open Publication-licensed material
-  is permitted.</para>
-
-  <para>Any publication in standard (paper) book form shall require the
-  citation of the original publisher and author. The publisher and
-  author's names shall appear on all outer surfaces of the book. On all
-  outer surfaces of the book the original publisher's name shall be as
-  large as the bridgehead of the work and cited as possessive with respect
-  to the bridgehead.</para>
-
-
-  <bridgehead renderas="sect2">II. COPYRIGHT</bridgehead>
-
-  <para>The copyright to each Open Publication is owned by its
-  author(s) or designee.</para>
-
-  <bridgehead renderas="sect2">III. SCOPE OF LICENSE</bridgehead>
-
-  <para>The following license terms apply to all Open Publication works,
-  unless otherwise explicitly stated in the document.</para>
-
-  <para>Mere aggregation of Open Publication works or a portion of an
-  Open Publication work with other works or programs on the same media
-  shall not cause this license to apply to those other works. The
-  aggregate work shall contain a notice specifying the inclusion of the
-  Open Publication material and appropriate copyright notice.</para>
-
-  <para>SEVERABILITY. If any part of this license is found to be
-  unenforceable in any jurisdiction, the remaining portions of the
-  license remain in force.</para>
-
-  <para>NO WARRANTY. Open Publication works are licensed and provided
-  "as is" without warranty of any kind, express or implied, including,
-  but not limited to, the implied warranties of merchantability and
-  fitness for a particular purpose or a warranty of non-infringement.</para>
-
-
-  <bridgehead renderas="sect2">IV. REQUIREMENTS ON MODIFIED WORKS</bridgehead>
-
-  <para>All modified versions of documents covered by this license,
-  including translations, anthologies, compilations and partial documents,
-  must meet the following requirements:</para>
-
-  <orderedlist>
-    <listitem>
-      <para>The modified version must be labeled as such.</para>
-    </listitem>
-    <listitem>
-      <para>The person making the modifications must be identified and
-      the modifications dated.</para>
-    </listitem>
-    <listitem>
-      <para>Acknowledgement of the original author and publisher if
-      applicable must be retained according to normal academic citation
-      practices.</para>
-    </listitem>
-    <listitem>
-      <para>The location of the original unmodified document must be
-      identified.</para>
-    </listitem>
-    <listitem>
-      <para>The original author's (or authors') name(s) may not be used
-      to assert or imply endorsement of the resulting document without
-      the original author's (or authors') permission.</para>
-    </listitem>
-  </orderedlist>
-
-
-  <bridgehead renderas="sect2">V. GOOD-PRACTICE RECOMMENDATIONS</bridgehead>
-
-  <para>In addition to the requirements of this license, it is requested
-  from and strongly recommended of redistributors that:</para>
-
-  <orderedlist>
-    <listitem>
-      <para>If you are distributing Open Publication works on hardcopy
-      or CD-ROM, you provide email notification to the authors of your
-      intent to redistribute at least thirty days before your manuscript
-      or media freeze, to give the authors time to provide updated
-      documents. This notification should describe modifications, if any,
-      made to the document.</para>
-    </listitem>
-    <listitem>
-      <para>All substantive modifications (including deletions) be either
-      clearly marked up in the document or else described in an attachment
-      to the document.</para>
-    </listitem>
-    <listitem>
-      <para>Finally, while it is not mandatory under this license, it is
-      considered good form to offer a free copy of any hardcopy and CD-ROM
-      expression of an Open Publication-licensed work to its author(s).</para>
-    </listitem>
-  </orderedlist>
-
-
-  <bridgehead renderas="sect2">VI. LICENSE OPTIONS</bridgehead>
-
-  <para>The author(s) and/or publisher of an Open Publication-licensed
-  document may elect certain options by appending language to the reference
-  to or copy of the license. These options are considered part of the
-  license instance and must be included with the license (or its
-  incorporation by reference) in derived works.</para>
-
-  <para>A. To prohibit distribution of substantively modified versions
-  without the explicit permission of the author(s). "Substantive modification"
-  is defined as a change to the semantic content of the document, and
-  excludes mere changes in format or typographical corrections.</para>
-
-  <para>To accomplish this, add the phrase `Distribution of substantively
-  modified versions of this document is prohibited without the explicit
-  permission of the copyright holder.' to the license reference or copy.</para>
-
-  <para>B. To prohibit any publication of this work or derivative works in
-  whole or in part in standard (paper) book form for commercial purposes
-  is prohibited unless prior permission is obtained from the copyright
-  holder.</para>
-
-  <para>To accomplish this, add the phrase 'Distribution of the work or
-  derivative of the work in any standard (paper) book form is prohibited
-  unless prior permission is obtained from the copyright holder.' to the
-  license reference or copy.</para>
-
-
-  <bridgehead renderas="sect2">OPEN PUBLICATION POLICY APPENDIX</bridgehead>
-
-  <para>(This is not considered part of the license.)</para>
-
-  <para>Open Publication works are available in source format via the Open
-  Publication home page at <ulink url="http://works.opencontent.org/"/>.</para>
-
-  <para>Open Publication authors who want to include their own license on
-  Open Publication works may do so, as long as their terms are not more
-  restrictive than the Open Publication license.</para>
-
-  <para>If you have questions about the Open Publication License, please
-  contact David Wiley at dw@opencontent.org, and/or the Open Publication
-  Authors' List at opal@opencontent.org, via email.</para>
-
-  <para>To <emphasis role="strong">subscribe</emphasis> to the Open Publication
-  Authors' List: Send E-mail to opal-request@opencontent.org with the word
-  "subscribe" in the body.</para>
-
-  <para>To <emphasis role="strong">post</emphasis> to the Open Publication
-  Authors' List: Send E-mail to opal@opencontent.org or simply reply to a
-  previous post.</para>
-
-  <para>To <emphasis role="strong">unsubscribe</emphasis> from the Open
-  Publication Authors' List: Send E-mail to opal-request@opencontent.org
-  with the word "unsubscribe" in the body.</para>
-
-</appendix>
