Moving short descriptions from appendix to chapter 6.

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

99 files changed, 50 insertions, 148 deletions

diff --git a/appendixa/autoconf.xml b/appendixa/autoconf.xml
index 89117a9b2..3286a2c2f 100644
--- a/appendixa/autoconf.xml
+++ b/appendixa/autoconf.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-autoconf"/>.</para>
 
 &aa-autoconf-down;
-&aa-autoconf-shortdesc;
-&aa-autoconf-desc;
 &aa-autoconf-dep;
 
 </sect1>
diff --git a/appendixa/automake.xml b/appendixa/automake.xml
index 4d894d9bb..65d504424 100644
--- a/appendixa/automake.xml
+++ b/appendixa/automake.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-automake"/>.</para>
 
 &aa-automake-down;
-&aa-automake-shortdesc;
-&aa-automake-desc;
 &aa-automake-dep;
 
 </sect1>
diff --git a/appendixa/bash.xml b/appendixa/bash.xml
index efff57ae3..b3c881f1c 100644
--- a/appendixa/bash.xml
+++ b/appendixa/bash.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-bash"/>.</para>
 
 &aa-bash-down;
-&aa-bash-shortdesc;
-&aa-bash-desc;
 &aa-bash-dep;
 
 </sect1>
diff --git a/appendixa/binutils.xml b/appendixa/binutils.xml
index b844e14c2..d319c5c95 100644
--- a/appendixa/binutils.xml
+++ b/appendixa/binutils.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-binutils"/>.</para>
 
 &aa-binutils-down;
-&aa-binutils-shortdesc;
-&aa-binutils-desc;
 &aa-binutils-dep;
 
 </sect1>
diff --git a/appendixa/bison.xml b/appendixa/bison.xml
index ec172a1c7..778af758c 100644
--- a/appendixa/bison.xml
+++ b/appendixa/bison.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-bison"/>.</para>
 
 &aa-bison-down;
-&aa-bison-shortdesc;
-&aa-bison-desc;
 &aa-bison-dep;
 
 </sect1>
diff --git a/appendixa/bootscripts.xml b/appendixa/bootscripts.xml
index 9260eb21b..fb66d1e32 100644
--- a/appendixa/bootscripts.xml
+++ b/appendixa/bootscripts.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-bootscripts"/>.</para>
 
 &aa-bootscripts-down;
-&aa-bootscripts-shortdesc;
-&aa-bootscripts-desc;
 &aa-bootscripts-dep;
 
 </sect1>
diff --git a/appendixa/bzip2.xml b/appendixa/bzip2.xml
index 390c334a3..d72394ad3 100644
--- a/appendixa/bzip2.xml
+++ b/appendixa/bzip2.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-bzip2"/>.</para>
 
 &aa-bzip2-down;
-&aa-bzip2-shortdesc;
-&aa-bzip2-desc;
 &aa-bzip2-dep;
 
 </sect1>
diff --git a/appendixa/coreutils.xml b/appendixa/coreutils.xml
index a104bbc58..69848618b 100644
--- a/appendixa/coreutils.xml
+++ b/appendixa/coreutils.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-coreutils"/>.</para>
 
 &aa-coreutils-down;
-&aa-coreutils-shortdesc;
-&aa-coreutils-desc;
 &aa-coreutils-dep;
 
 </sect1>
diff --git a/appendixa/diffutils.xml b/appendixa/diffutils.xml
index 37854772a..3402b9ddf 100644
--- a/appendixa/diffutils.xml
+++ b/appendixa/diffutils.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-diffutils"/>.</para>
 
 &aa-diffutils-down;
-&aa-diffutils-shortdesc;
-&aa-diffutils-desc;
 &aa-diffutils-dep;
 
 </sect1>
diff --git a/appendixa/e2fsprogs.xml b/appendixa/e2fsprogs.xml
index 26e37b961..1b48e48e7 100644
--- a/appendixa/e2fsprogs.xml
+++ b/appendixa/e2fsprogs.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-e2fsprogs"/>.</para>
 
 &aa-e2fsprogs-down;
-&aa-e2fsprogs-shortdesc;
-&aa-e2fsprogs-desc;
 &aa-e2fsprogs-dep;
 
 </sect1>
diff --git a/appendixa/ed.xml b/appendixa/ed.xml
index 72c0e0f11..c407aca29 100644
--- a/appendixa/ed.xml
+++ b/appendixa/ed.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-ed"/>.</para>
 
 &aa-ed-down;
-&aa-ed-shortdesc;
-&aa-ed-desc;
 &aa-ed-dep;
 
 </sect1>
diff --git a/appendixa/file.xml b/appendixa/file.xml
index 1d0353bd4..2cc750cea 100644
--- a/appendixa/file.xml
+++ b/appendixa/file.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-file"/>.</para>
 
 &aa-file-down;
