Moving stuff from appendix A to chapter 6.

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

appendixa/appendixa.xml

@@ -1,60 +1,59 @@
 <appendix id="appendixa" xreflabel="Appendix A">
-<title>Package descriptions and dependencies</title>
+<title>Index of packages</title>
 <?dbhtml filename="appendixa.html" dir="appendixa"?>
 
-&aa-introduction;
-&aa-autoconf;
-&aa-automake;
-&aa-bash;
-&aa-binutils;
-&aa-bison;
-&aa-bzip2;
-&aa-coreutils;
-&aa-dejagnu;
-&aa-diffutils;
-&aa-e2fsprogs;
-&aa-ed;
-&aa-expect;
-&aa-file;
-&aa-findutils;
-&aa-flex;
-&aa-gawk;
-&aa-gcc;
-&aa-gettext;
-&aa-glibc;
-&aa-grep;
-&aa-groff;
-&aa-grub;
-&aa-gzip;
-&aa-inetutils;
-&aa-kbd;
-&aa-less;
-&aa-bootscripts;
-&aa-lfs-utils;
-&aa-libtool;
-&aa-kernel;
-&aa-m4;
-&aa-make;
-&aa-makedev;
-&aa-man;
-&aa-manpages;
-&aa-modutils;
-&aa-ncurses;
-&aa-nettools;
-&aa-patch;
-&aa-perl;
-&aa-procinfo;
-&aa-procps;
-&aa-psmisc;
-&aa-sed;
-&aa-shadowpwd;
-&aa-sysklogd;
-&aa-sysvinit;
-&aa-tar;
-&aa-tcl;
-&aa-texinfo;
-&aa-utillinux;
-&aa-vim;
-&aa-zlib;
+<itemizedlist>
+<listitem><para><xref linkend="ch06-autoconf"/></para></listitem>
+<listitem><para><xref linkend="ch06-automake"/></para></listitem>
+<listitem><para><xref linkend="ch06-bash"/></para></listitem>
+<listitem><para><xref linkend="ch06-binutils"/></para></listitem>
+<listitem><para><xref linkend="ch06-bison"/></para></listitem>
+<listitem><para><xref linkend="ch06-lfs-bootscripts"/></para></listitem>
+<listitem><para><xref linkend="ch06-bzip2"/></para></listitem>
+<listitem><para><xref linkend="ch06-coreutils"/></para></listitem>
+<listitem><para><xref linkend="ch05-dejagnu"/></para></listitem>
+<listitem><para><xref linkend="ch06-diffutils"/></para></listitem>
+<listitem><para><xref linkend="ch06-e2fsprogs"/></para></listitem>
+<listitem><para><xref linkend="ch06-ed"/></para></listitem>
+<listitem><para><xref linkend="ch05-expect"/></para></listitem>
+<listitem><para><xref linkend="ch06-file"/></para></listitem>
+<listitem><para><xref linkend="ch06-findutils"/></para></listitem>
+<listitem><para><xref linkend="ch06-flex"/></para></listitem>
+<listitem><para><xref linkend="ch06-gawk"/></para></listitem>
+<listitem><para><xref linkend="ch06-gcc"/></para></listitem>
+<listitem><para><xref linkend="ch06-gettext"/></para></listitem>
+<listitem><para><xref linkend="ch06-glibc"/></para></listitem>
+<listitem><para><xref linkend="ch06-grep"/></para></listitem>
+<listitem><para><xref linkend="ch06-groff"/></para></listitem>
+<listitem><para><xref linkend="ch06-grub"/></para></listitem>
+<listitem><para><xref linkend="ch06-gzip"/></para></listitem>
+<listitem><para><xref linkend="ch06-inetutils"/></para></listitem>
+<listitem><para><xref linkend="ch06-kbd"/></para></listitem>
+<listitem><para><xref linkend="ch06-less"/></para></listitem>
+<listitem><para><xref linkend="ch06-libtool"/></para></listitem>
+<listitem><para><xref linkend="ch08-kernel"/></para></listitem>
+<listitem><para><xref linkend="ch06-m4"/></para></listitem>
+<listitem><para><xref linkend="ch06-make"/></para></listitem>
+<listitem><para><xref linkend="ch06-man"/></para></listitem>
+<listitem><para><xref linkend="ch06-man-pages"/></para></listitem>
+<listitem><para><xref linkend="ch06-modutils"/></para></listitem>
+<listitem><para><xref linkend="ch06-ncurses"/></para></listitem>
+<listitem><para><xref linkend="ch06-net-tools"/></para></listitem>
+<listitem><para><xref linkend="ch06-patch"/></para></listitem>
+<listitem><para><xref linkend="ch06-perl"/></para></listitem>
+<listitem><para><xref linkend="ch06-procinfo"/></para></listitem>
+<listitem><para><xref linkend="ch06-procps"/></para></listitem>
+<listitem><para><xref linkend="ch06-psmisc"/></para></listitem>
+<listitem><para><xref linkend="ch06-sed"/></para></listitem>
+<listitem><para><xref linkend="ch06-shadow"/></para></listitem>
+<listitem><para><xref linkend="ch06-sysklogd"/></para></listitem>
+<listitem><para><xref linkend="ch06-sysvinit"/></para></listitem>
+<listitem><para><xref linkend="ch06-tar"/></para></listitem>
+<listitem><para><xref linkend="ch05-tcl"/></para></listitem>
+<listitem><para><xref linkend="ch06-texinfo"/></para></listitem>
+<listitem><para><xref linkend="ch06-util-linux"/></para></listitem>
+<listitem><para><xref linkend="ch06-vim"/></para></listitem>
+<listitem><para><xref linkend="ch06-zlib"/></para></listitem>
+</itemizedlist>
 
 </appendix>

