Revert Alex's changes back to previous state

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

127 files changed, 177 insertions, 99 deletions

diff --git a/appendixa/less.xml b/appendixa/less.xml
index dcef281cd..90e0583b4 100644
--- a/appendixa/less.xml
+++ b/appendixa/less.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-less"/>.</para>
 
 &aa-less-down;
+&aa-less-shortdesc;
+&aa-less-desc;
 &aa-less-dep;
 
 </sect1>
diff --git a/appendixa/lfs-utils-shortdesc.xml b/appendixa/lfs-utils-shortdesc.xml
index 454a33a9a..14cb50539 100644
--- a/appendixa/lfs-utils-shortdesc.xml
+++ b/appendixa/lfs-utils-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-lfs"><title>Contents of Lfs-Utils</title>
+<sect2><title>Contents of Lfs-Utils</title>
 
 <!-- <para>(Last checked against version &lfs-utils-contversion;.)</para> -->
 
diff --git a/appendixa/lfs-utils.xml b/appendixa/lfs-utils.xml
index f97c8eb20..d2b9c94a1 100644
--- a/appendixa/lfs-utils.xml
+++ b/appendixa/lfs-utils.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-lfs-utils"/>.</para>
 
 &aa-lfs-utils-down;
+&aa-lfs-utils-shortdesc;
+&aa-lfs-utils-desc;
 &aa-lfs-utils-dep;
 
 </sect1>
diff --git a/appendixa/libtool-shortdesc.xml b/appendixa/libtool-shortdesc.xml
index f73db53f8..a8feb6259 100644
--- a/appendixa/libtool-shortdesc.xml
+++ b/appendixa/libtool-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-libtool"><title>Contents of Libtool</title>
+<sect2><title>Contents of Libtool</title>
 
 <!-- <para>(Last checked against version &libtool-contversion;.)</para> -->
 
diff --git a/appendixa/libtool.xml b/appendixa/libtool.xml
index 4d840fad0..8df5a002c 100644
--- a/appendixa/libtool.xml
+++ b/appendixa/libtool.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-libtool"/>.</para>
 
 &aa-libtool-down;
+&aa-libtool-shortdesc;
+&aa-libtool-desc;
 &aa-libtool-dep;
 
 </sect1>
diff --git a/appendixa/m4-shortdesc.xml b/appendixa/m4-shortdesc.xml
index 64dcf30e9..7cf572dda 100644
--- a/appendixa/m4-shortdesc.xml
+++ b/appendixa/m4-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-m4"><title>Contents of M4</title>
+<sect2><title>Contents of M4</title>
 
 <!-- <para>(Last checked against version &m4-contversion;.)</para> -->
 
diff --git a/appendixa/m4.xml b/appendixa/m4.xml
index 18af45b03..0e2263837 100644
--- a/appendixa/m4.xml
+++ b/appendixa/m4.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-m4"/>.</para>
 
 &aa-m4-down;
+&aa-m4-shortdesc;
+&aa-m4-desc;
 &aa-m4-dep;
 
 </sect1>
diff --git a/appendixa/make-shortdesc.xml b/appendixa/make-shortdesc.xml
index c771b5e15..c30061dc2 100644
--- a/appendixa/make-shortdesc.xml
+++ b/appendixa/make-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-make"><title>Contents of Make</title>
+<sect2><title>Contents of Make</title>
 
 <!-- <para>(Last checked against version &make-contversion;.)</para> -->
 
diff --git a/appendixa/make.xml b/appendixa/make.xml
index 57bcdce42..2f08325a4 100644
--- a/appendixa/make.xml
+++ b/appendixa/make.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-make"/>.</para>
 
 &aa-make-down;
+&aa-make-shortdesc;
+&aa-make-desc;
 &aa-make-dep;
 
 </sect1>
diff --git a/appendixa/makedev-shortdesc.xml b/appendixa/makedev-shortdesc.xml
index 31d8a453c..c77310bd3 100644
--- a/appendixa/makedev-shortdesc.xml
+++ b/appendixa/makedev-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-makedev"><title>Contents of MAKEDEV</title>
+<sect2><title>Contents of MAKEDEV</title>
 
 <!-- <para>(Last checked against version &makedev-contversion;.)</para> -->
 
diff --git a/appendixa/makedev.xml b/appendixa/makedev.xml
index bea1cbe09..206fe934b 100644
--- a/appendixa/makedev.xml
+++ b/appendixa/makedev.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-makedev"/>.</para>
 
 &aa-makedev-down;
+&aa-makedev-shortdesc;
+&aa-makedev-desc;
 &aa-makedev-dep;
 
 </sect1>
diff --git a/appendixa/man-shortdesc.xml b/appendixa/man-shortdesc.xml
index fcebbc3c2..bd631b85e 100644
--- a/appendixa/man-shortdesc.xml
+++ b/appendixa/man-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-man"><title>Contents of Man</title>
+<sect2><title>Contents of Man</title>
 
 <!-- <para>(Last checked against version &man-contversion;.)</para> -->
 
