Index: chapter06/util-linux.xml
===================================================================
--- chapter06/util-linux.xml	(revision df8334f9247ba4aca231fab539c83a0a986236ee)
+++ chapter06/util-linux.xml	(revision b6a95185f527abd5468542cb51d35bb848e02758)
@@ -101,6 +101,6 @@
 <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>
@@ -110,6 +110,6 @@
 </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>
@@ -118,6 +118,6 @@
 </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>
@@ -126,6 +126,6 @@
 </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>
@@ -134,6 +134,6 @@
 </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>
@@ -142,6 +142,6 @@
 </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>
@@ -150,6 +150,6 @@
 </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>
@@ -158,6 +158,6 @@
 </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>
@@ -167,6 +167,6 @@
 </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>
@@ -175,6 +175,6 @@
 </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>
@@ -183,6 +183,6 @@
 </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>
@@ -192,6 +192,6 @@
 </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>
@@ -201,6 +201,6 @@
 </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>
@@ -210,6 +210,6 @@
 </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>
@@ -218,6 +218,6 @@
 </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>
@@ -227,6 +227,6 @@
 </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>
@@ -235,6 +235,6 @@
 </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>
@@ -243,6 +243,6 @@
 </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>
@@ -252,6 +252,6 @@
 </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>
@@ -261,6 +261,6 @@
 </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>
@@ -269,6 +269,6 @@
 </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>
@@ -277,6 +277,6 @@
 </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>
@@ -286,6 +286,6 @@
 </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>
@@ -294,6 +294,6 @@
 </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>
@@ -302,6 +302,6 @@
 </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>
@@ -310,6 +310,6 @@
 </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>
@@ -318,6 +318,6 @@
 </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>
@@ -326,6 +326,6 @@
 </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>
@@ -334,6 +334,6 @@
 </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>
@@ -342,6 +342,6 @@
 </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>
@@ -351,6 +351,6 @@
 </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>
@@ -360,6 +360,6 @@
 </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>
@@ -368,6 +368,6 @@
 </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>
@@ -376,6 +376,6 @@
 </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>
@@ -384,6 +384,6 @@
 </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>
@@ -392,6 +392,6 @@
 </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>
@@ -401,6 +401,6 @@
 </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>
@@ -410,6 +410,6 @@
 </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>
@@ -418,6 +418,6 @@
 </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>
@@ -426,6 +426,6 @@
 </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>
@@ -435,6 +435,6 @@
 </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>
@@ -443,6 +443,6 @@
 </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>
@@ -452,6 +452,6 @@
 </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>
@@ -460,6 +460,6 @@
 </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>
@@ -468,6 +468,6 @@
 </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>
@@ -476,6 +476,6 @@
 </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>
@@ -484,6 +484,6 @@
 </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>
@@ -492,6 +492,6 @@
 </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>
@@ -501,6 +501,6 @@
 </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>
@@ -509,6 +509,6 @@
 </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>
@@ -517,6 +517,6 @@
 </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>
@@ -525,6 +525,6 @@
 </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>
@@ -533,6 +533,6 @@
 </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>
@@ -541,6 +541,6 @@
 </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>
@@ -549,6 +549,6 @@
 </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>
@@ -557,6 +557,6 @@
 </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>
@@ -565,6 +565,6 @@
 </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>
@@ -574,6 +574,6 @@
 </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>
@@ -582,6 +582,6 @@
 </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>
@@ -590,6 +590,6 @@
 </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>
@@ -599,6 +599,6 @@
 </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>