appendixa/autoconf-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Autoconf Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &autoconf-depversion;.)</para> -->
-
-<para>Autoconf depends on: Bash, Coreutils, Diffutils, Grep,
+<para>For its installation Autoconf depends on: Bash, Coreutils, Diffutils, Grep,
 M4, Make, Perl, Sed.</para>
-
-</sect2>
-

appendixa/autoconf-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>autoconf</command> is a tool for producing shell scripts

appendixa/autoconf-down.xml

@@ -1,8 +1,2 @@
-<sect2>
-
-<title>Official Download Location</title>
-
-<literallayout>Autoconf (&autoconf-version;): 
+<literallayout>Official download location for Autoconf (&autoconf-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/autoconf/"/></literallayout>
-
-</sect2>

appendixa/autoconf-shortdesc.xml

@@ -1,9 +1,6 @@
-<sect2><title>Contents of Autoconf</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &autoconf-contversion;.)</para> -->
-
-<para>Autoconf produces shell scripts which automatically configure source
-code.</para>
+<sect2 id="contents-autoconf"><title>Contents of Autoconf</title>
 
 <para><emphasis>Installed programs</emphasis>: autoconf, autoheader, autom4te,
 autoreconf, autoscan, autoupdate and ifnames</para>

appendixa/automake-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Automake Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &automake-depversion;.)</para> -->
-
-<para>Automake depends on: Autoconf, Bash, Coreutils,
+<para>For its installation Automake depends on: Autoconf, Bash, Coreutils,
 Diffutils, Grep, M4, Make, Perl, Sed.</para>
-
-</sect2>
-

appendixa/automake-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>acinstall</command> is a script that installs

appendixa/automake-down.xml

@@ -1,6 +1,2 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Automake (&automake-version;): 
+<literallayout>Official download location for Automake (&automake-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/automake/"/></literallayout>
-</sect2>

appendixa/automake-shortdesc.xml

@@ -1,8 +1,6 @@
-<sect2><title>Contents of Automake</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &automake-contversion;.)</para> -->
-
-<para>Automake generates Makefile.in files, intended for use with Autoconf.</para>
+<sect2 id="contents-automake"><title>Contents of Automake</title>
 
 <para><emphasis>Installed programs</emphasis>: acinstall, aclocal,
 aclocal-1.8, automake, automake-1.8, compile, config.guess, config.sub,

appendixa/bash-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Bash Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &bash-depversion;.)</para> -->
-
-<para>Bash depends on: Binutils, Coreutils, Diffutils, Gawk,
+<para>For its installation Bash depends on: Binutils, Coreutils, Diffutils, Gawk,
 GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
-
-</sect2>
-

appendixa/bash-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>bash</command> is a widely-used command interpreter. It

appendixa/bash-down.xml

@@ -1,10 +1,5 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Bash (&bash-version;): 
+<literallayout>Official download location for Bash (&bash-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/bash/"/>
-
-Bash Patch:
+And for the Bash Patch:
 <ulink url="&patches-root;&bash-patch;"/></literallayout>
-</sect2>
 

appendixa/bash-shortdesc.xml

@@ -1,12 +1,6 @@
-<sect2><title>Contents of Bash</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &bash-contversion;.)</para> -->
-
-<para>bash is the Bourne-Again SHell, which is a widely used command
-interpreter on Unix systems. The bash program reads from standard
-input (the keyboard). A user types something and the program will evaluate
-what he has typed and do something with it, like running a
-program.</para>
+<sect2 id="contents-bash"><title>Contents of Bash</title>
 
 <para><emphasis>Installed programs</emphasis>: bash, sh (link to bash) and
 bashbug</para>

appendixa/binutils-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Binutils Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &binutils-depversion;.)</para> -->
-
-<para>Binutils depends on: Bash, Coreutils, Diffutils, GCC, Gettext,
+<para>For its installation Binutils depends on: Bash, Coreutils, Diffutils, GCC, Gettext,
 Glibc, Grep, Make, Perl, Sed, Texinfo.</para>
-
-</sect2>
-

