Revert Alex's changes back to previous state

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

51 files changed, 53 insertions, 50 deletions

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>