diff --git a/appendixa/man.xml b/appendixa/man.xml
index 067c7ff07..9410cce74 100644
--- a/appendixa/man.xml
+++ b/appendixa/man.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-man"/>.</para>
 
 &aa-man-down;
+&aa-man-shortdesc;
+&aa-man-desc;
 &aa-man-dep;
 
 </sect1>
diff --git a/appendixa/manpages-shortdesc.xml b/appendixa/manpages-shortdesc.xml
index e963d0146..bb8b0579e 100644
--- a/appendixa/manpages-shortdesc.xml
+++ b/appendixa/manpages-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-manpages"><title>Contents of Man-pages</title>
+<sect2><title>Contents of Man-pages</title>
 
 <!-- <para>(Last checked against version &man-pages-contversion;.)</para> -->
 
diff --git a/appendixa/manpages.xml b/appendixa/manpages.xml
index b707ea298..1b59ce7ed 100644
--- a/appendixa/manpages.xml
+++ b/appendixa/manpages.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-manpages"/>.</para>
 
 &aa-manpages-down;
+&aa-manpages-shortdesc;
+&aa-manpages-desc;
 &aa-manpages-dep;
 
 </sect1>
diff --git a/appendixa/modutils-shortdesc.xml b/appendixa/modutils-shortdesc.xml
index 43de4d2f4..6fd5849ae 100644
--- a/appendixa/modutils-shortdesc.xml
+++ b/appendixa/modutils-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-modutils"><title>Contents of Modutils</title>
+<sect2><title>Contents of Modutils</title>
 
 <!-- <para>(Last checked against version &modutils-contversion;.)</para> -->
 
diff --git a/appendixa/modutils.xml b/appendixa/modutils.xml
index fd5957ce2..349f267d2 100644
--- a/appendixa/modutils.xml
+++ b/appendixa/modutils.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-modutils"/>.</para>
 
 &aa-modutils-down;
+&aa-modutils-shortdesc;
+&aa-modutils-desc;
 &aa-modutils-dep;
 
 </sect1>
diff --git a/appendixa/ncurses-shortdesc.xml b/appendixa/ncurses-shortdesc.xml
index 551c62607..217148d20 100644
--- a/appendixa/ncurses-shortdesc.xml
+++ b/appendixa/ncurses-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-ncurses"><title>Contents of Ncurses</title>
+<sect2><title>Contents of Ncurses</title>
 
 <!-- <para>(Last checked against version &ncurses-contversion;.)</para> -->
 
diff --git a/appendixa/ncurses.xml b/appendixa/ncurses.xml
index 376824ebd..f45886a47 100644
--- a/appendixa/ncurses.xml
+++ b/appendixa/ncurses.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-ncurses"/>.</para>
 
 &aa-ncurses-down;
+&aa-ncurses-shortdesc;
+&aa-ncurses-desc;
 &aa-ncurses-dep;
 
 </sect1>
diff --git a/appendixa/nettools-shortdesc.xml b/appendixa/nettools-shortdesc.xml
index 8746b0ac9..c11e3e90e 100644
--- a/appendixa/nettools-shortdesc.xml
+++ b/appendixa/nettools-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-net"><title>Contents of Net-tools</title>
+<sect2><title>Contents of Net-tools</title>
 
 <!-- <para>(Last checked against version &net-tools-contversion;.)</para> -->
 
diff --git a/appendixa/nettools.xml b/appendixa/nettools.xml
index c41cd5dd4..15b633bb1 100644
--- a/appendixa/nettools.xml
+++ b/appendixa/nettools.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-nettools"/>.</para>
 
 &aa-nettools-down;
+&aa-nettools-shortdesc;
+&aa-nettools-desc;
 &aa-nettools-dep;
 
 </sect1>
diff --git a/appendixa/patch-shortdesc.xml b/appendixa/patch-shortdesc.xml
index acc095910..7308fdeca 100644
--- a/appendixa/patch-shortdesc.xml
+++ b/appendixa/patch-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-patch"><title>Contents of Patch</title>
+<sect2><title>Contents of Patch</title>
 
 <!-- <para>(Last checked against version &patch-contversion;.)</para> -->
 
diff --git a/appendixa/patch.xml b/appendixa/patch.xml
index dc7d25466..fbfe93e57 100644
--- a/appendixa/patch.xml
+++ b/appendixa/patch.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-patch"/>.</para>
 
 &aa-patch-down;
+&aa-patch-shortdesc;
+&aa-patch-desc;
 &aa-patch-dep;
 
 </sect1>
diff --git a/appendixa/perl-shortdesc.xml b/appendixa/perl-shortdesc.xml
index bc215a020..a3bdd9bf7 100644
--- a/appendixa/perl-shortdesc.xml
+++ b/appendixa/perl-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-perl"><title>Contents of Perl</title>
+<sect2><title>Contents of Perl</title>
 
 <!-- <para>(Last checked against version &perl-contversion;.)</para> -->
 
diff --git a/appendixa/perl.xml b/appendixa/perl.xml
index 2c5587beb..60f20473c 100644
--- a/appendixa/perl.xml
+++ b/appendixa/perl.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-perl"/>.</para>
 
 &aa-perl-down;
