Index: chapter06/coreutils.xml
===================================================================
--- chapter06/coreutils.xml	(revision c6cb3aa2f176d65a5ebe77e7da82e20946188a98)
+++ chapter06/coreutils.xml	(revision b8a819fd7bca2d339d92375130c556cca465aa1d)
@@ -112,6 +112,6 @@
 <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>
@@ -120,6 +120,6 @@
 </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>
@@ -128,6 +128,6 @@
 </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>
@@ -137,6 +137,6 @@
 </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>
@@ -147,6 +147,6 @@
 </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>
@@ -156,6 +156,6 @@
 </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>
@@ -166,6 +166,6 @@
 </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>
@@ -175,6 +175,6 @@
 </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>
@@ -184,6 +184,6 @@
 </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>
@@ -192,6 +192,6 @@
 </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>
@@ -202,6 +202,6 @@
 </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>
@@ -211,6 +211,6 @@
 </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>
@@ -219,6 +219,6 @@
 </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>
@@ -228,6 +228,6 @@
 </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>
@@ -238,6 +238,6 @@
 </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>
@@ -246,6 +246,6 @@
 </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>
@@ -255,6 +255,6 @@
 </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>
@@ -263,6 +263,6 @@
 </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>
@@ -273,6 +273,6 @@
 </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>
@@ -281,6 +281,6 @@
 </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>
@@ -289,6 +289,6 @@
 </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>
@@ -297,6 +297,6 @@
 </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>
@@ -305,6 +305,6 @@
 </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>
@@ -313,6 +313,6 @@
 </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>
@@ -322,6 +322,6 @@
 </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>
@@ -330,6 +330,6 @@
 </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>
@@ -338,6 +338,6 @@
 </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>
@@ -346,6 +346,6 @@
 </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>
@@ -354,6 +354,6 @@
 </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>
@@ -362,6 +362,6 @@
 </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>
@@ -370,6 +370,6 @@
 </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>
@@ -379,6 +379,6 @@
 </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>
@@ -388,6 +388,6 @@
 </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>
@@ -396,6 +396,6 @@
 </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>
@@ -404,6 +404,6 @@
 </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>
@@ -412,6 +412,6 @@
 </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>
@@ -420,6 +420,6 @@
 </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>
@@ -429,6 +429,6 @@
 </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>
@@ -437,6 +437,6 @@
 </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>
@@ -445,6 +445,6 @@
 </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>
@@ -454,6 +454,6 @@
 </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>
@@ -463,6 +463,6 @@
 </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>
@@ -471,6 +471,6 @@
 </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>
@@ -479,6 +479,6 @@
 </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>
@@ -487,6 +487,6 @@
 </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>
@@ -496,6 +496,6 @@
 </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>
@@ -504,6 +504,6 @@
 </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>
@@ -513,6 +513,6 @@
 </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>
@@ -521,6 +521,6 @@
 </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>
@@ -529,6 +529,6 @@
 </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>
@@ -537,6 +537,6 @@
 </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>
@@ -545,6 +545,6 @@
 </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>
@@ -554,6 +554,6 @@
 </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>
@@ -563,6 +563,6 @@
 </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>
@@ -571,6 +571,6 @@
 </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>
@@ -579,6 +579,6 @@
 </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>
@@ -587,6 +587,6 @@
 </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>
@@ -595,6 +595,6 @@
 </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>
@@ -604,6 +604,6 @@
 </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>
@@ -612,6 +612,6 @@
 </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>
@@ -621,6 +621,6 @@
 </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>
@@ -629,6 +629,6 @@
 </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>
@@ -637,6 +637,6 @@
 </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>
@@ -645,6 +645,6 @@
 </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>
@@ -653,6 +653,6 @@
 </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>
@@ -661,6 +661,6 @@
 </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>
@@ -669,6 +669,6 @@
 </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>
@@ -678,6 +678,6 @@
 </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>
@@ -686,6 +686,6 @@
 </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>
@@ -694,6 +694,6 @@
 </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>
@@ -703,6 +703,6 @@
 </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>
@@ -711,6 +711,6 @@
 </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>
@@ -721,6 +721,6 @@
 </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>
@@ -730,6 +730,6 @@
 </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>
@@ -739,6 +739,6 @@
 </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>
@@ -748,6 +748,6 @@
 </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>
@@ -756,6 +756,6 @@
 </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>
@@ -764,6 +764,6 @@
 </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>
@@ -772,6 +772,6 @@
 </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>
@@ -780,6 +780,6 @@
 </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>
@@ -788,6 +788,6 @@
 </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>
@@ -797,6 +797,6 @@
 </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>
@@ -805,6 +805,6 @@
 </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>
@@ -813,6 +813,6 @@
 </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>
@@ -822,6 +822,6 @@
 </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>
@@ -830,6 +830,6 @@
 </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>
@@ -838,6 +838,6 @@
 </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>