appendixa/binutils-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>addr2line</command> translates program addresses to file

appendixa/binutils-down.xml

@@ -1,7 +1,3 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Binutils (&binutils-version;): 
+<literallayout>Official download location for Binutils (&binutils-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/binutils/"/></literallayout>
-</sect2>
 

appendixa/binutils-shortdesc.xml

@@ -1,10 +1,6 @@
-<sect2><title>Contents of Binutils</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &binutils-contversion;.)</para> -->
-
-<para>Binutils is a collection of software development tools containing a
-linker, assembler and other tools to work with object files and
-archives.</para>
+<sect2 id="contents-binutils"><title>Contents of Binutils</title>
 
 <para><emphasis>Installed programs</emphasis>: addr2line, ar, as, c++filt,
 gprof, ld, nm, objcopy, objdump, ranlib, readelf, size, strings and

appendixa/bison-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Bison Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &bison-depversion;.)</para> -->
-
-<para>Bison depends on: Bash, Binutils, Coreutils, Diffutils,
+<para>For its installation Bison depends on: Bash, Binutils, Coreutils, Diffutils,
 GCC, Gettext, Glibc, Grep, M4, Make, Sed.</para>
-
-</sect2>
-

appendixa/bison-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>bison</command> generates, from a series of rules, a program

appendixa/bison-down.xml

@@ -1,10 +1,5 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Bison (&bison-version;): 
+<literallayout>Official download location for Bison (&bison-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/bison/"/>
-
-Bison Attribute Patch:
+And for the Bison Attribute Patch:
 <ulink url="&patches-root;&bison-patch;"/></literallayout>
-</sect2>
 

appendixa/bison-shortdesc.xml

@@ -1,9 +1,6 @@
-<sect2><title>Contents of Bison</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &bison-contversion;.)</para> -->
-
-<para>Bison is a parser generator, a replacement for yacc. Bison
-generates a program that analyzes the structure of a text file.</para>
+<sect2 id="contents-bison"><title>Contents of Bison</title>
 
 <para><emphasis>Installed programs</emphasis>: bison and yacc</para>
 

appendixa/bootscripts-dep.xml

@@ -1,11 +1 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>LFS-Bootscripts Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &bootscripts-depversion;.)</para> -->
-
-<para>LFS-Bootscripts depends on: Bash, Coreutils.</para>
-
-</sect2>
-
+<para>For its installation LFS-Bootscripts depends on: Bash, Coreutils.</para>

appendixa/bootscripts-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para>The <command>checkfs</command> script checks the file systems just

appendixa/bootscripts-down.xml

@@ -1,6 +1,2 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>LFS-Bootscripts (&bootscripts-version;): 
+<literallayout>Official download location for LFS-Bootscripts (&bootscripts-version;): 
 <ulink url="&http;/"/></literallayout>
-</sect2>

appendixa/bootscripts-shortdesc.xml

@@ -1,11 +1,6 @@
-<sect2><title>Contents of LFS-bootscripts</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &bootscripts-contversion;.)</para> -->
-
-<para>The LFS-Bootscripts package contains SysV init style shell
-scripts. These scripts do various tasks such as check filesystem
-integrity during boot, load keymaps, set up networks and halt
-processes at shutdown.</para>
+<sect2 id="contents-bootscripts"><title>Contents of LFS-bootscripts</title>
 
 <para><emphasis>Installed scripts</emphasis>: checkfs, cleanfs, functions,
 halt, ifdown, ifup, loadkeys, localnet, mountfs, mountproc, network, rc,

appendixa/bzip2-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Bzip2 Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &bzip2-depversion;.)</para> -->
-
-<para>Bzip2 depends on: Bash, Binutils, Coreutils, Diffutils,
+<para>For its installation Bzip2 depends on: Bash, Binutils, Coreutils, Diffutils,
 GCC, Glibc, Make.</para>
-
-</sect2>
-

appendixa/bzip2-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>bunzip2</command> decompresses bzipped files.</para>

appendixa/bzip2-down.xml

@@ -1,6 +1,2 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Bzip2 (&bzip2-version;): 
+<literallayout>Official download location for Bzip2 (&bzip2-version;): 
 <ulink url="http://sources.redhat.com/bzip2/"/></literallayout>
-</sect2>

appendixa/bzip2-shortdesc.xml

@@ -1,10 +1,6 @@
-<sect2><title>Contents of Bzip2</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &bzip2-contversion;.)</para> -->
-
-<para>Bzip2 is a block-sorting file compressor which generally achieves a
-better compression than the traditional <userinput>gzip</userinput>
-does.</para>
+<sect2 id="contents-bzip2"><title>Contents of Bzip2</title>
 
 <para><emphasis>Installed programs</emphasis>: bunzip2 (link to bzip2), bzcat
 (link to bzip2), bzcmp, bzdiff, bzegrep, bzfgrep, bzgrep, bzip2, bzip2recover,