+&aa-perl-shortdesc;
+&aa-perl-desc;
 &aa-perl-dep;
 
 </sect1>
diff --git a/appendixa/procinfo-shortdesc.xml b/appendixa/procinfo-shortdesc.xml
index 8c13d0dc5..55d7c2e2b 100644
--- a/appendixa/procinfo-shortdesc.xml
+++ b/appendixa/procinfo-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-procinfo"><title>Contents of Procinfo</title>
+<sect2><title>Contents of Procinfo</title>
 
 <!-- <para>(Last checked against version &procinfo-contversion;.)</para> -->
 
diff --git a/appendixa/procinfo.xml b/appendixa/procinfo.xml
index 2feabc630..6ae3cb78c 100644
--- a/appendixa/procinfo.xml
+++ b/appendixa/procinfo.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-procinfo"/>.</para>
 
 &aa-procinfo-down;
+&aa-procinfo-shortdesc;
+&aa-procinfo-desc;
 &aa-procinfo-dep;
 
 </sect1>
diff --git a/appendixa/procps-shortdesc.xml b/appendixa/procps-shortdesc.xml
index 5b443c55f..33141ed50 100644
--- a/appendixa/procps-shortdesc.xml
+++ b/appendixa/procps-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-procps"><title>Contents of Procps</title>
+<sect2><title>Contents of Procps</title>
 
 <!-- <para>(Last checked against version &procps-contversion;.)</para> -->
 
diff --git a/appendixa/procps.xml b/appendixa/procps.xml
index d6bd8dfa6..a2b82a10a 100644
--- a/appendixa/procps.xml
+++ b/appendixa/procps.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-procps"/>.</para>
 
 &aa-procps-down;
+&aa-procps-shortdesc;
+&aa-procps-desc;
 &aa-procps-dep;
 
 </sect1>
diff --git a/appendixa/psmisc-shortdesc.xml b/appendixa/psmisc-shortdesc.xml
index c695d6ff5..3a9526cb7 100644
--- a/appendixa/psmisc-shortdesc.xml
+++ b/appendixa/psmisc-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-psmisc"><title>Contents of Psmisc</title>
+<sect2><title>Contents of Psmisc</title>
 
 <!-- <para>(Last checked against version &psmisc-contversion;.)</para> -->
 
diff --git a/appendixa/psmisc.xml b/appendixa/psmisc.xml
index 18b439855..78f61b1be 100644
--- a/appendixa/psmisc.xml
+++ b/appendixa/psmisc.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-psmisc"/>.</para>
 
 &aa-psmisc-down;
+&aa-psmisc-shortdesc;
+&aa-psmisc-desc;
 &aa-psmisc-dep;
 
 </sect1>
diff --git a/appendixa/sed-shortdesc.xml b/appendixa/sed-shortdesc.xml
index b291c660c..f56546602 100644
--- a/appendixa/sed-shortdesc.xml
+++ b/appendixa/sed-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-sed"><title>Contents of Sed</title>
+<sect2><title>Contents of Sed</title>
 
 <!-- <para>(Last checked against version &sed-contversion;.)</para> -->
 
diff --git a/appendixa/sed.xml b/appendixa/sed.xml
index f3098d1b7..48cfa4318 100644
--- a/appendixa/sed.xml
+++ b/appendixa/sed.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-sed"/>.</para>
 
 &aa-sed-down;
+&aa-sed-shortdesc;
+&aa-sed-desc;
 &aa-sed-dep;
 
 </sect1>
diff --git a/appendixa/shadowpwd-shortdesc.xml b/appendixa/shadowpwd-shortdesc.xml
index fd6847106..b44a5c9cd 100644
--- a/appendixa/shadowpwd-shortdesc.xml
+++ b/appendixa/shadowpwd-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-shadow"><title>Contents of Shadow</title>
+<sect2><title>Contents of Shadow</title>
 
 <!-- <para>(Last checked against version &shadow-contversion;.)</para> -->
 
diff --git a/appendixa/shadowpwd.xml b/appendixa/shadowpwd.xml
index 24047b5e0..711f7a1b2 100644
--- a/appendixa/shadowpwd.xml
+++ b/appendixa/shadowpwd.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-shadow"/>.</para>
 
 &aa-shadowpwd-down;
+&aa-shadowpwd-shortdesc;
+&aa-shadowpwd-desc;
 &aa-shadowpwd-dep;
 
 </sect1>
diff --git a/appendixa/sysklogd-shortdesc.xml b/appendixa/sysklogd-shortdesc.xml
index f6c6304d2..4e4f9cd44 100644
--- a/appendixa/sysklogd-shortdesc.xml
+++ b/appendixa/sysklogd-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-sysklogd"><title>Contents of Sysklogd</title>
+<sect2><title>Contents of Sysklogd</title>
 
 <!-- <para>(Last checked against version &sysklogd-contversion;.)</para> -->
 
diff --git a/appendixa/sysklogd.xml b/appendixa/sysklogd.xml
index 3150ccc4a..c3a54c1b2 100644
--- a/appendixa/sysklogd.xml
+++ b/appendixa/sysklogd.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-sysklogd"/>.</para>
 
 &aa-sysklogd-down;
