Removing some dead-wood entities.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2952 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

55 files changed, 29 insertions, 157 deletions

diff --git a/entities/autoconf.ent b/entities/autoconf.ent
index 6b764ceb1..b4ee9b8e6 100644
--- a/entities/autoconf.ent
+++ b/entities/autoconf.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-autoconf SYSTEM "../chapter04/autoconf.xml">
-
 <!ENTITY c6-autoconf SYSTEM "../chapter06/autoconf.xml">
 <!ENTITY c6-autoconf-inst SYSTEM "../chapter06/autoconf-inst.xml">
 
diff --git a/entities/automake.ent b/entities/automake.ent
index 59c6be5bf..d3f060609 100644
--- a/entities/automake.ent
+++ b/entities/automake.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-automake SYSTEM "../chapter04/automake.xml">
-
 <!ENTITY c6-automake SYSTEM "../chapter06/automake.xml">
 <!ENTITY c6-automake-inst SYSTEM "../chapter06/automake-inst.xml">
 
diff --git a/entities/bash.ent b/entities/bash.ent
index 60f868c1f..5fee9969e 100644
--- a/entities/bash.ent
+++ b/entities/bash.ent
@@ -1,6 +1,3 @@
-<!ENTITY c4-bash SYSTEM "../chapter04/bash.xml">
-<!ENTITY c4-bash-patch SYSTEM "../chapter04/bash-patch.xml">
-
 <!ENTITY c5-bash SYSTEM "../chapter05/bash.xml">
 <!ENTITY c5-bash-inst SYSTEM "../chapter05/bash-inst.xml">
 
diff --git a/entities/binutils.ent b/entities/binutils.ent
index 1eec9f7d3..d0e1b1f1b 100644
--- a/entities/binutils.ent
+++ b/entities/binutils.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-binutils SYSTEM "../chapter04/binutils.xml">
-
 <!ENTITY c5-binutils-pass1 SYSTEM "../chapter05/binutils-pass1.xml">
 <!ENTITY c5-binutils-pass1-inst SYSTEM "../chapter05/binutils-pass1-inst.xml">
 <!ENTITY c5-binutils-pass2 SYSTEM "../chapter05/binutils-pass2.xml">
diff --git a/entities/bison.ent b/entities/bison.ent
index 83f7601ef..f001b7bab 100644
--- a/entities/bison.ent
+++ b/entities/bison.ent
@@ -1,13 +1,11 @@
-<!ENTITY c4-bison SYSTEM "../chapter04/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-shortdesc SYSTEM "../appendixa/bison-shortdesc.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 aa-bison-shortdesc SYSTEM "../appendixa/bison-shortdesc.xml">
 
 <!ENTITY bison-version "1.875">
 <!ENTITY bison-depversion "1.31">
diff --git a/entities/book-structure.xml b/entities/book-structure.xml
index 9ff7ea6fe..3af32c9fd 100644
--- a/entities/book-structure.xml
+++ b/entities/book-structure.xml
@@ -8,9 +8,9 @@
 <!ENTITY c1-how SYSTEM "../chapter01/how.xml">
 <!ENTITY c1-conventions SYSTEM "../chapter01/conventions.xml">
 <!ENTITY c1-version SYSTEM "../chapter01/versions.xml">
-<!ENTITY c1-acknowledgements SYSTEM "../chapter01/acknowledgements.xml">
 <!ENTITY c1-changelog SYSTEM "../chapter01/changelog.xml">
-<!ENTITY c1-contactinfo SYSTEM "../chapter01/contactinfo.xml">
+<!ENTITY c1-resources SYSTEM "../chapter01/contactinfo.xml">
+<!ENTITY c1-acknowledgements SYSTEM "../chapter01/acknowledgements.xml">
 
 <!ENTITY chapter02 SYSTEM "../chapter02/chapter02.xml">
 <!ENTITY c2-aboutlfs SYSTEM "../chapter02/aboutlfs.xml">
@@ -64,6 +64,7 @@
 <!ENTITY chapter08 SYSTEM "../chapter08/chapter08.xml">
 <!ENTITY c8-introduction SYSTEM "../chapter08/introduction.xml">
 <!ENTITY c8-fstab SYSTEM "../chapter08/fstab.xml">
+<!ENTITY c8-grub-conf SYSTEM "../chapter08/grub.xml">
 
 <!ENTITY chapter09 SYSTEM "../chapter09/chapter09.xml">
 <!ENTITY c9-theend SYSTEM "../chapter09/theend.xml">
diff --git a/entities/bootscripts.ent b/entities/bootscripts.ent
index 416d8498c..0b9872488 100644
--- a/entities/bootscripts.ent
+++ b/entities/bootscripts.ent
@@ -1,13 +1,11 @@
-<!ENTITY c4-bootscripts SYSTEM "../chapter04/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-shortdesc SYSTEM "../appendixa/bootscripts-shortdesc.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 aa-bootscripts-shortdesc SYSTEM "../appendixa/bootscripts-shortdesc.xml">
 
 <!ENTITY bootscripts-version "1.11">
 <!ENTITY bootscripts-depversion "1.11">
