From 27c0e5c4bd59f966ba8e189ba2ecd8ad3d4b41f0 Mon Sep 17 00:00:00 2001
From: Mark Hymers <markh@linuxfromscratch.org>
Date: Fri, 12 Apr 2002 16:14:31 +0000
Subject: the entities files should be .ent not .xml.  Now syntax highlighting
 actually works with the files in vim

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@1823 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 entities/autoconf.ent    | 19 +++++++++++++++++++
 entities/autoconf.xml    | 19 -------------------
 entities/automake.ent    | 19 +++++++++++++++++++
 entities/automake.xml    | 19 -------------------
 entities/bash.ent        | 27 +++++++++++++++++++++++++++
 entities/bash.xml        | 27 ---------------------------
 entities/bin86.ent       | 19 +++++++++++++++++++
 entities/bin86.xml       | 19 -------------------
 entities/binutils.ent    | 27 +++++++++++++++++++++++++++
 entities/binutils.xml    | 27 ---------------------------
 entities/bison.ent       | 19 +++++++++++++++++++
 entities/bison.xml       | 19 -------------------
 entities/bootscripts.ent | 19 +++++++++++++++++++
 entities/bootscripts.xml | 19 -------------------
 entities/bzip2.ent       | 27 +++++++++++++++++++++++++++
 entities/bzip2.xml       | 27 ---------------------------
 entities/diffutils.ent   | 26 ++++++++++++++++++++++++++
 entities/diffutils.xml   | 26 --------------------------
 entities/e2fsprogs.ent   | 20 ++++++++++++++++++++
 entities/e2fsprogs.xml   | 20 --------------------
 entities/ed.ent          | 19 +++++++++++++++++++
 entities/ed.xml          | 19 -------------------
 entities/file.ent        | 20 ++++++++++++++++++++
 entities/file.xml        | 20 --------------------
 entities/fileutils.ent   | 26 ++++++++++++++++++++++++++
 entities/fileutils.xml   | 26 --------------------------
 entities/findutils.ent   | 22 ++++++++++++++++++++++
 entities/findutils.xml   | 22 ----------------------
 entities/flex.ent        | 19 +++++++++++++++++++
 entities/flex.xml        | 19 -------------------
 entities/gawk.ent        | 25 +++++++++++++++++++++++++
 entities/gawk.xml        | 25 -------------------------
 entities/gcc.ent         | 29 +++++++++++++++++++++++++++++
 entities/gcc.xml         | 29 -----------------------------
 entities/gettext.ent     | 20 ++++++++++++++++++++
 entities/gettext.xml     | 20 --------------------
 entities/glibc.ent       | 25 +++++++++++++++++++++++++
 entities/glibc.xml       | 25 -------------------------
 entities/grep.ent        | 26 ++++++++++++++++++++++++++
 entities/grep.xml        | 26 --------------------------
 entities/groff.ent       | 20 ++++++++++++++++++++
 entities/groff.xml       | 20 --------------------
 entities/gzip.ent        | 28 ++++++++++++++++++++++++++++
 entities/gzip.xml        | 28 ----------------------------
 entities/kbd.ent         | 23 +++++++++++++++++++++++
 entities/kbd.xml         | 23 -----------------------
 entities/kernel.ent      | 26 ++++++++++++++++++++++++++
 entities/kernel.xml      | 26 --------------------------
 entities/less.ent        | 19 +++++++++++++++++++
 entities/less.xml        | 19 -------------------
 entities/libtool.ent     | 19 +++++++++++++++++++
 entities/libtool.xml     | 19 -------------------
 entities/lilo.ent        | 21 +++++++++++++++++++++
 entities/lilo.xml        | 21 ---------------------
 entities/m4.ent          | 19 +++++++++++++++++++
 entities/m4.xml          | 19 -------------------
 entities/make.ent        | 26 ++++++++++++++++++++++++++
 entities/make.xml        | 26 --------------------------
 entities/makedev.ent     | 19 +++++++++++++++++++
 entities/makedev.xml     | 19 -------------------
 entities/man.ent         | 19 +++++++++++++++++++
 entities/man.xml         | 19 -------------------
 entities/manpages.ent    | 19 +++++++++++++++++++
 entities/manpages.xml    | 19 -------------------
 entities/modutils.ent    | 19 +++++++++++++++++++
 entities/modutils.xml    | 19 -------------------
 entities/ncurses.ent     | 20 ++++++++++++++++++++
 entities/ncurses.xml     | 20 --------------------
 entities/netkitbase.ent  | 19 +++++++++++++++++++
 entities/netkitbase.xml  | 19 -------------------
 entities/nettools.ent    | 20 ++++++++++++++++++++
 entities/nettools.xml    | 20 --------------------
 entities/patch.ent       | 26 ++++++++++++++++++++++++++
 entities/patch.xml       | 26 --------------------------
 entities/perl.ent        | 19 +++++++++++++++++++
 entities/perl.xml        | 19 -------------------
 entities/procinfo.ent    | 20 ++++++++++++++++++++
 entities/procinfo.xml    | 20 --------------------
 entities/procps.ent      | 20 ++++++++++++++++++++
 entities/procps.xml      | 20 --------------------
 entities/psmisc.ent      | 20 ++++++++++++++++++++
 entities/psmisc.xml      | 20 --------------------
 entities/reiserfs.ent    | 20 ++++++++++++++++++++
 entities/reiserfs.xml    | 20 --------------------
 entities/sed.ent         | 25 +++++++++++++++++++++++++
 entities/sed.xml         | 25 -------------------------
 entities/shadow.ent      | 22 ++++++++++++++++++++++
 entities/shadow.xml      | 22 ----------------------
 entities/shellutils.ent  | 27 +++++++++++++++++++++++++++
 entities/shellutils.xml  | 27 ---------------------------
 entities/sysklogd.ent    | 22 ++++++++++++++++++++++
 entities/sysklogd.xml    | 22 ----------------------
 entities/sysvinit.ent    | 20 ++++++++++++++++++++
 entities/sysvinit.xml    | 20 --------------------
 entities/tar.ent         | 26 ++++++++++++++++++++++++++
 entities/tar.xml         | 26 --------------------------
 entities/texinfo.ent     | 26 ++++++++++++++++++++++++++
 entities/texinfo.xml     | 26 --------------------------
 entities/textutils.ent   | 25 +++++++++++++++++++++++++
 entities/textutils.xml   | 25 -------------------------
 entities/utillinux.ent   | 20 ++++++++++++++++++++
 entities/utillinux.xml   | 20 --------------------
 entities/vim.ent         | 21 +++++++++++++++++++++
 entities/vim.xml         | 21 ---------------------
 104 files changed, 1148 insertions(+), 1148 deletions(-)
 create mode 100644 entities/autoconf.ent
 delete mode 100644 entities/autoconf.xml
 create mode 100644 entities/automake.ent
 delete mode 100644 entities/automake.xml
 create mode 100644 entities/bash.ent
 delete mode 100644 entities/bash.xml
 create mode 100644 entities/bin86.ent
 delete mode 100644 entities/bin86.xml
 create mode 100644 entities/binutils.ent
 delete mode 100644 entities/binutils.xml
 create mode 100644 entities/bison.ent
 delete mode 100644 entities/bison.xml
 create mode 100644 entities/bootscripts.ent
 delete mode 100644 entities/bootscripts.xml
 create mode 100644 entities/bzip2.ent
 delete mode 100644 entities/bzip2.xml
 create mode 100644 entities/diffutils.ent
 delete mode 100644 entities/diffutils.xml
 create mode 100644 entities/e2fsprogs.ent
 delete mode 100644 entities/e2fsprogs.xml
 create mode 100644 entities/ed.ent
 delete mode 100644 entities/ed.xml
 create mode 100644 entities/file.ent
 delete mode 100644 entities/file.xml
 create mode 100644 entities/fileutils.ent
 delete mode 100644 entities/fileutils.xml
 create mode 100644 entities/findutils.ent
 delete mode 100644 entities/findutils.xml
 create mode 100644 entities/flex.ent
 delete mode 100644 entities/flex.xml
 create mode 100644 entities/gawk.ent
 delete mode 100644 entities/gawk.xml
 create mode 100644 entities/gcc.ent
 delete mode 100644 entities/gcc.xml
 create mode 100644 entities/gettext.ent
 delete mode 100644 entities/gettext.xml
 create mode 100644 entities/glibc.ent
 delete mode 100644 entities/glibc.xml
 create mode 100644 entities/grep.ent
 delete mode 100644 entities/grep.xml
 create mode 100644 entities/groff.ent
 delete mode 100644 entities/groff.xml
 create mode 100644 entities/gzip.ent
 delete mode 100644 entities/gzip.xml
 create mode 100644 entities/kbd.ent
 delete mode 100644 entities/kbd.xml
 create mode 100644 entities/kernel.ent
 delete mode 100644 entities/kernel.xml
 create mode 100644 entities/less.ent
 delete mode 100644 entities/less.xml
 create mode 100644 entities/libtool.ent
 delete mode 100644 entities/libtool.xml
 create mode 100644 entities/lilo.ent
 delete mode 100644 entities/lilo.xml
 create mode 100644 entities/m4.ent
 delete mode 100644 entities/m4.xml
 create mode 100644 entities/make.ent
 delete mode 100644 entities/make.xml
 create mode 100644 entities/makedev.ent
 delete mode 100644 entities/makedev.xml
 create mode 100644 entities/man.ent
 delete mode 100644 entities/man.xml
 create mode 100644 entities/manpages.ent
 delete mode 100644 entities/manpages.xml
 create mode 100644 entities/modutils.ent
 delete mode 100644 entities/modutils.xml
 create mode 100644 entities/ncurses.ent
 delete mode 100644 entities/ncurses.xml
 create mode 100644 entities/netkitbase.ent
 delete mode 100644 entities/netkitbase.xml
 create mode 100644 entities/nettools.ent
 delete mode 100644 entities/nettools.xml
 create mode 100644 entities/patch.ent
 delete mode 100644 entities/patch.xml
 create mode 100644 entities/perl.ent
 delete mode 100644 entities/perl.xml
 create mode 100644 entities/procinfo.ent
 delete mode 100644 entities/procinfo.xml
 create mode 100644 entities/procps.ent
 delete mode 100644 entities/procps.xml
 create mode 100644 entities/psmisc.ent
 delete mode 100644 entities/psmisc.xml
 create mode 100644 entities/reiserfs.ent
 delete mode 100644 entities/reiserfs.xml
 create mode 100644 entities/sed.ent
 delete mode 100644 entities/sed.xml
 create mode 100644 entities/shadow.ent
 delete mode 100644 entities/shadow.xml
 create mode 100644 entities/shellutils.ent
 delete mode 100644 entities/shellutils.xml
 create mode 100644 entities/sysklogd.ent
 delete mode 100644 entities/sysklogd.xml
 create mode 100644 entities/sysvinit.ent
 delete mode 100644 entities/sysvinit.xml
 create mode 100644 entities/tar.ent
 delete mode 100644 entities/tar.xml
 create mode 100644 entities/texinfo.ent
 delete mode 100644 entities/texinfo.xml
 create mode 100644 entities/textutils.ent
 delete mode 100644 entities/textutils.xml
 create mode 100644 entities/utillinux.ent
 delete mode 100644 entities/utillinux.xml
 create mode 100644 entities/vim.ent
 delete mode 100644 entities/vim.xml

(limited to 'entities')