+&aa-sysklogd-shortdesc;
+&aa-sysklogd-desc;
 &aa-sysklogd-dep;
 
 </sect1>
diff --git a/appendixa/sysvinit-shortdesc.xml b/appendixa/sysvinit-shortdesc.xml
index dd5f4b3f3..95464553b 100644
--- a/appendixa/sysvinit-shortdesc.xml
+++ b/appendixa/sysvinit-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-sysvinit"><title>Contents of Sysvinit</title>
+<sect2><title>Contents of Sysvinit</title>
 
 <!-- <para>(Last checked against version &sysvinit-contversion;.)</para> -->
 
diff --git a/appendixa/sysvinit.xml b/appendixa/sysvinit.xml
index be95c404b..2410fd031 100644
--- a/appendixa/sysvinit.xml
+++ b/appendixa/sysvinit.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-sysvinit"/>.</para>
 
 &aa-sysvinit-down;
+&aa-sysvinit-shortdesc;
+&aa-sysvinit-desc;
 &aa-sysvinit-dep;
 
 </sect1>
diff --git a/appendixa/tar-shortdesc.xml b/appendixa/tar-shortdesc.xml
index ce5e902e4..ab20a0223 100644
--- a/appendixa/tar-shortdesc.xml
+++ b/appendixa/tar-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-tar"><title>Contents of Tar</title>
+<sect2><title>Contents of Tar</title>
 
 <!-- <para>(Last checked against version &tar-contversion;.)</para> -->
 
diff --git a/appendixa/tar.xml b/appendixa/tar.xml
index 982c38774..68e0f8cbc 100644
--- a/appendixa/tar.xml
+++ b/appendixa/tar.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-tar"/>.</para>
 
 &aa-tar-down;
+&aa-tar-shortdesc;
+&aa-tar-desc;
 &aa-tar-dep;
 
 </sect1>
diff --git a/appendixa/tcl-shortdesc.xml b/appendixa/tcl-shortdesc.xml
index b969ee666..bfe6ed2bd 100644
--- a/appendixa/tcl-shortdesc.xml
+++ b/appendixa/tcl-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-tcl"><title>Contents of Tcl</title>
+<sect2><title>Contents of Tcl</title>
 
 <!-- <para>(Last checked against version &tcl-contversion;.)</para> -->
 
diff --git a/appendixa/tcl.xml b/appendixa/tcl.xml
index 77bf5df7c..ca0445c09 100644
--- a/appendixa/tcl.xml
+++ b/appendixa/tcl.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch05-tcl"/>.</para>
 
 &aa-tcl-down;
+&aa-tcl-shortdesc;
+&aa-tcl-desc;
 &aa-tcl-dep;
 
 </sect1>
diff --git a/appendixa/texinfo-shortdesc.xml b/appendixa/texinfo-shortdesc.xml
index 7f36e41ca..c8a7e98f7 100644
--- a/appendixa/texinfo-shortdesc.xml
+++ b/appendixa/texinfo-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-texinfo"><title>Contents of Texinfo</title>
+<sect2><title>Contents of Texinfo</title>
 
 <!-- <para>(Last checked against version &texinfo-contversion;.)</para> -->
 
diff --git a/appendixa/texinfo.xml b/appendixa/texinfo.xml
index 6332646ca..c74c66278 100644
--- a/appendixa/texinfo.xml
+++ b/appendixa/texinfo.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-texinfo"/>.</para>
 
 &aa-texinfo-down;
+&aa-texinfo-shortdesc;
+&aa-texinfo-desc;
 &aa-texinfo-dep;
 
 </sect1>
diff --git a/appendixa/utillinux-shortdesc.xml b/appendixa/utillinux-shortdesc.xml
index 14f64f7b6..255742eb8 100644
--- a/appendixa/utillinux-shortdesc.xml
+++ b/appendixa/utillinux-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-utillinux"><title>Contents of Util-linux</title>
+<sect2><title>Contents of Util-linux</title>
 
 <!-- <para>(Last checked against version &util-linux-contversion;.)</para> -->
 
diff --git a/appendixa/utillinux.xml b/appendixa/utillinux.xml
index 6a23948bf..0f53e0bab 100644
--- a/appendixa/utillinux.xml
+++ b/appendixa/utillinux.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-utillinux"/>.</para>
 
 &aa-utillinux-down;
+&aa-utillinux-shortdesc;
+&aa-utillinux-desc;
 &aa-utillinux-dep;
 
 </sect1>
diff --git a/appendixa/vim-shortdesc.xml b/appendixa/vim-shortdesc.xml
index 13292d8ef..5e00b9b44 100644
--- a/appendixa/vim-shortdesc.xml
+++ b/appendixa/vim-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-vim"><title>Contents of Vim</title>
+<sect2><title>Contents of Vim</title>
 
 <!-- <para>(Last checked against version &vim-contversion;.)</para> -->
 