appendixa/coreutils-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Coreutils Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &coreutils-depversion;.)</para> -->
-
-<para>Coreutils depends on: Bash, Binutils, Coreutils, Diffutils, GCC,
+<para>For its installation Coreutils depends on: Bash, Binutils, Coreutils, Diffutils, GCC,
 Gettext, Glibc, Grep, Make, Perl, Sed.</para>
-
-</sect2>
-

appendixa/coreutils-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>basename</command> strips any path and a given suffix from

appendixa/coreutils-down.xml

@@ -1,12 +1,6 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Coreutils (&coreutils-version;):
+<literallayout>Official download location for Coreutils (&coreutils-version;):
 <ulink url="ftp://ftp.gnu.org/gnu/coreutils/"/>
-
-Coreutils Hostname Patch:
+And for the Coreutils Hostname Patch:
 <ulink url="&patches-root;&coreutils-hostname-patch;"/>
-
-Coreutils Uname Patch:
+And for the Coreutils Uname Patch:
 <ulink url="&patches-root;&coreutils-uname-patch;"/></literallayout>
-</sect2>

appendixa/coreutils-shortdesc.xml

@@ -1,8 +1,6 @@
-<sect2><title>Contents of Coreutils</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<para>The Coreutils package contains a whole series of basic shell utilities.</para>
-
-<!-- <para>(Last checked against version &coreutils-contversion;.)</para> -->
+<sect2 id="contents-coreutils"><title>Contents of Coreutils</title>
 
 <para><emphasis>Installed programs</emphasis>: basename, cat, chgrp, chmod,
 chown, chroot, cksum, comm, cp, csplit, cut, date, dd, df, dir, dircolors,

appendixa/dejagnu-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>DejaGnu Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &dejagnu-depversion;.)</para> -->
-
-<para>Dejagnu depends on: Bash, Binutils, Coreutils, Diffutils,
+<para>For its installation Dejagnu depends on: Bash, Binutils, Coreutils, Diffutils,
 GCC, Glibc, Grep, Make, Sed.</para>
-
-</sect2>
-

appendixa/dejagnu-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short description</title>
 
 <para><command>runtest</command> is the wrapper script that finds the proper

appendixa/dejagnu-down.xml

@@ -1,6 +1,2 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>DejaGnu (&dejagnu-version;):
+<literallayout>Official download location for DejaGnu (&dejagnu-version;):
 <ulink url="ftp://ftp.gnu.org/gnu/dejagnu/"/></literallayout>
-</sect2>

appendixa/dejagnu-shortdesc.xml

@@ -1,8 +1,6 @@
-<sect2><title>Contents of DejaGnu</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &dejagnu-contversion;.)</para> -->
-
-<para>The DejaGnu package contains a framework for testing other programs.</para>
+<sect2 id="contents-dejagnu"><title>Contents of DejaGnu</title>
 
 <para><emphasis>Installed program</emphasis>: runtest</para>
 

appendixa/diffutils-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Diffutils Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &diffutils-depversion;.)</para> -->
-
-<para>Diffutils depends on: Bash, Binutils, Coreutils, Diffutils, GCC,
+<para>For its installation Diffutils depends on: Bash, Binutils, Coreutils, Diffutils, GCC,
 Gettext, Glibc, Grep, Make, Sed.</para>
-
-</sect2>
-

appendixa/diffutils-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>cmp</command> compares two files and reports whether or

appendixa/diffutils-down.xml

@@ -1,6 +1,2 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Diffutils (&diffutils-version;):
+<literallayout>Official download location for Diffutils (&diffutils-version;):
 <ulink url="ftp://ftp.gnu.org/gnu/diffutils/"/></literallayout>
-</sect2>

appendixa/diffutils-shortdesc.xml

@@ -1,10 +1,6 @@
-<sect2><title>Contents of Diffutils</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &diffutils-contversion;.)</para> -->
-
-<para>The programs from this package show you the differences between two
-files or directories. It's most common use is to create software
-patches.</para>
+<sect2 id="contents-diffutils"><title>Contents of Diffutils</title>
 
 <para><emphasis>Installed programs</emphasis>: cmp, diff, diff3 and sdiff</para>
 

appendixa/e2fsprogs-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>E2fsprogs Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &e2fsprogs-depversion;.)</para> -->
-
-<para>E2fsprogs depends on: Bash, Binutils, Coreutils,
+<para>For its installation E2fsprogs depends on: Bash, Binutils, Coreutils,
 Diffutils, Gawk, GCC, Gettext, Glibc, Grep, Make, Sed, Texinfo.</para>
-
-</sect2>
-