diff --git a/entities/bzip2.ent b/entities/bzip2.ent
index 9ce528088..59d05cb0e 100644
--- a/entities/bzip2.ent
+++ b/entities/bzip2.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-bzip2 SYSTEM "../chapter04/bzip2.xml">
-
 <!ENTITY c5-bzip2 SYSTEM "../chapter05/bzip2.xml">
 <!ENTITY c5-bzip2-inst SYSTEM "../chapter05/bzip2-inst.xml">
 
diff --git a/entities/coreutils.ent b/entities/coreutils.ent
index b0172cbc5..d3229d346 100644
--- a/entities/coreutils.ent
+++ b/entities/coreutils.ent
@@ -1,6 +1,3 @@
-<!ENTITY c4-coreutils SYSTEM "../chapter04/coreutils.xml">
-<!ENTITY c4-coreutils-patch SYSTEM "../chapter04/coreutils-patch.xml">
-
 <!ENTITY c5-coreutils SYSTEM "../chapter05/coreutils.xml">
 <!ENTITY c5-coreutils-inst SYSTEM "../chapter05/coreutils-inst.xml">
 
diff --git a/entities/dejagnu.ent b/entities/dejagnu.ent
index 2ef084073..7d2cdaa14 100644
--- a/entities/dejagnu.ent
+++ b/entities/dejagnu.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-dejagnu SYSTEM "../chapter04/dejagnu.xml">
-
 <!ENTITY c5-dejagnu SYSTEM "../chapter05/dejagnu.xml">
 <!ENTITY c5-dejagnu-inst SYSTEM "../chapter05/dejagnu-inst.xml">
 
diff --git a/entities/diffutils.ent b/entities/diffutils.ent
index 4838c86f0..af9a876c4 100644
--- a/entities/diffutils.ent
+++ b/entities/diffutils.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-diffutils SYSTEM "../chapter04/diffutils.xml">
-
 <!ENTITY c5-diffutils SYSTEM "../chapter05/diffutils.xml">
 <!ENTITY c5-diffutils-inst SYSTEM "../chapter05/diffutils-inst.xml">
 
@@ -15,8 +13,8 @@
 <!ENTITY diffutils-version "2.8.1">
 <!ENTITY diffutils-depversion "2.7">
 <!ENTITY diffutils-contversion "2.8.1">
-<!ENTITY diffutils-package "diffutils-&diffutils-version;.tar.bz2">
 <!ENTITY diffutils-dir "diffutils-&diffutils-version;">
+<!ENTITY diffutils-package "diffutils-&diffutils-version;.tar.bz2">
 <!ENTITY diffutils-size "762 KB">
 
 <!ENTITY diffutils-compsize-static "10 MB">
diff --git a/entities/e2fsprogs.ent b/entities/e2fsprogs.ent
index 33447854d..3a54e9e8f 100644
--- a/entities/e2fsprogs.ent
+++ b/entities/e2fsprogs.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-e2fsprogs SYSTEM "../chapter04/e2fsprogs.xml">
-
 <!ENTITY c6-e2fsprogs SYSTEM "../chapter06/e2fsprogs.xml">
 <!ENTITY c6-e2fsprogs-inst SYSTEM "../chapter06/e2fsprogs-inst.xml">
 
diff --git a/entities/ed.ent b/entities/ed.ent
index 0c8927877..c7191d1d0 100644
--- a/entities/ed.ent
+++ b/entities/ed.ent
@@ -1,6 +1,3 @@
-<!ENTITY c4-ed SYSTEM "../chapter04/ed.xml">
-<!ENTITY c4-ed-patch SYSTEM "../chapter04/ed-patch.xml">
-
 <!ENTITY c6-ed SYSTEM "../chapter06/ed.xml">
 <!ENTITY c6-ed-inst SYSTEM "../chapter06/ed-inst.xml">
 
diff --git a/entities/expect.ent b/entities/expect.ent
index 25812ffd4..2a35ff85f 100644
--- a/entities/expect.ent
+++ b/entities/expect.ent
@@ -1,6 +1,3 @@
-<!ENTITY c4-expect SYSTEM "../chapter04/expect.xml">
-<!ENTITY c4-expect-patch SYSTEM "../chapter04/expect-patch.xml">
-
 <!ENTITY c5-expect SYSTEM "../chapter05/expect.xml">
 <!ENTITY c5-expect-inst SYSTEM "../chapter05/expect-inst.xml">
 
diff --git a/entities/file.ent b/entities/file.ent
index d77c5ae81..218a702e1 100644
--- a/entities/file.ent
+++ b/entities/file.ent
@@ -1,11 +1,8 @@
-<!ENTITY c4-file SYSTEM "../chapter04/file.xml">
-
 <!ENTITY c6-file SYSTEM "../chapter06/file.xml">
 <!ENTITY c6-file-inst SYSTEM "../chapter06/file-inst.xml">
 
 <!ENTITY aa-file SYSTEM "../appendixa/file.xml">
 <!ENTITY aa-file-shortdesc SYSTEM "../appendixa/file-shortdesc.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">
diff --git a/entities/findutils.ent b/entities/findutils.ent
index 5bb8eff03..8e67838ca 100644
--- a/entities/findutils.ent
+++ b/entities/findutils.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-findutils SYSTEM "../chapter04/findutils.xml">
-
 <!ENTITY c5-findutils SYSTEM "../chapter05/findutils.xml">
 <!ENTITY c5-findutils-inst SYSTEM "../chapter05/findutils-inst.xml">
 