-&aa-file-shortdesc;
-&aa-file-desc;
 &aa-file-dep;
 
 </sect1>
diff --git a/appendixa/findutils.xml b/appendixa/findutils.xml
index 3c75699c1..c89177187 100644
--- a/appendixa/findutils.xml
+++ b/appendixa/findutils.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-findutils"/>.</para>
 
 &aa-findutils-down;
-&aa-findutils-shortdesc;
-&aa-findutils-desc;
 &aa-findutils-dep;
 
 </sect1>
diff --git a/appendixa/flex.xml b/appendixa/flex.xml
index 2f2231e17..7521a0934 100644
--- a/appendixa/flex.xml
+++ b/appendixa/flex.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-flex"/>.</para>
 
 &aa-flex-down;
-&aa-flex-shortdesc;
-&aa-flex-desc;
 &aa-flex-dep;
 
 </sect1>
diff --git a/appendixa/gawk.xml b/appendixa/gawk.xml
index 886ee4327..e85515a5f 100644
--- a/appendixa/gawk.xml
+++ b/appendixa/gawk.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-gawk"/>.</para>
 
 &aa-gawk-down;
-&aa-gawk-shortdesc;
-&aa-gawk-desc;
 &aa-gawk-dep;
 
 </sect1>
diff --git a/appendixa/gcc.xml b/appendixa/gcc.xml
index b96baffb6..fdf94ae1e 100644
--- a/appendixa/gcc.xml
+++ b/appendixa/gcc.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-gcc"/>.</para>
 
 &aa-gcc-down;
-&aa-gcc-shortdesc;
-&aa-gcc-desc;
 &aa-gcc-dep;
 
 </sect1>
diff --git a/appendixa/gettext.xml b/appendixa/gettext.xml
index de7b8037c..aeb94eff5 100644
--- a/appendixa/gettext.xml
+++ b/appendixa/gettext.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-gettext"/>.</para>
 
 &aa-gettext-down;
-&aa-gettext-shortdesc;
-&aa-gettext-desc;
 &aa-gettext-dep;
 
 </sect1>
diff --git a/appendixa/glibc.xml b/appendixa/glibc.xml
index 5b59a7345..502df6431 100644
--- a/appendixa/glibc.xml
+++ b/appendixa/glibc.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-glibc"/>.</para>
 
 &aa-glibc-down;
-&aa-glibc-shortdesc;
-&aa-glibc-desc;
 &aa-glibc-dep;
 
 </sect1>
diff --git a/appendixa/grep.xml b/appendixa/grep.xml
index 80faed290..567fc072c 100644
--- a/appendixa/grep.xml
+++ b/appendixa/grep.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-grep"/>.</para>
 
 &aa-grep-down;
-&aa-grep-shortdesc;
-&aa-grep-desc;
 &aa-grep-dep;
 
 </sect1>
diff --git a/appendixa/groff.xml b/appendixa/groff.xml
index e38801b09..c259f9d1a 100644
--- a/appendixa/groff.xml
+++ b/appendixa/groff.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-groff"/>.</para>
 
 &aa-groff-down;
-&aa-groff-shortdesc;
-&aa-groff-desc;
 &aa-groff-dep;
 
 </sect1>
diff --git a/appendixa/grub.xml b/appendixa/grub.xml
index 1d109a7a8..28a183600 100644
--- a/appendixa/grub.xml
+++ b/appendixa/grub.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-grub"/>.</para>
 
 &aa-grub-down;
-&aa-grub-shortdesc;
-&aa-grub-desc;
 &aa-grub-dep;
 
 </sect1>
diff --git a/appendixa/gzip.xml b/appendixa/gzip.xml
index eca4b2c30..0b42dbe90 100644
--- a/appendixa/gzip.xml
+++ b/appendixa/gzip.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-gzip"/>.</para>
 
 &aa-gzip-down;
-&aa-gzip-shortdesc;
-&aa-gzip-desc;
 &aa-gzip-dep;
 
 </sect1>
diff --git a/appendixa/inetutils.xml b/appendixa/inetutils.xml
index c935ba9fa..de181b751 100644
--- a/appendixa/inetutils.xml
+++ b/appendixa/inetutils.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-inetutils"/>.</para>
 
 &aa-inetutils-down;
-&aa-inetutils-shortdesc;
-&aa-inetutils-desc;
 &aa-inetutils-dep;
 
 </sect1>
diff --git a/appendixa/kbd.xml b/appendixa/kbd.xml
index da92bfe8e..e93eb2ea4 100644
--- a/appendixa/kbd.xml
+++ b/appendixa/kbd.xml
@@ -5,8 +5,6 @@
 <para>For installation instructions see <xref linkend="ch06-kbd"/>.</para>
 
 &aa-kbd-down;