appendixa/e2fsprogs-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>badblocks</command> searches a device (usually a disk

appendixa/e2fsprogs-down.xml

@@ -1,7 +1,3 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>E2fsprogs (&e2fsprogs-version;):
+<literallayout>Official download locations for E2fsprogs (&e2fsprogs-version;):
 <ulink url="ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/"/>
 <ulink url="http://download.sourceforge.net/e2fsprogs/"/></literallayout>
-</sect2>

appendixa/e2fsprogs-shortdesc.xml

@@ -1,10 +1,6 @@
-<sect2><title>Contents of E2fsprogs</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &e2fsprogs-contversion;.)</para> -->
-
-<para>E2fsprogs provides the filesystem utilities for use with the
- ext2 filesystem. It also supports the ext3 filesystem with journaling
- support.</para>
+<sect2 id="contents-e2fsprogs"><title>Contents of E2fsprogs</title>
 
 <para><emphasis>Installed programs</emphasis>: badblocks, blkid, chattr,
 compile_et, debugfs, dumpe2fs, e2fsck, e2image, e2label, findfs, fsck,

appendixa/ed-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Ed Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &ed-depversion;.)</para> -->
-
-<para>Ed depends on: Bash, Binutils, Coreutils, Diffutils, GCC,
+<para>For its installation Ed depends on: Bash, Binutils, Coreutils, Diffutils, GCC,
 Glibc, Grep, Make, Sed.</para>
-
-</sect2>
-

appendixa/ed-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>ed</command> is a line-oriented text editor. It can be used

appendixa/ed-down.xml

@@ -1,9 +1,4 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Ed (&ed-version;): 
+<literallayout>Official download location for Ed (&ed-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/ed/"/>
-
-Ed Mkstemp Patch:
+And for the Ed Mkstemp Patch:
 <ulink url="&patches-root;&ed-patch;"/></literallayout>
-</sect2>

appendixa/ed-shortdesc.xml

@@ -1,8 +1,6 @@
-<sect2><title>Contents of Ed</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &ed-contversion;.)</para> -->
-
-<para>GNU ed is an 8-bit clean, POSIX-compliant line editor.</para>
+<sect2 id="contents-ed"><title>Contents of Ed</title>
 
 <para><emphasis>Installed programs</emphasis>: ed and red (link to ed)</para>
 

appendixa/expect-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Expect Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &expect-depversion;.)</para> -->
-
-<para>Expect depends on: Bash, Binutils, Coreutils, Diffutils,
+<para>For its installation Expect depends on: Bash, Binutils, Coreutils, Diffutils,
 GCC, Glibc, Grep, Make, Sed, Tcl.</para>
-
-</sect2>
-

appendixa/expect-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short description</title>
 
 <para><command>expect</command> "talks" to other interactive programs according

appendixa/expect-down.xml

@@ -1,9 +1,4 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Expect (&expect-version;):
+<literallayout>Official download location for Expect (&expect-version;):
 <ulink url="http://expect.nist.gov/src/"/>
-
-Expect Spawn Patch:
+And for the Expect Spawn Patch:
 <ulink url="&patches-root;&expect-patch;"/></literallayout>
-</sect2>

appendixa/expect-shortdesc.xml

@@ -1,9 +1,6 @@
-<sect2><title>Contents of Expect</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &expect-contversion;.)</para> -->
-
-<para>The Expect package provides a program that performs programmed dialogue
-with other interactive programs.</para>
+<sect2 id="contents-expect"><title>Contents of Expect</title>
 
 <para><emphasis>Installed program</emphasis>: expect</para>
 

appendixa/file-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>File Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &file-depversion;.)</para> -->
-
-<para>File depends on: Bash, Binutils, Coreutils, Diffutils,
+<para>For its installation File depends on: Bash, Binutils, Coreutils, Diffutils,
 GCC, Glibc, Grep, Make, Sed, Zlib.</para>
-
-</sect2>
-

appendixa/file-desc.xml

@@ -1,6 +1,4 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2><title>Short description</title>
+<sect2><title>Short descriptions</title>
 
 <para><command>file</command> tries to classify each given file. It does
 this by performing several tests: filesystem tests, magic number tests, and

appendixa/file-down.xml

@@ -1,9 +1,5 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>File (&file-version;): 
+<literallayout>Official download location for File (&file-version;): 
 <ulink url="ftp://ftp.gw.com/mirrors/pub/unix/file/"/>
 
 Alternate Download Location:
 <ulink url="ftp://gaosu.rave.org/pub/linux/lfs/"/></literallayout>
-</sect2>

appendixa/file-shortdesc.xml

@@ -1,8 +1,6 @@
-<sect2><title>Contents of File</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &file-contversion;.)</para> -->
-
-<para>File is a utility used to determine file types.</para>
+<sect2 id="contents-file"><title>Contents of File</title>
 
 <para><emphasis>Installed program</emphasis>: file</para>
 

appendixa/findutils-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Findutils Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &findutils-depversion;.)</para> -->
-
-<para>Findutils depends on: Bash, Binutils, Coreutils,
+<para>For its installation Findutils depends on: Bash, Binutils, Coreutils,
 Diffutils, GCC, Gettext, Glibc, Grep, Make, Sed.</para>