diff --git a/entities/flex.ent b/entities/flex.ent
index 26c6a2ade..549225190 100644
--- a/entities/flex.ent
+++ b/entities/flex.ent
@@ -1,13 +1,11 @@
-<!ENTITY c4-flex SYSTEM "../chapter04/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-shortdesc SYSTEM "../appendixa/flex-shortdesc.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 aa-flex-shortdesc SYSTEM "../appendixa/flex-shortdesc.xml">
 
 <!ENTITY flex-version "2.5.4a">
 <!ENTITY flex-depversion "2.5.4a">
diff --git a/entities/gawk.ent b/entities/gawk.ent
index 385bc2e9f..092ca1517 100644
--- a/entities/gawk.ent
+++ b/entities/gawk.ent
@@ -1,6 +1,3 @@
-<!ENTITY c4-gawk SYSTEM "../chapter04/gawk.xml">
-<!ENTITY c4-gawk-patch SYSTEM "../chapter04/gawk-patch.xml">
-
 <!ENTITY c5-gawk SYSTEM "../chapter05/gawk.xml">
 <!ENTITY c5-gawk-inst SYSTEM "../chapter05/gawk-inst.xml">
 
diff --git a/entities/gcc-2953.ent b/entities/gcc-2953.ent
index 0151e5689..768119431 100644
--- a/entities/gcc-2953.ent
+++ b/entities/gcc-2953.ent
@@ -1,6 +1,3 @@
-<!ENTITY c4-gcc-2953 SYSTEM "../chapter04/gcc-2953.xml">
-<!ENTITY c4-gcc-2953patch SYSTEM "../chapter04/gcc-2953-patch.xml">
-
 <!ENTITY c6-gcc-2953 SYSTEM "../chapter06/gcc-2953.xml">
 <!ENTITY c6-gcc-2953-inst SYSTEM "../chapter06/gcc-2953-inst.xml">
 
@@ -24,6 +21,5 @@
 <!ENTITY gcc-2953-returntype-fix-patch "gcc-&gcc-2953-version;-returntype-fix.patch">
 <!ENTITY gcc-2953-returntype-fix-patch-size "1 KB">
 
-
 <!ENTITY gcc-2953-compsize "221 MB">
 <!ENTITY gcc-2953-time "2.0 SBU">
diff --git a/entities/gcc.ent b/entities/gcc.ent
index 92dc528a9..bd81a80ff 100644
--- a/entities/gcc.ent
+++ b/entities/gcc.ent
@@ -1,12 +1,8 @@
-<!ENTITY c4-gcc SYSTEM "../chapter04/gcc.xml">
-<!ENTITY c4-gcc-patch SYSTEM "../chapter04/gcc-patch.xml">
-
 <!ENTITY c5-gcc-pass1 SYSTEM "../chapter05/gcc-pass1.xml">
 <!ENTITY c5-gcc-pass1-inst SYSTEM "../chapter05/gcc-pass1-inst.xml">
 <!ENTITY c5-gcc-pass2 SYSTEM "../chapter05/gcc-pass2.xml">
 <!ENTITY c5-gcc-pass2-inst SYSTEM "../chapter05/gcc-pass2-inst.xml">
 
-
 <!ENTITY c6-gcc SYSTEM "../chapter06/gcc.xml">
 <!ENTITY c6-gcc-inst SYSTEM "../chapter06/gcc-inst.xml">
 
diff --git a/entities/gettext.ent b/entities/gettext.ent
index e3b5dd83c..21fcfda8e 100644
--- a/entities/gettext.ent
+++ b/entities/gettext.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-gettext SYSTEM "../chapter04/gettext.xml">
-
 <!ENTITY c5-gettext SYSTEM "../chapter05/gettext.xml">
 <!ENTITY c5-gettext-inst SYSTEM "../chapter05/gettext-inst.xml">
 
@@ -7,10 +5,10 @@
 <!ENTITY c6-gettext-inst SYSTEM "../chapter06/gettext-inst.xml">
 
 <!ENTITY aa-gettext SYSTEM "../appendixa/gettext.xml">
+<!ENTITY aa-gettext-shortdesc SYSTEM "../appendixa/gettext-shortdesc.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 aa-gettext-shortdesc SYSTEM "../appendixa/gettext-shortdesc.xml">
 
 <!ENTITY gettext-version "0.12.1">
 <!ENTITY gettext-depversion "0.10.40">
diff --git a/entities/glibc.ent b/entities/glibc.ent
index eb473a6e4..eb8107af0 100644
--- a/entities/glibc.ent
+++ b/entities/glibc.ent
@@ -1,7 +1,3 @@
-<!ENTITY c4-glibc SYSTEM "../chapter04/glibc.xml">
-<!ENTITY c4-glibc-threads SYSTEM "../chapter04/glibc-threads.xml">
-<!ENTITY c4-glibc-patch SYSTEM "../chapter04/glibc-patch.xml">
-
 <!ENTITY c5-glibc SYSTEM "../chapter05/glibc.xml">
 <!ENTITY c5-glibc-inst SYSTEM "../chapter05/glibc-inst.xml">
 