diff --git a/entities/autoconf.ent b/entities/autoconf.ent
new file mode 100644
index 000000000..ee0f1dcab
--- /dev/null
+++ b/entities/autoconf.ent
@@ -0,0 +1,19 @@
+<!ENTITY c3-autoconf SYSTEM "../chapter03/autoconf.xml">
+
+<!ENTITY c6-autoconf SYSTEM "../chapter06/autoconf.xml">
+<!ENTITY c6-autoconf-inst SYSTEM "../chapter06/autoconf-inst.xml">
+
+<!ENTITY aa-autoconf SYSTEM "../appendixa/autoconf.xml">
+<!ENTITY aa-autoconf-desc SYSTEM "../appendixa/autoconf-desc.xml">
+<!ENTITY aa-autoconf-dep SYSTEM "../appendixa/autoconf-dep.xml">
+<!ENTITY aa-autoconf-down SYSTEM "../appendixa/autoconf-down.xml">
+
+<!ENTITY autoconf-version "2.53">
+<!ENTITY autoconf-depversion "2.52">
+<!ENTITY autoconf-contversion "2.52">
+<!ENTITY autoconf-size "739 KB">
+<!ENTITY autoconf-dir "autoconf-&autoconf-version;">
+<!ENTITY autoconf-package "autoconf-&autoconf-version;.tar.bz2">
+
+<!ENTITY autoconf-compsize "4 MB">
+<!ENTITY autoconf-time "1 minute">
diff --git a/entities/autoconf.xml b/entities/autoconf.xml
deleted file mode 100644
index ee0f1dcab..000000000
--- a/entities/autoconf.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY c3-autoconf SYSTEM "../chapter03/autoconf.xml">
-
-<!ENTITY c6-autoconf SYSTEM "../chapter06/autoconf.xml">
-<!ENTITY c6-autoconf-inst SYSTEM "../chapter06/autoconf-inst.xml">
-
-<!ENTITY aa-autoconf SYSTEM "../appendixa/autoconf.xml">
-<!ENTITY aa-autoconf-desc SYSTEM "../appendixa/autoconf-desc.xml">
-<!ENTITY aa-autoconf-dep SYSTEM "../appendixa/autoconf-dep.xml">
-<!ENTITY aa-autoconf-down SYSTEM "../appendixa/autoconf-down.xml">
-
-<!ENTITY autoconf-version "2.53">
-<!ENTITY autoconf-depversion "2.52">
-<!ENTITY autoconf-contversion "2.52">
-<!ENTITY autoconf-size "739 KB">
-<!ENTITY autoconf-dir "autoconf-&autoconf-version;">
-<!ENTITY autoconf-package "autoconf-&autoconf-version;.tar.bz2">
-
-<!ENTITY autoconf-compsize "4 MB">
-<!ENTITY autoconf-time "1 minute">
diff --git a/entities/automake.ent b/entities/automake.ent
new file mode 100644
index 000000000..a2c87f9e8
--- /dev/null
+++ b/entities/automake.ent
@@ -0,0 +1,19 @@
+<!ENTITY c3-automake SYSTEM "../chapter03/automake.xml">
+
+<!ENTITY c6-automake SYSTEM "../chapter06/automake.xml">
+<!ENTITY c6-automake-inst SYSTEM "../chapter06/automake-inst.xml">
+
+<!ENTITY aa-automake SYSTEM "../appendixa/automake.xml">
+<!ENTITY aa-automake-desc SYSTEM "../appendixa/automake-desc.xml">
+<!ENTITY aa-automake-dep SYSTEM "../appendixa/automake-dep.xml">
+<!ENTITY aa-automake-down SYSTEM "../appendixa/automake-down.xml">
+
+<!ENTITY automake-version "1.6">
+<!ENTITY automake-depversion "1.5">
+<!ENTITY automake-contversion "1.5">
+<!ENTITY automake-size "451 KB">
+<!ENTITY automake-package "automake-&automake-version;.tar.bz2">
+<!ENTITY automake-dir "automake-&automake-version;">
+
+<!ENTITY automake-compsize "3 MB">
+<!ENTITY automake-time "1 minute">
diff --git a/entities/automake.xml b/entities/automake.xml
deleted file mode 100644
index a2c87f9e8..000000000
--- a/entities/automake.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY c3-automake SYSTEM "../chapter03/automake.xml">
-
-<!ENTITY c6-automake SYSTEM "../chapter06/automake.xml">
-<!ENTITY c6-automake-inst SYSTEM "../chapter06/automake-inst.xml">
-
-<!ENTITY aa-automake SYSTEM "../appendixa/automake.xml">
-<!ENTITY aa-automake-desc SYSTEM "../appendixa/automake-desc.xml">
-<!ENTITY aa-automake-dep SYSTEM "../appendixa/automake-dep.xml">
-<!ENTITY aa-automake-down SYSTEM "../appendixa/automake-down.xml">
-
-<!ENTITY automake-version "1.6">
-<!ENTITY automake-depversion "1.5">
-<!ENTITY automake-contversion "1.5">
-<!ENTITY automake-size "451 KB">
-<!ENTITY automake-package "automake-&automake-version;.tar.bz2">
-<!ENTITY automake-dir "automake-&automake-version;">
-
-<!ENTITY automake-compsize "3 MB">
-<!ENTITY automake-time "1 minute">
diff --git a/entities/bash.ent b/entities/bash.ent
new file mode 100644
index 000000000..0f14e439d
--- /dev/null
+++ b/entities/bash.ent
@@ -0,0 +1,27 @@
+<!ENTITY c3-bash SYSTEM "../chapter03/bash.xml">
+
+<!ENTITY c5-bash SYSTEM "../chapter05/bash.xml">
+<!ENTITY c5-bash-inst SYSTEM "../chapter05/bash-inst.xml">
+<!ENTITY c5-bash-exp SYSTEM "../chapter05/bash-exp.xml">
+
+<!ENTITY c6-bashprofile SYSTEM "../chapter06/bashprofile.xml">
+<!ENTITY c6-bash SYSTEM "../chapter06/bash.xml">
+<!ENTITY c6-bash-inst SYSTEM "../chapter06/bash-inst.xml">
+
+<!ENTITY aa-bash SYSTEM "../appendixa/bash.xml">
+<!ENTITY aa-bash-desc SYSTEM "../appendixa/bash-desc.xml">
+<!ENTITY aa-bash-dep SYSTEM "../appendixa/bash-dep.xml">
+<!ENTITY aa-bash-down SYSTEM "../appendixa/bash-down.xml">
+
+<!ENTITY bash-version "2.05a">
+<!ENTITY bash-depversion "2.05a">
+<!ENTITY bash-contversion "2.05a">
+<!ENTITY bash-package "bash-&bash-version;.tar.bz2">
+<!ENTITY bash-dir "bash-&bash-version;">
+<!ENTITY bash-size "1,400 KB">
+
+<!ENTITY bash-compsize-static "20 MB">
+<!ENTITY bash-time-static "3 minutes">
+
+<!ENTITY bash-compsize "19 MB">
+<!ENTITY bash-time "3 minutes">
diff --git a/entities/bash.xml b/entities/bash.xml
deleted file mode 100644
index 0f14e439d..000000000
--- a/entities/bash.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!ENTITY c3-bash SYSTEM "../chapter03/bash.xml">
-
-<!ENTITY c5-bash SYSTEM "../chapter05/bash.xml">
-<!ENTITY c5-bash-inst SYSTEM "../chapter05/bash-inst.xml">
-<!ENTITY c5-bash-exp SYSTEM "../chapter05/bash-exp.xml">
-
-<!ENTITY c6-bashprofile SYSTEM "../chapter06/bashprofile.xml">
-<!ENTITY c6-bash SYSTEM "../chapter06/bash.xml">
-<!ENTITY c6-bash-inst SYSTEM "../chapter06/bash-inst.xml">
-
-<!ENTITY aa-bash SYSTEM "../appendixa/bash.xml">
-<!ENTITY aa-bash-desc SYSTEM "../appendixa/bash-desc.xml">
-<!ENTITY aa-bash-dep SYSTEM "../appendixa/bash-dep.xml">
-<!ENTITY aa-bash-down SYSTEM "../appendixa/bash-down.xml">
-
-<!ENTITY bash-version "2.05a">
-<!ENTITY bash-depversion "2.05a">
-<!ENTITY bash-contversion "2.05a">
-<!ENTITY bash-package "bash-&bash-version;.tar.bz2">
-<!ENTITY bash-dir "bash-&bash-version;">
-<!ENTITY bash-size "1,400 KB">
-
-<!ENTITY bash-compsize-static "20 MB">
-<!ENTITY bash-time-static "3 minutes">
-
-<!ENTITY bash-compsize "19 MB">
-<!ENTITY bash-time "3 minutes">
diff --git a/entities/bin86.ent b/entities/bin86.ent
new file mode 100644
index 000000000..8f3ba740d
--- /dev/null
+++ b/entities/bin86.ent
@@ -0,0 +1,19 @@
+<!ENTITY c3-bin86 SYSTEM "../chapter03/bin86.xml">
+
+<!ENTITY c6-bin86 SYSTEM "../chapter06/bin86.xml">
+<!ENTITY c6-bin86-inst SYSTEM "../chapter06/bin86-inst.xml">
+
+<!ENTITY aa-bin86 SYSTEM "../appendixa/bin86.xml">
+<!ENTITY aa-bin86-desc SYSTEM "../appendixa/bin86-desc.xml">
+<!ENTITY aa-bin86-dep SYSTEM "../appendixa/bin86-dep.xml">
+<!ENTITY aa-bin86-down SYSTEM "../appendixa/bin86-down.xml">
+
+<!ENTITY bin86-version "0.16.2">
+<!ENTITY bin86-depversion "0.16.0">
+<!ENTITY bin86-contversion "0.16.0">
+<!ENTITY bin86-size "112 KB">
+<!ENTITY bin86-dir "bin86-&bin86-version;">
+<!ENTITY bin86-package "bin86-&bin86-version;.tar.bz2">
+
+<!ENTITY bin86-compsize "1 MB">
+<!ENTITY bin86-time "1 minute">
diff --git a/entities/bin86.xml b/entities/bin86.xml
deleted file mode 100644
index 8f3ba740d..000000000
--- a/entities/bin86.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY c3-bin86 SYSTEM "../chapter03/bin86.xml">
-
-<!ENTITY c6-bin86 SYSTEM "../chapter06/bin86.xml">
-<!ENTITY c6-bin86-inst SYSTEM "../chapter06/bin86-inst.xml">
-
-<!ENTITY aa-bin86 SYSTEM "../appendixa/bin86.xml">
-<!ENTITY aa-bin86-desc SYSTEM "../appendixa/bin86-desc.xml">
-<!ENTITY aa-bin86-dep SYSTEM "../appendixa/bin86-dep.xml">
-<!ENTITY aa-bin86-down SYSTEM "../appendixa/bin86-down.xml">
-
-<!ENTITY bin86-version "0.16.2">
-<!ENTITY bin86-depversion "0.16.0">
-<!ENTITY bin86-contversion "0.16.0">
-<!ENTITY bin86-size "112 KB">
-<!ENTITY bin86-dir "bin86-&bin86-version;">
-<!ENTITY bin86-package "bin86-&bin86-version;.tar.bz2">
-
-<!ENTITY bin86-compsize "1 MB">
-<!ENTITY bin86-time "1 minute">
diff --git a/entities/binutils.ent b/entities/binutils.ent
new file mode 100644
index 000000000..15661b6ce
--- /dev/null
+++ b/entities/binutils.ent
@@ -0,0 +1,27 @@
+<!ENTITY c3-binutils SYSTEM "../chapter03/binutils.xml">
+
+<!ENTITY c5-binutils SYSTEM "../chapter05/binutils.xml">
+<!ENTITY c5-binutils-inst SYSTEM "../chapter05/binutils-inst.xml">
+<!ENTITY c5-binutils-exp SYSTEM "../chapter05/binutils-exp.xml">
+
+<!ENTITY c6-binutils SYSTEM "../chapter06/binutils.xml">
+<!ENTITY c6-binutils-inst SYSTEM "../chapter06/binutils-inst.xml">
+<!ENTITY c6-binutils-exp SYSTEM "../chapter06/binutils-exp.xml">
+
+<!ENTITY aa-binutils SYSTEM "../appendixa/binutils.xml">
+<!ENTITY aa-binutils-desc SYSTEM "../appendixa/binutils-desc.xml">
+<!ENTITY aa-binutils-dep SYSTEM "../appendixa/binutils-dep.xml">
+<!ENTITY aa-binutils-down SYSTEM "../appendixa/binutils-down.xml">
+
+<!ENTITY binutils-version "2.12">
+<!ENTITY binutils-depversion "2.11.2">
+<!ENTITY binutils-contversion "2.11.2">
+<!ENTITY binutils-size "9,312 KB">
+<!ENTITY binutils-package "binutils-&binutils-version;.tar.bz2">
+<!ENTITY binutils-dir "binutils-&binutils-version;">
+
+<!ENTITY binutils-compsize-static "96 MB">
+<!ENTITY binutils-time-static "6 minutes">
+
+<!ENTITY binutils-compsize "85 MB">
+<!ENTITY binutils-time "6 minutes">
diff --git a/entities/binutils.xml b/entities/binutils.xml
deleted file mode 100644
index 15661b6ce..000000000
--- a/entities/binutils.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!ENTITY c3-binutils SYSTEM "../chapter03/binutils.xml">
-
-<!ENTITY c5-binutils SYSTEM "../chapter05/binutils.xml">
-<!ENTITY c5-binutils-inst SYSTEM "../chapter05/binutils-inst.xml">
-<!ENTITY c5-binutils-exp SYSTEM "../chapter05/binutils-exp.xml">
-
-<!ENTITY c6-binutils SYSTEM "../chapter06/binutils.xml">
-<!ENTITY c6-binutils-inst SYSTEM "../chapter06/binutils-inst.xml">
-<!ENTITY c6-binutils-exp SYSTEM "../chapter06/binutils-exp.xml">
-
-<!ENTITY aa-binutils SYSTEM "../appendixa/binutils.xml">
-<!ENTITY aa-binutils-desc SYSTEM "../appendixa/binutils-desc.xml">
-<!ENTITY aa-binutils-dep SYSTEM "../appendixa/binutils-dep.xml">
-<!ENTITY aa-binutils-down SYSTEM "../appendixa/binutils-down.xml">
-
-<!ENTITY binutils-version "2.12">
-<!ENTITY binutils-depversion "2.11.2">
-<!ENTITY binutils-contversion "2.11.2">
-<!ENTITY binutils-size "9,312 KB">
-<!ENTITY binutils-package "binutils-&binutils-version;.tar.bz2">
-<!ENTITY binutils-dir "binutils-&binutils-version;">
-
-<!ENTITY binutils-compsize-static "96 MB">
-<!ENTITY binutils-time-static "6 minutes">
-
-<!ENTITY binutils-compsize "85 MB">
-<!ENTITY binutils-time "6 minutes">
diff --git a/entities/bison.ent b/entities/bison.ent
new file mode 100644
index 000000000..a02ef7c7b
--- /dev/null
+++ b/entities/bison.ent
@@ -0,0 +1,19 @@
+<!ENTITY c3-bison SYSTEM "../chapter03/bison.xml">
+
+<!ENTITY c6-bison SYSTEM "../chapter06/bison.xml">
+<!ENTITY c6-bison-inst SYSTEM "../chapter06/bison-inst.xml">
+
+<!ENTITY aa-bison SYSTEM "../appendixa/bison.xml">
+<!ENTITY aa-bison-desc SYSTEM "../appendixa/bison-desc.xml">
+<!ENTITY aa-bison-dep SYSTEM "../appendixa/bison-dep.xml">
+<!ENTITY aa-bison-down SYSTEM "../appendixa/bison-down.xml">
+
+<!ENTITY bison-version "1.35">
+<!ENTITY bison-depversion "1.31">
+<!ENTITY bison-contversion "1.31">
+<!ENTITY bison-size "613 KB">
+<!ENTITY bison-dir "bison-&bison-version;">
+<!ENTITY bison-package "bison-&bison-version;.tar.bz2">
+
+<!ENTITY bison-compsize "3 MB">
+<!ENTITY bison-time "1 minute">
diff --git a/entities/bison.xml b/entities/bison.xml
deleted file mode 100644
index a02ef7c7b..000000000
--- a/entities/bison.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY c3-bison SYSTEM "../chapter03/bison.xml">
-
-<!ENTITY c6-bison SYSTEM "../chapter06/bison.xml">
-<!ENTITY c6-bison-inst SYSTEM "../chapter06/bison-inst.xml">
-
-<!ENTITY aa-bison SYSTEM "../appendixa/bison.xml">
-<!ENTITY aa-bison-desc SYSTEM "../appendixa/bison-desc.xml">
-<!ENTITY aa-bison-dep SYSTEM "../appendixa/bison-dep.xml">
-<!ENTITY aa-bison-down SYSTEM "../appendixa/bison-down.xml">
-
-<!ENTITY bison-version "1.35">
-<!ENTITY bison-depversion "1.31">
-<!ENTITY bison-contversion "1.31">
-<!ENTITY bison-size "613 KB">
-<!ENTITY bison-dir "bison-&bison-version;">
-<!ENTITY bison-package "bison-&bison-version;.tar.bz2">
-
-<!ENTITY bison-compsize "3 MB">
-<!ENTITY bison-time "1 minute">
diff --git a/entities/bootscripts.ent b/entities/bootscripts.ent
new file mode 100644
index 000000000..3c2bedc20
--- /dev/null
+++ b/entities/bootscripts.ent
@@ -0,0 +1,19 @@
+<!ENTITY c3-bootscripts SYSTEM "../chapter03/bootscripts.xml">
+
+<!ENTITY c6-bootscripts SYSTEM "../chapter06/bootscripts.xml">
+<!ENTITY c6-bootscripts-inst SYSTEM "../chapter06/bootscripts-inst.xml">
+
+<!ENTITY aa-bootscripts SYSTEM "../appendixa/bootscripts.xml">
+<!ENTITY aa-bootscripts-desc SYSTEM "../appendixa/bootscripts-desc.xml">
+<!ENTITY aa-bootscripts-dep SYSTEM "../appendixa/bootscripts-dep.xml">
+<!ENTITY aa-bootscripts-down SYSTEM "../appendixa/bootscripts-down.xml">
+
+<!ENTITY bootscripts-version "1.9">
+<!ENTITY bootscripts-depversion "1.9">
+<!ENTITY bootscripts-contversion "1.9">
+<!ENTITY bootscripts-size "26 KB">
+<!ENTITY bootscripts-dir "lfs-bootscritps-&bootscripts-version;">
+<!ENTITY bootscripts-package "lfs-bootscripts-&bootscripts-version;.tar.bz2">
+
+<!ENTITY bootscripts-compsize "23 KB">
+<!ENTITY bootscripts-time "1 minute">
diff --git a/entities/bootscripts.xml b/entities/bootscripts.xml
deleted file mode 100644
index 3c2bedc20..000000000
--- a/entities/bootscripts.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY c3-bootscripts SYSTEM "../chapter03/bootscripts.xml">
-
-<!ENTITY c6-bootscripts SYSTEM "../chapter06/bootscripts.xml">
-<!ENTITY c6-bootscripts-inst SYSTEM "../chapter06/bootscripts-inst.xml">
-
-<!ENTITY aa-bootscripts SYSTEM "../appendixa/bootscripts.xml">
-<!ENTITY aa-bootscripts-desc SYSTEM "../appendixa/bootscripts-desc.xml">
-<!ENTITY aa-bootscripts-dep SYSTEM "../appendixa/bootscripts-dep.xml">
-<!ENTITY aa-bootscripts-down SYSTEM "../appendixa/bootscripts-down.xml">
-
-<!ENTITY bootscripts-version "1.9">
-<!ENTITY bootscripts-depversion "1.9">
-<!ENTITY bootscripts-contversion "1.9">
-<!ENTITY bootscripts-size "26 KB">
-<!ENTITY bootscripts-dir "lfs-bootscritps-&bootscripts-version;">
-<!ENTITY bootscripts-package "lfs-bootscripts-&bootscripts-version;.tar.bz2">
-
-<!ENTITY bootscripts-compsize "23 KB">
-<!ENTITY bootscripts-time "1 minute">
diff --git a/entities/bzip2.ent b/entities/bzip2.ent
new file mode 100644
index 000000000..add650778
--- /dev/null
+++ b/entities/bzip2.ent
@@ -0,0 +1,27 @@
+<!ENTITY c3-bzip2 SYSTEM "../chapter03/bzip2.xml">
+
+<!ENTITY c5-bzip2 SYSTEM "../chapter05/bzip2.xml">
+<!ENTITY c5-bzip2-inst SYSTEM "../chapter05/bzip2-inst.xml">
+<!ENTITY c5-bzip2-exp SYSTEM "../chapter05/bzip2-exp.xml">
+
+<!ENTITY c6-bzip2 SYSTEM "../chapter06/bzip2.xml">
+<!ENTITY c6-bzip2-inst SYSTEM "../chapter06/bzip2-inst.xml">
+<!ENTITY c6-bzip2-exp SYSTEM "../chapter06/bzip2-exp.xml">
+
+<!ENTITY aa-bzip2 SYSTEM "../appendixa/bzip2.xml">
+<!ENTITY aa-bzip2-desc SYSTEM "../appendixa/bzip2-desc.xml">
+<!ENTITY aa-bzip2-dep SYSTEM "../appendixa/bzip2-dep.xml">
+<!ENTITY aa-bzip2-down SYSTEM "../appendixa/bzip2-down.xml">
+
+<!ENTITY bzip2-version "1.0.2">
+<!ENTITY bzip2-depversion "1.0.1">
+<!ENTITY bzip2-contversion "1.0.1">
+<!ENTITY bzip2-package "bzip2-&bzip2-version;.tar.bz2">
+<!ENTITY bzip2-dir "bzip2-&bzip2-version;">
+<!ENTITY bzip2-size "610 KB">
+
+<!ENTITY bzip2-compsize-static "3 MB">
+<!ENTITY bzip2-time-static "1 minute">
+
+<!ENTITY bzip2-compsize "2 MB">
+<!ENTITY bzip2-time "1 minute">
diff --git a/entities/bzip2.xml b/entities/bzip2.xml
deleted file mode 100644
index add650778..000000000
--- a/entities/bzip2.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!ENTITY c3-bzip2 SYSTEM "../chapter03/bzip2.xml">
-
-<!ENTITY c5-bzip2 SYSTEM "../chapter05/bzip2.xml">
-<!ENTITY c5-bzip2-inst SYSTEM "../chapter05/bzip2-inst.xml">
-<!ENTITY c5-bzip2-exp SYSTEM "../chapter05/bzip2-exp.xml">
-
-<!ENTITY c6-bzip2 SYSTEM "../chapter06/bzip2.xml">
-<!ENTITY c6-bzip2-inst SYSTEM "../chapter06/bzip2-inst.xml">
-<!ENTITY c6-bzip2-exp SYSTEM "../chapter06/bzip2-exp.xml">
-
-<!ENTITY aa-bzip2 SYSTEM "../appendixa/bzip2.xml">
-<!ENTITY aa-bzip2-desc SYSTEM "../appendixa/bzip2-desc.xml">
-<!ENTITY aa-bzip2-dep SYSTEM "../appendixa/bzip2-dep.xml">
-<!ENTITY aa-bzip2-down SYSTEM "../appendixa/bzip2-down.xml">
-
-<!ENTITY bzip2-version "1.0.2">
-<!ENTITY bzip2-depversion "1.0.1">
-<!ENTITY bzip2-contversion "1.0.1">
-<!ENTITY bzip2-package "bzip2-&bzip2-version;.tar.bz2">
-<!ENTITY bzip2-dir "bzip2-&bzip2-version;">
-<!ENTITY bzip2-size "610 KB">
-
-<!ENTITY bzip2-compsize-static "3 MB">
-<!ENTITY bzip2-time-static "1 minute">
-
-<!ENTITY bzip2-compsize "2 MB">
-<!ENTITY bzip2-time "1 minute">
diff --git a/entities/diffutils.ent b/entities/diffutils.ent
new file mode 100644
index 000000000..e1c0ecb72
--- /dev/null
+++ b/entities/diffutils.ent
@@ -0,0 +1,26 @@
+<!ENTITY c3-diffutils SYSTEM "../chapter03/diffutils.xml">
+
+<!ENTITY c5-diffutils SYSTEM "../chapter05/diffutils.xml">
+<!ENTITY c5-diffutils-inst SYSTEM "../chapter05/diffutils-inst.xml">
+<!ENTITY c5-diffutils-exp SYSTEM "../chapter05/diffutils-exp.xml">
+
+<!ENTITY c6-diffutils SYSTEM "../chapter06/diffutils.xml">
+<!ENTITY c6-diffutils-inst SYSTEM "../chapter06/diffutils-inst.xml">
+
+<!ENTITY aa-diffutils SYSTEM "../appendixa/diffutils.xml">
+<!ENTITY aa-diffutils-desc SYSTEM "../appendixa/diffutils-desc.xml">
+<!ENTITY aa-diffutils-dep SYSTEM "../appendixa/diffutils-dep.xml">
+<!ENTITY aa-diffutils-down SYSTEM "../appendixa/diffutils-down.xml">
+
+<!ENTITY diffutils-version "2.8.1">
+<!ENTITY diffutils-depversion "2.7">
+<!ENTITY diffutils-contversion "2.7">
+<!ENTITY diffutils-package "diffutils-&diffutils-version;.tar.bz2">
+<!ENTITY diffutils-dir "diffutils-&diffutils-version;">
+<!ENTITY diffutils-size "641 KB">
+
+<!ENTITY diffutils-compsize-static "4 MB">
+<!ENTITY diffutils-time-static "1 minute">
+
+<!ENTITY diffutils-compsize "2 MB">
+<!ENTITY diffutils-time "1 minute">
diff --git a/entities/diffutils.xml b/entities/diffutils.xml
deleted file mode 100644
index e1c0ecb72..000000000
--- a/entities/diffutils.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!ENTITY c3-diffutils SYSTEM "../chapter03/diffutils.xml">
-
-<!ENTITY c5-diffutils SYSTEM "../chapter05/diffutils.xml">
-<!ENTITY c5-diffutils-inst SYSTEM "../chapter05/diffutils-inst.xml">
-<!ENTITY c5-diffutils-exp SYSTEM "../chapter05/diffutils-exp.xml">
-
-<!ENTITY c6-diffutils SYSTEM "../chapter06/diffutils.xml">
-<!ENTITY c6-diffutils-inst SYSTEM "../chapter06/diffutils-inst.xml">
-
-<!ENTITY aa-diffutils SYSTEM "../appendixa/diffutils.xml">
-<!ENTITY aa-diffutils-desc SYSTEM "../appendixa/diffutils-desc.xml">
-<!ENTITY aa-diffutils-dep SYSTEM "../appendixa/diffutils-dep.xml">
-<!ENTITY aa-diffutils-down SYSTEM "../appendixa/diffutils-down.xml">
-
-<!ENTITY diffutils-version "2.8.1">
-<!ENTITY diffutils-depversion "2.7">
-<!ENTITY diffutils-contversion "2.7">
-<!ENTITY diffutils-package "diffutils-&diffutils-version;.tar.bz2">
-<!ENTITY diffutils-dir "diffutils-&diffutils-version;">
-<!ENTITY diffutils-size "641 KB">
-
-<!ENTITY diffutils-compsize-static "4 MB">
-<!ENTITY diffutils-time-static "1 minute">
-
-<!ENTITY diffutils-compsize "2 MB">
-<!ENTITY diffutils-time "1 minute">
diff --git a/entities/e2fsprogs.ent b/entities/e2fsprogs.ent
new file mode 100644
index 000000000..6827191f6
--- /dev/null
+++ b/entities/e2fsprogs.ent
@@ -0,0 +1,20 @@
+<!ENTITY c3-e2fsprogs SYSTEM "../chapter03/e2fsprogs.xml">
+
+<!ENTITY c6-e2fsprogs SYSTEM "../chapter06/e2fsprogs.xml">
+<!ENTITY c6-e2fsprogs-inst SYSTEM "../chapter06/e2fsprogs-inst.xml">
+<!ENTITY c6-e2fsprogs-exp SYSTEM "../chapter06/e2fsprogs-exp.xml">
+
+<!ENTITY aa-e2fsprogs SYSTEM "../appendixa/e2fsprogs.xml">
+<!ENTITY aa-e2fsprogs-desc SYSTEM "../appendixa/e2fsprogs-desc.xml">
+<!ENTITY aa-e2fsprogs-dep SYSTEM "../appendixa/e2fsprogs-dep.xml">
+<!ENTITY aa-e2fsprogs-down SYSTEM "../appendixa/e2fsprogs-down.xml">
+
+<!ENTITY e2fsprogs-version "1.27">
+<!ENTITY e2fsprogs-depversion "1.25">
+<!ENTITY e2fsprogs-contversion "1.25">
+<!ENTITY e2fsprogs-size "1,176 KB">
+<!ENTITY e2fsprogs-dir "e2fsprogs-&e2fsprogs-version;">
+<!ENTITY e2fsprogs-package "e2fsprogs-&e2fsprogs-version;.tar.bz2">
+
+<!ENTITY e2fsprogs-compsize "21 MB">
+<!ENTITY e2fsprogs-time "2 minutes">
diff --git a/entities/e2fsprogs.xml b/entities/e2fsprogs.xml
deleted file mode 100644
index 6827191f6..000000000
--- a/entities/e2fsprogs.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!ENTITY c3-e2fsprogs SYSTEM "../chapter03/e2fsprogs.xml">
-
-<!ENTITY c6-e2fsprogs SYSTEM "../chapter06/e2fsprogs.xml">
-<!ENTITY c6-e2fsprogs-inst SYSTEM "../chapter06/e2fsprogs-inst.xml">
-<!ENTITY c6-e2fsprogs-exp SYSTEM "../chapter06/e2fsprogs-exp.xml">
-
-<!ENTITY aa-e2fsprogs SYSTEM "../appendixa/e2fsprogs.xml">
-<!ENTITY aa-e2fsprogs-desc SYSTEM "../appendixa/e2fsprogs-desc.xml">
-<!ENTITY aa-e2fsprogs-dep SYSTEM "../appendixa/e2fsprogs-dep.xml">
-<!ENTITY aa-e2fsprogs-down SYSTEM "../appendixa/e2fsprogs-down.xml">
-
-<!ENTITY e2fsprogs-version "1.27">
-<!ENTITY e2fsprogs-depversion "1.25">
-<!ENTITY e2fsprogs-contversion "1.25">
-<!ENTITY e2fsprogs-size "1,176 KB">
-<!ENTITY e2fsprogs-dir "e2fsprogs-&e2fsprogs-version;">
-<!ENTITY e2fsprogs-package "e2fsprogs-&e2fsprogs-version;.tar.bz2">
-
-<!ENTITY e2fsprogs-compsize "21 MB">
-<!ENTITY e2fsprogs-time "2 minutes">
diff --git a/entities/ed.ent b/entities/ed.ent
new file mode 100644
index 000000000..6cad14f37
--- /dev/null
+++ b/entities/ed.ent
@@ -0,0 +1,19 @@
+<!ENTITY c3-ed SYSTEM "../chapter03/ed.xml">
+
+<!ENTITY c6-ed SYSTEM "../chapter06/ed.xml">
+<!ENTITY c6-ed-inst SYSTEM "../chapter06/ed-inst.xml">
+<!ENTITY c6-ed-exp SYSTEM "../chapter06/ed-exp.xml">
+
+<!ENTITY aa-ed-desc SYSTEM "../appendixa/ed-desc.xml">
+<!ENTITY aa-ed-dep SYSTEM "../appendixa/ed-dep.xml">
+<!ENTITY aa-ed-down SYSTEM "../appendixa/ed-down.xml">
+
+<!ENTITY ed-version "0.2">
+<!ENTITY ed-depversion "0.2">
+<!ENTITY ed-contversion "0.2">
+<!ENTITY ed-size "158 KB">
+<!ENTITY ed-dir "ed-&ed-version;">
+<!ENTITY ed-package "ed-&ed-version;.tar.bz2">
+
+<!ENTITY ed-compsize "2 MB">
+<!ENTITY ed-time "1 minute">
diff --git a/entities/ed.xml b/entities/ed.xml
deleted file mode 100644
index 6cad14f37..000000000
--- a/entities/ed.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY c3-ed SYSTEM "../chapter03/ed.xml">
-
-<!ENTITY c6-ed SYSTEM "../chapter06/ed.xml">
-<!ENTITY c6-ed-inst SYSTEM "../chapter06/ed-inst.xml">
-<!ENTITY c6-ed-exp SYSTEM "../chapter06/ed-exp.xml">
-
-<!ENTITY aa-ed-desc SYSTEM "../appendixa/ed-desc.xml">
-<!ENTITY aa-ed-dep SYSTEM "../appendixa/ed-dep.xml">
-<!ENTITY aa-ed-down SYSTEM "../appendixa/ed-down.xml">
-
-<!ENTITY ed-version "0.2">
-<!ENTITY ed-depversion "0.2">
-<!ENTITY ed-contversion "0.2">
-<!ENTITY ed-size "158 KB">
-<!ENTITY ed-dir "ed-&ed-version;">
-<!ENTITY ed-package "ed-&ed-version;.tar.bz2">
-
-<!ENTITY ed-compsize "2 MB">
-<!ENTITY ed-time "1 minute">
diff --git a/entities/file.ent b/entities/file.ent
new file mode 100644
index 000000000..9207aae02
--- /dev/null
+++ b/entities/file.ent
@@ -0,0 +1,20 @@
+<!ENTITY c3-file SYSTEM "../chapter03/file.xml">
+
+<!ENTITY c6-file SYSTEM "../chapter06/file.xml">
+<!ENTITY c6-file-inst SYSTEM "../chapter06/file-inst.xml">
+<!ENTITY c6-file-exp SYSTEM "../chapter06/file-exp.xml">
+
+<!ENTITY aa-file SYSTEM "../appendixa/file.xml">
+<!ENTITY aa-file-desc SYSTEM "../appendixa/file-desc.xml">
+<!ENTITY aa-file-dep SYSTEM "../appendixa/file-dep.xml">
+<!ENTITY aa-file-down SYSTEM "../appendixa/file-down.xml">
+
+<!ENTITY file-version "3.37">
+<!ENTITY file-depversion "3.37">
+<!ENTITY file-contversion "3.37">
+<!ENTITY file-size "140 KB">
+<!ENTITY file-dir "file-&file-version;">
+<!ENTITY file-package "file-&file-version;.tar.bz2">
+
+<!ENTITY file-compsize "2 MB">
+<!ENTITY file-time "1 minute">
diff --git a/entities/file.xml b/entities/file.xml
deleted file mode 100644
index 9207aae02..000000000
--- a/entities/file.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!ENTITY c3-file SYSTEM "../chapter03/file.xml">
-
-<!ENTITY c6-file SYSTEM "../chapter06/file.xml">
-<!ENTITY c6-file-inst SYSTEM "../chapter06/file-inst.xml">
-<!ENTITY c6-file-exp SYSTEM "../chapter06/file-exp.xml">
-
-<!ENTITY aa-file SYSTEM "../appendixa/file.xml">
-<!ENTITY aa-file-desc SYSTEM "../appendixa/file-desc.xml">
-<!ENTITY aa-file-dep SYSTEM "../appendixa/file-dep.xml">
-<!ENTITY aa-file-down SYSTEM "../appendixa/file-down.xml">
-
-<!ENTITY file-version "3.37">
-<!ENTITY file-depversion "3.37">
-<!ENTITY file-contversion "3.37">
-<!ENTITY file-size "140 KB">
-<!ENTITY file-dir "file-&file-version;">
-<!ENTITY file-package "file-&file-version;.tar.bz2">
-
-<!ENTITY file-compsize "2 MB">
-<!ENTITY file-time "1 minute">
diff --git a/entities/fileutils.ent b/entities/fileutils.ent
new file mode 100644
index 000000000..a48114e62
--- /dev/null
+++ b/entities/fileutils.ent
@@ -0,0 +1,26 @@
+<!ENTITY c3-fileutils SYSTEM "../chapter03/fileutils.xml">
+
+<!ENTITY c5-fileutils SYSTEM "../chapter05/fileutils.xml">
+<!ENTITY c5-fileutils-inst SYSTEM "../chapter05/fileutils-inst.xml">
+<!ENTITY c5-fileutils-exp SYSTEM "../chapter05/fileutils-exp.xml">
+
+<!ENTITY c6-fileutils SYSTEM "../chapter06/fileutils.xml">
+<!ENTITY c6-fileutils-inst SYSTEM "../chapter06/fileutils-inst.xml">
+
+<!ENTITY aa-fileutils SYSTEM "../appendixa/fileutils.xml">
+<!ENTITY aa-fileutils-desc SYSTEM "../appendixa/fileutils-desc.xml">
+<!ENTITY aa-fileutils-dep SYSTEM "../appendixa/fileutils-dep.xml">
+<!ENTITY aa-fileutils-down SYSTEM "../appendixa/fileutils-down.xml">
+
+<!ENTITY fileutils-version "4.1">
+<!ENTITY fileutils-depversion "4.1">
+<!ENTITY fileutils-contversion "4.1">
+<!ENTITY fileutils-size "1217 KB">
+<!ENTITY fileutils-package "fileutils-&fileutils-version;.tar.bz2">
+<!ENTITY fileutils-dir "fileutils-&fileutils-version;">
+
+<!ENTITY fileutils-compsize-static "25 MB">
+<!ENTITY fileutils-time-static "3 minutes">
+
+<!ENTITY fileutils-compsize "16 MB">
+<!ENTITY fileutils-time "3 minutes">
diff --git a/entities/fileutils.xml b/entities/fileutils.xml
deleted file mode 100644
index a48114e62..000000000
--- a/entities/fileutils.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!ENTITY c3-fileutils SYSTEM "../chapter03/fileutils.xml">
-
-<!ENTITY c5-fileutils SYSTEM "../chapter05/fileutils.xml">
-<!ENTITY c5-fileutils-inst SYSTEM "../chapter05/fileutils-inst.xml">
-<!ENTITY c5-fileutils-exp SYSTEM "../chapter05/fileutils-exp.xml">
-
-<!ENTITY c6-fileutils SYSTEM "../chapter06/fileutils.xml">
-<!ENTITY c6-fileutils-inst SYSTEM "../chapter06/fileutils-inst.xml">
-
-<!ENTITY aa-fileutils SYSTEM "../appendixa/fileutils.xml">
-<!ENTITY aa-fileutils-desc SYSTEM "../appendixa/fileutils-desc.xml">
-<!ENTITY aa-fileutils-dep SYSTEM "../appendixa/fileutils-dep.xml">
-<!ENTITY aa-fileutils-down SYSTEM "../appendixa/fileutils-down.xml">
-
-<!ENTITY fileutils-version "4.1">
-<!ENTITY fileutils-depversion "4.1">
-<!ENTITY fileutils-contversion "4.1">
-<!ENTITY fileutils-size "1217 KB">
-<!ENTITY fileutils-package "fileutils-&fileutils-version;.tar.bz2">
-<!ENTITY fileutils-dir "fileutils-&fileutils-version;">
-
-<!ENTITY fileutils-compsize-static "25 MB">
-<!ENTITY fileutils-time-static "3 minutes">
-
-<!ENTITY fileutils-compsize "16 MB">
-<!ENTITY fileutils-time "3 minutes">
diff --git a/entities/findutils.ent b/entities/findutils.ent
new file mode 100644
index 000000000..7c512b202
--- /dev/null
+++ b/entities/findutils.ent
@@ -0,0 +1,22 @@
+<!ENTITY c3-findutils SYSTEM "../chapter03/findutils.xml">
+<!ENTITY c3-findutils-patch SYSTEM "../chapter03/findutils-patch.xml">
+
+<!ENTITY c6-findutils SYSTEM "../chapter06/findutils.xml">
+<!ENTITY c6-findutils-exp SYSTEM "../chapter06/findutils-exp.xml">
+<!ENTITY c6-findutils-inst SYSTEM "../chapter06/findutils-inst.xml">
+
+<!ENTITY aa-findutils SYSTEM "../appendixa/findutils.xml">
+<!ENTITY aa-findutils-desc SYSTEM "../appendixa/findutils-desc.xml">
+<!ENTITY aa-findutils-dep SYSTEM "../appendixa/findutils-dep.xml">
+<!ENTITY aa-findutils-down SYSTEM "../appendixa/findutils-down.xml">
+
+<!ENTITY findutils-version "4.1">
+<!ENTITY findutils-depversion "4.1">
+<!ENTITY findutils-contversion "4.1">
+<!ENTITY findutils-size "226 KB">
+<!ENTITY findutils-patch-size "1 KB">
+<!ENTITY findutils-dir "findutils-&findutils-version;">
+<!ENTITY findutils-package "findutils-&findutils-version;.tar.bz2">
+
+<!ENTITY findutils-compsize "3 MB">
+<!ENTITY findutils-time "1 minute">
diff --git a/entities/findutils.xml b/entities/findutils.xml
deleted file mode 100644
index 7c512b202..000000000
--- a/entities/findutils.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!ENTITY c3-findutils SYSTEM "../chapter03/findutils.xml">
-<!ENTITY c3-findutils-patch SYSTEM "../chapter03/findutils-patch.xml">
-
-<!ENTITY c6-findutils SYSTEM "../chapter06/findutils.xml">
-<!ENTITY c6-findutils-exp SYSTEM "../chapter06/findutils-exp.xml">
-<!ENTITY c6-findutils-inst SYSTEM "../chapter06/findutils-inst.xml">
-
-<!ENTITY aa-findutils SYSTEM "../appendixa/findutils.xml">
-<!ENTITY aa-findutils-desc SYSTEM "../appendixa/findutils-desc.xml">
-<!ENTITY aa-findutils-dep SYSTEM "../appendixa/findutils-dep.xml">
-<!ENTITY aa-findutils-down SYSTEM "../appendixa/findutils-down.xml">
-
-<!ENTITY findutils-version "4.1">
-<!ENTITY findutils-depversion "4.1">
-<!ENTITY findutils-contversion "4.1">
-<!ENTITY findutils-size "226 KB">
-<!ENTITY findutils-patch-size "1 KB">
-<!ENTITY findutils-dir "findutils-&findutils-version;">
-<!ENTITY findutils-package "findutils-&findutils-version;.tar.bz2">
-
-<!ENTITY findutils-compsize "3 MB">
-<!ENTITY findutils-time "1 minute">
diff --git a/entities/flex.ent b/entities/flex.ent
new file mode 100644
index 000000000..b4a8a8df8
--- /dev/null
+++ b/entities/flex.ent
@@ -0,0 +1,19 @@
+<!ENTITY c3-flex SYSTEM "../chapter03/flex.xml">
+
+<!ENTITY c6-flex SYSTEM "../chapter06/flex.xml">
+<!ENTITY c6-flex-inst SYSTEM "../chapter06/flex-inst.xml">
+
+<!ENTITY aa-flex SYSTEM "../appendixa/flex.xml">
+<!ENTITY aa-flex-desc SYSTEM "../appendixa/flex-desc.xml">
+<!ENTITY aa-flex-dep SYSTEM "../appendixa/flex-dep.xml">
+<!ENTITY aa-flex-down SYSTEM "../appendixa/flex-down.xml">
+
+<!ENTITY flex-version "2.5.4a">
+<!ENTITY flex-depversion "2.5.4a">
+<!ENTITY flex-contversion "2.5.4a">
+<!ENTITY flex-size "278 KB">
+<!ENTITY flex-dir "flex-&flex-version;">
+<!ENTITY flex-package "flex-&flex-version;.tar.bz2">
+
+<!ENTITY flex-compsize "3MB">
+<!ENTITY flex-time "1 minute">
diff --git a/entities/flex.xml b/entities/flex.xml
deleted file mode 100644
index b4a8a8df8..000000000
--- a/entities/flex.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY c3-flex SYSTEM "../chapter03/flex.xml">
-
-<!ENTITY c6-flex SYSTEM "../chapter06/flex.xml">
-<!ENTITY c6-flex-inst SYSTEM "../chapter06/flex-inst.xml">
-
-<!ENTITY aa-flex SYSTEM "../appendixa/flex.xml">
-<!ENTITY aa-flex-desc SYSTEM "../appendixa/flex-desc.xml">
-<!ENTITY aa-flex-dep SYSTEM "../appendixa/flex-dep.xml">
-<!ENTITY aa-flex-down SYSTEM "../appendixa/flex-down.xml">
-
-<!ENTITY flex-version "2.5.4a">
-<!ENTITY flex-depversion "2.5.4a">
-<!ENTITY flex-contversion "2.5.4a">
-<!ENTITY flex-size "278 KB">
-<!ENTITY flex-dir "flex-&flex-version;">
-<!ENTITY flex-package "flex-&flex-version;.tar.bz2">
-
-<!ENTITY flex-compsize "3MB">
-<!ENTITY flex-time "1 minute">
diff --git a/entities/gawk.ent b/entities/gawk.ent
new file mode 100644
index 000000000..50ca823ac
--- /dev/null
+++ b/entities/gawk.ent
@@ -0,0 +1,25 @@
+<!ENTITY c3-gawk SYSTEM "../chapter03/gawk.xml">
+
+<!ENTITY c5-gawk SYSTEM "../chapter05/gawk.xml">
+<!ENTITY c5-gawk-inst SYSTEM "../chapter05/gawk-inst.xml">
+
+<!ENTITY c6-gawk SYSTEM "../chapter06/gawk.xml">
+<!ENTITY c6-gawk-inst SYSTEM "../chapter06/gawk-inst.xml">
+
+<!ENTITY aa-gawk SYSTEM "../appendixa/gawk.xml">
+<!ENTITY aa-gawk-desc SYSTEM "../appendixa/gawk-desc.xml">
+<!ENTITY aa-gawk-dep SYSTEM "../appendixa/gawk-dep.xml">
+<!ENTITY aa-gawk-down SYSTEM "../appendixa/gawk-down.xml">
+
+<!ENTITY gawk-version "3.1.0">
+<!ENTITY gawk-depversion "3.1.0">
+<!ENTITY gawk-contversion "3.1.0">
+<!ENTITY gawk-size "1,286 KB">
+<!ENTITY gawk-dir "gawk-&gawk-version;">
+<!ENTITY gawk-package "gawk&gawk-version;.tar.bz2">
+
+<!ENTITY gawk-compsize-static "12 MB">
+<!ENTITY gawk-time-static "2 minutes">
+
+<!ENTITY gawk-compsize "10 MB">
+<!ENTITY gawk-time "2 minutes">
diff --git a/entities/gawk.xml b/entities/gawk.xml
deleted file mode 100644
index 50ca823ac..000000000
--- a/entities/gawk.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!ENTITY c3-gawk SYSTEM "../chapter03/gawk.xml">
-
-<!ENTITY c5-gawk SYSTEM "../chapter05/gawk.xml">
-<!ENTITY c5-gawk-inst SYSTEM "../chapter05/gawk-inst.xml">
-
-<!ENTITY c6-gawk SYSTEM "../chapter06/gawk.xml">
-<!ENTITY c6-gawk-inst SYSTEM "../chapter06/gawk-inst.xml">
-
-<!ENTITY aa-gawk SYSTEM "../appendixa/gawk.xml">
-<!ENTITY aa-gawk-desc SYSTEM "../appendixa/gawk-desc.xml">
-<!ENTITY aa-gawk-dep SYSTEM "../appendixa/gawk-dep.xml">
-<!ENTITY aa-gawk-down SYSTEM "../appendixa/gawk-down.xml">
-
-<!ENTITY gawk-version "3.1.0">
-<!ENTITY gawk-depversion "3.1.0">
-<!ENTITY gawk-contversion "3.1.0">
-<!ENTITY gawk-size "1,286 KB">
-<!ENTITY gawk-dir "gawk-&gawk-version;">
-<!ENTITY gawk-package "gawk&gawk-version;.tar.bz2">
-
-<!ENTITY gawk-compsize-static "12 MB">
-<!ENTITY gawk-time-static "2 minutes">
-
-<!ENTITY gawk-compsize "10 MB">
-<!ENTITY gawk-time "2 minutes">
diff --git a/entities/gcc.ent b/entities/gcc.ent
new file mode 100644
index 000000000..aac28107a
--- /dev/null
+++ b/entities/gcc.ent
@@ -0,0 +1,29 @@
+<!ENTITY c3-gcc SYSTEM "../chapter03/gcc.xml">
+<!ENTITY c3-gcc-patch SYSTEM "../chapter03/gcc-patch.xml">
+
+<!ENTITY c5-gcc SYSTEM "../chapter05/gcc.xml">
+<!ENTITY c5-gcc-inst SYSTEM "../chapter05/gcc-inst.xml">
+<!ENTITY c5-gcc-exp SYSTEM "../chapter05/gcc-exp.xml">
+
+<!ENTITY c6-gcc SYSTEM "../chapter06/gcc.xml">
+<!ENTITY c6-gcc-inst SYSTEM "../chapter06/gcc-inst.xml">
+
+<!ENTITY aa-gcc SYSTEM "../appendixa/gcc.xml">
+<!ENTITY aa-gcc-desc SYSTEM "../appendixa/gcc-desc.xml">
+<!ENTITY aa-gcc-dep SYSTEM "../appendixa/gcc-dep.xml">
+<!ENTITY aa-gcc-down SYSTEM "../appendixa/gcc-down.xml">
+
+<!ENTITY gcc-version "2.95.3">
+<!ENTITY gcc-depversion "2.95.3">
+<!ENTITY gcc-contversion "2.95.3">
+<!ENTITY gcc-size "9,618 KB">
+<!ENTITY gcc-patch-version "2.95.3-2">
+<!ENTITY gcc-patch-size "8 KB">
+<!ENTITY gcc-package "gcc-&gcc-version;.tar.bz2">
+<!ENTITY gcc-dir "gcc-&gcc-version;">
+
+<!ENTITY gcc-compsize-static "168 MB">
+<!ENTITY gcc-time-static "22 minutes">
+
+<!ENTITY gcc-compsize "148 MB">
+<!ENTITY gcc-time "22 minutes">
diff --git a/entities/gcc.xml b/entities/gcc.xml
deleted file mode 100644
index aac28107a..000000000
--- a/entities/gcc.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!ENTITY c3-gcc SYSTEM "../chapter03/gcc.xml">
-<!ENTITY c3-gcc-patch SYSTEM "../chapter03/gcc-patch.xml">
-
-<!ENTITY c5-gcc SYSTEM "../chapter05/gcc.xml">
-<!ENTITY c5-gcc-inst SYSTEM "../chapter05/gcc-inst.xml">
-<!ENTITY c5-gcc-exp SYSTEM "../chapter05/gcc-exp.xml">
-
-<!ENTITY c6-gcc SYSTEM "../chapter06/gcc.xml">
-<!ENTITY c6-gcc-inst SYSTEM "../chapter06/gcc-inst.xml">
-
-<!ENTITY aa-gcc SYSTEM "../appendixa/gcc.xml">
-<!ENTITY aa-gcc-desc SYSTEM "../appendixa/gcc-desc.xml">
-<!ENTITY aa-gcc-dep SYSTEM "../appendixa/gcc-dep.xml">
-<!ENTITY aa-gcc-down SYSTEM "../appendixa/gcc-down.xml">
-
-<!ENTITY gcc-version "2.95.3">
-<!ENTITY gcc-depversion "2.95.3">
-<!ENTITY gcc-contversion "2.95.3">
-<!ENTITY gcc-size "9,618 KB">
-<!ENTITY gcc-patch-version "2.95.3-2">
-<!ENTITY gcc-patch-size "8 KB">
-<!ENTITY gcc-package "gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-dir "gcc-&gcc-version;">
-
-<!ENTITY gcc-compsize-static "168 MB">
-<!ENTITY gcc-time-static "22 minutes">
-
-<!ENTITY gcc-compsize "148 MB">
-<!ENTITY gcc-time "22 minutes">
diff --git a/entities/gettext.ent b/entities/gettext.ent
new file mode 100644
index 000000000..a5e46ee2c
--- /dev/null
+++ b/entities/gettext.ent
@@ -0,0 +1,20 @@
+<!ENTITY c3-gettext SYSTEM "../chapter03/gettext.xml">
+
+<!ENTITY c6-gettext SYSTEM "../chapter06/gettext.xml">
+<!ENTITY c6-gettext-inst SYSTEM "../chapter06/gettext-inst.xml">
+
+<!ENTITY aa-gettext SYSTEM "../appendixa/gettext.xml">
+<!ENTITY aa-gettext-desc SYSTEM "../appendixa/gettext-desc.xml">
+<!ENTITY aa-gettext-dep SYSTEM "../appendixa/gettext-dep.xml">
+<!ENTITY aa-gettext-down SYSTEM "../appendixa/gettext-down.xml">
+
+<!ENTITY gettext-version "0.11.1">
+<!ENTITY gettext-depversion "0.10.40">
+<!ENTITY gettext-contversion "0.10.40">
+<!ENTITY gettext-size "2,039 KB">
+
+<!ENTITY gettext-dir "gettext-&gettext-version;">
+<!ENTITY gettext-package "gettext-&gettext-version;.tar.bz2">
+
+<!ENTITY gettext-compsize "11MB">
+<!ENTITY gettext-time "1 minute">
diff --git a/entities/gettext.xml b/entities/gettext.xml
deleted file mode 100644
index a5e46ee2c..000000000
--- a/entities/gettext.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!ENTITY c3-gettext SYSTEM "../chapter03/gettext.xml">
-
-<!ENTITY c6-gettext SYSTEM "../chapter06/gettext.xml">
-<!ENTITY c6-gettext-inst SYSTEM "../chapter06/gettext-inst.xml">
-
-<!ENTITY aa-gettext SYSTEM "../appendixa/gettext.xml">
-<!ENTITY aa-gettext-desc SYSTEM "../appendixa/gettext-desc.xml">
-<!ENTITY aa-gettext-dep SYSTEM "../appendixa/gettext-dep.xml">
-<!ENTITY aa-gettext-down SYSTEM "../appendixa/gettext-down.xml">
-
-<!ENTITY gettext-version "0.11.1">
-<!ENTITY gettext-depversion "0.10.40">
-<!ENTITY gettext-contversion "0.10.40">
-<!ENTITY gettext-size "2,039 KB">
-
-<!ENTITY gettext-dir "gettext-&gettext-version;">
-<!ENTITY gettext-package "gettext-&gettext-version;.tar.bz2">
-
-<!ENTITY gettext-compsize "11MB">
-<!ENTITY gettext-time "1 minute">
diff --git a/entities/glibc.ent b/entities/glibc.ent
new file mode 100644
index 000000000..7a9e6c44c
--- /dev/null
+++ b/entities/glibc.ent
@@ -0,0 +1,25 @@
+<!ENTITY c3-glibc SYSTEM "../chapter03/glibc.xml">
+<!ENTITY c3-glibc-threads SYSTEM "../chapter03/glibc-threads.xml">
+
+<!ENTITY c6-glibc SYSTEM "../chapter06/glibc.xml">
+<!ENTITY c6-glibc-inst SYSTEM "../chapter06/glibc-inst.xml">
+<!ENTITY c6-glibc-exp SYSTEM "../chapter06/glibc-exp.xml">
+<!ENTITY c6-cf-glibc SYSTEM "../chapter06/config-glibc.xml">
+
+<!ENTITY aa-glibc SYSTEM "../appendixa/glibc.xml">
+<!ENTITY aa-glibc-desc SYSTEM "../appendixa/glibc-desc.xml">
+<!ENTITY aa-glibc-dep SYSTEM "../appendixa/glibc-dep.xml">
+<!ENTITY aa-glibc-down SYSTEM "../appendixa/glibc-down.xml">
+
+<!ENTITY glibc-version "2.2.5">
+<!ENTITY glibc-depversion "2.2.5">
+<!ENTITY glibc-contversion "2.2.5">
+<!ENTITY glibc-size "12,114 KB">
+<!ENTITY glibc-threads-size "164 KB">
+<!ENTITY glibc-dir "glibc-&glibc-version;">
+<!ENTITY glibc-threads-dir "linuxthreads, linuxthreads_db">
+<!ENTITY glibc-package "glibc-&glibc-version;.tar.bz2">
+<!ENTITY glibc-threads-package "glibc-linuxthreads-&glibc-version;.tar.bz2">
+
+<!ENTITY glibc-compsize "350 MB">
+<!ENTITY glibc-time "46 minutes">
diff --git a/entities/glibc.xml b/entities/glibc.xml
deleted file mode 100644
index 7a9e6c44c..000000000
--- a/entities/glibc.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!ENTITY c3-glibc SYSTEM "../chapter03/glibc.xml">
-<!ENTITY c3-glibc-threads SYSTEM "../chapter03/glibc-threads.xml">
-
-<!ENTITY c6-glibc SYSTEM "../chapter06/glibc.xml">
-<!ENTITY c6-glibc-inst SYSTEM "../chapter06/glibc-inst.xml">
-<!ENTITY c6-glibc-exp SYSTEM "../chapter06/glibc-exp.xml">
-<!ENTITY c6-cf-glibc SYSTEM "../chapter06/config-glibc.xml">
-
-<!ENTITY aa-glibc SYSTEM "../appendixa/glibc.xml">
-<!ENTITY aa-glibc-desc SYSTEM "../appendixa/glibc-desc.xml">
-<!ENTITY aa-glibc-dep SYSTEM "../appendixa/glibc-dep.xml">
-<!ENTITY aa-glibc-down SYSTEM "../appendixa/glibc-down.xml">
-
-<!ENTITY glibc-version "2.2.5">
-<!ENTITY glibc-depversion "2.2.5">
-<!ENTITY glibc-contversion "2.2.5">
-<!ENTITY glibc-size "12,114 KB">
-<!ENTITY glibc-threads-size "164 KB">
-<!ENTITY glibc-dir "glibc-&glibc-version;">
-<!ENTITY glibc-threads-dir "linuxthreads, linuxthreads_db">
-<!ENTITY glibc-package "glibc-&glibc-version;.tar.bz2">
-<!ENTITY glibc-threads-package "glibc-linuxthreads-&glibc-version;.tar.bz2">
-
-<!ENTITY glibc-compsize "350 MB">
-<!ENTITY glibc-time "46 minutes">
diff --git a/entities/grep.ent b/entities/grep.ent
new file mode 100644
index 000000000..0eda5b41d
--- /dev/null
+++ b/entities/grep.ent
@@ -0,0 +1,26 @@
+<!ENTITY c3-grep SYSTEM "../chapter03/grep.xml">
+
+<!ENTITY c5-grep SYSTEM "../chapter05/grep.xml">
+<!ENTITY c5-grep-inst SYSTEM "../chapter05/grep-inst.xml">
+<!ENTITY c5-grep-exp SYSTEM "../chapter05/grep-exp.xml">
+
+<!ENTITY c6-grep SYSTEM "../chapter06/grep.xml">
+<!ENTITY c6-grep-inst SYSTEM "../chapter06/grep-inst.xml">
+
+<!ENTITY aa-grep SYSTEM "../appendixa/grep.xml">
+<!ENTITY aa-grep-desc SYSTEM "../appendixa/grep-desc.xml">
+<!ENTITY aa-grep-dep SYSTEM "../appendixa/grep-dep.xml">
+<!ENTITY aa-grep-down SYSTEM "../appendixa/grep-down.xml">
+
+<!ENTITY grep-version "2.5">
+<!ENTITY grep-depversion "2.4.2">
+<!ENTITY grep-contversion "2.4.2">
+<!ENTITY grep-size "545 KB">
+<!ENTITY grep-package "grep-&grep-version;.tar.bz2">
+<!ENTITY grep-dir "grep-&grep-version;">
+
+<!ENTITY grep-compsize-static "4 MB">
+<!ENTITY grep-time-static "1 minute">
+
+<!ENTITY grep-compsize "3 MB">
+<!ENTITY grep-time "1 minute">
diff --git a/entities/grep.xml b/entities/grep.xml
deleted file mode 100644
index 0eda5b41d..000000000
--- a/entities/grep.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!ENTITY c3-grep SYSTEM "../chapter03/grep.xml">
-
-<!ENTITY c5-grep SYSTEM "../chapter05/grep.xml">
-<!ENTITY c5-grep-inst SYSTEM "../chapter05/grep-inst.xml">
-<!ENTITY c5-grep-exp SYSTEM "../chapter05/grep-exp.xml">
-
-<!ENTITY c6-grep SYSTEM "../chapter06/grep.xml">
-<!ENTITY c6-grep-inst SYSTEM "../chapter06/grep-inst.xml">
-
-<!ENTITY aa-grep SYSTEM "../appendixa/grep.xml">
-<!ENTITY aa-grep-desc SYSTEM "../appendixa/grep-desc.xml">
-<!ENTITY aa-grep-dep SYSTEM "../appendixa/grep-dep.xml">
-<!ENTITY aa-grep-down SYSTEM "../appendixa/grep-down.xml">
-
-<!ENTITY grep-version "2.5">
-<!ENTITY grep-depversion "2.4.2">
-<!ENTITY grep-contversion "2.4.2">
-<!ENTITY grep-size "545 KB">
-<!ENTITY grep-package "grep-&grep-version;.tar.bz2">
-<!ENTITY grep-dir "grep-&grep-version;">
-
-<!ENTITY grep-compsize-static "4 MB">
-<!ENTITY grep-time-static "1 minute">
-
-<!ENTITY grep-compsize "3 MB">
-<!ENTITY grep-time "1 minute">
diff --git a/entities/groff.ent b/entities/groff.ent
new file mode 100644
index 000000000..32e8bfcd3
--- /dev/null
+++ b/entities/groff.ent
@@ -0,0 +1,20 @@
+<!ENTITY c3-groff SYSTEM "../chapter03/groff.xml">
+
+<!ENTITY c6-groff SYSTEM "../chapter06/groff.xml">
+<!ENTITY c6-groff-inst SYSTEM "../chapter06/groff-inst.xml">
+<!ENTITY c6-groff-exp SYSTEM "../chapter06/groff-exp.xml">
+
+<!ENTITY aa-groff SYSTEM "../appendixa/groff.xml">
+<!ENTITY aa-groff-desc SYSTEM "../appendixa/groff-desc.xml">
+<!ENTITY aa-groff-dep SYSTEM "../appendixa/groff-dep.xml">
+<!ENTITY aa-groff-down SYSTEM "../appendixa/groff-down.xml">
+
+<!ENTITY groff-version "1.17.2">
+<!ENTITY groff-depversion "1.17.2">
+<!ENTITY groff-contversion "1.17.2">
+<!ENTITY groff-size "1,214 KB">
+<!ENTITY groff-dir "groff-&groff-version;">
+<!ENTITY groff-package "groff-&groff-version;.tar.bz2">
+
+<!ENTITY groff-compsize "16 MB">
+<!ENTITY groff-time "2 minutes">
diff --git a/entities/groff.xml b/entities/groff.xml
deleted file mode 100644
index 32e8bfcd3..000000000
--- a/entities/groff.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!ENTITY c3-groff SYSTEM "../chapter03/groff.xml">
-
-<!ENTITY c6-groff SYSTEM "../chapter06/groff.xml">
-<!ENTITY c6-groff-inst SYSTEM "../chapter06/groff-inst.xml">
-<!ENTITY c6-groff-exp SYSTEM "../chapter06/groff-exp.xml">
-
-<!ENTITY aa-groff SYSTEM "../appendixa/groff.xml">
-<!ENTITY aa-groff-desc SYSTEM "../appendixa/groff-desc.xml">
-<!ENTITY aa-groff-dep SYSTEM "../appendixa/groff-dep.xml">
-<!ENTITY aa-groff-down SYSTEM "../appendixa/groff-down.xml">
-
-<!ENTITY groff-version "1.17.2">
-<!ENTITY groff-depversion "1.17.2">
-<!ENTITY groff-contversion "1.17.2">
-<!ENTITY groff-size "1,214 KB">
-<!ENTITY groff-dir "groff-&groff-version;">
-<!ENTITY groff-package "groff-&groff-version;.tar.bz2">
-
-<!ENTITY groff-compsize "16 MB">
-<!ENTITY groff-time "2 minutes">
diff --git a/entities/gzip.ent b/entities/gzip.ent
new file mode 100644
index 000000000..bb0abf69a
--- /dev/null
+++ b/entities/gzip.ent
@@ -0,0 +1,28 @@
+<!ENTITY c3-gzip SYSTEM "../chapter03/gzip.xml">
+<!ENTITY c3-gzip-patch SYSTEM "../chapter03/gzip-patch.xml">
+
+<!ENTITY c5-gzip SYSTEM "../chapter05/gzip.xml">
+<!ENTITY c5-gzip-inst SYSTEM "../chapter05/gzip-inst.xml">
+<!ENTITY c5-gzip-exp SYSTEM "../chapter05/gzip-exp.xml">
+
+<!ENTITY c6-gzip SYSTEM "../chapter06/gzip.xml">
+<!ENTITY c6-gzip-inst SYSTEM "../chapter06/gzip-inst.xml">
+
+<!ENTITY aa-gzip SYSTEM "../appendixa/gzip.xml">
+<!ENTITY aa-gzip-desc SYSTEM "../appendixa/gzip-desc.xml">
+<!ENTITY aa-gzip-dep SYSTEM "../appendixa/gzip-dep.xml">
+<!ENTITY aa-gzip-down SYSTEM "../appendixa/gzip-down.xml">
+
+<!ENTITY gzip-version "1.2.4a">
+<!ENTITY gzip-depversion "1.2.4a">
+<!ENTITY gzip-contversion "1.2.4a">
+<!ENTITY gzip-size "178 KB">
+<!ENTITY gzip-patch-size "1 KB">
+<!ENTITY gzip-package "gzip-&gzip-version;.tar.bz2">
+<!ENTITY gzip-dir "gzip-&gzip-version;">
+
+<!ENTITY gzip-compsize-static "2 MB">
+<!ENTITY gzip-time-static "1 minute">
+
+<!ENTITY gzip-compsize "1 MB">
+<!ENTITY gzip-time "1 minute">
diff --git a/entities/gzip.xml b/entities/gzip.xml
deleted file mode 100644
index bb0abf69a..000000000
--- a/entities/gzip.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!ENTITY c3-gzip SYSTEM "../chapter03/gzip.xml">
-<!ENTITY c3-gzip-patch SYSTEM "../chapter03/gzip-patch.xml">
-
-<!ENTITY c5-gzip SYSTEM "../chapter05/gzip.xml">
-<!ENTITY c5-gzip-inst SYSTEM "../chapter05/gzip-inst.xml">
-<!ENTITY c5-gzip-exp SYSTEM "../chapter05/gzip-exp.xml">
-
-<!ENTITY c6-gzip SYSTEM "../chapter06/gzip.xml">
-<!ENTITY c6-gzip-inst SYSTEM "../chapter06/gzip-inst.xml">
-
-<!ENTITY aa-gzip SYSTEM "../appendixa/gzip.xml">
-<!ENTITY aa-gzip-desc SYSTEM "../appendixa/gzip-desc.xml">
-<!ENTITY aa-gzip-dep SYSTEM "../appendixa/gzip-dep.xml">
-<!ENTITY aa-gzip-down SYSTEM "../appendixa/gzip-down.xml">
-
-<!ENTITY gzip-version "1.2.4a">
-<!ENTITY gzip-depversion "1.2.4a">
-<!ENTITY gzip-contversion "1.2.4a">
-<!ENTITY gzip-size "178 KB">
-<!ENTITY gzip-patch-size "1 KB">
-<!ENTITY gzip-package "gzip-&gzip-version;.tar.bz2">
-<!ENTITY gzip-dir "gzip-&gzip-version;">
-
-<!ENTITY gzip-compsize-static "2 MB">
-<!ENTITY gzip-time-static "1 minute">
-
-<!ENTITY gzip-compsize "1 MB">
-<!ENTITY gzip-time "1 minute">
diff --git a/entities/kbd.ent b/entities/kbd.ent
new file mode 100644
index 000000000..3fcafa5b0
--- /dev/null
+++ b/entities/kbd.ent
@@ -0,0 +1,23 @@
+<!ENTITY c3-kbd SYSTEM "../chapter03/kbd.xml">
+<!ENTITY c3-kbd-patch SYSTEM "../chapter03/kbd-patch.xml">
+
+<!ENTITY c6-kbd SYSTEM "../chapter06/kbd.xml">
+<!ENTITY c6-kbd-inst SYSTEM "../chapter06/kbd-inst.xml">
+<!ENTITY c6-kbd-exp SYSTEM "../chapter06/kbd-exp.xml">
+
+<!ENTITY aa-kbd SYSTEM "../appendixa/kbd.xml">
+<!ENTITY aa-kbd-desc SYSTEM "../appendixa/kbd-desc.xml">
+<!ENTITY aa-kbd-dep SYSTEM "../appendixa/kbd-dep.xml">
+<!ENTITY aa-kbd-down SYSTEM "../appendixa/kbd-down.xml">
+
+<!ENTITY kbd-version "1.06">
+<!ENTITY kbd-depversion "1.06">
+<!ENTITY kbd-contversion "1.06">
+<!ENTITY kbd-size "559 KB">
+<!ENTITY kbd-patch-version "1.06-2">
+<!ENTITY kbd-patch-size "3 KB">
+<!ENTITY kbd-dir "kbd-&kbd-version;">
+<!ENTITY kbd-package "kbd-&kbd-version;.tar.bz2">
+
+<!ENTITY kbd-compsize "8 MB">
+<!ENTITY kbd-time "1 minute">
diff --git a/entities/kbd.xml b/entities/kbd.xml
deleted file mode 100644
index 3fcafa5b0..000000000
--- a/entities/kbd.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!ENTITY c3-kbd SYSTEM "../chapter03/kbd.xml">
-<!ENTITY c3-kbd-patch SYSTEM "../chapter03/kbd-patch.xml">
-
-<!ENTITY c6-kbd SYSTEM "../chapter06/kbd.xml">
-<!ENTITY c6-kbd-inst SYSTEM "../chapter06/kbd-inst.xml">
-<!ENTITY c6-kbd-exp SYSTEM "../chapter06/kbd-exp.xml">
-
-<!ENTITY aa-kbd SYSTEM "../appendixa/kbd.xml">
-<!ENTITY aa-kbd-desc SYSTEM "../appendixa/kbd-desc.xml">
-<!ENTITY aa-kbd-dep SYSTEM "../appendixa/kbd-dep.xml">
-<!ENTITY aa-kbd-down SYSTEM "../appendixa/kbd-down.xml">
-
-<!ENTITY kbd-version "1.06">
-<!ENTITY kbd-depversion "1.06">
-<!ENTITY kbd-contversion "1.06">
-<!ENTITY kbd-size "559 KB">
-<!ENTITY kbd-patch-version "1.06-2">
-<!ENTITY kbd-patch-size "3 KB">
-<!ENTITY kbd-dir "kbd-&kbd-version;">
-<!ENTITY kbd-package "kbd-&kbd-version;.tar.bz2">
-
-<!ENTITY kbd-compsize "8 MB">
-<!ENTITY kbd-time "1 minute">
diff --git a/entities/kernel.ent b/entities/kernel.ent
new file mode 100644
index 000000000..1a06e14fc
--- /dev/null
+++ b/entities/kernel.ent
@@ -0,0 +1,26 @@
+<!ENTITY c3-kernel SYSTEM "../chapter03/kernel.xml">
+
+<!ENTITY c5-kernel SYSTEM "../chapter05/kernel.xml">
+<!ENTITY c5-kernel-inst SYSTEM "../chapter05/kernel-inst.xml">
+<!ENTITY c5-kernel-exp SYSTEM "../chapter05/kernel-exp.xml">
+<!ENTITY c5-kernel-exp-headers SYSTEM "../chapter05/kernel-exp-headers.xml">
+
+<!ENTITY c8-kernel SYSTEM "../chapter08/kernel.xml">
+
+<!ENTITY aa-kernel SYSTEM "../appendixa/kernel.xml">
+<!ENTITY aa-kernel-desc SYSTEM "../appendixa/kernel-desc.xml">
+<!ENTITY aa-kernel-dep SYSTEM "../appendixa/kernel-dep.xml">
+<!ENTITY aa-kernel-down SYSTEM "../appendixa/kernel-down.xml">
+
+<!ENTITY kernel-version "2.4.18">
+<!ENTITY kernel-depversion "2.4.17">
+<!ENTITY kernel-contversion "2.4.17">
+<!ENTITY kernel-size "23,595 KB">
+<!ENTITY kernel-package "linux-&kernel-version;.tar.bz2">
+<!ENTITY kernel-dir "linux">
+
+<!ENTITY kernel-compsize-static "132 MB">
+<!ENTITY kernel-time-static "1 minute">
+
+<!ENTITY kernel-compsize "Depends on options selected">
+<!ENTITY kernel-time "Depends on options selected">
diff --git a/entities/kernel.xml b/entities/kernel.xml
deleted file mode 100644
index 1a06e14fc..000000000
--- a/entities/kernel.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!ENTITY c3-kernel SYSTEM "../chapter03/kernel.xml">
-
-<!ENTITY c5-kernel SYSTEM "../chapter05/kernel.xml">
-<!ENTITY c5-kernel-inst SYSTEM "../chapter05/kernel-inst.xml">
-<!ENTITY c5-kernel-exp SYSTEM "../chapter05/kernel-exp.xml">
-<!ENTITY c5-kernel-exp-headers SYSTEM "../chapter05/kernel-exp-headers.xml">
-
-<!ENTITY c8-kernel SYSTEM "../chapter08/kernel.xml">
-
-<!ENTITY aa-kernel SYSTEM "../appendixa/kernel.xml">
-<!ENTITY aa-kernel-desc SYSTEM "../appendixa/kernel-desc.xml">
-<!ENTITY aa-kernel-dep SYSTEM "../appendixa/kernel-dep.xml">
-<!ENTITY aa-kernel-down SYSTEM "../appendixa/kernel-down.xml">
-
-<!ENTITY kernel-version "2.4.18">
-<!ENTITY kernel-depversion "2.4.17">
-<!ENTITY kernel-contversion "2.4.17">
-<!ENTITY kernel-size "23,595 KB">
-<!ENTITY kernel-package "linux-&kernel-version;.tar.bz2">
-<!ENTITY kernel-dir "linux">
-
-<!ENTITY kernel-compsize-static "132 MB">
-<!ENTITY kernel-time-static "1 minute">
-
-<!ENTITY kernel-compsize "Depends on options selected">
-<!ENTITY kernel-time "Depends on options selected">
diff --git a/entities/less.ent b/entities/less.ent
new file mode 100644
index 000000000..6b693660d
--- /dev/null
+++ b/entities/less.ent
@@ -0,0 +1,19 @@
+<!ENTITY c3-less SYSTEM "../chapter03/less.xml">
+
+<!ENTITY c6-less SYSTEM "../chapter06/less.xml">
+<!ENTITY c6-less-inst SYSTEM "../chapter06/less-inst.xml">
+
+<!ENTITY aa-less SYSTEM "../appendixa/less.xml">
+<!ENTITY aa-less-desc SYSTEM "../appendixa/less-desc.xml">
+<!ENTITY aa-less-dep SYSTEM "../appendixa/less-dep.xml">
+<!ENTITY aa-less-down SYSTEM "../appendixa/less-down.xml">
+
+<!ENTITY less-version "374">
+<!ENTITY less-depversion "358">
+<!ENTITY less-contversion "358">
+<!ENTITY less-size "189 KB">
+<!ENTITY less-dir "less-&less-version;">
+<!ENTITY less-package "less-&less-version;.tar.bz2">
+
+<!ENTITY less-compsize "2 MB">
+<!ENTITY less-time "1 minute">
diff --git a/entities/less.xml b/entities/less.xml
deleted file mode 100644
index 6b693660d..000000000
--- a/entities/less.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY c3-less SYSTEM "../chapter03/less.xml">
-
-<!ENTITY c6-less SYSTEM "../chapter06/less.xml">
-<!ENTITY c6-less-inst SYSTEM "../chapter06/less-inst.xml">
-
-<!ENTITY aa-less SYSTEM "../appendixa/less.xml">
-<!ENTITY aa-less-desc SYSTEM "../appendixa/less-desc.xml">
-<!ENTITY aa-less-dep SYSTEM "../appendixa/less-dep.xml">
-<!ENTITY aa-less-down SYSTEM "../appendixa/less-down.xml">
-
-<!ENTITY less-version "374">
-<!ENTITY less-depversion "358">
-<!ENTITY less-contversion "358">
-<!ENTITY less-size "189 KB">
-<!ENTITY less-dir "less-&less-version;">
-<!ENTITY less-package "less-&less-version;.tar.bz2">
-
-<!ENTITY less-compsize "2 MB">
-<!ENTITY less-time "1 minute">
diff --git a/entities/libtool.ent b/entities/libtool.ent
new file mode 100644
index 000000000..facbdef8a
--- /dev/null
+++ b/entities/libtool.ent
@@ -0,0 +1,19 @@
+<!ENTITY c3-libtool SYSTEM "../chapter03/libtool.xml">
+
+<!ENTITY c6-libtool SYSTEM "../chapter06/libtool.xml">
+<!ENTITY c6-libtool-inst SYSTEM "../chapter06/libtool-inst.xml">
+
+<!ENTITY aa-libtool SYSTEM "../appendixa/libtool.xml">
+<!ENTITY aa-libtool-desc SYSTEM "../appendixa/libtool-desc.xml">
+<!ENTITY aa-libtool-dep SYSTEM "../appendixa/libtool-dep.xml">
+<!ENTITY aa-libtool-down SYSTEM "../appendixa/libtool-down.xml">
+
+<!ENTITY libtool-version "1.4.2">
+<!ENTITY libtool-depversion "1.4.2">
+<!ENTITY libtool-contversion "1.4.2">
+<!ENTITY libtool-size "653 KB">
+<!ENTITY libtool-dir "libtool-&libtool-version;">
+<!ENTITY libtool-package "libtool-&libtool-version;.tar.bz2">
+
+<!ENTITY libtool-compsize "5 MB">
+<!ENTITY libtool-time "1 minute">
diff --git a/entities/libtool.xml b/entities/libtool.xml
deleted file mode 100644
index facbdef8a..000000000
--- a/entities/libtool.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY c3-libtool SYSTEM "../chapter03/libtool.xml">
-
-<!ENTITY c6-libtool SYSTEM "../chapter06/libtool.xml">
-<!ENTITY c6-libtool-inst SYSTEM "../chapter06/libtool-inst.xml">
-
-<!ENTITY aa-libtool SYSTEM "../appendixa/libtool.xml">
-<!ENTITY aa-libtool-desc SYSTEM "../appendixa/libtool-desc.xml">
-<!ENTITY aa-libtool-dep SYSTEM "../appendixa/libtool-dep.xml">
-<!ENTITY aa-libtool-down SYSTEM "../appendixa/libtool-down.xml">
-
-<!ENTITY libtool-version "1.4.2">
-<!ENTITY libtool-depversion "1.4.2">
-<!ENTITY libtool-contversion "1.4.2">
-<!ENTITY libtool-size "653 KB">
-<!ENTITY libtool-dir "libtool-&libtool-version;">
-<!ENTITY libtool-package "libtool-&libtool-version;.tar.bz2">
-
-<!ENTITY libtool-compsize "5 MB">
-<!ENTITY libtool-time "1 minute">
diff --git a/entities/lilo.ent b/entities/lilo.ent
new file mode 100644
index 000000000..ea8dbee1e
--- /dev/null
+++ b/entities/lilo.ent
@@ -0,0 +1,21 @@
+<!ENTITY c3-lilo SYSTEM "../chapter03/lilo.xml">
+
+<!ENTITY c6-lilo SYSTEM "../chapter06/lilo.xml">
+<!ENTITY c6-lilo-inst SYSTEM "../chapter06/lilo-inst.xml">
+
+<!ENTITY c8-lilo SYSTEM "../chapter08/lilo.xml">
+
+<!ENTITY aa-lilo SYSTEM "../appendixa/lilo.xml">
+<!ENTITY aa-lilo-desc SYSTEM "../appendixa/lilo-desc.xml">
+<!ENTITY aa-lilo-dep SYSTEM "../appendixa/lilo-dep.xml">
+<!ENTITY aa-lilo-down SYSTEM "../appendixa/lilo-down.xml">
+
+<!ENTITY lilo-version "22.2">
+<!ENTITY lilo-depversion "22.1">
+<!ENTITY lilo-contversion "22.1">
+<!ENTITY lilo-size "292 KB">
+<!ENTITY lilo-dir "lilo-&lilo-version;">
+<!ENTITY lilo-package "lilo-&lilo-version;.tar.bz2">
+
+<!ENTITY lilo-compsize "3 MB">
+<!ENTITY lilo-time "1 minute">
diff --git a/entities/lilo.xml b/entities/lilo.xml
deleted file mode 100644
index ea8dbee1e..000000000
--- a/entities/lilo.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!ENTITY c3-lilo SYSTEM "../chapter03/lilo.xml">
-
-<!ENTITY c6-lilo SYSTEM "../chapter06/lilo.xml">
-<!ENTITY c6-lilo-inst SYSTEM "../chapter06/lilo-inst.xml">
-
-<!ENTITY c8-lilo SYSTEM "../chapter08/lilo.xml">
-
-<!ENTITY aa-lilo SYSTEM "../appendixa/lilo.xml">
-<!ENTITY aa-lilo-desc SYSTEM "../appendixa/lilo-desc.xml">
-<!ENTITY aa-lilo-dep SYSTEM "../appendixa/lilo-dep.xml">
-<!ENTITY aa-lilo-down SYSTEM "../appendixa/lilo-down.xml">
-
-<!ENTITY lilo-version "22.2">
-<!ENTITY lilo-depversion "22.1">
-<!ENTITY lilo-contversion "22.1">
-<!ENTITY lilo-size "292 KB">
-<!ENTITY lilo-dir "lilo-&lilo-version;">
-<!ENTITY lilo-package "lilo-&lilo-version;.tar.bz2">
-
-<!ENTITY lilo-compsize "3 MB">
-<!ENTITY lilo-time "1 minute">
diff --git a/entities/m4.ent b/entities/m4.ent
new file mode 100644
index 000000000..7914e3bc5
--- /dev/null
+++ b/entities/m4.ent
@@ -0,0 +1,19 @@
+<!ENTITY c3-m4 SYSTEM "../chapter03/m4.xml">
+
+<!ENTITY c6-m4 SYSTEM "../chapter06/m4.xml">
+<!ENTITY c6-m4-inst SYSTEM "../chapter06/m4-inst.xml">
+
+<!ENTITY aa-m4 SYSTEM "../appendixa/m4.xml">
+<!ENTITY aa-m4-desc SYSTEM "../appendixa/m4-desc.xml">
+<!ENTITY aa-m4-dep SYSTEM "../appendixa/m4-dep.xml">
+<!ENTITY aa-m4-down SYSTEM "../appendixa/m4-down.xml">
+
+<!ENTITY m4-version "1.4">
+<!ENTITY m4-depversion "1.4">
+<!ENTITY m4-contversion "1.4">
+<!ENTITY m4-size "249 KB">
+<!ENTITY m4-dir "m4-&m4-version;">
+<!ENTITY m4-package "m4-&m4-version;.tar.bz2">
+
+<!ENTITY m4-compsize "3 MB">
+<!ENTITY m4-time "1 minute">
diff --git a/entities/m4.xml b/entities/m4.xml
deleted file mode 100644
index 7914e3bc5..000000000
--- a/entities/m4.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY c3-m4 SYSTEM "../chapter03/m4.xml">
-
-<!ENTITY c6-m4 SYSTEM "../chapter06/m4.xml">
-<!ENTITY c6-m4-inst SYSTEM "../chapter06/m4-inst.xml">
-
-<!ENTITY aa-m4 SYSTEM "../appendixa/m4.xml">
-<!ENTITY aa-m4-desc SYSTEM "../appendixa/m4-desc.xml">
-<!ENTITY aa-m4-dep SYSTEM "../appendixa/m4-dep.xml">
-<!ENTITY aa-m4-down SYSTEM "../appendixa/m4-down.xml">
-
-<!ENTITY m4-version "1.4">
-<!ENTITY m4-depversion "1.4">
-<!ENTITY m4-contversion "1.4">
-<!ENTITY m4-size "249 KB">
-<!ENTITY m4-dir "m4-&m4-version;">
-<!ENTITY m4-package "m4-&m4-version;.tar.bz2">
-
-<!ENTITY m4-compsize "3 MB">
-<!ENTITY m4-time "1 minute">
diff --git a/entities/make.ent b/entities/make.ent
new file mode 100644
index 000000000..d70319f6f
--- /dev/null
+++ b/entities/make.ent
@@ -0,0 +1,26 @@
+<!ENTITY c3-make SYSTEM "../chapter03/make.xml">
+
+<!ENTITY c5-make SYSTEM "../chapter05/make.xml">
+<!ENTITY c5-make-inst SYSTEM "../chapter05/make-inst.xml">
+
+<!ENTITY c6-make SYSTEM "../chapter06/make.xml">
+<!ENTITY c6-make-inst SYSTEM "../chapter06/make-inst.xml">
+<!ENTITY c6-make-exp SYSTEM "../chapter06/make-exp.xml">
+
+<!ENTITY aa-make SYSTEM "../appendixa/make.xml">
+<!ENTITY aa-make-desc SYSTEM "../appendixa/make-desc.xml">
+<!ENTITY aa-make-dep SYSTEM "../appendixa/make-dep.xml">
+<!ENTITY aa-make-down SYSTEM "../appendixa/make-down.xml">
+
+<!ENTITY make-version "3.79.1">
+<!ENTITY make-depversion "3.79.1">
+<!ENTITY make-contversion "3.79.1">
+<!ENTITY make-size "794 KB">
+<!ENTITY make-package "make-&make-version;.tar.bz2">
+<!ENTITY make-dir "make-&make-version;">
+
+<!ENTITY make-compsize-static "6 MB">
+<!ENTITY make-time-static "1 minute">
+
+<!ENTITY make-compsize "6 MB">
+<!ENTITY make-time "1 minute">
diff --git a/entities/make.xml b/entities/make.xml
deleted file mode 100644
index d70319f6f..000000000
--- a/entities/make.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!ENTITY c3-make SYSTEM "../chapter03/make.xml">
-
-<!ENTITY c5-make SYSTEM "../chapter05/make.xml">
-<!ENTITY c5-make-inst SYSTEM "../chapter05/make-inst.xml">
-
-<!ENTITY c6-make SYSTEM "../chapter06/make.xml">
-<!ENTITY c6-make-inst SYSTEM "../chapter06/make-inst.xml">
-<!ENTITY c6-make-exp SYSTEM "../chapter06/make-exp.xml">
-
-<!ENTITY aa-make SYSTEM "../appendixa/make.xml">
-<!ENTITY aa-make-desc SYSTEM "../appendixa/make-desc.xml">
-<!ENTITY aa-make-dep SYSTEM "../appendixa/make-dep.xml">
-<!ENTITY aa-make-down SYSTEM "../appendixa/make-down.xml">
-
-<!ENTITY make-version "3.79.1">
-<!ENTITY make-depversion "3.79.1">
-<!ENTITY make-contversion "3.79.1">
-<!ENTITY make-size "794 KB">
-<!ENTITY make-package "make-&make-version;.tar.bz2">
-<!ENTITY make-dir "make-&make-version;">
-
-<!ENTITY make-compsize-static "6 MB">
-<!ENTITY make-time-static "1 minute">
-
-<!ENTITY make-compsize "6 MB">
-<!ENTITY make-time "1 minute">
diff --git a/entities/makedev.ent b/entities/makedev.ent
new file mode 100644
index 000000000..7bcf1ec00
--- /dev/null
+++ b/entities/makedev.ent
@@ -0,0 +1,19 @@
+<!ENTITY c3-makedev SYSTEM "../chapter03/makedev.xml">
+
+<!ENTITY c6-makedev SYSTEM "../chapter06/makedev.xml">
+<!ENTITY c6-makedev-inst SYSTEM "../chapter06/makedev-inst.xml">
+<!ENTITY c6-makedev-exp SYSTEM "../chapter06/makedev-exp.xml">
+
+<!ENTITY aa-makedev SYSTEM "../appendixa/makedev.xml">
+<!ENTITY aa-makedev-desc SYSTEM "../appendixa/makedev-desc.xml">
+<!ENTITY aa-makedev-dep SYSTEM "../appendixa/makedev-dep.xml">
+<!ENTITY aa-makedev-down SYSTEM "../appendixa/makedev-down.xml">
+
+<!ENTITY makedev-version "1.4">
+<!ENTITY makedev-depversion "1.4">
+<!ENTITY makedev-contversion "1.4">
+<!ENTITY makedev-size "7 KB">
+<!ENTITY makedev-package "MAKEDEV-&makedev-version;.tar.bz2">
+
+<!ENTITY makedev-compsize "57 KB">
+<!ENTITY makedev-time "1 minute">
diff --git a/entities/makedev.xml b/entities/makedev.xml
deleted file mode 100644
index 7bcf1ec00..000000000
--- a/entities/makedev.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY c3-makedev SYSTEM "../chapter03/makedev.xml">
-
-<!ENTITY c6-makedev SYSTEM "../chapter06/makedev.xml">
-<!ENTITY c6-makedev-inst SYSTEM "../chapter06/makedev-inst.xml">
-<!ENTITY c6-makedev-exp SYSTEM "../chapter06/makedev-exp.xml">
-
-<!ENTITY aa-makedev SYSTEM "../appendixa/makedev.xml">
-<!ENTITY aa-makedev-desc SYSTEM "../appendixa/makedev-desc.xml">
-<!ENTITY aa-makedev-dep SYSTEM "../appendixa/makedev-dep.xml">
-<!ENTITY aa-makedev-down SYSTEM "../appendixa/makedev-down.xml">
-
-<!ENTITY makedev-version "1.4">
-<!ENTITY makedev-depversion "1.4">
-<!ENTITY makedev-contversion "1.4">
-<!ENTITY makedev-size "7 KB">
-<!ENTITY makedev-package "MAKEDEV-&makedev-version;.tar.bz2">
-
-<!ENTITY makedev-compsize "57 KB">
-<!ENTITY makedev-time "1 minute">
diff --git a/entities/man.ent b/entities/man.ent
new file mode 100644
index 000000000..b26af9d67
--- /dev/null
+++ b/entities/man.ent
@@ -0,0 +1,19 @@
+<!ENTITY c3-man SYSTEM "../chapter03/man.xml">
+
+<!ENTITY c6-man SYSTEM "../chapter06/man.xml">
+<!ENTITY c6-man-inst SYSTEM "../chapter06/man-inst.xml">
+
+<!ENTITY aa-man SYSTEM "../appendixa/man.xml">
+<!ENTITY aa-man-desc SYSTEM "../appendixa/man-desc.xml">
+<!ENTITY aa-man-dep SYSTEM "../appendixa/man-dep.xml">
+<!ENTITY aa-man-down SYSTEM "../appendixa/man-down.xml">
+
+<!ENTITY man-version "1.5j">
+<!ENTITY man-depversion "1.5i2">
+<!ENTITY man-contversion "1.5j">
+<!ENTITY man-size "167 KB">
+<!ENTITY man-dir "man-&man-version;">
+<!ENTITY man-package "man-&man-version;.tar.bz2">
+
+<!ENTITY man-compsize "1 MB">
+<!ENTITY man-time "1 minute">
diff --git a/entities/man.xml b/entities/man.xml
deleted file mode 100644
index b26af9d67..000000000
--- a/entities/man.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY c3-man SYSTEM "../chapter03/man.xml">
-
-<!ENTITY c6-man SYSTEM "../chapter06/man.xml">
-<!ENTITY c6-man-inst SYSTEM "../chapter06/man-inst.xml">
-
-<!ENTITY aa-man SYSTEM "../appendixa/man.xml">
-<!ENTITY aa-man-desc SYSTEM "../appendixa/man-desc.xml">
-<!ENTITY aa-man-dep SYSTEM "../appendixa/man-dep.xml">
-<!ENTITY aa-man-down SYSTEM "../appendixa/man-down.xml">
-
-<!ENTITY man-version "1.5j">
-<!ENTITY man-depversion "1.5i2">
-<!ENTITY man-contversion "1.5j">
-<!ENTITY man-size "167 KB">
-<!ENTITY man-dir "man-&man-version;">
-<!ENTITY man-package "man-&man-version;.tar.bz2">
-
-<!ENTITY man-compsize "1 MB">
-<!ENTITY man-time "1 minute">
diff --git a/entities/manpages.ent b/entities/manpages.ent
new file mode 100644
index 000000000..79467e6d7
--- /dev/null
+++ b/entities/manpages.ent
@@ -0,0 +1,19 @@
+<!ENTITY c3-manpages SYSTEM "../chapter03/manpages.xml">
+
+<!ENTITY c6-manpages SYSTEM "../chapter06/manpages.xml">
+<!ENTITY c6-manpages-inst SYSTEM "../chapter06/manpages-inst.xml">
+
+<!ENTITY aa-manpages SYSTEM "../appendixa/manpages.xml">
+<!ENTITY aa-manpages-desc SYSTEM "../appendixa/manpages-desc.xml">
+<!ENTITY aa-manpages-dep SYSTEM "../appendixa/manpages-dep.xml">
+<!ENTITY aa-manpages-down SYSTEM "../appendixa/manpages-down.xml">
+
+<!ENTITY man-pages-version "1.48">
+<!ENTITY man-pages-depversion "1.47">
+<!ENTITY man-pages-contversion "1.47">
+<!ENTITY man-pages-size "537 KB">
+<!ENTITY man-pages-dir "man-pages-&man-pages-version;">
+<!ENTITY man-pages-package "man-pages-&man-pages-version;.tar.bz2">
+
+<!ENTITY man-pages-compsize "5 MB">
+<!ENTITY man-pages-time "1 minute">
diff --git a/entities/manpages.xml b/entities/manpages.xml
deleted file mode 100644
index 79467e6d7..000000000
--- a/entities/manpages.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY c3-manpages SYSTEM "../chapter03/manpages.xml">
-
-<!ENTITY c6-manpages SYSTEM "../chapter06/manpages.xml">
-<!ENTITY c6-manpages-inst SYSTEM "../chapter06/manpages-inst.xml">
-
-<!ENTITY aa-manpages SYSTEM "../appendixa/manpages.xml">
-<!ENTITY aa-manpages-desc SYSTEM "../appendixa/manpages-desc.xml">
-<!ENTITY aa-manpages-dep SYSTEM "../appendixa/manpages-dep.xml">
-<!ENTITY aa-manpages-down SYSTEM "../appendixa/manpages-down.xml">
-
-<!ENTITY man-pages-version "1.48">
-<!ENTITY man-pages-depversion "1.47">
-<!ENTITY man-pages-contversion "1.47">
-<!ENTITY man-pages-size "537 KB">
-<!ENTITY man-pages-dir "man-pages-&man-pages-version;">
-<!ENTITY man-pages-package "man-pages-&man-pages-version;.tar.bz2">
-
-<!ENTITY man-pages-compsize "5 MB">
-<!ENTITY man-pages-time "1 minute">
diff --git a/entities/modutils.ent b/entities/modutils.ent
new file mode 100644
index 000000000..9674a05bc
--- /dev/null
+++ b/entities/modutils.ent
@@ -0,0 +1,19 @@
+<!ENTITY c3-modutils SYSTEM "../chapter03/modutils.xml">
+
+<!ENTITY c6-modutils SYSTEM "../chapter06/modutils.xml">
+<!ENTITY c6-modutils-inst SYSTEM "../chapter06/modutils-inst.xml">
+
+<!ENTITY aa-modutils SYSTEM "../appendixa/modutils.xml">
+<!ENTITY aa-modutils-desc SYSTEM "../appendixa/modutils-desc.xml">
+<!ENTITY aa-modutils-dep SYSTEM "../appendixa/modutils-dep.xml">
+<!ENTITY aa-modutils-down SYSTEM "../appendixa/modutils-down.xml">
+
+<!ENTITY modutils-version "2.4.15">
+<!ENTITY modutils-depversion "2.4.12">
+<!ENTITY modutils-contversion "2.4.12">
+<!ENTITY modutils-size "211 KB">
+<!ENTITY modutils-dir "modutils-&modutils-version;">
+<!ENTITY modutils-package "modutils-&modutils-version;.tar.bz2">
+
+<!ENTITY modutils-compsize "2 MB">
+<!ENTITY modutils-time "1 minute">
diff --git a/entities/modutils.xml b/entities/modutils.xml
deleted file mode 100644
index 9674a05bc..000000000
--- a/entities/modutils.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY c3-modutils SYSTEM "../chapter03/modutils.xml">
-
-<!ENTITY c6-modutils SYSTEM "../chapter06/modutils.xml">
-<!ENTITY c6-modutils-inst SYSTEM "../chapter06/modutils-inst.xml">
-
-<!ENTITY aa-modutils SYSTEM "../appendixa/modutils.xml">
-<!ENTITY aa-modutils-desc SYSTEM "../appendixa/modutils-desc.xml">
-<!ENTITY aa-modutils-dep SYSTEM "../appendixa/modutils-dep.xml">
-<!ENTITY aa-modutils-down SYSTEM "../appendixa/modutils-down.xml">
-
-<!ENTITY modutils-version "2.4.15">
-<!ENTITY modutils-depversion "2.4.12">
-<!ENTITY modutils-contversion "2.4.12">
-<!ENTITY modutils-size "211 KB">
-<!ENTITY modutils-dir "modutils-&modutils-version;">
-<!ENTITY modutils-package "modutils-&modutils-version;.tar.bz2">
-
-<!ENTITY modutils-compsize "2 MB">
-<!ENTITY modutils-time "1 minute">
diff --git a/entities/ncurses.ent b/entities/ncurses.ent
new file mode 100644
index 000000000..bceb52b54
--- /dev/null
+++ b/entities/ncurses.ent
@@ -0,0 +1,20 @@
+<!ENTITY c3-ncurses SYSTEM "../chapter03/ncurses.xml">
+
+<!ENTITY c6-ncurses SYSTEM "../chapter06/ncurses.xml">
+<!ENTITY c6-ncurses-inst SYSTEM "../chapter06/ncurses-inst.xml">
+<!ENTITY c6-ncurses-exp SYSTEM "../chapter06/ncurses-exp.xml">
+
+<!ENTITY aa-ncurses SYSTEM "../appendixa/ncurses.xml">
+<!ENTITY aa-ncurses-desc SYSTEM "../appendixa/ncurses-desc.xml">
+<!ENTITY aa-ncurses-dep SYSTEM "../appendixa/ncurses-dep.xml">
+<!ENTITY aa-ncurses-down SYSTEM "../appendixa/ncurses-down.xml">
+
+<!ENTITY ncurses-version "5.2">
+<!ENTITY ncurses-depversion "5.2">
+<!ENTITY ncurses-contversion "5.2">
+<!ENTITY ncurses-size "1,308 KB">
+<!ENTITY ncurses-dir "ncurses-&ncurses-version;">
+<!ENTITY ncurses-package "ncurses-&ncurses-version;.tar.bz2">
+
+<!ENTITY ncurses-compsize "29 MB">
+<!ENTITY ncurses-time "6 minutes">
diff --git a/entities/ncurses.xml b/entities/ncurses.xml
deleted file mode 100644
index bceb52b54..000000000
--- a/entities/ncurses.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!ENTITY c3-ncurses SYSTEM "../chapter03/ncurses.xml">
-
-<!ENTITY c6-ncurses SYSTEM "../chapter06/ncurses.xml">
-<!ENTITY c6-ncurses-inst SYSTEM "../chapter06/ncurses-inst.xml">
-<!ENTITY c6-ncurses-exp SYSTEM "../chapter06/ncurses-exp.xml">
-
-<!ENTITY aa-ncurses SYSTEM "../appendixa/ncurses.xml">
-<!ENTITY aa-ncurses-desc SYSTEM "../appendixa/ncurses-desc.xml">
-<!ENTITY aa-ncurses-dep SYSTEM "../appendixa/ncurses-dep.xml">
-<!ENTITY aa-ncurses-down SYSTEM "../appendixa/ncurses-down.xml">
-
-<!ENTITY ncurses-version "5.2">
-<!ENTITY ncurses-depversion "5.2">
-<!ENTITY ncurses-contversion "5.2">
-<!ENTITY ncurses-size "1,308 KB">
-<!ENTITY ncurses-dir "ncurses-&ncurses-version;">
-<!ENTITY ncurses-package "ncurses-&ncurses-version;.tar.bz2">
-
-<!ENTITY ncurses-compsize "29 MB">
-<!ENTITY ncurses-time "6 minutes">
diff --git a/entities/netkitbase.ent b/entities/netkitbase.ent
new file mode 100644
index 000000000..f93fc877c
--- /dev/null
+++ b/entities/netkitbase.ent
@@ -0,0 +1,19 @@
+<!ENTITY c3-netkitbase SYSTEM "../chapter03/netkitbase.xml">
+
+<!ENTITY c6-netkitbase SYSTEM "../chapter06/netkitbase.xml">
+<!ENTITY c6-netkitbase-inst SYSTEM "../chapter06/netkitbase-inst.xml">
+
+<!ENTITY aa-netkitbase SYSTEM "../appendixa/netkitbase.xml">
+<!ENTITY aa-netkitbase-desc SYSTEM "../appendixa/netkitbase-desc.xml">
+<!ENTITY aa-netkitbase-dep SYSTEM "../appendixa/netkitbase-dep.xml">
+<!ENTITY aa-netkitbase-down SYSTEM "../appendixa/netkitbase-down.xml">
+
+<!ENTITY netkit-base-version "0.17">
+<!ENTITY netkit-base-depversion "0.17">
+<!ENTITY netkit-base-contversion "0.17">
+<!ENTITY netkit-base-size "49 KB">
+<!ENTITY netkit-base-dir "netkit-base-&net-kit-version;">
+<!ENTITY netkit-base-package "netkit-base-&net-kit-version;.tar.bz2">
+
+<!ENTITY netkit-base-compsize "1 MB">
+<!ENTITY netkit-base-time "1 minute">
diff --git a/entities/netkitbase.xml b/entities/netkitbase.xml
deleted file mode 100644
index f93fc877c..000000000
--- a/entities/netkitbase.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY c3-netkitbase SYSTEM "../chapter03/netkitbase.xml">
-
-<!ENTITY c6-netkitbase SYSTEM "../chapter06/netkitbase.xml">
-<!ENTITY c6-netkitbase-inst SYSTEM "../chapter06/netkitbase-inst.xml">
-
-<!ENTITY aa-netkitbase SYSTEM "../appendixa/netkitbase.xml">
-<!ENTITY aa-netkitbase-desc SYSTEM "../appendixa/netkitbase-desc.xml">
-<!ENTITY aa-netkitbase-dep SYSTEM "../appendixa/netkitbase-dep.xml">
-<!ENTITY aa-netkitbase-down SYSTEM "../appendixa/netkitbase-down.xml">
-
-<!ENTITY netkit-base-version "0.17">
-<!ENTITY netkit-base-depversion "0.17">
-<!ENTITY netkit-base-contversion "0.17">
-<!ENTITY netkit-base-size "49 KB">
-<!ENTITY netkit-base-dir "netkit-base-&net-kit-version;">
-<!ENTITY netkit-base-package "netkit-base-&net-kit-version;.tar.bz2">
-
-<!ENTITY netkit-base-compsize "1 MB">
-<!ENTITY netkit-base-time "1 minute">
diff --git a/entities/nettools.ent b/entities/nettools.ent
new file mode 100644
index 000000000..d3b0396d7
--- /dev/null
+++ b/entities/nettools.ent
@@ -0,0 +1,20 @@
+<!ENTITY c3-nettools SYSTEM "../chapter03/nettools.xml">
+
+<!ENTITY c6-nettools SYSTEM "../chapter06/nettools.xml">
+<!ENTITY c6-nettools-inst SYSTEM "../chapter06/nettools-inst.xml">
+<!ENTITY c6-nettools-exp SYSTEM "../chapter06/nettools-exp.xml">
+
+<!ENTITY aa-nettools SYSTEM "../appendixa/nettools.xml">
+<!ENTITY aa-nettools-desc SYSTEM "../appendixa/nettools-desc.xml">
+<!ENTITY aa-nettools-dep SYSTEM "../appendixa/nettools-dep.xml">
+<!ENTITY aa-nettools-down SYSTEM "../appendixa/nettools-down.xml">
+
+<!ENTITY net-tools-version "1.60">
+<!ENTITY net-tools-depversion "1.60">
+<!ENTITY net-tools-contversion "1.60">
+<!ENTITY net-tools-size "194 KB">
+<!ENTITY net-tools-dir "net-tools-&net-tools-version;">
+<!ENTITY net-tools-package "net-tools-&net-tools-version;.tar.bz2">
+
+<!ENTITY net-tools-compsize "5 MB">
+<!ENTITY net-tools-time "1 minute">
diff --git a/entities/nettools.xml b/entities/nettools.xml
deleted file mode 100644
index d3b0396d7..000000000
--- a/entities/nettools.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!ENTITY c3-nettools SYSTEM "../chapter03/nettools.xml">
-
-<!ENTITY c6-nettools SYSTEM "../chapter06/nettools.xml">
-<!ENTITY c6-nettools-inst SYSTEM "../chapter06/nettools-inst.xml">
-<!ENTITY c6-nettools-exp SYSTEM "../chapter06/nettools-exp.xml">
-
-<!ENTITY aa-nettools SYSTEM "../appendixa/nettools.xml">
-<!ENTITY aa-nettools-desc SYSTEM "../appendixa/nettools-desc.xml">
-<!ENTITY aa-nettools-dep SYSTEM "../appendixa/nettools-dep.xml">
-<!ENTITY aa-nettools-down SYSTEM "../appendixa/nettools-down.xml">
-
-<!ENTITY net-tools-version "1.60">
-<!ENTITY net-tools-depversion "1.60">
-<!ENTITY net-tools-contversion "1.60">
-<!ENTITY net-tools-size "194 KB">
-<!ENTITY net-tools-dir "net-tools-&net-tools-version;">
-<!ENTITY net-tools-package "net-tools-&net-tools-version;.tar.bz2">
-
-<!ENTITY net-tools-compsize "5 MB">
-<!ENTITY net-tools-time "1 minute">
diff --git a/entities/patch.ent b/entities/patch.ent
new file mode 100644
index 000000000..86293832b
--- /dev/null
+++ b/entities/patch.ent
@@ -0,0 +1,26 @@
+<!ENTITY c3-patch SYSTEM "../chapter03/patch.xml">
+
+<!ENTITY c5-patch SYSTEM "../chapter05/patch.xml">
+<!ENTITY c5-patch-inst SYSTEM "../chapter05/patch-inst.xml">
+<!ENTITY c5-patch-exp SYSTEM "../chapter05/patch-exp.xml">
+
+<!ENTITY c6-patch SYSTEM "../chapter06/patch.xml">
+<!ENTITY c6-patch-inst SYSTEM "../chapter06/patch-inst.xml">
+
+<!ENTITY aa-patch SYSTEM "../appendixa/patch.xml">
+<!ENTITY aa-patch-desc SYSTEM "../appendixa/patch-desc.xml">
+<!ENTITY aa-patch-dep SYSTEM "../appendixa/patch-dep.xml">
+<!ENTITY aa-patch-down SYSTEM "../appendixa/patch-down.xml">
+
+<!ENTITY patch-version "2.5.4">
+<!ENTITY patch-depversion "2.5.4">
+<!ENTITY patch-contversion "2.5.4">
+<!ENTITY patch-size "149 KB">
+<!ENTITY patch-package "patch-&patch-version;.tar.bz2">
+<!ENTITY patch-dir "patch-&patch-version;">
+
+<!ENTITY patch-compsize-static "2 MB">
+<!ENTITY patch-time-static "1 minute">
+
+<!ENTITY patch-compsize "2 MB">
+<!ENTITY patch-time "1 minute">
diff --git a/entities/patch.xml b/entities/patch.xml
deleted file mode 100644
index 86293832b..000000000
--- a/entities/patch.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!ENTITY c3-patch SYSTEM "../chapter03/patch.xml">
-
-<!ENTITY c5-patch SYSTEM "../chapter05/patch.xml">
-<!ENTITY c5-patch-inst SYSTEM "../chapter05/patch-inst.xml">
-<!ENTITY c5-patch-exp SYSTEM "../chapter05/patch-exp.xml">
-
-<!ENTITY c6-patch SYSTEM "../chapter06/patch.xml">
-<!ENTITY c6-patch-inst SYSTEM "../chapter06/patch-inst.xml">
-
-<!ENTITY aa-patch SYSTEM "../appendixa/patch.xml">
-<!ENTITY aa-patch-desc SYSTEM "../appendixa/patch-desc.xml">
-<!ENTITY aa-patch-dep SYSTEM "../appendixa/patch-dep.xml">
-<!ENTITY aa-patch-down SYSTEM "../appendixa/patch-down.xml">
-
-<!ENTITY patch-version "2.5.4">
-<!ENTITY patch-depversion "2.5.4">
-<!ENTITY patch-contversion "2.5.4">
-<!ENTITY patch-size "149 KB">
-<!ENTITY patch-package "patch-&patch-version;.tar.bz2">
-<!ENTITY patch-dir "patch-&patch-version;">
-
-<!ENTITY patch-compsize-static "2 MB">
-<!ENTITY patch-time-static "1 minute">
-
-<!ENTITY patch-compsize "2 MB">
-<!ENTITY patch-time "1 minute">
diff --git a/entities/perl.ent b/entities/perl.ent
new file mode 100644
index 000000000..2f4335058
--- /dev/null
+++ b/entities/perl.ent
@@ -0,0 +1,19 @@
+<!ENTITY c3-perl SYSTEM "../chapter03/perl.xml">
+
+<!ENTITY c6-perl SYSTEM "../chapter06/perl.xml">
+<!ENTITY c6-perl-inst SYSTEM "../chapter06/perl-inst.xml">
+
+<!ENTITY aa-perl SYSTEM "../appendixa/perl.xml">
+<!ENTITY aa-perl-desc SYSTEM "../appendixa/perl-desc.xml">
+<!ENTITY aa-perl-dep SYSTEM "../appendixa/perl-dep.xml">
+<!ENTITY aa-perl-down SYSTEM "../appendixa/perl-down.xml">
+
+<!ENTITY perl-version "5.6.1">
+<!ENTITY perl-depversion "5.6.1">
+<!ENTITY perl-contversion "5.6.1">
+<!ENTITY perl-size "4,750 KB">
+<!ENTITY perl-dir "perl-&perl-version;">
+<!ENTITY perl-package "perl-&perl-version;.tar.bz2">
+
+<!ENTITY perl-compsize "35 MB">
+<!ENTITY perl-time "6 minutes">
diff --git a/entities/perl.xml b/entities/perl.xml
deleted file mode 100644
index 2f4335058..000000000
--- a/entities/perl.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!ENTITY c3-perl SYSTEM "../chapter03/perl.xml">
-
-<!ENTITY c6-perl SYSTEM "../chapter06/perl.xml">
-<!ENTITY c6-perl-inst SYSTEM "../chapter06/perl-inst.xml">
-
-<!ENTITY aa-perl SYSTEM "../appendixa/perl.xml">
-<!ENTITY aa-perl-desc SYSTEM "../appendixa/perl-desc.xml">
-<!ENTITY aa-perl-dep SYSTEM "../appendixa/perl-dep.xml">
-<!ENTITY aa-perl-down SYSTEM "../appendixa/perl-down.xml">
-
-<!ENTITY perl-version "5.6.1">
-<!ENTITY perl-depversion "5.6.1">
-<!ENTITY perl-contversion "5.6.1">
-<!ENTITY perl-size "4,750 KB">
-<!ENTITY perl-dir "perl-&perl-version;">
-<!ENTITY perl-package "perl-&perl-version;.tar.bz2">
-
-<!ENTITY perl-compsize "35 MB">
-<!ENTITY perl-time "6 minutes">
diff --git a/entities/procinfo.ent b/entities/procinfo.ent
new file mode 100644
index 000000000..c1b1e8d0f
--- /dev/null
+++ b/entities/procinfo.ent
@@ -0,0 +1,20 @@
+<!ENTITY c3-procinfo SYSTEM "../chapter03/procinfo.xml">
+
+<!ENTITY c6-procinfo SYSTEM "../chapter06/procinfo.xml">
+<!ENTITY c6-procinfo-exp SYSTEM "../chapter06/procinfo-exp.xml">
+<!ENTITY c6-procinfo-inst SYSTEM "../chapter06/procinfo-inst.xml">
+
+<!ENTITY aa-procinfo SYSTEM "../appendixa/procinfo.xml">
+<!ENTITY aa-procinfo-desc SYSTEM "../appendixa/procinfo-desc.xml">
+<!ENTITY aa-procinfo-dep SYSTEM "../appendixa/procinfo-dep.xml">
+<!ENTITY aa-procinfo-down SYSTEM "../appendixa/procinfo-down.xml">
+
+<!ENTITY procinfo-version "18">
+<!ENTITY procinfo-depversion "18">
+<!ENTITY procinfo-contversion "18">
+<!ENTITY procinfo-size "22 KB">
+<!ENTITY procinfo-dir "procinfo-&procinfo-version;">
+<!ENTITY procinfo-package "procinfo-&procinfo-version;.tar.bz2">
+
+<!ENTITY procinfo-compsize "170 KB">
+<!ENTITY procinfo-time "1 minute">
diff --git a/entities/procinfo.xml b/entities/procinfo.xml
deleted file mode 100644
index c1b1e8d0f..000000000
--- a/entities/procinfo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!ENTITY c3-procinfo SYSTEM "../chapter03/procinfo.xml">
-
-<!ENTITY c6-procinfo SYSTEM "../chapter06/procinfo.xml">
-<!ENTITY c6-procinfo-exp SYSTEM "../chapter06/procinfo-exp.xml">
-<!ENTITY c6-procinfo-inst SYSTEM "../chapter06/procinfo-inst.xml">
-
-<!ENTITY aa-procinfo SYSTEM "../appendixa/procinfo.xml">
-<!ENTITY aa-procinfo-desc SYSTEM "../appendixa/procinfo-desc.xml">
-<!ENTITY aa-procinfo-dep SYSTEM "../appendixa/procinfo-dep.xml">
-<!ENTITY aa-procinfo-down SYSTEM "../appendixa/procinfo-down.xml">
-
-<!ENTITY procinfo-version "18">
-<!ENTITY procinfo-depversion "18">
-<!ENTITY procinfo-contversion "18">
-<!ENTITY procinfo-size "22 KB">
-<!ENTITY procinfo-dir "procinfo-&procinfo-version;">
-<!ENTITY procinfo-package "procinfo-&procinfo-version;.tar.bz2">
-
-<!ENTITY procinfo-compsize "170 KB">
-<!ENTITY procinfo-time "1 minute">
diff --git a/entities/procps.ent b/entities/procps.ent
new file mode 100644
index 000000000..0b97133d4
--- /dev/null
+++ b/entities/procps.ent
@@ -0,0 +1,20 @@
+<!ENTITY c3-procps SYSTEM "../chapter03/procps.xml">
+
+<!ENTITY c6-procps SYSTEM "../chapter06/procps.xml">
+<!ENTITY c6-procps-inst SYSTEM "../chapter06/procps-inst.xml">
+<!ENTITY c6-procps-exp SYSTEM "../chapter06/procps-exp.xml">
+
+<!ENTITY aa-procps SYSTEM "../appendixa/procps.xml">
+<!ENTITY aa-procps-desc SYSTEM "../appendixa/procps-desc.xml">
+<!ENTITY aa-procps-dep SYSTEM "../appendixa/procps-dep.xml">
+<!ENTITY aa-procps-down SYSTEM "../appendixa/procps-down.xml">
+
+<!ENTITY procps-version "2.0.7">
+<!ENTITY procps-depversion "2.0.7">
+<!ENTITY procps-contversion "2.0.7">
+<!ENTITY procps-size "153 KB">
+<!ENTITY procps-dir "procps-&procps-version;">
+<!ENTITY procps-package "procps-&procps-version;.tar.bz2">
+
+<!ENTITY procps-compsize "2 MB">
+<!ENTITY procps-time "1 minute">
diff --git a/entities/procps.xml b/entities/procps.xml
deleted file mode 100644
index 0b97133d4..000000000
--- a/entities/procps.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!ENTITY c3-procps SYSTEM "../chapter03/procps.xml">
-
-<!ENTITY c6-procps SYSTEM "../chapter06/procps.xml">
-<!ENTITY c6-procps-inst SYSTEM "../chapter06/procps-inst.xml">
-<!ENTITY c6-procps-exp SYSTEM "../chapter06/procps-exp.xml">
-
-<!ENTITY aa-procps SYSTEM "../appendixa/procps.xml">
-<!ENTITY aa-procps-desc SYSTEM "../appendixa/procps-desc.xml">
-<!ENTITY aa-procps-dep SYSTEM "../appendixa/procps-dep.xml">
-<!ENTITY aa-procps-down SYSTEM "../appendixa/procps-down.xml">
-
-<!ENTITY procps-version "2.0.7">
-<!ENTITY procps-depversion "2.0.7">
-<!ENTITY procps-contversion "2.0.7">
-<!ENTITY procps-size "153 KB">
-<!ENTITY procps-dir "procps-&procps-version;">
-<!ENTITY procps-package "procps-&procps-version;.tar.bz2">
-
-<!ENTITY procps-compsize "2 MB">
-<!ENTITY procps-time "1 minute">
diff --git a/entities/psmisc.ent b/entities/psmisc.ent
new file mode 100644
index 000000000..1c5be78aa
--- /dev/null
+++ b/entities/psmisc.ent
@@ -0,0 +1,20 @@
+<!ENTITY c3-psmisc SYSTEM "../chapter03/psmisc.xml">
+
+<!ENTITY c6-psmisc SYSTEM "../chapter06/psmisc.xml">
+<!ENTITY c6-psmisc-inst SYSTEM "../chapter06/psmisc-inst.xml">
+<!ENTITY c6-psmisc-exp SYSTEM "../chapter06/psmisc-exp.xml">
+
+<!ENTITY aa-psmisc SYSTEM "../appendixa/psmisc.xml">
+<!ENTITY aa-psmisc-desc SYSTEM "../appendixa/psmisc-desc.xml">
+<!ENTITY aa-psmisc-dep SYSTEM "../appendixa/psmisc-dep.xml">
+<!ENTITY aa-psmisc-down SYSTEM "../appendixa/psmisc-down.xml">
+
+<!ENTITY psmisc-version "20.2">
+<!ENTITY psmisc-depversion "20.2">
+<!ENTITY psmisc-contversion "20.2">
+<!ENTITY psmisc-size "123 KB">
+<!ENTITY psmisc-dir "psmisc-&psmisc-version;">
+<!ENTITY psmisc-package "psmisc-&psmisc-version;.tar.bz2">
+
+<!ENTITY psmisc-compsize "500 KB">
+<!ENTITY psmisc-time "1 minute">
diff --git a/entities/psmisc.xml b/entities/psmisc.xml
deleted file mode 100644
index 1c5be78aa..000000000
--- a/entities/psmisc.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!ENTITY c3-psmisc SYSTEM "../chapter03/psmisc.xml">
-
-<!ENTITY c6-psmisc SYSTEM "../chapter06/psmisc.xml">
-<!ENTITY c6-psmisc-inst SYSTEM "../chapter06/psmisc-inst.xml">
-<!ENTITY c6-psmisc-exp SYSTEM "../chapter06/psmisc-exp.xml">
-
-<!ENTITY aa-psmisc SYSTEM "../appendixa/psmisc.xml">
-<!ENTITY aa-psmisc-desc SYSTEM "../appendixa/psmisc-desc.xml">
-<!ENTITY aa-psmisc-dep SYSTEM "../appendixa/psmisc-dep.xml">
-<!ENTITY aa-psmisc-down SYSTEM "../appendixa/psmisc-down.xml">
-
-<!ENTITY psmisc-version "20.2">
-<!ENTITY psmisc-depversion "20.2">
-<!ENTITY psmisc-contversion "20.2">
-<!ENTITY psmisc-size "123 KB">
-<!ENTITY psmisc-dir "psmisc-&psmisc-version;">
-<!ENTITY psmisc-package "psmisc-&psmisc-version;.tar.bz2">
-
-<!ENTITY psmisc-compsize "500 KB">
-<!ENTITY psmisc-time "1 minute">
diff --git a/entities/reiserfs.ent b/entities/reiserfs.ent
new file mode 100644
index 000000000..50125d78c
--- /dev/null
+++ b/entities/reiserfs.ent
@@ -0,0 +1,20 @@
+<!ENTITY c3-reiserfs SYSTEM "../chapter03/reiserfs.xml">
+
+<!ENTITY c6-reiserfs SYSTEM "../chapter06/reiserfs.xml">
+<!ENTITY c6-reiserfs-inst SYSTEM "../chapter06/reiserfs-inst.xml">
+<!ENTITY c6-reiserfs-exp SYSTEM "../chapter06/reiserfs-exp.xml">
+
+<!ENTITY aa-reiserfs SYSTEM "../appendixa/reiserfs.xml">
+<!ENTITY aa-reiserfs-desc SYSTEM "../appendixa/reiserfs-desc.xml">
+<!ENTITY aa-reiserfs-dep SYSTEM "../appendixa/reiserfs-dep.xml">
+<!ENTITY aa-reiserfs-down SYSTEM "../appendixa/reiserfs-down.xml">
+
+<!ENTITY reiserfs-version "3.x.1b">
+<!ENTITY reiserfs-depversion "3.x.0j">
+<!ENTITY reiserfs-contversion "3.x.0j">
+<!ENTITY reiserfs-size "243 KB">
+<!ENTITY reiserfs-dir "reiserfs-&reiserfs-version;">
+<!ENTITY reiserfs-package "reiserfs-&reiserfs-version;.tar.bz2">
+
+<!ENTITY reiserfs-compsize "7 MB">
+<!ENTITY reiserfs-time "1 minute">
diff --git a/entities/reiserfs.xml b/entities/reiserfs.xml
deleted file mode 100644
index 50125d78c..000000000
--- a/entities/reiserfs.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!ENTITY c3-reiserfs SYSTEM "../chapter03/reiserfs.xml">
-
-<!ENTITY c6-reiserfs SYSTEM "../chapter06/reiserfs.xml">
-<!ENTITY c6-reiserfs-inst SYSTEM "../chapter06/reiserfs-inst.xml">
-<!ENTITY c6-reiserfs-exp SYSTEM "../chapter06/reiserfs-exp.xml">
-
-<!ENTITY aa-reiserfs SYSTEM "../appendixa/reiserfs.xml">
-<!ENTITY aa-reiserfs-desc SYSTEM "../appendixa/reiserfs-desc.xml">
-<!ENTITY aa-reiserfs-dep SYSTEM "../appendixa/reiserfs-dep.xml">
-<!ENTITY aa-reiserfs-down SYSTEM "../appendixa/reiserfs-down.xml">
-
-<!ENTITY reiserfs-version "3.x.1b">
-<!ENTITY reiserfs-depversion "3.x.0j">
-<!ENTITY reiserfs-contversion "3.x.0j">
-<!ENTITY reiserfs-size "243 KB">
-<!ENTITY reiserfs-dir "reiserfs-&reiserfs-version;">
-<!ENTITY reiserfs-package "reiserfs-&reiserfs-version;.tar.bz2">
-
-<!ENTITY reiserfs-compsize "7 MB">
-<!ENTITY reiserfs-time "1 minute">
diff --git a/entities/sed.ent b/entities/sed.ent
new file mode 100644
index 000000000..114212cf6
--- /dev/null
+++ b/entities/sed.ent
@@ -0,0 +1,25 @@
+<!ENTITY c3-sed SYSTEM "../chapter03/sed.xml">
+
+<!ENTITY c5-sed SYSTEM "../chapter05/sed.xml">
+<!ENTITY c5-sed-inst SYSTEM "../chapter05/sed-inst.xml">
+
+<!ENTITY c6-sed SYSTEM "../chapter06/sed.xml">
+<!ENTITY c6-sed-inst SYSTEM "../chapter06/sed-inst.xml">
+
+<!ENTITY aa-sed SYSTEM "../appendixa/sed.xml">
+<!ENTITY aa-sed-desc SYSTEM "../appendixa/sed-desc.xml">
+<!ENTITY aa-sed-dep SYSTEM "../appendixa/sed-dep.xml">
+<!ENTITY aa-sed-down SYSTEM "../appendixa/sed-down.xml">
+
+<!ENTITY sed-version "3.02">
+<!ENTITY sed-depversion "3.02">
+<!ENTITY sed-contversion "3.02">
+<!ENTITY sed-size "221 KB">
+<!ENTITY sed-package "sed-&sed-version;.tar.bz2">
+<!ENTITY sed-dir "sed-&sed-version;">
+
+<!ENTITY sed-compsize-static "2 MB">
+<!ENTITY sed-time-static "1 minute">
+
+<!ENTITY sed-compsize "2 MB">
+<!ENTITY sed-time "1 minute">
diff --git a/entities/sed.xml b/entities/sed.xml
deleted file mode 100644
index 114212cf6..000000000
--- a/entities/sed.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!ENTITY c3-sed SYSTEM "../chapter03/sed.xml">
-
-<!ENTITY c5-sed SYSTEM "../chapter05/sed.xml">
-<!ENTITY c5-sed-inst SYSTEM "../chapter05/sed-inst.xml">
-
-<!ENTITY c6-sed SYSTEM "../chapter06/sed.xml">
-<!ENTITY c6-sed-inst SYSTEM "../chapter06/sed-inst.xml">
-
-<!ENTITY aa-sed SYSTEM "../appendixa/sed.xml">
-<!ENTITY aa-sed-desc SYSTEM "../appendixa/sed-desc.xml">
-<!ENTITY aa-sed-dep SYSTEM "../appendixa/sed-dep.xml">
-<!ENTITY aa-sed-down SYSTEM "../appendixa/sed-down.xml">
-
-<!ENTITY sed-version "3.02">
-<!ENTITY sed-depversion "3.02">
-<!ENTITY sed-contversion "3.02">
-<!ENTITY sed-size "221 KB">
-<!ENTITY sed-package "sed-&sed-version;.tar.bz2">
-<!ENTITY sed-dir "sed-&sed-version;">
-
-<!ENTITY sed-compsize-static "2 MB">
-<!ENTITY sed-time-static "1 minute">
-
-<!ENTITY sed-compsize "2 MB">
-<!ENTITY sed-time "1 minute">
diff --git a/entities/shadow.ent b/entities/shadow.ent
new file mode 100644
index 000000000..1e55ac409
--- /dev/null
+++ b/entities/shadow.ent
@@ -0,0 +1,22 @@
+<!ENTITY c3-shadowpwd SYSTEM "../chapter03/shadowpwd.xml">
+
+<!ENTITY c6-shadowpwd SYSTEM "../chapter06/shadowpwd.xml">
+<!ENTITY c6-shadowpwd-inst SYSTEM "../chapter06/shadowpwd-inst.xml">
+<!ENTITY c6-shadowpwd-exp SYSTEM "../chapter06/shadowpwd-exp.xml">
+<!ENTITY c6-cf-shadowpwd SYSTEM "../chapter06/config-shadowpwd.xml">
+
+<!ENTITY aa-shadowpwd SYSTEM "../appendixa/shadowpwd.xml">
+<!ENTITY aa-shadowpwd-desc SYSTEM "../appendixa/shadowpwd-desc.xml">
+<!ENTITY aa-shadowpwd-dep SYSTEM "../appendixa/shadowpwd-dep.xml">
+<!ENTITY aa-shadowpwd-down SYSTEM "../appendixa/shadowpwd-down.xml">
+
+<!ENTITY shadow-version "4.0.3">
+<!ENTITY shadow-depversion "20001016">
+<!ENTITY shadow-contversion "20001016">
+<!ENTITY shadow-size "760 KB">
+
+<!ENTITY shadow-dir "shadow-&shadow-version;">
+<!ENTITY shadow-package "shadow-&shadow-version;.tar.bz2">
+
+<!ENTITY shadow-compsize "6 MB">
+<!ENTITY shadow-time "3 minutes">
diff --git a/entities/shadow.xml b/entities/shadow.xml
deleted file mode 100644
index 1e55ac409..000000000
--- a/entities/shadow.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!ENTITY c3-shadowpwd SYSTEM "../chapter03/shadowpwd.xml">
-
-<!ENTITY c6-shadowpwd SYSTEM "../chapter06/shadowpwd.xml">
-<!ENTITY c6-shadowpwd-inst SYSTEM "../chapter06/shadowpwd-inst.xml">
-<!ENTITY c6-shadowpwd-exp SYSTEM "../chapter06/shadowpwd-exp.xml">
-<!ENTITY c6-cf-shadowpwd SYSTEM "../chapter06/config-shadowpwd.xml">
-
-<!ENTITY aa-shadowpwd SYSTEM "../appendixa/shadowpwd.xml">
-<!ENTITY aa-shadowpwd-desc SYSTEM "../appendixa/shadowpwd-desc.xml">
-<!ENTITY aa-shadowpwd-dep SYSTEM "../appendixa/shadowpwd-dep.xml">
-<!ENTITY aa-shadowpwd-down SYSTEM "../appendixa/shadowpwd-down.xml">
-
-<!ENTITY shadow-version "4.0.3">
-<!ENTITY shadow-depversion "20001016">
-<!ENTITY shadow-contversion "20001016">
-<!ENTITY shadow-size "760 KB">
-
-<!ENTITY shadow-dir "shadow-&shadow-version;">
-<!ENTITY shadow-package "shadow-&shadow-version;.tar.bz2">
-
-<!ENTITY shadow-compsize "6 MB">
-<!ENTITY shadow-time "3 minutes">
diff --git a/entities/shellutils.ent b/entities/shellutils.ent
new file mode 100644
index 000000000..675559275
--- /dev/null
+++ b/entities/shellutils.ent
@@ -0,0 +1,27 @@
+<!ENTITY c3-shellutils SYSTEM "../chapter03/shellutils.xml">
+<!ENTITY c3-shellutils-patch SYSTEM "../chapter03/shellutils-patch.xml">
+
+<!ENTITY c5-shellutils SYSTEM "../chapter05/shellutils.xml">
+<!ENTITY c5-shellutils-inst SYSTEM "../chapter05/shellutils-inst.xml">
+
+<!ENTITY c6-shellutils SYSTEM "../chapter06/shellutils.xml">
+<!ENTITY c6-shellutils-inst SYSTEM "../chapter06/shellutils-inst.xml">
+
+<!ENTITY aa-shellutils SYSTEM "../appendixa/shellutils.xml">
+<!ENTITY aa-shellutils-desc SYSTEM "../appendixa/shellutils-desc.xml">
+<!ENTITY aa-shellutils-dep SYSTEM "../appendixa/shellutils-dep.xml">
+<!ENTITY aa-shellutils-down SYSTEM "../appendixa/shellutils-down.xml">
+
+<!ENTITY sh-utils-version "2.0">
+<!ENTITY sh-utils-depversion "2.0">
+<!ENTITY sh-utils-contversion "2.0">
+<!ENTITY sh-utils-size "824 KB">
+<!ENTITY sh-utils-patch-size "1 KB">
+<!ENTITY sh-utils-package "sh-utils-&sh-utils-version;.tar.bz2">
+<!ENTITY sh-utils-dir "sh-utils-&sh-utils-version;">
+
+<!ENTITY sh-utils-compsize-static "23 MB">
+<!ENTITY sh-utils-time-static "2 minutes">
+
+<!ENTITY sh-utils-compsize "11 MB">
+<!ENTITY sh-utils-time "2 minutes">
diff --git a/entities/shellutils.xml b/entities/shellutils.xml
deleted file mode 100644
index 675559275..000000000
--- a/entities/shellutils.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!ENTITY c3-shellutils SYSTEM "../chapter03/shellutils.xml">
-<!ENTITY c3-shellutils-patch SYSTEM "../chapter03/shellutils-patch.xml">
-
-<!ENTITY c5-shellutils SYSTEM "../chapter05/shellutils.xml">
-<!ENTITY c5-shellutils-inst SYSTEM "../chapter05/shellutils-inst.xml">
-
-<!ENTITY c6-shellutils SYSTEM "../chapter06/shellutils.xml">
-<!ENTITY c6-shellutils-inst SYSTEM "../chapter06/shellutils-inst.xml">
-
-<!ENTITY aa-shellutils SYSTEM "../appendixa/shellutils.xml">
-<!ENTITY aa-shellutils-desc SYSTEM "../appendixa/shellutils-desc.xml">
-<!ENTITY aa-shellutils-dep SYSTEM "../appendixa/shellutils-dep.xml">
-<!ENTITY aa-shellutils-down SYSTEM "../appendixa/shellutils-down.xml">
-
-<!ENTITY sh-utils-version "2.0">
-<!ENTITY sh-utils-depversion "2.0">
-<!ENTITY sh-utils-contversion "2.0">
-<!ENTITY sh-utils-size "824 KB">
-<!ENTITY sh-utils-patch-size "1 KB">
-<!ENTITY sh-utils-package "sh-utils-&sh-utils-version;.tar.bz2">
-<!ENTITY sh-utils-dir "sh-utils-&sh-utils-version;">
-
-<!ENTITY sh-utils-compsize-static "23 MB">
-<!ENTITY sh-utils-time-static "2 minutes">
-
-<!ENTITY sh-utils-compsize "11 MB">
-<!ENTITY sh-utils-time "2 minutes">
diff --git a/entities/sysklogd.ent b/entities/sysklogd.ent
new file mode 100644
index 000000000..49f8a2a40
--- /dev/null
+++ b/entities/sysklogd.ent
@@ -0,0 +1,22 @@
+<!ENTITY c3-sysklogd SYSTEM "../chapter03/sysklogd.xml">
+
+<!ENTITY c6-sysklogd SYSTEM "../chapter06/sysklogd.xml">
+<!ENTITY c6-sysklogd-inst SYSTEM "../chapter06/sysklogd-inst.xml">
+<!ENTITY c6-cf-sysklogd SYSTEM "../chapter06/config-sysklogd.xml">
+
+<!ENTITY c7-sysklogd SYSTEM "../chapter07/sysklogd.xml">
+
+<!ENTITY aa-sysklogd SYSTEM "../appendixa/sysklogd.xml">
+<!ENTITY aa-sysklogd-desc SYSTEM "../appendixa/sysklogd-desc.xml">
+<!ENTITY aa-sysklogd-dep SYSTEM "../appendixa/sysklogd-dep.xml">
+<!ENTITY aa-sysklogd-down SYSTEM "../appendixa/sysklogd-down.xml">
+
+<!ENTITY sysklogd-version "1.4.1">
+<!ENTITY sysklogd-depversion "1.4.1">
+<!ENTITY sysklogd-contversion "1.4.1">
+<!ENTITY sysklogd-size "67 KB">
+<!ENTITY sysklogd-dir "sysklogd-&sysklogd-version;">
+<!ENTITY sysklogd-package "sysklogd-&sysklogd-version;.tar.bz2">
+
+<!ENTITY sysklogd-compsize "710 KB">
+<!ENTITY sysklogd-time "1 minute">
diff --git a/entities/sysklogd.xml b/entities/sysklogd.xml
deleted file mode 100644
index 49f8a2a40..000000000
--- a/entities/sysklogd.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!ENTITY c3-sysklogd SYSTEM "../chapter03/sysklogd.xml">
-
-<!ENTITY c6-sysklogd SYSTEM "../chapter06/sysklogd.xml">
-<!ENTITY c6-sysklogd-inst SYSTEM "../chapter06/sysklogd-inst.xml">
-<!ENTITY c6-cf-sysklogd SYSTEM "../chapter06/config-sysklogd.xml">
-
-<!ENTITY c7-sysklogd SYSTEM "../chapter07/sysklogd.xml">
-
-<!ENTITY aa-sysklogd SYSTEM "../appendixa/sysklogd.xml">
-<!ENTITY aa-sysklogd-desc SYSTEM "../appendixa/sysklogd-desc.xml">
-<!ENTITY aa-sysklogd-dep SYSTEM "../appendixa/sysklogd-dep.xml">
-<!ENTITY aa-sysklogd-down SYSTEM "../appendixa/sysklogd-down.xml">
-
-<!ENTITY sysklogd-version "1.4.1">
-<!ENTITY sysklogd-depversion "1.4.1">
-<!ENTITY sysklogd-contversion "1.4.1">
-<!ENTITY sysklogd-size "67 KB">
-<!ENTITY sysklogd-dir "sysklogd-&sysklogd-version;">
-<!ENTITY sysklogd-package "sysklogd-&sysklogd-version;.tar.bz2">
-
-<!ENTITY sysklogd-compsize "710 KB">
-<!ENTITY sysklogd-time "1 minute">
diff --git a/entities/sysvinit.ent b/entities/sysvinit.ent
new file mode 100644
index 000000000..7ab52bcd3
--- /dev/null
+++ b/entities/sysvinit.ent
@@ -0,0 +1,20 @@
+<!ENTITY c3-sysvinit SYSTEM "../chapter03/sysvinit.xml">
+
+<!ENTITY c6-sysvinit SYSTEM "../chapter06/sysvinit.xml">
+<!ENTITY c6-sysvinit-inst SYSTEM "../chapter06/sysvinit-inst.xml">
+<!ENTITY c6-cf-sysvinit SYSTEM "../chapter06/config-sysvinit.xml">
+
+<!ENTITY aa-sysvinit SYSTEM "../appendixa/sysvinit.xml">
+<!ENTITY aa-sysvinit-desc SYSTEM "../appendixa/sysvinit-desc.xml">
+<!ENTITY aa-sysvinit-dep SYSTEM "../appendixa/sysvinit-dep.xml">
+<!ENTITY aa-sysvinit-down SYSTEM "../appendixa/sysvinit-down.xml">
+
+<!ENTITY sysvinit-version "2.84">
+<!ENTITY sysvinit-depversion "2.84">
+<!ENTITY sysvinit-contversion "2.84">
+<!ENTITY sysvinit-size "76 KB">
+<!ENTITY sysvinit-dir "sysvinit-&sysvinit-version;">
+<!ENTITY sysvinit-package "sysvinit-&sysvinit-version;.tar.bz2">
+
+<!ENTITY sysvinit-compsize "630 KB">
+<!ENTITY sysvinit-time "1 minute">
diff --git a/entities/sysvinit.xml b/entities/sysvinit.xml
deleted file mode 100644
index 7ab52bcd3..000000000
--- a/entities/sysvinit.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!ENTITY c3-sysvinit SYSTEM "../chapter03/sysvinit.xml">
-
-<!ENTITY c6-sysvinit SYSTEM "../chapter06/sysvinit.xml">
-<!ENTITY c6-sysvinit-inst SYSTEM "../chapter06/sysvinit-inst.xml">
-<!ENTITY c6-cf-sysvinit SYSTEM "../chapter06/config-sysvinit.xml">
-
-<!ENTITY aa-sysvinit SYSTEM "../appendixa/sysvinit.xml">
-<!ENTITY aa-sysvinit-desc SYSTEM "../appendixa/sysvinit-desc.xml">
-<!ENTITY aa-sysvinit-dep SYSTEM "../appendixa/sysvinit-dep.xml">
-<!ENTITY aa-sysvinit-down SYSTEM "../appendixa/sysvinit-down.xml">
-
-<!ENTITY sysvinit-version "2.84">
-<!ENTITY sysvinit-depversion "2.84">
-<!ENTITY sysvinit-contversion "2.84">
-<!ENTITY sysvinit-size "76 KB">
-<!ENTITY sysvinit-dir "sysvinit-&sysvinit-version;">
-<!ENTITY sysvinit-package "sysvinit-&sysvinit-version;.tar.bz2">
-
-<!ENTITY sysvinit-compsize "630 KB">
-<!ENTITY sysvinit-time "1 minute">
diff --git a/entities/tar.ent b/entities/tar.ent
new file mode 100644
index 000000000..0006f7cc0
--- /dev/null
+++ b/entities/tar.ent
@@ -0,0 +1,26 @@
+<!ENTITY c3-tar SYSTEM "../chapter03/tar.xml">
+<!ENTITY c3-tar-patch SYSTEM "../chapter03/tar-patch.xml">
+
+<!ENTITY c5-tar SYSTEM "../chapter05/tar.xml">
+<!ENTITY c5-tar-inst SYSTEM "../chapter05/tar-inst.xml">
+
+<!ENTITY c6-tar SYSTEM "../chapter06/tar.xml">
+<!ENTITY c6-tar-inst SYSTEM "../chapter06/tar-inst.xml">
+<!ENTITY aa-tar SYSTEM "../appendixa/tar.xml">
+<!ENTITY aa-tar-desc SYSTEM "../appendixa/tar-desc.xml">
+<!ENTITY aa-tar-dep SYSTEM "../appendixa/tar-dep.xml">
+<!ENTITY aa-tar-down SYSTEM "../appendixa/tar-down.xml">
+
+<!ENTITY tar-version "1.13">
+<!ENTITY tar-depversion "1.13">
+<!ENTITY tar-contversion "1.13">
+<!ENTITY tar-size "730 KB">
+<!ENTITY tar-patch-size "1 KB">
+<!ENTITY tar-package "tar-&tar-version;.tar.bz2">
+<!ENTITY tar-dir "tar-&tar-version;">
+
+<!ENTITY tar-compsize-static "7 MB">
+<!ENTITY tar-time-static "1 minute">
+
+<!ENTITY tar-compsize "7 MB">
+<!ENTITY tar-time "1 minute">
diff --git a/entities/tar.xml b/entities/tar.xml
deleted file mode 100644
index 0006f7cc0..000000000
--- a/entities/tar.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!ENTITY c3-tar SYSTEM "../chapter03/tar.xml">
-<!ENTITY c3-tar-patch SYSTEM "../chapter03/tar-patch.xml">
-
-<!ENTITY c5-tar SYSTEM "../chapter05/tar.xml">
-<!ENTITY c5-tar-inst SYSTEM "../chapter05/tar-inst.xml">
-
-<!ENTITY c6-tar SYSTEM "../chapter06/tar.xml">
-<!ENTITY c6-tar-inst SYSTEM "../chapter06/tar-inst.xml">
-<!ENTITY aa-tar SYSTEM "../appendixa/tar.xml">
-<!ENTITY aa-tar-desc SYSTEM "../appendixa/tar-desc.xml">
-<!ENTITY aa-tar-dep SYSTEM "../appendixa/tar-dep.xml">
-<!ENTITY aa-tar-down SYSTEM "../appendixa/tar-down.xml">
-
-<!ENTITY tar-version "1.13">
-<!ENTITY tar-depversion "1.13">
-<!ENTITY tar-contversion "1.13">
-<!ENTITY tar-size "730 KB">
-<!ENTITY tar-patch-size "1 KB">
-<!ENTITY tar-package "tar-&tar-version;.tar.bz2">
-<!ENTITY tar-dir "tar-&tar-version;">
-
-<!ENTITY tar-compsize-static "7 MB">
-<!ENTITY tar-time-static "1 minute">
-
-<!ENTITY tar-compsize "7 MB">
-<!ENTITY tar-time "1 minute">
diff --git a/entities/texinfo.ent b/entities/texinfo.ent
new file mode 100644
index 000000000..34aed30df
--- /dev/null
+++ b/entities/texinfo.ent
@@ -0,0 +1,26 @@
+<!ENTITY c3-texinfo SYSTEM "../chapter03/texinfo.xml">
+
+<!ENTITY c5-texinfo SYSTEM "../chapter05/texinfo.xml">
+<!ENTITY c5-texinfo-inst SYSTEM "../chapter05/texinfo-inst.xml">
+
+<!ENTITY c6-texinfo SYSTEM "../chapter06/texinfo.xml">
+<!ENTITY c6-texinfo-inst SYSTEM "../chapter06/texinfo-inst.xml">
+<!ENTITY c6-texinfo-exp SYSTEM "../chapter06/texinfo-exp.xml">
+
+<!ENTITY aa-texinfo SYSTEM "../appendixa/texinfo.xml">
+<!ENTITY aa-texinfo-desc SYSTEM "../appendixa/texinfo-desc.xml">
+<!ENTITY aa-texinfo-dep SYSTEM "../appendixa/texinfo-dep.xml">
+<!ENTITY aa-texinfo-down SYSTEM "../appendixa/texinfo-down.xml">
+
+<!ENTITY texinfo-version "4.2">
+<!ENTITY texinfo-depversion "4.0">
+<!ENTITY texinfo-contversion "4.0">
+<!ENTITY texinfo-size "1,175 KB">
+<!ENTITY texinfo-dir "texinfo-&texinfo-version;">
+<!ENTITY texinfo-package "texinfo-&texinfo-version;.tar.bz2">
+
+<!ENTITY texinfo-compsize-static "11 MB">
+<!ENTITY texinfo-time-static "1 minute">
+
+<!ENTITY texinfo-compsize "10 MB">
+<!ENTITY texinfo-time "1 minute">
diff --git a/entities/texinfo.xml b/entities/texinfo.xml
deleted file mode 100644
index 34aed30df..000000000
--- a/entities/texinfo.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!ENTITY c3-texinfo SYSTEM "../chapter03/texinfo.xml">
-
-<!ENTITY c5-texinfo SYSTEM "../chapter05/texinfo.xml">
-<!ENTITY c5-texinfo-inst SYSTEM "../chapter05/texinfo-inst.xml">
-
-<!ENTITY c6-texinfo SYSTEM "../chapter06/texinfo.xml">
-<!ENTITY c6-texinfo-inst SYSTEM "../chapter06/texinfo-inst.xml">
-<!ENTITY c6-texinfo-exp SYSTEM "../chapter06/texinfo-exp.xml">
-
-<!ENTITY aa-texinfo SYSTEM "../appendixa/texinfo.xml">
-<!ENTITY aa-texinfo-desc SYSTEM "../appendixa/texinfo-desc.xml">
-<!ENTITY aa-texinfo-dep SYSTEM "../appendixa/texinfo-dep.xml">
-<!ENTITY aa-texinfo-down SYSTEM "../appendixa/texinfo-down.xml">
-
-<!ENTITY texinfo-version "4.2">
-<!ENTITY texinfo-depversion "4.0">
-<!ENTITY texinfo-contversion "4.0">
-<!ENTITY texinfo-size "1,175 KB">
-<!ENTITY texinfo-dir "texinfo-&texinfo-version;">
-<!ENTITY texinfo-package "texinfo-&texinfo-version;.tar.bz2">
-
-<!ENTITY texinfo-compsize-static "11 MB">
-<!ENTITY texinfo-time-static "1 minute">
-
-<!ENTITY texinfo-compsize "10 MB">
-<!ENTITY texinfo-time "1 minute">
diff --git a/entities/textutils.ent b/entities/textutils.ent
new file mode 100644
index 000000000..8be9ff30c
--- /dev/null
+++ b/entities/textutils.ent
@@ -0,0 +1,25 @@
+<!ENTITY c3-textutils SYSTEM "../chapter03/textutils.xml">
+
+<!ENTITY c5-textutils SYSTEM "../chapter05/textutils.xml">
+<!ENTITY c5-textutils-inst SYSTEM "../chapter05/textutils-inst.xml">
+
+<!ENTITY c6-textutils SYSTEM "../chapter06/textutils.xml">
+<!ENTITY c6-textutils-inst SYSTEM "../chapter06/textutils-inst.xml">
+
+<!ENTITY aa-textutils SYSTEM "../appendixa/textutils.xml">
+<!ENTITY aa-textutils-desc SYSTEM "../appendixa/textutils-desc.xml">
+<!ENTITY aa-textutils-dep SYSTEM "../appendixa/textutils-dep.xml">
+<!ENTITY aa-textutils-down SYSTEM "../appendixa/textutils-down.xml">
+
+<!ENTITY textutils-version "2.0">
+<!ENTITY textutils-depversion "2.0">
+<!ENTITY textutils-contversion "2.0">
+<!ENTITY textutils-size "1,040 KB">
+<!ENTITY textutils-package "textutils-&textutils-version;.tar.bz2">
+<!ENTITY textutils-dir "textutils-&textutils-version;">
+
+<!ENTITY textutils-compsize-static "24 MB">
+<!ENTITY textutils-time-static "2 minutes">
+
+<!ENTITY textutils-compsize "15 MB">
+<!ENTITY textutils-time "1 minute">
diff --git a/entities/textutils.xml b/entities/textutils.xml
deleted file mode 100644
index 8be9ff30c..000000000
--- a/entities/textutils.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!ENTITY c3-textutils SYSTEM "../chapter03/textutils.xml">
-
-<!ENTITY c5-textutils SYSTEM "../chapter05/textutils.xml">
-<!ENTITY c5-textutils-inst SYSTEM "../chapter05/textutils-inst.xml">
-
-<!ENTITY c6-textutils SYSTEM "../chapter06/textutils.xml">
-<!ENTITY c6-textutils-inst SYSTEM "../chapter06/textutils-inst.xml">
-
-<!ENTITY aa-textutils SYSTEM "../appendixa/textutils.xml">
-<!ENTITY aa-textutils-desc SYSTEM "../appendixa/textutils-desc.xml">
-<!ENTITY aa-textutils-dep SYSTEM "../appendixa/textutils-dep.xml">
-<!ENTITY aa-textutils-down SYSTEM "../appendixa/textutils-down.xml">
-
-<!ENTITY textutils-version "2.0">
-<!ENTITY textutils-depversion "2.0">
-<!ENTITY textutils-contversion "2.0">
-<!ENTITY textutils-size "1,040 KB">
-<!ENTITY textutils-package "textutils-&textutils-version;.tar.bz2">
-<!ENTITY textutils-dir "textutils-&textutils-version;">
-
-<!ENTITY textutils-compsize-static "24 MB">
-<!ENTITY textutils-time-static "2 minutes">
-
-<!ENTITY textutils-compsize "15 MB">
-<!ENTITY textutils-time "1 minute">
diff --git a/entities/utillinux.ent b/entities/utillinux.ent
new file mode 100644
index 000000000..2f976c1b1
--- /dev/null
+++ b/entities/utillinux.ent
@@ -0,0 +1,20 @@
+<!ENTITY c3-utillinux SYSTEM "../chapter03/utillinux.xml">
+
+<!ENTITY c6-utillinux SYSTEM "../chapter06/utillinux.xml">
+<!ENTITY c6-utillinux-inst SYSTEM "../chapter06/utillinux-inst.xml">
+<!ENTITY c6-utillinux-exp SYSTEM "../chapter06/utillinux-exp.xml">
+
+<!ENTITY aa-utillinux SYSTEM "../appendixa/utillinux.xml">
+<!ENTITY aa-utillinux-desc SYSTEM "../appendixa/utillinux-desc.xml">
+<!ENTITY aa-utillinux-dep SYSTEM "../appendixa/utillinux-dep.xml">
+<!ENTITY aa-utillinux-down SYSTEM "../appendixa/utillinux-down.xml">
+
+<!ENTITY util-linux-version "2.11q">
+<!ENTITY util-linux-depversion "2.11n">
+<!ENTITY util-linux-contversion "2.11n">
+<!ENTITY util-linux-size "1,035 KB">
+<!ENTITY util-linux-dir "util-linux-&util-linux-version;">
+<!ENTITY util-linux-package "util-linux-&util-linux-version;.tar.bz2">
+
+<!ENTITY util-linux-compsize "9 MB">
+<!ENTITY util-linux-time "1 minute">
diff --git a/entities/utillinux.xml b/entities/utillinux.xml
deleted file mode 100644
index 2f976c1b1..000000000
--- a/entities/utillinux.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!ENTITY c3-utillinux SYSTEM "../chapter03/utillinux.xml">
-
-<!ENTITY c6-utillinux SYSTEM "../chapter06/utillinux.xml">
-<!ENTITY c6-utillinux-inst SYSTEM "../chapter06/utillinux-inst.xml">
-<!ENTITY c6-utillinux-exp SYSTEM "../chapter06/utillinux-exp.xml">
-
-<!ENTITY aa-utillinux SYSTEM "../appendixa/utillinux.xml">
-<!ENTITY aa-utillinux-desc SYSTEM "../appendixa/utillinux-desc.xml">
-<!ENTITY aa-utillinux-dep SYSTEM "../appendixa/utillinux-dep.xml">
-<!ENTITY aa-utillinux-down SYSTEM "../appendixa/utillinux-down.xml">
-
-<!ENTITY util-linux-version "2.11q">
-<!ENTITY util-linux-depversion "2.11n">
-<!ENTITY util-linux-contversion "2.11n">
-<!ENTITY util-linux-size "1,035 KB">
-<!ENTITY util-linux-dir "util-linux-&util-linux-version;">
-<!ENTITY util-linux-package "util-linux-&util-linux-version;.tar.bz2">
-
-<!ENTITY util-linux-compsize "9 MB">
-<!ENTITY util-linux-time "1 minute">
diff --git a/entities/vim.ent b/entities/vim.ent
new file mode 100644
index 000000000..b9461e3cb
--- /dev/null
+++ b/entities/vim.ent
@@ -0,0 +1,21 @@
+<!ENTITY c3-vim SYSTEM "../chapter03/vim.xml">
+
+<!ENTITY c6-vim SYSTEM "../chapter06/vim.xml">
+<!ENTITY c6-vim-inst SYSTEM "../chapter06/vim-inst.xml">
+<!ENTITY c6-vim-exp SYSTEM "../chapter06/vim-exp.xml">
+<!ENTITY c6-cf-vim SYSTEM "../chapter06/config-vim.xml">
+
+<!ENTITY aa-vim SYSTEM "../appendixa/vim.xml">
+<!ENTITY aa-vim-desc SYSTEM "../appendixa/vim-desc.xml">
+<!ENTITY aa-vim-dep SYSTEM "../appendixa/vim-dep.xml">
+<!ENTITY aa-vim-down SYSTEM "../appendixa/vim-down.xml">
+
+<!ENTITY vim-version "6.1">
+<!ENTITY vim-depversion "6.0">
+<!ENTITY vim-contversion "6.0">
+<!ENTITY vim-size "2,890 KB">
+<!ENTITY vim-dir "vim&vim-version;">
+<!ENTITY vim-package "vim-&vim-version;.tar.bz2">
+
+<!ENTITY vim-compsize "15 MB">
+<!ENTITY vim-time "2 minutes">
diff --git a/entities/vim.xml b/entities/vim.xml
deleted file mode 100644
index b9461e3cb..000000000
--- a/entities/vim.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!ENTITY c3-vim SYSTEM "../chapter03/vim.xml">
-
-<!ENTITY c6-vim SYSTEM "../chapter06/vim.xml">
-<!ENTITY c6-vim-inst SYSTEM "../chapter06/vim-inst.xml">
-<!ENTITY c6-vim-exp SYSTEM "../chapter06/vim-exp.xml">
-<!ENTITY c6-cf-vim SYSTEM "../chapter06/config-vim.xml">
-
-<!ENTITY aa-vim SYSTEM "../appendixa/vim.xml">
-<!ENTITY aa-vim-desc SYSTEM "../appendixa/vim-desc.xml">
-<!ENTITY aa-vim-dep SYSTEM "../appendixa/vim-dep.xml">
-<!ENTITY aa-vim-down SYSTEM "../appendixa/vim-down.xml">
-
-<!ENTITY vim-version "6.1">
-<!ENTITY vim-depversion "6.0">
-<!ENTITY vim-contversion "6.0">
-<!ENTITY vim-size "2,890 KB">
-<!ENTITY vim-dir "vim&vim-version;">
-<!ENTITY vim-package "vim-&vim-version;.tar.bz2">
-
-<!ENTITY vim-compsize "15 MB">
-<!ENTITY vim-time "2 minutes">
-- 
cgit v1.2.3-54-g00ecf