Index: chapter05/chapter05.xml
===================================================================
--- chapter05/chapter05.xml	(revision 4bac71c515ccfa6c02221d8dd68fb4dad01bc507)
+++ chapter05/chapter05.xml	(revision c6d52ce7e5688d9b38b960c46f458d86719d8a6a)
@@ -42,5 +42,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="stripping.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="changingowner.xml"/>
Index: chapter05/e2fsprogs.xml
===================================================================
--- chapter05/e2fsprogs.xml	(revision c6d52ce7e5688d9b38b960c46f458d86719d8a6a)
+++ chapter05/e2fsprogs.xml	(revision c6d52ce7e5688d9b38b960c46f458d86719d8a6a)
@@ -0,0 +1,72 @@
+<?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-tools-e2fsprogs" role="wrap">
+  <?dbhtml filename="e2fsprogs.html"?>
+
+  <sect1info condition="script">
+    <productname>e2fsprogs</productname>
+    <productnumber>&e2fsprogs-version;</productnumber>
+    <address>&e2fsprogs-url;</address>
+  </sect1info>
+
+  <title>E2fsprogs-&e2fsprogs-version;</title>
+
+  <indexterm zone="ch-tools-e2fsprogs">
+    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/e2fsprogs.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&e2fsprogs-ch5-sbu;</seg>
+        <seg>&e2fsprogs-ch5-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of E2fsprogs</title>
+
+    <para>The E2fsprogs documentation recommends that the package be built in
+    a subdirectory of the source tree: </para>
+
+<screen><userinput remap="pre">mkdir -v build
+cd build</userinput></screen>
+
+    <para>Prepare E2fsprogs for compilation:</para>
+
+<screen><userinput remap="configure">../configure --prefix=/tools</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the static libraries and headers required by Udev:</para>
+
+<screen><userinput remap="install">make install-libs</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in
+    <xref linkend="contents-e2fsprogs" role="."/></para>
+  </sect2>
+
+</sect1>
Index: chapter05/util-linux-ng.xml
===================================================================
--- chapter05/util-linux-ng.xml	(revision c6d52ce7e5688d9b38b960c46f458d86719d8a6a)
+++ chapter05/util-linux-ng.xml	(revision c6d52ce7e5688d9b38b960c46f458d86719d8a6a)
@@ -0,0 +1,76 @@
+<?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-tools-util-linux-ng" role="wrap">
+  <?dbhtml filename="util-linux-ng.html"?>
+
+  <sect1info condition="script">
+    <productname>util-linux-ng</productname>
+    <productnumber>&util-linux-ng-version;</productnumber>
+    <address>&util-linux-ng-url;</address>
+  </sect1info>
+
+  <title>Util-linux-ng-&util-linux-ng-version;</title>
+
+  <indexterm zone="ch-tools-util-linux-ng">
+    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
+    <secondary>tools</secondary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/util-linux-ng.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&util-linux-ng-ch5-sbu;</seg>
+        <seg>&util-linux-ng-ch5-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Util-linux-ng</title>
+
+    <para>Prepare Util-linux for compilation:</para>
+
+<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
+
+    <para>Only a few of the utilities contained in this package need to be
+    built:</para>
+
+<screen><userinput remap="make">make -C mount mount umount
+make -C text-utils more</userinput></screen>
+
+    <para>This package comes with a test suite, but running it will cause all of
+    the binaries to be built and tested.  If you still wish to run the tests,
+    issue:</para>
+
+<screen><userinput remap="test">make check</userinput></screen>
+
+    <para>Copy these programs to the temporary tools directory:</para>
+
+<screen><userinput remap="install">cp -v mount/{,u}mount text-utils/more /tools/bin</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in
+    <xref linkend="contents-utillinux" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: chapter05/util-linux.xml
===================================================================
--- chapter05/util-linux.xml	(revision 4bac71c515ccfa6c02221d8dd68fb4dad01bc507)
+++ 	(revision )
@@ -1,76 +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-tools-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng.html"?>
-
-  <sect1info condition="script">
-    <productname>util-linux-ng</productname>
-    <productnumber>&util-linux-ng-version;</productnumber>
-    <address>&util-linux-ng-url;</address>
-  </sect1info>
-
-  <title>Util-linux-ng-&util-linux-ng-version;</title>
-
-  <indexterm zone="ch-tools-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
-    <secondary>tools</secondary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../chapter06/util-linux.xml"
-    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>&util-linux-ng-ch5-sbu;</seg>
-        <seg>&util-linux-ng-ch5-du;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux-ng</title>
-
-    <para>Prepare Util-linux for compilation:</para>
-
-<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
-
-    <para>Only a few of the utilities contained in this package need to be
-    built:</para>
-
-<screen><userinput remap="make">make -C mount mount umount
-make -C text-utils more</userinput></screen>
-
-    <para>This package comes with a test suite, but running it will cause all of
-    the binaries to be built and tested.  If you still wish to run the tests,
-    issue:</para>
-
-<screen><userinput remap="test">make check</userinput></screen>
-
-    <para>Copy these programs to the temporary tools directory:</para>
-
-<screen><userinput remap="install">cp -v mount/{,u}mount text-utils/more /tools/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in
-    <xref linkend="contents-utillinux" role="."/></para>
-
-  </sect2>
-
-</sect1>