diff --git a/entities/grep.ent b/entities/grep.ent
index 6b392d221..69f4edb21 100644
--- a/entities/grep.ent
+++ b/entities/grep.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-grep SYSTEM "../chapter04/grep.xml">
-
 <!ENTITY c5-grep SYSTEM "../chapter05/grep.xml">
 <!ENTITY c5-grep-inst SYSTEM "../chapter05/grep-inst.xml">
 
diff --git a/entities/groff.ent b/entities/groff.ent
index ab3090942..d957f7cf0 100644
--- a/entities/groff.ent
+++ b/entities/groff.ent
@@ -1,13 +1,11 @@
-<!ENTITY c4-groff SYSTEM "../chapter04/groff.xml">
-
 <!ENTITY c6-groff SYSTEM "../chapter06/groff.xml">
 <!ENTITY c6-groff-inst SYSTEM "../chapter06/groff-inst.xml">
 
 <!ENTITY aa-groff SYSTEM "../appendixa/groff.xml">
+<!ENTITY aa-groff-shortdesc SYSTEM "../appendixa/groff-shortdesc.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 aa-groff-shortdesc SYSTEM "../appendixa/groff-shortdesc.xml">
 
 <!ENTITY groff-version "1.19">
 <!ENTITY groff-depversion "1.17.2">
diff --git a/entities/grub.ent b/entities/grub.ent
index b9d3df919..d48730d69 100644
--- a/entities/grub.ent
+++ b/entities/grub.ent
@@ -1,10 +1,6 @@
-<!ENTITY c4-grub SYSTEM "../chapter04/grub.xml">
-
 <!ENTITY c6-grub SYSTEM "../chapter06/grub.xml">
 <!ENTITY c6-grub-inst SYSTEM "../chapter06/grub-inst.xml">
 
-<!ENTITY c8-grub SYSTEM "../chapter08/grub.xml">
-
 <!ENTITY aa-grub SYSTEM "../appendixa/grub.xml">
 <!ENTITY aa-grub-shortdesc SYSTEM "../appendixa/grub-shortdesc.xml">
 <!ENTITY aa-grub-desc SYSTEM "../appendixa/grub-desc.xml">
diff --git a/entities/gzip.ent b/entities/gzip.ent
index 2907d0711..26c8f6230 100644
--- a/entities/gzip.ent
+++ b/entities/gzip.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-gzip SYSTEM "../chapter04/gzip.xml">
-
 <!ENTITY c5-gzip SYSTEM "../chapter05/gzip.xml">
 <!ENTITY c5-gzip-inst SYSTEM "../chapter05/gzip-inst.xml">
 
diff --git a/entities/inetutils.ent b/entities/inetutils.ent
index d4d9f98fd..4a3e03b29 100644
--- a/entities/inetutils.ent
+++ b/entities/inetutils.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-inetutils SYSTEM "../chapter04/inetutils.xml">
-
 <!ENTITY c6-inetutils SYSTEM "../chapter06/inetutils.xml">
 <!ENTITY c6-inetutils-inst SYSTEM "../chapter06/inetutils-inst.xml">
 
diff --git a/entities/kbd.ent b/entities/kbd.ent
index 92f444de3..d1175d069 100644
--- a/entities/kbd.ent
+++ b/entities/kbd.ent
@@ -1,6 +1,3 @@
-<!ENTITY c4-kbd SYSTEM "../chapter04/kbd.xml">
-<!ENTITY c4-kbd-patch SYSTEM "../chapter04/kbd-patch.xml">
-
 <!ENTITY c6-kbd SYSTEM "../chapter06/kbd.xml">
 <!ENTITY c6-kbd-inst SYSTEM "../chapter06/kbd-inst.xml">
 
diff --git a/entities/kernel.ent b/entities/kernel.ent
index ccdd4f98a..2f530258c 100644
--- a/entities/kernel.ent
+++ b/entities/kernel.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-kernel SYSTEM "../chapter04/kernel.xml">
-
 <!ENTITY c5-kernelheaders SYSTEM "../chapter05/kernelheaders.xml">
 <!ENTITY c5-kernelheaders-inst SYSTEM "../chapter05/kernelheaders-inst.xml">
 
@@ -11,10 +9,10 @@
 <!ENTITY c8-kernel-inst SYSTEM "../chapter08/kernel-inst.xml">
 
 <!ENTITY aa-kernel SYSTEM "../appendixa/kernel.xml">
+<!ENTITY aa-kernel-shortdesc SYSTEM "../appendixa/kernel-shortdesc.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 aa-kernel-shortdesc SYSTEM "../appendixa/kernel-shortdesc.xml">
 
 <!ENTITY kernel-version "2.4.22">
 <!ENTITY kernel-depversion "2.4.17">
diff --git a/entities/less.ent b/entities/less.ent
index 69c372fb7..2e1456a81 100644
--- a/entities/less.ent
+++ b/entities/less.ent
@@ -1,13 +1,11 @@
-<!ENTITY c4-less SYSTEM "../chapter04/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-shortdesc SYSTEM "../appendixa/less-shortdesc.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 aa-less-shortdesc SYSTEM "../appendixa/less-shortdesc.xml">
 
 <!ENTITY less-version "381">
 <!ENTITY less-depversion "358">