-&aa-kbd-shortdesc;
-&aa-kbd-desc;
 &aa-kbd-dep;
 
 </sect1>
diff --git a/appendixa/less.xml b/appendixa/less.xml
index 90e0583b4..dcef281cd 100644
--- a/appendixa/less.xml
+++ b/appendixa/less.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/lfs-utils.xml
index d2b9c94a1..f97c8eb20 100644
--- a/appendixa/lfs-utils.xml
+++ b/appendixa/lfs-utils.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/libtool.xml
index 8df5a002c..4d840fad0 100644
--- a/appendixa/libtool.xml
+++ b/appendixa/libtool.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/m4.xml
index 0e2263837..18af45b03 100644
--- a/appendixa/m4.xml
+++ b/appendixa/m4.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/make.xml
index 2f08325a4..57bcdce42 100644
--- a/appendixa/make.xml
+++ b/appendixa/make.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/makedev.xml
index 206fe934b..bea1cbe09 100644
--- a/appendixa/makedev.xml
+++ b/appendixa/makedev.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/man.xml
index 9410cce74..067c7ff07 100644
--- a/appendixa/man.xml
+++ b/appendixa/man.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/manpages.xml
index 1b59ce7ed..b707ea298 100644
--- a/appendixa/manpages.xml
+++ b/appendixa/manpages.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/modutils.xml
index 349f267d2..fd5957ce2 100644
--- a/appendixa/modutils.xml
+++ b/appendixa/modutils.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/ncurses.xml
index f45886a47..376824ebd 100644
--- a/appendixa/ncurses.xml
+++ b/appendixa/ncurses.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/nettools.xml
index 15b633bb1..c41cd5dd4 100644
--- a/appendixa/nettools.xml
+++ b/appendixa/nettools.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/patch.xml
index fbfe93e57..dc7d25466 100644
--- a/appendixa/patch.xml
+++ b/appendixa/patch.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/perl.xml
index 60f20473c..2c5587beb 100644
--- a/appendixa/perl.xml
+++ b/appendixa/perl.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/procinfo.xml
index 6ae3cb78c..2feabc630 100644
--- a/appendixa/procinfo.xml
+++ b/appendixa/procinfo.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/procps.xml
index a2b82a10a..d6bd8dfa6 100644
--- a/appendixa/procps.xml
+++ b/appendixa/procps.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/psmisc.xml
index 78f61b1be..18b439855 100644
--- a/appendixa/psmisc.xml
+++ b/appendixa/psmisc.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/sed.xml
index 48cfa4318..f3098d1b7 100644
--- a/appendixa/sed.xml
+++ b/appendixa/sed.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/shadowpwd.xml
index 711f7a1b2..24047b5e0 100644
--- a/appendixa/shadowpwd.xml
+++ b/appendixa/shadowpwd.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/sysklogd.xml
index c3a54c1b2..3150ccc4a 100644
--- a/appendixa/sysklogd.xml
+++ b/appendixa/sysklogd.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/sysvinit.xml
index 2410fd031..be95c404b 100644
--- a/appendixa/sysvinit.xml
+++ b/appendixa/sysvinit.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/tar.xml
index 68e0f8cbc..982c38774 100644
--- a/appendixa/tar.xml
+++ b/appendixa/tar.xml
@@ -5,8 +5,6 @@
 <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/texinfo.xml b/appendixa/texinfo.xml
index c74c66278..6332646ca 100644
--- a/appendixa/texinfo.xml
+++ b/appendixa/texinfo.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/utillinux.xml
index 0f53e0bab..6a23948bf 100644
--- a/appendixa/utillinux.xml
+++ b/appendixa/utillinux.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/vim.xml
index ac02d83f2..628f5dcc8 100644
--- a/appendixa/vim.xml
+++ b/appendixa/vim.xml
@@ -5,8 +5,6 @@
 <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.xml b/appendixa/zlib.xml
index 97e338cbd..b2548ba7d 100644
--- a/appendixa/zlib.xml
+++ b/appendixa/zlib.xml
@@ -5,8 +5,6 @@
 <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/chapter06/autoconf.xml b/chapter06/autoconf.xml