-
-</sect2>
-

appendixa/findutils-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>bigram</command> was formerly used to produce locate

appendixa/findutils-down.xml

@@ -1,7 +1,3 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Findutils (&findutils-version;):
+<literallayout>Official download location for Findutils (&findutils-version;):
 <ulink url="ftp://alpha.gnu.org/gnu/findutils/"/></literallayout>
 
-</sect2>

appendixa/findutils-shortdesc.xml

@@ -1,11 +1,6 @@
-<sect2><title>Contents of Findutils</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &findutils-contversion;.)</para> -->
-
-<para>The Findutils package contains programs to find files, either
-on-the-fly (by doing a live recursive search through directories and only
-showing files that match the specifications) or by searching through a
-database.</para>
+<sect2 id="contents-findutils"><title>Contents of Findutils</title>
 
 <para><emphasis>Installed programs</emphasis>: bigram, code, find, frcode,
 locate, updatedb and xargs</para>

appendixa/flex-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Flex Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &flex-depversion;.)</para> -->
-
-<para>Flex depends on: Bash, Binutils, Bison, Coreutils, Diffutils,
+<para>For its installation Flex depends on: Bash, Binutils, Bison, Coreutils, Diffutils,
 GCC, Gettext, Glibc, Grep, M4, Make, Sed.</para>
-
-</sect2>
-

appendixa/flex-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>flex</command> is a tool for generating programs that

appendixa/flex-down.xml

@@ -1,6 +1,2 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Flex (&flex-version;): 
+<literallayout>Official download location for Flex (&flex-version;): 
 <ulink url="ftp://ftp.gnu.org/non-gnu/flex/"/></literallayout>
-</sect2>

appendixa/flex-shortdesc.xml

@@ -1,9 +1,6 @@
-<sect2><title>Contents of Flex</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &flex-contversion;.)</para> -->
-
-<para>The Flex package is used to generate programs which recognize
-patterns in text.</para>
+<sect2 id="contents-flex"><title>Contents of Flex</title>
 
 <para><emphasis>Installed programs</emphasis>: flex, flex++ (link to flex)
 and lex</para>

appendixa/gawk-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Gawk Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &gawk-depversion;.)</para> -->
-
-<para>Gawk depends on: Bash, Binutils, Coreutils,
+<para>For its installation Gawk depends on: Bash, Binutils, Coreutils,
 Diffutils, GCC, Gettext, Glibc, Grep, Make, Sed.</para>
-
-</sect2>
-

appendixa/gawk-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>gawk</command> is a program for manipulating text files.

appendixa/gawk-down.xml

@@ -1,6 +1,2 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Gawk (&gawk-version;): 
+<literallayout>Official download location for Gawk (&gawk-version;): 
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gawk/"/></literallayout>
-</sect2>

appendixa/gawk-shortdesc.xml

@@ -1,9 +1,6 @@
-<sect2><title>Contents of Gawk</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &gawk-contversion;.)</para> -->
-
-<para>Gawk is an awk implementation that is used to manipulate text
-files.</para>
+<sect2 id="contents-gawk"><title>Contents of Gawk</title>
 
 <para><emphasis>Installed programs</emphasis>: awk (link to gawk), gawk,
 gawk-&gawk-version;, grcat, igawk, pgawk, pgawk-&gawk-version; and pwcat</para>

appendixa/gcc-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>GCC Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &gcc-depversion;.)</para> -->
-
-<para>GCC depends on: Bash, Binutils, Coreutils, Diffutils, Findutils,
+<para>For its installation GCC depends on: Bash, Binutils, Coreutils, Diffutils, Findutils,
 Gawk, Gettext, Glibc, Grep, Make, Perl, Sed, Texinfo.</para>
-
-</sect2>
-

appendixa/gcc-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>cpp</command> is the C preprocessor. It is used by the

appendixa/gcc-down.xml

@@ -1,24 +1,6 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>GCC (&gcc-version;): 
+<literallayout>Official download location for GCC (&gcc-version;): 
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/>
-
-GCC No-Fixincludes Patch:
+And for the GCC No-Fixincludes Patch:
 <ulink url="&patches-root;&gcc-nofixincludes-patch;"/>
-
-GCC Specs Patch:
-<ulink url="&patches-root;&gcc-specs-patch;"/>
-
-GCC-2 (&gcc-2953-version;): 
-<ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/>
-
-GCC-2 Patch:
-<ulink url="&patches-root;&gcc-2953-patch;"/>
-
-GCC-2 No-Fixincludes Patch:
-<ulink url="&patches-root;&gcc-2953-no-fixinc-patch;"/>
-
-GCC-2 Return-Type Patch:
-<ulink url="&patches-root;&gcc-2953-returntype-fix-patch;"/></literallayout>
-</sect2>
+And for the GCC Specs Patch:
+<ulink url="&patches-root;&gcc-specs-patch;"/></literallayout>