diff --git a/entities/lfs-utils.ent b/entities/lfs-utils.ent
index ef036f4f3..e3bc48680 100644
--- a/entities/lfs-utils.ent
+++ b/entities/lfs-utils.ent
@@ -1,13 +1,11 @@
-<!ENTITY c4-lfs-utils SYSTEM "../chapter04/lfs-utils.xml">
-
 <!ENTITY c6-lfs-utils SYSTEM "../chapter06/lfs-utils.xml">
 <!ENTITY c6-lfs-utils-inst SYSTEM "../chapter06/lfs-utils-inst.xml">
 
 <!ENTITY aa-lfs-utils SYSTEM "../appendixa/lfs-utils.xml">
+<!ENTITY aa-lfs-utils-shortdesc SYSTEM "../appendixa/lfs-utils-shortdesc.xml">
 <!ENTITY aa-lfs-utils-desc SYSTEM "../appendixa/lfs-utils-desc.xml">
 <!ENTITY aa-lfs-utils-dep SYSTEM "../appendixa/lfs-utils-dep.xml">
 <!ENTITY aa-lfs-utils-down SYSTEM "../appendixa/lfs-utils-down.xml">
-<!ENTITY aa-lfs-utils-shortdesc SYSTEM "../appendixa/lfs-utils-shortdesc.xml">
 
 <!ENTITY lfs-utils-version "0.3">
 <!ENTITY lfs-utils-depversion "">
diff --git a/entities/libtool.ent b/entities/libtool.ent
index 566976603..2769aa02a 100644
--- a/entities/libtool.ent
+++ b/entities/libtool.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-libtool SYSTEM "../chapter04/libtool.xml">
-
 <!ENTITY c6-libtool SYSTEM "../chapter06/libtool.xml">
 <!ENTITY c6-libtool-inst SYSTEM "../chapter06/libtool-inst.xml">
 
diff --git a/entities/m4.ent b/entities/m4.ent
index 7754090b2..c347969b4 100644
--- a/entities/m4.ent
+++ b/entities/m4.ent
@@ -1,13 +1,11 @@
-<!ENTITY c4-m4 SYSTEM "../chapter04/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-shortdesc SYSTEM "../appendixa/m4-shortdesc.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 aa-m4-shortdesc SYSTEM "../appendixa/m4-shortdesc.xml">
 
 <!ENTITY m4-version "1.4">
 <!ENTITY m4-depversion "1.4">
diff --git a/entities/make.ent b/entities/make.ent
index 9cfc90534..66f208df2 100644
--- a/entities/make.ent
+++ b/entities/make.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-make SYSTEM "../chapter04/make.xml">
-
 <!ENTITY c5-make SYSTEM "../chapter05/make.xml">
 <!ENTITY c5-make-inst SYSTEM "../chapter05/make-inst.xml">
 
@@ -8,7 +6,6 @@
 
 <!ENTITY aa-make SYSTEM "../appendixa/make.xml">
 <!ENTITY aa-make-shortdesc SYSTEM "../appendixa/make-shortdesc.xml">
-<!ENTITY aa-make-shortdesc SYSTEM "../appendixa/make-shortdesc.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">
diff --git a/entities/makedev.ent b/entities/makedev.ent
index 76cfbc47f..a4e632eb7 100644
--- a/entities/makedev.ent
+++ b/entities/makedev.ent
@@ -1,13 +1,11 @@
-<!ENTITY c4-makedev SYSTEM "../chapter04/makedev.xml">
-
 <!ENTITY c6-makedev SYSTEM "../chapter06/makedev.xml">
 <!ENTITY c6-makedev-inst SYSTEM "../chapter06/makedev-inst.xml">
 
 <!ENTITY aa-makedev SYSTEM "../appendixa/makedev.xml">
+<!ENTITY aa-makedev-shortdesc SYSTEM "../appendixa/makedev-shortdesc.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 aa-makedev-shortdesc SYSTEM "../appendixa/makedev-shortdesc.xml">
 
 <!ENTITY makedev-version "1.7">
 <!ENTITY makedev-depversion "1.5">
diff --git a/entities/man.ent b/entities/man.ent
index 352caa358..fb01ce23a 100644
--- a/entities/man.ent
+++ b/entities/man.ent
@@ -1,6 +1,3 @@
-<!ENTITY c4-man SYSTEM "../chapter04/man.xml">
-<!ENTITY c4-man-patch SYSTEM "../chapter04/man-patch.xml">
-
 <!ENTITY c6-man SYSTEM "../chapter06/man.xml">
 <!ENTITY c6-man-inst SYSTEM "../chapter06/man-inst.xml">
 
diff --git a/entities/manpages.ent b/entities/manpages.ent
index e19e69f62..51db5466f 100644
--- a/entities/manpages.ent
+++ b/entities/manpages.ent
@@ -1,13 +1,11 @@
-<!ENTITY c4-manpages SYSTEM "../chapter04/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-shortdesc SYSTEM "../appendixa/manpages-shortdesc.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 aa-manpages-shortdesc SYSTEM "../appendixa/manpages-shortdesc.xml">
 
 <!ENTITY man-pages-version "1.60">
 <!ENTITY man-pages-depversion "1.47">
