aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Canales Esparcia <manuel@linuxfromscratch.org>2004-05-24 21:37:26 +0000
committerManuel Canales Esparcia <manuel@linuxfromscratch.org>2004-05-24 21:37:26 +0000
commitb8a819fd7bca2d339d92375130c556cca465aa1d (patch)
treee50ac7f33f4bafb2fb0d129181ba168181bc4083
parent8d11d9f0c80a970ae5aa1a4f95123d70ac8f485e (diff)
Changed the id's location in the Short descriptions sections to fix a bug in the PDF generation.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3711 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter05/dejagnu.xml4
-rw-r--r--chapter05/expect.xml4
-rw-r--r--chapter05/tcl.xml8
-rw-r--r--chapter06/autoconf.xml28
-rw-r--r--chapter06/automake.xml60
-rw-r--r--chapter06/bash.xml12
-rw-r--r--chapter06/binutils.xml68
-rw-r--r--chapter06/bison.xml12
-rw-r--r--chapter06/bzip2.xml40
-rw-r--r--chapter06/coreutils.xml348
-rw-r--r--chapter06/diffutils.xml16
-rw-r--r--chapter06/e2fsprogs.xml100
-rw-r--r--chapter06/file.xml8
-rw-r--r--chapter06/findutils.xml28
-rw-r--r--chapter06/flex.xml12
-rw-r--r--chapter06/gawk.xml20
-rw-r--r--chapter06/gcc.xml32
-rw-r--r--chapter06/gettext.xml108
-rw-r--r--chapter06/glibc.xml204
-rw-r--r--chapter06/grep.xml12
-rw-r--r--chapter06/groff.xml132
-rw-r--r--chapter06/grub.xml20
-rw-r--r--chapter06/gzip.xml52
-rw-r--r--chapter06/hotplug.xml32
-rw-r--r--chapter06/inetutils.xml32
-rw-r--r--chapter06/kbd.xml96
-rw-r--r--chapter06/less.xml12
-rw-r--r--chapter06/libtool.xml12
-rw-r--r--chapter06/m4.xml6
-rw-r--r--chapter06/make.xml4
-rw-r--r--chapter06/man-pages.xml4
-rw-r--r--chapter06/man.xml24
-rw-r--r--chapter06/mktemp.xml8
-rw-r--r--chapter06/module-init-tools.xml44
-rw-r--r--chapter06/ncurses.xml56
-rw-r--r--chapter06/net-tools.xml52
-rw-r--r--chapter06/patch.xml4
-rw-r--r--chapter06/perl.xml108
-rw-r--r--chapter06/procps.xml64
-rw-r--r--chapter06/psmisc.xml16
-rw-r--r--chapter06/sed.xml4
-rw-r--r--chapter06/shadow.xml132
-rw-r--r--chapter06/sysklogd.xml8
-rw-r--r--chapter06/sysvinit.xml60
-rw-r--r--chapter06/tar.xml8
-rw-r--r--chapter06/texinfo.xml24
-rw-r--r--chapter06/util-linux.xml244
-rw-r--r--chapter06/vim.xml80
-rw-r--r--chapter06/zlib.xml4
-rw-r--r--chapter07/bootscripts.xml72
-rw-r--r--chapter08/kernel.xml12
51 files changed, 1275 insertions, 1275 deletions
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index 044374f8a..8b156af1c 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -48,8 +48,8 @@ GCC, Glibc, Grep, Make, Sed</seg></seglistitem>
<variablelist><title>Short description</title>
-<varlistentry>
-<term id="runtest"><command>rutest</command></term>
+<varlistentry id="runtest">
+<term><command>rutest</command></term>
<listitem>
<indexterm zone="ch-tools-dejagnu runtest"><primary sortas="b-runtest">runtest</primary></indexterm>
<para>is the wrapper script that finds the proper
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index d3f63773d..fa50bd726 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -96,8 +96,8 @@ of the supplementary expect scripts which are not needed.</para></listitem>
<variablelist><title>Short description</title>
-<varlistentry>
-<term id="expect"><command>expect</command></term>
+<varlistentry id="expect">
+<term><command>expect</command></term>
<listitem>
<indexterm zone="ch-tools-expect expect"><primary sortas="b-expect">expect</primary></indexterm>
<para><quote>talks</quote> to other interactive
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index c0191f138..4c2cf7b83 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -80,16 +80,16 @@ will need its internal headers.</para></warning>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="tclsh8.4"><command>tclsh8.4</command></term>
+<varlistentry id="tclsh8.4">
+<term><command>tclsh8.4</command></term>
<listitem>
<indexterm zone="ch-tools-tcl tclsh8.4"><primary sortas="b-tclsh8.4">tclsh8.4</primary></indexterm>
<para>is the Tcl command shell.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libtcl8.4.so"><command>libtcl8.4.so</command></term>
+<varlistentry id="libtcl8.4.so">
+<term><command>libtcl8.4.so</command></term>
<listitem>
<indexterm zone="ch-tools-tcl libtcl8.4.so"><primary sortas="c-libtcl8.4.so">libtcl8.4.so</primary></indexterm>
<para>is the Tcl library.</para>
diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml
index dd7c5e233..b4c39aea2 100644
--- a/chapter06/autoconf.xml
+++ b/chapter06/autoconf.xml
@@ -57,8 +57,8 @@ autoreconf, autoscan, autoupdate and ifnames</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="autoconf"><command>autoconf</command></term>
+<varlistentry id="autoconf">
+<term><command>autoconf</command></term>
<listitem>
<indexterm zone="ch-system-autoconf autoconf"><primary sortas="b-autoconf">autoconf</primary></indexterm>
<para>is a tool for producing shell scripts
@@ -68,8 +68,8 @@ independent -- running them does not require the autoconf program.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="autoheader"><command>autoheader</command> </term>
+<varlistentry id="autoheader">
+<term><command>autoheader</command> </term>
<listitem>
<indexterm zone="ch-system-autoconf autoheader"><primary sortas="b-autoheader">autoheader</primary></indexterm>
<para>is a tool for creating template files
@@ -77,16 +77,16 @@ of C #define statements for configure to use.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="autom4te"><command>autom4te</command></term>
+<varlistentry id="autom4te">
+<term><command>autom4te</command></term>
<listitem>
<indexterm zone="ch-system-autoconf autom4te"><primary sortas="b-autom4te">autom4te</primary></indexterm>
<para>is a wrapper for the M4 macro processor.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="autoreconf"><command>autoreconf</command></term>
+<varlistentry id="autoreconf">
+<term><command>autoreconf</command></term>
<listitem>
<indexterm zone="ch-system-autoconf autoreconf"><primary sortas="b-autoreconf">autoreconf</primary></indexterm>
<para>comes in handy when there are a lot
@@ -96,8 +96,8 @@ scripts and configuration header templates in a given directory tree.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="autoscan"><command>autoscan</command> </term>
+<varlistentry id="autoscan">
+<term><command>autoscan</command> </term>
<listitem>
<indexterm zone="ch-system-autoconf autoscan"><primary sortas="b-autoscan">autoscan</primary></indexterm>
<para>can help to create a
@@ -108,8 +108,8 @@ as a preliminary <filename>configure.in</filename> for the package.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="autoupdate"><command>autoupdate</command></term>
+<varlistentry id="autoupdate">
+<term><command>autoupdate</command></term>
<listitem>
<indexterm zone="ch-system-autoconf autoupdate"><primary sortas="b-autoupdate">autoupdate</primary></indexterm>
<para>modifies a <filename>configure.in</filename> file that still calls autoconf
@@ -117,8 +117,8 @@ macros by their old names to use the current macro names.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ifnames"><command>ifnames</command> </term>
+<varlistentry id="ifnames">
+<term><command>ifnames</command> </term>
<listitem>
<indexterm zone="ch-system-autoconf ifnames"><primary sortas="b-ifnames">ifnames</primary></indexterm>
<para>can be helpful when writing a
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index fce2c31a3..84043649a 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -58,16 +58,16 @@ missing, mkinstalldirs, py-compile, symlink-tree, ylwrap</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="acinstall"><command>acinstall</command></term>
+<varlistentry id="acinstall">
+<term><command>acinstall</command></term>
<listitem>
<indexterm zone="ch-system-automake acinstall"><primary sortas="b-acinstall">acinstall</primary></indexterm>
<para>is a script that installs aclocal-style M4 files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="aclocal"><command>aclocal</command></term>
+<varlistentry id="aclocal">
+<term><command>aclocal</command></term>
<listitem>
<indexterm zone="ch-system-automake aclocal"><primary sortas="b-aclocal">aclocal</primary></indexterm>
<para>generates <filename>aclocal.m4</filename>
@@ -75,8 +75,8 @@ files based on the contents of <filename>configure.in</filename> files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="automake"><command>automake</command></term>
+<varlistentry id="automake">
+<term><command>automake</command></term>
<listitem>
<indexterm zone="ch-system-automake automake"><primary sortas="b-automake">automake</primary></indexterm>
<para>is a tool for automatically generating
@@ -89,16 +89,16 @@ generate the corresponding <filename>Makefile.in</filename>.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="compile"><command>compile</command></term>
+<varlistentry id="compile">
+<term><command>compile</command></term>
<listitem>
<indexterm zone="ch-system-automake compile"><primary sortas="b-compile">compile</primary></indexterm>
<para>is a wrapper for compilers.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="config.guess"><command>config.guess</command> </term>
+<varlistentry id="config.guess">
+<term><command>config.guess</command> </term>
<listitem>
<indexterm zone="ch-system-automake config.guess"><primary sortas="b-config.guess">config.guess</primary></indexterm>
<para>is a script that attempts to guess
@@ -106,16 +106,16 @@ the canonical triplet for the given build, host, or target architecture.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="config.su"><command>config.sub</command></term>
+<varlistentry id="config.su">
+<term><command>config.sub</command></term>
<listitem>
<indexterm zone="ch-system-automake config.su"><primary sortas="b-config.su">config.su</primary></indexterm>
<para>is a configuration validation subroutine script.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="depcomp"><command>depcomp</command></term>
+<varlistentry id="depcomp">
+<term><command>depcomp</command></term>
<listitem>
<indexterm zone="ch-system-automake depcomp"><primary sortas="b-depcomp">depcomp</primary></indexterm>
<para>is a script for compiling a program so that not only the desired output is
@@ -123,32 +123,32 @@ generated, but also dependency information.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="elisp-comp"><command>elisp-comp</command></term>
+<varlistentry id="elisp-comp">
+<term><command>elisp-comp</command></term>
<listitem>
<indexterm zone="ch-system-automake elisp-comp"><primary sortas="b-elisp-comp">elisp-comp</primary></indexterm>
<para>byte-compiles Emacs Lisp code.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="install-sh"><command>install-sh</command></term>
+<varlistentry id="install-sh">
+<term><command>install-sh</command></term>
<listitem>
<indexterm zone="ch-system-automake install-sh"><primary sortas="b-install-sh">install-sh</primary></indexterm>
<para>is a script that installs a program, a script, or a datafile.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mdate-sh"><command>mdate-sh</command></term>
+<varlistentry id="mdate-sh">
+<term><command>mdate-sh</command></term>
<listitem>
<indexterm zone="ch-system-automake mdate-sh"><primary sortas="b-mdate-sh">mdate-sh</primary></indexterm>
<para>is a script that prints the modification time of a file or directory.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="missing"><command>missing</command></term>
+<varlistentry id="missing">
+<term><command>missing</command></term>
<listitem>
<indexterm zone="ch-system-automake missing"><primary sortas="b-missing">missing</primary></indexterm>
<para>is a script acting as a common stub for
@@ -156,32 +156,32 @@ missing GNU programs during an installation.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mkinstalldirs"><command>mkinstalldirs</command></term>
+<varlistentry id="mkinstalldirs">
+<term><command>mkinstalldirs</command></term>
<listitem>
<indexterm zone="ch-system-automake mkinstalldirs"><primary sortas="b-mkinstalldirs">mkinstalldirs</primary></indexterm>
<para>is a script that creates a directory tree.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="py-compile"><command>py-compile</command></term>
+<varlistentry id="py-compile">
+<term><command>py-compile</command></term>
<listitem>
<indexterm zone="ch-system-automake py-compile"><primary sortas="b-py-compile">py-compile</primary></indexterm>
<para>compiles a Python program.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="symlink-tree"><command>symlink-tree</command></term>
+<varlistentry id="symlink-tree">
+<term><command>symlink-tree</command></term>
<listitem>
<indexterm zone="ch-system-automake symlink-tree"><primary sortas="b-symlink-tree">symlink-tree</primary></indexterm>
<para>is a script to create a symlink tree of a directory tree.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ylwrap"><command>ylwrap</command></term>
+<varlistentry id="ylwrap">
+<term><command>ylwrap</command></term>
<listitem>
<indexterm zone="ch-system-automake ylwrap"><primary sortas="b-ylwrap">ylwrap</primary></indexterm>
<para>is a wrapper for lex and yacc.</para>
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 8d2745902..f2fcf435a 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -72,8 +72,8 @@ available.</para>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="bash"><command>bash</command></term>
+<varlistentry id="bash">
+<term><command>bash</command></term>
<listitem>
<indexterm zone="ch-system-bash bash"><primary sortas="b-bash">bash</primary></indexterm>
<para>is a widely-used command interpreter. It
@@ -82,8 +82,8 @@ before executing it, thus making this interpreter a powerful tool.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="bashbug"><command>bashbug</command></term>
+<varlistentry id="bashbug">
+<term><command>bashbug</command></term>
<listitem>
<indexterm zone="ch-system-bash bashbug"><primary sortas="b-bashbug">bashbug</primary></indexterm>
<para>is a shell script to help the user
@@ -91,8 +91,8 @@ compose and mail bug reports concerning bash in a standard format.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="sh"><command>sh</command></term>
+<varlistentry id="sh">
+<term><command>sh</command></term>
<listitem>
<indexterm zone="ch-system-bash sh"><primary sortas="b-sh">sh</primary></indexterm>
<para>is a symlink to the bash program. When invoked
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index cee1136c7..b05d0416e 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -107,8 +107,8 @@ ranlib, readelf, size, strings and strip</seg>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="addr2line"><command>addr2line</command></term>
+<varlistentry id="addr2line">
+<term><command>addr2line</command></term>
<listitem>
<indexterm zone="ch-system-binutils addr2line"><primary sortas="b-addr2line">addr2line</primary></indexterm>
<para>translates program addresses to file
@@ -118,8 +118,8 @@ file and line number are associated with the address.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ar"><command>ar</command></term>
+<varlistentry id="ar">
+<term><command>ar</command></term>
<listitem>
<indexterm zone="ch-system-binutils ar"><primary sortas="b-ar">ar</primary></indexterm>
<para>creates, modifies, and extracts from archives. An archive
@@ -129,16 +129,16 @@ the archive).</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="as"><command>as</command></term>
+<varlistentry id="as">
+<term><command>as</command></term>
<listitem>
<indexterm zone="ch-system-binutils as"><primary sortas="b-as">as</primary></indexterm>
<para>is an assembler. It assembles the output of gcc into object files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="c-filt"><command>c++filt</command></term>
+<varlistentry id="c-filt">
+<term><command>c++filt</command></term>
<listitem>
<indexterm zone="ch-system-binutils c-filt"><primary sortas="b-c++filt">c++filt</primary></indexterm>
<para>is used by the linker to de-mangle C++ and
@@ -146,16 +146,16 @@ Java symbols, to keep overloaded functions from clashing.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="gprof"><command>gprof</command></term>
+<varlistentry id="gprof">
+<term><command>gprof</command></term>
<listitem>
<indexterm zone="ch-system-binutils gprof"><primary sortas="b-gprof">gprof</primary></indexterm>
<para>displays call graph profile data.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ld"><command>ld</command></term>
+<varlistentry id="ld">
+<term><command>ld</command></term>
<listitem>
<indexterm zone="ch-system-binutils ld"><primary sortas="b-ld">ld</primary></indexterm>
<para>is a linker. It combines a number of object and archive files into a single file,
@@ -163,24 +163,24 @@ relocating their data and tying up symbol references.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="nm"><command>nm</command></term>
+<varlistentry id="nm">
+<term><command>nm</command></term>
<listitem>
<indexterm zone="ch-system-binutils nm"><primary sortas="b-nm">nm</primary></indexterm>
<para>lists the symbols occurring in a given object file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="objcopy"><command>objcopy</command></term>
+<varlistentry id="objcopy">
+<term><command>objcopy</command></term>
<listitem>
<indexterm zone="ch-system-binutils objcopy"><primary sortas="b-objcopy">objcopy</primary></indexterm>
<para>is used to translate one type of object file into another.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="objdump"><command>objdump</command></term>
+<varlistentry id="objdump">
+<term><command>objdump</command></term>
<listitem>
<indexterm zone="ch-system-binutils objdump"><primary sortas="b-objdump">objdump</primary></indexterm>
<para>displays information about the given object file, with options controlling what
@@ -189,8 +189,8 @@ programmers who are working on the compilation tools.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ranlib"><command>ranlib</command></term>
+<varlistentry id="ranlib">
+<term><command>ranlib</command></term>
<listitem>
<indexterm zone="ch-system-binutils ranlib"><primary sortas="b-ranlib">ranlib</primary></indexterm>
<para>generates an index of the contents of an
@@ -199,24 +199,24 @@ by archive members that are relocatable object files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="readelf"><command>readelf</command></term>
+<varlistentry id="readelf">
+<term><command>readelf</command></term>
<listitem>
<indexterm zone="ch-system-binutils readelf"><primary sortas="b-readelf">readelf</primary></indexterm>
<para>displays information about elf type binaries.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="size"><command>size</command></term>
+<varlistentry id="size">
+<term><command>size</command></term>
<listitem>
<indexterm zone="ch-system-binutils size"><primary sortas="b-size">size</primary></indexterm>
<para>lists the section sizes -- and the grand total -- for the given object files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="strings"><command>strings</command></term>
+<varlistentry id="strings">
+<term><command>strings</command></term>
<listitem>
<indexterm zone="ch-system-binutils strings"><primary sortas="b-strings">strings</primary></indexterm>
<para>outputs, for each given file, the sequences
@@ -226,16 +226,16 @@ and loading sections. For other types of files it scans the whole file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="strip"><command>strip</command></term>
+<varlistentry id="strip">
+<term><command>strip</command></term>
<listitem>
<indexterm zone="ch-system-binutils strip"><primary sortas="b-strip">strip</primary></indexterm>
<para>discards symbols from object files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libiberty"><command>libiberty</command></term>
+<varlistentry id="libiberty">
+<term><command>libiberty</command></term>
<listitem>
<indexterm zone="ch-system-binutils libiberty"><primary sortas="c-libiberty">libiberty</primary></indexterm>
<para>contains routines used by various GNU
@@ -243,16 +243,16 @@ programs, including getopt, obstack, strerror, strtol and strtoul.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libbfd"><command>libbfd</command></term>
+<varlistentry id="libbfd">
+<term><command>libbfd</command></term>
<listitem>
<indexterm zone="ch-system-binutils libbfd"><primary sortas="c-libbfd">libbfd</primary></indexterm>
<para>is the Binary File Descriptor library.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libopcodes"><command>libopcodes</command></term>
+<varlistentry id="libopcodes">
+<term><command>libopcodes</command></term>
<listitem>
<indexterm zone="ch-system-binutils libopcodes"><primary sortas="c-libopcodes">libopcodes</primary></indexterm>
<para>is a library for dealing with opcodes.
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index 1d062e0b1..f6247bb94 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -56,8 +56,8 @@ GCC, Gettext, Glibc, Grep, M4, Make, Sed</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="bison"><command>bison</command></term>
+<varlistentry id="bison">
+<term><command>bison</command></term>
<listitem>
<indexterm zone="ch-system-bison bison"><primary sortas="b-bison">bison</primary></indexterm>
<para>generates, from a series of rules, a program
@@ -66,8 +66,8 @@ for analyzing the structure of text files. Bison is a replacement for yacc
</listitem>
</varlistentry>
-<varlistentry>
-<term id="yacc"><command>yacc</command></term>
+<varlistentry id="yacc">
+<term><command>yacc</command></term>
<listitem>
<indexterm zone="ch-system-bison yacc"><primary sortas="b-yacc">yacc</primary></indexterm>
<para>is a wrapper for bison, meant for programs
@@ -75,8 +75,8 @@ that still call yacc instead of bison. It calls bison with the -y option.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="liby.a"><command>liby.a</command></term>
+<varlistentry id="liby.a">
+<term><command>liby.a</command></term>
<listitem>
<indexterm zone="ch-system-bison liby.a"><primary sortas="c-liby.a">liby.a</primary></indexterm>
<para>is the Yacc library containing
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index eb8270053..62271ad57 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -80,48 +80,48 @@ libbz2.so.&bzip2-version;) and libbz2.so.&bzip2-version;</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="bunzip2"><command>bunzip2</command></term>
+<varlistentry id="bunzip2">
+<term><command>bunzip2</command></term>
<listitem>
<indexterm zone="ch-system-bzip2 bunzip2"><primary sortas="b-bunzip2">bunzip2</primary></indexterm>
<para>decompresses bzipped files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="bzcat"><command>bzcat</command></term>
+<varlistentry id="bzcat">
+<term><command>bzcat</command></term>
<listitem>
<indexterm zone="ch-system-bzip2 bzcat"><primary sortas="b-bzcat">bzcat</primary></indexterm>
<para>decompresses to standard output.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="bzcmp"><command>bzcmp</command></term>
+<varlistentry id="bzcmp">
+<term><command>bzcmp</command></term>
<listitem>
<indexterm zone="ch-system-bzip2 bzcmp"><primary sortas="b-bzcmp">bzcmp</primary></indexterm>
<para>runs cmp on bzipped files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="bzdiff"><command>bzdiff</command></term>
+<varlistentry id="bzdiff">
+<term><command>bzdiff</command></term>
<listitem>
<indexterm zone="ch-system-bzip2 bzdiff"><primary sortas="b-bzdiff">bzdiff</primary></indexterm>
<para>runs diff on bzipped files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="bzgrep"><command>bzgrep</command></term>
+<varlistentry id="bzgrep">
+<term><command>bzgrep</command></term>
<listitem>
<indexterm zone="ch-system-bzip2 bzgrep"><primary sortas="b-bzgrep">bzgrep</primary></indexterm>
<para>and friends run grep on bzipped files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="bzip2"><command>bzip2</command></term>
+<varlistentry id="bzip2">
+<term><command>bzip2</command></term>
<listitem>
<indexterm zone="ch-system-bzip2 bzip2"><primary sortas="b-bzip2">bzip2</primary></indexterm>
<para>compresses files using the Burrows-Wheeler
@@ -131,32 +131,32 @@ compressors using LZ77/LZ78, like <command>gzip</command>.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="bzip2recover"><command>bzip2recover</command></term>
+<varlistentry id="bzip2recover">
+<term><command>bzip2recover</command></term>
<listitem>
<indexterm zone="ch-system-bzip2 bzip2recover"><primary sortas="b-bzip2recover">bzip2recover</primary></indexterm>
<para>tries to recover data from damaged bzip2 files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="bzless"><command>bzless</command></term>
+<varlistentry id="bzless">
+<term><command>bzless</command></term>
<listitem>
<indexterm zone="ch-system-bzip2 bzless"><primary sortas="b-bzless">bzless</primary></indexterm>
<para>runs less on bzipped files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="bzmore"><command>bzmore</command></term>
+<varlistentry id="bzmore">
+<term><command>bzmore</command></term>
<listitem>
<indexterm zone="ch-system-bzip2 bzmore"><primary sortas="b-bzmore">bzmore</primary></indexterm>
<para>runs more on bzipped files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libbz2"><command>libbz2*</command></term>
+<varlistentry id="libbz2">
+<term><command>libbz2*</command></term>
<listitem>
<indexterm zone="ch-system-bzip2 libbz2"><primary sortas="c-libbz2*">libbz2*</primary></indexterm>
<para>is the library implementing lossless,
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 80e6be012..983db0db8 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -111,24 +111,24 @@ whoami and yes</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="basename"><command>basename</command></term>
+<varlistentry id="basename">
+<term><command>basename</command></term>
<listitem>
<indexterm zone="ch-system-coreutils basename"><primary sortas="b-basename">basename</primary></indexterm>
<para>strips any path and a given suffix from the given file name.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="cat"><command>cat</command></term>
+<varlistentry id="cat">
+<term><command>cat</command></term>
<listitem>
<indexterm zone="ch-system-coreutils cat"><primary sortas="b-cat">cat</primary></indexterm>
<para>concatenates files to standard output.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="chgrp"><command>chgrp</command></term>
+<varlistentry id="chgrp">
+<term><command>chgrp</command></term>
<listitem>
<indexterm zone="ch-system-coreutils chgrp"><primary sortas="b-chgrp">chgrp</primary></indexterm>
<para>changes the group ownership of each given file to the given group. The
@@ -136,8 +136,8 @@ group can be either given a a name or a numeric ID.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="chmod"><command>chmod</command></term>
+<varlistentry id="chmod">
+<term><command>chmod</command></term>
<listitem>
<indexterm zone="ch-system-coreutils chmod"><primary sortas="b-chmod">chmod</primary></indexterm>
<para>changes the permissions of each given file
@@ -146,8 +146,8 @@ changes to make, or an octal number representing the new permissions.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="chown"><command>chown</command></term>
+<varlistentry id="chown">
+<term><command>chown</command></term>
<listitem>
<indexterm zone="ch-system-coreutils chown"><primary sortas="b-chown">chown</primary></indexterm>
<para>changes the user and/or group ownership of
@@ -155,8 +155,8 @@ each given file to the given user:group pair.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="chroot"><command>chroot</command></term>
+<varlistentry id="chroot">
+<term><command>chroot</command></term>
<listitem>
<indexterm zone="ch-system-coreutils chroot"><primary sortas="b-chroot">chroot</primary></indexterm>
<para>runs a given command with the specified directory as the
@@ -165,8 +165,8 @@ On most systems only <emphasis>root</emphasis> can do this.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="cksum"><command>cksum</command></term>
+<varlistentry id="cksum">
+<term><command>cksum</command></term>
<listitem>
<indexterm zone="ch-system-coreutils cksum"><primary sortas="b-cksum">cksum</primary></indexterm>
<para>prints the CRC (Cyclic Redundancy Check) checksum and the byte
@@ -174,8 +174,8 @@ counts of each specified file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="comm"><command>comm</command></term>
+<varlistentry id="comm">
+<term><command>comm</command></term>
<listitem>
<indexterm zone="ch-system-coreutils comm"><primary sortas="b-comm">comm</primary></indexterm>
<para>compares two sorted files, outputting in
@@ -183,16 +183,16 @@ three columns the lines that are unique, and the lines that are common.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="cp"><command>cp</command></term>
+<varlistentry id="cp">
+<term><command>cp</command></term>
<listitem>
<indexterm zone="ch-system-coreutils cp"><primary sortas="b-cp">cp</primary></indexterm>
<para>copies files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="csplit"><command>csplit</command></term>
+<varlistentry id="csplit">
+<term><command>csplit</command></term>
<listitem>
<indexterm zone="ch-system-coreutils csplit"><primary sortas="b-csplit">csplit</primary></indexterm>
<para>splits a given file into several new files,
@@ -201,8 +201,8 @@ the byte count of each new file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="cut"><command>cut</command></term>
+<varlistentry id="cut">
+<term><command>cut</command></term>
<listitem>
<indexterm zone="ch-system-coreutils cut"><primary sortas="b-cut">cut</primary></indexterm>
<para>prints parts of lines, selecting the parts
@@ -210,16 +210,16 @@ according to given fields or positions.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="date"><command>date</command></term>
+<varlistentry id="date">
+<term><command>date</command></term>
<listitem>
<indexterm zone="ch-system-coreutils date"><primary sortas="b-date">date</primary></indexterm>
<para>displays the current time in the given format, or sets the system date.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="dd"><command>dd</command> </term>
+<varlistentry id="dd">
+<term><command>dd</command> </term>
<listitem>
<indexterm zone="ch-system-coreutils dd"><primary sortas="b-dd">dd</primary></indexterm>
<para>copies a file using the given block size and
@@ -227,8 +227,8 @@ count, while optionally performing conversions on it.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="df"><command>df</command></term>
+<varlistentry id="df">
+<term><command>df</command></term>
<listitem>
<indexterm zone="ch-system-coreutils df"><primary sortas="b-df">df</primary></indexterm>
<para>reports the amount of disk space available
@@ -237,16 +237,16 @@ given files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="dir"><command>dir</command></term>
+<varlistentry id="dir">
+<term><command>dir</command></term>
<listitem>
<indexterm zone="ch-system-coreutils dir"><primary sortas="b-dir">dir</primary></indexterm>
<para>is the same as ls.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="dircolors"><command>dircolors</command></term>
+<varlistentry id="dircolors">
+<term><command>dircolors</command></term>
<listitem>
<indexterm zone="ch-system-coreutils dircolors"><primary sortas="b-dircolors">dircolors</primary></indexterm>
<para>outputs commands to set the LS_COLOR
@@ -254,16 +254,16 @@ environment variable, to change the color scheme used by ls.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="dirname"><command>dirname</command></term>
+<varlistentry id="dirname">
+<term><command>dirname</command></term>
<listitem>
<indexterm zone="ch-system-coreutils dirname"><primary sortas="b-dirname">dirname</primary></indexterm>
<para>strips the non-directory suffix from a given file name.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="du"><command>du</command></term>
+<varlistentry id="du">
+<term><command>du</command></term>
<listitem>
<indexterm zone="ch-system-coreutils du"><primary sortas="b-du">du</primary></indexterm>
<para>reports the amount of disk space used by the
@@ -272,48 +272,48 @@ subdirectories, or by each of the given files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="echo"><command>echo</command></term>
+<varlistentry id="echo">
+<term><command>echo</command></term>
<listitem>
<indexterm zone="ch-system-coreutils echo"><primary sortas="b-echo">echo</primary></indexterm>
<para>displays the given strings.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="env"><command>env</command></term>
+<varlistentry id="env">
+<term><command>env</command></term>
<listitem>
<indexterm zone="ch-system-coreutils env"><primary sortas="b-env">env</primary></indexterm>
<para>runs a command in a modified environment.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="expand"><command>expand</command></term>
+<varlistentry id="expand">
+<term><command>expand</command></term>
<listitem>
<indexterm zone="ch-system-coreutils expand"><primary sortas="b-expand">expand</primary></indexterm>
<para>converts tabs to spaces.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="expr"><command>expr</command></term>
+<varlistentry id="expr">
+<term><command>expr</command></term>
<listitem>
<indexterm zone="ch-system-coreutils expr"><primary sortas="b-expr">expr</primary></indexterm>
<para>evaluates expressions.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="factor"><command>factor</command></term>
+<varlistentry id="factor">
+<term><command>factor</command></term>
<listitem>
<indexterm zone="ch-system-coreutils factor"><primary sortas="b-factor">factor</primary></indexterm>
<para>prints the prime factors of all specified integer numbers.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="false"><command>false</command></term>
+<varlistentry id="false">
+<term><command>false</command></term>
<listitem>
<indexterm zone="ch-system-coreutils false"><primary sortas="b-false">false</primary></indexterm>
<para>does nothing, unsuccessfully. It always
@@ -321,56 +321,56 @@ exits with a status code indicating failure.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mt"><command>fmt</command></term>
+<varlistentry id="mt">
+<term><command>fmt</command></term>
<listitem>
<indexterm zone="ch-system-coreutils mt"><primary sortas="b-mt">mt</primary></indexterm>
<para>reformats the paragraphs in the given files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="fold"><command>fold</command></term>
+<varlistentry id="fold">
+<term><command>fold</command></term>
<listitem>
<indexterm zone="ch-system-coreutils fold"><primary sortas="b-fold">fold</primary></indexterm>
<para>wraps the lines in the given files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="groups-coreutils"><command>groups</command></term>
+<varlistentry id="groups-coreutils">
+<term><command>groups</command></term>
<listitem>
<indexterm zone="ch-system-coreutils groups-coreutils"><primary sortas="b-groups-coreutils">groups</primary></indexterm>
<para>reports a user's group memberships.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="head"><command>head</command></term>
+<varlistentry id="head">
+<term><command>head</command></term>
<listitem>
<indexterm zone="ch-system-coreutils head"><primary sortas="b-head">head</primary></indexterm>
<para>prints the first ten lines (or the given number of lines) of each given file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="hostid"><command>hostid</command></term>
+<varlistentry id="hostid">
+<term><command>hostid</command></term>
<listitem>
<indexterm zone="ch-system-coreutils hostid"><primary sortas="b-hostid">hostid</primary></indexterm>
<para>reports the numeric identifier (in hexadecimal) of the host.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="hostname-coreutils"><command>hostname</command></term>
+<varlistentry id="hostname-coreutils">
+<term><command>hostname</command></term>
<listitem>
<indexterm zone="ch-system-coreutils hostname-coreutils"><primary sortas="b-hostname-coreutils">hostname</primary></indexterm>
<para>reports or sets the name of the host.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="id"><command>id</command></term>
+<varlistentry id="id">
+<term><command>id</command></term>
<listitem>
<indexterm zone="ch-system-coreutils id"><primary sortas="b-id">id</primary></indexterm>
<para>reports the effective user ID, group ID, and
@@ -378,8 +378,8 @@ group memberships of the current user, or of a given user.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="install"><command>install</command> </term>
+<varlistentry id="install">
+<term><command>install</command> </term>
<listitem>
<indexterm zone="ch-system-coreutils install"><primary sortas="b-install">install</primary></indexterm>
<para>copies files while setting their
@@ -387,40 +387,40 @@ permission modes and, if possible, their owner and group.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="join"><command>join</command></term>
+<varlistentry id="join">
+<term><command>join</command></term>
<listitem>
<indexterm zone="ch-system-coreutils join"><primary sortas="b-join">join</primary></indexterm>
<para>joins from two files the lines that have identical join fields.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="link"><command>link</command></term>
+<varlistentry id="link">
+<term><command>link</command></term>
<listitem>
<indexterm zone="ch-system-coreutils link"><primary sortas="b-link">link</primary></indexterm>
<para>creates a hard link with the given name to the given file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ln"><command>ln</command></term>
+<varlistentry id="ln">
+<term><command>ln</command></term>
<listitem>
<indexterm zone="ch-system-coreutils ln"><primary sortas="b-ln">ln</primary></indexterm>
<para>makes hard links or soft links between files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="logname"><command>logname</command></term>
+<varlistentry id="logname">
+<term><command>logname</command></term>
<listitem>
<indexterm zone="ch-system-coreutils logname"><primary sortas="b-logname">logname</primary></indexterm>
<para>reports the current user's login name.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ls"><command>ls</command></term>
+<varlistentry id="ls">
+<term><command>ls</command></term>
<listitem>
<indexterm zone="ch-system-coreutils ls"><primary sortas="b-ls">ls</primary></indexterm>
<para>lists the contents of each given directory.
@@ -428,24 +428,24 @@ By default it orders the files and subdirectories alphabetically.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="md5sum"><command>md5sum</command></term>
+<varlistentry id="md5sum">
+<term><command>md5sum</command></term>
<listitem>
<indexterm zone="ch-system-coreutils md5sum"><primary sortas="b-md5sum">md5sum</primary></indexterm>
<para>reports or checks MD5 (Message Digest 5) checksums.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mkdir"><command>mkdir</command></term>
+<varlistentry id="mkdir">
+<term><command>mkdir</command></term>
<listitem>
<indexterm zone="ch-system-coreutils mkdir"><primary sortas="b-mkdir">mkdir</primary></indexterm>
<para>creates directories with the given names.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mkfifo"><command>mkfifo</command></term>
+<varlistentry id="mkfifo">
+<term><command>mkfifo</command></term>
<listitem>
<indexterm zone="ch-system-coreutils mkfifo"><primary sortas="b-mkfifo">mkfifo</primary></indexterm>
<para>creates FIFOs (First-In, First-Out, a "named pipe" in UNIX parlance) with
@@ -453,8 +453,8 @@ the given names.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mknod"><command>mknod</command></term>
+<varlistentry id="mknod">
+<term><command>mknod</command></term>
<listitem>
<indexterm zone="ch-system-coreutils mknod"><primary sortas="b-mknod">mknod</primary></indexterm>
<para>creates device nodes with the given names.
@@ -462,32 +462,32 @@ A device node is a character special file, or a block special file, or a FIFO.</
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mv"><command>mv</command></term>
+<varlistentry id="mv">
+<term><command>mv</command></term>
<listitem>
<indexterm zone="ch-system-coreutils mv"><primary sortas="b-mv">mv</primary></indexterm>
<para>moves or renames files or directories.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="nice"><command>nice</command></term>
+<varlistentry id="nice">
+<term><command>nice</command></term>
<listitem>
<indexterm zone="ch-system-coreutils nice"><primary sortas="b-nice">nice</primary></indexterm>
<para>runs a program with modified scheduling priority.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="nl"><command>nl</command></term>
+<varlistentry id="nl">
+<term><command>nl</command></term>
<listitem>
<indexterm zone="ch-system-coreutils nl"><primary sortas="b-nl">nl</primary></indexterm>
<para>numbers the lines from the given files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="nohup"><command>nohup</command></term>
+<varlistentry id="nohup">
+<term><command>nohup</command></term>
<listitem>
<indexterm zone="ch-system-coreutils nohup"><primary sortas="b-nohup">nohup</primary></indexterm>
<para>runs a command immune to hangups, with
@@ -495,16 +495,16 @@ output redirected to a log file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="od"><command>od</command></term>
+<varlistentry id="od">
+<term><command>od</command></term>
<listitem>
<indexterm zone="ch-system-coreutils od"><primary sortas="b-od">od</primary></indexterm>
<para>dumps files in octal and other formats.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="paste"><command>paste</command></term>
+<varlistentry id="paste">
+<term><command>paste</command></term>
<listitem>
<indexterm zone="ch-system-coreutils paste"><primary sortas="b-paste">paste</primary></indexterm>
<para>merges the given files, joining
@@ -512,40 +512,40 @@ sequentially corresponding lines side by side, separated by tab characters..</pa
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pathchk"><command>pathchk</command></term>
+<varlistentry id="pathchk">
+<term><command>pathchk</command></term>
<listitem>
<indexterm zone="ch-system-coreutils pathchk"><primary sortas="b-pathchk">pathchk</primary></indexterm>
<para>checks whether file names are valid or portable.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pinky"><command>pinky</command></term>
+<varlistentry id="pinky">
+<term><command>pinky</command></term>
<listitem>
<indexterm zone="ch-system-coreutils pinky"><primary sortas="b-pinky">pinky</primary></indexterm>
<para>is a lightweight finger. It reports some information about the given users.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pr"><command>pr</command></term>
+<varlistentry id="pr">
+<term><command>pr</command></term>
<listitem>
<indexterm zone="ch-system-coreutils pr"><primary sortas="b-pr">pr</primary></indexterm>
<para>paginates and columnates files for printing.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="printenv"><command>printenv</command></term>
+<varlistentry id="printenv">
+<term><command>printenv</command></term>
<listitem>
<indexterm zone="ch-system-coreutils printenv"><primary sortas="b-printenv">printenv</primary></indexterm>
<para>prints the environment.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="printf"><command>printf</command></term>
+<varlistentry id="printf">
+<term><command>printf</command></term>
<listitem>
<indexterm zone="ch-system-coreutils printf"><primary sortas="b-printf">printf</primary></indexterm>
<para>prints the given arguments according to the
@@ -553,8 +553,8 @@ given format -- much like the C printf function.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ptx"><command>ptx</command></term>
+<varlistentry id="ptx">
+<term><command>ptx</command></term>
<listitem>
<indexterm zone="ch-system-coreutils ptx"><primary sortas="b-ptx">ptx</primary></indexterm>
<para>produces from the contents of the given files
@@ -562,40 +562,40 @@ a permuted index, with each keyword in its context.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pwd"><command>pwd</command></term>
+<varlistentry id="pwd">
+<term><command>pwd</command></term>
<listitem>
<indexterm zone="ch-system-coreutils pwd"><primary sortas="b-pwd">pwd</primary></indexterm>
<para>reports the name of the current directory.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="readlink"><command>readlink</command></term>
+<varlistentry id="readlink">
+<term><command>readlink</command></term>
<listitem>
<indexterm zone="ch-system-coreutils readlink"><primary sortas="b-readlink">readlink</primary></indexterm>
<para>reports the value of the given symbolic link.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="rm"><command>rm</command></term>
+<varlistentry id="rm">
+<term><command>rm</command></term>
<listitem>
<indexterm zone="ch-system-coreutils rm"><primary sortas="b-rm">rm</primary></indexterm>
<para>removes files or directories.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="rmdir"><command>rmdir</command></term>
+<varlistentry id="rmdir">
+<term><command>rmdir</command></term>
<listitem>
<indexterm zone="ch-system-coreutils rmdir"><primary sortas="b-rmdir">rmdir</primary></indexterm>
<para>removes directories, if they are empty.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="seq"><command>seq</command></term>
+<varlistentry id="seq">
+<term><command>seq</command></term>
<listitem>
<indexterm zone="ch-system-coreutils seq"><primary sortas="b-seq">seq</primary></indexterm>
<para>prints a sequence of numbers, within a given
@@ -603,16 +603,16 @@ range and with a given increment.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="sha1sum"><command>sha1sum</command></term>
+<varlistentry id="sha1sum">
+<term><command>sha1sum</command></term>
<listitem>
<indexterm zone="ch-system-coreutils sha1sum"><primary sortas="b-sha1sum">sha1sum</primary></indexterm>
<para>prints or checks 160-bit SHA1 checksums.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="shred"><command>shred</command></term>
+<varlistentry id="shred">
+<term><command>shred</command></term>
<listitem>
<indexterm zone="ch-system-coreutils shred"><primary sortas="b-shred">shred</primary></indexterm>
<para>overwrites the given files repeatedly with
@@ -620,56 +620,56 @@ strange patterns, to make it real hard to recover the data.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="sleep"><command>sleep</command></term>
+<varlistentry id="sleep">
+<term><command>sleep</command></term>
<listitem>
<indexterm zone="ch-system-coreutils sleep"><primary sortas="b-sleep">sleep</primary></indexterm>
<para>pauses for the given amount of time.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="sort"><command>sort</command></term>
+<varlistentry id="sort">
+<term><command>sort</command></term>
<listitem>
<indexterm zone="ch-system-coreutils sort"><primary sortas="b-sort">sort</primary></indexterm>
<para>sorts the lines from the given files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="split"><command>split</command></term>
+<varlistentry id="split">
+<term><command>split</command></term>
<listitem>
<indexterm zone="ch-system-coreutils split"><primary sortas="b-split">split</primary></indexterm>
<para>splits the given file into pieces, by size or by numbspliter of lines.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="stty"><command>stty</command></term>
+<varlistentry id="stty">
+<term><command>stty</command></term>
<listitem>
<indexterm zone="ch-system-coreutils stty"><primary sortas="b-stty">stty</primary></indexterm>
<para>sets or reports terminal line settings.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="su"><command>su</command></term>
+<varlistentry id="su">
+<term><command>su</command></term>
<listitem>
<indexterm zone="ch-system-coreutils su"><primary sortas="b-su">su</primary></indexterm>
<para>runs a shell with substitute user and group IDs.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="sum"><command>sum</command></term>
+<varlistentry id="sum">
+<term><command>sum</command></term>
<listitem>
<indexterm zone="ch-system-coreutils sum"><primary sortas="b-sum">sum</primary></indexterm>
<para>prints checksum and block counts for each given file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="sync"><command>sync</command></term>
+<varlistentry id="sync">
+<term><command>sync</command></term>
<listitem>
<indexterm zone="ch-system-coreutils sync"><primary sortas="b-sync">sync</primary></indexterm>
<para>flushes file system buffers. It forces
@@ -677,24 +677,24 @@ changed blocks to disk and updates the super block.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tac"><command>tac</command></term>
+<varlistentry id="tac">
+<term><command>tac</command></term>
<listitem>
<indexterm zone="ch-system-coreutils tac"><primary sortas="b-tac">tac</primary></indexterm>
<para>concatenates the given files in reverse.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tail"><command>tail</command></term>
+<varlistentry id="tail">
+<term><command>tail</command></term>
<listitem>
<indexterm zone="ch-system-coreutils tail"><primary sortas="b-tail">tail</primary></indexterm>
<para>prints the last ten lines (or the given number of lines) of each given file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tee"><command>tee</command></term>
+<varlistentry id="tee">
+<term><command>tee</command></term>
<listitem>
<indexterm zone="ch-system-coreutils tee"><primary sortas="b-tee">tee</primary></indexterm>
<para>reads from standard input while writing both
@@ -702,16 +702,16 @@ to standard output and to the given files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="test"><command>test</command></term>
+<varlistentry id="test">
+<term><command>test</command></term>
<listitem>
<indexterm zone="ch-system-coreutils test"><primary sortas="b-test">test</primary></indexterm>
<para>compares values and checks file types.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="touch"><command>touch</command></term>
+<varlistentry id="touch">
+<term><command>touch</command></term>
<listitem>
<indexterm zone="ch-system-coreutils touch"><primary sortas="b-touch">touch</primary></indexterm>
<para>changes file timestamps, setting the access
@@ -720,8 +720,8 @@ not exist are created with zero length.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tr"><command>tr</command></term>
+<varlistentry id="tr">
+<term><command>tr</command></term>
<listitem>
<indexterm zone="ch-system-coreutils tr"><primary sortas="b-tr">tr</primary></indexterm>
<para>translates, squeezes, and deletes the given
@@ -729,8 +729,8 @@ characters from standard input.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="true"><command>true</command></term>
+<varlistentry id="true">
+<term><command>true</command></term>
<listitem>
<indexterm zone="ch-system-coreutils true"><primary sortas="b-true">true</primary></indexterm>
<para>does nothing, successfully. It always exits
@@ -738,8 +738,8 @@ with a status code indicating success.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tsort"><command>tsort</command></term>
+<varlistentry id="tsort">
+<term><command>tsort</command></term>
<listitem>
<indexterm zone="ch-system-coreutils tsort"><primary sortas="b-tsort">tsort</primary></indexterm>
<para>performs a topological sort. It writes a
@@ -747,48 +747,48 @@ totally ordered list according to the partial ordering in a given file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tty"><command>tty</command></term>
+<varlistentry id="tty">
+<term><command>tty</command></term>
<listitem>
<indexterm zone="ch-system-coreutils tty"><primary sortas="b-tty">tty</primary></indexterm>
<para>reports the file name of the terminal connected to standard input.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="uname"><command>uname</command></term>
+<varlistentry id="uname">
+<term><command>uname</command></term>
<listitem>
<indexterm zone="ch-system-coreutils uname"><primary sortas="b-uname">uname</primary></indexterm>
<para>reports system information.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="unexpand"><command>unexpand</command></term>
+<varlistentry id="unexpand">
+<term><command>unexpand</command></term>
<listitem>
<indexterm zone="ch-system-coreutils unexpand"><primary sortas="b-unexpand">unexpand</primary></indexterm>
<para>converts spaces to tabs.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="uniq"><command>uniq</command></term>
+<varlistentry id="uniq">
+<term><command>uniq</command></term>
<listitem>
<indexterm zone="ch-system-coreutils uniq"><primary sortas="b-uniq">uniq</primary></indexterm>
<para>discards all but one of successive identical lines.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="unlink"><command>unlink</command></term>
+<varlistentry id="unlink">
+<term><command>unlink</command></term>
<listitem>
<indexterm zone="ch-system-coreutils unlink"><primary sortas="b-unlink">unlink</primary></indexterm>
<para>removes the given file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="uptime-coreutils"><command>uptime</command></term>
+<varlistentry id="uptime-coreutils">
+<term><command>uptime</command></term>
<listitem>
<indexterm zone="ch-system-coreutils uptime-coreutils"><primary sortas="b-uptime-coreutils">uptime</primary></indexterm>
<para>reports how long the system has been
@@ -796,24 +796,24 @@ running, how many users are logged on, and the system load averages.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="users"><command>users</command></term>
+<varlistentry id="users">
+<term><command>users</command></term>
<listitem>
<indexterm zone="ch-system-coreutils users"><primary sortas="b-users">users</primary></indexterm>
<para>reports the names of the users currently logged on.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="vdir"><command>vdir</command></term>
+<varlistentry id="vdir">
+<term><command>vdir</command></term>
<listitem>
<indexterm zone="ch-system-coreutils vdir"><primary sortas="b-vdir">vdir</primary></indexterm>
<para>is the same as ls -l.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="wc"><command>wc</command></term>
+<varlistentry id="wc">
+<term><command>wc</command></term>
<listitem>
<indexterm zone="ch-system-coreutils wc"><primary sortas="b-wc">wc</primary></indexterm>
<para>reports the number of lines, words, and bytes
@@ -821,24 +821,24 @@ for each given file, and a total line when more than one file is given.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="who"><command>who</command></term>
+<varlistentry id="who">
+<term><command>who</command></term>
<listitem>
<indexterm zone="ch-system-coreutils who"><primary sortas="b-who">who</primary></indexterm>
<para>reports who is logged on.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="whoami"><command>whoami</command></term>
+<varlistentry id="whoami">
+<term><command>whoami</command></term>
<listitem>
<indexterm zone="ch-system-coreutils whoami"><primary sortas="b-whoami">whoami</primary></indexterm>
<para>reports the user name associated with the current effective user ID.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="yes"><command>yes</command></term>
+<varlistentry id="yes">
+<term><command>yes</command></term>
<listitem>
<indexterm zone="ch-system-coreutils yes"><primary sortas="b-yes">yes</primary></indexterm>
<para>outputs 'y' or a given string repeatedly, until killed.</para>
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index f65781a6c..79790979f 100644
--- a/chapter06/diffutils.xml
+++ b/chapter06/diffutils.xml
@@ -53,32 +53,32 @@ Gettext, Glibc, Grep, Make, Sed</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="cmp"><command>cmp</command></term>
+<varlistentry id="cmp">
+<term><command>cmp</command></term>
<listitem>
<indexterm zone="ch-system-diffutils cmp"><primary sortas="b-cmp">cmp</primary></indexterm>
<para>compares two files and reports whether or in which bytes they differ.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="diff"><command>diff</command></term>
+<varlistentry id="diff">
+<term><command>diff</command></term>
<listitem>
<indexterm zone="ch-system-diffutils diff"><primary sortas="b-diff">diff</primary></indexterm>
<para>compares two files or directories and reports which lines in the files differ.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="diff3"><command>diff3</command></term>
+<varlistentry id="diff3">
+<term><command>diff3</command></term>
<listitem>
<indexterm zone="ch-system-diffutils diff3"><primary sortas="b-diff3">diff3</primary></indexterm>
<para>compares three files line by line.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="sdiff"><command>sdiff</command></term>
+<varlistentry id="sdiff">
+<term><command>sdiff</command></term>
<listitem>
<indexterm zone="ch-system-diffutils sdiff"><primary sortas="b-sdiff">sdiff</primary></indexterm>
<para>merges two files and interactively outputs the results.</para>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 74c887688..da481b953 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -91,24 +91,24 @@ libuuid.[a,so]</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="badblocks"><command>badblocks</command></term>
+<varlistentry id="badblocks">
+<term><command>badblocks</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs badblocks"><primary sortas="b-badblocks">badblocks</primary></indexterm>
<para>searches a device (usually a disk partition) for bad blocks.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="blkid"><command>blkid</command></term>
+<varlistentry id="blkid">
+<term><command>blkid</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs blkid"><primary sortas="b-blkid">blkid</primary></indexterm>
<para>is a command line utility to locate and print block device attributes.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="chattr"><command>chattr</command></term>
+<varlistentry id="chattr">
+<term><command>chattr</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs chattr"><primary sortas="b-chattr">chattr</primary></indexterm>
<para>changes the attributes of files on a second extended (ext2) file system, and
@@ -116,8 +116,8 @@ also ext3 file systems, the journaling version of ext2 file systems.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="compile_et"><command>compile_et</command></term>
+<varlistentry id="compile_et">
+<term><command>compile_et</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs compile_et"><primary sortas="b-compile_et">compile_et</primary></indexterm>
<para>is an error table compiler. It
@@ -126,8 +126,8 @@ suitable for use with the com_err library.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="debugfs"><command>debugfs</command></term>
+<varlistentry id="debugfs">
+<term><command>debugfs</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs debugfs"><primary sortas="b-debugfs">debugfs</primary></indexterm>
<para>is a file system debugger. It can be
@@ -135,8 +135,8 @@ used to examine and change the state of an ext2 file system.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="dumpe2fs"><command>dumpe2fs</command></term>
+<varlistentry id="dumpe2fs">
+<term><command>dumpe2fs</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs dumpe2fs"><primary sortas="b-dumpe2fs">dumpe2fs</primary></indexterm>
<para>prints the super block and blocks group
@@ -144,8 +144,8 @@ information for the file system present on a given device.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="e2fsck"><command>e2fsck</command></term>
+<varlistentry id="e2fsck">
+<term><command>e2fsck</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs e2fsck"><primary sortas="b-e2fsck">e2fsck</primary></indexterm>
<para>is used to check, and optionally repair,
@@ -153,16 +153,16 @@ second extended (ext2) file systems, and also ext3 file systems.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="e2image"><command>e2image</command></term>
+<varlistentry id="e2image">
+<term><command>e2image</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs e2image"><primary sortas="b-e2image">e2image</primary></indexterm>
<para>is used to save critical ext2 file system data to a file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="e2label"><command>e2label</command></term>
+<varlistentry id="e2label">
+<term><command>e2label</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs e2label"><primary sortas="b-e2label">e2label</primary></indexterm>
<para>will display or change the file system
@@ -170,16 +170,16 @@ label on the ext2 file system present on a given device.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="findfs"><command>findfs</command></term>
+<varlistentry id="findfs">
+<term><command>findfs</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs findfs"><primary sortas="b-findfs">findfs</primary></indexterm>
<para>finds a file system by label or UUID (Universally Unique Identifier).</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="fsck"><command>fsck</command></term>
+<varlistentry id="fsck">
+<term><command>fsck</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs fsck"><primary sortas="b-fsck">fsck</primary></indexterm>
<para>is used to check, and optionally repair, file systems. By default it checks the
@@ -187,24 +187,24 @@ file systems listed in <filename>/etc/fstab</filename></para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="logsave"><command>logsave</command></term>
+<varlistentry id="logsave">
+<term><command>logsave</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs logsave"><primary sortas="b-logsave">logsave</primary></indexterm>
<para>saves the output of a command in a log file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="lsattr"><command>lsattr</command></term>
+<varlistentry id="lsattr">
+<term><command>lsattr</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs lsattr"><primary sortas="b-lsattr">lsattr</primary></indexterm>
<para>lists the attributes of files on a second extended file system.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mk_cmds"><command>mk_cmds</command></term>
+<varlistentry id="mk_cmds">
+<term><command>mk_cmds</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs mk_cmds"><primary sortas="b-mk_cmds">mk_cmds</primary></indexterm>
<para>converts a table of command names
@@ -213,16 +213,16 @@ and help messages into a C source file suitable for use with the
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mke2fs"><command>mke2fs</command></term>
+<varlistentry id="mke2fs">
+<term><command>mke2fs</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs mke2fs"><primary sortas="b-mke2fs">mke2fs</primary></indexterm>
<para>is used to create a second extended file system on the given device.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mklost-found"><command>mklost+found</command></term>
+<varlistentry id="mklost-found">
+<term><command>mklost+found</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs mklost-found"><primary sortas="b-mklost+found">mklost+found</primary></indexterm>
<para>is used to create a
@@ -231,16 +231,16 @@ It pre-allocates disk blocks to this directory to lighten the task of e2fsck.</p
</listitem>
</varlistentry>
-<varlistentry>
-<term id="resize2fs"><command>resize2fs</command></term>
+<varlistentry id="resize2fs">
+<term><command>resize2fs</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs resize2fs"><primary sortas="b-resize2fs">resize2fs</primary></indexterm>
<para>can be used to enlarge or shrink an ext2 file system.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tune2fs"><command>tune2fs</command></term>
+<varlistentry id="tune2fs">
+<term><command>tune2fs</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs tune2fs"><primary sortas="b-tune2fs">tune2fs</primary></indexterm>
<para>is used adjust tunable file system
@@ -248,8 +248,8 @@ parameters on a second extended file system.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="uuidgen"><command>uuidgen</command></term>
+<varlistentry id="uuidgen">
+<term><command>uuidgen</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs uuidgen"><primary sortas="b-uuidgen">uuidgen</primary></indexterm>
<para>creates new UUID. Each new UUID can reasonably be considered unique
@@ -258,32 +258,32 @@ past and in the future.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libblkid"><command>libblkid</command></term>
+<varlistentry id="libblkid">
+<term><command>libblkid</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs libblkid"><primary sortas="c-libblkid">libblkid</primary></indexterm>
<para>contains routines for device identification and token extraction.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libcom_err"><command>libcom_err</command></term>
+<varlistentry id="libcom_err">
+<term><command>libcom_err</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs libcom_err"><primary sortas="c-libcom_err">libcom_err</primary></indexterm>
<para>is the common error display routine.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libe2p"><command>libe2p</command></term>
+<varlistentry id="libe2p">
+<term><command>libe2p</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs libe2p"><primary sortas="c-libe2p">libe2p</primary></indexterm>
<para>is used by dumpe2fs, chattr, and lsattr.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libext2fs"><command>libext2fs</command></term>
+<varlistentry id="libext2fs">
+<term><command>libext2fs</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs libext2fs"><primary sortas="c-libext2fs">libext2fs</primary></indexterm>
<para>contains routines to enable user-level
@@ -291,16 +291,16 @@ programs to manipulate an ext2 file system.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libss"><command>libss</command></term>
+<varlistentry id="libss">
+<term><command>libss</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs libss"><primary sortas="c-libss">libss</primary></indexterm>
<para>is used by debugfs.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libuuid"><command>libuuid</command></term>
+<varlistentry id="libuuid">
+<term><command>libuuid</command></term>
<listitem>
<indexterm zone="ch-system-e2fsprogs libuuid"><primary sortas="c-libuuid">libuuid</primary></indexterm>
<para>contains routines for generating unique
diff --git a/chapter06/file.xml b/chapter06/file.xml
index a5043f518..2fe5e46f2 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -53,8 +53,8 @@ GCC, Glibc, Grep, Make, Sed, Zlib</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="file"><command>file</command></term>
+<varlistentry id="file">
+<term><command>file</command></term>
<listitem>
<indexterm zone="ch-system-file file"><primary sortas="b-file">file</primary></indexterm>
<para>tries to classify each given file. It does
@@ -63,8 +63,8 @@ language tests. The first test that succeeds determines the result.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libmagic"><command>libmagic</command></term>
+<varlistentry id="libmagic">
+<term><command>libmagic</command></term>
<listitem>
<indexterm zone="ch-system-file libmagic"><primary sortas="c-libmagic">libmagic</primary></indexterm>
<para>contains routines for magic number recognition, used by the file program.</para>
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index 4847c2fc8..f3d7d5395 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -62,16 +62,16 @@ database to be in /var/lib/locate, which is FHS-compliant.</para>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="bigram"><command>bigram</command></term>
+<varlistentry id="bigram">
+<term><command>bigram</command></term>
<listitem>
<indexterm zone="ch-system-findutils bigram"><primary sortas="b-bigram">bigram</primary></indexterm>
<para>was formerly used to produce locate databases.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="code"><command>code</command></term>
+<varlistentry id="code">
+<term><command>code</command></term>
<listitem>
<indexterm zone="ch-system-findutils code"><primary sortas="b-code">code</primary></indexterm>
<para>was formerly used to produce locate
@@ -79,16 +79,16 @@ databases. It is the ancestor of frcode.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="find"><command>find</command></term>
+<varlistentry id="find">
+<term><command>find</command></term>
<listitem>
<indexterm zone="ch-system-findutils find"><primary sortas="b-find">find</primary></indexterm>
<para>searches given directory trees for files matching the specified criteria.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="frcode"><command>frcode</command></term>
+<varlistentry id="frcode">
+<term><command>frcode</command></term>
<listitem>
<indexterm zone="ch-system-findutils frcode"><primary sortas="b-frcode">frcode</primary></indexterm>
<para>is called by updatedb to compress the list of file names. It uses
@@ -96,8 +96,8 @@ front-compression, reducing the database size by a factor of 4 to 5.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="locate"><command>locate</command></term>
+<varlistentry id="locate">
+<term><command>locate</command></term>
<listitem>
<indexterm zone="ch-system-findutils locate"><primary sortas="b-locate">locate</primary></indexterm>
<para>searches through a database of file names,
@@ -105,8 +105,8 @@ and reports the names that contain a given string or match a given pattern.</par
</listitem>
</varlistentry>
-<varlistentry>
-<term id="updatedb"><command>updatedb</command></term>
+<varlistentry id="updatedb">
+<term><command>updatedb</command></term>
<listitem>
<indexterm zone="ch-system-findutils updatedb"><primary sortas="b-updatedb">updatedb</primary></indexterm>
<para>updates the locate database. It scans
@@ -115,8 +115,8 @@ unless told not to) and puts every file name it finds in the database.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="xargs"><command>xargs</command></term>
+<varlistentry id="xargs">
+<term><command>xargs</command></term>
<listitem>
<indexterm zone="ch-system-findutils xargs"><primary sortas="b-xargs">xargs</primary></indexterm>
<para>can be used to apply a given command to a list of files.</para>
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index c4bc1e664..ce0f86e5a 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -89,8 +89,8 @@ chmod 755 /usr/bin/lex</userinput></screen>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="flex"><command>flex</command></term>
+<varlistentry id="flex">
+<term><command>flex</command></term>
<listitem>
<indexterm zone="ch-system-flex flex"><primary sortas="b-flex">flex</primary></indexterm>
<para>is a tool for generating programs that
@@ -101,16 +101,16 @@ the rules for a pattern-finding program than to write the program.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="flex-"><command>flex++</command></term>
+<varlistentry id="flex-">
+<term><command>flex++</command></term>
<listitem>
<indexterm zone="ch-system-flex flex-"><primary sortas="b-flex++">flex++</primary></indexterm>
<para>invokes a version of flex that is used exclusively for C++ scanners.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libfl.a"><command>libfl.a</command></term>
+<varlistentry id="libfl.a">
+<term><command>libfl.a</command></term>
<listitem>
<indexterm zone="ch-system-flex libfl.a"><primary sortas="c-libfl.a">libfl.a</primary></indexterm>
<para>is the flex library.</para>
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index 022948dc0..65ccfb0c8 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -56,8 +56,8 @@ pgawk, pgawk-&gawk-version; and pwcat</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="gawk"><command>gawk</command></term>
+<varlistentry id="gawk">
+<term><command>gawk</command></term>
<listitem>
<indexterm zone="ch-system-gawk gawk"><primary sortas="b-gawk">gawk</primary></indexterm>
<para>is a program for manipulating text files.
@@ -65,32 +65,32 @@ It is the GNU implementation of awk.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="grcat"><command>grcat</command></term>
+<varlistentry id="grcat">
+<term><command>grcat</command></term>
<listitem>
<indexterm zone="ch-system-gawk grcat"><primary sortas="b-grcat">grcat</primary></indexterm>
<para>dumps the group database <filename>/etc/group</filename>.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="igawk"><command>igawk</command></term>
+<varlistentry id="igawk">
+<term><command>igawk</command></term>
<listitem>
<indexterm zone="ch-system-gawk igawk"><primary sortas="b-igawk">igawk</primary></indexterm>
<para>gives gawk the ability to include files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pgawk"><command>pgawk</command></term>
+<varlistentry id="pgawk">
+<term><command>pgawk</command></term>
<listitem>
<indexterm zone="ch-system-gawk pgawk"><primary sortas="b-pgawk">pgawk</primary></indexterm>
<para>is the profiling version of gawk.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pwcat"><command>pwcat</command></term>
+<varlistentry id="pwcat">
+<term><command>pwcat</command></term>
<listitem>
<indexterm zone="ch-system-gawk pwcat"><primary sortas="b-pwcat">pwcat</primary></indexterm>
<para>dumps the password database <filename>/etc/passwd</filename>.</para>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 74e7ad3fc..fdae5f665 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -118,8 +118,8 @@ cc1, cc1plus, collect2, cpp, g++, gcc, gccbug, and gcov</seg>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="cpp"><command>cpp</command></term>
+<varlistentry id="cpp">
+<term><command>cpp</command></term>
<listitem>
<indexterm zone="ch-system-gcc cpp"><primary sortas="b-cpp">cpp</primary></indexterm>
<para>is the C preprocessor. It is used by the compiler to have the #include and
@@ -127,16 +127,16 @@ cc1, cc1plus, collect2, cpp, g++, gcc, gccbug, and gcov</seg>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="g"><command>g++</command></term>
+<varlistentry id="g">
+<term><command>g++</command></term>
<listitem>
<indexterm zone="ch-system-gcc g"><primary sortas="b-g++">g++</primary></indexterm>
<para>is the C++ compiler.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="gcc"><command>gcc</command></term>
+<varlistentry id="gcc">
+<term><command>gcc</command></term>
<listitem>
<indexterm zone="ch-system-gcc gcc"><primary sortas="b-gcc">gcc</primary></indexterm>
<para>is the C compiler. It is used to translate
@@ -144,16 +144,16 @@ the source code of a program into assembly code.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="gccbug"><command>gccbug</command></term>
+<varlistentry id="gccbug">
+<term><command>gccbug</command></term>
<listitem>
<indexterm zone="ch-system-gcc gccbug"><primary sortas="b-gccbug">gccbug</primary></indexterm>
<para>is a shell script used to help create good bug reports.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="gcov"><command>gcov</command></term>
+<varlistentry id="gcov">
+<term><command>gcov</command></term>
<listitem>
<indexterm zone="ch-system-gcc gcov"><primary sortas="b-gcov">gcov</primary></indexterm>
<para>is a coverage testing tool. It is used to
@@ -161,24 +161,24 @@ analyze programs to find out where optimizations will have the most effect.</par
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libgcc"><command>libgcc*</command></term>
+<varlistentry id="libgcc">
+<term><command>libgcc*</command></term>
<listitem>
<indexterm zone="ch-system-gcc libgcc"><primary sortas="c-libgcc*">libgcc*</primary></indexterm>
<para>contains run-time support for gcc.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libstdc"><command>libstdc++</command></term>
+<varlistentry id="libstdc">
+<term><command>libstdc++</command></term>
<listitem>
<indexterm zone="ch-system-gcc libstdc"><primary sortas="c-libstdc++">libstdc++</primary></indexterm>
<para>is the standard C++ library. It contains many frequently-used functions.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libsupc"><command>libsupc++</command></term>
+<varlistentry id="libsupc">
+<term><command>libsupc++</command></term>
<listitem>
<indexterm zone="ch-system-gcc libsupc"><primary sortas="c-libsupc++">libsupc++</primary></indexterm>
<para>provides supporting routines for the c++ programming language.</para>
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index feb85a5f0..ca3e5e8f7 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -63,24 +63,24 @@ ngettext, project-id, team-address, trigger, urlget, user-email and xgettext</se
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="autopoint"><command>autopoint</command></term>
+<varlistentry id="autopoint">
+<term><command>autopoint</command></term>
<listitem>
<indexterm zone="ch-system-gettext autopoint"><primary sortas="b-autopoint">autopoint</primary></indexterm>
<para>copies standard gettext infrastructure files into a source package.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="config.charset"><command>config.charset</command></term>
+<varlistentry id="config.charset">
+<term><command>config.charset</command></term>
<listitem>
<indexterm zone="ch-system-gettext config.charset"><primary sortas="b-config.charset">config.charset</primary></indexterm>
<para>outputs a system-dependent table of character encoding aliases.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="config.rpath"><command>config.rpath</command></term>
+<varlistentry id="config.rpath">
+<term><command>config.rpath</command></term>
<listitem>
<indexterm zone="ch-system-gettext config.rpath"><primary sortas="b-config.rpath">config.rpath</primary></indexterm>
<para>outputs a system-dependent set of variables, describing how to set the
@@ -88,16 +88,16 @@ runtime search path of shared libraries in an executable.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="envsubst"><command>envsubst</command></term>
+<varlistentry id="envsubst">
+<term><command>envsubst</command></term>
<listitem>
<indexterm zone="ch-system-gettext envsubst"><primary sortas="b-envsubst">envsubst</primary></indexterm>
<para>substitutes environment variables in shell format strings.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="gettext"><command>gettext</command></term>
+<varlistentry id="gettext">
+<term><command>gettext</command></term>
<listitem>
<indexterm zone="ch-system-gettext gettext"><primary sortas="b-gettext">gettext</primary></indexterm>
<para>translates a natural language message into
@@ -105,8 +105,8 @@ the user's language, by looking up the translation in a message catalog.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="gettextize"><command>gettextize</command></term>
+<varlistentry id="gettextize">
+<term><command>gettextize</command></term>
<listitem>
<indexterm zone="ch-system-gettext gettextize"><primary sortas="b-gettextize">gettextize</primary></indexterm>
<para>copies all standard Gettext files into
@@ -114,16 +114,16 @@ the given top-level directory of a package, to begin inter-nationalizing it.</pa
</listitem>
</varlistentry>
-<varlistentry>
-<term id="hostname-gettext"><command>hostname</command></term>
+<varlistentry id="hostname-gettext">
+<term><command>hostname</command></term>
<listitem>
<indexterm zone="ch-system-gettext hostname-gettext"><primary sortas="b-hostname-gettext">hostname</primary></indexterm>
<para>displays a network hostname in various forms.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="msgattrib"><command>msgattrib</command></term>
+<varlistentry id="msgattrib">
+<term><command>msgattrib</command></term>
<listitem>
<indexterm zone="ch-system-gettext msgattrib"><primary sortas="b-msgattrib">msgattrib</primary></indexterm>
<para>filters the messages of a translation
@@ -131,16 +131,16 @@ catalog according to their attributes and manipulates the attributes.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="msgcat"><command>msgcat</command></term>
+<varlistentry id="msgcat">
+<term><command>msgcat</command></term>
<listitem>
<indexterm zone="ch-system-gettext msgcat"><primary sortas="b-msgcat">msgcat</primary></indexterm>
<para>concatenates and merges the given <filename>.po</filename> files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="msgcmp"><command>msgcmp</command></term>
+<varlistentry id="msgcmp">
+<term><command>msgcmp</command></term>
<listitem>
<indexterm zone="ch-system-gettext msgcmp"><primary sortas="b-msgcmp">msgcmp</primary></indexterm>
<para>compares two <filename>.po</filename>
@@ -148,8 +148,8 @@ files to check that both contain the same set of msgid strings.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="msgcomm"><command>msgcomm</command></term>
+<varlistentry id="msgcomm">
+<term><command>msgcomm</command></term>
<listitem>
<indexterm zone="ch-system-gettext msgcomm"><primary sortas="b-msgcomm">msgcomm</primary></indexterm>
<para>finds the messages that are common to
@@ -157,48 +157,48 @@ to the given <filename>.po</filename> files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="msgconv"><command>msgconv</command></term>
+<varlistentry id="msgconv">
+<term><command>msgconv</command></term>
<listitem>
<indexterm zone="ch-system-gettext msgconv"><primary sortas="b-msgconv">msgconv</primary></indexterm>
<para>converts a translation catalog to a different character encoding.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="msgen"><command>msgen</command></term>
+<varlistentry id="msgen">
+<term><command>msgen</command></term>
<listitem>
<indexterm zone="ch-system-gettext msgen"><primary sortas="b-msgen">msgen</primary></indexterm>
<para>creates an English translation catalog.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="msgexec"><command>msgexec</command></term>
+<varlistentry id="msgexec">
+<term><command>msgexec</command></term>
<listitem>
<indexterm zone="ch-system-gettext msgexec"><primary sortas="b-msgexec">msgexec</primary></indexterm>
<para>applies a command to all translations of a translation catalog.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="msgfilter"><command>msgfilter</command></term>
+<varlistentry id="msgfilter">
+<term><command>msgfilter</command></term>
<listitem>
<indexterm zone="ch-system-gettext msgfilter"><primary sortas="b-msgfilter">msgfilter</primary></indexterm>
<para>applies a filter to all translations of a translation catalog.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="msgfmt"><command>msgfmt</command></term>
+<varlistentry id="msgfmt">
+<term><command>msgfmt</command></term>
<listitem>
<indexterm zone="ch-system-gettext msgfmt"><primary sortas="b-msgfmt">msgfmt</primary></indexterm>
<para>generates a binary message catalog from from a translation catalog.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="msggrep"><command>msggrep</command></term>
+<varlistentry id="msggrep">
+<term><command>msggrep</command></term>
<listitem>
<indexterm zone="ch-system-gettext msggrep"><primary sortas="b-msggrep">msggrep</primary></indexterm>
<para>extracts all messages of a translation
@@ -206,8 +206,8 @@ catalog that match a given pattern or belong to some given source files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="msginit"><command>msginit</command></term>
+<varlistentry id="msginit">
+<term><command>msginit</command></term>
<listitem>
<indexterm zone="ch-system-gettext msginit"><primary sortas="b-msginit">msginit</primary></indexterm>
<para>creates a new <filename>.po</filename> file, initializing the meta
@@ -215,32 +215,32 @@ information with values from the user's environment.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="msgmerge"><command>msgmerge</command></term>
+<varlistentry id="msgmerge">
+<term><command>msgmerge</command></term>
<listitem>
<indexterm zone="ch-system-gettext msgmerge"><primary sortas="b-msgmerge">msgmerge</primary></indexterm>
<para>combines two raw translations into a single file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="msgunfmt"><command>msgunfmt</command></term>
+<varlistentry id="msgunfmt">
+<term><command>msgunfmt</command></term>
<listitem>
<indexterm zone="ch-system-gettext msgunfmt"><primary sortas="b-msgunfmt">msgunfmt</primary></indexterm>
<para>decompiles a binary message catalog into raw translation text.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="msguniq"><command>msguniq</command></term>
+<varlistentry id="msguniq">
+<term><command>msguniq</command></term>
<listitem>
<indexterm zone="ch-system-gettext msguniq"><primary sortas="b-msguniq">msguniq</primary></indexterm>
<para>unifies duplicate translations in a translation catalog.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ngettext"><command>ngettext</command></term>
+<varlistentry id="ngettext">
+<term><command>ngettext</command></term>
<listitem>
<indexterm zone="ch-system-gettext ngettext"><primary sortas="b-ngettext">ngettext</primary></indexterm>
<para>displays native language translations of a
@@ -248,8 +248,8 @@ textual message whose grammatical form depends on a number.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="xgettext"><command>xgettext</command></term>
+<varlistentry id="xgettext">
+<term><command>xgettext</command></term>
<listitem>
<indexterm zone="ch-system-gettext xgettext"><primary sortas="b-xgettext">xgettext</primary></indexterm>
<para>extracts the translatable message lines
@@ -257,8 +257,8 @@ from the given source files, to make the first translation template.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libasprintf"><command>libasprintf</command></term>
+<varlistentry id="libasprintf">
+<term><command>libasprintf</command></term>
<listitem>
<indexterm zone="ch-system-gettext libasprintf"><primary sortas="c-libasprintf">libasprintf</primary></indexterm>
<para>defines the autosprintf class, which
@@ -267,8 +267,8 @@ makes C formatted output routines usable in C++ programs, for use with the
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libgettextlib"><command>libgettextlib</command></term>
+<varlistentry id="libgettextlib">
+<term><command>libgettextlib</command></term>
<listitem>
<indexterm zone="ch-system-gettext libgettextlib"><primary sortas="c-libgettextlib">libgettextlib</primary></indexterm>
<para>is a private library containing common routines used by the various gettext
@@ -276,8 +276,8 @@ programs. They're not meant for general use.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libgettextpo"><command>libgettextpo</command></term>
+<varlistentry id="libgettextpo">
+<term><command>libgettextpo</command></term>
<listitem>
<indexterm zone="ch-system-gettext libgettextpo"><primary sortas="c-libgettextpo">libgettextpo</primary></indexterm>
<para>is used to write specialized programs that process PO files. This library is
@@ -286,8 +286,8 @@ msgcomm, msgcmp, msgattrib and msgen).</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libgettextsrc"><command>libgettextsrc</command></term>
+<varlistentry id="libgettextsrc">
+<term><command>libgettextsrc</command></term>
<listitem>
<indexterm zone="ch-system-gettext libgettextsrc"><primary sortas="c-libgettextsrc">libgettextsrc</primary></indexterm>
<para>is a private library containing common routines used by the various gettext
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 40bc3b3a9..bb2921041 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -195,13 +195,15 @@ or <emphasis>Canada/Eastern</emphasis>. Then create the
<para>The meaning of the option:</para>
-<itemizedlist>
-<listitem><para><userinput>--remove-destination</userinput>: This is needed to
-force removal of the already existing symbolic link. The reason why we copy
-instead of symlink is to cover the situation where <filename>/usr</filename> is
-on a separate partition. This could matter, for example, when booted into single
-user mode.</para></listitem>
-</itemizedlist>
+<variablelist>
+<varlistentry>
+<term><userinput>--remove-destination</userinput></term>
+<listitem><para>This is needed to force removal of the already existing symbolic
+link. The reason why we copy instead of symlink is to cover the situation where
+<filename>/usr</filename> is on a separate partition. This could matter, for
+example, when booted into single user mode.</para></listitem>
+</varlistentry>
+</variablelist>
<para>Of course, instead of <emphasis>Canada/Eastern</emphasis>, fill in
the name of the time zone that the <command>tzselect</command> script
@@ -262,8 +264,8 @@ and libutil.[a,so]</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="catchsegv"><command>catchsegv</command></term>
+<varlistentry id="catchsegv">
+<term><command>catchsegv</command></term>
<listitem>
<indexterm zone="ch-system-glibc catchsegv"><primary sortas="b-catchsegv">catchsegv</primary></indexterm>
<para>can be used to create a stack trace
@@ -271,64 +273,64 @@ when a program terminates with a segmentation fault.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="gencat"><command>gencat</command></term>
+<varlistentry id="gencat">
+<term><command>gencat</command></term>
<listitem>
<indexterm zone="ch-system-glibc gencat"><primary sortas="b-gencat">gencat</primary></indexterm>
<para>generates message catalogues.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="getconf"><command>getconf</command></term>
+<varlistentry id="getconf">
+<term><command>getconf</command></term>
<listitem>
<indexterm zone="ch-system-glibc getconf"><primary sortas="b-getconf">getconf</primary></indexterm>
<para>displays the system configuration values for file system specific variables.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="getent"><command>getent</command></term>
+<varlistentry id="getent">
+<term><command>getent</command></term>
<listitem>
<indexterm zone="ch-system-glibc getent"><primary sortas="b-getent">getent</primary></indexterm>
<para>gets entries from an administrative database.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="glibcbug"><command>glibcbug</command></term>
+<varlistentry id="glibcbug">
+<term><command>glibcbug</command></term>
<listitem>
<indexterm zone="ch-system-glibc glibcbug"><primary sortas="b-glibcbug">glibcbug</primary></indexterm>
<para>creates a bug report and mails it to the bug email address.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="iconv"><command>iconv</command></term>
+<varlistentry id="iconv">
+<term><command>iconv</command></term>
<listitem>
<indexterm zone="ch-system-glibc iconv"><primary sortas="b-iconv">iconv</primary></indexterm>
<para>performs character set conversion.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="iconvconfig"><command>iconvconfig</command></term>
+<varlistentry id="iconvconfig">
+<term><command>iconvconfig</command></term>
<listitem>
<indexterm zone="ch-system-glibc iconvconfig"><primary sortas="b-iconvconfig">iconvconfig</primary></indexterm>
<para>creates fastloading iconv module configuration file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ldconfig"><command>ldconfig</command></term>
+<varlistentry id="ldconfig">
+<term><command>ldconfig</command></term>
<listitem>
<indexterm zone="ch-system-glibc ldconfig"><primary sortas="b-ldconfig">ldconfig</primary></indexterm>
<para>configures the dynamic linker runtime bindings.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ldd"><command>ldd</command></term>
+<varlistentry id="ldd">
+<term><command>ldd</command></term>
<listitem>
<indexterm zone="ch-system-glibc ldd"><primary sortas="b-ldd">ldd</primary></indexterm>
<para>reports which shared libraries are required
@@ -336,16 +338,16 @@ by each given program or shared library.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="lddlibc4"><command>lddlibc4</command></term>
+<varlistentry id="lddlibc4">
+<term><command>lddlibc4</command></term>
<listitem>
<indexterm zone="ch-system-glibc lddlibc4"><primary sortas="b-lddlibc4">lddlibc4</primary></indexterm>
<para>assists ldd with object files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="locale"><command>locale</command></term>
+<varlistentry id="locale">
+<term><command>locale</command></term>
<listitem>
<indexterm zone="ch-system-glibc locale"><primary sortas="b-locale">locale</primary></indexterm>
<para>is a Perl program that tells the compiler
@@ -353,24 +355,24 @@ to enable or disable the use of POSIX locales for built-in operations.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="localedef"><command>localedef</command></term>
+<varlistentry id="localedef">
+<term><command>localedef</command></term>
<listitem>
<indexterm zone="ch-system-glibc localedef"><primary sortas="b-localedef">localedef</primary></indexterm>
<para>compiles locale specifications.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mtrace"><command>mtrace</command></term>
+<varlistentry id="mtrace">
+<term><command>mtrace</command></term>
<listitem>
<indexterm zone="ch-system-glibc mtrace"><primary sortas="b-mtrace">mtrace</primary></indexterm>
<para>...</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="nscd"><command>nscd</command></term>
+<varlistentry id="nscd">
+<term><command>nscd</command></term>
<listitem>
<indexterm zone="ch-system-glibc nscd"><primary sortas="b-nscd">nscd</primary></indexterm>
<para>is a name service cache daemon providing a
@@ -378,24 +380,24 @@ cache for the most common name service requests.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="nscd_nischeck"><command>nscd_nischeck</command></term>
+<varlistentry id="nscd_nischeck">
+<term><command>nscd_nischeck</command></term>
<listitem>
<indexterm zone="ch-system-glibc nscd_nischeck"><primary sortas="b-nscd_nischeck">nscd_nischeck</primary></indexterm>
<para>checks whether or not secure mode is necessary for NIS+ lookup.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pcprofiledump"><command>pcprofiledump</command></term>
+<varlistentry id="pcprofiledump">
+<term><command>pcprofiledump</command></term>
<listitem>
<indexterm zone="ch-system-glibc pcprofiledump"><primary sortas="b-pcprofiledump">pcprofiledump</primary></indexterm>
<para>dumps information generated by PC profiling.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pt_chown"><command>pt_chown</command></term>
+<varlistentry id="pt_chown">
+<term><command>pt_chown</command></term>
<listitem>
<indexterm zone="ch-system-glibc pt_chown"><primary sortas="b-pt_chown">pt_chown</primary></indexterm>
<para>is a helper program for grantpt to set
@@ -403,24 +405,24 @@ the owner, group and access permissions of a slave pseudo terminal.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="rpcgen"><command>rpcgen</command></term>
+<varlistentry id="rpcgen">
+<term><command>rpcgen</command></term>
<listitem>
<indexterm zone="ch-system-glibc rpcgen"><primary sortas="b-rpcgen">rpcgen</primary></indexterm>
<para>generates C code to implement the RPC protocol.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="rpcinfo"><command>rpcinfo</command></term>
+<varlistentry id="rpcinfo">
+<term><command>rpcinfo</command></term>
<listitem>
<indexterm zone="ch-system-glibc rpcinfo"><primary sortas="b-rpcinfo">rpcinfo</primary></indexterm>
<para>makes an RPC call to an RPC server.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="sln"><command>sln</command></term>
+<varlistentry id="sln">
+<term><command>sln</command></term>
<listitem>
<indexterm zone="ch-system-glibc sln"><primary sortas="b-sln">sln</primary></indexterm>
<para>is used to make symbolic links. The program
@@ -429,16 +431,16 @@ libraries if the dynamic linking system for some reason is nonfunctional.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="sprof"><command>sprof</command></term>
+<varlistentry id="sprof">
+<term><command>sprof</command></term>
<listitem>
<indexterm zone="ch-system-glibc sprof"><primary sortas="b-sprof">sprof</primary></indexterm>
<para>reads and displays shared object profiling data.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tzselect"><command>tzselect</command></term>
+<varlistentry id="tzselect">
+<term><command>tzselect</command></term>
<listitem>
<indexterm zone="ch-system-glibc tzselect"><primary sortas="b-tzselect">tzselect</primary></indexterm>
<para>asks the user about the location of the
@@ -446,8 +448,8 @@ system and reports the corresponding time zone description.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="xtrace"><command>xtrace</command></term>
+<varlistentry id="xtrace">
+<term><command>xtrace</command></term>
<listitem>
<indexterm zone="ch-system-glibc xtrace"><primary sortas="b-xtrace">xtrace</primary></indexterm>
<para>traces the execution of a program by
@@ -455,56 +457,56 @@ printing the currently executed function.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="zdump"><command>zdump</command></term>
+<varlistentry id="zdump">
+<term><command>zdump</command></term>
<listitem>
<indexterm zone="ch-system-glibc zdump"><primary sortas="b-zdump">zdump</primary></indexterm>
<para>is the time zone dumper.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="zic"><command>zic</command></term>
+<varlistentry id="zic">
+<term><command>zic</command></term>
<listitem>
<indexterm zone="ch-system-glibc zic"><primary sortas="b-zic">zic</primary></indexterm>
<para>is the time zone compiler.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ld.so"><command>ld.so</command></term>
+<varlistentry id="ld.so">
+<term><command>ld.so</command></term>
<listitem>
<indexterm zone="ch-system-glibc ld.so"><primary sortas="c-ld.so">ld.so</primary></indexterm>
<para>is the helper program for shared library executables.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libBrokenLocale"><command>libBrokenLocale</command></term>
+<varlistentry id="libBrokenLocale">
+<term><command>libBrokenLocale</command></term>
<listitem>
<indexterm zone="ch-system-glibc libBrokenLocale"><primary sortas="c-libBrokenLocale">libBrokenLocale</primary></indexterm>
<para>is used by programs, such as Mozilla, to solve broken locales.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libSegFault"><command>libSegFault</command></term>
+<varlistentry id="libSegFault">
+<term><command>libSegFault</command></term>
<listitem>
<indexterm zone="ch-system-glibc libSegFault"><primary sortas="c-libSegFault">libSegFault</primary></indexterm>
<para>is a segmentation fault signal handler. It tries to catch segfaults.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libanl"><command>libanl</command></term>
+<varlistentry id="libanl">
+<term><command>libanl</command></term>
<listitem>
<indexterm zone="ch-system-glibc libanl"><primary sortas="c-libanl">libanl</primary></indexterm>
<para>is an asynchronous name lookup library.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libbsd-compat"><command>libbsd-compat</command></term>
+<varlistentry id="libbsd-compat">
+<term><command>libbsd-compat</command></term>
<listitem>
<indexterm zone="ch-system-glibc libbsd-compat"><primary sortas="c-libbsd-compat">libbsd-compat</primary></indexterm>
<para>provides the portability needed
@@ -512,64 +514,64 @@ in order to run certain BSD programs under Linux.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libc"><command>libc</command></term>
+<varlistentry id="libc">
+<term><command>libc</command></term>
<listitem>
<indexterm zone="ch-system-glibc libc"><primary sortas="c-libc">libc</primary></indexterm>
<para>is the main C library -- a collection of commonly used functions.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libcrypt"><command>libcrypt</command></term>
+<varlistentry id="libcrypt">
+<term><command>libcrypt</command></term>
<listitem>
<indexterm zone="ch-system-glibc libcrypt"><primary sortas="c-libcrypt">libcrypt</primary></indexterm>
<para>is the cryptography library.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libdl"><command>libdl</command></term>
+<varlistentry id="libdl">
+<term><command>libdl</command></term>
<listitem>
<indexterm zone="ch-system-glibc libdl"><primary sortas="c-libdl">libdl</primary></indexterm>
<para>is the dynamic linking interface library.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libg"><command>libg</command></term>
+<varlistentry id="libg">
+<term><command>libg</command></term>
<listitem>
<indexterm zone="ch-system-glibc libg"><primary sortas="c-libg">libg</primary></indexterm>
<para>is a runtime library for g++.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libieee"><command>libieee</command></term>
+<varlistentry id="libieee">
+<term><command>libieee</command></term>
<listitem>
<indexterm zone="ch-system-glibc libieee"><primary sortas="c-libieee">libieee</primary></indexterm>
<para>is the IEEE floating point library.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libm"><command>libm</command></term>
+<varlistentry id="libm">
+<term><command>libm</command></term>
<listitem>
<indexterm zone="ch-system-glibc libm"><primary sortas="c-libm">libm</primary></indexterm>
<para>is the mathematical library.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libmcheck"><command>libmcheck</command></term>
+<varlistentry id="libmcheck">
+<term><command>libmcheck</command></term>
<listitem>
<indexterm zone="ch-system-glibc libmcheck"><primary sortas="c-libmcheck">libmcheck</primary></indexterm>
<para>contains code run at boot.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libmemusage"><command>libmemusage</command></term>
+<varlistentry id="libmemusage">
+<term><command>libmemusage</command></term>
<listitem>
<indexterm zone="ch-system-glibc libmemusage"><primary sortas="c-libmemusage">libmemusage</primary></indexterm>
<para>is used by memusage to help collect
@@ -577,16 +579,16 @@ information about the memory usage of a program.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libnsl"><command>libnsl</command></term>
+<varlistentry id="libnsl">
+<term><command>libnsl</command></term>
<listitem>
<indexterm zone="ch-system-glibc libnsl"><primary sortas="c-libnsl">libnsl</primary></indexterm>
<para>is the network services library.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libnss"><command>libnss*</command></term>
+<varlistentry id="libnss">
+<term><command>libnss*</command></term>
<listitem>
<indexterm zone="ch-system-glibc libnss"><primary sortas="c-libnss*">libnss*</primary></indexterm>
<para>are the Name Service Switch libraries,
@@ -595,8 +597,8 @@ aliases, services, protocols,and the like.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libpcprofile"><command>libpcprofile</command></term>
+<varlistentry id="libpcprofile">
+<term><command>libpcprofile</command></term>
<listitem>
<indexterm zone="ch-system-glibc libpcprofile"><primary sortas="c-libpcprofile">libpcprofile</primary></indexterm>
<para>contains profiling functions used
@@ -604,16 +606,16 @@ to track the amount of CPU time spent in which source code lines.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libpthread"><command>libpthread</command></term>
+<varlistentry id="libpthread">
+<term><command>libpthread</command></term>
<listitem>
<indexterm zone="ch-system-glibc libpthread"><primary sortas="c-libpthread">libpthread</primary></indexterm>
<para>is the POSIX threads library.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libresolv"><command>libresolv</command></term>
+<varlistentry id="libresolv">
+<term><command>libresolv</command></term>
<listitem>
<indexterm zone="ch-system-glibc libresolv"><primary sortas="c-libresolv">libresolv</primary></indexterm>
<para>contains functions for creating,
@@ -621,16 +623,16 @@ sending, and interpreting packets to the Internet domain name servers.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="librpcsvc"><command>librpcsvc</command></term>
+<varlistentry id="librpcsvc">
+<term><command>librpcsvc</command></term>
<listitem>
<indexterm zone="ch-system-glibc librpcsvc"><primary sortas="c-librpcsvc">librpcsvc</primary></indexterm>
<para>contains functions providing miscellaneous RPC services.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="librt"><command>librt</command></term>
+<varlistentry id="librt">
+<term><command>librt</command></term>
<listitem>
<indexterm zone="ch-system-glibc librt"><primary sortas="c-librt">librt</primary></indexterm>
<para>contains functions providing most of the
@@ -638,8 +640,8 @@ interfaces specified by the POSIX.1b Realtime Extension.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libthread_db"><command>libthread_db</command></term>
+<varlistentry id="libthread_db">
+<term><command>libthread_db</command></term>
<listitem>
<indexterm zone="ch-system-glibc libthread_db"><primary sortas="c-libthread_db">libthread_db</primary></indexterm>
<para>contains functions useful for
@@ -647,8 +649,8 @@ building debuggers for multi-threaded programs.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libutil"><command>libutil</command></term>
+<varlistentry id="libutil">
+<term><command>libutil</command></term>
<listitem>
<indexterm zone="ch-system-glibc libutil"><primary sortas="c-libutil">libutil</primary></indexterm>
<para>contains code for "standard" functions used in many different Unix utilities.</para>
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index 1726965b7..b4fb3ac27 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -55,24 +55,24 @@ Diffutils, GCC, Gettext, Glibc, Make, Sed, Texinfo</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="egrep"><command>egrep</command></term>
+<varlistentry id="egrep">
+<term><command>egrep</command></term>
<listitem>
<indexterm zone="ch-system-grep egrep"><primary sortas="b-egrep">egrep</primary></indexterm>
<para>prints lines matching an extended regular expression.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="fgrep"><command>fgrep</command></term>
+<varlistentry id="fgrep">
+<term><command>fgrep</command></term>
<listitem>
<indexterm zone="ch-system-grep fgrep"><primary sortas="b-fgrep">fgrep</primary></indexterm>
<para>prints lines matching a list of fixed strings.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="grep"><command>grep</command></term>
+<varlistentry id="grep">
+<term><command>grep</command></term>
<listitem>
<indexterm zone="ch-system-grep grep"><primary sortas="b-grep">grep</primary></indexterm>
<para>prints lines matching a basic regular expression.</para>
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index f580255ba..65c58de60 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -59,16 +59,16 @@ ln -s tbl /usr/bin/gtbl</userinput></screen>
<segmentedlist>
<segtitle>Installed programs</segtitle>
-<seglistitem><seg>addftinfo, afmtodit, eqn, eqn2graph, geqn (link to eqn), grn,
-grodvi, groff, groffer, grog, grolbp, grolj4, grops, grotty, gtbl (link to tbl), hpftodit,
+<seglistitem><seg>addftinfo, afmtodit, eqn, eqn2graph, geqn (link to eqn), grn,
+grodvi, groff, groffer, grog, grolbp, grolj4, grops, grotty, gtbl (link to tbl), hpftodit,
indxbib, lkbib, lookbib, mmroff, neqn, nroff, pfbtops, pic, pic2graph, post-grohtml,
pre-grohtml, refer, soelim, tbl, tfmtodit, troff and zsoelim (link to soelim)</seg></seglistitem>
</segmentedlist>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="addftinfo"><command>addftinfo</command></term>
+<varlistentry id="addftinfo">
+<term><command>addftinfo</command></term>
<listitem>
<indexterm zone="ch-system-groff addftinfo"><primary sortas="b-addftinfo">addftinfo</primary></indexterm>
<para>reads a troff font file and adds some
@@ -76,16 +76,16 @@ additional font-metric information that is used by the groff system.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="afmtodit"><command>afmtodit</command></term>
+<varlistentry id="afmtodit">
+<term><command>afmtodit</command></term>
<listitem>
<indexterm zone="ch-system-groff afmtodit"><primary sortas="b-afmtodit">afmtodit</primary></indexterm>
<para>creates a font file for use with groff and grops.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="eqn"><command>eqn</command></term>
+<varlistentry id="eqn">
+<term><command>eqn</command></term>
<listitem>
<indexterm zone="ch-system-groff eqn"><primary sortas="b-eqn">eqn</primary></indexterm>
<para>compiles descriptions of equations embedded
@@ -93,32 +93,32 @@ within troff input files into commands that are understood by troff.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="eqn2graph"><command>eqn2graph</command></term>
+<varlistentry id="eqn2graph">
+<term><command>eqn2graph</command></term>
<listitem>
<indexterm zone="ch-system-groff eqn2graph"><primary sortas="b-eqn2graph">eqn2graph</primary></indexterm>
<para>converts an EQN equation into a cropped image.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="grn"><command>grn</command></term>
+<varlistentry id="grn">
+<term><command>grn</command></term>
<listitem>
<indexterm zone="ch-system-groff grn"><primary sortas="b-grn">grn</primary></indexterm>
<para>is a groff preprocessor for gremlin files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="grodvi"><command>grodvi</command></term>
+<varlistentry id="grodvi">
+<term><command>grodvi</command></term>
<listitem>
<indexterm zone="ch-system-groff grodvi"><primary sortas="b-grodvi">grodvi</primary></indexterm>
<para>is a driver for groff that produces TeX dvi format.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="groff"><command>groff</command></term>
+<varlistentry id="groff">
+<term><command>groff</command></term>
<listitem>
<indexterm zone="ch-system-groff groff"><primary sortas="b-groff">groff</primary></indexterm>
<para>is a front-end to the groff document
@@ -127,16 +127,16 @@ appropriate for the selected device.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="groffer"><command>groffer</command></term>
+<varlistentry id="groffer">
+<term><command>groffer</command></term>
<listitem>
<indexterm zone="ch-system-groff groffer"><primary sortas="b-groffer">groffer</primary></indexterm>
<para>displays groff files and man pages on X and tty terminals.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="grog"><command>grog</command></term>
+<varlistentry id="grog">
+<term><command>grog</command></term>
<listitem>
<indexterm zone="ch-system-groff grog"><primary sortas="b-grog">grog</primary></indexterm>
<para>reads files and guesses which of the groff
@@ -145,8 +145,8 @@ files, and reports the groff command including those options.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="grolbp"><command>grolbp</command></term>
+<varlistentry id="grolbp">
+<term><command>grolbp</command></term>
<listitem>
<indexterm zone="ch-system-groff grolbp"><primary sortas="b-grolbp">grolbp</primary></indexterm>
<para>is a groff driver for Canon CAPSL printers
@@ -154,8 +154,8 @@ files, and reports the groff command including those options.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="grolj4"><command>grolj4</command></term>
+<varlistentry id="grolj4">
+<term><command>grolj4</command></term>
<listitem>
<indexterm zone="ch-system-groff grolj4"><primary sortas="b-grolj4">grolj4</primary></indexterm>
<para>is a driver for groff that produces output
@@ -163,16 +163,16 @@ in PCL5 format suitable for an HP Laserjet 4 printer.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="grops"><command>grops</command></term>
+<varlistentry id="grops">
+<term><command>grops</command></term>
<listitem>
<indexterm zone="ch-system-groff grops"><primary sortas="b-grops">grops</primary></indexterm>
<para>translates the output of GNU troff to Postscript.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="grotty"><command>grotty</command></term>
+<varlistentry id="grotty">
+<term><command>grotty</command></term>
<listitem>
<indexterm zone="ch-system-groff grotty"><primary sortas="b-grotty">grotty</primary></indexterm>
<para>translates the output of GNU troff into
@@ -180,16 +180,16 @@ a form suitable for typewriter-like devices.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="gtbl"><command>gtbl</command></term>
+<varlistentry id="gtbl">
+<term><command>gtbl</command></term>
<listitem>
<indexterm zone="ch-system-groff gtbl"><primary sortas="b-gtbl">gtbl</primary></indexterm>
<para>is the GNU implementation of tbl.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="hpftodit"><command>hpftodit</command></term>
+<varlistentry id="hpftodit">
+<term><command>hpftodit</command></term>
<listitem>
<indexterm zone="ch-system-groff hpftodit"><primary sortas="b-hpftodit">hpftodit</primary></indexterm>
<para>creates a font file for use with
@@ -197,8 +197,8 @@ groff -Tlj4 from an HP-tagged font metric file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="indxbib"><command>indxbib</command></term>
+<varlistentry id="indxbib">
+<term><command>indxbib</command></term>
<listitem>
<indexterm zone="ch-system-groff indxbib"><primary sortas="b-indxbib">indxbib</primary></indexterm>
<para>makes an inverted index for the bibliographic databases a specified file for
@@ -206,8 +206,8 @@ use with refer, lookbib, and lkbib.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="lkbib"><command>lkbib</command></term>
+<varlistentry id="lkbib">
+<term><command>lkbib</command></term>
<listitem>
<indexterm zone="ch-system-groff lkbib"><primary sortas="b-lkbib">lkbib</primary></indexterm>
<para>searches bibliographic databases for
@@ -215,8 +215,8 @@ references that contain specified keys and reports any references found.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="lookbib"><command>lookbib</command></term>
+<varlistentry id="lookbib">
+<term><command>lookbib</command></term>
<listitem>
<indexterm zone="ch-system-groff lookbib"><primary sortas="b-lookbib">lookbib</primary></indexterm>
<para>prints a prompt on the standard error
@@ -228,16 +228,16 @@ end of input.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mmroff"><command>mmroff</command></term>
+<varlistentry id="mmroff">
+<term><command>mmroff</command></term>
<listitem>
<indexterm zone="ch-system-groff mmroff"><primary sortas="b-mmroff">mmroff</primary></indexterm>
<para>is a simple preprocessor for groff.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="neqn"><command>neqn</command></term>
+<varlistentry id="neqn">
+<term><command>neqn</command></term>
<listitem>
<indexterm zone="ch-system-groff neqn"><primary sortas="b-neqn">neqn</primary></indexterm>
<para>formats equations for ASCII (American Standard Code for Information
@@ -245,24 +245,24 @@ Interchange) output.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="nroff"><command>nroff</command></term>
+<varlistentry id="nroff">
+<term><command>nroff</command></term>
<listitem>
<indexterm zone="ch-system-groff nroff"><primary sortas="b-nroff">nroff</primary></indexterm>
<para>is a script that emulates the nroff command using groff.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pfbtops"><command>pfbtops</command></term>
+<varlistentry id="pfbtops">
+<term><command>pfbtops</command></term>
<listitem>
<indexterm zone="ch-system-groff pfbtops"><primary sortas="b-pfbtops">pfbtops</primary></indexterm>
<para>translates a Postscript font in .pfb format to ASCII.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pic"><command>pic</command></term>
+<varlistentry id="pic">
+<term><command>pic</command></term>
<listitem>
<indexterm zone="ch-system-groff pic"><primary sortas="b-pic">pic</primary></indexterm>
<para>compiles descriptions of pictures embedded
@@ -270,32 +270,32 @@ within troff or TeX input files into commands understood by TeX or troff.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pic2graph"><command>pic2graph</command></term>
+<varlistentry id="pic2graph">
+<term><command>pic2graph</command></term>
<listitem>
<indexterm zone="ch-system-groff pic2graph"><primary sortas="b-pic2graph">pic2graph</primary></indexterm>
<para>converts a PIC diagram into a cropped image.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pre-grohtml"><command>pre-grohtml </command></term>
+<varlistentry id="pre-grohtml">
+<term><command>pre-grohtml </command></term>
<listitem>
<indexterm zone="ch-system-groff pre-grohtml"><primary sortas="b-pre-grohtml">pre-grohtml</primary></indexterm>
<para>translates the output of GNU troff to html.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="post-grohtml"><command>post-grohtml</command></term>
+<varlistentry id="post-grohtml">
+<term><command>post-grohtml</command></term>
<listitem>
<indexterm zone="ch-system-groff post-grohtml"><primary sortas="b-post-grohtml">post-grohtml</primary></indexterm>
<para>translates the output of GNU troff to html.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="refer"><command>refer</command></term>
+<varlistentry id="refer">
+<term><command>refer</command></term>
<listitem>
<indexterm zone="ch-system-groff refer"><primary sortas="b-refer">refer</primary></indexterm>
<para>copies the contents of a file to the
@@ -305,8 +305,8 @@ how citations are to be processed.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="soelim"><command>soelim</command></term>
+<varlistentry id="soelim">
+<term><command>soelim</command></term>
<listitem>
<indexterm zone="ch-system-groff soelim"><primary sortas="b-soelim">soelim</primary></indexterm>
<para>reads files and replaces lines of the form
@@ -315,8 +315,8 @@ how citations are to be processed.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tbl"><command>tbl</command></term>
+<varlistentry id="tbl">
+<term><command>tbl</command></term>
<listitem>
<indexterm zone="ch-system-groff tbl"><primary sortas="b-tbl">tbl</primary></indexterm>
<para>compiles descriptions of tables embedded
@@ -324,16 +324,16 @@ within troff input files into commands that are understood by troff.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tfmtodit"><command>tfmtodit</command></term>
+<varlistentry id="tfmtodit">
+<term><command>tfmtodit</command></term>
<listitem>
<indexterm zone="ch-system-groff tfmtodit"><primary sortas="b-tfmtodit">tfmtodit</primary></indexterm>
<para>creates a font file for use with groff -Tdvi.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="troff"><command>troff</command></term>
+<varlistentry id="troff">
+<term><command>troff</command></term>
<listitem>
<indexterm zone="ch-system-groff troff"><primary sortas="b-troff">troff</primary></indexterm>
<para>is highly compatible with Unix troff. Usually it should be invoked using the
@@ -342,8 +342,8 @@ appropriate order and with the appropriate options.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="zsoelim"><command>zsoelim</command></term>
+<varlistentry id="zsoelim">
+<term><command>zsoelim</command></term>
<listitem>
<indexterm zone="ch-system-groff zsoelim"><primary sortas="b-zsoelim">zsoelim</primary></indexterm>
<para>is the GNU implementation of soelim.</para>
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index 1c15a15cb..6b23a5cd5 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -80,32 +80,32 @@ grub-md5-crypt, grub-terminfo and mbchk</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="grub"><command>grub</command></term>
+<varlistentry id="grub">
+<term><command>grub</command></term>
<listitem>
<indexterm zone="ch-system-grub grub"><primary sortas="b-grub">grub</primary></indexterm>
<para>is the GRand Unified Bootloader's command shell.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="grub-install"><command>grub-install</command></term>
+<varlistentry id="grub-install">
+<term><command>grub-install</command></term>
<listitem>
<indexterm zone="ch-system-grub grub-install"><primary sortas="b-grub-install">grub-install</primary></indexterm>
<para>installs GRUB on the given device.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="grub-md5-crypt"><command>grub-md5-crypt</command></term>
+<varlistentry id="grub-md5-crypt">
+<term><command>grub-md5-crypt</command></term>
<listitem>
<indexterm zone="ch-system-grub grub-md5-crypt"><primary sortas="b-grub-md5-crypt">grub-md5-crypt</primary></indexterm>
<para>encrypts a password in MD5 format.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="grub-terminfo"><command>grub-terminfo</command></term>
+<varlistentry id="grub-terminfo">
+<term><command>grub-terminfo</command></term>
<listitem>
<indexterm zone="ch-system-grub grub-terminfo"><primary sortas="b-grub-terminfo">grub-terminfo</primary></indexterm>
<para>generates a terminfo command from a
@@ -113,8 +113,8 @@ terminfo name. It can be used if you have an uncommon terminal.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mbchk"><command>mbchk</command></term>
+<varlistentry id="mbchk">
+<term><command>mbchk</command></term>
<listitem>
<indexterm zone="ch-system-grub mbchk"><primary sortas="b-mbchk">mbchk</primary></indexterm>
<para>checks the format of a multi-boot kernel.</para>
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 65791d2b7..4804b48ad 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -70,72 +70,72 @@ zegrep, zfgrep, zforce, zgrep, zless, zmore and znew</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="gunzip"><command>gunzip</command></term>
+<varlistentry id="gunzip">
+<term><command>gunzip</command></term>
<listitem>
<indexterm zone="ch-system-gzip gunzip"><primary sortas="b-gunzip">gunzip</primary></indexterm>
<para>decompresses gzipped files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="gzexe"><command>gzexe</command></term>
+<varlistentry id="gzexe">
+<term><command>gzexe</command></term>
<listitem>
<indexterm zone="ch-system-gzip gzexe"><primary sortas="b-gzexe">gzexe</primary></indexterm>
<para>is used to create self-uncompressing executable files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="gzip"><command>gzip</command></term>
+<varlistentry id="gzip">
+<term><command>gzip</command></term>
<listitem>
<indexterm zone="ch-system-gzip gzip"><primary sortas="b-gzip">gzip</primary></indexterm>
<para>compresses the given files, using Lempel-Ziv (LZ77) coding.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="zcat"><command>zcat</command></term>
+<varlistentry id="zcat">
+<term><command>zcat</command></term>
<listitem>
<indexterm zone="ch-system-gzip zcat"><primary sortas="b-zcat">zcat</primary></indexterm>
<para>uncompresses the given gzipped files to standard output.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="zcmp"><command>zcmp</command></term>
+<varlistentry id="zcmp">
+<term><command>zcmp</command></term>
<listitem>
<indexterm zone="ch-system-gzip zcmp"><primary sortas="b-zcmp">zcmp</primary></indexterm>
<para>runs cmp on gzipped files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="zdiff"><command>zdiff</command></term>
+<varlistentry id="zdiff">
+<term><command>zdiff</command></term>
<listitem>
<indexterm zone="ch-system-gzip zdiff"><primary sortas="b-zdiff">zdiff</primary></indexterm>
<para>runs diff on gzipped files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="zegrep"><command>zegrep</command></term>
+<varlistentry id="zegrep">
+<term><command>zegrep</command></term>
<listitem>
<indexterm zone="ch-system-gzip zegrep"><primary sortas="b-zegrep">zegrep</primary></indexterm>
<para>runs egrep on gzipped files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="zfgrep"><command>zfgrep</command></term>
+<varlistentry id="zfgrep">
+<term><command>zfgrep</command></term>
<listitem>
<indexterm zone="ch-system-gzip zfgrep"><primary sortas="b-zfgrep">zfgrep</primary></indexterm>
<para>runs fgrep on gzipped files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="zforce"><command>zforce</command></term>
+<varlistentry id="zforce">
+<term><command>zforce</command></term>
<listitem>
<indexterm zone="ch-system-gzip zforce"><primary sortas="b-zforce">zforce</primary></indexterm>
<para>forces a .gz extension on all given files
@@ -144,32 +144,32 @@ useful when file names were truncated during a file transfer.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="zgrep"><command>zgrep</command></term>
+<varlistentry id="zgrep">
+<term><command>zgrep</command></term>
<listitem>
<indexterm zone="ch-system-gzip zgrep"><primary sortas="b-zgrep">zgrep</primary></indexterm>
<para>runs grep on gzipped files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="zless"><command>zless</command></term>
+<varlistentry id="zless">
+<term><command>zless</command></term>
<listitem>
<indexterm zone="ch-system-gzip zless"><primary sortas="b-zless">zless</primary></indexterm>
<para>runs less on gzipped files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="zmore"><command>zmore</command></term>
+<varlistentry id="zmore">
+<term><command>zmore</command></term>
<listitem>
<indexterm zone="ch-system-gzip zmore"><primary sortas="b-zmore">zmore</primary></indexterm>
<para>runs more on gzipped files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="znew"><command>znew</command></term>
+<varlistentry id="znew">
+<term><command>znew</command></term>
<listitem>
<indexterm zone="ch-system-gzip znew"><primary sortas="b-znew">znew</primary></indexterm>
<para>re-compresses files from compress format to gzip format -- .Z to .gz.</para>
diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml
index e0a87e584..498666a0f 100644
--- a/chapter06/hotplug.xml
+++ b/chapter06/hotplug.xml
@@ -89,8 +89,8 @@ corresponding modules themselves.</para>
<sect2 id="contents-hotplug" role="content"><title>Contents of Hotplug</title>
<variablelist>
-<varlistentry>
-<term id="hotplug"><command>/sbin/hotplug</command></term>
+<varlistentry id="hotplug">
+<term><command>/sbin/hotplug</command></term>
<listitem>
<indexterm zone="ch-system-hotplug hotplug"><primary
sortas="b-hotplug">hotplug</primary></indexterm>
@@ -99,8 +99,8 @@ changes in its internal state (e.g. a new device is added or removed).</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="hotplug-rc"><command>*.rc</command> files in
+<varlistentry id="hotplug-rc">
+<term><command>*.rc</command> files in
<filename class="directory">/etc/hotplug</filename> directory</term>
<listitem>
<para>These scripts are used for cold plugging, i.e. detection and other
@@ -114,8 +114,8 @@ them into the running kernel.
</listitem>
</varlistentry>
-<varlistentry>
-<term id="hotplug-agent"><command>*.agent</command> files in
+<varlistentry id="hotplug-agent">
+<term><command>*.agent</command> files in
<filename class="directory">/etc/hotplug</filename> directory</term>
<listitem>
<para>These scripts are called by <command>/sbin/hotplug</command>
@@ -126,8 +126,8 @@ scripts, if any.
</listitem>
</varlistentry>
-<varlistentry>
-<term id="hotplug-functions"><filename>/etc/hotplug/hotplug.functions</filename></term>
+<varlistentry id="hotplug-functions">
+<term><filename>/etc/hotplug/hotplug.functions</filename></term>
<listitem>
<para>This file contains common functions used by other scripts in hotplug
package.
@@ -135,8 +135,8 @@ package.
</listitem>
</varlistentry>
-<varlistentry>
-<term id="hotplug-blacklist"><filename>/etc/hotplug/blacklist</filename></term>
+<varlistentry id="hotplug-blacklist">
+<term><filename>/etc/hotplug/blacklist</filename></term>
<listitem>
<indexterm zone="ch-system-hotplug hotplug-blacklist"><primary
sortas="e-/etc/hotplug/blacklist">/etc/hotplug/blacklist</primary></indexterm>
@@ -146,8 +146,8 @@ inserted into the kernel by hotplug scripts.
</listitem>
</varlistentry>
-<varlistentry>
-<term id="hotplug-subdirs"><filename class="directory">/etc/hotplug/{pci,usb}</filename></term>
+<varlistentry id="hotplug-subdirs">
+<term><filename class="directory">/etc/hotplug/{pci,usb}</filename></term>
<listitem>
<para>These directories are supposed to contain user-written handlers for
hotplug events.
@@ -155,8 +155,8 @@ hotplug events.
</listitem>
</varlistentry>
-<varlistentry>
-<term id="hotplug-usb.usermap"><filename>/etc/hotplug/usb.usermap</filename></term>
+<varlistentry id="hotplug-usb.usermap">
+<term><filename>/etc/hotplug/usb.usermap</filename></term>
<listitem>
<indexterm zone="ch-system-hotplug hotplug-usb.usermap"><primary
sortas="e-/etc/hotplug/usb.usermap">/etc/hotplug/usb.usermap</primary></indexterm>
@@ -166,8 +166,8 @@ call for each USB device, based on its vendor, id and other attributes.
</listitem>
</varlistentry>
-<varlistentry>
-<term id="hotplug-hotplug.d"><filename class="directory">/etc/hotplug.d</filename></term>
+<varlistentry id="hotplug-hotplug.d">
+<term><filename class="directory">/etc/hotplug.d</filename></term>
<listitem>
<para>This directory contains programs (or symlinks to them)
that are interested in receiving all hotplug events. E.g.,
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 96604857b..cd9914cff 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -108,64 +108,64 @@ place:</para>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="ftp"><command>ftp</command></term>
+<varlistentry id="ftp">
+<term><command>ftp</command></term>
<listitem>
<indexterm zone="ch-system-inetutils ftp"><primary sortas="b-ftp">ftp</primary></indexterm>
<para>is the ARPANET file transfer program.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ping"><command>ping</command></term>
+<varlistentry id="ping">
+<term><command>ping</command></term>
<listitem>
<indexterm zone="ch-system-inetutils ping"><primary sortas="b-ping">ping</primary></indexterm>
<para>sends echo-request packets and reports how long the replies take.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="rcp"><command>rcp</command></term>
+<varlistentry id="rcp">
+<term><command>rcp</command></term>
<listitem>
<indexterm zone="ch-system-inetutils rcp"><primary sortas="b-rcp">rcp</primary></indexterm>
<para>does remote file copy.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="rlogin"><command>rlogin</command></term>
+<varlistentry id="rlogin">
+<term><command>rlogin</command></term>
<listitem>
<indexterm zone="ch-system-inetutils rlogin"><primary sortas="b-rlogin">rlogin</primary></indexterm>
<para>does remote login.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="rsh"><command>rsh</command></term>
+<varlistentry id="rsh">
+<term><command>rsh</command></term>
<listitem>
<indexterm zone="ch-system-inetutils rsh"><primary sortas="b-rsh">rsh</primary></indexterm>
<para>runs a remote shell.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="talk"><command>talk</command></term>
+<varlistentry id="talk">
+<term><command>talk</command></term>
<listitem>
<indexterm zone="ch-system-inetutils talk"><primary sortas="b-talk">talk</primary></indexterm>
<para>is used to chat up another user.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="telnet"><command>telnet</command></term>
+<varlistentry id="telnet">
+<term><command>telnet</command></term>
<listitem>
<indexterm zone="ch-system-inetutils telnet"><primary sortas="b-telnet">telnet</primary></indexterm>
<para>is an interface to the TELNET protocol.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tftp"><command>tftp</command></term>
+<varlistentry id="tftp">
+<term><command>tftp</command></term>
<listitem>
<indexterm zone="ch-system-inetutils tftp"><primary sortas="b-tftp">tftp</primary></indexterm>
<para>is a trivial file transfer program.</para>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index e89b203d9..7529ff3ca 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -59,88 +59,88 @@ showconsolefont, showkey, unicode_start and unicode_stop</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="chvt"><command>chvt</command></term>
+<varlistentry id="chvt">
+<term><command>chvt</command></term>
<listitem>
<indexterm zone="ch-system-kbd chvt"><primary sortas="b-chvt">chvt</primary></indexterm>
<para>changes the foreground virtual terminal.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="deallocvt"><command>deallocvt</command></term>
+<varlistentry id="deallocvt">
+<term><command>deallocvt</command></term>
<listitem>
<indexterm zone="ch-system-kbd deallocvt"><primary sortas="b-deallocvt">deallocvt</primary></indexterm>
<para>deallocates unused virtual terminals.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="dumpkeys"><command>dumpkeys</command></term>
+<varlistentry id="dumpkeys">
+<term><command>dumpkeys</command></term>
<listitem>
<indexterm zone="ch-system-kbd dumpkeys"><primary sortas="b-dumpkeys">dumpkeys</primary></indexterm>
<para>dumps the keyboard translation tables.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="fgconsole"><command>fgconsole</command></term>
+<varlistentry id="fgconsole">
+<term><command>fgconsole</command></term>
<listitem>
<indexterm zone="ch-system-kbd fgconsole"><primary sortas="b-fgconsole">fgconsole</primary></indexterm>
<para>prints the number of the active virtual terminal.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="getkeycodes"><command>getkeycodes</command></term>
+<varlistentry id="getkeycodes">
+<term><command>getkeycodes</command></term>
<listitem>
<indexterm zone="ch-system-kbd getkeycodes"><primary sortas="b-getkeycodes">getkeycodes</primary></indexterm>
<para>prints the kernel scancode-to-keycode mapping table.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="getunimap"><command>getunimap</command></term>
+<varlistentry id="getunimap">
+<term><command>getunimap</command></term>
<listitem>
<indexterm zone="ch-system-kbd getunimap"><primary sortas="b-getunimap">getunimap</primary></indexterm>
<para>prints the currently used unimap.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="kbd_mode"><command>kbd_mode</command></term>
+<varlistentry id="kbd_mode">
+<term><command>kbd_mode</command></term>
<listitem>
<indexterm zone="ch-system-kbd kbd_mode"><primary sortas="b-kbd_mode">kbd_mode</primary></indexterm>
<para>reports or sets the keyboard mode.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="kbdrate"><command>kbdrate</command></term>
+<varlistentry id="kbdrate">
+<term><command>kbdrate</command></term>
<listitem>
<indexterm zone="ch-system-kbd kbdrate"><primary sortas="b-kbdrate">kbdrate</primary></indexterm>
<para>sets the keyboard repeat and delay rates.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="loadkeys"><command>loadkeys</command></term>
+<varlistentry id="loadkeys">
+<term><command>loadkeys</command></term>
<listitem>
<indexterm zone="ch-system-kbd loadkeys"><primary sortas="b-loadkeys">loadkeys</primary></indexterm>
<para>loads the keyboard translation tables.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="loadunimap"><command>loadunimap</command></term>
+<varlistentry id="loadunimap">
+<term><command>loadunimap</command></term>
<listitem>
<indexterm zone="ch-system-kbd loadunimap"><primary sortas="b-loadunimap">loadunimap</primary></indexterm>
<para>loads the kernel unicode-to-font mapping table.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mapscrn"><command>mapscrn</command></term>
+<varlistentry id="mapscrn">
+<term><command>mapscrn</command></term>
<listitem>
<indexterm zone="ch-system-kbd mapscrn"><primary sortas="b-mapscrn">mapscrn</primary></indexterm>
<para>is an obsolete program that used to load
@@ -149,40 +149,40 @@ now done by setfont.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="openvt"><command>openvt</command></term>
+<varlistentry id="openvt">
+<term><command>openvt</command></term>
<listitem>
<indexterm zone="ch-system-kbd openvt"><primary sortas="b-openvt">openvt</primary></indexterm>
<para>starts a program on a new virtual terminal (VT).</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="psf"><command>psf*</command></term>
+<varlistentry id="psf">
+<term><command>psf*</command></term>
<listitem>
<indexterm zone="ch-system-kbd psf"><primary sortas="b-psf*">psf*</primary></indexterm>
<para>are a set of tools for handling Unicode character tables for console fonts.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="resizecons"><command>resizecons</command></term>
+<varlistentry id="resizecons">
+<term><command>resizecons</command></term>
<listitem>
<indexterm zone="ch-system-kbd resizecons"><primary sortas="b-resizecons">resizecons</primary></indexterm>
<para>changes the kernel idea of the console size.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="setfont"><command>setfont</command></term>
+<varlistentry id="setfont">
+<term><command>setfont</command></term>
<listitem>
<indexterm zone="ch-system-kbd setfont"><primary sortas="b-setfont">setfont</primary></indexterm>
<para>lets you change the EGA/VGA fonts on the console.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="setkeycodes"><command>setkeycodes</command></term>
+<varlistentry id="setkeycodes">
+<term><command>setkeycodes</command></term>
<listitem>
<indexterm zone="ch-system-kbd setkeycodes"><primary sortas="b-setkeycodes">setkeycodes</primary></indexterm>
<para>loads kernel scancode-to-keycode
@@ -190,8 +190,8 @@ mapping table entries, useful if you have some unusual keys on your keyboard.</p
</listitem>
</varlistentry>
-<varlistentry>
-<term id="setleds"><command>setleds</command></term>
+<varlistentry id="setleds">
+<term><command>setleds</command></term>
<listitem>
<indexterm zone="ch-system-kbd setleds"><primary sortas="b-setleds">setleds</primary></indexterm>
<para>sets the keyboard flags and LEDs. Many
@@ -199,24 +199,24 @@ people find it useful to have "Num Lock" on by default, setleds +num achieves th
</listitem>
</varlistentry>
-<varlistentry>
-<term id="setlogcons"><command>setlogcons</command></term>
+<varlistentry id="setlogcons">
+<term><command>setlogcons</command></term>
<listitem>
<indexterm zone="ch-system-kbd setlogcons"><primary sortas="b-setlogcons">setlogcons</primary></indexterm>
<para>sends kernel messages to the console.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="setmetamode"><command>setmetamode</command></term>
+<varlistentry id="setmetamode">
+<term><command>setmetamode</command></term>
<listitem>
<indexterm zone="ch-system-kbd setmetamode"><primary sortas="b-setmetamode">setmetamode</primary></indexterm>
<para>defines the keyboard meta-key handling.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="setvesablank"><command>setvesablank</command></term>
+<varlistentry id="setvesablank">
+<term><command>setvesablank</command></term>
<listitem>
<indexterm zone="ch-system-kbd setvesablank"><primary sortas="b-setvesablank">setvesablank</primary></indexterm>
<para>lets you fiddle with the built-in
@@ -224,16 +224,16 @@ hardware screensaver (no toasters, just a blank screen).</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="showconsolefont"><command>showconsolefont</command></term>
+<varlistentry id="showconsolefont">
+<term><command>showconsolefont</command></term>
<listitem>
<indexterm zone="ch-system-kbd showconsolefont"><primary sortas="b-showconsolefont">showconsolefont</primary></indexterm>
<para>shows the current EGA/VGA console screen font.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="showkey"><command>showkey</command></term>
+<varlistentry id="showkey">
+<term><command>showkey</command></term>
<listitem>
<indexterm zone="ch-system-kbd showkey"><primary sortas="b-showkey">showkey</primary></indexterm>
<para>reports the scancodes and keycodes and
@@ -241,8 +241,8 @@ ASCII codes of the keys pressed on the keyboard.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="unicode_start"><command>unicode_start</command></term>
+<varlistentry id="unicode_start">
+<term><command>unicode_start</command></term>
<listitem>
<indexterm zone="ch-system-kbd unicode_start"><primary sortas="b-unicode_start">unicode_start</primary></indexterm>
<para>puts the keyboard and console in UNICODE mode. Never use it on LFS,
@@ -250,8 +250,8 @@ because applications are not configured to support UNICODE.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="unicode_stop"><command>unicode_stop</command></term>
+<varlistentry id="unicode_stop">
+<term><command>unicode_stop</command></term>
<listitem>
<indexterm zone="ch-system-kbd unicode_stop"><primary sortas="b-unicode_stop">unicode_stop</primary></indexterm>
<para>reverts keyboard and console from UNICODE mode.</para>
diff --git a/chapter06/less.xml b/chapter06/less.xml
index d1f95e419..48be223b6 100644
--- a/chapter06/less.xml
+++ b/chapter06/less.xml
@@ -61,8 +61,8 @@ GCC, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="less"><command>less</command></term>
+<varlistentry id="less">
+<term><command>less</command></term>
<listitem>
<indexterm zone="ch-system-less less"><primary sortas="b-less">less</primary></indexterm>
<para>is a file viewer or pager. It displays the contents of the given file, letting you
@@ -70,16 +70,16 @@ scroll around, find strings, and jump to marks.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="lessecho"><command>lessecho</command></term>
+<varlistentry id="lessecho">
+<term><command>lessecho</command></term>
<listitem>
<indexterm zone="ch-system-less lessecho"><primary sortas="b-lessecho">lessecho</primary></indexterm>
<para>is needed to expand meta-characters, such as * and ?, in filenames on Unix systems.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="lesskey"><command>lesskey</command></term>
+<varlistentry id="lesskey">
+<term><command>lesskey</command></term>
<listitem>
<indexterm zone="ch-system-less lesskey"><primary sortas="b-lesskey">lesskey</primary></indexterm>
<para>is used to specify the key bindings for less.</para>
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index ea5fe64c4..47d06f46a 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -58,24 +58,24 @@ GCC, Glibc, Grep, Make, Sed</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="libtool"><command>libtool</command></term>
+<varlistentry id="libtool">
+<term><command>libtool</command></term>
<listitem>
<indexterm zone="ch-system-libtool libtool"><primary sortas="b-libtool">libtool</primary></indexterm>
<para>provides generalized library-building support services.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libtoolize"><command>libtoolize</command></term>
+<varlistentry id="libtoolize">
+<term><command>libtoolize</command></term>
<listitem>
<indexterm zone="ch-system-libtool libtoolize"><primary sortas="b-libtoolize">libtoolize</primary></indexterm>
<para>provides a standard way to add libtool support to a package.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libltdl"><command>libltdl</command></term>
+<varlistentry id="libltdl">
+<term><command>libltdl</command></term>
<listitem>
<indexterm zone="ch-system-libtool libltdl"><primary sortas="c-libltdl">libltdl</primary></indexterm>
<para>hides the various difficulties of dlopening libraries.</para>
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index a6e7a95f1..5a55147b6 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -55,8 +55,8 @@ Gettext, Glibc, Grep, Make, Perl, Sed</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="m4"><command>m4</command></term>
+<varlistentry id="m4">
+<term><command>m4</command></term>
<listitem>
<indexterm zone="ch-system-m4 m4"><primary sortas="b-m4">m4</primary></indexterm>
<para>copies the given files
@@ -72,6 +72,4 @@ compiler or as a macro processor in its own right.</para>
</sect2>
-
-
</sect1>
diff --git a/chapter06/make.xml b/chapter06/make.xml
index 537aa74e0..8f8313be1 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -55,8 +55,8 @@ GCC, Gettext, Glibc, Grep, Sed</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="make"><command>make</command></term>
+<varlistentry id="make">
+<term><command>make</command></term>
<listitem>
<indexterm zone="ch-system-make make"><primary sortas="b-make">make</primary></indexterm>
<para>automatically determines which pieces of a large package need to be
diff --git a/chapter06/man-pages.xml b/chapter06/man-pages.xml
index 532f5a962..b00f4cdb1 100644
--- a/chapter06/man-pages.xml
+++ b/chapter06/man-pages.xml
@@ -43,8 +43,8 @@
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="manual-pages"><emphasis>manual pages</emphasis></term>
+<varlistentry id="manual-pages">
+<term><emphasis>manual pages</emphasis></term>
<listitem>
<indexterm zone="ch-system-man-pages manual-pages"><primary sortas="e-manual-pages">manual pages</primary></indexterm>
<para>Examples of provided manual pages are the pages describing all the C and
diff --git a/chapter06/man.xml b/chapter06/man.xml
index babe2acdf..552d07d21 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -121,8 +121,8 @@ man2dvi, man2html and whatis</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="apropos"><command>apropos</command></term>
+<varlistentry id="apropos">
+<term><command>apropos</command></term>
<listitem>
<indexterm zone="ch-system-man apropos"><primary sortas="b-apropos">apropos</primary></indexterm>
<para>searches the whatis database and displays
@@ -130,8 +130,8 @@ the short descriptions of system commands that contain a given string.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="makewhatis"><command>makewhatis</command></term>
+<varlistentry id="makewhatis">
+<term><command>makewhatis</command></term>
<listitem>
<indexterm zone="ch-system-man makewhatis"><primary sortas="b-makewhatis">makewhatis</primary></indexterm>
<para>builds the whatis database. It reads
@@ -140,32 +140,32 @@ short description in the whatis database.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="man"><command>man</command></term>
+<varlistentry id="man">
+<term><command>man</command></term>
<listitem>
<indexterm zone="ch-system-man man"><primary sortas="b-man">man</primary></indexterm>
<para>formats and displays the requested on-line manual page.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="man2dvi"><command>man2dvi</command></term>
+<varlistentry id="man2dvi">
+<term><command>man2dvi</command></term>
<listitem>
<indexterm zone="ch-system-man man2dvi"><primary sortas="b-man2dvi">man2dvi</primary></indexterm>
<para>converts a manual page into dvi format.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="man2html"><command>man2html</command></term>
+<varlistentry id="man2html">
+<term><command>man2html</command></term>
<listitem>
<indexterm zone="ch-system-man man2html"><primary sortas="b-man2html">man2html</primary></indexterm>
<para>converts a manual page into html.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="whatis"><command>whatis</command></term>
+<varlistentry id="whatis">
+<term><command>whatis</command></term>
<listitem>
<indexterm zone="ch-system-man whatis"><primary sortas="b-whatis">whatis</primary></indexterm>
<para>searches the whatis database and displays the short descriptions of system
diff --git a/chapter06/mktemp.xml b/chapter06/mktemp.xml
index 093ec4400..07944e904 100644
--- a/chapter06/mktemp.xml
+++ b/chapter06/mktemp.xml
@@ -68,16 +68,16 @@ functions from the system C library.</para></listitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="mktemp"><command>mktemp</command></term>
+<varlistentry id="mktemp">
+<term><command>mktemp</command></term>
<listitem>
<indexterm zone="ch-system-mktemp mktemp"><primary sortas="b-mktemp">mktemp</primary></indexterm>
<para>creates temporary files in a secure manner. It is used in scripts.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tempfile"><command>tempfile</command></term>
+<varlistentry id="tempfile">
+<term><command>tempfile</command></term>
<listitem>
<indexterm zone="ch-system-mktemp tempfile"><primary sortas="b-tempfile">tempfile</primary></indexterm>
<para>creates temporary files in a less secure manner than
diff --git a/chapter06/module-init-tools.xml b/chapter06/module-init-tools.xml
index cb3191236..227cc37e4 100644
--- a/chapter06/module-init-tools.xml
+++ b/chapter06/module-init-tools.xml
@@ -59,8 +59,8 @@ and rmmod (link to insmod)</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="depmod"><command>depmod</command></term>
+<varlistentry id="depmod">
+<term><command>depmod</command></term>
<listitem>
<indexterm zone="ch-system-module-init-tools depmod"><primary sortas="b-depmod">depmod</primary></indexterm>
<para>creates a dependency file, based on the
@@ -69,64 +69,64 @@ by modprobe to automatically load the required modules.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="genksyms"><command>genksyms</command></term>
+<varlistentry id="genksyms">
+<term><command>genksyms</command></term>
<listitem>
<indexterm zone="ch-system-module-init-tools genksyms"><primary sortas="b-genksyms">genksyms</primary></indexterm>
<para>generates symbol version information.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="insmod"><command>insmod</command></term>
+<varlistentry id="insmod">
+<term><command>insmod</command></term>
<listitem>
<indexterm zone="ch-system-module-init-tools insmod"><primary sortas="b-insmod">insmod</primary></indexterm>
<para>installs a loadable module in the running kernel.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="insmod_ksymoops_clean"><command>insmod_ksymoops_clean</command></term>
+<varlistentry id="insmod_ksymoops_clean">
+<term><command>insmod_ksymoops_clean</command></term>
<listitem>
<indexterm zone="ch-system-module-init-tools insmod_ksymoops_clean"><primary sortas="b-insmod_ksymoops_clean">insmod_ksymoops_clean</primary></indexterm>
<para>deletes saved ksyms and modules not accessed for two days.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="kallsyms"><command>kallsyms</command></term>
+<varlistentry id="kallsyms">
+<term><command>kallsyms</command></term>
<listitem>
<indexterm zone="ch-system-module-init-tools kallsyms"><primary sortas="b-kallsyms">kallsyms</primary></indexterm>
<para>extracts all kernel symbols for debugging.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="kernelversion"><command>kernelversion</command></term>
+<varlistentry id="kernelversion">
+<term><command>kernelversion</command></term>
<listitem>
<indexterm zone="ch-system-module-init-tools kernelversion"><primary sortas="b-kernelversion">kernelversion</primary></indexterm>
<para>reports the major version of the running kernel.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ksyms"><command>ksyms</command></term>
+<varlistentry id="ksyms">
+<term><command>ksyms</command></term>
<listitem>
<indexterm zone="ch-system-module-init-tools ksyms"><primary sortas="b-ksyms">ksyms</primary></indexterm>
<para>displays exported kernel symbols.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="lsmod"><command>lsmod</command></term>
+<varlistentry id="lsmod">
+<term><command>lsmod</command></term>
<listitem>
<indexterm zone="ch-system-module-init-tools lsmod"><primary sortas="b-lsmod">lsmod</primary></indexterm>
<para>shows which modules are loaded.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="modinfo"><command>modinfo</command></term>
+<varlistentry id="modinfo">
+<term><command>modinfo</command></term>
<listitem>
<indexterm zone="ch-system-module-init-tools modinfo"><primary sortas="b-modinfo">modinfo</primary></indexterm>
<para>examines an object file associated with
@@ -134,8 +134,8 @@ a kernel module and displays any information that it can glean.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="modprobe"><command>modprobe</command></term>
+<varlistentry id="modprobe">
+<term><command>modprobe</command></term>
<listitem>
<indexterm zone="ch-system-module-init-tools modprobe"><primary sortas="b-modprobe">modprobe</primary></indexterm>
<para>uses a dependency file, created by
@@ -143,8 +143,8 @@ depmod, to automatically load the relevant modules.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="rmmod"><command>rmmod</command></term>
+<varlistentry id="rmmod">
+<term><command>rmmod</command></term>
<listitem>
<indexterm zone="ch-system-module-init-tools rmmod"><primary sortas="b-rmmod">rmmod</primary></indexterm>
<para>unloads modules from the running kernel.</para>
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 733796464..fb17b42a8 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -75,48 +75,48 @@ libncurses++.a, libncurses.[a,so], libpanel.[a,so]</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="captoinfo"><command>captoinfo</command></term>
+<varlistentry id="captoinfo">
+<term><command>captoinfo</command></term>
<listitem>
<indexterm zone="ch-system-ncurses captoinfo"><primary sortas="b-captoinfo">captoinfo</primary></indexterm>
<para>converts a termcap description into a terminfo description.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="clear"><command>clear</command></term>
+<varlistentry id="clear">
+<term><command>clear</command></term>
<listitem>
<indexterm zone="ch-system-ncurses clear"><primary sortas="b-clear">clear</primary></indexterm>
<para>clears the screen, if this is possible.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="infocmp"><command>infocmp</command></term>
+<varlistentry id="infocmp">
+<term><command>infocmp</command></term>
<listitem>
<indexterm zone="ch-system-ncurses infocmp"><primary sortas="b-infocmp">infocmp</primary></indexterm>
<para>compares or prints out terminfo descriptions.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="infotocap"><command>infotocap</command></term>
+<varlistentry id="infotocap">
+<term><command>infotocap</command></term>
<listitem>
<indexterm zone="ch-system-ncurses infotocap"><primary sortas="b-infotocap">infotocap</primary></indexterm>
<para>converts a terminfo description into a termcap description.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="reset"><command>reset</command></term>
+<varlistentry id="reset">
+<term><command>reset</command></term>
<listitem>
<indexterm zone="ch-system-ncurses reset"><primary sortas="b-reset">reset</primary></indexterm>
<para>reinitializes a terminal to its default values.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tack"><command>tack</command></term>
+<varlistentry id="tack">
+<term><command>tack</command></term>
<listitem>
<indexterm zone="ch-system-ncurses tack"><primary sortas="b-tack">tack</primary></indexterm>
<para>is the terminfo action checker. It is mainly
@@ -124,8 +124,8 @@ used to test the correctness of an entry in the terminfo database.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tic"><command>tic</command></term>
+<varlistentry id="tic">
+<term><command>tic</command></term>
<listitem>
<indexterm zone="ch-system-ncurses tic"><primary sortas="b-tic">tic</primary></indexterm>
<para>is the terminfo entry-description compiler.
@@ -135,8 +135,8 @@ capabilities of a certain terminal.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="toe"><command>toe</command></term>
+<varlistentry id="toe">
+<term><command>toe</command></term>
<listitem>
<indexterm zone="ch-system-ncurses toe"><primary sortas="b-toe">toe</primary></indexterm>
<para>lists all available terminal types, for each
@@ -144,8 +144,8 @@ giving its primary name and its description.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tput"><command>tput</command></term>
+<varlistentry id="tput">
+<term><command>tput</command></term>
<listitem>
<indexterm zone="ch-system-ncurses tput"><primary sortas="b-tput">tput</primary></indexterm>
<para>makes the values of terminal-dependent
@@ -154,16 +154,16 @@ a terminal, or report its long name.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tset"><command>tset</command></term>
+<varlistentry id="tset">
+<term><command>tset</command></term>
<listitem>
<indexterm zone="ch-system-ncurses tset"><primary sortas="b-tset">tset</primary></indexterm>
<para>can be used to initialize terminals.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libncurses"><command>libncurses*</command></term>
+<varlistentry id="libncurses">
+<term><command>libncurses*</command></term>
<listitem>
<indexterm zone="ch-system-ncurses libncurses"><primary sortas="c-libncurses*">libncurses*</primary></indexterm>
<para>contains functions to display text in
@@ -172,24 +172,24 @@ functions is the menu displayed during the kernel's make menuconfig.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libform"><command>libform*</command></term>
+<varlistentry id="libform">
+<term><command>libform*</command></term>
<listitem>
<indexterm zone="ch-system-ncurses libform"><primary sortas="c-libform*">libform*</primary></indexterm>
<para>contains functions to implement forms.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libmenu"><command>libmenu*</command></term>
+<varlistentry id="libmenu">
+<term><command>libmenu*</command></term>
<listitem>
<indexterm zone="ch-system-ncurses libmenu"><primary sortas="c-libmenu*">libmenu*</primary></indexterm>
<para>contains functions to implement menus.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libpanel"><command>libpanel*</command></term>
+<varlistentry id="libpanel">
+<term><command>libpanel*</command></term>
<listitem>
<indexterm zone="ch-system-ncurses libpanel"><primary sortas="c-libpanel*">libpanel*</primary></indexterm>
<para>contains functions to implement panels.</para>
diff --git a/chapter06/net-tools.xml b/chapter06/net-tools.xml
index d45fd004b..1c3b45b72 100644
--- a/chapter06/net-tools.xml
+++ b/chapter06/net-tools.xml
@@ -76,8 +76,8 @@ plipconfig, rarp, route, slattach and ypdomainname (link to hostname)</seg></seg
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="arp"><command>arp</command></term>
+<varlistentry id="arp">
+<term><command>arp</command></term>
<listitem>
<indexterm zone="ch-system-net-tools arp"><primary sortas="b-arp">arp</primary></indexterm>
<para>is used to manipulate the kernel's ARP cache,
@@ -85,48 +85,48 @@ usually to add or delete an entry, or to dump the entire cache.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="dnsdomainname"><command>dnsdomainname</command></term>
+<varlistentry id="dnsdomainname">
+<term><command>dnsdomainname</command></term>
<listitem>
<indexterm zone="ch-system-net-tools dnsdomainname"><primary sortas="b-dnsdomainname">dnsdomainname</primary></indexterm>
<para>reports the system's DNS (Domain Name Server) domain name.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="domainname"><command>domainname</command></term>
+<varlistentry id="domainname">
+<term><command>domainname</command></term>
<listitem>
<indexterm zone="ch-system-net-tools domainname"><primary sortas="b-domainname">domainname</primary></indexterm>
<para>reports or sets the system's NIS/YP domain name.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="hostname"><command>hostname</command></term>
+<varlistentry id="hostname">
+<term><command>hostname</command></term>
<listitem>
<indexterm zone="ch-system-net-tools hostname"><primary sortas="b-hostname">hostname</primary></indexterm>
<para>reports or sets the name of the current host system.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ifconfig"><command>ifconfig</command></term>
+<varlistentry id="ifconfig">
+<term><command>ifconfig</command></term>
<listitem>
<indexterm zone="ch-system-net-tools ifconfig"><primary sortas="b-ifconfig">ifconfig</primary></indexterm>
<para>is the main utility for configuring network interfaces.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="nameif"><command>nameif</command></term>
+<varlistentry id="nameif">
+<term><command>nameif</command></term>
<listitem>
<indexterm zone="ch-system-net-tools nameif"><primary sortas="b-nameif">nameif</primary></indexterm>
<para>names network interfaces based on MAC addresses.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="netstat"><command>netstat</command></term>
+<varlistentry id="netstat">
+<term><command>netstat</command></term>
<listitem>
<indexterm zone="ch-system-net-tools netstat"><primary sortas="b-netstat">netstat</primary></indexterm>
<para>is used to report network connections, routing tables, and interface
@@ -134,40 +134,40 @@ statistics..</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="nisdomainname"><command>nisdomainname</command></term>
+<varlistentry id="nisdomainname">
+<term><command>nisdomainname</command></term>
<listitem>
<indexterm zone="ch-system-net-tools nisdomainname"><primary sortas="b-nisdomainname">nisdomainname</primary></indexterm>
<para>does the same as domainname.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="plipconfig"><command>plipconfig</command></term>
+<varlistentry id="plipconfig">
+<term><command>plipconfig</command></term>
<listitem>
<indexterm zone="ch-system-net-tools plipconfig"><primary sortas="b-plipconfig">plipconfig</primary></indexterm>
<para>is used to fine tune the PLIP device parameters, to improve its performance.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="rarp"><command>rarp</command></term>
+<varlistentry id="rarp">
+<term><command>rarp</command></term>
<listitem>
<indexterm zone="ch-system-net-tools rarp"><primary sortas="b-rarp">rarp</primary></indexterm>
<para>is used to manipulate the kernel's RARP table.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="route"><command>route</command></term>
+<varlistentry id="route">
+<term><command>route</command></term>
<listitem>
<indexterm zone="ch-system-net-tools route"><primary sortas="b-route">route</primary></indexterm>
<para>is used to manipulate the IP routing table.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="slattach"><command>slattach</command></term>
+<varlistentry id="slattach">
+<term><command>slattach</command></term>
<listitem>
<indexterm zone="ch-system-net-tools slattach"><primary sortas="b-slattach">slattach</primary></indexterm>
<para>attaches a network interface to a serial line. This allows you to use normal
@@ -175,8 +175,8 @@ terminal lines for point-to-point links to other computers.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ypdomainname"><command>ypdomainname</command></term>
+<varlistentry id="ypdomainname">
+<term><command>ypdomainname</command></term>
<listitem>
<indexterm zone="ch-system-net-tools ypdomainname"><primary sortas="b-ypdomainname">ypdomainname</primary></indexterm>
<para>does the same as domainname.</para>
diff --git a/chapter06/patch.xml b/chapter06/patch.xml
index ad6708b25..9bc61574c 100644
--- a/chapter06/patch.xml
+++ b/chapter06/patch.xml
@@ -54,8 +54,8 @@ machines you can leave it out):</para>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="patch"><command>patch</command></term>
+<varlistentry id="patch">
+<term><command>patch</command></term>
<listitem>
<indexterm zone="ch-system-patch patch"><primary sortas="b-patch">patch</primary></indexterm>
<para>modifies files according to a patch file.
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 1a303f907..0963dcc54 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -81,32 +81,32 @@ to c2ph), s2p, splain and xsubpp</seg>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="a2p"><command>a2p</command></term>
+<varlistentry id="a2p">
+<term><command>a2p</command></term>
<listitem>
<indexterm zone="ch-system-perl a2p"><primary sortas="b-a2p">a2p</primary></indexterm>
<para>translates awk to perl.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="c2ph"><command>c2ph</command></term>
+<varlistentry id="c2ph">
+<term><command>c2ph</command></term>
<listitem>
<indexterm zone="ch-system-perl c2ph"><primary sortas="b-c2ph">c2ph</primary></indexterm>
<para>dumps C structures as generated from "cc -g -S" stabs.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="dprofpp"><command>dprofpp</command></term>
+<varlistentry id="dprofpp">
+<term><command>dprofpp</command></term>
<listitem>
<indexterm zone="ch-system-perl dprofpp"><primary sortas="b-dprofpp">dprofpp</primary></indexterm>
<para>displays perl profile data.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="en2cxs"><command>en2cxs</command></term>
+<varlistentry id="en2cxs">
+<term><command>en2cxs</command></term>
<listitem>
<indexterm zone="ch-system-perl en2cxs"><primary sortas="b-en2cxs">en2cxs</primary></indexterm>
<para>builds a Perl extension for the Encode module,
@@ -114,40 +114,40 @@ from either Unicode Character Mappings or Tcl Encoding Files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="find2perl"><command>find2perl</command></term>
+<varlistentry id="find2perl">
+<term><command>find2perl</command></term>
<listitem>
<indexterm zone="ch-system-perl find2perl"><primary sortas="b-find2perl">find2perl</primary></indexterm>
<para>translates find commands to perl.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="h2ph"><command>h2ph</command></term>
+<varlistentry id="h2ph">
+<term><command>h2ph</command></term>
<listitem>
<indexterm zone="ch-system-perl h2ph"><primary sortas="b-h2ph">h2ph</primary></indexterm>
<para>converts .h C header files to .ph Perl header files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="h2xs"><command>h2xs</command></term>
+<varlistentry id="h2xs">
+<term><command>h2xs</command></term>
<listitem>
<indexterm zone="ch-system-perl h2xs"><primary sortas="b-h2xs">h2xs</primary></indexterm>
<para>converts .h C header files to Perl extensions.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libnetcfg"><command>libnetcfg</command></term>
+<varlistentry id="libnetcfg">
+<term><command>libnetcfg</command></term>
<listitem>
<indexterm zone="ch-system-perl libnetcfg"><primary sortas="b-libnetcfg">libnetcfg</primary></indexterm>
<para>can be used to configure the libnet.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="perl"><command>perl</command></term>
+<varlistentry id="perl">
+<term><command>perl</command></term>
<listitem>
<indexterm zone="ch-system-perl perl"><primary sortas="b-perl">perl</primary></indexterm>
<para>combines some of the best features of C, sed,
@@ -155,8 +155,8 @@ awk and sh into a single swiss-army language.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="perlbug"><command>perlbug</command></term>
+<varlistentry id="perlbug">
+<term><command>perlbug</command></term>
<listitem>
<indexterm zone="ch-system-perl perlbug"><primary sortas="b-perlbug">perlbug</primary></indexterm>
<para>is used to generate bug reports about
@@ -164,16 +164,16 @@ Perl or the modules that come with it, and mail them.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="perlcc"><command>perlcc</command></term>
+<varlistentry id="perlcc">
+<term><command>perlcc</command></term>
<listitem>
<indexterm zone="ch-system-perl perlcc"><primary sortas="b-perlcc">perlcc</primary></indexterm>
<para>generates executables from Perl programs.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="perldoc"><command>perldoc</command></term>
+<varlistentry id="perldoc">
+<term><command>perldoc</command></term>
<listitem>
<indexterm zone="ch-system-perl perldoc"><primary sortas="b-perldoc">perldoc</primary></indexterm>
<para>displays a piece of documentation in pod
@@ -181,8 +181,8 @@ format that is embedded in the perl installation tree or in a perl script.</para
</listitem>
</varlistentry>
-<varlistentry>
-<term id="perlivp"><command>perlivp</command></term>
+<varlistentry id="perlivp">
+<term><command>perlivp</command></term>
<listitem>
<indexterm zone="ch-system-perl perlivp"><primary sortas="b-perlivp">perlivp</primary></indexterm>
<para>is the Perl Installation Verification Procedure. It can be used to verify that
@@ -190,8 +190,8 @@ Perl and its libraries have been installed correctly.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="piconv"><command>piconv</command></term>
+<varlistentry id="piconv">
+<term><command>piconv</command></term>
<listitem>
<indexterm zone="ch-system-perl piconv"><primary sortas="b-piconv">piconv</primary></indexterm>
<para>is a Perl version of the character encoding
@@ -199,96 +199,96 @@ converter <command>iconv</command>.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pl2pm"><command>pl2pm</command></term>
+<varlistentry id="pl2pm">
+<term><command>pl2pm</command></term>
<listitem>
<indexterm zone="ch-system-perl pl2pm"><primary sortas="b-pl2pm">pl2pm</primary></indexterm>
<para>is a rough tool for converting Perl4 .pl files to Perl5 .pm modules.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pod2html"><command>pod2html</command></term>
+<varlistentry id="pod2html">
+<term><command>pod2html</command></term>
<listitem>
<indexterm zone="ch-system-perl pod2html"><primary sortas="b-pod2html">pod2html</primary></indexterm>
<para>converts files from pod format to HTML format.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pod2latex"><command>pod2latex</command></term>
+<varlistentry id="pod2latex">
+<term><command>pod2latex</command></term>
<listitem>
<indexterm zone="ch-system-perl pod2latex"><primary sortas="b-pod2latex">pod2latex</primary></indexterm>
<para>converts files from pod format to LaTeX format.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pod2man"><command>pod2man</command></term>
+<varlistentry id="pod2man">
+<term><command>pod2man</command></term>
<listitem>
<indexterm zone="ch-system-perl pod2man"><primary sortas="b-pod2man">pod2man</primary></indexterm>
<para>converts pod data to formatted *roff input.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pod2text"><command>pod2text</command></term>
+<varlistentry id="pod2text">
+<term><command>pod2text</command></term>
<listitem>
<indexterm zone="ch-system-perl pod2text"><primary sortas="b-pod2text">pod2text</primary></indexterm>
<para>converts pod data to formatted ASCII text.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pod2usage"><command>pod2usage</command></term>
+<varlistentry id="pod2usage">
+<term><command>pod2usage</command></term>
<listitem>
<indexterm zone="ch-system-perl pod2usage"><primary sortas="b-pod2usage">pod2usage</primary></indexterm>
<para>prints usage messages from embedded pod docs in files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="podchecker"><command>podchecker</command></term>
+<varlistentry id="podchecker">
+<term><command>podchecker</command></term>
<listitem>
<indexterm zone="ch-system-perl podchecker"><primary sortas="b-podchecker">podchecker</primary></indexterm>
<para>checks the syntax of pod format documentation files.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="podselect"><command>podselect</command></term>
+<varlistentry id="podselect">
+<term><command>podselect</command></term>
<listitem>
<indexterm zone="ch-system-perl podselect"><primary sortas="b-podselect">podselect</primary></indexterm>
<para>displays selected sections of pod documentation.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="psed"><command>psed</command></term>
+<varlistentry id="psed">
+<term><command>psed</command></term>
<listitem>
<indexterm zone="ch-system-perl psed"><primary sortas="b-psed">psed</primary></indexterm>
<para>is a Perl version of the stream editor <userinput>sed</userinput>.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pstruct"><command>pstruct</command></term>
+<varlistentry id="pstruct">
+<term><command>pstruct</command></term>
<listitem>
<indexterm zone="ch-system-perl pstruct"><primary sortas="b-pstruct">pstruct</primary></indexterm>
<para>dumps C structures as generated from "cc -g -S" stabs.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="s2p"><command>s2p</command></term>
+<varlistentry id="s2p">
+<term><command>s2p</command></term>
<listitem>
<indexterm zone="ch-system-perl s2p"><primary sortas="b-s2p">s2p</primary></indexterm>
<para>translates sed to perl.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="splain"><command>splain</command></term>
+<varlistentry id="splain">
+<term><command>splain</command></term>
<listitem>
<indexterm zone="ch-system-perl splain"><primary sortas="b-splain">splain</primary></indexterm>
<para>is used to force verbose warning
@@ -296,8 +296,8 @@ diagnostics in perl.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="xsubpp"><command>xsubpp</command></term>
+<varlistentry id="xsubpp">
+<term><command>xsubpp</command></term>
<listitem>
<indexterm zone="ch-system-perl xsubpp"><primary sortas="b-xsubpp">xsubpp</primary></indexterm>
<para>converts Perl XS code into C code.</para>
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 9444b9eef..5a5c0e74a 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -55,8 +55,8 @@ pmap, ps, skill, snice, sysctl, tload, top, uptime, vmstat, w and watch</seg>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="free"><command>free</command></term>
+<varlistentry id="free">
+<term><command>free</command></term>
<listitem>
<indexterm zone="ch-system-procps free"><primary sortas="b-free">free</primary></indexterm>
<para>reports the amount of free and used memory
@@ -64,80 +64,80 @@ in the system, both physical and swap memory.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="kill"><command>kill</command></term>
+<varlistentry id="kill">
+<term><command>kill</command></term>
<listitem>
<indexterm zone="ch-system-procps kill"><primary sortas="b-kill">kill</primary></indexterm>
<para>is used to send signals to processes.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pgrep"><command>pgrep</command></term>
+<varlistentry id="pgrep">
+<term><command>pgrep</command></term>
<listitem>
<indexterm zone="ch-system-procps pgrep"><primary sortas="b-pgrep">pgrep</primary></indexterm>
<para>looks up processes based on their name and other attributes.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pkill"><command>pkill</command></term>
+<varlistentry id="pkill">
+<term><command>pkill</command></term>
<listitem>
<indexterm zone="ch-system-procps pkill"><primary sortas="b-pkill">pkill</primary></indexterm>
<para>signals processes based on their name and other attributes.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pmap"><command>pmap</command></term>
+<varlistentry id="pmap">
+<term><command>pmap</command></term>
<listitem>
<indexterm zone="ch-system-procps pmap"><primary sortas="b-pmap">pmap</primary></indexterm>
<para>reports the memory map of the given process.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ps"><command>ps</command></term>
+<varlistentry id="ps">
+<term><command>ps</command></term>
<listitem>
<indexterm zone="ch-system-procps ps"><primary sortas="b-ps">ps</primary></indexterm>
<para>gives a snapshot of the current processes.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="skill"><command>skill</command></term>
+<varlistentry id="skill">
+<term><command>skill</command></term>
<listitem>
<indexterm zone="ch-system-procps skill"><primary sortas="b-skill">skill</primary></indexterm>
<para>sends signals to processes matching the given criteria.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="snice"><command>snice</command></term>
+<varlistentry id="snice">
+<term><command>snice</command></term>
<listitem>
<indexterm zone="ch-system-procps snice"><primary sortas="b-snice">snice</primary></indexterm>
<para>changes the scheduling priority of processes matching the given criteria.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="sysctl"><command>sysctl</command></term>
+<varlistentry id="sysctl">
+<term><command>sysctl</command></term>
<listitem>
<indexterm zone="ch-system-procps sysctl"><primary sortas="b-sysctl">sysctl</primary></indexterm>
<para>modifies kernel parameters at run time.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tload"><command>tload</command></term>
+<varlistentry id="tload">
+<term><command>tload</command></term>
<listitem>
<indexterm zone="ch-system-procps tload"><primary sortas="b-tload">tload</primary></indexterm>
<para>prints a graph of the current system load average.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="top"><command>top</command></term>
+<varlistentry id="top">
+<term><command>top</command></term>
<listitem>
<indexterm zone="ch-system-procps top"><primary sortas="b-top">top</primary></indexterm>
<para>displays the top CPU processes. It provides
@@ -145,8 +145,8 @@ an ongoing look at processor activity in real time.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="uptime"><command>uptime</command></term>
+<varlistentry id="uptime">
+<term><command>uptime</command></term>
<listitem>
<indexterm zone="ch-system-procps uptime"><primary sortas="b-uptime">uptime</primary></indexterm>
<para>reports how long the system has been
@@ -154,8 +154,8 @@ running, how many users are logged on, and the system load averages.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="vmstat"><command>vmstat</command></term>
+<varlistentry id="vmstat">
+<term><command>vmstat</command></term>
<listitem>
<indexterm zone="ch-system-procps vmstat"><primary sortas="b-vmstat">vmstat</primary></indexterm>
<para>reports virtual memory statistics, giving information about processes,
@@ -163,16 +163,16 @@ memory, paging, block IO, traps, and CPU activity.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="w"><command>w</command></term>
+<varlistentry id="w">
+<term><command>w</command></term>
<listitem>
<indexterm zone="ch-system-procps w"><primary sortas="b-w">w</primary></indexterm>
<para>shows which users are currently logged on, where and since when.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="watch"><command>watch</command></term>
+<varlistentry id="watch">
+<term><command>watch</command></term>
<listitem>
<indexterm zone="ch-system-procps watch"><primary sortas="b-watch">watch</primary></indexterm>
<para>runs a given command repeatedly, displaying the first screen-full of its
@@ -180,8 +180,8 @@ output. This allows you to watch the output change over time.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libproc"><command>libproc</command></term>
+<varlistentry id="libproc">
+<term><command>libproc</command></term>
<listitem>
<indexterm zone="ch-system-procps libproc"><primary sortas="c-libproc">libproc</primary></indexterm>
<para>contains the functions used by most programs in this package.</para>
diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index 0e3383fa2..a95fdd262 100644
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@@ -84,16 +84,16 @@ creating the following symlink:</para>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="fuser"><command>fuser</command></term>
+<varlistentry id="fuser">
+<term><command>fuser</command></term>
<listitem>
<indexterm zone="ch-system-psmisc fuser"><primary sortas="b-fuser">fuser</primary></indexterm>
<para>reports the PIDs of processes that use the given files or file systems.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="killall"><command>killall</command></term>
+<varlistentry id="killall">
+<term><command>killall</command></term>
<listitem>
<indexterm zone="ch-system-psmisc killall"><primary sortas="b-killall">killall</primary></indexterm>
<para>kills processes by name. It sends a signal
@@ -101,16 +101,16 @@ to all processes running any of the given commands.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pstree"><command>pstree</command></term>
+<varlistentry id="pstree">
+<term><command>pstree</command></term>
<listitem>
<indexterm zone="ch-system-psmisc pstree"><primary sortas="b-pstree">pstree</primary></indexterm>
<para>displays running processes as a tree.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pstree.x11"><command>pstree.x11</command></term>
+<varlistentry id="pstree.x11">
+<term><command>pstree.x11</command></term>
<listitem>
<indexterm zone="ch-system-psmisc pstree.x11"><primary sortas="b-pstree.x11">pstree.x11</primary></indexterm>
<para>same as pstree except that it waits for confirmation before exiting.</para>
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index 9bb01facc..cf4598f0d 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -55,8 +55,8 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Texinfo</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="sed"><command>sed</command></term>
+<varlistentry id="sed">
+<term><command>sed</command></term>
<listitem>
<indexterm zone="ch-system-sed sed"><primary sortas="b-sed">sed</primary></indexterm>
<para>is used to filter and transform text files in a single pass.</para>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 525affe6d..0018929a2 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -153,8 +153,8 @@ vipw</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="chage"><command>chage</command></term>
+<varlistentry id="chage">
+<term><command>chage</command></term>
<listitem>
<indexterm zone="ch-system-shadow chage"><primary sortas="b-chage">chage</primary></indexterm>
<para>is used to change the maximum number of
@@ -162,16 +162,16 @@ days between obligatory password changes.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="chfn"><command>chfn</command></term>
+<varlistentry id="chfn">
+<term><command>chfn</command></term>
<listitem>
<indexterm zone="ch-system-shadow chfn"><primary sortas="b-chfn">chfn</primary></indexterm>
<para>is used to change a user's full name and some other info.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="chpasswd"><command>chpasswd</command></term>
+<varlistentry id="chpasswd">
+<term><command>chpasswd</command></term>
<listitem>
<indexterm zone="ch-system-shadow chpasswd"><primary sortas="b-chpasswd">chpasswd</primary></indexterm>
<para>is used to update the passwords of a
@@ -179,32 +179,32 @@ whole series of user accounts in one go.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="chsh"><command>chsh</command></term>
+<varlistentry id="chsh">
+<term><command>chsh</command></term>
<listitem>
<indexterm zone="ch-system-shadow chsh"><primary sortas="b-chsh">chsh</primary></indexterm>
<para>is used to change a user's default login shell.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="dpasswd"><command>dpasswd</command></term>
+<varlistentry id="dpasswd">
+<term><command>dpasswd</command></term>
<listitem>
<indexterm zone="ch-system-shadow dpasswd"><primary sortas="b-dpasswd">dpasswd</primary></indexterm>
<para>is used to change dial-up passwords for user login shells.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="expiry"><command>expiry</command></term>
+<varlistentry id="expiry">
+<term><command>expiry</command></term>
<listitem>
<indexterm zone="ch-system-shadow expiry"><primary sortas="b-expiry">expiry</primary></indexterm>
<para>checks and enforces the current password expiration policy.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="faillog"><command>faillog</command></term>
+<varlistentry id="faillog">
+<term><command>faillog</command></term>
<listitem>
<indexterm zone="ch-system-shadow faillog"><primary sortas="b-faillog">faillog</primary></indexterm>
<para>is used to examine the log of login failures, to set a maximum number of
@@ -212,48 +212,48 @@ failures before an account is blocked, or to reset the failure count.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="gpasswd"><command>gpasswd</command></term>
+<varlistentry id="gpasswd">
+<term><command>gpasswd</command></term>
<listitem>
<indexterm zone="ch-system-shadow gpasswd"><primary sortas="b-gpasswd">gpasswd</primary></indexterm>
<para>is used to add and delete members and administrators to groups.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="groupadd"><command>groupadd</command></term>
+<varlistentry id="groupadd">
+<term><command>groupadd</command></term>
<listitem>
<indexterm zone="ch-system-shadow groupadd"><primary sortas="b-groupadd">groupadd</primary></indexterm>
<para>creates a group with the given name.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="groupdel"><command>groupdel</command></term>
+<varlistentry id="groupdel">
+<term><command>groupdel</command></term>
<listitem>
<indexterm zone="ch-system-shadow groupdel"><primary sortas="b-groupdel">groupdel</primary></indexterm>
<para>deletes the group with the given name.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="groupmod"><command>groupmod</command></term>
+<varlistentry id="groupmod">
+<term><command>groupmod</command></term>
<listitem>
<indexterm zone="ch-system-shadow groupmod"><primary sortas="b-groupmod">groupmod</primary></indexterm>
<para>is used to modify the given group's name or GID.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="groups"><command>groups</command></term>
+<varlistentry id="groups">
+<term><command>groups</command></term>
<listitem>
<indexterm zone="ch-system-shadow groups"><primary sortas="b-groups">groups</primary></indexterm>
<para>reports the groups of which the given users are members.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="grpck"><command>grpck</command></term>
+<varlistentry id="grpck">
+<term><command>grpck</command></term>
<listitem>
<indexterm zone="ch-system-shadow grpck"><primary sortas="b-grpck">grpck</primary></indexterm>
<para>verifies the integrity of the group files, <filename>/etc/group</filename>
@@ -261,16 +261,16 @@ and <filename>/etc/gshadow</filename>.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="grpconv"><command>grpconv</command></term>
+<varlistentry id="grpconv">
+<term><command>grpconv</command></term>
<listitem>
<indexterm zone="ch-system-shadow grpconv"><primary sortas="b-grpconv">grpconv</primary></indexterm>
<para>creates or updates the shadow group file from the normal group file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="grpunconv"><command>grpunconv</command></term>
+<varlistentry id="grpunconv">
+<term><command>grpunconv</command></term>
<listitem>
<indexterm zone="ch-system-shadow grpunconv"><primary sortas="b-grpunconv">grpunconv</primary></indexterm>
<para>updates <filename>/etc/group</filename>
@@ -278,64 +278,64 @@ from <filename>/etc/gshadow</filename> and then deletes the latter.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="lastlog"><command>lastlog</command></term>
+<varlistentry id="lastlog">
+<term><command>lastlog</command></term>
<listitem>
<indexterm zone="ch-system-shadow lastlog"><primary sortas="b-lastlog">lastlog</primary></indexterm>
<para>reports the most recent login of all users, or of a given user.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="login"><command>login</command></term>
+<varlistentry id="login">
+<term><command>login</command></term>
<listitem>
<indexterm zone="ch-system-shadow login"><primary sortas="b-login">login</primary></indexterm>
<para>is used by the system to let users sign on.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="logoutd"><command>logoutd</command></term>
+<varlistentry id="logoutd">
+<term><command>logoutd</command></term>
<listitem>
<indexterm zone="ch-system-shadow logoutd"><primary sortas="b-logoutd">logoutd</primary></indexterm>
<para>is a daemon used to enforce restrictions on log-on time and ports.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mkpasswd"><command>mkpasswd</command></term>
+<varlistentry id="mkpasswd">
+<term><command>mkpasswd</command></term>
<listitem>
<indexterm zone="ch-system-shadow mkpasswd"><primary sortas="b-mkpasswd">mkpasswd</primary></indexterm>
<para>encrypts the given password using the also given perturbation.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="newgrp"><command>newgrp</command></term>
+<varlistentry id="newgrp">
+<term><command>newgrp</command></term>
<listitem>
<indexterm zone="ch-system-shadow newgrp"><primary sortas="b-newgrp">newgrp</primary></indexterm>
<para>is used to change the current GID during a login session.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="newusers"><command>newusers</command></term>
+<varlistentry id="newusers">
+<term><command>newusers</command></term>
<listitem>
<indexterm zone="ch-system-shadow newusers"><primary sortas="b-newusers">newusers</primary></indexterm>
<para>is used to create or update a whole series of user accounts in one go.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="passwd"><command>passwd</command></term>
+<varlistentry id="passwd">
+<term><command>passwd</command></term>
<listitem>
<indexterm zone="ch-system-shadow passwd"><primary sortas="b-passwd">passwd</primary></indexterm>
<para>is used to change the password for a user or group account.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pwck"><command>pwck</command></term>
+<varlistentry id="pwck">
+<term><command>pwck</command></term>
<listitem>
<indexterm zone="ch-system-shadow pwck"><primary sortas="b-pwck">pwck</primary></indexterm>
<para>verifies the integrity of the password files,
@@ -343,8 +343,8 @@ from <filename>/etc/gshadow</filename> and then deletes the latter.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pwconv"><command>pwconv</command></term>
+<varlistentry id="pwconv">
+<term><command>pwconv</command></term>
<listitem>
<indexterm zone="ch-system-shadow pwconv"><primary sortas="b-pwconv">pwconv</primary></indexterm>
<para>creates or updates the shadow password file
@@ -352,8 +352,8 @@ from the normal password file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pwunconv"><command>pwunconv</command></term>
+<varlistentry id="pwunconv">
+<term><command>pwunconv</command></term>
<listitem>
<indexterm zone="ch-system-shadow pwunconv"><primary sortas="b-pwunconv">pwunconv</primary></indexterm>
<para>updates <filename>/etc/passwd</filename>
@@ -361,8 +361,8 @@ from <filename>/etc/shadow</filename> and then deletes the latter.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="sg"><command>sg</command></term>
+<varlistentry id="sg">
+<term><command>sg</command></term>
<listitem>
<indexterm zone="ch-system-shadow sg"><primary sortas="b-sg">sg</primary></indexterm>
<para>executes a given command while the user's GID
@@ -370,8 +370,8 @@ is set to that of the given group.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="useradd"><command>useradd</command></term>
+<varlistentry id="useradd">
+<term><command>useradd</command></term>
<listitem>
<indexterm zone="ch-system-shadow useradd"><primary sortas="b-useradd">useradd</primary></indexterm>
<para>creates a new user with the given name,
@@ -379,16 +379,16 @@ or updates the default new-user information.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="userdel"><command>userdel</command></term>
+<varlistentry id="userdel">
+<term><command>userdel</command></term>
<listitem>
<indexterm zone="ch-system-shadow userdel"><primary sortas="b-userdel">userdel</primary></indexterm>
<para>deletes the given user account.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="usermod"><command>usermod</command></term>
+<varlistentry id="usermod">
+<term><command>usermod</command></term>
<listitem>
<indexterm zone="ch-system-shadow usermod"><primary sortas="b-usermod">usermod</primary></indexterm>
<para>is used to modify the given user's login name, UID (User Identification),
@@ -396,8 +396,8 @@ shell, initial group, home directory, and the like.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="vigr"><command>vigr</command></term>
+<varlistentry id="vigr">
+<term><command>vigr</command></term>
<listitem>
<indexterm zone="ch-system-shadow vigr"><primary sortas="b-vigr">vigr</primary></indexterm>
<para>can be used to edit the <filename>/etc/group</filename> or
@@ -405,8 +405,8 @@ shell, initial group, home directory, and the like.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="vipw"><command>vipw</command></term>
+<varlistentry id="vipw">
+<term><command>vipw</command></term>
<listitem>
<indexterm zone="ch-system-shadow vipw"><primary sortas="b-vipw">vipw</primary></indexterm>
<para>can be used to edit the <filename>/etc/passwd</filename> or
@@ -414,16 +414,16 @@ shell, initial group, home directory, and the like.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libmisc"><command>libmisc</command></term>
+<varlistentry id="libmisc">
+<term><command>libmisc</command></term>
<listitem>
<indexterm zone="ch-system-shadow libmisc"><primary sortas="c-libmisc">libmisc</primary></indexterm>
<para>...</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="libshadow"><command>libshadow</command></term>
+<varlistentry id="libshadow">
+<term><command>libshadow</command></term>
<listitem>
<indexterm zone="ch-system-shadow libshadow"><primary sortas="c-libshadow">libshadow</primary></indexterm>
<para>contains functions used by most programs in this package.</para>
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index 851a28808..deb95e22a 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -86,16 +86,16 @@ user.* -/var/log/user.log
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="klogd"><command>klogd</command></term>
+<varlistentry id="klogd">
+<term><command>klogd</command></term>
<listitem>
<indexterm zone="ch-system-sysklogd klogd"><primary sortas="b-klogd">klogd</primary></indexterm>
<para>is a system daemon for intercepting and logging kernel messages.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="syslogd"><command>syslogd</command></term>
+<varlistentry id="syslogd">
+<term><command>syslogd</command></term>
<listitem>
<indexterm zone="ch-system-sysklogd syslogd"><primary sortas="b-syslogd">syslogd</primary></indexterm>
<para>logs the messages that system programs
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 842396db7..9f2ad48f8 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -114,8 +114,8 @@ killall5), poweroff (link to halt), reboot (link to halt), runlevel, shutdown, s
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="halt"><command>halt</command></term>
+<varlistentry id="halt">
+<term><command>halt</command></term>
<listitem>
<indexterm zone="ch-system-sysvinit halt"><primary sortas="b-halt">halt</primary></indexterm>
<para>normally invokes shutdown with the -h flag,
@@ -125,8 +125,8 @@ system is being brought down.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="init"><command>init</command></term>
+<varlistentry id="init">
+<term><command>init</command></term>
<listitem>
<indexterm zone="ch-system-sysvinit init"><primary sortas="b-init">init</primary></indexterm>
<para>is the mother of all processes. It reads its
@@ -135,8 +135,8 @@ scripts to run for which run-level, and how many gettys to spawn.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="killall5"><command>killall5</command></term>
+<varlistentry id="killall5">
+<term><command>killall5</command></term>
<listitem>
<indexterm zone="ch-system-sysvinit killall5"><primary sortas="b-killall5">killall5</primary></indexterm>
<para>sends a signal to all processes, except the processes in its own session --
@@ -144,8 +144,8 @@ so it won't kill the shell running the script that called it.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="last"><command>last</command></term>
+<varlistentry id="last">
+<term><command>last</command></term>
<listitem>
<indexterm zone="ch-system-sysvinit last"><primary sortas="b-last">last</primary></indexterm>
<para>shows which users last logged in (and out),
@@ -154,8 +154,8 @@ also show system boots and shutdowns, and run-level changes.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="lastb"><command>lastb</command></term>
+<varlistentry id="lastb">
+<term><command>lastb</command></term>
<listitem>
<indexterm zone="ch-system-sysvinit lastb"><primary sortas="b-lastb">lastb</primary></indexterm>
<para>shows the failed login attempts, as logged in
@@ -163,8 +163,8 @@ also show system boots and shutdowns, and run-level changes.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mesg"><command>mesg</command></term>
+<varlistentry id="mesg">
+<term><command>mesg</command></term>
<listitem>
<indexterm zone="ch-system-sysvinit mesg"><primary sortas="b-mesg">mesg</primary></indexterm>
<para>controls whether other users can send
@@ -172,16 +172,16 @@ messages to the current user's terminal.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pidof"><command>pidof</command></term>
+<varlistentry id="pidof">
+<term><command>pidof</command></term>
<listitem>
<indexterm zone="ch-system-sysvinit pidof"><primary sortas="b-pidof">pidof</primary></indexterm>
<para>reports the PIDs of the given programs.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="poweroff"><command>poweroff</command></term>
+<varlistentry id="poweroff">
+<term><command>poweroff</command></term>
<listitem>
<indexterm zone="ch-system-sysvinit poweroff"><primary sortas="b-poweroff">poweroff</primary></indexterm>
<para>tells the kernel to halt the system and
@@ -189,16 +189,16 @@ switch off the computer. But see halt.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="reboot"><command>reboot</command></term>
+<varlistentry id="reboot">
+<term><command>reboot</command></term>
<listitem>
<indexterm zone="ch-system-sysvinit reboot"><primary sortas="b-reboot">reboot</primary></indexterm>
<para>tells the kernel to reboot the system. But see halt.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="runlevel"><command>runlevel</command></term>
+<varlistentry id="runlevel">
+<term><command>runlevel</command></term>
<listitem>
<indexterm zone="ch-system-sysvinit runlevel"><primary sortas="b-runlevel">runlevel</primary></indexterm>
<para>reports the previous and the current run-level, as noted in the last run-level
@@ -206,8 +206,8 @@ record in <filename>/var/run/utmp</filename>.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="shutdown"><command>shutdown</command></term>
+<varlistentry id="shutdown">
+<term><command>shutdown</command></term>
<listitem>
<indexterm zone="ch-system-sysvinit shutdown"><primary sortas="b-shutdown">shutdown</primary></indexterm>
<para>brings the system down in a secure way,
@@ -215,8 +215,8 @@ signaling all processes and notifying all logged-in users.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="sulogin"><command>sulogin</command></term>
+<varlistentry id="sulogin">
+<term><command>sulogin</command></term>
<listitem>
<indexterm zone="ch-system-sysvinit sulogin"><primary sortas="b-sulogin">sulogin</primary></indexterm>
<para>allows the superuser to log in. It is
@@ -224,24 +224,24 @@ normally invoked by init when the system goes into single user mode.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="telinit"><command>telinit</command></term>
+<varlistentry id="telinit">
+<term><command>telinit</command></term>
<listitem>
<indexterm zone="ch-system-sysvinit telinit"><primary sortas="b-telinit">telinit</primary></indexterm>
<para>tells init which run-level to enter.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="utmpdump"><command>utmpdump</command></term>
+<varlistentry id="utmpdump">
+<term><command>utmpdump</command></term>
<listitem>
<indexterm zone="ch-system-sysvinit utmpdump"><primary sortas="b-utmpdump">utmpdump</primary></indexterm>
<para>displays the content of the given login file in a friendlier format.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="wall"><command>wall</command></term>
+<varlistentry id="wall">
+<term><command>wall</command></term>
<listitem>
<indexterm zone="ch-system-sysvinit wall"><primary sortas="b-wall">wall</primary></indexterm>
<para>writes a message to all logged-in users.</para>
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index 1d457bf1f..d6de8d795 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -55,8 +55,8 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Sed</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="rmt"><command>rmt</command></term>
+<varlistentry id="rmt">
+<term><command>rmt</command></term>
<listitem>
<indexterm zone="ch-system-tar rmt"><primary sortas="b-rmt">rmt</primary></indexterm>
<para>is used to remotely manipulate a magnetic
@@ -64,8 +64,8 @@ tape drive, through an interprocess communication connection.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tar"><command>tar</command></term>
+<varlistentry id="tar">
+<term><command>tar</command></term>
<listitem>
<indexterm zone="ch-system-tar tar"><primary sortas="b-tar">tar</primary></indexterm>
<para>is used to create and extract files from archives, also known as tarballs.</para>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index a19c0351b..4e16bf28c 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -86,8 +86,8 @@ makeinfo, texi2dvi and texindex</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="info"><command>info</command></term>
+<varlistentry id="info">
+<term><command>info</command></term>
<listitem>
<indexterm zone="ch-system-texinfo info"><primary sortas="b-info">info</primary></indexterm>
<para>is used to read Info documents. Info
@@ -96,8 +96,8 @@ explaining all the flags. Compare for example man tar and info tar.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="infokey"><command>infokey</command></term>
+<varlistentry id="infokey">
+<term><command>infokey</command></term>
<listitem>
<indexterm zone="ch-system-texinfo infokey"><primary sortas="b-infokey">infokey</primary></indexterm>
<para>compiles a source file containing Info
@@ -105,16 +105,16 @@ customizations into a binary format.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="install-info"><command>install-info</command></term>
+<varlistentry id="install-info">
+<term><command>install-info</command></term>
<listitem>
<indexterm zone="ch-system-texinfo install-info"><primary sortas="b-install-info">install-info</primary></indexterm>
<para>is used to install Info files. It updates entries in the Info index file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="makeinfo"><command>makeinfo</command></term>
+<varlistentry id="makeinfo">
+<term><command>makeinfo</command></term>
<listitem>
<indexterm zone="ch-system-texinfo makeinfo"><primary sortas="b-makeinfo">makeinfo</primary></indexterm>
<para>translates the given Texinfo source
@@ -122,8 +122,8 @@ documents into various other formats: Info files, plain text, or HTML.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="texi2dvi"><command>texi2dvi</command></term>
+<varlistentry id="texi2dvi">
+<term><command>texi2dvi</command></term>
<listitem>
<indexterm zone="ch-system-texinfo texi2dvi"><primary sortas="b-texi2dvi">texi2dvi</primary></indexterm>
<para>is used to format the given Texinfo
@@ -131,8 +131,8 @@ document into a device-independent file that can be printed.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="texindex"><command>texindex</command></term>
+<varlistentry id="texindex">
+<term><command>texindex</command></term>
<listitem>
<indexterm zone="ch-system-texinfo texindex"><primary sortas="b-texindex">texindex</primary></indexterm>
<para>is used to sort Texinfo index files.</para>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 7ab4b6374..ac1413644 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -100,8 +100,8 @@ whereis and write</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="agetty"><command>agetty</command></term>
+<varlistentry id="agetty">
+<term><command>agetty</command></term>
<listitem>
<indexterm zone="ch-system-util-linux agetty"><primary sortas="b-agetty">agetty</primary></indexterm>
<para>opens a tty port, prompts for a login name,
@@ -109,56 +109,56 @@ and then invokes the login program.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="arch"><command>arch</command></term>
+<varlistentry id="arch">
+<term><command>arch</command></term>
<listitem>
<indexterm zone="ch-system-util-linux arch"><primary sortas="b-arch">arch</primary></indexterm>
<para>reports the machine's architecture.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="blockdev"><command>blockdev</command></term>
+<varlistentry id="blockdev">
+<term><command>blockdev</command></term>
<listitem>
<indexterm zone="ch-system-util-linux blockdev"><primary sortas="b-blockdev">blockdev</primary></indexterm>
<para>allows you to call block device ioctls from the command line.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="cal"><command>cal</command></term>
+<varlistentry id="cal">
+<term><command>cal</command></term>
<listitem>
<indexterm zone="ch-system-util-linux cal"><primary sortas="b-cal">cal</primary></indexterm>
<para>displays a simple calendar.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="cfdisk"><command>cfdisk</command></term>
+<varlistentry id="cfdisk">
+<term><command>cfdisk</command></term>
<listitem>
<indexterm zone="ch-system-util-linux cfdisk"><primary sortas="b-cfdisk">cfdisk</primary></indexterm>
<para>is used to manipulate the partition table of the given device.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="chkdupexe"><command>chkdupexe</command></term>
+<varlistentry id="chkdupexe">
+<term><command>chkdupexe</command></term>
<listitem>
<indexterm zone="ch-system-util-linux chkdupexe"><primary sortas="b-chkdupexe">chkdupexe</primary></indexterm>
<para>finds duplicate executables.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="col"><command>col</command></term>
+<varlistentry id="col">
+<term><command>col</command></term>
<listitem>
<indexterm zone="ch-system-util-linux col"><primary sortas="b-col">col</primary></indexterm>
<para>filters out reverse line feeds.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="colcrt"><command>colcrt</command></term>
+<varlistentry id="colcrt">
+<term><command>colcrt</command></term>
<listitem>
<indexterm zone="ch-system-util-linux colcrt"><primary sortas="b-colcrt">colcrt</primary></indexterm>
<para>is used to filter nroff output for terminals
@@ -166,24 +166,24 @@ that lack some capabilities such as overstriking and half-lines.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="colrm"><command>colrm</command></term>
+<varlistentry id="colrm">
+<term><command>colrm</command></term>
<listitem>
<indexterm zone="ch-system-util-linux colrm"><primary sortas="b-colrm">colrm</primary></indexterm>
<para>filters out the given columns.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="column"><command>column</command></term>
+<varlistentry id="column">
+<term><command>column</command></term>
<listitem>
<indexterm zone="ch-system-util-linux column"><primary sortas="b-column">column</primary></indexterm>
<para>formats a given file into multiple columns.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ctrlaltdel"><command>ctrlaltdel</command></term>
+<varlistentry id="ctrlaltdel">
+<term><command>ctrlaltdel</command></term>
<listitem>
<indexterm zone="ch-system-util-linux ctrlaltdel"><primary sortas="b-ctrlaltdel">ctrlaltdel</primary></indexterm>
<para>sets the function of the Ctrl+Alt+Del key combination to a hard or a
@@ -191,8 +191,8 @@ soft reset.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="cytune"><command>cytune</command></term>
+<varlistentry id="cytune">
+<term><command>cytune</command></term>
<listitem>
<indexterm zone="ch-system-util-linux cytune"><primary sortas="b-cytune">cytune</primary></indexterm>
<para>was used to tune the parameters of the
@@ -200,8 +200,8 @@ serial line drivers for Cyclades cards.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ddate"><command>ddate</command></term>
+<varlistentry id="ddate">
+<term><command>ddate</command></term>
<listitem>
<indexterm zone="ch-system-util-linux ddate"><primary sortas="b-ddate">ddate</primary></indexterm>
<para>gives the Discordian date, or converts the
@@ -209,16 +209,16 @@ given Gregorian date to a Discordian one.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="dmesg"><command>dmesg</command></term>
+<varlistentry id="dmesg">
+<term><command>dmesg</command></term>
<listitem>
<indexterm zone="ch-system-util-linux dmesg"><primary sortas="b-dmesg">dmesg</primary></indexterm>
<para>dumps the kernel boot messages.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="elvtune"><command>elvtune</command></term>
+<varlistentry id="elvtune">
+<term><command>elvtune</command></term>
<listitem>
<indexterm zone="ch-system-util-linux elvtune"><primary sortas="b-elvtune">elvtune</primary></indexterm>
<para>can be used to tune the performance
@@ -226,24 +226,24 @@ and interactivity of a block device.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="fdformat"><command>fdformat</command></term>
+<varlistentry id="fdformat">
+<term><command>fdformat</command></term>
<listitem>
<indexterm zone="ch-system-util-linux fdformat"><primary sortas="b-fdformat">fdformat</primary></indexterm>
<para>low-level formats a floppy disk.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="fdisk"><command>fdisk</command></term>
+<varlistentry id="fdisk">
+<term><command>fdisk</command></term>
<listitem>
<indexterm zone="ch-system-util-linux fdisk"><primary sortas="b-fdisk">fdisk</primary></indexterm>
<para>could be used to manipulate the partition table of the given device.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="fsck.cramfs"><command>fsck.cramfs</command></term>
+<varlistentry id="fsck.cramfs">
+<term><command>fsck.cramfs</command></term>
<listitem>
<indexterm zone="ch-system-util-linux fsck.cramfs"><primary sortas="b-fsck.cramfs">fsck.cramfs</primary></indexterm>
<para>performs a consistency check on the
@@ -251,8 +251,8 @@ Cramfs file system on the given device.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="fsck.minix"><command>fsck.minix</command></term>
+<varlistentry id="fsck.minix">
+<term><command>fsck.minix</command></term>
<listitem>
<indexterm zone="ch-system-util-linux fsck.minix"><primary sortas="b-fsck.minix">fsck.minix</primary></indexterm>
<para>performs a consistency check on the
@@ -260,24 +260,24 @@ Minix file system on the given device.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="getopt"><command>getopt</command></term>
+<varlistentry id="getopt">
+<term><command>getopt</command></term>
<listitem>
<indexterm zone="ch-system-util-linux getopt"><primary sortas="b-getopt">getopt</primary></indexterm>
<para>parses options in the given command line.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="hexdump"><command>hexdump</command></term>
+<varlistentry id="hexdump">
+<term><command>hexdump</command></term>
<listitem>
<indexterm zone="ch-system-util-linux hexdump"><primary sortas="b-hexdump">hexdump</primary></indexterm>
<para>dumps the given file in hexadecimal, or in another given format.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="hwclock"><command>hwclock</command></term>
+<varlistentry id="hwclock">
+<term><command>hwclock</command></term>
<listitem>
<indexterm zone="ch-system-util-linux hwclock"><primary sortas="b-hwclock">hwclock</primary></indexterm>
<para>is used to read or set the system's hardware clock, also called the RTC
@@ -285,64 +285,64 @@ Minix file system on the given device.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ipcrm"><command>ipcrm</command></term>
+<varlistentry id="ipcrm">
+<term><command>ipcrm</command></term>
<listitem>
<indexterm zone="ch-system-util-linux ipcrm"><primary sortas="b-ipcrm">ipcrm</primary></indexterm>
<para>removes the given IPC resource.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ipcs"><command>ipcs</command></term>
+<varlistentry id="ipcs">
+<term><command>ipcs</command></term>
<listitem>
<indexterm zone="ch-system-util-linux ipcs"><primary sortas="b-ipcs">ipcs</primary></indexterm>
<para>provides IPC status information.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="isosize"><command>isosize</command></term>
+<varlistentry id="isosize">
+<term><command>isosize</command></term>
<listitem>
<indexterm zone="ch-system-util-linux isosize"><primary sortas="b-isosize">isosize</primary></indexterm>
<para>reports the size of an iso9660 file system.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="line"><command>line</command></term>
+<varlistentry id="line">
+<term><command>line</command></term>
<listitem>
<indexterm zone="ch-system-util-linux line"><primary sortas="b-line">line</primary></indexterm>
<para>copies a single line.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="logger"><command>logger</command></term>
+<varlistentry id="logger">
+<term><command>logger</command></term>
<listitem>
<indexterm zone="ch-system-util-linux logger"><primary sortas="b-logger">logger</primary></indexterm>
<para>enters the given message into the system log.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="look"><command>look</command></term>
+<varlistentry id="look">
+<term><command>look</command></term>
<listitem>
<indexterm zone="ch-system-util-linux look"><primary sortas="b-look">look</primary></indexterm>
<para>displays lines that begin with the given string.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="losetup"><command>losetup</command></term>
+<varlistentry id="losetup">
+<term><command>losetup</command></term>
<listitem>
<indexterm zone="ch-system-util-linux losetup"><primary sortas="b-losetup">losetup</primary></indexterm>
<para>is used to set up and control loop devices.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mcookie"><command>mcookie</command></term>
+<varlistentry id="mcookie">
+<term><command>mcookie</command></term>
<listitem>
<indexterm zone="ch-system-util-linux mcookie"><primary sortas="b-mcookie">mcookie</primary></indexterm>
<para>generates magic cookies, 128-bit random hexadecimal numbers,
@@ -350,8 +350,8 @@ for xauth.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mkfs"><command>mkfs</command></term>
+<varlistentry id="mkfs">
+<term><command>mkfs</command></term>
<listitem>
<indexterm zone="ch-system-util-linux mkfs"><primary sortas="b-mkfs">mkfs</primary></indexterm>
<para>is used to build a file system on a device
@@ -359,40 +359,40 @@ for xauth.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mkfs.bfs"><command>mkfs.bfs</command></term>
+<varlistentry id="mkfs.bfs">
+<term><command>mkfs.bfs</command></term>
<listitem>
<indexterm zone="ch-system-util-linux mkfs.bfs"><primary sortas="b-mkfs.bfs">mkfs.bfs</primary></indexterm>
<para>creates an SCO (Santa Cruz Operations) bfs file system.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mkfs.cramfs"><command>mkfs.cramfs</command></term>
+<varlistentry id="mkfs.cramfs">
+<term><command>mkfs.cramfs</command></term>
<listitem>
<indexterm zone="ch-system-util-linux mkfs.cramfs"><primary sortas="b-mkfs.cramfs">mkfs.cramfs</primary></indexterm>
<para>creates a cramfs file system.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mkfs.minix"><command>mkfs.minix</command></term>
+<varlistentry id="mkfs.minix">
+<term><command>mkfs.minix</command></term>
<listitem>
<indexterm zone="ch-system-util-linux mkfs.minix"><primary sortas="b-mkfs.minix">mkfs.minix</primary></indexterm>
<para>creates a Minix file system.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mkswap"><command>mkswap</command></term>
+<varlistentry id="mkswap">
+<term><command>mkswap</command></term>
<listitem>
<indexterm zone="ch-system-util-linux mkswap"><primary sortas="b-mkswap">mkswap</primary></indexterm>
<para>initializes the given device or file to be used as a swap area.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="more"><command>more</command></term>
+<varlistentry id="more">
+<term><command>more</command></term>
<listitem>
<indexterm zone="ch-system-util-linux more"><primary sortas="b-more">more</primary></indexterm>
<para>is a filter for paging through text one
@@ -400,8 +400,8 @@ screen full at a time. But less is much better.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mount"><command>mount</command></term>
+<varlistentry id="mount">
+<term><command>mount</command></term>
<listitem>
<indexterm zone="ch-system-util-linux mount"><primary sortas="b-mount">mount</primary></indexterm>
<para>attaches the file system on the given device to a specified directory (thus
@@ -409,24 +409,24 @@ hiding the contents of that directory) in the file-system tree.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="namei"><command>namei</command></term>
+<varlistentry id="namei">
+<term><command>namei</command></term>
<listitem>
<indexterm zone="ch-system-util-linux namei"><primary sortas="b-namei">namei</primary></indexterm>
<para>shows the symbolic links in the given pathnames.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pg"><command>pg</command></term>
+<varlistentry id="pg">
+<term><command>pg</command></term>
<listitem>
<indexterm zone="ch-system-util-linux pg"><primary sortas="b-pg">pg</primary></indexterm>
<para>displays a text file one screen full at a time.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pivot_root"><command>pivot_root</command></term>
+<varlistentry id="pivot_root">
+<term><command>pivot_root</command></term>
<listitem>
<indexterm zone="ch-system-util-linux pivot_root"><primary sortas="b-pivot_root">pivot_root</primary></indexterm>
<para>makes the given file system the new
@@ -434,16 +434,16 @@ root file system of the current process.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ramsize"><command>ramsize</command></term>
+<varlistentry id="ramsize">
+<term><command>ramsize</command></term>
<listitem>
<indexterm zone="ch-system-util-linux ramsize"><primary sortas="b-ramsize">ramsize</primary></indexterm>
<para>is used to set the size of the RAM disk in a bootable image.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="rdev"><command>rdev</command></term>
+<varlistentry id="rdev">
+<term><command>rdev</command></term>
<listitem>
<indexterm zone="ch-system-util-linux rdev"><primary sortas="b-rdev">rdev</primary></indexterm>
<para>is used to query and set the root
@@ -451,48 +451,48 @@ device and other things in a bootable image.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="readprofile"><command>readprofile</command></term>
+<varlistentry id="readprofile">
+<term><command>readprofile</command></term>
<listitem>
<indexterm zone="ch-system-util-linux readprofile"><primary sortas="b-readprofile">readprofile</primary></indexterm>
<para>reads kernel profiling information.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="rename"><command>rename</command></term>
+<varlistentry id="rename">
+<term><command>rename</command></term>
<listitem>
<indexterm zone="ch-system-util-linux rename"><primary sortas="b-rename">rename</primary></indexterm>
<para>renames the given files, replacing a given string with another.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="renice"><command>renice</command></term>
+<varlistentry id="renice">
+<term><command>renice</command></term>
<listitem>
<indexterm zone="ch-system-util-linux renice"><primary sortas="b-renice">renice</primary></indexterm>
<para>is used to alter the priority of running processes.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="rev"><command>rev</command></term>
+<varlistentry id="rev">
+<term><command>rev</command></term>
<listitem>
<indexterm zone="ch-system-util-linux rev"><primary sortas="b-rev">rev</primary></indexterm>
<para>reverses the lines of a given file.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="rootflags"><command>rootflags</command></term>
+<varlistentry id="rootflags">
+<term><command>rootflags</command></term>
<listitem>
<indexterm zone="ch-system-util-linux rootflags"><primary sortas="b-rootflags">rootflags</primary></indexterm>
<para>is used to set the rootflags in a bootable image.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="script"><command>script</command></term>
+<varlistentry id="script">
+<term><command>script</command></term>
<listitem>
<indexterm zone="ch-system-util-linux script"><primary sortas="b-script">script</primary></indexterm>
<para>makes a typescript of a terminal session, of everything printed to
@@ -500,72 +500,72 @@ the terminal.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="setfdprm"><command>setfdprm</command></term>
+<varlistentry id="setfdprm">
+<term><command>setfdprm</command></term>
<listitem>
<indexterm zone="ch-system-util-linux setfdprm"><primary sortas="b-setfdprm">setfdprm</primary></indexterm>
<para>sets user-provided floppy disk parameters.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="setsid"><command>setsid</command></term>
+<varlistentry id="setsid">
+<term><command>setsid</command></term>
<listitem>
<indexterm zone="ch-system-util-linux setsid"><primary sortas="b-setsid">setsid</primary></indexterm>
<para>runs the given program in a new session.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="setterm"><command>setterm</command></term>
+<varlistentry id="setterm">
+<term><command>setterm</command></term>
<listitem>
<indexterm zone="ch-system-util-linux setterm"><primary sortas="b-setterm">setterm</primary></indexterm>
<para>is used to set terminal attributes.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="sfdisk"><command>sfdisk</command></term>
+<varlistentry id="sfdisk">
+<term><command>sfdisk</command></term>
<listitem>
<indexterm zone="ch-system-util-linux sfdisk"><primary sortas="b-sfdisk">sfdisk</primary></indexterm>
<para>is a disk partition table manipulator.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="swapdev"><command>swapdev</command></term>
+<varlistentry id="swapdev">
+<term><command>swapdev</command></term>
<listitem>
<indexterm zone="ch-system-util-linux swapdev"><primary sortas="b-swapdev">swapdev</primary></indexterm>
<para>is used to set the swap device in a bootable image.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="swapoff"><command>swapoff</command></term>
+<varlistentry id="swapoff">
+<term><command>swapoff</command></term>
<listitem>
<indexterm zone="ch-system-util-linux swapoff"><primary sortas="b-swapoff">swapoff</primary></indexterm>
<para>disables devices and files for paging and swapping.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="swapon"><command>swapon</command></term>
+<varlistentry id="swapon">
+<term><command>swapon</command></term>
<listitem>
<indexterm zone="ch-system-util-linux swapon"><primary sortas="b-swapon">swapon</primary></indexterm>
<para>enables devices and files for paging and swapping.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tunelp"><command>tunelp</command></term>
+<varlistentry id="tunelp">
+<term><command>tunelp</command></term>
<listitem>
<indexterm zone="ch-system-util-linux tunelp"><primary sortas="b-tunelp">tunelp</primary></indexterm>
<para>is used to tune the parameters of the line printer.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ul"><command>ul</command></term>
+<varlistentry id="ul">
+<term><command>ul</command></term>
<listitem>
<indexterm zone="ch-system-util-linux ul"><primary sortas="b-ul">ul</primary></indexterm>
<para>is a filter for translating underscores into
@@ -573,24 +573,24 @@ escape sequences indicating underlining for the terminal in use.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="umount"><command>umount</command></term>
+<varlistentry id="umount">
+<term><command>umount</command></term>
<listitem>
<indexterm zone="ch-system-util-linux umount"><primary sortas="b-umount">umount</primary></indexterm>
<para>disconnects a file system from the system's file tree.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="vidmode"><command>vidmode</command></term>
+<varlistentry id="vidmode">
+<term><command>vidmode</command></term>
<listitem>
<indexterm zone="ch-system-util-linux vidmode"><primary sortas="b-vidmode">vidmode</primary></indexterm>
<para>could be used to set the video mode in a bootable image.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="whereis"><command>whereis</command></term>
+<varlistentry id="whereis">
+<term><command>whereis</command></term>
<listitem>
<indexterm zone="ch-system-util-linux whereis"><primary sortas="b-whereis">whereis</primary></indexterm>
<para>reports the location of binary, the
@@ -598,8 +598,8 @@ source, and the manual page for the given command.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="write"><command>write</command></term>
+<varlistentry id="write">
+<term><command>write</command></term>
<listitem>
<indexterm zone="ch-system-util-linux write"><primary sortas="b-write">write</primary></indexterm>
<para>sends a message to the given user,
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 7b1b2d7fc..ffb38e01e 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -134,16 +134,16 @@ vimtutor and xxd</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="efm_filter.pl"><command>efm_filter.pl</command></term>
+<varlistentry id="efm_filter.pl">
+<term><command>efm_filter.pl</command></term>
<listitem>
<indexterm zone="ch-system-vim efm_filter.pl"><primary sortas="b-efm_filter.pl">efm_filter.pl</primary></indexterm>
<para>is a filter for creating an error file that can be read by vim.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="efm_perl.pl"><command>efm_perl.pl</command></term>
+<varlistentry id="efm_perl.pl">
+<term><command>efm_perl.pl</command></term>
<listitem>
<indexterm zone="ch-system-vim efm_perl.pl"><primary sortas="b-efm_perl.pl">efm_perl.pl</primary></indexterm>
<para>reformats the error messages of the
@@ -151,48 +151,48 @@ Perl interpreter for use with the <quote>quickfix</quote> mode of vim.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ex"><command>ex</command></term>
+<varlistentry id="ex">
+<term><command>ex</command></term>
<listitem>
<indexterm zone="ch-system-vim ex"><primary sortas="b-ex">ex</primary></indexterm>
<para>starts vim in ex mode.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="less.sh"><command>less.sh</command></term>
+<varlistentry id="less.sh">
+<term><command>less.sh</command></term>
<listitem>
<indexterm zone="ch-system-vim less.sh"><primary sortas="b-less.sh">less.sh</primary></indexterm>
<para>is a script that starts vim with less.vim.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mve.awk"><command>mve.awk</command></term>
+<varlistentry id="mve.awk">
+<term><command>mve.awk</command></term>
<listitem>
<indexterm zone="ch-system-vim mve.awk"><primary sortas="b-mve.awk">mve.awk</primary></indexterm>
<para>processes vim errors.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="pltags.pl"><command>pltags.pl</command></term>
+<varlistentry id="pltags.pl">
+<term><command>pltags.pl</command></term>
<listitem>
<indexterm zone="ch-system-vim pltags.pl"><primary sortas="b-pltags.pl">pltags.pl</primary></indexterm>
<para>creates a tags file for perl code, for use by vim.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ref"><command>ref</command></term>
+<varlistentry id="ref">
+<term><command>ref</command></term>
<listitem>
<indexterm zone="ch-system-vim ref"><primary sortas="b-ref">ref</primary></indexterm>
<para>checks the spelling of arguments.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="rview"><command>rview</command></term>
+<varlistentry id="rview">
+<term><command>rview</command></term>
<listitem>
<indexterm zone="ch-system-vim rview"><primary sortas="b-rview">rview</primary></indexterm>
<para>is a restricted version of view: no shell
@@ -200,8 +200,8 @@ commands can be started and view can't be suspended.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="rvim"><command>rvim</command></term>
+<varlistentry id="rvim">
+<term><command>rvim</command></term>
<listitem>
<indexterm zone="ch-system-vim rvim"><primary sortas="b-rvim">rvim</primary></indexterm>
<para>is a restricted version of vim: no shell
@@ -209,72 +209,72 @@ commands can be started and vim can't be suspended.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="shtags.pl"><command>shtags.pl</command></term>
+<varlistentry id="shtags.pl">
+<term><command>shtags.pl</command></term>
<listitem>
<indexterm zone="ch-system-vim shtags.pl"><primary sortas="b-shtags.pl">shtags.pl</primary></indexterm>
<para>generates a tag file for perl scripts.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="tcltags"><command>tcltags</command></term>
+<varlistentry id="tcltags">
+<term><command>tcltags</command></term>
<listitem>
<indexterm zone="ch-system-vim tcltags"><primary sortas="b-tcltags">tcltags</primary></indexterm>
<para>generates a tag file for TCL code.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="view"><command>view</command></term>
+<varlistentry id="view">
+<term><command>view</command></term>
<listitem>
<indexterm zone="ch-system-vim view"><primary sortas="b-view">view</primary></indexterm>
<para>starts vim in read-only mode.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="vim"><command>vim</command></term>
+<varlistentry id="vim">
+<term><command>vim</command></term>
<listitem>
<indexterm zone="ch-system-vim vim"><primary sortas="b-vim">vim</primary></indexterm>
<para>is the editor.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="vim132"><command>vim132</command></term>
+<varlistentry id="vim132">
+<term><command>vim132</command></term>
<listitem>
<indexterm zone="ch-system-vim vim132"><primary sortas="b-vim132">vim132</primary></indexterm>
<para>starts vim with the terminal in 132-column mode.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="vim2html.pl"><command>vim2html.pl</command></term>
+<varlistentry id="vim2html.pl">
+<term><command>vim2html.pl</command></term>
<listitem>
<indexterm zone="ch-system-vim vim2html.pl"><primary sortas="b-vim2html.pl">vim2html.pl</primary></indexterm>
<para>converts vim documentation to HTML.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="vimdiff"><command>vimdiff</command></term>
+<varlistentry id="vimdiff">
+<term><command>vimdiff</command></term>
<listitem>
<indexterm zone="ch-system-vim vimdiff"><primary sortas="b-vimdiff">vimdiff</primary></indexterm>
<para>edits two or three versions of a file with vim and show differences.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="vimm"><command>vimm</command></term>
+<varlistentry id="vimm">
+<term><command>vimm</command></term>
<listitem>
<indexterm zone="ch-system-vim vimm"><primary sortas="b-vimm">vimm</primary></indexterm>
<para>enables the DEC locator input model on a remote terminal.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="vimspell.sh"><command>vimspell.sh</command></term>
+<varlistentry id="vimspell.sh">
+<term><command>vimspell.sh</command></term>
<listitem>
<indexterm zone="ch-system-vim vimspell.sh"><primary sortas="b-vimspell.sh">vimspell.sh</primary></indexterm>
<para>is a script which spells a file and generates the syntax statements necessary
@@ -283,16 +283,16 @@ command, which is provided neither in LFS nor in BLFS.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="vimtutor"><command>vimtutor</command></term>
+<varlistentry id="vimtutor">
+<term><command>vimtutor</command></term>
<listitem>
<indexterm zone="ch-system-vim vimtutor"><primary sortas="b-vimtutor">vimtutor</primary></indexterm>
<para>teaches you the basic keys and commands of vim.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="xxd"><command>xxd</command></term>
+<varlistentry id="xxd">
+<term><command>xxd</command></term>
<listitem>
<indexterm zone="ch-system-vim xxd"><primary sortas="b-xxd">xxd</primary></indexterm>
<para>makes a hex dump of the given file. It can
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index 08cdfbf79..fe893e2c3 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -97,8 +97,8 @@ because we just moved the file it points to:</para>
<variablelist><title>Short description</title>
-<varlistentry>
-<term id="libz"><command>libz*</command></term>
+<varlistentry id="libz">
+<term><command>libz*</command></term>
<listitem>
<indexterm zone="ch-system-zlib libz"><primary sortas="c-libz*">libz*</primary></indexterm>
<para>contains compression and un-compression
diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml
index fee55dbbe..89f3c4f6e 100644
--- a/chapter07/bootscripts.xml
+++ b/chapter07/bootscripts.xml
@@ -49,8 +49,8 @@ swap, sysklogd and template</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="checkfs-bootscripts"><command>checkfs</command></term>
+<varlistentry id="checkfs-bootscripts">
+<term><command>checkfs</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts checkfs-bootscripts"><primary sortas="d-checkfs">checkfs</primary></indexterm>
<para>checks the file systems just before they are mounted (with the exception of journal
@@ -58,8 +58,8 @@ and network based file systems).</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="cleanfs-bootscripts"><command>cleanfs</command></term>
+<varlistentry id="cleanfs-bootscripts">
+<term><command>cleanfs</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts cleanfs-bootscripts"><primary sortas="d-cleanfs">cleanfs</primary></indexterm>
<para>removes files that shouldn't be
@@ -70,8 +70,8 @@ and removes the possibly present <filename>/etc/nologin</filename>,
</listitem>
</varlistentry>
-<varlistentry>
-<term id="console-bootscripts"><command>console</command></term>
+<varlistentry id="console-bootscripts">
+<term><command>console</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts console-bootscripts"><primary sortas="d-console">console</primary></indexterm>
<para>loads the keymap table you specified as proper for your keyboard layout.
@@ -79,8 +79,8 @@ It also sets the screen font.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="functions-bootscripts"><command>functions</command></term>
+<varlistentry id="functions-bootscripts">
+<term><command>functions</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts functions-bootscripts"><primary sortas="d-functions">functions</primary></indexterm>
<para>contains functions shared among
@@ -88,32 +88,32 @@ different scripts, such as error and status checking.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="halt-bootscripts"><command>halt</command></term>
+<varlistentry id="halt-bootscripts">
+<term><command>halt</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts halt-bootscripts"><primary sortas="d-halt">halt</primary></indexterm>
<para>halts the system.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="ifdown-bootscripts"><command>ifdown</command> and <command>ifup</command></term>
+<varlistentry id="ifdown-bootscripts">
+<term><command>ifdown</command> and <command>ifup</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts ifdown-bootscripts"><primary sortas="d-ifdown">ifdown</primary></indexterm>
<para>assist the network script with network devices.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="localnet-bootscripts"><command>localnet</command></term>
+<varlistentry id="localnet-bootscripts">
+<term><command>localnet</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts localnet-bootscripts"><primary sortas="d-localnet">localnet</primary></indexterm>
<para>sets up the system's hostname and local loopback device.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mountfs-bootscripts"><command>mountfs</command></term>
+<varlistentry id="mountfs-bootscripts">
+<term><command>mountfs</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts mountfs-bootscripts"><primary sortas="d-mountfs">mountfs</primary></indexterm>
<para>mounts all file systems that
@@ -121,16 +121,16 @@ aren't marked <emphasis>noauto</emphasis> or aren't network based.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="mountkernfs-bootscripts"><command>mountkernfs</command></term>
+<varlistentry id="mountkernfs-bootscripts">
+<term><command>mountkernfs</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts mountkernfs-bootscripts"><primary sortas="d-mountkernfs">mountkernfs</primary></indexterm>
<para>is used to mount kernel-provided file systems, such as /proc.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="network-bootscripts"><command>network</command></term>
+<varlistentry id="network-bootscripts">
+<term><command>network</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts network-bootscripts"><primary sortas="d-network">network</primary></indexterm>
<para>sets up network interfaces, such
@@ -138,8 +138,8 @@ as network cards, and sets up the default gateway where applicable.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="rc-bootscripts"><command>rc</command></term>
+<varlistentry id="rc-bootscripts">
+<term><command>rc</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts rc-bootscripts"><primary sortas="d-rc">rc</primary></indexterm>
<para>is the master run-level control script.
@@ -148,24 +148,24 @@ determined by the name of the symbolic links being processed.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="reboot-bootscripts"><command>reboot</command></term>
+<varlistentry id="reboot-bootscripts">
+<term><command>reboot</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts reboot-bootscripts"><primary sortas="d-reboot">reboot</primary></indexterm>
<para>reboots the system.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="sendsignals-bootscripts"><command>sendsignals</command></term>
+<varlistentry id="sendsignals-bootscripts">
+<term><command>sendsignals</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts sendsignals-bootscripts"><primary sortas="d-sendsignals">sendsignals</primary></indexterm>
<para>makes sure every process is terminated before the system reboots or halts.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="setclock-bootscripts"><command>setclock</command></term>
+<varlistentry id="setclock-bootscripts">
+<term><command>setclock</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts setclock-bootscripts"><primary sortas="d-setclock">setclock</primary></indexterm>
<para>resets the kernel clock to
@@ -173,8 +173,8 @@ localtime in case the hardware clock isn't set to GMT time.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="static-bootscripts"><command>static</command></term>
+<varlistentry id="static-bootscripts">
+<term><command>static</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts static-bootscripts"><primary sortas="d-static">static</primary></indexterm>
<para>provides the functionality needed
@@ -182,24 +182,24 @@ to assign a static IP address to a network interface.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="swap-bootscripts"><command>swap</command></term>
+<varlistentry id="swap-bootscripts">
+<term><command>swap</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts swap-bootscripts"><primary sortas="d-swap">swap</primary></indexterm>
<para>enables and disables swap files and partitions.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="sysklogd-bootscripts"><command>sysklogd</command></term>
+<varlistentry id="sysklogd-bootscripts">
+<term><command>sysklogd</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts sysklogd-bootscripts"><primary sortas="d-sysklogd">sysklogd</primary></indexterm>
<para>starts and stops the system and kernel log daemons.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="template-bootscripts"><command>template</command></term>
+<varlistentry id="template-bootscripts">
+<term><command>template</command></term>
<listitem>
<indexterm zone="ch-scripts-bootscripts template-bootscripts"><primary sortas="d-template">template</primary></indexterm>
<para>is a template you can use to
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 6013089e5..6c5123ee0 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -145,8 +145,8 @@ and the System.map</seg></seglistitem>
<variablelist><title>Short descriptions</title>
-<varlistentry>
-<term id="kernel">The <emphasis>kernel</emphasis></term>
+<varlistentry id="kernel">
+<term>The <emphasis>kernel</emphasis></term>
<listitem>
<indexterm zone="ch-bootable-kernel kernel"><primary sortas="b-kernel">kernel</primary></indexterm>
<para>is the engine of your GNU/Linux system.
@@ -158,8 +158,8 @@ of running scores of programs seemingly at the same time.</para>
</listitem>
</varlistentry>
-<varlistentry>
-<term id="kernel-headers">The <emphasis>kernel headers</emphasis></term>
+<varlistentry id="kernel-headers">
+<term>The <emphasis>kernel headers</emphasis></term>
<listitem>
<indexterm zone="ch-bootable-kernel kernel-headers"><primary sortas="e-kernel-headers">kernel headers</primary></indexterm>
<para>define the interface to the
@@ -170,8 +170,8 @@ the ones against which Glibc was compiled and should therefore
</listitem>
</varlistentry>
-<varlistentry>
-<term id="System.map"><filename>System.map</filename></term>
+<varlistentry id="System.map">
+<term><filename>System.map</filename></term>
<listitem>
<indexterm zone="ch-bootable-kernel System.map"><primary sortas="e-/boot/System.map">/boot/System.map</primary></indexterm>
<para>is a list of addresses and symbols. It maps the entry points and addresses