appendixa/gcc-shortdesc.xml

@@ -1,9 +1,6 @@
-<sect2><title>Contents of GCC</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &gcc-contversion;.)</para> -->
-
-<para>The GCC package contains the GNU compiler collection, including
-the C and C++ compilers.</para>
+<sect2 id="contents-gcc"><title>Contents of GCC</title>
 
 <para><emphasis>Installed programs</emphasis>: c++, cc (link to gcc),
 cc1, cc1plus, collect2, cpp, g++, gcc, gccbug, and gcov</para>

appendixa/gettext-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Gettext Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &gettext-depversion;.)</para> -->
-
-<para>Gettext depends on: Bash, Binutils, Bison, Coreutils,
+<para>For its installation Gettext depends on: Bash, Binutils, Bison, Coreutils,
 Diffutils, Gawk, GCC, Glibc, Grep, Make, Sed.</para>
-
-</sect2>
-

appendixa/gettext-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>autopoint</command> copies standard gettext infrastructure

appendixa/gettext-down.xml

@@ -1,6 +1,2 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Gettext (&gettext-version;): 
+<literallayout>Official download location for Gettext (&gettext-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/gettext/"/></literallayout>
-</sect2>

appendixa/gettext-shortdesc.xml

@@ -1,15 +1,10 @@
-<sect2><title>Contents of Gettext</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &gettext-contversion;.)</para> -->
-
-<para>The Gettext package is used for internationalization and
-localization. Programs can be compiled with Native Language Support
-(NLS) which enable them to output messages in the user's native
-language.</para>
+<sect2 id="contents-gettext"><title>Contents of Gettext</title>
 
 <para><emphasis>Installed programs</emphasis>: autopoint, config.charset,
-config.rpath, envsubst, gettext, gettextize, hostname, msgattrib, msgcat, msgcmp,
-msgcomm, msgconv, msgen, msgexec, msgfilter, msgfmt, msggrep, msginit,
+config.rpath, envsubst, gettext, gettextize, hostname, msgattrib, msgcat,
+msgcmp, msgcomm, msgconv, msgen, msgexec, msgfilter, msgfmt, msggrep, msginit,
 msgmerge, msgunfmt, msguniq, ngettext, project-id, team-address, trigger,
 urlget, user-email and xgettext</para>
 

appendixa/glibc-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Glibc Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &glibc-depversion;.)</para> -->
-
-<para>Glibc depends on: Bash, Binutils, Coreutils, Diffutils,
+<para>For its installation Glibc depends on: Bash, Binutils, Coreutils, Diffutils,
 Gawk, GCC, Gettext, Grep, Make, Perl, Sed, Texinfo.</para>
-
-</sect2>
-

appendixa/glibc-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>catchsegv</command> can be used to create a stack trace

appendixa/glibc-down.xml

@@ -1,12 +1,6 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Glibc (&glibc-version;): 
+<literallayout>Official download location for Glibc (&glibc-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/glibc/"/>
-
-Glibc-linuxthreads (&glibc-version;): 
+And for Glibc-linuxthreads (&glibc-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/glibc/"/>
-
-Glibc Sscanf Patch:
+And for the Glibc Sscanf Patch:
 <ulink url="&patches-root;&glibc-sscanf-patch;"/></literallayout>
-</sect2>

appendixa/glibc-shortdesc.xml

@@ -1,10 +1,6 @@
-<sect2><title>Contents of Glibc</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &glibc-contversion;.)</para> -->
-
-<para>Glibc is the C library that provides the system calls and basic
-functions such as open, malloc, printf, etc. The C library is used by all
-dynamically linked programs.</para>
+<sect2 id="contents-glibc"><title>Contents of Glibc</title>
 
 <para><emphasis>Installed programs</emphasis>: catchsegv, gencat, getconf,
 getent, glibcbug, iconv, iconvconfig, ldconfig, ldd, lddlibc4, locale,

appendixa/grep-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Grep Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &grep-depversion;.)</para> -->
-
-<para>Grep depends on: Bash, Binutils, Coreutils,
+<para>For its installation Grep depends on: Bash, Binutils, Coreutils,
 Diffutils, GCC, Gettext, Glibc, Make, Sed, Texinfo.</para>
-
-</sect2>
-

appendixa/grep-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>egrep</command> prints lines matching an extended regular

appendixa/grep-down.xml

@@ -1,6 +1,2 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Grep (&grep-version;): 
+<literallayout>Official download location for Grep (&grep-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/grep/"/></literallayout>
-</sect2>

appendixa/grep-shortdesc.xml

@@ -1,9 +1,6 @@
-<sect2><title>Contents of Grep</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &grep-contversion;.)</para> -->
-
-<para>Grep is a program used to print lines from a file matching a
-specified pattern.</para>
+<sect2 id="contents-grep"><title>Contents of Grep</title>
 
 <para><emphasis>Installed programs</emphasis>: egrep (link to grep), fgrep
 (link to grep) and grep</para>