diff --git a/entities/modutils.ent b/entities/modutils.ent
index 9929353b2..5af602f13 100644
--- a/entities/modutils.ent
+++ b/entities/modutils.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-modutils SYSTEM "../chapter04/modutils.xml">
-
 <!ENTITY c6-modutils SYSTEM "../chapter06/modutils.xml">
 <!ENTITY c6-modutils-inst SYSTEM "../chapter06/modutils-inst.xml">
 
diff --git a/entities/ncurses.ent b/entities/ncurses.ent
index 2717598d5..3cb6784c8 100644
--- a/entities/ncurses.ent
+++ b/entities/ncurses.ent
@@ -1,6 +1,3 @@
-<!ENTITY c4-ncurses SYSTEM "../chapter04/ncurses.xml">
-<!ENTITY c4-ncurses-patch SYSTEM "../chapter04/ncurses-patch.xml">
-
 <!ENTITY c5-ncurses SYSTEM "../chapter05/ncurses.xml">
 <!ENTITY c5-ncurses-inst SYSTEM "../chapter05/ncurses-inst.xml">
 
@@ -8,10 +5,10 @@
 <!ENTITY c6-ncurses-inst SYSTEM "../chapter06/ncurses-inst.xml">
 
 <!ENTITY aa-ncurses SYSTEM "../appendixa/ncurses.xml">
+<!ENTITY aa-ncurses-shortdesc SYSTEM "../appendixa/ncurses-shortdesc.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 aa-ncurses-shortdesc SYSTEM "../appendixa/ncurses-shortdesc.xml">
 
 <!ENTITY ncurses-version "5.3">
 <!ENTITY ncurses-depversion "5.2">
diff --git a/entities/nettools.ent b/entities/nettools.ent
index 54eeec8b6..c462fe5c5 100644
--- a/entities/nettools.ent
+++ b/entities/nettools.ent
@@ -1,13 +1,11 @@
-<!ENTITY c4-nettools SYSTEM "../chapter04/nettools.xml">
-
 <!ENTITY c6-nettools SYSTEM "../chapter06/nettools.xml">
 <!ENTITY c6-nettools-inst SYSTEM "../chapter06/nettools-inst.xml">
 
 <!ENTITY aa-nettools SYSTEM "../appendixa/nettools.xml">
+<!ENTITY aa-nettools-shortdesc SYSTEM "../appendixa/nettools-shortdesc.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 aa-nettools-shortdesc SYSTEM "../appendixa/nettools-shortdesc.xml">
 
 <!ENTITY net-tools-version "1.60">
 <!ENTITY net-tools-depversion "1.60">
diff --git a/entities/patch.ent b/entities/patch.ent
index 371900fbe..84e681412 100644
--- a/entities/patch.ent
+++ b/entities/patch.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-patch SYSTEM "../chapter04/patch.xml">
-
 <!ENTITY c5-patch SYSTEM "../chapter05/patch.xml">
 <!ENTITY c5-patch-inst SYSTEM "../chapter05/patch-inst.xml">
 
diff --git a/entities/perl.ent b/entities/perl.ent
index 71af5e446..f4370ff75 100644
--- a/entities/perl.ent
+++ b/entities/perl.ent
@@ -1,6 +1,3 @@
-<!ENTITY c4-perl SYSTEM "../chapter04/perl.xml">
-<!ENTITY c4-perl-patch SYSTEM "../chapter04/perl-patch.xml">
-
 <!ENTITY c5-perl SYSTEM "../chapter05/perl.xml">
 <!ENTITY c5-perl-inst SYSTEM "../chapter05/perl-inst.xml">
 
diff --git a/entities/procinfo.ent b/entities/procinfo.ent
index 32da6e54d..8b61dbc83 100644
--- a/entities/procinfo.ent
+++ b/entities/procinfo.ent
@@ -1,13 +1,11 @@
-<!ENTITY c4-procinfo SYSTEM "../chapter04/procinfo.xml">
-
 <!ENTITY c6-procinfo SYSTEM "../chapter06/procinfo.xml">
 <!ENTITY c6-procinfo-inst SYSTEM "../chapter06/procinfo-inst.xml">
 
 <!ENTITY aa-procinfo SYSTEM "../appendixa/procinfo.xml">
+<!ENTITY aa-procinfo-shortdesc SYSTEM "../appendixa/procinfo-shortdesc.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 aa-procinfo-shortdesc SYSTEM "../appendixa/procinfo-shortdesc.xml">
 
 <!ENTITY procinfo-version "18">
 <!ENTITY procinfo-depversion "18">
diff --git a/entities/procps.ent b/entities/procps.ent
index 9dffc16be..e05eb1878 100644
--- a/entities/procps.ent
+++ b/entities/procps.ent
@@ -1,14 +1,11 @@
-<!ENTITY c4-procps SYSTEM "../chapter04/procps.xml">
-<!ENTITY c4-procps-patch SYSTEM "../chapter04/procps-patch.xml">
-
 <!ENTITY c6-procps SYSTEM "../chapter06/procps.xml">
 <!ENTITY c6-procps-inst SYSTEM "../chapter06/procps-inst.xml">
 
 <!ENTITY aa-procps SYSTEM "../appendixa/procps.xml">