diff --git a/appendixa/vim.xml b/appendixa/vim.xml
index 628f5dcc8..ac02d83f2 100644
--- a/appendixa/vim.xml
+++ b/appendixa/vim.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-vim"/>.</para>
 
 &aa-vim-down;
+&aa-vim-shortdesc;
+&aa-vim-desc;
 &aa-vim-dep;
 
 </sect1>
diff --git a/appendixa/zlib-shortdesc.xml b/appendixa/zlib-shortdesc.xml
index e76e10784..aeb804e8c 100644
--- a/appendixa/zlib-shortdesc.xml
+++ b/appendixa/zlib-shortdesc.xml
@@ -1,4 +1,4 @@
-<sect2 id="contents-zlib"><title>Contents of Zlib</title>
+<sect2><title>Contents of Zlib</title>
 
 <!-- <para>(Last checked against version &zlib-contversion;.)</para> -->
 
diff --git a/appendixa/zlib.xml b/appendixa/zlib.xml
index b2548ba7d..97e338cbd 100644
--- a/appendixa/zlib.xml
+++ b/appendixa/zlib.xml
@@ -5,6 +5,8 @@
 <para>For installation instructions see <xref linkend="ch06-zlib"/>.</para>
 
 &aa-zlib-down;
+&aa-zlib-shortdesc;
+&aa-zlib-desc;
 &aa-zlib-dep;
 
 </sect1>
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index a285c038c..16824d4dd 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &bash-time-tools; 
 Estimated required disk space:  &bash-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-bash"/>.</para>
+&aa-bash-shortdesc;
+&aa-bash-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 0ff391dca..2e2e46ba2 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &binutils-time-tools-pass1;
 Estimated required disk space:  &binutils-compsize-tools-pass1;</screen>
 
-<para>For the package details see <xref linkend="contents-binutils"/>.</para>
+&aa-binutils-shortdesc;
+&aa-binutils-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/bzip2.xml b/chapter05/bzip2.xml
index c84ca8703..be20eae98 100644
--- a/chapter05/bzip2.xml
+++ b/chapter05/bzip2.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &bzip2-time-tools;
 Estimated required disk space:  &bzip2-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-bzip2"/>.</para>
+&aa-bzip2-shortdesc;
+&aa-bzip2-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml
index 72eb89a86..f0a1eb7fb 100644
--- a/chapter05/coreutils.xml
+++ b/chapter05/coreutils.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &coreutils-time-tools;
 Estimated required disk space:  &coreutils-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-coreutils"/>.</para>
+&aa-coreutils-shortdesc;
+&aa-coreutils-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index 2e8a785c5..dc37b94de 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &dejagnu-compsize-tools;</screen>
 
 &aa-dejagnu-shortdesc;
-&aa-dejagnu-desc;
+&aa-dejagnu-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml
index 3d0aeeb88..32ed45ce2 100644
--- a/chapter05/diffutils.xml
+++ b/chapter05/diffutils.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &diffutils-time-tools;
 Estimated required disk space:  &diffutils-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-diffutils"/>.</para>
+&aa-diffutils-shortdesc;
+&aa-diffutils-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 56a3c8a85..f2505d1ae 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &expect-compsize-tools;</screen>
 
 &aa-expect-shortdesc;
-&aa-expect-desc;
+&aa-expect-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/findutils.xml b/chapter05/findutils.xml
index 0b6d3547c..19cf03288 100644
--- a/chapter05/findutils.xml
+++ b/chapter05/findutils.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &findutils-time-tools;
 Estimated required disk space:  &findutils-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-findutils"/>.</para>
+&aa-findutils-shortdesc;
+&aa-findutils-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml
index dea6ee46b..48c9cb61f 100644
--- a/chapter05/gawk.xml
+++ b/chapter05/gawk.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &gawk-time-tools;
 Estimated required disk space:  &gawk-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-gawk"/>.</para>
+&aa-gawk-shortdesc;
+&aa-gawk-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 4ca3a47da..226b67333 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &gcc-time-tools-pass1;
 Estimated required disk space:  &gcc-compsize-tools-pass1;</screen>
 
-<para>For the package details see <xref linkend="contents-gcc"/>.</para>
+&aa-gcc-shortdesc;
+&aa-gcc-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index 146c55000..18a3d57c8 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &gettext-time-tools;
 Estimated required disk space:  &gettext-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-gettext"/>.</para>
+&aa-gettext-shortdesc;
+&aa-gettext-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 22c10df0d..aa333a2bd 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &glibc-time-tools;
 Estimated required disk space:  &glibc-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-glibc"/>.</para>
+&aa-glibc-shortdesc;
+&aa-glibc-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index 5e293fac6..f5e06b0df 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &grep-time-tools;
 Estimated required disk space:  &grep-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-grep"/>.</para>
+&aa-grep-shortdesc;
+&aa-grep-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml
index 2f27a0379..149208f6d 100644
--- a/chapter05/gzip.xml
+++ b/chapter05/gzip.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &gzip-time-tools;
 Estimated required disk space:  &gzip-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-gzip"/>.</para>