appendixa/groff-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Groff Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &groff-depversion;.)</para> -->
-
-<para>Groff depends on: Bash, Binutils, Coreutils, Diffutils,
+<para>For its installation Groff depends on: Bash, Binutils, Coreutils, Diffutils,
 Gawk, GCC, Glibc, Grep, Make, Sed.</para>
-
-</sect2>
-

appendixa/groff-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>addftinfo</command> reads a troff font file and adds some

appendixa/groff-down.xml

@@ -1,6 +1,2 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Groff (&groff-version;): 
+<literallayout>Official download location for Groff (&groff-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/groff/"/></literallayout>
-</sect2>

appendixa/groff-shortdesc.xml

@@ -1,11 +1,6 @@
-<sect2><title>Contents of Groff</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &groff-contversion;.)</para> -->
-
-<para>The Groff package includes several text processing programs
-for text formatting. Groff translates standard text and special
-commands into formatted output, such as what you see in a manual
-page.</para>
+<sect2 id="contents-groff"><title>Contents of Groff</title>
 
 <para><emphasis>Installed programs</emphasis>: addftinfo, afmtodit, eqn,
 eqn2graph, geqn (link to eqn), grn, grodvi, groff, groffer, grog, grolbp,

appendixa/grub-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Grub Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &grub-depversion;.)</para> -->
-
-<para>Grub depends on: Bash, Binutils, Coreutils, Diffutils,
+<para>For its installation Grub depends on: Bash, Binutils, Coreutils, Diffutils,
 GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
-
-</sect2>
-

appendixa/grub-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>grub</command> is the GRand Unified Bootloader's command

appendixa/grub-down.xml

@@ -1,6 +1,2 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Grub (&grub-version;):
+<literallayout>Official download location for Grub (&grub-version;):
 <ulink url="ftp://alpha.gnu.org/pub/gnu/grub/"/></literallayout>
-</sect2>

appendixa/grub-shortdesc.xml

@@ -1,8 +1,6 @@
-<sect2><title>Contents of Grub</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &grub-contversion;.)</para> -->
-
-<para>The Grub package contains a bootloader.</para>
+<sect2 id="contents-grub"><title>Contents of Grub</title>
 
 <para><emphasis>Installed programs</emphasis>: grub, grub-install,
 grub-md5-crypt, grub-terminfo and mbchk</para>

appendixa/gzip-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Gzip Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &gzip-depversion;.)</para> -->
-
-<para>Gzip depends on: Bash, Binutils, Coreutils, Diffutils,
+<para>For its installation Gzip depends on: Bash, Binutils, Coreutils, Diffutils,
 GCC, Glibc, Grep, Make, Sed.</para>
-
-</sect2>
-

appendixa/gzip-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>gunzip</command> decompresses gzipped files.</para>

appendixa/gzip-down.xml

@@ -1,7 +1,3 @@
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Gzip (&gzip-version;): 
+<literallayout>Official download location for Gzip (&gzip-version;): 
 <ulink url="ftp://alpha.gnu.org/gnu/gzip/"/></literallayout>
 
-</sect2>

appendixa/gzip-shortdesc.xml

@@ -1,9 +1,6 @@
-<sect2><title>Contents of Gzip</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
-<!-- <para>(Last checked against version &gzip-contversion;.)</para> -->
-
-<para>The Gzip package contains programs to compress and decompress files
-using the Lempel-Ziv coding (LZ77).</para>
+<sect2 id="contents-gzip"><title>Contents of Gzip</title>
 
 <para><emphasis>Installed programs</emphasis>: gunzip (link to gzip), gzexe,
 gzip, uncompress (link to gunzip), zcat (link to gzip), zcmp, zdiff,

appendixa/inetutils-dep.xml

@@ -1,12 +1,2 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Inetutils Installation Dependencies</title>
-
-<!-- <para>(Last checked against version &inetutils-depversion;.)</para> -->
-
-<para>Inetutils depends on: Bash, Binutils, Coreutils,
+<para>For its installation Inetutils depends on: Bash, Binutils, Coreutils,
 Diffutils, GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
-
-</sect2>
-

appendixa/inetutils-desc.xml

@@ -1,5 +1,3 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
 <sect2><title>Short descriptions</title>
 
 <para><command>ftp</command> is the ARPANET file transfer program.</para>

appendixa/inetutils-down.xml

@@ -1,12 +1,5 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Official Download Location</title>
-
-<literallayout>Inetutils (&inetutils-version;):
+<literallayout>Official download location for Inetutils (&inetutils-version;):
 <ulink url="http://freshmeat.net/projects/inetutils/"/>
-
-Inetutils No-Server-Man-Pages Patch:
+And for the Inetutils No-Server-Man-Pages Patch:
 <ulink url="&patches-root;&inetutils-no-server-man-pages-patch;"/></literallayout>
-</sect2>