+<!ENTITY aa-procps-shortdesc SYSTEM "../appendixa/procps-shortdesc.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 aa-procps-shortdesc SYSTEM "../appendixa/procps-shortdesc.xml">
 
 <!ENTITY procps-version "3.1.11">
 <!ENTITY procps-depversion "2.0.7">
diff --git a/entities/psmisc.ent b/entities/psmisc.ent
index ad4bb835e..11122fa3f 100644
--- a/entities/psmisc.ent
+++ b/entities/psmisc.ent
@@ -1,13 +1,11 @@
-<!ENTITY c4-psmisc SYSTEM "../chapter04/psmisc.xml">
-
 <!ENTITY c6-psmisc SYSTEM "../chapter06/psmisc.xml">
 <!ENTITY c6-psmisc-inst SYSTEM "../chapter06/psmisc-inst.xml">
 
 <!ENTITY aa-psmisc SYSTEM "../appendixa/psmisc.xml">
+<!ENTITY aa-psmisc-shortdesc SYSTEM "../appendixa/psmisc-shortdesc.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 aa-psmisc-shortdesc SYSTEM "../appendixa/psmisc-shortdesc.xml">
 
 <!ENTITY psmisc-version "21.3">
 <!ENTITY psmisc-depversion "20.2">
diff --git a/entities/sed.ent b/entities/sed.ent
index 5eb416a22..e0643ccb4 100644
--- a/entities/sed.ent
+++ b/entities/sed.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-sed SYSTEM "../chapter04/sed.xml">
-
 <!ENTITY c5-sed SYSTEM "../chapter05/sed.xml">
 <!ENTITY c5-sed-inst SYSTEM "../chapter05/sed-inst.xml">
 
diff --git a/entities/shadow.ent b/entities/shadow.ent
index 5c41eae92..15c7d97f3 100644
--- a/entities/shadow.ent
+++ b/entities/shadow.ent
@@ -1,14 +1,12 @@
-<!ENTITY c4-shadowpwd SYSTEM "../chapter04/shadowpwd.xml">
-
 <!ENTITY c6-shadowpwd SYSTEM "../chapter06/shadowpwd.xml">
 <!ENTITY c6-shadowpwd-inst SYSTEM "../chapter06/shadowpwd-inst.xml">
 <!ENTITY c6-cf-shadowpwd SYSTEM "../chapter06/config-shadowpwd.xml">
 
 <!ENTITY aa-shadowpwd SYSTEM "../appendixa/shadowpwd.xml">
+<!ENTITY aa-shadowpwd-shortdesc SYSTEM "../appendixa/shadowpwd-shortdesc.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 aa-shadowpwd-shortdesc SYSTEM "../appendixa/shadowpwd-shortdesc.xml">
 
 <!ENTITY shadow-version "4.0.3">
 <!ENTITY shadow-depversion "20001016">
diff --git a/entities/sysklogd.ent b/entities/sysklogd.ent
index ebed1ed4c..73b04c8be 100644
--- a/entities/sysklogd.ent
+++ b/entities/sysklogd.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-sysklogd SYSTEM "../chapter04/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">
@@ -7,10 +5,10 @@
 <!ENTITY c7-sysklogd SYSTEM "../chapter07/sysklogd.xml">
 
 <!ENTITY aa-sysklogd SYSTEM "../appendixa/sysklogd.xml">
+<!ENTITY aa-sysklogd-shortdesc SYSTEM "../appendixa/sysklogd-shortdesc.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 aa-sysklogd-shortdesc SYSTEM "../appendixa/sysklogd-shortdesc.xml">
 
 <!ENTITY sysklogd-version "1.4.1">
 <!ENTITY sysklogd-depversion "1.4.1">
diff --git a/entities/sysvinit.ent b/entities/sysvinit.ent
index d0052535a..6adffffb2 100644
--- a/entities/sysvinit.ent
+++ b/entities/sysvinit.ent
@@ -1,14 +1,12 @@
-<!ENTITY c4-sysvinit SYSTEM "../chapter04/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-shortdesc SYSTEM "../appendixa/sysvinit-shortdesc.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 aa-sysvinit-shortdesc SYSTEM "../appendixa/sysvinit-shortdesc.xml">
 
 <!ENTITY sysvinit-version "2.85">
 <!ENTITY sysvinit-depversion "2.84">
diff --git a/entities/tar.ent b/entities/tar.ent
index c539836bd..423c6c284 100644
--- a/entities/tar.ent
+++ b/entities/tar.ent
@@ -1,15 +1,14 @@
-<!ENTITY c4-tar SYSTEM "../chapter04/tar.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-shortdesc SYSTEM "../appendixa/tar-shortdesc.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 aa-tar-shortdesc SYSTEM "../appendixa/tar-shortdesc.xml">
 
 <!ENTITY tar-version "1.13.25">
 <!ENTITY tar-depversion "1.13">