+&aa-gzip-shortdesc;
+&aa-gzip-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/kernelheaders.xml b/chapter05/kernelheaders.xml
index 8d4d2b40e..a5f3e3a0b 100644
--- a/chapter05/kernelheaders.xml
+++ b/chapter05/kernelheaders.xml
@@ -5,6 +5,9 @@
 <screen>Estimated build time:           &kernel-time-headers;
 Estimated required disk space:  &kernel-compsize-headers;</screen>
 
+&aa-kernel-shortdesc;
+&aa-kernel-dep;
+
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
diff --git a/chapter05/make.xml b/chapter05/make.xml
index 395a5d23e..6307edb8f 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &make-time-tools;
 Estimated required disk space:  &make-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-make"/>.</para>
+&aa-make-shortdesc;
+&aa-make-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index 25ebb14fc..045bd3412 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &ncurses-time-tools;
 Estimated required disk space:  &ncurses-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-ncurses"/>.</para>
+&aa-ncurses-shortdesc;
+&aa-ncurses-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/patch.xml b/chapter05/patch.xml
index e0aef0faf..fc4e874bf 100644
--- a/chapter05/patch.xml
+++ b/chapter05/patch.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &patch-time-tools;
 Estimated required disk space:  &patch-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-patch"/>.</para>
+&aa-patch-shortdesc;
+&aa-patch-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/perl.xml b/chapter05/perl.xml
index 2a332ca5e..be1597e30 100644
--- a/chapter05/perl.xml
+++ b/chapter05/perl.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &perl-time-tools;
 Estimated required disk space:  &perl-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-perl"/>.</para>
+&aa-perl-shortdesc;
+&aa-perl-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/sed.xml b/chapter05/sed.xml
index 6c9a30d77..0e202650f 100644
--- a/chapter05/sed.xml
+++ b/chapter05/sed.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &sed-time-tools;
 Estimated required disk space:  &sed-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-sed"/>.</para>
+&aa-sed-shortdesc;
+&aa-sed-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/tar.xml b/chapter05/tar.xml
index b3b926078..50bdd5aba 100644
--- a/chapter05/tar.xml
+++ b/chapter05/tar.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &tar-time-tools;
 Estimated required disk space:  &tar-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-tar"/>.</para>
+&aa-tar-shortdesc;
+&aa-tar-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index 62f165c50..364be9ce9 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &tcl-compsize-tools;</screen>
 
 &aa-tcl-shortdesc;
-&aa-tcl-desc;
+&aa-tcl-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/texinfo.xml b/chapter05/texinfo.xml
index d8f25a5bf..eb9fa9ab4 100644
--- a/chapter05/texinfo.xml
+++ b/chapter05/texinfo.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &texinfo-time-tools;
 Estimated required disk space:  &texinfo-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-texinfo"/>.</para>
+&aa-texinfo-shortdesc;
+&aa-texinfo-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/utillinux.xml b/chapter05/utillinux.xml
index 06f9d6a81..33c79ff99 100644
--- a/chapter05/utillinux.xml
+++ b/chapter05/utillinux.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &util-linux-time-tools;
 Estimated required disk space:  &util-linux-compsize-tools;</screen>
 
-<para>For the package details see <xref linkend="contents-utillinux"/>.</para>
+&aa-utillinux-shortdesc;
+&aa-utillinux-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml
index 0174f6954..0d43410fa 100644
--- a/chapter06/autoconf.xml
+++ b/chapter06/autoconf.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &autoconf-compsize;</screen>
 
 &aa-autoconf-shortdesc;
-&aa-autoconf-desc;
+&aa-autoconf-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 <sect2>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 62c03f92d..8f52c9d58 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &automake-compsize;</screen>
 
 &aa-automake-shortdesc;
-&aa-automake-desc;
+&aa-automake-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index da0139644..c2703142a 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &bash-compsize;</screen>
 
 &aa-bash-shortdesc;
-&aa-bash-desc;
+&aa-bash-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 9986fc344..872fff1ab 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &binutils-compsize;</screen>
 
 &aa-binutils-shortdesc;
-&aa-binutils-desc;
+&aa-binutils-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index 80e2ebd4f..5d525b96f 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &bison-compsize;</screen>
 
 &aa-bison-shortdesc;
-&aa-bison-desc;
+&aa-bison-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/bootscripts.xml b/chapter06/bootscripts.xml
index 1360b2653..6c3a21963 100644
--- a/chapter06/bootscripts.xml
+++ b/chapter06/bootscripts.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &bootscripts-compsize;</screen>
 
 &aa-bootscripts-shortdesc;
-&aa-bootscripts-desc;
+&aa-bootscripts-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index e55af375f..6b1c4f695 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &bzip2-compsize;</screen>
 
 &aa-bzip2-shortdesc;
-&aa-bzip2-desc;
+&aa-bzip2-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 996a17b5e..93f799423 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -424,6 +424,7 @@ different.</para>
 &c6-sysvinit;
 &c6-tar;
 &c6-utillinux;
+&c6-gcc-2953;
 
 
 <sect1 id="ch06-revisedchroot">
@@ -446,7 +447,6 @@ just yet. There is still some use for it towards the end of the book.</para>
 </sect1>
 
 
