aboutsummaryrefslogtreecommitdiffstats
path: root/appendixa
diff options
context:
space:
mode:
authorAlex Gronenwoud <alex@linuxfromscratch.org>2003-10-06 22:19:12 +0000
committerAlex Gronenwoud <alex@linuxfromscratch.org>2003-10-06 22:19:12 +0000
commit04a335156f4e0a83bf7d1bf3173cff3bd55f9695 (patch)
treea3e283fd5a0eca8822416d6ea086f3a5e4feab62 /appendixa
parentc1f00d2596a81bcc5e957b90a1f015a788b069c7 (diff)
Changing the style of the 'Content' subsections.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2930 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'appendixa')
-rw-r--r--appendixa/autoconf-desc.xml8
-rw-r--r--appendixa/autoconf-shortdesc.xml8
-rw-r--r--appendixa/automake-desc.xml8
-rw-r--r--appendixa/automake-shortdesc.xml9
-rw-r--r--appendixa/bash-desc.xml8
-rw-r--r--appendixa/bash-shortdesc.xml6
-rw-r--r--appendixa/binutils-desc.xml12
-rw-r--r--appendixa/binutils-shortdesc.xml12
-rw-r--r--appendixa/bison-desc.xml8
-rw-r--r--appendixa/bison-shortdesc.xml5
-rw-r--r--appendixa/bootscripts-desc.xml17
-rw-r--r--appendixa/bootscripts-shortdesc.xml9
-rw-r--r--appendixa/bzip2-desc.xml12
-rw-r--r--appendixa/bzip2-shortdesc.xml14
-rw-r--r--appendixa/coreutils-desc.xml8
-rw-r--r--appendixa/coreutils-shortdesc.xml20
-rw-r--r--appendixa/dejagnu-desc.xml6
-rw-r--r--appendixa/dejagnu-shortdesc.xml6
-rw-r--r--appendixa/diffutils-desc.xml8
-rw-r--r--appendixa/diffutils-shortdesc.xml5
-rw-r--r--appendixa/e2fsprogs-desc.xml12
-rw-r--r--appendixa/e2fsprogs-shortdesc.xml19
-rw-r--r--appendixa/ed-desc.xml8
-rw-r--r--appendixa/ed-shortdesc.xml5
-rw-r--r--appendixa/expect-desc.xml4
-rw-r--r--appendixa/expect-shortdesc.xml9
-rw-r--r--appendixa/file-desc.xml8
-rw-r--r--appendixa/file-shortdesc.xml5
-rw-r--r--appendixa/findutils-desc.xml8
-rw-r--r--appendixa/findutils-shortdesc.xml7
-rw-r--r--appendixa/flex-desc.xml12
-rw-r--r--appendixa/flex-shortdesc.xml9
-rw-r--r--appendixa/gawk-desc.xml8
-rw-r--r--appendixa/gawk-shortdesc.xml7
-rw-r--r--appendixa/gcc-desc.xml12
-rw-r--r--appendixa/gcc-shortdesc.xml12
-rw-r--r--appendixa/gettext-desc.xml12
-rw-r--r--appendixa/gettext-shortdesc.xml16
-rw-r--r--appendixa/glibc-desc.xml12
-rw-r--r--appendixa/glibc-shortdesc.xml33
-rw-r--r--appendixa/grep-desc.xml8
-rw-r--r--appendixa/grep-shortdesc.xml6
-rw-r--r--appendixa/groff-desc.xml8
-rw-r--r--appendixa/groff-shortdesc.xml13
-rw-r--r--appendixa/grub-desc.xml4
-rw-r--r--appendixa/grub-shortdesc.xml6
-rw-r--r--appendixa/gzip-desc.xml8
-rw-r--r--appendixa/gzip-shortdesc.xml9
-rw-r--r--appendixa/inetutils-desc.xml8
-rw-r--r--appendixa/inetutils-shortdesc.xml6
-rw-r--r--appendixa/kbd-desc.xml8
-rw-r--r--appendixa/kbd-shortdesc.xml14
-rw-r--r--appendixa/kernel-desc.xml8
-rw-r--r--appendixa/kernel-shortdesc.xml6
-rw-r--r--appendixa/less-desc.xml8
-rw-r--r--appendixa/less-shortdesc.xml5
-rw-r--r--appendixa/lfs-utils-desc.xml8
-rw-r--r--appendixa/lfs-utils-shortdesc.xml6
-rw-r--r--appendixa/libtool-desc.xml12
-rw-r--r--appendixa/libtool-shortdesc.xml11
-rw-r--r--appendixa/m4-desc.xml8
-rw-r--r--appendixa/m4-shortdesc.xml5
-rw-r--r--appendixa/make-desc.xml8
-rw-r--r--appendixa/make-shortdesc.xml5
-rw-r--r--appendixa/makedev-desc.xml8
-rw-r--r--appendixa/makedev-shortdesc.xml5
-rw-r--r--appendixa/man-desc.xml8
-rw-r--r--appendixa/man-shortdesc.xml7
-rw-r--r--appendixa/manpages-desc.xml8
-rw-r--r--appendixa/manpages-shortdesc.xml5
-rw-r--r--appendixa/modutils-desc.xml8
-rw-r--r--appendixa/modutils-shortdesc.xml10
-rw-r--r--appendixa/ncurses-desc.xml12
-rw-r--r--appendixa/ncurses-shortdesc.xml17
-rw-r--r--appendixa/nettools-desc.xml8
-rw-r--r--appendixa/nettools-shortdesc.xml11
-rw-r--r--appendixa/patch-desc.xml8
-rw-r--r--appendixa/patch-shortdesc.xml5
-rw-r--r--appendixa/perl-desc.xml12
-rw-r--r--appendixa/perl-shortdesc.xml17
-rw-r--r--appendixa/procinfo-desc.xml8
-rw-r--r--appendixa/procinfo-shortdesc.xml6
-rw-r--r--appendixa/procps-desc.xml12
-rw-r--r--appendixa/procps-shortdesc.xml10
-rw-r--r--appendixa/psmisc-desc.xml8
-rw-r--r--appendixa/psmisc-shortdesc.xml5
-rw-r--r--appendixa/sed-desc.xml8
-rw-r--r--appendixa/sed-shortdesc.xml5
-rw-r--r--appendixa/shadowpwd-desc.xml12
-rw-r--r--appendixa/shadowpwd-shortdesc.xml13
-rw-r--r--appendixa/sysklogd-desc.xml8
-rw-r--r--appendixa/sysklogd-shortdesc.xml5
-rw-r--r--appendixa/sysvinit-desc.xml8
-rw-r--r--appendixa/sysvinit-shortdesc.xml11
-rw-r--r--appendixa/tar-desc.xml8
-rw-r--r--appendixa/tar-shortdesc.xml5
-rw-r--r--appendixa/tcl-desc.xml4
-rw-r--r--appendixa/tcl-shortdesc.xml9
-rw-r--r--appendixa/texinfo-desc.xml8
-rw-r--r--appendixa/texinfo-shortdesc.xml7
-rw-r--r--appendixa/utillinux-desc.xml8
-rw-r--r--appendixa/utillinux-shortdesc.xml21
-rw-r--r--appendixa/vim-desc.xml8
-rw-r--r--appendixa/vim-shortdesc.xml12
-rw-r--r--appendixa/zlib-desc.xml8
-rw-r--r--appendixa/zlib-shortdesc.xml5
106 files changed, 229 insertions, 737 deletions
diff --git a/appendixa/autoconf-desc.xml b/appendixa/autoconf-desc.xml
index e529d5a77..324b87954 100644
--- a/appendixa/autoconf-desc.xml
+++ b/appendixa/autoconf-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &autoconf-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>autoconf</command> is a tool for producing shell scripts
that automatically configure software source code packages to adapt to many
@@ -40,7 +36,5 @@ determine what <userinput>configure</userinput> needs to check. It can fill
in some gaps in a <filename>configure.in</filename> file generated by
autoscan.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/autoconf-shortdesc.xml b/appendixa/autoconf-shortdesc.xml
index ee99fefc1..b9d52065c 100644
--- a/appendixa/autoconf-shortdesc.xml
+++ b/appendixa/autoconf-shortdesc.xml
@@ -1,13 +1,11 @@
<sect2><title>Contents of Autoconf</title>
<para>(Last checked against version &autoconf-contversion;.)</para>
+
<para>Autoconf produces shell scripts which automatically configure source
code.</para>
-<para>Autoconf installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>autoconf, autoheader, autom4te, autoreconf, autoscan, autoupdate and
-ifnames</para></sect3>
+<para><emphasis>Installed programs</emphasis>: autoconf, autoheader, autom4te,
+autoreconf, autoscan, autoupdate and ifnames</para>
</sect2>
diff --git a/appendixa/automake-desc.xml b/appendixa/automake-desc.xml
index 416ff2e90..c564278e8 100644
--- a/appendixa/automake-desc.xml
+++ b/appendixa/automake-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &automake-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>acinstall</command> is a script that installs
aclocal-style M4 files.</para>
@@ -50,7 +46,5 @@ tree.</para>
<para><command>ylwrap</command> is a wrapper for lex and yacc.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/automake-shortdesc.xml b/appendixa/automake-shortdesc.xml
index eec50d686..06474b3c7 100644
--- a/appendixa/automake-shortdesc.xml
+++ b/appendixa/automake-shortdesc.xml
@@ -3,11 +3,10 @@
<para>(Last checked against version &automake-contversion;.)</para>
<para>Automake generates Makefile.in files, intended for use with Autoconf.</para>
-<para>Automake installs the following:</para>
-<sect3><title>Program Files</title>
-<para>acinstall, aclocal, aclocal-1.6, automake, automake-1.6,
-compile, config.guess, config.sub, depcomp, elisp-comp, install-sh,
-mdate-sh, missing, mkinstalldirs, py-compile, ylwrap</para></sect3>
+<para><emphasis>Installed programs</emphasis>: acinstall, aclocal,
+aclocal-1.6, automake, automake-1.6, compile, config.guess, config.sub,
+depcomp, elisp-comp, install-sh, mdate-sh, missing, mkinstalldirs, py-compile,
+ylwrap</para>
</sect2>
diff --git a/appendixa/bash-desc.xml b/appendixa/bash-desc.xml
index 418a49423..7ff1e76ea 100644
--- a/appendixa/bash-desc.xml
+++ b/appendixa/bash-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &bash-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>bash</command> is a widely-used command interpreter. It
performs all kinds of expansions and substitutions on a given command line
@@ -17,7 +13,5 @@ compose and mail bug reports concerning bash in a standard format.</para>
as sh, bash tries to mimic the startup behavior of historical versions of sh as
closely as possible, while conforming to the POSIX standard as well.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/bash-shortdesc.xml b/appendixa/bash-shortdesc.xml
index 454fa5067..fcc4159a0 100644
--- a/appendixa/bash-shortdesc.xml
+++ b/appendixa/bash-shortdesc.xml
@@ -8,10 +8,8 @@ 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>
-<para>Bash installs the following files:</para>
-
-<sect3><title>Program Files</title>
-<para>bash, sh (link to bash) and bashbug</para></sect3>
+<para><emphasis>Installed programs</emphasis>: bash, sh (link to bash) and
+bashbug</para>
</sect2>
diff --git a/appendixa/binutils-desc.xml b/appendixa/binutils-desc.xml
index e409ece84..498afda4b 100644
--- a/appendixa/binutils-desc.xml
+++ b/appendixa/binutils-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &binutils-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>addr2line</command> translates program addresses to file
names and line numbers. Given an address and the name of an executable, it
@@ -51,17 +47,11 @@ and loading sections. For other types of files it scans the whole file.</para>
<para><command>strip</command> discards symbols from object files.</para>
-</sect3>
-
-<sect3><title>Library file descriptions</title>
-
<para><command>libbfd</command> is the Binary File Descriptor library.</para>
<para><command>libopcodes</command> is a library for dealing with opcodes.
It is used for building utilities like objdump. Opcodes are the "readable text"
versions of instructions for the processor.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/binutils-shortdesc.xml b/appendixa/binutils-shortdesc.xml
index 6d25b0dba..3bd9844b1 100644
--- a/appendixa/binutils-shortdesc.xml
+++ b/appendixa/binutils-shortdesc.xml
@@ -6,15 +6,11 @@
linker, assembler and other tools to work with object files and
archives.</para>
-<para>Binutils installs the following files:</para>
+<para><emphasis>Installed programs</emphasis>: addr2line, ar, as, gprof, ld,
+nm, objcopy, objdump, ranlib, readelf, size, strings and strip</para>
-<sect3><title>Program Files</title>
-
-<para>addr2line, ar, as, gprof, ld, nm, objcopy, objdump,
-ranlib, readelf, size, strings and strip</para></sect3>
-
-<sect3><title>Library Files</title>
-<para>libbfd.[a,so] and libopcodes.[a,so]</para></sect3>
+<para><emphasis>Installed libraries</emphasis>: libbfd.[a,so] and
+libopcodes.[a,so]</para>
</sect2>
diff --git a/appendixa/bison-desc.xml b/appendixa/bison-desc.xml
index 49ffbcd1c..ba1572da6 100644
--- a/appendixa/bison-desc.xml
+++ b/appendixa/bison-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &bison-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>bison</command> generates, from a series of rules, a program
for analyzing the structure of text files. Bison is a replacement for yacc
@@ -13,7 +9,5 @@ for analyzing the structure of text files. Bison is a replacement for yacc
<para><command>yacc</command> is a wrapper for bison, meant for programs
that still call yacc instead of bison. It calls bison with the -y option.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/bison-shortdesc.xml b/appendixa/bison-shortdesc.xml
index b5747ac23..c2f3571f0 100644
--- a/appendixa/bison-shortdesc.xml
+++ b/appendixa/bison-shortdesc.xml
@@ -5,10 +5,7 @@
<para>Bison is a parser generator, a replacement for yacc. Bison
generates a program that analyzes the structure of a text file.</para>
-<para>Bison installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>bison and yacc</para></sect3>
+<para><emphasis>Installed programs</emphasis>: bison and yacc</para>
</sect2>
diff --git a/appendixa/bootscripts-desc.xml b/appendixa/bootscripts-desc.xml
index 83ff56681..4a791f5e5 100644
--- a/appendixa/bootscripts-desc.xml
+++ b/appendixa/bootscripts-desc.xml
@@ -1,19 +1,16 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &bootscripts-contversion;.)</para>
-
-<sect3><title>Script descriptions</title>
+<sect2><title>Short descriptions</title>
<para>The <command>checkfs</command> script checks the file systems just
before they are mounted (with the exception of journal and network based file
systems).</para>
-<para>The <command>cleanfs</command> script removes files that shouldn't be preserved between
-reboots, such as /var/run/* and /var/lock/*. It re-creates /var/run/utmp and
-removes the possibly present /etc/nologin, /fastboot and /forcefsck
-files.</para>
+<para>The <command>cleanfs</command> script removes files that shouldn't be
+preserved between reboots, such as those in <filename>/var/run/</filename> and
+<filename>/var/lock/</filename>. It re-creates <filename>/var/run/utmp</filename>
+and removes the possibly present <filename>/etc/nologin</filename>,
+<filename>/fastboot</filename> and <filename>/forcefsck</filename> files.</para>
<para>The <command>functions</command> script contains functions shared among
different scripts, such as error and status checking.</para>
@@ -59,7 +56,5 @@ kernel log daemons.</para>
<para>The <command>template</command> script is a template you can use to
create your own bootscripts for your other daemons.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/bootscripts-shortdesc.xml b/appendixa/bootscripts-shortdesc.xml
index 544dd6439..455f2453b 100644
--- a/appendixa/bootscripts-shortdesc.xml
+++ b/appendixa/bootscripts-shortdesc.xml
@@ -7,12 +7,9 @@ scripts. These scripts do various tasks such as check filesystem
integrity during boot, load keymaps, set up networks and halt
processes at shutdown.</para>
-<para>LFS-bootscripts installs the following:</para>
-
-<sect3><title>Scripts</title>
-<para>checkfs, cleanfs, functions, halt, ifdown, ifup, loadkeys, localnet,
-mountfs, mountproc, network, rc, reboot, sendsignals, setclock, swap,
-sysklogd and template</para></sect3>
+<para><emphasis>Installed scripts</emphasis>: checkfs, cleanfs, functions,
+halt, ifdown, ifup, loadkeys, localnet, mountfs, mountproc, network, rc,
+reboot, sendsignals, setclock, swap, sysklogd and template</para>
</sect2>
diff --git a/appendixa/bzip2-desc.xml b/appendixa/bzip2-desc.xml
index 6f02f43bd..7fc388cef 100644
--- a/appendixa/bzip2-desc.xml
+++ b/appendixa/bzip2-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &bzip2-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>bunzip2</command> decompresses bzipped files.</para>
@@ -28,14 +24,8 @@ bzip2 files.</para>
<para><command>bzmore</command> runs more on bzipped files.</para>
-</sect3>
-
-<sect3><title>Library file descriptions</title>
-
<para><command>libbz2*</command> is the library implementing lossless,
block-sorting data compression, using the Burrows-Wheeler algorithm.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/bzip2-shortdesc.xml b/appendixa/bzip2-shortdesc.xml
index 3da5d3679..1d384730a 100644
--- a/appendixa/bzip2-shortdesc.xml
+++ b/appendixa/bzip2-shortdesc.xml
@@ -6,14 +6,12 @@
better compression than the traditional <userinput>gzip</userinput>
does.</para>
-<para>Bzip2 installs the following files:</para>
+<para><emphasis>Installed programs</emphasis>: bunzip2 (link to bzip2), bzcat
+(link to bzip2), bzcmp, bzdiff, bzegrep, bzfgrep, bzgrep, bzip2, bzip2recover,
+bzless and bzmore</para>
-<sect3><title>Program Files</title>
-<para>bunzip2 (link to bzip2), bzcat (link to bzip2), bzcmp, bzdiff, bzegrep,
-bzfgrep, bzgrep, bzip2, bzip2recover, bzless and bzmore</para></sect3>
-
-<sect3><title>Library Files</title>
-<para>libbz2.a, libbz2.so (link to libbz2.so.1.0), libbz2.so.1.0 (link to
-libbz2.so.1.0.2) and libbz2.so.1.0.2</para></sect3>
+<para><emphasis>Installed libraries</emphasis>: libbz2.a, libbz2.so (link to
+libbz2.so.1.0), libbz2.so.1.0 (link to libbz2.so.1.0.2) and
+libbz2.so.1.0.2</para>
</sect2>
diff --git a/appendixa/coreutils-desc.xml b/appendixa/coreutils-desc.xml
index 9a780a649..80e6602eb 100644
--- a/appendixa/coreutils-desc.xml
+++ b/appendixa/coreutils-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against the old Fileutils, Sh-utils and Textutils.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>basename</command> strips any path and a given suffix from
the given file name.</para>
@@ -242,7 +238,5 @@ current effective user ID.</para>
<para><command>yes</command> outputs 'y' or a given string repeatedly,
until killed.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/coreutils-shortdesc.xml b/appendixa/coreutils-shortdesc.xml
index 6cdb62a88..b84577feb 100644
--- a/appendixa/coreutils-shortdesc.xml
+++ b/appendixa/coreutils-shortdesc.xml
@@ -2,17 +2,17 @@
<para>The Coreutils package contains a whole series of basic shell utilities.</para>
-<para>Coreutils installs the following:</para>
+<para>(Last checked against the old Fileutils, Sh-utils and Textutils.)</para>
-<sect3><title>Program Files</title>
-<para>basename, cat, chgrp, chmod, chown, chroot, cksum, comm, cp, csplit,
-cut, date, dd, df, dir, dircolors, dirname, du, echo, env, expand, expr,
-factor, false, fmt, fold, groups, head, hostid, hostname, id, install, join,
-kill, link, ln, logname, ls, md5sum, mkdir, mkfifo, mknod, mv, nice, nl,
-nohup, od, paste, pathchk, pinky, pr, printenv, printf, ptx, pwd, readlink,
-rm, rmdir, seq, sha1sum, shred, sleep, sort, split, stat, stty, su, sum, sync,
-tac, tail, tee, test, touch, tr, true, tsort, tty, uname, unexpand, uniq,
-unlink, uptime, users, vdir, wc, who, whoami, yes</para></sect3>
+<para><emphasis>Installed programs</emphasis>: basename, cat, chgrp, chmod,
+chown, chroot, cksum, comm, cp, csplit, cut, date, dd, df, dir, dircolors,
+dirname, du, echo, env, expand, expr, factor, false, fmt, fold, groups, head,
+hostid, hostname, id, install, join, kill, link, ln, logname, ls, md5sum,
+mkdir, mkfifo, mknod, mv, nice, nl, nohup, od, paste, pathchk, pinky, pr,
+printenv, printf, ptx, pwd, readlink, rm, rmdir, seq, sha1sum, shred, sleep,
+sort, split, stat, stty, su, sum, sync, tac, tail, tee, test, touch, tr, true,
+tsort, tty, uname, unexpand, uniq, unlink, uptime, users, vdir, wc, who,
+whoami and yes</para>
</sect2>
diff --git a/appendixa/dejagnu-desc.xml b/appendixa/dejagnu-desc.xml
index 994ef2956..9cd020d89 100644
--- a/appendixa/dejagnu-desc.xml
+++ b/appendixa/dejagnu-desc.xml
@@ -1,10 +1,8 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &dejagnu-contversion;.)</para>
+<sect2><title>Short description</title>
<para><command>runtest</command> is the wrapper script that finds the proper
-expect shell then runs DejaGnu</para>
+expect shell and then runs DejaGnu.</para>
</sect2>
diff --git a/appendixa/dejagnu-shortdesc.xml b/appendixa/dejagnu-shortdesc.xml
index b31a47f93..bcc1d1356 100644
--- a/appendixa/dejagnu-shortdesc.xml
+++ b/appendixa/dejagnu-shortdesc.xml
@@ -4,11 +4,7 @@
<para>The DejaGnu package contains a framework for testing other programs.</para>
-<para>DejaGnu installs the following files:</para>
-
-<sect3><title>Program Files</title>
-
-<para>runtest</para></sect3>
+<para><emphasis>Installed program</emphasis>: runtest</para>
</sect2>
diff --git a/appendixa/diffutils-desc.xml b/appendixa/diffutils-desc.xml
index d8653fecb..68af0a0f2 100644
--- a/appendixa/diffutils-desc.xml
+++ b/appendixa/diffutils-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &diffutils-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>cmp</command> compares two files and reports whether or
in which bytes they differ.</para>
@@ -17,7 +13,5 @@ which lines in the files differ.</para>
<para><command>sdiff</command> merges two files and interactively outputs
the results.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/diffutils-shortdesc.xml b/appendixa/diffutils-shortdesc.xml
index a3892d4fc..43e1158b9 100644
--- a/appendixa/diffutils-shortdesc.xml
+++ b/appendixa/diffutils-shortdesc.xml
@@ -6,10 +6,7 @@
files or directories. It's most common use is to create software
patches.</para>
-<para>Diffutils installs the following files:</para>
-
-<sect3><title>Program Files</title>
-<para>cmp, diff, diff3 and sdiff</para></sect3>
+<para><emphasis>Installed programs</emphasis>: cmp, diff, diff3 and sdiff</para>
</sect2>
diff --git a/appendixa/e2fsprogs-desc.xml b/appendixa/e2fsprogs-desc.xml
index 3ec288f7a..09f580976 100644
--- a/appendixa/e2fsprogs-desc.xml
+++ b/appendixa/e2fsprogs-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &e2fsprogs-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>badblocks</command> searches a device (usually a disk
partition) for bad blocks.</para>
@@ -60,10 +56,6 @@ identifiers (UUID). Each new UUID can reasonably be considered unique
among all UUIDs created, on the local system and on other systems, in the
past and in the future.</para>
-</sect3>
-
-<sect3><title>Library file descriptions</title>
-
<para><command>libcom_err</command> is the common error display routine.</para>
<para><command>libe2p</command> is used by dumpe2fs, chattr, and lsattr.</para>
@@ -76,7 +68,5 @@ programs to manipulate an ext2 filesystem.</para>
<para><command>libuuid</command> contains routines for generating unique
identifiers for objects that may be accessible beyond the local system.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/e2fsprogs-shortdesc.xml b/appendixa/e2fsprogs-shortdesc.xml
index 0d6ac20ba..13515defe 100644
--- a/appendixa/e2fsprogs-shortdesc.xml
+++ b/appendixa/e2fsprogs-shortdesc.xml
@@ -6,20 +6,13 @@
ext2 filesystem. It also supports the ext3 filesystem with journaling
support.</para>
-<para>E2fsprogs installs the following:</para>
-
-<sect3><title>Program Files</title>
-
-<para>badblocks, chattr, compile_et, debugfs, dumpe2fs, e2fsck,
-e2image, e2label, fsck, fsck.ext2, fsck.ext3, lsattr, mk_cmds, mke2fs,
-mkfs.ext2, mkfs.ext3, mklost+found, resize2fs, tune2fs and
-uuidgen</para></sect3>
-
-<sect3><title>Library Files</title>
-
-<para>libcom_err.[a,so], libe2p.[a,so], libext2fs.[a,so], libss.[a,so],
-libuuid.[a,so]</para></sect3>
+<para><emphasis>Installed programs</emphasis>: badblocks, chattr, compile_et,
+debugfs, dumpe2fs, e2fsck, e2image, e2label, fsck, fsck.ext2, fsck.ext3,
+lsattr, mk_cmds, mke2fs, mkfs.ext2, mkfs.ext3, mklost+found, resize2fs,
+tune2fs and uuidgen</para>
+<para><emphasis>Installed libraries</emphasis>: libcom_err.[a,so],
+libe2p.[a,so], libext2fs.[a,so], libss.[a,so] and libuuid.[a,so]</para>
</sect2>
diff --git a/appendixa/ed-desc.xml b/appendixa/ed-desc.xml
index a9a37b02c..a7122ee0a 100644
--- a/appendixa/ed-desc.xml
+++ b/appendixa/ed-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &ed-contversion;.)</para>
-
-<sect3><title>Program file description</title>
+<sect2><title>Short descriptions</title>
<para><command>ed</command> is a line-oriented text editor. It can be used
to create, display, modify and otherwise manipulate text files.</para>
@@ -12,7 +8,5 @@ to create, display, modify and otherwise manipulate text files.</para>
<para><command>red</command> is a restricted ed -- it can only edit files
in the current directory and cannot execute shell commands.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/ed-shortdesc.xml b/appendixa/ed-shortdesc.xml
index c0d80ba7d..625961f79 100644
--- a/appendixa/ed-shortdesc.xml
+++ b/appendixa/ed-shortdesc.xml
@@ -4,10 +4,7 @@
<para>GNU ed is an 8-bit clean, POSIX-compliant line editor.</para>
-<para>Ed installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>ed and red (link to ed)</para></sect3>
+<para><emphasis>Installed programs</emphasis>: ed and red (link to ed)</para>
</sect2>
diff --git a/appendixa/expect-desc.xml b/appendixa/expect-desc.xml
index caf136605..ea80526f8 100644
--- a/appendixa/expect-desc.xml
+++ b/appendixa/expect-desc.xml
@@ -1,8 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &expect-contversion;.)</para>
+<sect2><title>Short description</title>
<para><command>expect</command> "talks" to other interactive programs according
to a script.</para>
diff --git a/appendixa/expect-shortdesc.xml b/appendixa/expect-shortdesc.xml
index 7d3647250..a51b1ab5a 100644
--- a/appendixa/expect-shortdesc.xml
+++ b/appendixa/expect-shortdesc.xml
@@ -5,14 +5,9 @@
<para>The Expect package provides a program that performs programmed dialogue
with other interactive programs.</para>
-<para>Expect installs the following files:</para>
+<para><emphasis>Installed program</emphasis>: expect</para>
-<sect3><title>Program Files</title>
-
-<para>expect</para></sect3>
-
-<sect3><title>Library Files</title>
-<para>libexpect5.39.a</para></sect3>
+<para><emphasis>Installed library</emphasis>: libexpect5.39.a</para>
</sect2>
diff --git a/appendixa/file-desc.xml b/appendixa/file-desc.xml
index ab8568760..fa85855db 100644
--- a/appendixa/file-desc.xml
+++ b/appendixa/file-desc.xml
@@ -1,16 +1,10 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Description</title>
-
-<para>(Last checked against version &file-contversion;.)</para>
-
-<sect3><title>Program file description</title>
+<sect2><title>Short description</title>
<para><command>file</command> tries to classify each given file. It does
this by performing several tests: filesystem tests, magic number tests, and
language tests. The first test that succeeds determines the result.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/file-shortdesc.xml b/appendixa/file-shortdesc.xml
index bec6420a6..4eab0f2b5 100644
--- a/appendixa/file-shortdesc.xml
+++ b/appendixa/file-shortdesc.xml
@@ -4,10 +4,7 @@
<para>File is a utility used to determine file types.</para>
-<para>File installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>file</para></sect3>
+<para><emphasis>Installed program</emphasis>: file</para>
</sect2>
diff --git a/appendixa/findutils-desc.xml b/appendixa/findutils-desc.xml
index 879505a1d..05cd7b8fb 100644
--- a/appendixa/findutils-desc.xml
+++ b/appendixa/findutils-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &findutils-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>bigram</command> was formerly used to produce locate
databases.</para>
@@ -29,7 +25,5 @@ unless told not to) and puts every file name it finds in the database.</para>
<para><command>xargs</command> can be used to apply a given command to
a list of files.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/findutils-shortdesc.xml b/appendixa/findutils-shortdesc.xml
index e492672cb..6477b05a5 100644
--- a/appendixa/findutils-shortdesc.xml
+++ b/appendixa/findutils-shortdesc.xml
@@ -7,11 +7,8 @@ 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>
-<para>Findutils installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>bigram, code, find, frcode, locate, updatedb and
-xargs</para></sect3>
+<para><emphasis>Installed programs</emphasis>: bigram, code, find, frcode,
+locate, updatedb and xargs</para>
</sect2>
diff --git a/appendixa/flex-desc.xml b/appendixa/flex-desc.xml
index ea6181669..1e14e43ff 100644
--- a/appendixa/flex-desc.xml
+++ b/appendixa/flex-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &flex-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>flex</command> is a tool for generating programs that
recognize patterns in text. Pattern recognition is useful in many applications.
@@ -15,13 +11,7 @@ the rules for than to write the actual pattern-finding program.</para>
<para><command>flex++</command> invokes a version of flex that is used
exclusively for C++ scanners.</para>
-</sect3>
-
-<sect3><title>Library file descriptions</title>
-
<para><command>libfl.a</command> is the flex library.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/flex-shortdesc.xml b/appendixa/flex-shortdesc.xml
index ca7a8ef05..75f144476 100644
--- a/appendixa/flex-shortdesc.xml
+++ b/appendixa/flex-shortdesc.xml
@@ -5,13 +5,10 @@
<para>The Flex package is used to generate programs which recognize
patterns in text.</para>
-<para>Flex installs the following:</para>
+<para><emphasis>Installed programs</emphasis>: flex, flex++ (link to flex)
+and lex</para>
-<sect3><title>Program Files</title>
-<para>flex, flex++ (link to flex) and lex</para></sect3>
-
-<sect3><title>Library Files</title>
-<para>libfl.a</para></sect3>
+<para><emphasis>Installed library</emphasis>: libfl.a</para>
</sect2>
diff --git a/appendixa/gawk-desc.xml b/appendixa/gawk-desc.xml
index 2078327cf..79ed37059 100644
--- a/appendixa/gawk-desc.xml
+++ b/appendixa/gawk-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &gawk-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>gawk</command> is a program for manipulating text files.
It is the GNU implementation of awk.</para>
@@ -20,7 +16,5 @@ include files.</para>
<para><command>pwcat</command> dumps the password database
<filename>/etc/passwd</filename>.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/gawk-shortdesc.xml b/appendixa/gawk-shortdesc.xml
index e81df4a66..52095c913 100644
--- a/appendixa/gawk-shortdesc.xml
+++ b/appendixa/gawk-shortdesc.xml
@@ -5,10 +5,7 @@
<para>Gawk is an awk implementation that is used to manipulate text
files.</para>
-<para>Gawk installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>awk, gawk, gawk-3.1.1, grcat, igawk, pgawk, pgawk-3.1.1,
-pwcat</para></sect3>
+<para><emphasis>Installed programs</emphasis>: awk, gawk, gawk-3.1.1, grcat,
+igawk, pgawk, pgawk-3.1.1 and pwcat</para>
</sect2>
diff --git a/appendixa/gcc-desc.xml b/appendixa/gcc-desc.xml
index 66f7dd23d..aa9e16bae 100644
--- a/appendixa/gcc-desc.xml
+++ b/appendixa/gcc-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &gcc-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>c++filt</command> is used by the linker to demangle C++
symbols, to keep overloaded functions from clashing.</para>
@@ -24,10 +20,6 @@ good bug reports.</para>
<para><command>gcov</command> is a coverage testing tool. It is used to
analyze programs to find out where optimizations will have the most effect.</para>
-</sect3>
-
-<sect3><title>Library file descriptions</title>
-
<para><command>libgcc*</command> contains run-time support for gcc.</para>
<para><command>libiberty</command> contains routines used by various GNU
@@ -39,7 +31,5 @@ many frequently-used functions.</para>
<para><command>libsupc++</command> provides supporting routines
for the c++ programming language.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/gcc-shortdesc.xml b/appendixa/gcc-shortdesc.xml
index 9f159b8e1..811bc9586 100644
--- a/appendixa/gcc-shortdesc.xml
+++ b/appendixa/gcc-shortdesc.xml
@@ -5,15 +5,11 @@
<para>The GCC package contains the GNU compiler collection, including
the C and C++ compilers.</para>
-<para>GCC installs the following files:</para>
+<para><emphasis>Installed programs</emphasis>: c++, c++filt, cc (link to gcc),
+cc1, cc1plus, collect2, cpp, cpp0, g++, gcc, gccbug, gcov and tradcpp0</para>
-<sect3><title>Program Files</title>
-<para>c++, c++filt, cc (link to gcc), cc1, cc1plus, collect2, cpp, cpp0,
-g++, gcc, gccbug, gcov and tradcpp0</para></sect3>
-
-<sect3><title>Library Files</title>
-<para>libgcc.a, libgcc_eh.a, libgcc_s.so, libiberty.a, libstdc++.[a,so],
-libsupc++.a</para></sect3>
+<para><emphasis>Installed libraries</emphasis>: libgcc.a, libgcc_eh.a,
+libgcc_s.so, libiberty.a, libstdc++.[a,so] and libsupc++.a</para>
</sect2>
diff --git a/appendixa/gettext-desc.xml b/appendixa/gettext-desc.xml
index 39cb47365..750de7f1e 100644
--- a/appendixa/gettext-desc.xml
+++ b/appendixa/gettext-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &gettext-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>config.charset</command> outputs a system-dependent table of
character encoding aliases.</para>
@@ -70,15 +66,9 @@ textual message whose grammatical form depends on a number.</para>
<para><command>xgettext</command> extracts the translatable message lines
from the given source files, to make the first translation template.</para>
-</sect3>
-
-<sect3><title>Library file descriptions</title>
-
<para><command>libgettextlib</command>...</para>
<para><command>libgettextsrc</command>...</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/gettext-shortdesc.xml b/appendixa/gettext-shortdesc.xml
index 4b19ec467..2afbf38e9 100644
--- a/appendixa/gettext-shortdesc.xml
+++ b/appendixa/gettext-shortdesc.xml
@@ -7,15 +7,13 @@ localization. Programs can be compiled with Native Language Support
(NLS) which enable them to output messages in the user's native
language.</para>
-<para>Gettext installs the following:</para>
+<para><emphasis>Installed programs</emphasis>: config.charset, config.rpath,
+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>
-<sect3><title>Program Files</title>
-<para>config.charset, config.rpath, 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></sect3>
-
-<sect3><title>Library Files</title>
-<para>libgettextlib[a,so], libgettextsrc[a,so]</para></sect3>
+<para><emphasis>Installed libraries</emphasis>: libgettextlib[a,so] and
+libgettextsrc[a,so]</para>
</sect2>
diff --git a/appendixa/glibc-desc.xml b/appendixa/glibc-desc.xml
index d3ff2b7da..37646c177 100644
--- a/appendixa/glibc-desc.xml
+++ b/appendixa/glibc-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &glibc-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>catchsegv</command> can be used to create a stack trace
when a program terminates with a segmentation fault.</para>
@@ -74,10 +70,6 @@ printing the currently executed function.</para>
<para><command>zic</command> is the time zone compiler.</para>
-</sect3>
-
-<sect3><title>Library file descriptions</title>
-
<para><command>ld.so</command> is the helper program for shared library
executables.</para>
@@ -137,7 +129,5 @@ building debuggers for multi-threaded programs.</para>
<para><command>libutil</command> contains code for "standard" functions
used in many different Unix utilities.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/glibc-shortdesc.xml b/appendixa/glibc-shortdesc.xml
index b5c3b44bf..2f053b67a 100644
--- a/appendixa/glibc-shortdesc.xml
+++ b/appendixa/glibc-shortdesc.xml
@@ -6,27 +6,18 @@
functions such as open, malloc, printf, etc. The C library is used by all
dynamically linked programs.</para>
-<para>Glibc installs the following files:</para>
-
-<sect3><title>Program Files</title>
-
-<para>catchsegv, gencat, getconf, getent, glibcbug, iconv, iconvconfig,
-ldconfig, ldd, lddlibc4, locale, localedef, mtrace, nscd, nscd_nischeck,
-pcprofiledump, pt_chown, rpcgen, rpcinfo, sln, sprof, tzselect, xtrace,
-zdump and zic</para>
-
-</sect3>
-
-<sect3><title>Library Files</title>
-<para>ld.so, libBrokenLocale.[a,so], libSegFault.so, libanl.[a,so],
-libbsd-compat.a, libc.[a,so], libc_nonshared.a, libcrypt.[a,so], libdl.[a,so],
-libg.a, libieee.a, libm.[a,so], libmcheck.a, libmemusage.so, libnsl.a,
-libnss_compat.so, libnss_dns.so, libnss_files.so, libnss_hesiod.so,
-libnss_nis.so, libnss_nisplus.so, libpcprofile.so, libpthread.[a,so],
-libresolv.[a,so], librpcsvc.a, librt.[a,so], libthread_db.so and
-libutil.[a,so]</para>
-
-</sect3>
+<para><emphasis>Installed programs</emphasis>: catchsegv, gencat, getconf,
+getent, glibcbug, iconv, iconvconfig, ldconfig, ldd, lddlibc4, locale,
+localedef, mtrace, nscd, nscd_nischeck, pcprofiledump, pt_chown, rpcgen,
+rpcinfo, sln, sprof, tzselect, xtrace, zdump and zic</para>
+
+<para><emphasis>Installed libraries</emphasis>: ld.so, libBrokenLocale.[a,so],
+libSegFault.so, libanl.[a,so], libbsd-compat.a, libc.[a,so], libc_nonshared.a,
+libcrypt.[a,so], libdl.[a,so], libg.a, libieee.a, libm.[a,so], libmcheck.a,
+libmemusage.so, libnsl.a, libnss_compat.so, libnss_dns.so, libnss_files.so,
+libnss_hesiod.so, libnss_nis.so, libnss_nisplus.so, libpcprofile.so,
+libpthread.[a,so], libresolv.[a,so], librpcsvc.a, librt.[a,so], libthread_db.so
+and libutil.[a,so]</para>
</sect2>
diff --git a/appendixa/grep-desc.xml b/appendixa/grep-desc.xml
index a3973016d..58b1227ea 100644
--- a/appendixa/grep-desc.xml
+++ b/appendixa/grep-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &grep-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>egrep</command> prints lines matching an extended regular
expression.</para>
@@ -15,7 +11,5 @@ strings.</para>
<para><command>grep</command> prints lines matching a basic regular
expression.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/grep-shortdesc.xml b/appendixa/grep-shortdesc.xml
index 087f1efe0..1abe296c4 100644
--- a/appendixa/grep-shortdesc.xml
+++ b/appendixa/grep-shortdesc.xml
@@ -5,10 +5,8 @@
<para>Grep is a program used to print lines from a file matching a
specified pattern.</para>
-<para>Grep installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>egrep (link to grep), fgrep (link to grep) and grep</para></sect3>
+<para><emphasis>Installed programs</emphasis>: egrep (link to grep), fgrep
+(link to grep) and grep</para>
</sect2>
diff --git a/appendixa/groff-desc.xml b/appendixa/groff-desc.xml
index a9a6a691a..a274b4742 100644
--- a/appendixa/groff-desc.xml
+++ b/appendixa/groff-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &groff-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>addftinfo</command> reads a troff font file and adds some
additional font-metric information that is used by the groff system.</para>
@@ -99,7 +95,5 @@ appropriate options.</para>
<para><command>zsoelim</command> is the GNU implementation of soelim.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/groff-shortdesc.xml b/appendixa/groff-shortdesc.xml
index c246f0e0e..195ab2971 100644
--- a/appendixa/groff-shortdesc.xml
+++ b/appendixa/groff-shortdesc.xml
@@ -7,13 +7,10 @@ for text formatting. Groff translates standard text and special
commands into formatted output, such as what you see in a manual
page.</para>
-<para>Groff installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>addftinfo, afmtodit, eqn, geqn (link to eqn), grn, grodvi,
-groff, grog, grolbp, grolj4, grops, grotty, gtbl (link to tbl),
-hpftodit, indxbib, lkbib, lookbib, mmroff, neqn, nroff, pfbtops,
-pic, post-grohtml, pre-grohtml, refer, soelim, tbl, tfmtodit,
-troff and zsoelim (link to soelim)</para></sect3>
+<para><emphasis>Installed programs</emphasis>: addftinfo, afmtodit, eqn, geqn
+(link to eqn), grn, grodvi, groff, grog, grolbp, grolj4, grops, grotty, gtbl
+(link to tbl), hpftodit, indxbib, lkbib, lookbib, mmroff, neqn, nroff, pfbtops,
+pic, post-grohtml, pre-grohtml, refer, soelim, tbl, tfmtodit, troff and
+zsoelim (link to soelim)</para>
</sect2>
diff --git a/appendixa/grub-desc.xml b/appendixa/grub-desc.xml
index f1d9805d0..38c0dfc9c 100644
--- a/appendixa/grub-desc.xml
+++ b/appendixa/grub-desc.xml
@@ -1,8 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &grub-contversion;.)</para>
+<sect2><title>Short descriptions</title>
<para><command>grub</command> is the GRand Unified Bootloader's command
shell.</para>
diff --git a/appendixa/grub-shortdesc.xml b/appendixa/grub-shortdesc.xml
index e7e9e69b8..0db5a69fd 100644
--- a/appendixa/grub-shortdesc.xml
+++ b/appendixa/grub-shortdesc.xml
@@ -4,9 +4,7 @@
<para>The Grub package contains a bootloader.</para>
-<para>Grub installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>grub, grub-install, grub-md5-crypt, grub-terminfo and mbchk</para></sect3>
+<para><emphasis>Installed programs</emphasis>: grub, grub-install,
+grub-md5-crypt, grub-terminfo and mbchk</para>
</sect2>
diff --git a/appendixa/gzip-desc.xml b/appendixa/gzip-desc.xml
index e5f48fb6e..daeb948da 100644
--- a/appendixa/gzip-desc.xml
+++ b/appendixa/gzip-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &gzip-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>gunzip</command> decompresses gzipped files.</para>
@@ -34,7 +30,5 @@ useful when file names were truncated during a file transfer.</para>
<para><command>znew</command> recompresses files from compress format
to gzip format -- .Z to .gz.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/gzip-shortdesc.xml b/appendixa/gzip-shortdesc.xml
index f2339bda7..5e6f111ba 100644
--- a/appendixa/gzip-shortdesc.xml
+++ b/appendixa/gzip-shortdesc.xml
@@ -5,11 +5,8 @@
<para>The Gzip package contains programs to compress and decompress files
using the Lempel-Ziv coding (LZ77).</para>
-<para>Gzip installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>gunzip (link to gzip), gzexe, gzip,
-uncompress (link to gunzip), zcat (link to gzip), zcmp, zdiff, zforce,
-zgrep, zmore and znew</para></sect3>
+<para><emphasis>Installed programs</emphasis>: gunzip (link to gzip), gzexe,
+gzip, uncompress (link to gunzip), zcat (link to gzip), zcmp, zdiff, zforce,
+zgrep, zmore and znew</para>
</sect2>
diff --git a/appendixa/inetutils-desc.xml b/appendixa/inetutils-desc.xml
index 29d47ccba..7da0f5cf5 100644
--- a/appendixa/inetutils-desc.xml
+++ b/appendixa/inetutils-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &inetutils-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>ftp</command> is the ARPANET file transfer program.</para>
@@ -23,7 +19,5 @@ long the replies take.</para>
<para><command>tftp</command> is a trivial file transfer program.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/inetutils-shortdesc.xml b/appendixa/inetutils-shortdesc.xml
index bfa5cfbad..f914eb996 100644
--- a/appendixa/inetutils-shortdesc.xml
+++ b/appendixa/inetutils-shortdesc.xml
@@ -4,9 +4,7 @@
<para>The Inetutils package contains network clients and servers.</para>
-<para>Inetutils installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>ftp, ping, rcp, rlogin, rsh, talk, telnet, tftp</para></sect3>
+<para><emphasis>Installed programs</emphasis>: ftp, ping, rcp, rlogin, rsh,
+talk, telnet and tftp</para>
</sect2>
diff --git a/appendixa/kbd-desc.xml b/appendixa/kbd-desc.xml
index 10c6c9f2f..7ae2c4c10 100644
--- a/appendixa/kbd-desc.xml
+++ b/appendixa/kbd-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &kbd-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>chvt</command> changes the foreground virtual terminal.</para>
@@ -65,7 +61,5 @@ unicode mode.</para>
<para><command>unicode_stop</command> reverts keyboard and console from
unicode mode.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/kbd-shortdesc.xml b/appendixa/kbd-shortdesc.xml
index d00538d90..2637146cd 100644
--- a/appendixa/kbd-shortdesc.xml
+++ b/appendixa/kbd-shortdesc.xml
@@ -4,16 +4,12 @@
<para>Kbd contains keytable files and keyboard utilities.</para>
-<para>Kbd installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>chvt, deallocvt, dumpkeys, fgconsole,
-getkeycodes, getunimap, kbd_mode, kbdrate, loadkeys, loadunimap,
+<para><emphasis>Installed programs</emphasis>: chvt, deallocvt, dumpkeys,
+fgconsole, getkeycodes, getunimap, kbd_mode, kbdrate, loadkeys, loadunimap,
mapscrn, openvt, psfaddtable (link to psfxtable), psfgettable (link to
-psfxtable), psfstriptable (link to psfxtable), psfxtable, resizecons,
-setfont, setkeycodes, setleds, setlogcons,
-setmetamode, setvesablank, showfont, showkey, unicode_start, and
-unicode_stop</para></sect3>
+psfxtable), psfstriptable (link to psfxtable), psfxtable, resizecons,
+setfont, setkeycodes, setleds, setlogcons, setmetamode, setvesablank,
+showfont, showkey, unicode_start and unicode_stop</para>
</sect2>
diff --git a/appendixa/kernel-desc.xml b/appendixa/kernel-desc.xml
index da763659c..ab7119f87 100644
--- a/appendixa/kernel-desc.xml
+++ b/appendixa/kernel-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &kernel-contversion;.)</para>
-
-<sect3><title>File descriptions</title>
+<sect2><title>Short descriptions</title>
<para>The <emphasis>kernel</emphasis> is the engine of your GNU/Linux system.
When switching on your box, the kernel is the first part of your operating
@@ -19,7 +15,5 @@ services that the kernel provides. The headers in your system's
the ones against which Glibc was compiled and should therefore
<emphasis>not</emphasis> be replaced when upgrading the kernel.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/kernel-shortdesc.xml b/appendixa/kernel-shortdesc.xml
index f12277110..df319c660 100644
--- a/appendixa/kernel-shortdesc.xml
+++ b/appendixa/kernel-shortdesc.xml
@@ -10,9 +10,7 @@ ports, sound cards, network cards, IDE controllers, SCSI controllers and a
lot more. In a nutshell the kernel makes the hardware available so that the
software can run.</para>
-<para>Linux installs the following files:</para>
-
-<sect3><title>Files</title>
-<para>kernel and kernel headers</para></sect3>
+<para><emphasis>Installed files</emphasis>: the kernel and the kernel
+headers</para>
</sect2>
diff --git a/appendixa/less-desc.xml b/appendixa/less-desc.xml
index e60c79abb..af8f0c781 100644
--- a/appendixa/less-desc.xml
+++ b/appendixa/less-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &less-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>less</command> is a file viewer or pager. It displays the
contents of the given file, letting you scroll around, find strings, and jump
@@ -16,7 +12,5 @@ such as * and ?, in filenames on Unix systems.</para>
<para><command>lesskey</command> is used to specify the key bindings
for less.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/less-shortdesc.xml b/appendixa/less-shortdesc.xml
index 4d19bb358..718b87070 100644
--- a/appendixa/less-shortdesc.xml
+++ b/appendixa/less-shortdesc.xml
@@ -7,10 +7,7 @@ of a file, or stream, and has the ability to scroll. Less has a few
features not included in the <userinput>more</userinput> pager,
such as the ability to scroll backwards.</para>
-<para>Less installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>less, lessecho and lesskey</para></sect3>
+<para><emphasis>Installed programs</emphasis>: less, lessecho and lesskey</para>
</sect2>
diff --git a/appendixa/lfs-utils-desc.xml b/appendixa/lfs-utils-desc.xml
index 9b19a60b4..17161f53a 100644
--- a/appendixa/lfs-utils-desc.xml
+++ b/appendixa/lfs-utils-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &lfs-utils-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>mktemp</command> creates temporary files in a secure manner.
It is used in scripts.</para>
@@ -21,6 +17,4 @@ download from websites without using any other programs.</para>
script to simplify the process of procuring IANA's services and protocols
configuration files.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/lfs-utils-shortdesc.xml b/appendixa/lfs-utils-shortdesc.xml
index 58f065780..9bc7524c3 100644
--- a/appendixa/lfs-utils-shortdesc.xml
+++ b/appendixa/lfs-utils-shortdesc.xml
@@ -6,9 +6,7 @@
various packages, but are not large enough to warrant their own
individual package.</para>
-<para>Lfs-Utils installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>mktemp, tempfile, http-get, iana-net</para></sect3>
+<para><emphasis>Installed programs</emphasis>: mktemp, tempfile, http-get
+and iana-net</para>
</sect2>
diff --git a/appendixa/libtool-desc.xml b/appendixa/libtool-desc.xml
index 54d7f3cc6..134c4213d 100644
--- a/appendixa/libtool-desc.xml
+++ b/appendixa/libtool-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &libtool-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>libtool</command> provides generalized library-building
support services.</para>
@@ -12,13 +8,7 @@ support services.</para>
<para><command>libtoolize</command> provides a standard way to add
libtool support to a package.</para>
-</sect3>
-
-<sect3><title>Library file descriptions</title>
-
<para><command>libltdl*</command>...</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/libtool-shortdesc.xml b/appendixa/libtool-shortdesc.xml
index 38fe52f8b..4f1f5055b 100644
--- a/appendixa/libtool-shortdesc.xml
+++ b/appendixa/libtool-shortdesc.xml
@@ -6,14 +6,11 @@
the complexity of using shared libraries behind a consistent,
portable interface.</para>
-<para>Libtool installs the following:</para>
+<para><emphasis>Installed programs</emphasis>: libtool and libtoolize</para>
-<sect3><title>Program Files</title>
-<para>libtool and libtoolize</para></sect3>
-
-<sect3><title>Library Files</title>
-<para>libltdl.a, libltdl.so (link to libltdl.so.3.1.0), libltdl.so.3
-(link to libltdl.so.3.1.0) and libltdl.so.3.1.0</para></sect3>
+<para><emphasis>Installed libraries</emphasis>: libltdl.a, libltdl.so
+(link to libltdl.so.3.1.0), libltdl.so.3 (link to libltdl.so.3.1.0) and
+libltdl.so.3.1.0</para>
</sect2>
diff --git a/appendixa/m4-desc.xml b/appendixa/m4-desc.xml
index 7adcf90c8..d60319278 100644
--- a/appendixa/m4-desc.xml
+++ b/appendixa/m4-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &m4-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>m4</command> copies the given files
while expanding the macros that they contain. These macros are either built-in
@@ -14,7 +10,5 @@ commands, doing integer arithmetic, manipulating text in various ways,
recursion, and so on. The m4 program can be used either as a front-end to a
compiler or as a macro processor in its own right.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/m4-shortdesc.xml b/appendixa/m4-shortdesc.xml
index 3425101c5..606c50f98 100644
--- a/appendixa/m4-shortdesc.xml
+++ b/appendixa/m4-shortdesc.xml
@@ -10,9 +10,6 @@ commands, doing integer arithmetic, manipulating text in various ways,
recursion, etc. The m4 program can be used either as a front-end to a
compiler or as a macro processor in its own right.</para>
-<para>M4 installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>m4</para></sect3>
+<para><emphasis>Installed program</emphasis>: m4</para>
</sect2>
diff --git a/appendixa/make-desc.xml b/appendixa/make-desc.xml
index 91e00f196..899df0c69 100644
--- a/appendixa/make-desc.xml
+++ b/appendixa/make-desc.xml
@@ -1,15 +1,9 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Description</title>
-
-<para>(Last checked against version &make-contversion;.)</para>
-
-<sect3><title>Program file description</title>
+<sect2><title>Short description</title>
<para><command>make</command> automatically determines which pieces of a
large package need to be recompiled, and then issues the relevant commands.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/make-shortdesc.xml b/appendixa/make-shortdesc.xml
index 9dcbb002c..f265661f0 100644
--- a/appendixa/make-shortdesc.xml
+++ b/appendixa/make-shortdesc.xml
@@ -5,10 +5,7 @@
<para>Make determines, automatically, which pieces of a large program need
to be recompiled and issues the commands to recompile them.</para>
-<para>Make installs the following:</para>
-
-<sect3><title>Program files</title>
-<para>make</para></sect3>
+<para><emphasis>Installed program</emphasis>: make</para>
</sect2>
diff --git a/appendixa/makedev-desc.xml b/appendixa/makedev-desc.xml
index a93e42771..1c150b258 100644
--- a/appendixa/makedev-desc.xml
+++ b/appendixa/makedev-desc.xml
@@ -1,16 +1,10 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Description</title>
-
-<para>(Last checked against version &makedev-contversion;.)</para>
-
-<sect3><title>Program file description</title>
+<sect2><title>Short description</title>
<para><command>MAKEDEV</command> is a script for creating the necessary
static device nodes, usually residing in the <filename>/dev</filename>
directory.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/makedev-shortdesc.xml b/appendixa/makedev-shortdesc.xml
index 6d4cd439d..958b506d1 100644
--- a/appendixa/makedev-shortdesc.xml
+++ b/appendixa/makedev-shortdesc.xml
@@ -8,9 +8,6 @@ directory. Detailed information about device nodes may be found
in the <filename>Documentation/devices.txt</filename> file under
the Linux kernel source tree.</para>
-<para>MAKEDEV installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>MAKEDEV</para></sect3>
+<para><emphasis>Installed script</emphasis>: MAKEDEV</para>
</sect2>
diff --git a/appendixa/man-desc.xml b/appendixa/man-desc.xml
index ae1863c49..8eb15017f 100644
--- a/appendixa/man-desc.xml
+++ b/appendixa/man-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &man-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>apropos</command> searches the whatis database and displays
the short descriptions of system commands that contain a given string.</para>
@@ -24,7 +20,5 @@ manual page.</para>
the short descriptions of system commands that contain the given keyword as a
separate word.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/man-shortdesc.xml b/appendixa/man-shortdesc.xml
index c59fa7608..0f4fcdb13 100644
--- a/appendixa/man-shortdesc.xml
+++ b/appendixa/man-shortdesc.xml
@@ -4,11 +4,8 @@
<para>Man is a man pager.</para>
-<para>Man installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>apropos, makewhatis, man, man2dvi, man2html and
-whatis</para></sect3>
+<para><emphasis>Installed programs</emphasis>: apropos, makewhatis, man,
+man2dvi, man2html and whatis</para>
</sect2>
diff --git a/appendixa/manpages-desc.xml b/appendixa/manpages-desc.xml
index fb4080ece..a776f87ab 100644
--- a/appendixa/manpages-desc.xml
+++ b/appendixa/manpages-desc.xml
@@ -1,16 +1,10 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Description</title>
-
-<para>(Last checked against version &man-pages-contversion;.)</para>
-
-<sect3><title>Support file description</title>
+<sect2><title>Short description</title>
<para>Examples of provided <emphasis>manual pages</emphasis> are the pages
describing all the C and C++ functions, important device files, and important
configuration files.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/manpages-shortdesc.xml b/appendixa/manpages-shortdesc.xml
index 6e3560fe7..26af266be 100644
--- a/appendixa/manpages-shortdesc.xml
+++ b/appendixa/manpages-shortdesc.xml
@@ -7,10 +7,7 @@ documentation details the C and C++ functions, describes a few
important device files and provides documents which would otherwise
be missing from other packages.</para>
-<para>Man-pages installs the following:</para>
-
-<sect3><title>Support Files</title>
-<para>Various manual pages.</para></sect3>
+<para><emphasis>Installed files</emphasis>: various manual pages</para>
</sect2>
diff --git a/appendixa/modutils-desc.xml b/appendixa/modutils-desc.xml
index 08b8da2a6..fabc1e5ec 100644
--- a/appendixa/modutils-desc.xml
+++ b/appendixa/modutils-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &modutils-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>depmod</command> creates a dependency file, based on the
symbols it finds in the existing set of modules. This dependency file is used
@@ -34,7 +30,5 @@ depmod, to automatically load the relevant modules.</para>
<para><command>rmmod</command> unloads modules from the running kernel.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/modutils-shortdesc.xml b/appendixa/modutils-shortdesc.xml
index 984ff7299..110018fc1 100644
--- a/appendixa/modutils-shortdesc.xml
+++ b/appendixa/modutils-shortdesc.xml
@@ -5,12 +5,10 @@
<para>The Modutils package contains programs that you can use to work with
kernel modules.</para>
-<para>Modutils installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>depmod, genksyms, insmod, insmod_ksymoops_clean, kallsyms (link to
-insmod), kernelversion, ksyms (link to insmod), lsmod (link to insmod),
-modinfo, modprobe (link to insmod) and rmmod (link to insmod)</para></sect3>
+<para><emphasis>Installed programs</emphasis>: depmod, genksyms, insmod,
+insmod_ksymoops_clean, kallsyms (link to insmod), kernelversion, ksyms
+(link to insmod), lsmod (link to insmod), modinfo, modprobe (link to insmod)
+and rmmod (link to insmod)</para>
</sect2>
diff --git a/appendixa/ncurses-desc.xml b/appendixa/ncurses-desc.xml
index aa970d06a..bae638b2a 100644
--- a/appendixa/ncurses-desc.xml
+++ b/appendixa/ncurses-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &ncurses-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>captoinfo</command> converts a termcap description into a
terminfo description.</para>
@@ -37,10 +33,6 @@ a terminal, or report its long name.</para>
<para><command>tset</command> can be used to initialize terminals.</para>
-</sect3>
-
-<sect3><title>Library file descriptions</title>
-
<para><command>libncurses*</command> contain functions to display text in
many complicated ways on a terminal screen. A good example of the use of these
functions is the menu displayed during the kernel's make menuconfig.</para>
@@ -51,7 +43,5 @@ functions is the menu displayed during the kernel's make menuconfig.</para>
<para><command>libpanel*</command> contain functions to implement panels.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/ncurses-shortdesc.xml b/appendixa/ncurses-shortdesc.xml
index 60e79124d..f1bb99502 100644
--- a/appendixa/ncurses-shortdesc.xml
+++ b/appendixa/ncurses-shortdesc.xml
@@ -5,16 +5,13 @@
<para>The Ncurses package provides character and terminal handling
libraries, including panels and menus.</para>
-<para>Ncurses installs the following:</para>
+<para><emphasis>Installed programs</emphasis>: captoinfo (link to tic), clear,
+infocmp, infotocap (link to tic), reset (link to tset), tack, tic, toe, tput
+and tset</para>
-<sect3><title>Program Files</title>
-<para>captoinfo (link to tic), clear, infocmp, infotocap (link to tic),
-reset (link to tset), tack, tic, toe, tput and tset.</para></sect3>
-
-<sect3><title>Library Files</title>
-<para>libcurses.[a,so] (link to libncurses.[a,so]), libform.[a,so],
-libform_g.a, libmenu.[a,so], libmenu_g.a, libncurses++.a,
-libncurses.[a,so], libncurses_g.a, libpanel.[a,so] and
-libpanel_g.a</para></sect3>
+<para><emphasis>Installed libraries</emphasis>: libcurses.[a,so] (link to
+libncurses.[a,so]), libform.[a,so], libform_g.a, libmenu.[a,so], libmenu_g.a,
+libncurses++.a, libncurses.[a,so], libncurses_g.a, libpanel.[a,so] and
+libpanel_g.a</para>
</sect2>
diff --git a/appendixa/nettools-desc.xml b/appendixa/nettools-desc.xml
index 49f3e848e..31539c107 100644
--- a/appendixa/nettools-desc.xml
+++ b/appendixa/nettools-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &net-tools-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>arp</command> is used to manipulate the kernel's ARP cache,
usually to add or delete an entry, or to dump the entire cache.</para>
@@ -44,7 +40,5 @@ other computers.</para>
<para><command>ypdomainname</command> does the same as domainname.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/nettools-shortdesc.xml b/appendixa/nettools-shortdesc.xml
index 87a39be12..d93506278 100644
--- a/appendixa/nettools-shortdesc.xml
+++ b/appendixa/nettools-shortdesc.xml
@@ -5,13 +5,10 @@
<para>The Net-tools package contains a collection of programs
which form the base of Linux networking.</para>
-<para>Net-tools installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>arp, dnsdomainname (link to hostname), domainname (link to
-hostname), hostname, ifconfig, nameif, netstat, nisdomainname (link to
-hostname), plipconfig, rarp, route, slattach and ypdomainname (link to
-hostname)</para></sect3>
+<para><emphasis>Installed programs</emphasis>: arp, dnsdomainname (link to
+hostname), domainname (link to hostname), hostname, ifconfig, nameif, netstat,
+nisdomainname (link to hostname), plipconfig, rarp, route, slattach and
+ypdomainname (link to hostname)</para>
</sect2>
diff --git a/appendixa/patch-desc.xml b/appendixa/patch-desc.xml
index 2152e55f5..01283f801 100644
--- a/appendixa/patch-desc.xml
+++ b/appendixa/patch-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Description</title>
-
-<para>(Last checked against version &patch-contversion;.)</para>
-
-<sect3><title>Program file description</title>
+<sect2><title>Short description</title>
<para><command>patch</command> modifies files according to a patch file.
A patch file normally is a difference listing created with the diff program.
@@ -12,7 +8,5 @@ By applying these differences to the original files, patch creates the patched
versions. Using patches instead a entire new tarballs to keep your sources
up-to-date can save you a lot of download time.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/patch-shortdesc.xml b/appendixa/patch-shortdesc.xml
index 5e951aac3..f4e842562 100644
--- a/appendixa/patch-shortdesc.xml
+++ b/appendixa/patch-shortdesc.xml
@@ -6,10 +6,7 @@
file usually is a list, created by the diff program, that contains
instructions on how an original file needs to be modified.</para>
-<para>Patch installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>patch</para></sect3>
+<para><emphasis>Installed program</emphasis>: patch</para>
</sect2>
diff --git a/appendixa/perl-desc.xml b/appendixa/perl-desc.xml
index 083755661..b739005bb 100644
--- a/appendixa/perl-desc.xml
+++ b/appendixa/perl-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &perl-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>a2p</command> translates awk to perl.</para>
@@ -62,10 +58,6 @@ documentation.</para>
<para><command>splain</command> is used to force verbose warning
diagnostics in perl.</para>
-</sect3>
-
-<sect3><title>Library file descriptions</title>
-
<para><command>attrs</command>...</para>
<para><command>B</command>...</para>
@@ -104,7 +96,5 @@ diagnostics in perl.</para>
<para><command>SysV</command>...</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/perl-shortdesc.xml b/appendixa/perl-shortdesc.xml
index b6238ba27..6facfa9dd 100644
--- a/appendixa/perl-shortdesc.xml
+++ b/appendixa/perl-shortdesc.xml
@@ -6,15 +6,14 @@
and Report Language. Perl combines some of the best features of C,
sed, awk and sh into one powerful language.</para>
-<para>Perl installs the following:</para>
+<para><emphasis>Installed programs</emphasis>: a2p, c2ph, dprofpp, find2perl,
+h2ph, h2xs, perl, perl5.6.1, perlbug, perlcc, perldoc, pl2pm, pod2html,
+pod2latex, pod2man, pod2text, pod2usage, podchecker, podselect, pstruct, s2p
+and splain</para>
-<sect3><title>Program files and libraries</title>
-
-<para>a2p, c2ph, dprofpp, find2perl, h2ph, h2xs, perl, perl5.6.1,
-perlbug, perlcc, perldoc, pl2pm, pod2html, pod2latex, pod2man, pod2text,
-pod2usage, podchecker, podselect, pstruct, s2p, splain,attrs.so, B.so,
-ByteLoader.so, DProf.so, Dumper.so, DynaLoader.a, Fcntl.so, Glob.so,
-Hostname.so, IO.so, libperl.a, Opcode.so, Peek.so, POSIX.so, re.so,
-SDBM_File.so, Socket.so, Syslog.so and SysV.so</para></sect3>
+<para><emphasis>Installed libraries</emphasis>: attrs.so, B.so, ByteLoader.so,
+DProf.so, Dumper.so, DynaLoader.a, Fcntl.so, Glob.so, Hostname.so, IO.so,
+libperl.a, Opcode.so, Peek.so, POSIX.so, re.so, SDBM_File.so, Socket.so,
+Syslog.so and SysV.so</para>
</sect2>
diff --git a/appendixa/procinfo-desc.xml b/appendixa/procinfo-desc.xml
index 5a1ea8ad6..5523cddb7 100644
--- a/appendixa/procinfo-desc.xml
+++ b/appendixa/procinfo-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &procinfo-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>lsdev</command> lists the devices present in your system,
and which IRQs and IO ports they use.</para>
@@ -15,7 +11,5 @@ present in the virtual proc filesystem.</para>
<para><command>socklist</command> lists the open sockets, reporting their
type, portnumber, and other specifics.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/procinfo-shortdesc.xml b/appendixa/procinfo-shortdesc.xml
index 307e06461..8e4cd971e 100644
--- a/appendixa/procinfo-shortdesc.xml
+++ b/appendixa/procinfo-shortdesc.xml
@@ -6,10 +6,8 @@
usage and IRQ numbers, from the <filename>/proc</filename>
directory and formats this data in a meaningful way.</para>
-<para>Procinfo installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>lsdev, procinfo and socklist</para></sect3>
+<para><emphasis>Installed programs</emphasis>: lsdev, procinfo and
+socklist</para>
</sect2>
diff --git a/appendixa/procps-desc.xml b/appendixa/procps-desc.xml
index 32501415f..06556497d 100644
--- a/appendixa/procps-desc.xml
+++ b/appendixa/procps-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &procps-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>free</command> reports the amount of free and used memory
in the system, both physical and swap memory.</para>
@@ -44,14 +40,8 @@ where and since when.</para>
displaying the first screenful of its output. This allows you to watch the
output change over time.</para>
-</sect3>
-
-<sect3><title>Library file descriptions</title>
-
<para><command>libproc</command> contains the functions used by most
programs in this package.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/procps-shortdesc.xml b/appendixa/procps-shortdesc.xml
index 0aa1b78e3..d5ee5ad65 100644
--- a/appendixa/procps-shortdesc.xml
+++ b/appendixa/procps-shortdesc.xml
@@ -6,14 +6,10 @@
halt system processes. Procps gathers information about
processes via the <filename>/proc</filename> directory.</para>
-<para>Procps installs the following:</para>
+<para><emphasis>Installed programs</emphasis>: free, kill, oldps, pgrep,
+pkill, ps, skill, snice, sysctl, tload, top, vmstat, w and watch</para>
-<sect3><title>Program Files</title>
-<para>free, kill, oldps, pgrep, pkill, ps, skill, snice, sysctl, tload, top,
-vmstat, w and watch</para></sect3>
-
-<sect3><title>Library Files</title>
-<para>libproc.so</para></sect3>
+<para><emphasis>Installed library</emphasis>: libproc.so</para>
</sect2>
diff --git a/appendixa/psmisc-desc.xml b/appendixa/psmisc-desc.xml
index 7b4c8e587..e9d247eba 100644
--- a/appendixa/psmisc-desc.xml
+++ b/appendixa/psmisc-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &psmisc-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>fuser</command> reports the PIDs of processes that use
the given files or filesystems.</para>
@@ -17,7 +13,5 @@ to all processes running any of the given commands.</para>
<para><command>pstree</command> displays running processes as a tree.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/psmisc-shortdesc.xml b/appendixa/psmisc-shortdesc.xml
index fa5cf5121..742b3a4ae 100644
--- a/appendixa/psmisc-shortdesc.xml
+++ b/appendixa/psmisc-shortdesc.xml
@@ -5,10 +5,7 @@
<para>The Psmisc package contains three programs which help
manage the <filename>/proc</filename> directory.</para>
-<para>Psmisc installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>fuser, killall and pstree</para></sect3>
+<para><emphasis>Installed programs</emphasis>: fuser, killall and pstree</para>
</sect2>
diff --git a/appendixa/sed-desc.xml b/appendixa/sed-desc.xml
index c2545befc..0aeca9c63 100644
--- a/appendixa/sed-desc.xml
+++ b/appendixa/sed-desc.xml
@@ -1,15 +1,9 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Description</title>
-
-<para>(Last checked against version &sed-contversion;.)</para>
-
-<sect3><title>Program file description</title>
+<sect2><title>Short description</title>
<para><command>sed</command> is used to filter and transform text files
in a single pass.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/sed-shortdesc.xml b/appendixa/sed-shortdesc.xml
index f7180e479..c8cd5bb60 100644
--- a/appendixa/sed-shortdesc.xml
+++ b/appendixa/sed-shortdesc.xml
@@ -6,10 +6,7 @@
transformations on an input stream (a file or input from a
pipeline).</para>
-<para>Sed installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>sed</para></sect3>
+<para><emphasis>Installed program</emphasis>: sed</para>
</sect2>
diff --git a/appendixa/shadowpwd-desc.xml b/appendixa/shadowpwd-desc.xml
index d71610663..b4239423c 100644
--- a/appendixa/shadowpwd-desc.xml
+++ b/appendixa/shadowpwd-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &shadow-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>chage</command> is used to change the maximum number of
days between obligatory password changes.</para>
@@ -100,16 +96,10 @@ files.</para>
<filename>/etc/passwd</filename> or <filename>/etc/shadow</filename>
files.</para>
-</sect3>
-
-<sect3><title>Library file descriptions</title>
-
<para><command>libmisc</command>...</para>
<para><command>libshadow</command> contains functions used by most
programs in this package.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/shadowpwd-shortdesc.xml b/appendixa/shadowpwd-shortdesc.xml
index 949f37012..f74b5b594 100644
--- a/appendixa/shadowpwd-shortdesc.xml
+++ b/appendixa/shadowpwd-shortdesc.xml
@@ -5,13 +5,10 @@
<para>The Shadow package was created to strengthen the security
of system passwords.</para>
-<para>Shadow installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>chage, chfn, chpasswd, chsh, dpasswd, expiry, faillog, gpasswd,
-groupadd, groupdel, groupmod, groups, grpck, grpconv, grpunconv, lastlog,
-login, logoutd, mkpasswd, newgrp, newusers, passwd, pwck, pwconv, pwunconv,
-sg (link to newgrp), useradd, userdel, usermod, vigr (link to vipw) and
-vipw</para></sect3>
+<para><emphasis>Installed programs</emphasis>: chage, chfn, chpasswd, chsh,
+dpasswd, expiry, faillog, gpasswd, groupadd, groupdel, groupmod, groups, grpck,
+grpconv, grpunconv, lastlog, login, logoutd, mkpasswd, newgrp, newusers,
+passwd, pwck, pwconv, pwunconv, sg (link to newgrp), useradd, userdel, usermod,
+vigr (link to vipw) and vipw</para>
</sect2>
diff --git a/appendixa/sysklogd-desc.xml b/appendixa/sysklogd-desc.xml
index 3b9ccf882..1a6870ad0 100644
--- a/appendixa/sysklogd-desc.xml
+++ b/appendixa/sysklogd-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &sysklogd-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>klogd</command> is a system daemon for intercepting and
logging kernel messages.</para>
@@ -14,7 +10,5 @@ offer for logging. Every logged message contains at least a date stamp and a
hostname, and normally the program's name too, but that depends on how
trusting the logging daemon is told to be.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/sysklogd-shortdesc.xml b/appendixa/sysklogd-shortdesc.xml
index e72fc7f5b..8d46a6b39 100644
--- a/appendixa/sysklogd-shortdesc.xml
+++ b/appendixa/sysklogd-shortdesc.xml
@@ -5,10 +5,7 @@
<para>The Sysklogd package contains programs for recording
system log messages, such as those reported by the kernel.</para>
-<para>Sysklogd installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>klogd and syslogd</para></sect3>
+<para><emphasis>Installed programs</emphasis>: klogd and syslogd</para>
</sect2>
diff --git a/appendixa/sysvinit-desc.xml b/appendixa/sysvinit-desc.xml
index ec9af5434..a14103b3d 100644
--- a/appendixa/sysvinit-desc.xml
+++ b/appendixa/sysvinit-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &sysvinit-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>halt</command> normally invokes shutdown with the -h flag,
except when already in runlevel 0, then it tells the kernel to halt the system.
@@ -54,7 +50,5 @@ file in a friendlier format.</para>
<para><command>wall</command> writes a message to all logged-in users.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/sysvinit-shortdesc.xml b/appendixa/sysvinit-shortdesc.xml
index 6aec55c06..7c63b2164 100644
--- a/appendixa/sysvinit-shortdesc.xml
+++ b/appendixa/sysvinit-shortdesc.xml
@@ -5,13 +5,10 @@
<para>The Sysvinit package contains programs to control the
startup, running and shutdown of all other programs.</para>
-<para>Sysvinit installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>halt, init, killall5, last, lastb (link to last), mesg, pidof
-(link to killall5), poweroff (link to halt), reboot (link to halt),
-runlevel, shutdown, sulogin, telinit (link to init), utmpdump and
-wall</para></sect3>
+<para><emphasis>Installed programs</emphasis>: halt, init, killall5, last,
+lastb (link to last), mesg, pidof (link to killall5), poweroff (link to halt),
+reboot (link to halt), runlevel, shutdown, sulogin, telinit (link to init),
+utmpdump and wall</para>
</sect2>
diff --git a/appendixa/tar-desc.xml b/appendixa/tar-desc.xml
index a5188dd53..bc9f2ab29 100644
--- a/appendixa/tar-desc.xml
+++ b/appendixa/tar-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &tar-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>rmt</command> is used to remotely manipulate a magnetic
tape drive, through an interprocess communication connection.</para>
@@ -12,7 +8,5 @@ tape drive, through an interprocess communication connection.</para>
<para><command>tar</command> is used to create and extract files from
archives, also known as tarballs.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/tar-shortdesc.xml b/appendixa/tar-shortdesc.xml
index e0e712ef9..5870d4eeb 100644
--- a/appendixa/tar-shortdesc.xml
+++ b/appendixa/tar-shortdesc.xml
@@ -5,9 +5,6 @@
<para>Tar is an archiving program designed to store and extract
files from an archive file known as a tar file.</para>
-<para>Tar installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>rmt and tar</para></sect3>
+<para><emphasis>Installed programs</emphasis>: rmt and tar</para>
</sect2>
diff --git a/appendixa/tcl-desc.xml b/appendixa/tcl-desc.xml
index 26864c3d6..2941ac238 100644
--- a/appendixa/tcl-desc.xml
+++ b/appendixa/tcl-desc.xml
@@ -1,8 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &tcl-contversion;.)</para>
+<sect2><title>Short description</title>
<para><command>tclsh</command> is the Tcl command shell.</para>
diff --git a/appendixa/tcl-shortdesc.xml b/appendixa/tcl-shortdesc.xml
index de10a98ba..0f79da72b 100644
--- a/appendixa/tcl-shortdesc.xml
+++ b/appendixa/tcl-shortdesc.xml
@@ -4,14 +4,9 @@
<para>The Tcl package contains the Tool Command Language.</para>
-<para>Tcl installs the following files:</para>
+<para><emphasis>Installed program</emphasis>: tclsh</para>
-<sect3><title>Program Files</title>
-
-<para>tclsh</para></sect3>
-
-<sect3><title>Library Files</title>
-<para>libtcl8.4.so</para></sect3>
+<para><emphasis>Installed library</emphasis>: libtcl8.4.so</para>
</sect2>
diff --git a/appendixa/texinfo-desc.xml b/appendixa/texinfo-desc.xml
index 482cfe01d..97d846af8 100644
--- a/appendixa/texinfo-desc.xml
+++ b/appendixa/texinfo-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &texinfo-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>info</command> is used to read Info documents. Info
documents are a bit like man pages, but often go much deeper than just
@@ -24,7 +20,5 @@ document into a device-independent file that can be printed.</para>
<para><command>texindex</command> is used to sort Texinfo index files.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/texinfo-shortdesc.xml b/appendixa/texinfo-shortdesc.xml
index 7f4a74cc9..7bcab1836 100644
--- a/appendixa/texinfo-shortdesc.xml
+++ b/appendixa/texinfo-shortdesc.xml
@@ -6,10 +6,7 @@
writing and converting Info documents, which provide system
documentation.</para>
-<para>Texinfo installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>info, infokey, install-info, makeinfo, texi2dvi and
-texindex</para></sect3>
+<para><emphasis>Installed programs</emphasis>: info, infokey, install-info,
+makeinfo, texi2dvi and texindex</para>
</sect2>
diff --git a/appendixa/utillinux-desc.xml b/appendixa/utillinux-desc.xml
index 51a543d27..2f9bcbccd 100644
--- a/appendixa/utillinux-desc.xml
+++ b/appendixa/utillinux-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &util-linux-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>agetty</command> opens a tty port, prompts for a login name,
and then invokes the login program.</para>
@@ -167,7 +163,5 @@ source, and the manual page for the given command.</para>
<para><command>write</command> sends a message to the given user. That is,
if that user has not disabled such messages.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/utillinux-shortdesc.xml b/appendixa/utillinux-shortdesc.xml
index e4d03961e..8be70b0f4 100644
--- a/appendixa/utillinux-shortdesc.xml
+++ b/appendixa/utillinux-shortdesc.xml
@@ -7,17 +7,14 @@ utility programs. Some of the more prominent utilities are used
to mount, unmount, format, partition and manage disk drives,
open tty ports and fetch kernel messages.</para>
-<para>Util-linux installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>agetty, arch, blockdev, cal, cfdisk, chkdupexe, col, colcrt,
-colrm, column, ctrlaltdel, cytune, ddate, dmesg, elvtune, fdformat, fdisk,
-fsck.cramfs, fsck.minix, getopt, hexdump, hwclock, ipcrm, ipcs, isosize, line, logger,
-look, losetup, mcookie, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap, more, mount,
-namei, parse.bash, parse.tcsh, pg, pivot_root, ramsize (link to rdev),
-raw, rdev, readprofile, rename, renice, rev, rootflags (link to rdev),
-script, setfdprm, setsid, setterm, sfdisk, swapoff (link to swapon), swapon,
-test.bash, test.tcsh, tunelp, ul, umount, vidmode (link to rdev), whereis
-and write</para></sect3>
+<para><emphasis>Installed programs</emphasis>: agetty, arch, blockdev, cal,
+cfdisk, chkdupexe, col, colcrt, colrm, column, ctrlaltdel, cytune, ddate,
+dmesg, elvtune, fdformat, fdisk, fsck.cramfs, fsck.minix, getopt, hexdump,
+hwclock, ipcrm, ipcs, isosize, line, logger, look, losetup, mcookie, mkfs,
+mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap, more, mount, namei, parse.bash,
+parse.tcsh, pg, pivot_root, ramsize (link to rdev), raw, rdev, readprofile,
+rename, renice, rev, rootflags (link to rdev), script, setfdprm, setsid,
+setterm, sfdisk, swapoff (link to swapon), swapon, test.bash, test.tcsh,
+tunelp, ul, umount, vidmode (link to rdev), whereis and write</para>
</sect2>
diff --git a/appendixa/vim-desc.xml b/appendixa/vim-desc.xml
index 9ff2a56ad..cbb3af0d3 100644
--- a/appendixa/vim-desc.xml
+++ b/appendixa/vim-desc.xml
@@ -1,10 +1,6 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Descriptions</title>
-
-<para>(Last checked against version &vim-contversion;.)</para>
-
-<sect3><title>Program file descriptions</title>
+<sect2><title>Short descriptions</title>
<para><command>efm_filter.pl</command> is a filter for creating an error
file that can be read by vim.</para>
@@ -60,7 +56,5 @@ of vim.</para>
<para><command>xxd</command> makes a hexdump of the given file. It can
also do the reverse, so it can be used for binary patching.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/vim-shortdesc.xml b/appendixa/vim-shortdesc.xml
index 97eb7cd68..73261882f 100644
--- a/appendixa/vim-shortdesc.xml
+++ b/appendixa/vim-shortdesc.xml
@@ -5,12 +5,10 @@
<para>The Vim package contains a configurable text editor built to
enable efficient text editing.</para>
-<para>Vim installs the following:</para>
-
-<sect3><title>Program Files</title>
-<para>efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk,
-pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl,
-tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl,
-vimdiff (link to vim), vimm, vimspell.sh, vimtutor and xxd</para></sect3>
+<para><emphasis>Installed programs</emphasis>: efm_filter.pl, efm_perl.pl, ex
+(link to vim), less.sh, mve.awk, pltags.pl, ref, rview (link to vim), rvim
+(link to vim), shtags.pl, tcltags, vi (link to vim), view (link to vim), vim,
+vim132, vim2html.pl, vimdiff (link to vim), vimm, vimspell.sh, vimtutor
+and xxd</para>
</sect2>
diff --git a/appendixa/zlib-desc.xml b/appendixa/zlib-desc.xml
index 9b582bc03..ecaa03789 100644
--- a/appendixa/zlib-desc.xml
+++ b/appendixa/zlib-desc.xml
@@ -1,15 +1,9 @@
<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<sect2><title>Description</title>
-
-<para>(Last checked against version &zlib-contversion;.)</para>
-
-<sect3><title>Library file description</title>
+<sect2><title>Short description</title>
<para><command>libz*</command> contains compression and uncompression
functions used by some programs.</para>
-</sect3>
-
</sect2>
diff --git a/appendixa/zlib-shortdesc.xml b/appendixa/zlib-shortdesc.xml
index d8fc72385..88f8f26e5 100644
--- a/appendixa/zlib-shortdesc.xml
+++ b/appendixa/zlib-shortdesc.xml
@@ -5,10 +5,7 @@
<para>The Zlib package contains the libz library, which is used by some
programs for its compression and uncompression functions.</para>
-<para>Zlib installs the following:</para>
-
-<sect3><title>Library Files</title>
-<para>libz[a,so]</para></sect3>
+<para><emphasis>Installed libraries</emphasis>: libz[a,so]</para>
</sect2>