diff --git a/entities/tcl.ent b/entities/tcl.ent
index 9751c0745..b9199111a 100644
--- a/entities/tcl.ent
+++ b/entities/tcl.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-tcl SYSTEM "../chapter04/tcl.xml">
-
 <!ENTITY c5-tcl SYSTEM "../chapter05/tcl.xml">
 <!ENTITY c5-tcl-inst SYSTEM "../chapter05/tcl-inst.xml">
 
diff --git a/entities/texinfo.ent b/entities/texinfo.ent
index cffa8772d..5af83e2e5 100644
--- a/entities/texinfo.ent
+++ b/entities/texinfo.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-texinfo SYSTEM "../chapter04/texinfo.xml">
-
 <!ENTITY c5-texinfo SYSTEM "../chapter05/texinfo.xml">
 <!ENTITY c5-texinfo-inst SYSTEM "../chapter05/texinfo-inst.xml">
 
@@ -7,10 +5,10 @@
 <!ENTITY c6-texinfo-inst SYSTEM "../chapter06/texinfo-inst.xml">
 
 <!ENTITY aa-texinfo SYSTEM "../appendixa/texinfo.xml">
+<!ENTITY aa-texinfo-shortdesc SYSTEM "../appendixa/texinfo-shortdesc.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 aa-texinfo-shortdesc SYSTEM "../appendixa/texinfo-shortdesc.xml">
 
 <!ENTITY texinfo-version "4.6">
 <!ENTITY texinfo-depversion "4.0">
diff --git a/entities/utillinux.ent b/entities/utillinux.ent
index 4341301bb..45a39e9e3 100644
--- a/entities/utillinux.ent
+++ b/entities/utillinux.ent
@@ -1,5 +1,3 @@
-<!ENTITY c4-utillinux SYSTEM "../chapter04/utillinux.xml">
-
 <!ENTITY c5-utillinux SYSTEM "../chapter05/utillinux.xml">
 <!ENTITY c5-utillinux-inst SYSTEM "../chapter05/utillinux-inst.xml">
 
@@ -7,10 +5,10 @@
 <!ENTITY c6-utillinux-inst SYSTEM "../chapter06/utillinux-inst.xml">
 
 <!ENTITY aa-utillinux SYSTEM "../appendixa/utillinux.xml">
+<!ENTITY aa-utillinux-shortdesc SYSTEM "../appendixa/utillinux-shortdesc.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 aa-utillinux-shortdesc SYSTEM "../appendixa/utillinux-shortdesc.xml">
 
 <!ENTITY util-linux-version "2.12">
 <!ENTITY util-linux-depversion "2.11n">
diff --git a/entities/vim.ent b/entities/vim.ent
index 5e35ab137..619fda5b4 100644
--- a/entities/vim.ent
+++ b/entities/vim.ent
@@ -1,15 +1,12 @@
-<!ENTITY c4-vim SYSTEM "../chapter04/vim.xml">
-
 <!ENTITY c6-vim SYSTEM "../chapter06/vim.xml">
 <!ENTITY c6-vim-inst SYSTEM "../chapter06/vim-inst.xml">
 <!ENTITY c6-cf-vim SYSTEM "../chapter06/config-vim.xml">
 
 <!ENTITY aa-vim SYSTEM "../appendixa/vim.xml">
+<!ENTITY aa-vim-shortdesc SYSTEM "../appendixa/vim-shortdesc.xml">
 <!ENTITY aa-vim-dep SYSTEM "../appendixa/vim-dep.xml">
 <!ENTITY aa-vim-desc SYSTEM "../appendixa/vim-desc.xml">
 <!ENTITY aa-vim-down SYSTEM "../appendixa/vim-down.xml">
-<!ENTITY aa-vim-shortdesc SYSTEM "../appendixa/vim-shortdesc.xml">
-<!ENTITY aa-vim-alt SYSTEM "../appendixa/vim-alt.xml">
 
 <!ENTITY vim-version "6.2">
 <!ENTITY vim-depversion "6.0">
diff --git a/entities/zlib.ent b/entities/zlib.ent
index e20ad827f..409325168 100644
--- a/entities/zlib.ent
+++ b/entities/zlib.ent
@@ -1,14 +1,11 @@
-<!ENTITY c4-zlib SYSTEM "../chapter04/zlib.xml">
-<!ENTITY c4-zlib-patch SYSTEM "../chapter04/zlib-patch.xml">
-
 <!ENTITY c6-zlib SYSTEM "../chapter06/zlib.xml">
 <!ENTITY c6-zlib-inst SYSTEM "../chapter06/zlib-inst.xml">
 
 <!ENTITY aa-zlib SYSTEM "../appendixa/zlib.xml">
+<!ENTITY aa-zlib-shortdesc SYSTEM "../appendixa/zlib-shortdesc.xml">
 <!ENTITY aa-zlib-desc SYSTEM "../appendixa/zlib-desc.xml">
 <!ENTITY aa-zlib-dep SYSTEM "../appendixa/zlib-dep.xml">
 <!ENTITY aa-zlib-down SYSTEM "../appendixa/zlib-down.xml">
-<!ENTITY aa-zlib-shortdesc SYSTEM "../appendixa/zlib-shortdesc.xml">
 
 <!ENTITY zlib-version "1.1.4">
 <!ENTITY zlib-depversion "1.1.4">