-&c6-gcc-2953;
 &c6-bootscripts;
 &c6-aboutdebug;
 
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 06e640fb2..cbddb98f0 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &coreutils-compsize;</screen>
 
 &aa-coreutils-shortdesc;
-&aa-coreutils-desc;
+&aa-coreutils-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index cd8fe92d0..321081944 100644
--- a/chapter06/diffutils.xml
+++ b/chapter06/diffutils.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &diffutils-compsize;</screen>
 
 &aa-diffutils-shortdesc;
-&aa-diffutils-desc;
+&aa-diffutils-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index c8a23e6ca..d9ff51cb9 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &e2fsprogs-compsize;</screen>
 
 &aa-e2fsprogs-shortdesc;
-&aa-e2fsprogs-desc;
+&aa-e2fsprogs-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/ed.xml b/chapter06/ed.xml
index 24a26e7c3..dd1b7ebc4 100644
--- a/chapter06/ed.xml
+++ b/chapter06/ed.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &ed-compsize;</screen>
 
 &aa-ed-shortdesc;
-&aa-ed-desc;
+&aa-ed-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/file.xml b/chapter06/file.xml
index e251d805d..d21b96286 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &file-compsize;</screen>
 
 &aa-file-shortdesc;
-&aa-file-desc;
+&aa-file-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index 8c9b35ce4..5c2c0e956 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &findutils-compsize;</screen>
 
 &aa-findutils-shortdesc;
-&aa-findutils-desc;
+&aa-findutils-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 9a693786e..d202df991 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &flex-compsize;</screen>
 
 &aa-flex-shortdesc;
-&aa-flex-desc;
+&aa-flex-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index f5ecbc4a8..a25cfaec5 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &gawk-compsize;</screen>
 
 &aa-gawk-shortdesc;
-&aa-gawk-desc;
+&aa-gawk-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 6c3e21bc4..54a105db1 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &gcc-compsize;</screen>
 
 &aa-gcc-shortdesc;
-&aa-gcc-desc;
+&aa-gcc-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index 7a14241ed..63d473121 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &gettext-compsize;</screen>
 
 &aa-gettext-shortdesc;
-&aa-gettext-desc;
+&aa-gettext-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 0869a7220..c2df2bfb8 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &glibc-compsize;</screen>
 
 &aa-glibc-shortdesc;
-&aa-glibc-desc;
+&aa-glibc-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index 29153dc55..a68e7a271 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &grep-compsize;</screen>
 
 &aa-grep-shortdesc;
-&aa-grep-desc;
+&aa-grep-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index 43d79fd28..de9cc25d3 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &groff-compsize;</screen>
 
 &aa-groff-shortdesc;
-&aa-groff-desc;
+&aa-groff-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index 3d57e6f5d..929e2310b 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &grub-compsize;</screen>
 
 &aa-grub-shortdesc;
-&aa-grub-desc;
+&aa-grub-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 1d01e9582..7e097a06e 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &gzip-compsize;</screen>
 
 &aa-gzip-shortdesc;
-&aa-gzip-desc;
+&aa-gzip-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 0816ebd03..fd448abdb 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &inetutils-compsize;</screen>
 
 &aa-inetutils-shortdesc;
-&aa-inetutils-desc;
+&aa-inetutils-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index e5f0441c1..0f4894751 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &kbd-compsize;</screen>
 
 &aa-kbd-shortdesc;
-&aa-kbd-desc;
+&aa-kbd-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/kernel.xml b/chapter06/kernel.xml
index e3df3b1eb..b03c7adc7 100644
--- a/chapter06/kernel.xml
+++ b/chapter06/kernel.xml
@@ -5,6 +5,9 @@
 <screen>Estimated build time:           &kernel-time-headers;
 Estimated required disk space:  &kernel-compsize-headers;</screen>
 
+&aa-kernel-shortdesc;
+&aa-kernel-dep;
+
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
diff --git a/chapter06/less.xml b/chapter06/less.xml
index 31d3c1624..0508af478 100644
--- a/chapter06/less.xml
+++ b/chapter06/less.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &less-compsize;</screen>
 
 &aa-less-shortdesc;
-&aa-less-desc;
+&aa-less-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/lfs-utils.xml b/chapter06/lfs-utils.xml
index c4d6afce6..5119b4804 100644
--- a/chapter06/lfs-utils.xml
+++ b/chapter06/lfs-utils.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &lfs-utils-compsize;</screen>
 
 &aa-lfs-utils-shortdesc;
-&aa-lfs-utils-desc;
+&aa-lfs-utils-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index 7b5bd2642..9e9f9457f 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &libtool-compsize;</screen>
 
 &aa-libtool-shortdesc;
-&aa-libtool-desc;
+&aa-libtool-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index d1eca7aad..b52647f10 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &m4-compsize;</screen>
 
 &aa-m4-shortdesc;
-&aa-m4-desc;
+&aa-m4-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/make.xml b/chapter06/make.xml
index 3f641ec11..f24d53ee3 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &make-compsize;</screen>
 
 &aa-make-shortdesc;
