Revert Alex's changes back to previous state

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

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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> -->
 

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>

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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;
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>