index 0d43410fa..0174f6954 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-dep;
+&aa-autoconf-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 <sect2>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 8f52c9d58..62c03f92d 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-dep;
+&aa-automake-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index c2703142a..da0139644 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-dep;
+&aa-bash-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 872fff1ab..9986fc344 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-dep;
+&aa-binutils-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index 5d525b96f..80e2ebd4f 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-dep;
+&aa-bison-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/bootscripts.xml b/chapter06/bootscripts.xml
index 6c3a21963..1360b2653 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-dep;
+&aa-bootscripts-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index 6b1c4f695..e55af375f 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-dep;
+&aa-bzip2-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index cbddb98f0..06e640fb2 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-dep;
+&aa-coreutils-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index 321081944..cd8fe92d0 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-dep;
+&aa-diffutils-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index d9ff51cb9..c8a23e6ca 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-dep;
+&aa-e2fsprogs-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/ed.xml b/chapter06/ed.xml
index dd1b7ebc4..24a26e7c3 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-dep;
+&aa-ed-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/file.xml b/chapter06/file.xml
index d21b96286..e251d805d 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-dep;
+&aa-file-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index 5c2c0e956..8c9b35ce4 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-dep;
+&aa-findutils-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index d202df991..9a693786e 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-dep;
+&aa-flex-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index a25cfaec5..f5ecbc4a8 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-dep;
+&aa-gawk-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 54a105db1..6c3e21bc4 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-dep;
+&aa-gcc-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index 63d473121..7a14241ed 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-dep;
+&aa-gettext-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index c2df2bfb8..0869a7220 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-dep;
+&aa-glibc-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index a68e7a271..29153dc55 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-dep;
+&aa-grep-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index de9cc25d3..43d79fd28 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-dep;
+&aa-groff-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index 929e2310b..3d57e6f5d 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-dep;
+&aa-grub-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 7e097a06e..1d01e9582 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-dep;
+&aa-gzip-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index fd448abdb..0816ebd03 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-dep;
+&aa-inetutils-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 0f4894751..e5f0441c1 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-dep;
+&aa-kbd-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/kernel.xml b/chapter06/kernel.xml
index b03c7adc7..8950a9159 100644
--- a/chapter06/kernel.xml
+++ b/chapter06/kernel.xml
@@ -6,7 +6,7 @@
 Estimated required disk space:  &kernel-compsize-headers;</screen>
 
 &aa-kernel-shortdesc;
-&aa-kernel-dep;
+&aa-kernel-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/less.xml b/chapter06/less.xml
index 0508af478..31d3c1624 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-dep;
+&aa-less-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/lfs-utils.xml b/chapter06/lfs-utils.xml
index 5119b4804..c4d6afce6 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-dep;
+&aa-lfs-utils-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index 9e9f9457f..7b5bd2642 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-dep;
+&aa-libtool-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index b52647f10..d1eca7aad 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-dep;
+&aa-m4-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/make.xml b/chapter06/make.xml
index f24d53ee3..3f641ec11 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-dep;
+&aa-make-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/makedev.xml b/chapter06/makedev.xml
index acb766683..da7f52e96 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-dep;
+&aa-makedev-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/man.xml b/chapter06/man.xml
index 833ff0e8e..67afb3c8d 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-dep;
+&aa-man-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/manpages.xml b/chapter06/manpages.xml
index 699f68b74..d1f2adbcf 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-dep;
+&aa-manpages-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/modutils.xml b/chapter06/modutils.xml
index d5c6708f1..c148211f8 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-dep;
+&aa-modutils-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 9c194834b..6e752ffdf 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-dep;
+&aa-ncurses-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/nettools.xml b/chapter06/nettools.xml
index 61a6359d6..1664b3211 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-dep;
+&aa-nettools-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/patch.xml b/chapter06/patch.xml
index cc634a8e8..c5f680eb3 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-dep;
+&aa-patch-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 5e90ec069..ecef68538 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-dep;
+&aa-perl-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/procinfo.xml b/chapter06/procinfo.xml
index e02b583b6..8114b8c5f 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-dep;
+&aa-procinfo-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 9dda8547f..d28b0850d 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-dep;
+&aa-procps-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index 3b939961d..3080e0dc6 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-dep;
+&aa-psmisc-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index 25f9b488d..dcfea0c57 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-dep;
+&aa-sed-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/shadowpwd.xml b/chapter06/shadowpwd.xml
index aeaefac1c..b7ed2d63e 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-dep;
+&aa-shadowpwd-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index 2d8dd4aa9..b4b01baaf 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-dep;
+&aa-sysklogd-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 2f771b460..9bdb0aae3 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-dep;
+&aa-sysvinit-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index 2e21fad4f..627f59a19 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-dep;
+&aa-tar-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index a3d5cadd2..97a684090 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-dep;
+&aa-texinfo-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/utillinux.xml b/chapter06/utillinux.xml
index 8689c09a6..50b954657 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-dep;
+&aa-utillinux-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 8eb1bb7d2..8a449adac 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -15,7 +15,7 @@ suggested installation instructions.</para>
 </sect2>
 
 &aa-vim-shortdesc;
-&aa-vim-dep;
+&aa-vim-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index fba00043f..78db26c7e 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-dep;
+&aa-zlib-desc;
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>