-&aa-make-desc;
+&aa-make-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/makedev.xml b/chapter06/makedev.xml
index da7f52e96..acb766683 100644
--- a/chapter06/makedev.xml
+++ b/chapter06/makedev.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &makedev-compsize;</screen>
 
 &aa-makedev-shortdesc;
-&aa-makedev-desc;
+&aa-makedev-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/man.xml b/chapter06/man.xml
index 67afb3c8d..833ff0e8e 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &man-compsize;</screen>
 
 &aa-man-shortdesc;
-&aa-man-desc;
+&aa-man-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/manpages.xml b/chapter06/manpages.xml
index d1f2adbcf..699f68b74 100644
--- a/chapter06/manpages.xml
+++ b/chapter06/manpages.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &man-pages-compsize;</screen>
 
 &aa-manpages-shortdesc;
-&aa-manpages-desc;
+&aa-manpages-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/modutils.xml b/chapter06/modutils.xml
index c148211f8..d5c6708f1 100644
--- a/chapter06/modutils.xml
+++ b/chapter06/modutils.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &modutils-compsize;</screen>
 
 &aa-modutils-shortdesc;
-&aa-modutils-desc;
+&aa-modutils-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 6e752ffdf..9c194834b 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &ncurses-compsize;</screen>
 
 &aa-ncurses-shortdesc;
-&aa-ncurses-desc;
+&aa-ncurses-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/nettools.xml b/chapter06/nettools.xml
index 1664b3211..61a6359d6 100644
--- a/chapter06/nettools.xml
+++ b/chapter06/nettools.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &net-tools-compsize;</screen>
 
 &aa-nettools-shortdesc;
-&aa-nettools-desc;
+&aa-nettools-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/patch.xml b/chapter06/patch.xml
index c5f680eb3..cc634a8e8 100644
--- a/chapter06/patch.xml
+++ b/chapter06/patch.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &patch-compsize;</screen>
 
 &aa-patch-shortdesc;
-&aa-patch-desc;
+&aa-patch-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index ecef68538..5e90ec069 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &perl-compsize;</screen>
 
 &aa-perl-shortdesc;
-&aa-perl-desc;
+&aa-perl-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/procinfo.xml b/chapter06/procinfo.xml
index 8114b8c5f..e02b583b6 100644
--- a/chapter06/procinfo.xml
+++ b/chapter06/procinfo.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &procinfo-compsize;</screen>
 
 &aa-procinfo-shortdesc;
-&aa-procinfo-desc;
+&aa-procinfo-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index d28b0850d..9dda8547f 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &procps-compsize;</screen>
 
 &aa-procps-shortdesc;
-&aa-procps-desc;
+&aa-procps-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index 3080e0dc6..3b939961d 100644
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &psmisc-compsize;</screen>
 
 &aa-psmisc-shortdesc;
-&aa-psmisc-desc;
+&aa-psmisc-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index dcfea0c57..25f9b488d 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &sed-compsize;</screen>
 
 &aa-sed-shortdesc;
-&aa-sed-desc;
+&aa-sed-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/shadowpwd.xml b/chapter06/shadowpwd.xml
index b7ed2d63e..aeaefac1c 100644
--- a/chapter06/shadowpwd.xml
+++ b/chapter06/shadowpwd.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &shadow-compsize;</screen>
 
 &aa-shadowpwd-shortdesc;
-&aa-shadowpwd-desc;
+&aa-shadowpwd-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index b4b01baaf..2d8dd4aa9 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &sysklogd-compsize;</screen>
 
 &aa-sysklogd-shortdesc;
-&aa-sysklogd-desc;
+&aa-sysklogd-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 9bdb0aae3..2f771b460 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &sysvinit-compsize;</screen>
 
 &aa-sysvinit-shortdesc;
-&aa-sysvinit-desc;
+&aa-sysvinit-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index 627f59a19..2e21fad4f 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &tar-compsize;</screen>
 
 &aa-tar-shortdesc;
-&aa-tar-desc;
+&aa-tar-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 97a684090..a3d5cadd2 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &texinfo-compsize;</screen>
 
 &aa-texinfo-shortdesc;
-&aa-texinfo-desc;
+&aa-texinfo-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/utillinux.xml b/chapter06/utillinux.xml
index 50b954657..8689c09a6 100644
--- a/chapter06/utillinux.xml
+++ b/chapter06/utillinux.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &util-linux-compsize;</screen>
 
 &aa-utillinux-shortdesc;
-&aa-utillinux-desc;
+&aa-utillinux-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 8a449adac..8eb1bb7d2 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -15,7 +15,7 @@ suggested installation instructions.</para>
 </sect2>
 
 &aa-vim-shortdesc;
-&aa-vim-desc;
+&aa-vim-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index 78db26c7e..fba00043f 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &zlib-compsize;</screen>
 
 &aa-zlib-shortdesc;
-&aa-zlib-desc;
+&aa-zlib-dep;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index df5565f65..f9587ac72 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &kernel-compsize;</screen>
 
 &aa-kernel-shortdesc;
-&aa-kernel-desc;
+&aa-kernel-dep;
 &c8-kernel-inst;
 
 </sect1>