Finished the XML indentation plus few tags changes.

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

10 files changed, 2559 insertions, 2014 deletions

diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index f4f2cff01..c5a5ebc9c 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -1,440 +1,541 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-system-shadow" role="wrap">
-<title>Shadow-&shadow-version;</title>
-<?dbhtml filename="shadow.html"?>
+  <?dbhtml filename="shadow.html"?>
+
+  <title>Shadow-&shadow-version;</title>
+
+  <indexterm zone="ch-system-shadow">
+    <primary sortas="a-Shadow">Shadow</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Shadow package contains programs for handling passwords in a secure
+    way.</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<indexterm zone="ch-system-shadow"><primary sortas="a-Shadow">Shadow</primary></indexterm>
+      <seglistitem>
+        <seg>0.4 SBU</seg>
+        <seg>14.7 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<sect2 role="package"><title/>
-<para>The Shadow package contains programs for handling passwords in a secure
-way.</para>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.4 SBU</seg><seg>14.7 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>Bash, Binutils, Bison, Coreutils, Diffutils, GCC, Gettext,
+        Glibc, Grep, Make, and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Bison, Coreutils,
-Diffutils, GCC, Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem>
-</segmentedlist>
-</sect2>
+  </sect2>
 
-<sect2 role="installation">
-<title>Installation of Shadow</title>
+  <sect2 role="installation">
+    <title>Installation of Shadow</title>
 
-<note><para>If you would like to enforce the use of strong passwords, refer to
-<ulink url="&blfs-root;view/svn/postlfs/cracklib.html"/> for installing Cracklib
-prior to building Shadow. Then add <parameter>--with-libcrack</parameter> to the
-<command>configure</command> command below.</para></note>
+    <note>
+      <para>If you would like to enforce the use of strong passwords, refer to
+      <ulink url="&blfs-root;view/svn/postlfs/cracklib.html"/> for installing
+      Cracklib prior to building Shadow. Then add
+      <parameter>--with-libcrack</parameter> to the <command>configure</command>
+      command below.</para>
+    </note>
 
-<para>Prepare Shadow for compilation:</para>
+    <para>Prepare Shadow for compilation:</para>
 
 <screen><userinput>./configure --libdir=/lib --enable-shared --without-selinux</userinput></screen>
 
-<para>The meaning of the configure options:</para>
+    <variablelist>
+      <title>The meaning of the configure options:</title>
 
-<variablelist>
-<varlistentry>
-<term><parameter>--without-selinux</parameter></term>
-<listitem><para>Support for selinux is enabled by default, but selinux is not
-built in a base LFS system.  The <command>configure</command> script will fail
-if this option is not used.</para></listitem>
-</varlistentry>
-</variablelist>
+      <varlistentry>
+        <term><parameter>--without-selinux</parameter></term>
+        <listitem>
+          <para>Support for selinux is enabled by default, but selinux is not
+          built in a base LFS system.  The <command>configure</command> script
+          will fail if this option is not used.</para>
+        </listitem>
+      </varlistentry>
 
-<para>Disable the installation of the <command>groups</command> program and its man page, as Coreutils provides a better version:</para>
+    </variablelist>
+
+    <para>Disable the installation of the <command>groups</command> program
+    and its man page, as Coreutils provides a better version:</para>
 
 <screen><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile
 find man -name Makefile -exec sed -i '/groups/d' {} \;</userinput></screen>
 
-<para>Disable the installation of Chinese and Korean manual pages, since Man-DB
-cannot format them properly:</para>
+    <para>Disable the installation of Chinese and Korean manual pages, since
+    Man-DB cannot format them properly:</para>
 
 <screen><userinput>sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package does not come with a test suite.</para>
+    <para>This package does not come with a test suite.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para id="shadow-limits-login_access">Shadow uses two files to configure
-authentication settings for the system. Install these two configuration
-files:</para>
+    <para id="shadow-limits-login_access">Shadow uses two files to configure
+    authentication settings for the system. Install these two configuration
+    files:</para>
+
+    <indexterm zone="shadow-limits-login_access">
+      <primary sortas="e-/etc/limits">/etc/limits</primary>
+    </indexterm>
 
-<indexterm zone="shadow-limits-login_access"><primary sortas="e-/etc/limits">/etc/limits</primary></indexterm>
-<indexterm zone="shadow-limits-login_access"><primary sortas="e-/etc/login.access">/etc/login.access</primary></indexterm>
+    <indexterm zone="shadow-limits-login_access">
+      <primary sortas="e-/etc/login.access">/etc/login.access</primary>
+    </indexterm>
 
 <screen><userinput>cp -v etc/{limits,login.access} /etc</userinput></screen>
 
-<para id="shadow-login_defs">Instead of using the default <emphasis>crypt</emphasis> method,
-use the more secure <emphasis>MD5</emphasis> method of password
-encryption, which also allows passwords longer than 8 characters. It
-is also necessary to change the obsolete <filename
-class="directory">/var/spool/mail</filename> location for user
-mailboxes that Shadow uses by default to the <filename
-class="directory">/var/mail</filename> location used currently. Both
-of these can be accomplished by changing the relevant configuration
-file while copying it to its destination:</para>
+    <para id="shadow-login_defs">Instead of using the default
+    <emphasis>crypt</emphasis> method, use the more secure
+    <emphasis>MD5</emphasis> method of password encryption, which also allows
+    passwords longer than 8 characters. It is also necessary to change the
+    obsolete <filename class="directory">/var/spool/mail</filename> location
+    for user mailboxes that Shadow uses by default to the <filename
+    class="directory">/var/mail</filename> location used currently. Both of
+    these can be accomplished by changing the relevant configuration file
+    while copying it to its destination:</para>
 
-<indexterm zone="shadow-login_defs"><primary sortas="e-/etc/login.defs">/etc/login.defs</primary></indexterm>
+    <indexterm zone="shadow-login_defs">
+      <primary sortas="e-/etc/login.defs">/etc/login.defs</primary>
+    </indexterm>
 
-<note><para>If you built Shadow with Cracklib support, insert the following into
-the <command>sed</command> given below:</para>
+    <note>
+      <para>If you built Shadow with Cracklib support, insert the following into
+      the <command>sed</command> given below:</para>
 
 <screen><literal>-e 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@'</literal></screen>
-</note>
+    </note>
 
 <screen><userinput>sed -e's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
     -e 's@/var/spool/mail@/var/mail@' \
     etc/login.defs &gt; /etc/login.defs</userinput></screen>
 
-<para>Move a misplaced program to its proper location:</para>
+    <para>Move a misplaced program to its proper location:</para>
 
 <screen><userinput>mv -v /usr/bin/passwd /bin</userinput></screen>
 
-<para>Move Shadow's libraries to more appropriate locations:</para>
+    <para>Move Shadow's libraries to more appropriate locations:</para>
 
 <screen><userinput>mv -v /lib/libshadow.*a /usr/lib
 rm -v /lib/libshadow.so
 ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen>
 
-<para>The <parameter>-D</parameter> option of the
-<command>useradd</command> program requires the <filename
-class="directory">/etc/default</filename> directory for it to work
-properly:</para>
+    <para>The <parameter>-D</parameter> option of the
+    <command>useradd</command> program requires the <filename
+    class="directory">/etc/default</filename> directory for it to work
+    properly:</para>
 
 <screen><userinput>mkdir -v /etc/default</userinput></screen>
 
-</sect2>
+  </sect2>
 
+  <sect2 id="conf-shadow" role="configuration">
+    <title>Configuring Shadow</title>
 
-<sect2 id="conf-shadow" role="configuration"><title>Configuring Shadow</title>
-<indexterm zone="conf-shadow">
-<primary sortas="a-Shadow">Shadow</primary>
-<secondary>configuring</secondary></indexterm>
+    <indexterm zone="conf-shadow">
+      <primary sortas="a-Shadow">Shadow</primary>
+      <secondary>configuring</secondary>
+    </indexterm>
 
-<para>This package contains utilities to add, modify, and delete users
-and groups; set and change their passwords; and perform other
-administrative tasks. For a full explanation of what
-<emphasis>password shadowing</emphasis> means, see the
-<filename>doc/HOWTO</filename> file within the unpacked source tree.
-If using Shadow support, keep in mind that programs which need to
-verify passwords (display managers, FTP programs, pop3 daemons, etc.)
-must be Shadow-compliant. That is, they need to be able to work with
-shadowed passwords.</para>
+    <para>This package contains utilities to add, modify, and delete users and
+    groups; set and change their passwords; and perform other administrative
+    tasks. For a full explanation of what <emphasis>password shadowing</emphasis>
+    means, see the <filename>doc/HOWTO</filename> file within the unpacked
+    source tree. If using Shadow support, keep in mind that programs which need
+    to verify passwords (display managers, FTP programs, pop3 daemons, etc.)
+    must be Shadow-compliant. That is, they need to be able to work with
+    shadowed passwords.</para>
 
-<para>To enable shadowed passwords, run the following command:</para>
+    <para>To enable shadowed passwords, run the following command:</para>
 
 <screen><userinput>pwconv</userinput></screen>
 
-<para>To enable shadowed group passwords, run:</para>
+    <para>To enable shadowed group passwords, run:</para>
 
 <screen><userinput>grpconv</userinput></screen>
 
-<para>Under normal circumstances, passwords will not have been created
-yet. However, if returning to this section later to enable shadowing,
-reset any current user passwords with the <command>passwd</command>
-command or any group passwords with the <command>gpasswd</command>
-command.</para>
-
-</sect2>
+    <para>Under normal circumstances, passwords will not have been created
+    yet. However, if returning to this section later to enable shadowing,
+    reset any current user passwords with the <command>passwd</command>
+    command or any group passwords with the <command>gpasswd</command>
+    command.</para>
 
+  </sect2>
 
-<sect2 role="configuration">
-<title>Setting the root password</title>
+  <sect2 role="configuration">
+    <title>Setting the root password</title>
 
-<para>Choose a password for user <emphasis>root</emphasis> and set it
-by running:</para>
+    <para>Choose a password for user <emphasis>root</emphasis> and set it
+    by running:</para>
 
 <screen role="nodump"><userinput>passwd root</userinput></screen>
-</sect2>
-
-
-<sect2 id="contents-shadow" role="content"><title>Contents of Shadow</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<segtitle>Installed libraries</segtitle>
-<seglistitem><seg>chage, chfn, chpasswd, chsh, expiry, faillog, gpasswd,
-groupadd, groupdel, groupmod, grpck, grpconv, grpunconv, lastlog, login,
-logoutd, newgrp, newusers, passwd, pwck, pwconv, pwunconv, sg (link to newgrp),
-su, useradd, userdel, usermod, vigr (link to vipw), and vipw</seg>
-<seg>libshadow.[a,so]</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="chage">
-<term><command>chage</command></term>
-<listitem>
-<para>Used to change the maximum number of days between obligatory
-password changes</para>
-<indexterm zone="ch-system-shadow chage"><primary sortas="b-chage">chage</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="chfn">
-<term><command>chfn</command></term>
-<listitem>
-<para>Used to change a user's full name and other information</para>
-<indexterm zone="ch-system-shadow chfn"><primary sortas="b-chfn">chfn</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="chpasswd">
-<term><command>chpasswd</command></term>
-<listitem>
-<para>Used to update the passwords of an entire series of user
-accounts</para>
-<indexterm zone="ch-system-shadow chpasswd"><primary sortas="b-chpasswd">chpasswd</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="chsh">
-<term><command>chsh</command></term>
-<listitem>
-<para>Used to change a user's default login shell</para>
-<indexterm zone="ch-system-shadow chsh"><primary sortas="b-chsh">chsh</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="expiry">
-<term><command>expiry</command></term>
-<listitem>
-<para>Checks and enforces the current password expiration policy</para>
-<indexterm zone="ch-system-shadow expiry"><primary sortas="b-expiry">expiry</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="faillog">
-<term><command>faillog</command></term>
-<listitem>
-<para>Is used to examine the log of login failures, to set a maximum number of
-failures before an account is blocked, or to reset the failure count</para>
-<indexterm zone="ch-system-shadow faillog"><primary sortas="b-faillog">faillog</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="gpasswd">
-<term><command>gpasswd</command></term>
-<listitem>
-<para>Is used to add and delete members and administrators to groups</para>
-<indexterm zone="ch-system-shadow gpasswd"><primary sortas="b-gpasswd">gpasswd</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="groupadd">
-<term><command>groupadd</command></term>
-<listitem>
-<para>Creates a group with the given name</para>
-<indexterm zone="ch-system-shadow groupadd"><primary sortas="b-groupadd">groupadd</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="groupdel">
-<term><command>groupdel</command></term>
-<listitem>
-<para>Deletes the group with the given name</para>
-<indexterm zone="ch-system-shadow groupdel"><primary sortas="b-groupdel">groupdel</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="groupmod">
-<term><command>groupmod</command></term>
-<listitem>
-<para>Is used to modify the given group's name or GID</para>
-<indexterm zone="ch-system-shadow groupmod"><primary sortas="b-groupmod">groupmod</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="grpck">
-<term><command>grpck</command></term>
-<listitem>
-<para>Verifies the integrity of the group files <filename>/etc/group</filename>
-and <filename>/etc/gshadow</filename></para>
-<indexterm zone="ch-system-shadow grpck"><primary sortas="b-grpck">grpck</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="grpconv">
-<term><command>grpconv</command></term>
-<listitem>
-<para>Creates or updates the shadow group file from the normal group file</para>
-<indexterm zone="ch-system-shadow grpconv"><primary sortas="b-grpconv">grpconv</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="grpunconv">
-<term><command>grpunconv</command></term>
-<listitem>
-<para>Updates <filename>/etc/group</filename>
-from <filename>/etc/gshadow</filename> and then deletes the latter</para>
-<indexterm zone="ch-system-shadow grpunconv"><primary sortas="b-grpunconv">grpunconv</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="lastlog">
-<term><command>lastlog</command></term>
-<listitem>
-<para>Reports the most recent login of all users or of a given user</para>
-<indexterm zone="ch-system-shadow lastlog"><primary sortas="b-lastlog">lastlog</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="login">
-<term><command>login</command></term>
-<listitem>
-<para>Is used by the system to let users sign on</para>
-<indexterm zone="ch-system-shadow login"><primary sortas="b-login">login</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="logoutd">
-<term><command>logoutd</command></term>
-<listitem>
-<para>Is a daemon used to enforce restrictions on log-on time and ports</para>
-<indexterm zone="ch-system-shadow logoutd"><primary sortas="b-logoutd">logoutd</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="newgrp">
-<term><command>newgrp</command></term>
-<listitem>
-<para>Is used to change the current GID during a login session</para>
-<indexterm zone="ch-system-shadow newgrp"><primary sortas="b-newgrp">newgrp</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="newusers">
-<term><command>newusers</command></term>
-<listitem>
-<para>Is used to create or update an entire series of user accounts</para>
-<indexterm zone="ch-system-shadow newusers"><primary sortas="b-newusers">newusers</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="passwd">
-<term><command>passwd</command></term>
-<listitem>
-<para>Is used to change the password for a user or group account</para>
-<indexterm zone="ch-system-shadow passwd"><primary sortas="b-passwd">passwd</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="pwck">
-<term><command>pwck</command></term>
-<listitem>
-<para>Verifies the integrity of the password files
-<filename>/etc/passwd</filename> and <filename>/etc/shadow</filename></para>
-<indexterm zone="ch-system-shadow pwck"><primary sortas="b-pwck">pwck</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="pwconv">
-<term><command>pwconv</command></term>
-<listitem>
-<para>Creates or updates the shadow password file from the normal
-password file</para>
-<indexterm zone="ch-system-shadow pwconv"><primary sortas="b-pwconv">pwconv</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="pwunconv">
-<term><command>pwunconv</command></term>
-<listitem>
-<para>Updates <filename>/etc/passwd</filename>
-from <filename>/etc/shadow</filename> and then deletes the latter</para>
-<indexterm zone="ch-system-shadow pwunconv"><primary sortas="b-pwunconv">pwunconv</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="sg">
-<term><command>sg</command></term>
-<listitem>
-<para>Executes a given command while the user's GID
-is set to that of the given group</para>
-<indexterm zone="ch-system-shadow sg"><primary sortas="b-sg">sg</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="su">
-<term><command>su</command></term>
-<listitem>
-<indexterm zone="ch-system-shadow su"><primary sortas="b-su">su</primary></indexterm>
-<para>Runs a shell with substitute user and group IDs</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="useradd">
-<term><command>useradd</command></term>
-<listitem>
-<para>Creates a new user with the given name, or updates the default
-new-user information</para>
-<indexterm zone="ch-system-shadow useradd"><primary sortas="b-useradd">useradd</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="userdel">
-<term><command>userdel</command></term>
-<listitem>
-<para>Deletes the given user account</para>
-<indexterm zone="ch-system-shadow userdel"><primary sortas="b-userdel">userdel</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="usermod">
-<term><command>usermod</command></term>
-<listitem>
-<para>Is used to modify the given user's login name, User
-Identification (UID),
-shell, initial group, home directory, etc.</para>
-<indexterm zone="ch-system-shadow usermod"><primary sortas="b-usermod">usermod</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="vigr">
-<term><command>vigr</command></term>
-<listitem>
-<para>Edits the <filename>/etc/group</filename> or
-<filename>/etc/gshadow</filename> files</para>
-<indexterm zone="ch-system-shadow vigr"><primary sortas="b-vigr">vigr</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="vipw">
-<term><command>vipw</command></term>
-<listitem>
-<para>Edits the <filename>/etc/passwd</filename> or
-<filename>/etc/shadow</filename> files</para>
-<indexterm zone="ch-system-shadow vipw"><primary sortas="b-vipw">vipw</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="libshadow">
-<term><filename class="libraryfile">libshadow</filename></term>
-<listitem>
-<para>Contains functions used by most programs in this package</para>
-<indexterm zone="ch-system-shadow libshadow"><primary sortas="c-libshadow">libshadow</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
 
-</sect1>
+  </sect2>
+
+  <sect2 id="contents-shadow" role="content">
+    <title>Contents of Shadow</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+
+      <seglistitem>
+        <seg>chage, chfn, chpasswd, chsh, expiry, faillog, gpasswd, groupadd,
+        groupdel, groupmod, grpck, grpconv, grpunconv, lastlog, login, logoutd,
+        newgrp, newusers, passwd, pwck, pwconv, pwunconv, sg (link to newgrp),
+        su, useradd, userdel, usermod, vigr (link to vipw), and vipw</seg>
+        <seg>libshadow.[a,so]</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="chage">
+        <term><command>chage</command></term>
+        <listitem>
+          <para>Used to change the maximum number of days between obligatory
+          password changes</para>
+          <indexterm zone="ch-system-shadow chage">
+            <primary sortas="b-chage">chage</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="chfn">
+        <term><command>chfn</command></term>
+        <listitem>
+          <para>Used to change a user's full name and other information</para>
+          <indexterm zone="ch-system-shadow chfn">
+            <primary sortas="b-chfn">chfn</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="chpasswd">
+        <term><command>chpasswd</command></term>
+        <listitem>
+          <para>Used to update the passwords of an entire series of user
+          accounts</para>
+          <indexterm zone="ch-system-shadow chpasswd">
+            <primary sortas="b-chpasswd">chpasswd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="chsh">
+        <term><command>chsh</command></term>
+        <listitem>
+          <para>Used to change a user's default login shell</para>
+          <indexterm zone="ch-system-shadow chsh">
+            <primary sortas="b-chsh">chsh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="expiry">
+        <term><command>expiry</command></term>
+        <listitem>
+          <para>Checks and enforces the current password expiration policy</para>
+          <indexterm zone="ch-system-shadow expiry">
+            <primary sortas="b-expiry">expiry</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="faillog">
+        <term><command>faillog</command></term>
+        <listitem>
+          <para>Is used to examine the log of login failures, to set a maximum
+          number of failures before an account is blocked, or to reset the
+          failure count</para>
+          <indexterm zone="ch-system-shadow faillog">
+            <primary sortas="b-faillog">faillog</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpasswd">
+        <term><command>gpasswd</command></term>
+        <listitem>
+          <para>Is used to add and delete members and administrators to
+          groups</para>
+          <indexterm zone="ch-system-shadow gpasswd">
+            <primary sortas="b-gpasswd">gpasswd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="groupadd">
+        <term><command>groupadd</command></term>
+        <listitem>
+          <para>Creates a group with the given name</para>
+          <indexterm zone="ch-system-shadow groupadd">
+            <primary sortas="b-groupadd">groupadd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="groupdel">
+        <term><command>groupdel</command></term>
+        <listitem>
+          <para>Deletes the group with the given name</para>
+          <indexterm zone="ch-system-shadow groupdel">
+            <primary sortas="b-groupdel">groupdel</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="groupmod">
+        <term><command>groupmod</command></term>
+        <listitem>
+          <para>Is used to modify the given group's name or GID</para>
+          <indexterm zone="ch-system-shadow groupmod">
+            <primary sortas="b-groupmod">groupmod</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="grpck">
+        <term><command>grpck</command></term>
+        <listitem>
+          <para>Verifies the integrity of the group files
+          <filename>/etc/group</filename> and
+          <filename>/etc/gshadow</filename></para>
+          <indexterm zone="ch-system-shadow grpck">
+            <primary sortas="b-grpck">grpck</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="grpconv">
+        <term><command>grpconv</command></term>
+        <listitem>
+          <para>Creates or updates the shadow group file from the normal
+          group file</para>
+          <indexterm zone="ch-system-shadow grpconv">
+            <primary sortas="b-grpconv">grpconv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="grpunconv">
+        <term><command>grpunconv</command></term>
+        <listitem>
+          <para>Updates <filename>/etc/group</filename> from
+          <filename>/etc/gshadow</filename> and then deletes the latter</para>
+          <indexterm zone="ch-system-shadow grpunconv">
+            <primary sortas="b-grpunconv">grpunconv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lastlog">
+        <term><command>lastlog</command></term>
+        <listitem>
+          <para>Reports the most recent login of all users or of a
+          given user</para>
+          <indexterm zone="ch-system-shadow lastlog">
+            <primary sortas="b-lastlog">lastlog</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="login">
+        <term><command>login</command></term>
+        <listitem>
+          <para>Is used by the system to let users sign on</para>
+          <indexterm zone="ch-system-shadow login">
+            <primary sortas="b-login">login</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="logoutd">
+        <term><command>logoutd</command></term>
+        <listitem>
+          <para>Is a daemon used to enforce restrictions on log-on time
+          and ports</para>
+          <indexterm zone="ch-system-shadow logoutd">
+            <primary sortas="b-logoutd">logoutd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="newgrp">
+        <term><command>newgrp</command></term>
+        <listitem>
+          <para>Is used to change the current GID during a login session</para>
+          <indexterm zone="ch-system-shadow newgrp">
+            <primary sortas="b-newgrp">newgrp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="newusers">
+        <term><command>newusers</command></term>
+        <listitem>
+          <para>Is used to create or update an entire series of user
+          accounts</para>
+          <indexterm zone="ch-system-shadow newusers">
+            <primary sortas="b-newusers">newusers</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="passwd">
+        <term><command>passwd</command></term>
+        <listitem>
+          <para>Is used to change the password for a user or group account</para>
+          <indexterm zone="ch-system-shadow passwd">
+            <primary sortas="b-passwd">passwd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pwck">
+        <term><command>pwck</command></term>
+        <listitem>
+          <para>Verifies the integrity of the password files
+          <filename>/etc/passwd</filename> and
+          <filename>/etc/shadow</filename></para>
+          <indexterm zone="ch-system-shadow pwck">
+            <primary sortas="b-pwck">pwck</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pwconv">
+        <term><command>pwconv</command></term>
+        <listitem>
+          <para>Creates or updates the shadow password file from the normal
+          password file</para>
+          <indexterm zone="ch-system-shadow pwconv">
+            <primary sortas="b-pwconv">pwconv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pwunconv">
+        <term><command>pwunconv</command></term>
+        <listitem>
+          <para>Updates <filename>/etc/passwd</filename> from
+          <filename>/etc/shadow</filename> and then deletes the latter</para>
+          <indexterm zone="ch-system-shadow pwunconv">
+            <primary sortas="b-pwunconv">pwunconv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sg">
+        <term><command>sg</command></term>
+        <listitem>
+          <para>Executes a given command while the user's GID
+          is set to that of the given group</para>
+          <indexterm zone="ch-system-shadow sg">
+            <primary sortas="b-sg">sg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="su">
+        <term><command>su</command></term>
+        <listitem>
+          <para>Runs a shell with substitute user and group IDs</para>
+          <indexterm zone="ch-system-shadow su">
+            <primary sortas="b-su">su</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="useradd">
+        <term><command>useradd</command></term>
+        <listitem>
+          <para>Creates a new user with the given name, or updates the default
+          new-user information</para>
+          <indexterm zone="ch-system-shadow useradd">
+            <primary sortas="b-useradd">useradd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="userdel">
+        <term><command>userdel</command></term>
+        <listitem>
+          <para>Deletes the given user account</para>
+          <indexterm zone="ch-system-shadow userdel">
+            <primary sortas="b-userdel">userdel</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="usermod">
+        <term><command>usermod</command></term>
+        <listitem>
+          <para>Is used to modify the given user's login name, User
+          Identification (UID), shell, initial group, home directory, etc.</para>
+          <indexterm zone="ch-system-shadow usermod">
+            <primary sortas="b-usermod">usermod</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vigr">
+        <term><command>vigr</command></term>
+        <listitem>
+          <para>Edits the <filename>/etc/group</filename> or
+          <filename>/etc/gshadow</filename> files</para>
+          <indexterm zone="ch-system-shadow vigr">
+            <primary sortas="b-vigr">vigr</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vipw">
+        <term><command>vipw</command></term>
+        <listitem>
+          <para>Edits the <filename>/etc/passwd</filename> or
+          <filename>/etc/shadow</filename> files</para>
+          <indexterm zone="ch-system-shadow vipw">
+            <primary sortas="b-vipw">vipw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libshadow">
+        <term><filename class="libraryfile">libshadow</filename></term>
+        <listitem>
+          <para>Contains functions used by most programs in this package</para>
+          <indexterm zone="ch-system-shadow libshadow">
+            <primary sortas="c-libshadow">libshadow</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
+</sect1>
diff --git a/chapter06/strippingagain.xml b/chapter06/strippingagain.xml
index af1352e04..6ca4196eb 100644
--- a/chapter06/strippingagain.xml
+++ b/chapter06/strippingagain.xml
@@ -1,54 +1,56 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-system-strippingagain">
-<title>Stripping Again</title>
-<?dbhtml filename="strippingagain.html"?>
-
-<para>If the intended user is not a programmer and does not plan to do
-any debugging on the system software, the system size can be decreased
-by about 200 MB by removing the debugging symbols from binaries and
-libraries. This causes no inconvenience other than not being able to
-debug the software fully anymore.</para>
-
-<para>Most people who use the command mentioned below do not
-experience any difficulties. However, it is easy to make a typo and
-render the new system unusable, so before running the 
-<command>strip</command> command, it is a good idea to make a
-backup of the LFS system in its current state.</para>
-
-<para>Before performing the stripping, take special care to ensure that
-none of the binaries that are about to be stripped are running. If
-unsure whether the user entered chroot with the command given in
-<xref linkend="ch-system-chroot" role=","/> first exit from
-chroot:</para>
+  <?dbhtml filename="strippingagain.html"?>
+
+  <title>Stripping Again</title>
+
+  <para>If the intended user is not a programmer and does not plan to do
+  any debugging on the system software, the system size can be decreased
+  by about 200 MB by removing the debugging symbols from binaries and
+  libraries. This causes no inconvenience other than not being able to
+  debug the software fully anymore.</para>
+
+  <para>Most people who use the command mentioned below do not
+  experience any difficulties. However, it is easy to make a typo and
+  render the new system unusable, so before running the
+  <command>strip</command> command, it is a good idea to make a
+  backup of the LFS system in its current state.</para>
+
+  <para>Before performing the stripping, take special care to ensure that
+  none of the binaries that are about to be stripped are running. If
+  unsure whether the user entered chroot with the command given in
+  <xref linkend="ch-system-chroot" role=","/> first exit from
+  chroot:</para>
 
 <screen role="nodump"><userinput>logout</userinput></screen>
 
-<para>Then reenter it with:</para>
+  <para>Then reenter it with:</para>
 
 <screen role="nodump"><userinput>chroot $LFS /tools/bin/env -i \
     HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
     PATH=/bin:/usr/bin:/sbin:/usr/sbin \
     /tools/bin/bash --login</userinput></screen>
 
-<para>Now the binaries and libraries can be safely stripped:</para>
+  <para>Now the binaries and libraries can be safely stripped:</para>
 
 <screen><userinput>/tools/bin/find /{,usr/}{bin,lib,sbin} -type f \
-   -exec /tools/bin/strip --strip-debug '{}' ';'</userinput></screen>
+  -exec /tools/bin/strip --strip-debug '{}' ';'</userinput></screen>
 
-<para>A large number of files will be reported as having their file
-format not recognized. These warnings can be safely ignored. These
-warnings indicate that those files are scripts instead of
-binaries.</para>
+  <para>A large number of files will be reported as having their file
+  format not recognized. These warnings can be safely ignored. These
+  warnings indicate that those files are scripts instead of
+  binaries.</para>
 
-<para>If disk space is very tight, the
-<parameter>--strip-all</parameter> option can be used on the binaries
-in <filename class="directory">/{,usr/}{bin,sbin}</filename> to gain
-several more megabytes. Do not use this option on libraries&mdash;they will
-be destroyed.</para>
+  <para>If disk space is very tight, the
+  <parameter>--strip-all</parameter> option can be used on the binaries
+  in <filename class="directory">/{,usr/}{bin,sbin}</filename> to gain
+  several more megabytes. Do not use this option on libraries&mdash;they will
+  be destroyed.</para>
 
 </sect1>
-
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index 221e62074..37ebda9c1 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -1,66 +1,85 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-sysklogd" xreflabel="Sysklogd" role="wrap">
-<title>Sysklogd-&sysklogd-version;</title>
-<?dbhtml filename="sysklogd.html"?>
 
-<indexterm zone="ch-system-sysklogd"><primary sortas="a-Sysklogd">Sysklogd</primary></indexterm>
+<sect1 id="ch-system-sysklogd" role="wrap">
+  <?dbhtml filename="sysklogd.html"?>
 
-<sect2 role="package"><title/>
-<para>The Sysklogd package contains programs for logging system messages, such
-as those given by the kernel when unusual things happen.</para>
+  <title>Sysklogd-&sysklogd-version;</title>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>704 KB</seg></seglistitem>
-</segmentedlist>
+  <indexterm zone="ch-system-sysklogd">
+    <primary sortas="a-Sysklogd">Sysklogd</primary>
+  </indexterm>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Binutils, Coreutils, GCC, Glibc, Make</seg></seglistitem>
-</segmentedlist>
-</sect2>
+  <sect2 role="package">
+    <title/>
 
-<sect2 role="installation">
-<title>Installation of Sysklogd</title>
+    <para>The Sysklogd package contains programs for logging system messages,
+    such as those given by the kernel when unusual things happen.</para>
 
-<para>The following patch fixes various issues, including a problem building
-Sysklogd with Linux 2.6 series kernels</para>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>0.1 SBU</seg>
+        <seg>704 KB</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
+
+      <seglistitem>
+        <seg>Binutils, Coreutils, GCC, Glibc, Make</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Sysklogd</title>
+
+    <para>The following patch fixes various issues, including a problem building
+    Sysklogd with Linux 2.6 series kernels</para>
 
 <screen><userinput>patch -Np1 -i ../&sysklogd-fixes-patch;</userinput></screen>
 
-<para>The following patch makes sysklogd treat bytes in the 0x80--0x9f range
-literally in the messages being logged, instead of replacing them with octal
-codes. Unpatched sysklogd would damage messages in the UTF-8 encoding.</para>
+    <para>The following patch makes sysklogd treat bytes in the 0x80--0x9f range
+    literally in the messages being logged, instead of replacing them with octal
+    codes. Unpatched sysklogd would damage messages in the UTF-8 encoding.</para>
 
 <screen><userinput>patch -Np1 -i ../&sysklogd-8bit-patch;</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>This package does not come with a test suite.</para>
+    <para>This package does not come with a test suite.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-</sect2>
+  </sect2>
 
+  <sect2 id="conf-sysklogd" role="configuration">
+    <title>Configuring Sysklogd</title>
 
-<sect2 id="conf-sysklogd" role="configuration"><title>Configuring Sysklogd</title>
-<indexterm zone="conf-sysklogd">
-<primary sortas="a-Sysklogd">Sysklogd</primary>
-<secondary>configuring</secondary></indexterm>
+    <indexterm zone="conf-sysklogd">
+      <primary sortas="a-Sysklogd">Sysklogd</primary>
+      <secondary>configuring</secondary>
+    </indexterm>
 
-<indexterm zone="conf-sysklogd"><primary sortas="e-/etc/syslog.conf">/etc/syslog.conf</primary></indexterm>
+    <indexterm zone="conf-sysklogd">
+      <primary sortas="e-/etc/syslog.conf">/etc/syslog.conf</primary>
+    </indexterm>
 
-<para>Create a new <filename>/etc/syslog.conf</filename> file by running the
-following:</para>
+    <para>Create a new <filename>/etc/syslog.conf</filename> file by running the
+    following:</para>
 
 <screen><userinput>cat &gt; /etc/syslog.conf &lt;&lt; "EOF"
 <literal># Begin /etc/syslog.conf
@@ -79,40 +98,49 @@ local2.* -/var/log/boot.log
 # End /etc/syslog.conf</literal>
 EOF</userinput></screen>
 
-</sect2>
-
-
-<sect2 id="contents-sysklogd" role="content"><title>Contents of Sysklogd</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>klogd and syslogd</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="klogd">
-<term><command>klogd</command></term>
-<listitem>
-<para>A system daemon for intercepting and logging kernel messages</para>
-<indexterm zone="ch-system-sysklogd klogd"><primary sortas="b-klogd">klogd</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="syslogd">
-<term><command>syslogd</command></term>
-<listitem>
-<para>Logs the messages that system programs offer for logging. Every logged
-message contains at least a date stamp and a hostname, and normally the
-program's name too, but that depends on how trusting the logging daemon is told
-to be</para>
-<indexterm zone="ch-system-sysklogd syslogd"><primary sortas="b-syslogd">syslogd</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
+
+  <sect2 id="contents-sysklogd" role="content">
+    <title>Contents of Sysklogd</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>klogd and syslogd</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="klogd">
+        <term><command>klogd</command></term>
+        <listitem>
+          <para>A system daemon for intercepting and logging kernel messages</para>
+          <indexterm zone="ch-system-sysklogd klogd">
+            <primary sortas="b-klogd">klogd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="syslogd">
+        <term><command>syslogd</command></term>
+        <listitem>
+          <para>Logs the messages that system programs offer for logging. Every
+          logged message contains at least a date stamp and a hostname, and
+          normally the program's name too, but that depends on how trusting the
+          logging daemon is told to be</para>
+          <indexterm zone="ch-system-sysklogd syslogd">
+            <primary sortas="b-syslogd">syslogd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index a82fdd9a8..e2d8677cb 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -1,69 +1,87 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-system-sysvinit" role="wrap">
-<title>Sysvinit-&sysvinit-version;</title>
-<?dbhtml filename="sysvinit.html"?>
-
-<indexterm zone="ch-system-sysvinit"><primary sortas="a-Sysvinit">Sysvinit</primary></indexterm>
-
-<sect2 role="package"><title/>
-<para>The Sysvinit package contains programs for controlling the startup,
-running, and shutdown of the system.</para>
-
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>1012 KB</seg></seglistitem>
-</segmentedlist>
-
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Binutils, Coreutils, GCC, Glibc, and Make</seg></seglistitem>
-</segmentedlist>
-</sect2>
-
-<sect2 role="installation">
-<title>Installation of Sysvinit</title>
-
-<para>When run-levels are changed (for example, when halting the
-system), <command>init</command> sends termination signals to those
-processes that <command>init</command> itself started and that should
-not be running in the new run-level.  While doing this,
-<command>init</command> outputs messages like <quote>Sending processes
-the TERM signal</quote> which seem to imply that it is sending these
-signals to all currently running processes. To avoid this
-misinterpretation, modify the source so that these messages read like
-<quote>Sending processes started by init the TERM signal</quote>
-instead:</para>
+  <?dbhtml filename="sysvinit.html"?>
+
+  <title>Sysvinit-&sysvinit-version;</title>
+
+  <indexterm zone="ch-system-sysvinit">
+    <primary sortas="a-Sysvinit">Sysvinit</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Sysvinit package contains programs for controlling the startup,
+    running, and shutdown of the system.</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>0.1 SBU</seg><seg>1012 KB</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
+
+      <seglistitem>
+        <seg>Binutils, Coreutils, GCC, Glibc, and Make</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Sysvinit</title>
+
+    <para>When run-levels are changed (for example, when halting the
+    system), <command>init</command> sends termination signals to those
+    processes that <command>init</command> itself started and that should
+    not be running in the new run-level.  While doing this,
+    <command>init</command> outputs messages like <quote>Sending processes
+    the TERM signal</quote> which seem to imply that it is sending these
+    signals to all currently running processes. To avoid this
+    misinterpretation, modify the source so that these messages read like
+    <quote>Sending processes started by init the TERM signal</quote>
+    instead:</para>
 
 <screen><userinput>sed -i 's@Sending processes@&amp; started by init@g' \
     src/init.c</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make -C src</userinput></screen>
 
-<para>This package does not come with a test suite.</para>
+    <para>This package does not come with a test suite.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make -C src install</userinput></screen>
 
-</sect2>
+  </sect2>
 
+  <sect2 id="conf-sysvinit" role="configuration">
+    <title>Configuring Sysvinit</title>
 
-<sect2 id="conf-sysvinit" role="configuration"><title>Configuring Sysvinit</title>
-<indexterm zone="conf-sysvinit">
-<primary sortas="a-Sysvinit">Sysvinit</primary>
-<secondary>configuring</secondary></indexterm>
+    <indexterm zone="conf-sysvinit">
+      <primary sortas="a-Sysvinit">Sysvinit</primary>
+      <secondary>configuring</secondary>
+    </indexterm>
 
-<indexterm zone="conf-sysvinit"><primary sortas="e-/etc/inittab">/etc/inittab</primary></indexterm>
+    <indexterm zone="conf-sysvinit">
+      <primary sortas="e-/etc/inittab">/etc/inittab</primary>
+    </indexterm>
 
-<para>Create a new file <filename>/etc/inittab</filename> by running the
-following:</para>
+    <para>Create a new file <filename>/etc/inittab</filename> by running the
+    following:</para>
 
 <screen><userinput>cat &gt; /etc/inittab &lt;&lt; "EOF"
 <literal># Begin /etc/inittab
@@ -93,170 +111,209 @@ su:S016:once:/sbin/sulogin
 
 # End /etc/inittab</literal>
 EOF</userinput></screen>
-</sect2>
-
-
-<sect2 id="contents-sysvinit" role="content"><title>Contents of Sysvinit</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>halt, init, killall5, last, lastb (link to last), mesg, pidof (link to 
-killall5), poweroff (link to halt), reboot (link to halt), runlevel, shutdown, sulogin, telinit 
-(link to init), utmpdump, and wall</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="halt">
-<term><command>halt</command></term>
-<listitem>
-<para>Normally invokes <command>shutdown</command> with the
-<parameter>-h</parameter> option, except when already in run-level 0,
-then it tells the kernel to halt the system; it notes in the
-file <filename>/var/log/wtmp</filename> that the system is being
-brought down</para>
-<indexterm zone="ch-system-sysvinit halt"><primary sortas="b-halt">halt</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="init">
-<term><command>init</command></term>
-<listitem>
-<para>The first process to be started when the kernel has initialized
-the hardware which takes over the boot process and 
-starts all the proceses it is instructed to</para>
-<indexterm zone="ch-system-sysvinit init"><primary sortas="b-init">init</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="killall5">
-<term><command>killall5</command></term>
-<listitem>
-<para>Sends a signal to all processes, except the processes in its own
-session so it will not kill the shell running the script that called
-it</para>
-<indexterm zone="ch-system-sysvinit killall5"><primary sortas="b-killall5">killall5</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="last">
-<term><command>last</command></term>
-<listitem>
-<para>Shows which users last logged in (and out),
-searching back through the <filename>/var/log/wtmp</filename> file; it
-also shows system boots, shutdowns, and run-level changes</para>
-<indexterm zone="ch-system-sysvinit last"><primary sortas="b-last">last</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="lastb">
-<term><command>lastb</command></term>
-<listitem>
-<para>Shows the failed login attempts, as logged in
-<filename>/var/log/btmp</filename></para>
-<indexterm zone="ch-system-sysvinit lastb"><primary sortas="b-lastb">lastb</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="mesg">
-<term><command>mesg</command></term>
-<listitem>
-<para>Controls whether other users can send messages to the current
-user's terminal</para>
-<indexterm zone="ch-system-sysvinit mesg"><primary sortas="b-mesg">mesg</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="mountpoint">
-<term><command>mountpoint</command></term>
-<listitem>
-<para>Checks if the directory is a mountpoint</para>
-<indexterm zone="ch-system-sysvinit mountpoint"><primary sortas="b-mountpoint">mountpoint</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="pidof">
-<term><command>pidof</command></term>
-<listitem>
-<para>Reports the PIDs of the given programs</para>
-<indexterm zone="ch-system-sysvinit pidof"><primary sortas="b-pidof">pidof</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="poweroff">
-<term><command>poweroff</command></term>
-<listitem>
-<para>Tells the kernel to halt the system and switch off the computer
-(see <command>halt</command>)</para>
-<indexterm zone="ch-system-sysvinit poweroff"><primary sortas="b-poweroff">poweroff</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="reboot">
-<term><command>reboot</command></term>
-<listitem>
-<para>Tells the kernel to reboot the system (see
-<command>halt</command>)</para>
-<indexterm zone="ch-system-sysvinit reboot"><primary sortas="b-reboot">reboot</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="runlevel">
-<term><command>runlevel</command></term>
-<listitem>
-<para>Reports the previous and the current run-level, as noted in the last run-level 
-record in <filename>/var/run/utmp</filename></para>
-<indexterm zone="ch-system-sysvinit runlevel"><primary sortas="b-runlevel">runlevel</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="shutdown">
-<term><command>shutdown</command></term>
-<listitem>
-<para>Brings the system down in a secure way, signaling all processes
-and notifying all logged-in users</para>
-<indexterm zone="ch-system-sysvinit shutdown"><primary sortas="b-shutdown">shutdown</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="sulogin">
-<term><command>sulogin</command></term>
-<listitem>
-<para>Allows <emphasis>root</emphasis> to log in; it is
-normally invoked by <command>init</command> when the system goes into single user mode</para>
-<indexterm zone="ch-system-sysvinit sulogin"><primary sortas="b-sulogin">sulogin</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="telinit">
-<term><command>telinit</command></term>
-<listitem>
-<para>Tells <command>init</command> which run-level to change to</para>
-<indexterm zone="ch-system-sysvinit telinit"><primary sortas="b-telinit">telinit</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="utmpdump">
-<term><command>utmpdump</command></term>
-<listitem>
-<para>Displays the content of the given login file in a more
-user-friendly format</para>
-<indexterm zone="ch-system-sysvinit utmpdump"><primary sortas="b-utmpdump">utmpdump</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="wall">
-<term><command>wall</command></term>
-<listitem>
-<para>Writes a message to all logged-in users</para>
-<indexterm zone="ch-system-sysvinit wall"><primary sortas="b-wall">wall</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
 
-</sect1>
+  </sect2>
+
+  <sect2 id="contents-sysvinit" role="content">
+    <title>Contents of Sysvinit</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>halt, init, killall5, last, lastb (link to last), mesg, mountpoint,
+        pidof (link to killall5), poweroff (link to halt), reboot (link to halt),
+        runlevel, shutdown, sulogin, telinit (link to init), utmpdump, and
+        wall</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="halt">
+        <term><command>halt</command></term>
+        <listitem>
+          <para>Normally invokes <command>shutdown</command> with the
+          <parameter>-h</parameter> option, except when already in run-level 0,
+          then it tells the kernel to halt the system; it notes in the
+          file <filename>/var/log/wtmp</filename> that the system is being
+          brought down</para>
+          <indexterm zone="ch-system-sysvinit halt">
+            <primary sortas="b-halt">halt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="init">
+        <term><command>init</command></term>
+        <listitem>
+          <para>The first process to be started when the kernel has initialized
+          the hardware which takes over the boot process and starts all the
+          proceses it is instructed to</para>
+          <indexterm zone="ch-system-sysvinit init">
+            <primary sortas="b-init">init</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="killall5">
+        <term><command>killall5</command></term>
+        <listitem>
+          <para>Sends a signal to all processes, except the processes in its own
+          session so it will not kill the shell running the script that called
+          it</para>
+          <indexterm zone="ch-system-sysvinit killall5">
+            <primary sortas="b-killall5">killall5</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="last">
+        <term><command>last</command></term>
+        <listitem>
+          <para>Shows which users last logged in (and out), searching back
+          through the <filename>/var/log/wtmp</filename> file; it also shows
+          system boots, shutdowns, and run-level changes</para>
+          <indexterm zone="ch-system-sysvinit last">
+            <primary sortas="b-last">last</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lastb">
+        <term><command>lastb</command></term>
+        <listitem>
+          <para>Shows the failed login attempts, as logged in
+          <filename>/var/log/btmp</filename></para>
+          <indexterm zone="ch-system-sysvinit lastb">
+            <primary sortas="b-lastb">lastb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mesg">
+        <term><command>mesg</command></term>
+        <listitem>
+          <para>Controls whether other users can send messages to the current
+          user's terminal</para>
+          <indexterm zone="ch-system-sysvinit mesg">
+            <primary sortas="b-mesg">mesg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mountpoint">
+        <term><command>mountpoint</command></term>
+        <listitem>
+          <para>Checks if the directory is a mountpoint</para>
+          <indexterm zone="ch-system-sysvinit mountpoint">
+            <primary sortas="b-mountpoint">mountpoint</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pidof">
+        <term><command>pidof</command></term>
+        <listitem>
+          <para>Reports the PIDs of the given programs</para>
+          <indexterm zone="ch-system-sysvinit pidof">
+            <primary sortas="b-pidof">pidof</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="poweroff">
+        <term><command>poweroff</command></term>
+        <listitem>
+          <para>Tells the kernel to halt the system and switch off the computer
+          (see <command>halt</command>)</para>
+          <indexterm zone="ch-system-sysvinit poweroff">
+            <primary sortas="b-poweroff">poweroff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="reboot">
+        <term><command>reboot</command></term>
+        <listitem>
+          <para>Tells the kernel to reboot the system (see
+          <command>halt</command>)</para>
+          <indexterm zone="ch-system-sysvinit reboot">
+            <primary sortas="b-reboot">reboot</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="runlevel">
+        <term><command>runlevel</command></term>
+        <listitem>
+          <para>Reports the previous and the current run-level, as noted in the
+          last run-level record in <filename>/var/run/utmp</filename></para>
+          <indexterm zone="ch-system-sysvinit runlevel">
+            <primary sortas="b-runlevel">runlevel</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="shutdown">
+        <term><command>shutdown</command></term>
+        <listitem>
+          <para>Brings the system down in a secure way, signaling all processes
+          and notifying all logged-in users</para>
+          <indexterm zone="ch-system-sysvinit shutdown">
+            <primary sortas="b-shutdown">shutdown</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sulogin">
+        <term><command>sulogin</command></term>
+        <listitem>
+          <para>Allows <systemitem class="username">root</systemitem> to log in;
+          it is normally invoked by <command>init</command> when the system goes
+          into single user mode</para>
+          <indexterm zone="ch-system-sysvinit sulogin">
+            <primary sortas="b-sulogin">sulogin</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="telinit">
+        <term><command>telinit</command></term>
+        <listitem>
+          <para>Tells <command>init</command> which run-level to change to</para>
+          <indexterm zone="ch-system-sysvinit telinit">
+            <primary sortas="b-telinit">telinit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="utmpdump">
+        <term><command>utmpdump</command></term>
+        <listitem>
+          <para>Displays the content of the given login file in a more
+          user-friendly format</para>
+          <indexterm zone="ch-system-sysvinit utmpdump">
+            <primary sortas="b-utmpdump">utmpdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="wall">
+        <term><command>wall</command></term>
+        <listitem>
+          <para>Writes a message to all logged-in users</para>
+          <indexterm zone="ch-system-sysvinit wall">
+            <primary sortas="b-wall">wall</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
+</sect1>
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index c4fb7d67b..939b73f44 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -1,92 +1,117 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-system-tar" role="wrap">
-<title>Tar-&tar-version;</title>
-<?dbhtml filename="tar.html"?>
+  <?dbhtml filename="tar.html"?>
+
+  <title>Tar-&tar-version;</title>
+
+  <indexterm zone="ch-system-tar">
+    <primary sortas="a-Tar">Tar</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Tar package contains an archiving program.</para>
 
-<indexterm zone="ch-system-tar"><primary sortas="a-Tar">Tar</primary></indexterm>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<sect2 role="package"><title/>
-<para>The Tar package contains an archiving program.</para>
+      <seglistitem>
+        <seg>0.2 SBU</seg>
+        <seg>12.7 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.2 SBU</seg><seg>12.7 MB</seg></seglistitem>
-</segmentedlist>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils,
-Diffutils, GCC, Gettext, Glibc, Grep, Make, and Sed</seg></seglistitem>
-</segmentedlist>
-</sect2>
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc,
+        Grep, Make, and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<sect2 role="installation">
-<title>Installation of Tar</title>
+  </sect2>
 
-<para>Apply a patch to fix some issues with the test suite when using 
-GCC-&gcc-version;:</para>
+  <sect2 role="installation">
+    <title>Installation of Tar</title>
+
+    <para>Apply a patch to fix some issues with the test suite when using
+    GCC-&gcc-version;:</para>
 
 <screen><userinput>patch -Np1 -i ../&tar-gcc4_fix-patch;</userinput></screen>
 
-<para>Tar has a bug when the <parameter>-S</parameter> option is used
-with files larger than 4 GB. The following patch properly fixes this issue:</para>
+    <para>Tar has a bug when the <parameter>-S</parameter> option is used
+    with files larger than 4 GB. The following patch properly fixes this
+    issue:</para>
 
 <screen><userinput>patch -Np1 -i ../&tar-sparse_fix-patch;</userinput></screen>
 
-<para>Prepare Tar for compilation:</para>
+    <para>Prepare Tar for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue:
-<userinput>make check</userinput>.</para>
+    <para>To test the results, issue:
+    <userinput>make check</userinput>.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-</sect2>
+  </sect2>
 
 
-<sect2 id="contents-tar" role="content"><title>Contents of Tar</title>
+  <sect2 id="contents-tar" role="content">
+    <title>Contents of Tar</title>
 
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>rmt and tar</seg></seglistitem>
-</segmentedlist>
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
 
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
+      <seglistitem>
+        <seg>rmt and tar</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<varlistentry id="rmt">
-<term><command>rmt</command></term>
-<listitem>
-<para>Remotely manipulates a magnetic
-tape drive through an interprocess communication connection</para>
-<indexterm zone="ch-system-tar rmt"><primary sortas="b-rmt">rmt</primary></indexterm>
-</listitem>
-</varlistentry>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-<varlistentry id="tar">
-<term><command>tar</command></term>
-<listitem>
-<para>Creates, extracts files from, and lists the contents of archives,
-also known as tarballs</para>
-<indexterm zone="ch-system-tar tar"><primary sortas="b-tar">tar</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
+      <varlistentry id="rmt">
+        <term><command>rmt</command></term>
+        <listitem>
+          <para>Remotely manipulates a magnetic
+          tape drive through an interprocess communication connection</para>
+          <indexterm zone="ch-system-tar rmt">
+            <primary sortas="b-rmt">rmt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+      <varlistentry id="tar">
+        <term><command>tar</command></term>
+        <listitem>
+          <para>Creates, extracts files from, and lists the contents of archives,
+          also known as tarballs</para>
+          <indexterm zone="ch-system-tar tar">
+            <primary sortas="b-tar">tar</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect1>
+    </variablelist>
 
+  </sect2>
+
+</sect1>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 93c83c465..db6f979bd 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -1,86 +1,103 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-system-texinfo" role="wrap">
-<title>Texinfo-&texinfo-version;</title>
-<?dbhtml filename="texinfo.html"?>
+  <?dbhtml filename="texinfo.html"?>
+
+  <title>Texinfo-&texinfo-version;</title>
+
+  <indexterm zone="ch-system-texinfo">
+    <primary sortas="a-Texinfo">Texinfo</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Texinfo package contains programs for reading, writing, and
+    converting info pages.</para>
 
-<indexterm zone="ch-system-texinfo"><primary sortas="a-Texinfo">Texinfo</primary></indexterm>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<sect2 role="package"><title/>
-<para>The Texinfo package contains programs for reading, writing, and
-converting info pages.</para>
+      <seglistitem>
+        <seg>0.2 SBU</seg>
+        <seg>14.7 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.2 SBU</seg><seg>14.7 MB</seg></seglistitem>
-</segmentedlist>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils,
-Diffutils, GCC, Gettext, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
-</segmentedlist>
-</sect2>
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc,
+        Grep, Make, Ncurses, and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<sect2 role="installation">
-<title>Installation of Texinfo</title>
+  </sect2>
 
-<para>The <command>info</command> program makes assumptions such as that
-a string occupies the same number of character cells on the screen and bytes
-in memory and that one can break the string anywhere, which fail in
-UTF-8 based locales. The patch below makes them valid
-by falling back to English messages when a multibyte locale is in use:</para>
+  <sect2 role="installation">
+    <title>Installation of Texinfo</title>
+
+    <para>The <command>info</command> program makes assumptions such as that
+    a string occupies the same number of character cells on the screen and
+    bytes in memory and that one can break the string anywhere, which fail
+    in UTF-8 based locales. The patch below makes them valid by falling back
+    to English messages when a multibyte locale is in use:</para>
 
 <screen><userinput>patch -Np1 -i ../&texinfo-multibyte-patch;</userinput></screen>
 
-<para>Texinfo allows local users to overwrite arbitrary files via a symlink
-attack on temporary files. Apply the following patch to fix this:</para>
+    <para>Texinfo allows local users to overwrite arbitrary files via a symlink
+    attack on temporary files. Apply the following patch to fix this:</para>
 
 <screen><userinput>patch -Np1 -i ../&texinfo-tempfile_fix-patch;</userinput></screen>
 
-<para>Prepare Texinfo for compilation:</para>
+    <para>Prepare Texinfo for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue:
-<userinput>make check</userinput>.</para>
+    <para>To test the results, issue:
+    <userinput>make check</userinput>.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>Optionally, install the components belonging in a TeX installation:</para>
+    <para>Optionally, install the components belonging in a TeX
+    installation:</para>
+    <!-- FIXME: doesn't the TeX installation in BLFS overwrite files there? -->
 
 <screen><userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen>
 
-<para>The meaning of the make parameter:</para>
-
-<variablelist>
-<varlistentry>
-<term><parameter>TEXMF=/usr/share/texmf</parameter></term>
-<listitem><para>The <envar>TEXMF</envar> makefile variable holds the location of the
-root of the TeX tree if, for example, a TeX package will be installed
-later.</para></listitem>
-</varlistentry>
-</variablelist>
-<!-- FIXME: doesn't the TeX installation in BLFS overwrite files there? -->
-
-<para>The Info documentation system uses a plain text file to hold its
-list of menu entries. The file is located at
-<filename>/usr/share/info/dir</filename>.  Unfortunately, due to
-occasional problems in the Makefiles of various packages, it can
-sometimes get out of sync with the info pages installed on the
-system. If the <filename>/usr/share/info/dir</filename> file ever
-needs to be recreated, the following optional commands will accomplish
-the task:</para>
+    <variablelist>
+      <title>The meaning of the make parameter:</title>
+
+      <varlistentry>
+        <term><parameter>TEXMF=/usr/share/texmf</parameter></term>
+        <listitem>
+          <para>The <envar>TEXMF</envar> makefile variable holds the location
+          of the root of the TeX tree if, for example, a TeX package will be
+          installed later.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    <para>The Info documentation system uses a plain text file to hold its list of
+    menu entries. The file is located at <filename>/usr/share/info/dir</filename>.
+    Unfortunately, due to occasional problems in the Makefiles of various packages,
+    it can sometimes get out of sync with the info pages installed on the system.
+    If the <filename>/usr/share/info/dir</filename> file ever needs to be
+    recreated, the following optional commands will accomplish the task:</para>
 
 <screen role="nodump"><userinput>cd /usr/share/info
 rm dir
@@ -88,85 +105,105 @@ for f in *
 do install-info $f dir 2&gt;/dev/null
 done</userinput></screen>
 
-</sect2>
-
-<sect2 id="contents-texinfo" role="content"><title>Contents of Texinfo</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>info, infokey, install-info,
-makeinfo, texi2dvi, texi2pdf, and texindex</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="info">
-<term><command>info</command></term>
-<listitem>
-<para>Used to read info pages which are similar to man pages, but often go much
-deeper than just explaining all the available command line options. For example,
-compare <command>man bison</command> and <command>info bison</command>.</para>
-<indexterm zone="ch-system-texinfo info"><primary sortas="b-info">info</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="infokey">
-<term><command>infokey</command></term>
-<listitem>
-<para>Compiles a source file containing Info customizations into a
-binary format</para>
-<indexterm zone="ch-system-texinfo infokey"><primary sortas="b-infokey">infokey</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="install-info">
-<term><command>install-info</command></term>
-<listitem>
-<para>Used to install info pages; it updates entries in the
-<command>info</command> index file</para>
-<indexterm zone="ch-system-texinfo install-info"><primary sortas="b-install-info">install-info</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="makeinfo">
-<term><command>makeinfo</command></term>
-<listitem>
-<para>Translates the given Texinfo source documents into
-info pages, plain text, or HTML</para>
-<indexterm zone="ch-system-texinfo makeinfo"><primary sortas="b-makeinfo">makeinfo</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="texi2dvi">
-<term><command>texi2dvi</command></term>
-<listitem>
-<para>Used to format the given Texinfo document into a
-device-independent file that can be printed</para>
-<indexterm zone="ch-system-texinfo texi2dvi"><primary sortas="b-texi2dvi">texi2dvi</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="texi2pdf">
-<term><command>texi2pdf</command></term>
-<listitem>
-<para>Used to format the given Texinfo document into a
-Portable Document Format (PDF) file</para>
-<indexterm zone="ch-system-texinfo texi2pdf"><primary sortas="b-texi2pdf">texi2pdf</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="texindex">
-<term><command>texindex</command></term>
-<listitem>
-<para>Used to sort Texinfo index files</para>
-<indexterm zone="ch-system-texinfo texindex"><primary sortas="b-texindex">texindex</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
+
+  <sect2 id="contents-texinfo" role="content">
+    <title>Contents of Texinfo</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>info, infokey, install-info, makeinfo, texi2dvi, texi2pdf, and
+        texindex</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="info">
+        <term><command>info</command></term>
+        <listitem>
+          <para>Used to read info pages which are similar to man pages, but
+          often go much deeper than just explaining all the available command
+          line options. For example, compare <command>man bison</command> and
+          <command>info bison</command>.</para>
+          <indexterm zone="ch-system-texinfo info">
+            <primary sortas="b-info">info</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="infokey">
+        <term><command>infokey</command></term>
+        <listitem>
+          <para>Compiles a source file containing Info customizations into a
+          binary format</para>
+          <indexterm zone="ch-system-texinfo infokey">
+            <primary sortas="b-infokey">infokey</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="install-info">
+        <term><command>install-info</command></term>
+        <listitem>
+          <para>Used to install info pages; it updates entries in the
+          <command>info</command> index file</para>
+          <indexterm zone="ch-system-texinfo install-info">
+            <primary sortas="b-install-info">install-info</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="makeinfo">
+        <term><command>makeinfo</command></term>
+        <listitem>
+          <para>Translates the given Texinfo source documents into
+          info pages, plain text, or HTML</para>
+          <indexterm zone="ch-system-texinfo makeinfo">
+            <primary sortas="b-makeinfo">makeinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="texi2dvi">
+        <term><command>texi2dvi</command></term>
+        <listitem>
+          <para>Used to format the given Texinfo document into a
+          device-independent file that can be printed</para>
+          <indexterm zone="ch-system-texinfo texi2dvi">
+            <primary sortas="b-texi2dvi">texi2dvi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="texi2pdf">
+        <term><command>texi2pdf</command></term>
+        <listitem>
+          <para>Used to format the given Texinfo document into a
+          Portable Document Format (PDF) file</para>
+          <indexterm zone="ch-system-texinfo texi2pdf">
+            <primary sortas="b-texi2pdf">texi2pdf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="texindex">
+        <term><command>texindex</command></term>
+        <listitem>
+          <para>Used to sort Texinfo index files</para>
+          <indexterm zone="ch-system-texinfo texindex">
+            <primary sortas="b-texindex">texindex</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index 8b77b1b58..c53977ed2 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -1,217 +1,258 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-system-udev" role="wrap">
-<title>Udev-&udev-version;</title>
-<?dbhtml filename="udev.html"?>
+  <?dbhtml filename="udev.html"?>
+
+  <title>Udev-&udev-version;</title>
+
+  <indexterm zone="ch-system-udev">
+    <primary sortas="a-Udev">Udev</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-system-udev"><primary sortas="a-Udev">Udev</primary></indexterm>
+    <para>The Udev package contains programs for dynamic creation of device
+    nodes.</para>
 
-<sect2 role="package"><title/>
-<para>The Udev package contains programs for dynamic creation of device nodes.</para>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>3.8 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.1 SBU</seg>
+        <seg>3.8 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Coreutils and Make</seg></seglistitem>
-</segmentedlist>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-</sect2>
+      <seglistitem>
+        <seg>Coreutils and Make</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<sect2 role="installation">
-<title>Installation of Udev</title>
+  </sect2>
 
-<para>Compile the package:</para>
+  <sect2 role="installation">
+    <title>Installation of Udev</title>
+
+    <para>Compile the package:</para>
 
 <screen><userinput>make EXTRAS=extras/run_directory</userinput></screen>
 
-<para>The meaning of the make option:</para>
+    <variablelist>
+      <title>The meaning of the make option:</title>
+
+      <varlistentry>
+        <term><parameter>EXTRAS=extras/run_directory</parameter></term>
+        <listitem>
+          <para>This builds the <command>udev_run_devd</command> and
+          <command>udev_run_hotplugd</command> binaries, which are required
+          for correct handling of hotpluggable devices.</para>
+        </listitem>
+      </varlistentry>
 
-<variablelist>
-  <varlistentry>
-    <term><parameter>EXTRAS=extras/run_directory</parameter>
-    </term>
-    <listitem>
-      <para>This builds the <command>udev_run_devd</command> and
-        <command>udev_run_hotplugd</command> binaries, which are required for
-        correct handling of hotpluggable devices.
-      </para>
-    </listitem>
-  </varlistentry>
-</variablelist>
+    </variablelist>
 
-<para>To test the results, issue:
-<userinput>make test</userinput>.</para>
+    <para>To test the results, issue:
+    <userinput>make test</userinput>.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make DESTDIR=/ EXTRAS=extras/run_directory install</userinput></screen>
 
-<para>The meaning of the make option:</para>
+    <variablelist>
+      <title>The meaning of the make parameter:</title>
 
-<variablelist>
-  <varlistentry>
-    <term><parameter>DESTDIR=/</parameter>
-    </term>
-    <listitem>
-      <para>This prevents the Udev build process from killing any
-        <command>udevd</command> processes that may be running on the host
-        system.
-      </para>
-    </listitem>
-  </varlistentry>
-</variablelist>
+      <varlistentry>
+        <term><parameter>DESTDIR=/</parameter></term>
+        <listitem>
+          <para>This prevents the Udev build process from killing any
+          <command>udevd</command> processes that may be running on the
+          host system.</para>
+        </listitem>
+      </varlistentry>
 
-<para>Udev's configuration is far from ideal by default, so install
-the configuration files here:</para>
+    </variablelist>
+
+    <para>Udev's configuration is far from ideal by default, so install
+    the configuration files here:</para>
 
 <screen><userinput>cp -v ../&udev-config-file; /etc/udev/rules.d/25-lfs.rules</userinput></screen>
 
-<para>Install the documentation that explains how to create Udev rules:</para>
+    <para>Install the documentation that explains how to create Udev rules:</para>
 
 <screen><userinput>install -m644 -D -v docs/writing_udev_rules/index.html /usr/share/doc/udev-&udev-version;/index.html</userinput></screen>
 
-<!-- Not for the LiveCD -->
-<!-- Edit Me -->
-<para>Run the <command>udevstart</command> program to create our full
-complement of device nodes.</para>
+    <!-- Not for the LiveCD -->
+    <!-- Edit Me -->
+    <para>Run the <command>udevstart</command> program to create our full
+    complement of device nodes.</para>
 
 <screen><userinput>/sbin/udevstart</userinput></screen>
 
-</sect2>
-
-<sect2 id="contents-udev" role="content"><title>Contents of Udev</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<segtitle>Installed directory</segtitle>
-<seglistitem><seg>udev, udev_run_devd, udev_run_hotplugd, udevcontrol, udevd,
-udevinfo, udevmonitor, udevsend, udevstart, and udevtest</seg>
-<seg>/etc/udev</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-                                                                                
-<varlistentry id="udev">
-<term><command>udev</command></term>
-<listitem>
-<para>Creates device nodes in <filename
-class="directory">/dev</filename> or renames network interfaces (not
-in LFS) in response to hotplug events</para>
-<indexterm zone="ch-system-udev udev"><primary sortas="b-udev">udev</primary></indexterm>
-</listitem></varlistentry>
-
-<varlistentry id="udev_run_devd">
-  <term><command>udev_run_devd</command></term>
-  <listitem>
-    <para>Executes programs and scripts in the
-      <filename class="directory">/etc/dev.d/</filename> directory in response
-      to hotplug events
-    </para>
-    <indexterm zone="ch-system-udev udev_run_devd">
-      <primary sortas="b-udev_run_devd">udev_run_devd</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="udev_run_hotplugd">
-  <term><command>udev_run_hotplugd</command></term>
-  <listitem>
-    <para>Executes programs and scripts in the
-      <filename class="directory">/etc/hotplug.d/</filename> directory in
-      response to hotplug events
-    </para>
-    <indexterm zone="ch-system-udev udev_run_hotplugd">
-      <primary sortas="b-udev_run_hotplugd">udev_run_hotplugd</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-
-<varlistentry id="udevcontrol">
-<term><command>udevcontrol</command></term>
-<listitem>
-<para>Configures a number of options for the running <command>udevd</command>
-daemon, such as the log level.</para>
-<indexterm zone="ch-system-udev udevcontrol"><primary sortas="b-udevcontrol">udevcontrol</primary>
-</indexterm>
-</listitem></varlistentry>
-
-<varlistentry id="udevd">
-<term><command>udevd</command></term>
-<listitem>
-<para>A daemon that reorders hotplug events before submitting them to
-<command>udev</command>,
-thus avoiding various race conditions</para>
-<indexterm zone="ch-system-udev udevd"><primary sortas="b-udevd">udevd</primary></indexterm>
-</listitem></varlistentry>
-
-<varlistentry id="udevinfo">
-<term><command>udevinfo</command></term>
-<listitem>
-<para>Allows users to query the <command>udev</command> database for
-information on any device currently present on the system; it also
-provides a way to query any device in the <systemitem
-class="filesystem">sysfs</systemitem> tree to help create udev
-rules</para>
-<indexterm zone="ch-system-udev udevinfo"><primary sortas="b-udevinfo">udevinfo</primary></indexterm>
-</listitem></varlistentry>
-
-<varlistentry id="udevmonitor">
-<term><command>udevmonitor</command></term>
-<listitem>
-<para>Prints the event received from the kernel and the event which
-<command>udev</command> sends out after rule processing</para>
-<indexterm zone="ch-system-udev udevmonitor"><primary sortas="b-udevmonitor">udevmonitor</primary>
-</indexterm>
-</listitem></varlistentry>
-
-<varlistentry id="udevsend">
-<term><command>udevsend</command></term>
-<listitem>
-<para>Delivers hotplug events to <command>udevd</command></para>
-<indexterm zone="ch-system-udev udevsend"><primary sortas="b-udevsend">udevsend</primary></indexterm>
-</listitem></varlistentry>
-
-<varlistentry id="udevstart">
-<term><command>udevstart</command></term>
-<listitem>
-<para>Creates device nodes in <filename
-class="directory">/dev</filename> that correspond to drivers compiled directly
-into the kernel; it performs that task by simulating hotplug events presumably
-dropped by the kernel before invocation of this program (e.g., because the root
-filesystem has not been mounted) and submitting such synthetic hotplug events
-to <command>udev</command></para>
-<indexterm zone="ch-system-udev udevstart"><primary sortas="b-udevstart">udevstart</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="udevtest">
-<term><command>udevtest</command></term>
-<listitem>
-<para>Simulates a <command>udev</command> run for the given device,
-and prints out the name of the node the real <command>udev</command> would
-have created or (not in LFS) the name of the renamed network interface</para>
-<indexterm zone="ch-system-udev udevtest"><primary sortas="b-udevtest">udevtest</primary></indexterm>
-</listitem></varlistentry>
-
-<varlistentry id="etc-udev">
-<term><filename class="directory">/etc/udev</filename></term>
-<listitem>
-<para>Contains <command>udev</command> configuation files,
-device permissions, and rules for device naming</para>
-<indexterm zone="ch-system-udev etc-udev"><primary sortas="e-/etc/udev">/etc/udev</primary></indexterm>
-</listitem></varlistentry>
-</variablelist>
-</sect2>
+  </sect2>
+
+  <sect2 id="contents-udev" role="content">
+    <title>Contents of Udev</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed directory</segtitle>
+
+      <seglistitem>
+        <seg>udev, udev_run_devd, udev_run_hotplugd, udevcontrol, udevd,
+        udevinfo, udevmonitor, udevsend, udevstart, and udevtest</seg>
+        <seg>/etc/udev</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="udev">
+        <term><command>udev</command></term>
+        <listitem>
+          <para>Creates device nodes in <filename class="directory">/dev</filename>
+          or renames network interfaces (not in LFS) in response to hotplug
+          events</para>
+          <indexterm zone="ch-system-udev udev">
+            <primary sortas="b-udev">udev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udev_run_devd">
+        <term><command>udev_run_devd</command></term>
+        <listitem>
+          <para>Executes programs and scripts in the <filename
+          class="directory">/etc/dev.d/</filename> directory in response to
+          hotplug events</para>
+          <indexterm zone="ch-system-udev udev_run_devd">
+            <primary sortas="b-udev_run_devd">udev_run_devd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udev_run_hotplugd">
+        <term><command>udev_run_hotplugd</command></term>
+        <listitem>
+          <para>Executes programs and scripts in the <filename
+          class="directory">/etc/hotplug.d/</filename> directory in response
+          to hotplug events</para>
+          <indexterm zone="ch-system-udev udev_run_hotplugd">
+            <primary sortas="b-udev_run_hotplugd">udev_run_hotplugd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udevcontrol">
+        <term><command>udevcontrol</command></term>
+        <listitem>
+          <para>Configures a number of options for the running
+          <command>udevd</command> daemon, such as the log level.</para>
+          <indexterm zone="ch-system-udev udevcontrol">
+            <primary sortas="b-udevcontrol">udevcontrol</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udevd">
+        <term><command>udevd</command></term>
+        <listitem>
+          <para>A daemon that reorders hotplug events before submitting them to
+          <command>udev</command>, thus avoiding various race conditions</para>
+          <indexterm zone="ch-system-udev udevd">
+            <primary sortas="b-udevd">udevd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udevinfo">
+        <term><command>udevinfo</command></term>
+        <listitem>
+          <para>Allows users to query the <command>udev</command> database for
+          information on any device currently present on the system; it also
+          provides a way to query any device in the <systemitem
+          class="filesystem">sysfs</systemitem> tree to help create udev
+          rules</para>
+          <indexterm zone="ch-system-udev udevinfo">
+            <primary sortas="b-udevinfo">udevinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udevmonitor">
+        <term><command>udevmonitor</command></term>
+        <listitem>
+          <para>Prints the event received from the kernel and the event which
+          <command>udev</command> sends out after rule processing</para>
+          <indexterm zone="ch-system-udev udevmonitor">
+            <primary sortas="b-udevmonitor">udevmonitor</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udevsend">
+        <term><command>udevsend</command></term>
+        <listitem>
+          <para>Delivers hotplug events to <command>udevd</command></para>
+          <indexterm zone="ch-system-udev udevsend">
+            <primary sortas="b-udevsend">udevsend</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udevstart">
+        <term><command>udevstart</command></term>
+        <listitem>
+          <para>Creates device nodes in <filename class="directory">/dev</filename>
+          that correspond to drivers compiled directly into the kernel; it
+          performs that task by simulating hotplug events presumably dropped by
+          the kernel before invocation of this program (e.g., because the root
+          filesystem has not been mounted) and submitting such synthetic hotplug
+          events to <command>udev</command></para>
+          <indexterm zone="ch-system-udev udevstart">
+            <primary sortas="b-udevstart">udevstart</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="udevtest">
+        <term><command>udevtest</command></term>
+        <listitem>
+          <para>Simulates a <command>udev</command> run for the given device,
+          and prints out the name of the node the real <command>udev</command>
+          would have created or (not in LFS) the name of the renamed network
+          interface</para>
+          <indexterm zone="ch-system-udev udevtest">
+            <primary sortas="b-udevtest">udevtest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="etc-udev">
+        <term><filename class="directory">/etc/udev</filename></term>
+        <listitem>
+          <para>Contains <command>udev</command> configuation files,
+          device permissions, and rules for device naming</para>
+          <indexterm zone="ch-system-udev etc-udev">
+            <primary sortas="e-/etc/udev">/etc/udev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 1903d7aea..a0c759294 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -1,629 +1,782 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-system-util-linux" role="wrap">
-<title>Util-linux-&util-linux-version;</title>
-<?dbhtml filename="util-linux.html"?>
-
-<indexterm zone="ch-system-util-linux"><primary sortas="a-Util-linux">Util-linux</primary></indexterm>
-
-<sect2 role="package"><title/>
-<para>The Util-linux package contains miscellaneous utility programs. Among
-them are utilities for handling file systems, consoles, partitions, and
-messages.</para>
-
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.2 SBU</seg><seg>11.6 MB</seg></seglistitem>
-</segmentedlist>
-
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils,
-Diffutils, GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed, and Zlib</seg></seglistitem>
-</segmentedlist>
-</sect2>
-
-<sect2 role="installation">
-<title>FHS compliance notes</title>
-
-<para>The FHS recommends using the <filename
-class="directory">/var/lib/hwclock</filename> directory instead of the
-usual <filename class="directory">/etc</filename> directory as the
-location for the <filename>adjtime</filename> file. To make the
-<command>hwclock</command> program FHS-compliant, run the
-following:</para>
+  <?dbhtml filename="util-linux.html"?>
+
+  <title>Util-linux-&util-linux-version;</title>
+
+  <indexterm zone="ch-system-util-linux">
+    <primary sortas="a-Util-linux">Util-linux</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Util-linux package contains miscellaneous utility programs. Among
+    them are utilities for handling file systems, consoles, partitions, and
+    messages.</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>0.2 SBU</seg>
+        <seg>11.6 MB</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
+
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc,
+        Grep, Make, Ncurses, Sed, and Zlib</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>FHS compliance notes</title>
+
+    <para>The FHS recommends using the <filename
+    class="directory">/var/lib/hwclock</filename> directory instead of the
+    usual <filename class="directory">/etc</filename> directory as the
+    location for the <filename>adjtime</filename> file. To make the
+    <command>hwclock</command> program FHS-compliant, run the
+    following:</para>
 
 <screen><userinput>sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
     hwclock/hwclock.c
 mkdir -p /var/lib/hwclock</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2 role="installation">
-<title>Installation of Util-linux</title>
+  <sect2 role="installation">
+    <title>Installation of Util-linux</title>
 
-<para>Util-linux fails to compile against newer versions of Linux-Libc-Headers.
-The following patch properly fixes this issue:</para>
+    <para>Util-linux fails to compile against newer versions of Linux-Libc-Headers.
+    The following patch properly fixes this issue:</para>
 
 <screen><userinput>patch -Np1 -i ../&util-linux-cramfs-patch;</userinput></screen>
 
-<para>Prepare Util-linux for compilation:</para>
+    <para>Prepare Util-linux for compilation:</para>
 
 <screen><userinput>./configure</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes</userinput></screen>
 
-<para>The meaning of the make parameters:</para>
+    <variablelist>
+      <title>The meaning of the make parameters:</title>
+
+      <varlistentry>
+        <term><parameter>HAVE_KILL=yes</parameter></term>
+        <listitem>
+          <para>This prevents the <command>kill</command> program (already
+          installed by Procps) from being built and installed again.</para>
+        </listitem>
+      </varlistentry>
 
-<variablelist>
-<varlistentry>
-<term><parameter>HAVE_KILL=yes</parameter></term>
-<listitem><para>This prevents the
-<command>kill</command> program (already installed by Procps) from being
-built and installed again.</para></listitem>
-</varlistentry>
+      <varlistentry>
+        <term><parameter>HAVE_SLN=yes</parameter></term>
+        <listitem>
+          <para>This prevents the <command>sln</command> program (a
+          statically linked version of <command>ln</command> already installed
+          by Glibc) from being built and installed again.</para>
+        </listitem>
+      </varlistentry>
 
-<varlistentry>
-<term><parameter>HAVE_SLN=yes</parameter></term>
-<listitem><para>This prevents the <command>sln</command> program (a
-statically linked version of <command>ln</command> already installed
-by Glibc) from being built and installed again.</para></listitem>
-</varlistentry>
-</variablelist>
+    </variablelist>
 
-<para>This package does not come with a test suite.</para>
+    <para>This package does not come with a test suite.</para>
 
-<para>Install the package and move the <command>logger</command> binary to
-<filename class="directory">/bin</filename> as it is needed by the
-LFS-Bootscripts package:</para>
+    <para>Install the package and move the <command>logger</command> binary to
+    <filename class="directory">/bin</filename> as it is needed by the
+    LFS-Bootscripts package:</para>
 
 <screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes install
 mv /usr/bin/logger /bin</userinput></screen>
 
-</sect2>
-
-<sect2 id="contents-utillinux" role="content"><title>Contents of Util-linux</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>agetty, arch, blockdev, cal, cfdisk, chkdupexe, col, colcrt,
-colrm, column, ctrlaltdel, cytune, ddate, dmesg, elvtune, fdformat, fdisk,
-fsck.cramfs, fsck.minix, getopt, hexdump, hwclock, ipcrm, ipcs, isosize, line,
-logger, look, losetup, mcookie, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap,
-more, mount, namei, pg, pivot_root, ramsize (link to rdev), raw, rdev, readprofile,
-rename, renice, rev, rootflags (link to rdev), script, setfdprm, setsid, setterm,
-sfdisk, swapdev, swapoff (link to swapon), swapon, tunelp, ul, umount, vidmode (link to rdev),
-whereis, and write</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="agetty">
-<term><command>agetty</command></term>
-<listitem>
-<para>Opens a tty port, prompts for a login name,
-and then invokes the <command>login</command> program</para>
-<indexterm zone="ch-system-util-linux agetty"><primary sortas="b-agetty">agetty</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="arch">
-<term><command>arch</command></term>
-<listitem>
-<para>Reports the machine's architecture</para>
-<indexterm zone="ch-system-util-linux arch"><primary sortas="b-arch">arch</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="blockdev">
-<term><command>blockdev</command></term>
-<listitem>
-<para>Allows users to call block device ioctls from the command line</para>
-<indexterm zone="ch-system-util-linux blockdev"><primary sortas="b-blockdev">blockdev</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="cal">
-<term><command>cal</command></term>
-<listitem>
-<para>Displays a simple calendar</para>
-<indexterm zone="ch-system-util-linux cal"><primary sortas="b-cal">cal</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="cfdisk">
-<term><command>cfdisk</command></term>
-<listitem>
-<para>Manipulates the partition table of the given device</para>
-<indexterm zone="ch-system-util-linux cfdisk"><primary sortas="b-cfdisk">cfdisk</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="chkdupexe">
-<term><command>chkdupexe</command></term>
-<listitem>
-<para>Finds duplicate executables</para>
-<indexterm zone="ch-system-util-linux chkdupexe"><primary sortas="b-chkdupexe">chkdupexe</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="col">
-<term><command>col</command></term>
-<listitem>
-<para>Filters out reverse line feeds</para>
-<indexterm zone="ch-system-util-linux col"><primary sortas="b-col">col</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="colcrt">
-<term><command>colcrt</command></term>
-<listitem>
-<para>Filters <command>nroff</command> output for terminals
-that lack some capabilities, such as overstriking and half-lines</para>
-<indexterm zone="ch-system-util-linux colcrt"><primary sortas="b-colcrt">colcrt</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="colrm">
-<term><command>colrm</command></term>
-<listitem>
-<para>Filters out the given columns</para>
-<indexterm zone="ch-system-util-linux colrm"><primary sortas="b-colrm">colrm</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="column">
-<term><command>column</command></term>
-<listitem>
-<para>Formats a given file into multiple columns</para>
-<indexterm zone="ch-system-util-linux column"><primary sortas="b-column">column</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ctrlaltdel">
-<term><command>ctrlaltdel</command></term>
-<listitem>
-<para>Sets the function of the Ctrl+Alt+Del key combination to a hard or a
-soft reset</para>
-<indexterm zone="ch-system-util-linux ctrlaltdel"><primary sortas="b-ctrlaltdel">ctrlaltdel</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="cytune">
-<term><command>cytune</command></term>
-<listitem>
-<para>Tunes the parameters of the serial line drivers for
-Cyclades cards</para>
-<indexterm zone="ch-system-util-linux cytune"><primary sortas="b-cytune">cytune</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ddate">
-<term><command>ddate</command></term>
-<listitem>
-<para>Gives the Discordian date or converts the given Gregorian date
-to a Discordian one</para>
-<indexterm zone="ch-system-util-linux ddate"><primary sortas="b-ddate">ddate</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="dmesg">
-<term><command>dmesg</command></term>
-<listitem>
-<para>Dumps the kernel boot messages</para>
-<indexterm zone="ch-system-util-linux dmesg"><primary sortas="b-dmesg">dmesg</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="elvtune">
-<term><command>elvtune</command></term>
-<listitem>
-<para>Tunes the performance and interactivity of a block
-device</para>
-<indexterm zone="ch-system-util-linux elvtune"><primary sortas="b-elvtune">elvtune</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="fdformat">
-<term><command>fdformat</command></term>
-<listitem>
-<para>Low-level formats a floppy disk</para>
-<indexterm zone="ch-system-util-linux fdformat"><primary sortas="b-fdformat">fdformat</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="fdisk">
-<term><command>fdisk</command></term>
-<listitem>
-<para>Manipulates the partition table of the given device</para>
-<indexterm zone="ch-system-util-linux fdisk"><primary sortas="b-fdisk">fdisk</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="fsck.cramfs">
-<term><command>fsck.cramfs</command></term>
-<listitem>
-<para>Performs a consistency check on the Cramfs file system on the
-given device</para>
-<indexterm zone="ch-system-util-linux fsck.cramfs"><primary sortas="b-fsck.cramfs">fsck.cramfs</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="fsck.minix">
-<term><command>fsck.minix</command></term>
-<listitem>
-<para>Performs a consistency check on the Minix file system on the
-given device</para>
-<indexterm zone="ch-system-util-linux fsck.minix"><primary sortas="b-fsck.minix">fsck.minix</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="getopt">
-<term><command>getopt</command></term>
-<listitem>
-<para>Parses options in the given command line</para>
-<indexterm zone="ch-system-util-linux getopt"><primary sortas="b-getopt">getopt</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="hexdump">
-<term><command>hexdump</command></term>
-<listitem>
-<para>Dumps the given file in hexadecimal or in another given format</para>
-<indexterm zone="ch-system-util-linux hexdump"><primary sortas="b-hexdump">hexdump</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="hwclock">
-<term><command>hwclock</command></term>
-<listitem>
-<para>Reads or sets the system's hardware clock, also called
-the Real-Time Clock (RTC) or Basic Input-Output System (BIOS)
-clock</para>
-<indexterm zone="ch-system-util-linux hwclock"><primary sortas="b-hwclock">hwclock</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ipcrm">
-<term><command>ipcrm</command></term>
-<listitem>
-<para>Removes the given Inter-Process Communication (IPC) resource</para>
-<indexterm zone="ch-system-util-linux ipcrm"><primary sortas="b-ipcrm">ipcrm</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ipcs">
-<term><command>ipcs</command></term>
-<listitem>
-<para>Provides IPC status information</para>
-<indexterm zone="ch-system-util-linux ipcs"><primary sortas="b-ipcs">ipcs</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="isosize">
-<term><command>isosize</command></term>
-<listitem>
-<para>Reports the size of an iso9660 file system</para>
-<indexterm zone="ch-system-util-linux isosize"><primary sortas="b-isosize">isosize</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="line">
-<term><command>line</command></term>
-<listitem>
-<para>Copies a single line</para>
-<indexterm zone="ch-system-util-linux line"><primary sortas="b-line">line</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="logger">
-<term><command>logger</command></term>
-<listitem>
-<para>Enters the given message into the system log</para>
-<indexterm zone="ch-system-util-linux logger"><primary sortas="b-logger">logger</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="look">
-<term><command>look</command></term>
-<listitem>
-<para>Displays lines that begin with the given string</para>
-<indexterm zone="ch-system-util-linux look"><primary sortas="b-look">look</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="losetup">
-<term><command>losetup</command></term>
-<listitem>
-<para>Sets up and controls loop devices</para>
-<indexterm zone="ch-system-util-linux losetup"><primary sortas="b-losetup">losetup</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="mcookie">
-<term><command>mcookie</command></term>
-<listitem>
-<para>Generates magic cookies (128-bit random hexadecimal numbers) for
-<command>xauth</command></para>
-<indexterm zone="ch-system-util-linux mcookie"><primary sortas="b-mcookie">mcookie</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="mkfs">
-<term><command>mkfs</command></term>
-<listitem>
-<para>Builds a file system on a device (usually a hard disk
-partition)</para>
-<indexterm zone="ch-system-util-linux mkfs"><primary sortas="b-mkfs">mkfs</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="mkfs.bfs">
-<term><command>mkfs.bfs</command></term>
-<listitem>
-<para>Creates a Santa Cruz Operations (SCO) bfs file system</para>
-<indexterm zone="ch-system-util-linux mkfs.bfs"><primary sortas="b-mkfs.bfs">mkfs.bfs</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="mkfs.cramfs">
-<term><command>mkfs.cramfs</command></term>
-<listitem>
-<para>Creates a cramfs file system</para>
-<indexterm zone="ch-system-util-linux mkfs.cramfs"><primary sortas="b-mkfs.cramfs">mkfs.cramfs</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="mkfs.minix">
-<term><command>mkfs.minix</command></term>
-<listitem>
-<para>Creates a Minix file system</para>
-<indexterm zone="ch-system-util-linux mkfs.minix"><primary sortas="b-mkfs.minix">mkfs.minix</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="mkswap">
-<term><command>mkswap</command></term>
-<listitem>
-<para>Initializes the given device or file to be used as a swap area</para>
-<indexterm zone="ch-system-util-linux mkswap"><primary sortas="b-mkswap">mkswap</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="more">
-<term><command>more</command></term>
-<listitem>
-<para>A filter for paging through text one screen at a time</para>
-<indexterm zone="ch-system-util-linux more"><primary sortas="b-more">more</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="mount">
-<term><command>mount</command></term>
-<listitem>
-<para>Attaches the file system on the given device to a specified
-directory in the file-system tree</para>
-<indexterm zone="ch-system-util-linux mount"><primary sortas="b-mount">mount</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="namei">
-<term><command>namei</command></term>
-<listitem>
-<para>Shows the symbolic links in the given pathnames</para>
-<indexterm zone="ch-system-util-linux namei"><primary sortas="b-namei">namei</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="pg">
-<term><command>pg</command></term>
-<listitem>
-<para>Displays a text file one screen full at a time</para>
-<indexterm zone="ch-system-util-linux pg"><primary sortas="b-pg">pg</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="pivot_root">
-<term><command>pivot_root</command></term>
-<listitem>
-<para>Makes the given file system the new root file system of the
-current process</para>
-<indexterm zone="ch-system-util-linux pivot_root"><primary sortas="b-pivot_root">pivot_root</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ramsize">
-<term><command>ramsize</command></term>
-<listitem>
-<para>Sets the size of the RAM disk in a bootable image</para>
-<indexterm zone="ch-system-util-linux ramsize"><primary sortas="b-ramsize">ramsize</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="raw">
-<term><command>raw</command></term>
-<listitem>
-<para>Used to bind a Linux raw character device to a block
-device</para>
-<indexterm zone="ch-system-util-linux raw"><primary sortas="b-raw">raw</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="rdev">
-<term><command>rdev</command></term>
-<listitem>
-<para>Queries and sets the root device, among other things, in a
-bootable image</para>
-<indexterm zone="ch-system-util-linux rdev"><primary sortas="b-rdev">rdev</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="readprofile">
-<term><command>readprofile</command></term>
-<listitem>
-<para>Reads kernel profiling information</para>
-<indexterm zone="ch-system-util-linux readprofile"><primary sortas="b-readprofile">readprofile</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="rename">
-<term><command>rename</command></term>
-<listitem>
-<para>Renames the given files, replacing a given string with another</para>
-<indexterm zone="ch-system-util-linux rename"><primary sortas="b-rename">rename</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="renice">
-<term><command>renice</command></term>
-<listitem>
-<para>Alters the priority of running processes</para>
-<indexterm zone="ch-system-util-linux renice"><primary sortas="b-renice">renice</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="rev">
-<term><command>rev</command></term>
-<listitem>
-<para>Reverses the lines of a given file</para>
-<indexterm zone="ch-system-util-linux rev"><primary sortas="b-rev">rev</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="rootflags">
-<term><command>rootflags</command></term>
-<listitem>
-<para>Sets the rootflags in a bootable image</para>
-<indexterm zone="ch-system-util-linux rootflags"><primary sortas="b-rootflags">rootflags</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="script">
-<term><command>script</command></term>
-<listitem>
-<para>Makes a typescript of a terminal session</para>
-<indexterm zone="ch-system-util-linux script"><primary sortas="b-script">script</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="setfdprm">
-<term><command>setfdprm</command></term>
-<listitem>
-<para>Sets user-provided floppy disk parameters</para>
-<indexterm zone="ch-system-util-linux setfdprm"><primary sortas="b-setfdprm">setfdprm</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="setsid">
-<term><command>setsid</command></term>
-<listitem>
-<para>Runs the given program in a new session</para>
-<indexterm zone="ch-system-util-linux setsid"><primary sortas="b-setsid">setsid</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="setterm">
-<term><command>setterm</command></term>
-<listitem>
-<para>Sets terminal attributes</para>
-<indexterm zone="ch-system-util-linux setterm"><primary sortas="b-setterm">setterm</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="sfdisk">
-<term><command>sfdisk</command></term>
-<listitem>
-<para>A disk partition table manipulator</para>
-<indexterm zone="ch-system-util-linux sfdisk"><primary sortas="b-sfdisk">sfdisk</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="swapdev">
-<term><command>swapdev</command></term>
-<listitem>
-<para>Sets the swap device in a bootable image</para>
-<indexterm zone="ch-system-util-linux swapdev"><primary sortas="b-swapdev">swapdev</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="swapoff">
-<term><command>swapoff</command></term>
-<listitem>
-<para>Disables devices and files for paging and swapping</para>
-<indexterm zone="ch-system-util-linux swapoff"><primary sortas="b-swapoff">swapoff</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="swapon">
-<term><command>swapon</command></term>
-<listitem>
-<para>Enables devices and files for paging and swapping and lists the devices
-and files currently in use</para>
-<indexterm zone="ch-system-util-linux swapon"><primary sortas="b-swapon">swapon</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="tunelp">
-<term><command>tunelp</command></term>
-<listitem>
-<para>Tunes the parameters of the line printer</para>
-<indexterm zone="ch-system-util-linux tunelp"><primary sortas="b-tunelp">tunelp</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ul">
-<term><command>ul</command></term>
-<listitem>
-<para>A filter for translating underscores into
-escape sequences indicating underlining for the terminal in use</para>
-<indexterm zone="ch-system-util-linux ul"><primary sortas="b-ul">ul</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="umount">
-<term><command>umount</command></term>
-<listitem>
-<para>Disconnects a file system from the system's file tree</para>
-<indexterm zone="ch-system-util-linux umount"><primary sortas="b-umount">umount</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="vidmode">
-<term><command>vidmode</command></term>
-<listitem>
-<para>Sets the video mode in a bootable image</para>
-<indexterm zone="ch-system-util-linux vidmode"><primary sortas="b-vidmode">vidmode</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="whereis">
-<term><command>whereis</command></term>
-<listitem>
-<para>Reports the location of the binary, source, and man page
-for the given command</para>
-<indexterm zone="ch-system-util-linux whereis"><primary sortas="b-whereis">whereis</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="write">
-<term><command>write</command></term>
-<listitem>
-<para>Sends a message to the given user
-<emphasis>if</emphasis> that user has not disabled receipt of such messages</para>
-<indexterm zone="ch-system-util-linux write"><primary sortas="b-write">write</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
+
+  <sect2 id="contents-utillinux" role="content">
+    <title>Contents of Util-linux</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>agetty, arch, blockdev, cal, cfdisk, chkdupexe, col, colcrt,
+        colrm, column, ctrlaltdel, cytune, ddate, dmesg, elvtune, fdformat,
+        fdisk, fsck.cramfs, fsck.minix, getopt, hexdump, hwclock, ipcrm,
+        ipcs, isosize, line, logger, look, losetup, mcookie, mkfs, mkfs.bfs,
+        mkfs.cramfs, mkfs.minix, mkswap, more, mount, namei, pg, pivot_root,
+        ramsize (link to rdev), raw, rdev, readprofile, rename, renice, rev,
+        rootflags (link to rdev), script, setfdprm, setsid, setterm, sfdisk,
+        swapdev, swapoff (link to swapon), swapon, tunelp, ul, umount, vidmode
+        (link to rdev), whereis, and write</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="agetty">
+        <term><command>agetty</command></term>
+        <listitem>
+          <para>Opens a tty port, prompts for a login name,
+          and then invokes the <command>login</command> program</para>
+          <indexterm zone="ch-system-util-linux agetty">
+            <primary sortas="b-agetty">agetty</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="arch">
+        <term><command>arch</command></term>
+        <listitem>
+          <para>Reports the machine's architecture</para>
+          <indexterm zone="ch-system-util-linux arch">
+            <primary sortas="b-arch">arch</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="blockdev">
+        <term><command>blockdev</command></term>
+        <listitem>
+          <para>Allows users to call block device ioctls from the command
+          line</para>
+          <indexterm zone="ch-system-util-linux blockdev">
+            <primary sortas="b-blockdev">blockdev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cal">
+        <term><command>cal</command></term>
+        <listitem>
+          <para>Displays a simple calendar</para>
+          <indexterm zone="ch-system-util-linux cal">
+            <primary sortas="b-cal">cal</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cfdisk">
+        <term><command>cfdisk</command></term>
+        <listitem>
+          <para>Manipulates the partition table of the given device</para>
+          <indexterm zone="ch-system-util-linux cfdisk">
+            <primary sortas="b-cfdisk">cfdisk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="chkdupexe">
+        <term><command>chkdupexe</command></term>
+        <listitem>
+          <para>Finds duplicate executables</para>
+          <indexterm zone="ch-system-util-linux chkdupexe">
+            <primary sortas="b-chkdupexe">chkdupexe</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="col">
+        <term><command>col</command></term>
+        <listitem>
+          <para>Filters out reverse line feeds</para>
+          <indexterm zone="ch-system-util-linux col">
+            <primary sortas="b-col">col</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="colcrt">
+        <term><command>colcrt</command></term>
+        <listitem>
+          <para>Filters <command>nroff</command> output for terminals
+          that lack some capabilities, such as overstriking and half-lines</para>
+          <indexterm zone="ch-system-util-linux colcrt">
+            <primary sortas="b-colcrt">colcrt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="colrm">
+        <term><command>colrm</command></term>
+        <listitem>
+          <para>Filters out the given columns</para>
+          <indexterm zone="ch-system-util-linux colrm">
+            <primary sortas="b-colrm">colrm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="column">
+        <term><command>column</command></term>
+        <listitem>
+          <para>Formats a given file into multiple columns</para>
+          <indexterm zone="ch-system-util-linux column">
+            <primary sortas="b-column">column</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ctrlaltdel">
+        <term><command>ctrlaltdel</command></term>
+        <listitem>
+          <para>Sets the function of the Ctrl+Alt+Del key combination to a
+          hard or a soft reset</para>
+          <indexterm zone="ch-system-util-linux ctrlaltdel">
+            <primary sortas="b-ctrlaltdel">ctrlaltdel</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="cytune">
+        <term><command>cytune</command></term>
+        <listitem>
+          <para>Tunes the parameters of the serial line drivers for
+          Cyclades cards</para>
+          <indexterm zone="ch-system-util-linux cytune">
+            <primary sortas="b-cytune">cytune</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ddate">
+        <term><command>ddate</command></term>
+        <listitem>
+          <para>Gives the Discordian date or converts the given Gregorian date
+          to a Discordian one</para>
+          <indexterm zone="ch-system-util-linux ddate">
+            <primary sortas="b-ddate">ddate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dmesg">
+        <term><command>dmesg</command></term>
+        <listitem>
+          <para>Dumps the kernel boot messages</para>
+          <indexterm zone="ch-system-util-linux dmesg">
+            <primary sortas="b-dmesg">dmesg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="elvtune">
+        <term><command>elvtune</command></term>
+        <listitem>
+          <para>Tunes the performance and interactivity of a block
+          device</para>
+          <indexterm zone="ch-system-util-linux elvtune">
+            <primary sortas="b-elvtune">elvtune</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fdformat">
+        <term><command>fdformat</command></term>
+        <listitem>
+          <para>Low-level formats a floppy disk</para>
+          <indexterm zone="ch-system-util-linux fdformat">
+            <primary sortas="b-fdformat">fdformat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fdisk">
+        <term><command>fdisk</command></term>
+        <listitem>
+          <para>Manipulates the partition table of the given device</para>
+          <indexterm zone="ch-system-util-linux fdisk">
+            <primary sortas="b-fdisk">fdisk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fsck.cramfs">
+        <term><command>fsck.cramfs</command></term>
+        <listitem>
+          <para>Performs a consistency check on the Cramfs file system on the
+          given device</para>
+          <indexterm zone="ch-system-util-linux fsck.cramfs">
+            <primary sortas="b-fsck.cramfs">fsck.cramfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fsck.minix">
+        <term><command>fsck.minix</command></term>
+        <listitem>
+          <para>Performs a consistency check on the Minix file system on the
+          given device</para>
+          <indexterm zone="ch-system-util-linux fsck.minix">
+            <primary sortas="b-fsck.minix">fsck.minix</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getopt">
+        <term><command>getopt</command></term>
+        <listitem>
+          <para>Parses options in the given command line</para>
+          <indexterm zone="ch-system-util-linux getopt">
+            <primary sortas="b-getopt">getopt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hexdump">
+        <term><command>hexdump</command></term>
+        <listitem>
+          <para>Dumps the given file in hexadecimal or in another given
+          format</para>
+          <indexterm zone="ch-system-util-linux hexdump">
+            <primary sortas="b-hexdump">hexdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="hwclock">
+        <term><command>hwclock</command></term>
+        <listitem>
+          <para>Reads or sets the system's hardware clock, also called
+          the Real-Time Clock (RTC) or Basic Input-Output System (BIOS)
+          clock</para>
+          <indexterm zone="ch-system-util-linux hwclock">
+            <primary sortas="b-hwclock">hwclock</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ipcrm">
+        <term><command>ipcrm</command></term>
+        <listitem>
+          <para>Removes the given Inter-Process Communication (IPC) resource</para>
+          <indexterm zone="ch-system-util-linux ipcrm">
+            <primary sortas="b-ipcrm">ipcrm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ipcs">
+        <term><command>ipcs</command></term>
+        <listitem>
+          <para>Provides IPC status information</para>
+          <indexterm zone="ch-system-util-linux ipcs">
+            <primary sortas="b-ipcs">ipcs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="isosize">
+        <term><command>isosize</command></term>
+        <listitem>
+          <para>Reports the size of an iso9660 file system</para>
+          <indexterm zone="ch-system-util-linux isosize">
+            <primary sortas="b-isosize">isosize</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="line">
+        <term><command>line</command></term>
+        <listitem>
+          <para>Copies a single line</para>
+          <indexterm zone="ch-system-util-linux line">
+            <primary sortas="b-line">line</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="logger">
+        <term><command>logger</command></term>
+        <listitem>
+          <para>Enters the given message into the system log</para>
+          <indexterm zone="ch-system-util-linux logger">
+            <primary sortas="b-logger">logger</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="look">
+        <term><command>look</command></term>
+        <listitem>
+          <para>Displays lines that begin with the given string</para>
+          <indexterm zone="ch-system-util-linux look">
+            <primary sortas="b-look">look</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="losetup">
+        <term><command>losetup</command></term>
+        <listitem>
+          <para>Sets up and controls loop devices</para>
+          <indexterm zone="ch-system-util-linux losetup">
+            <primary sortas="b-losetup">losetup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mcookie">
+        <term><command>mcookie</command></term>
+        <listitem>
+          <para>Generates magic cookies (128-bit random hexadecimal numbers) for
+          <command>xauth</command></para>
+          <indexterm zone="ch-system-util-linux mcookie">
+            <primary sortas="b-mcookie">mcookie</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkfs">
+        <term><command>mkfs</command></term>
+        <listitem>
+          <para>Builds a file system on a device (usually a hard disk
+          partition)</para>
+          <indexterm zone="ch-system-util-linux mkfs">
+            <primary sortas="b-mkfs">mkfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkfs.bfs">
+        <term><command>mkfs.bfs</command></term>
+        <listitem>
+          <para>Creates a Santa Cruz Operations (SCO) bfs file system</para>
+          <indexterm zone="ch-system-util-linux mkfs.bfs">
+            <primary sortas="b-mkfs.bfs">mkfs.bfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkfs.cramfs">
+        <term><command>mkfs.cramfs</command></term>
+        <listitem>
+          <para>Creates a cramfs file system</para>
+          <indexterm zone="ch-system-util-linux mkfs.cramfs">
+            <primary sortas="b-mkfs.cramfs">mkfs.cramfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkfs.minix">
+        <term><command>mkfs.minix</command></term>
+        <listitem>
+          <para>Creates a Minix file system</para>
+          <indexterm zone="ch-system-util-linux mkfs.minix">
+            <primary sortas="b-mkfs.minix">mkfs.minix</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkswap">
+        <term><command>mkswap</command></term>
+        <listitem>
+          <para>Initializes the given device or file to be used as a swap
+          area</para>
+          <indexterm zone="ch-system-util-linux mkswap">
+            <primary sortas="b-mkswap">mkswap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="more">
+        <term><command>more</command></term>
+        <listitem>
+          <para>A filter for paging through text one screen at a time</para>
+          <indexterm zone="ch-system-util-linux more">
+            <primary sortas="b-more">more</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mount">
+        <term><command>mount</command></term>
+        <listitem>
+          <para>Attaches the file system on the given device to a specified
+          directory in the file-system tree</para>
+          <indexterm zone="ch-system-util-linux mount">
+            <primary sortas="b-mount">mount</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="namei">
+        <term><command>namei</command></term>
+        <listitem>
+          <para>Shows the symbolic links in the given pathnames</para>
+          <indexterm zone="ch-system-util-linux namei">
+            <primary sortas="b-namei">namei</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pg">
+        <term><command>pg</command></term>
+        <listitem>
+          <para>Displays a text file one screen full at a time</para>
+          <indexterm zone="ch-system-util-linux pg">
+            <primary sortas="b-pg">pg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pivot_root">
+        <term><command>pivot_root</command></term>
+        <listitem>
+          <para>Makes the given file system the new root file system of the
+          current process</para>
+          <indexterm zone="ch-system-util-linux pivot_root">
+            <primary sortas="b-pivot_root">pivot_root</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ramsize">
+        <term><command>ramsize</command></term>
+        <listitem>
+          <para>Sets the size of the RAM disk in a bootable image</para>
+          <indexterm zone="ch-system-util-linux ramsize">
+            <primary sortas="b-ramsize">ramsize</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="raw">
+        <term><command>raw</command></term>
+        <listitem>
+          <para>Used to bind a Linux raw character device to a block
+          device</para>
+          <indexterm zone="ch-system-util-linux raw">
+            <primary sortas="b-raw">raw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rdev">
+        <term><command>rdev</command></term>
+        <listitem>
+          <para>Queries and sets the root device, among other things, in a
+          bootable image</para>
+          <indexterm zone="ch-system-util-linux rdev">
+            <primary sortas="b-rdev">rdev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="readprofile">
+        <term><command>readprofile</command></term>
+        <listitem>
+          <para>Reads kernel profiling information</para>
+          <indexterm zone="ch-system-util-linux readprofile">
+            <primary sortas="b-readprofile">readprofile</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rename">
+        <term><command>rename</command></term>
+        <listitem>
+          <para>Renames the given files, replacing a given string with
+          another</para>
+          <indexterm zone="ch-system-util-linux rename">
+            <primary sortas="b-rename">rename</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="renice">
+        <term><command>renice</command></term>
+        <listitem>
+          <para>Alters the priority of running processes</para>
+          <indexterm zone="ch-system-util-linux renice">
+            <primary sortas="b-renice">renice</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rev">
+        <term><command>rev</command></term>
+        <listitem>
+          <para>Reverses the lines of a given file</para>
+          <indexterm zone="ch-system-util-linux rev">
+            <primary sortas="b-rev">rev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rootflags">
+        <term><command>rootflags</command></term>
+        <listitem>
+          <para>Sets the rootflags in a bootable image</para>
+          <indexterm zone="ch-system-util-linux rootflags">
+            <primary sortas="b-rootflags">rootflags</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="script">
+        <term><command>script</command></term>
+        <listitem>
+          <para>Makes a typescript of a terminal session</para>
+          <indexterm zone="ch-system-util-linux script">
+            <primary sortas="b-script">script</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setfdprm">
+        <term><command>setfdprm</command></term>
+        <listitem>
+          <para>Sets user-provided floppy disk parameters</para>
+          <indexterm zone="ch-system-util-linux setfdprm">
+            <primary sortas="b-setfdprm">setfdprm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setsid">
+        <term><command>setsid</command></term>
+        <listitem>
+          <para>Runs the given program in a new session</para>
+          <indexterm zone="ch-system-util-linux setsid">
+            <primary sortas="b-setsid">setsid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setterm">
+        <term><command>setterm</command></term>
+        <listitem>
+          <para>Sets terminal attributes</para>
+          <indexterm zone="ch-system-util-linux setterm">
+            <primary sortas="b-setterm">setterm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sfdisk">
+        <term><command>sfdisk</command></term>
+        <listitem>
+          <para>A disk partition table manipulator</para>
+          <indexterm zone="ch-system-util-linux sfdisk">
+            <primary sortas="b-sfdisk">sfdisk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="swapdev">
+        <term><command>swapdev</command></term>
+        <listitem>
+          <para>Sets the swap device in a bootable image</para>
+          <indexterm zone="ch-system-util-linux swapdev">
+            <primary sortas="b-swapdev">swapdev</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="swapoff">
+        <term><command>swapoff</command></term>
+        <listitem>
+          <para>Disables devices and files for paging and swapping</para>
+          <indexterm zone="ch-system-util-linux swapoff">
+            <primary sortas="b-swapoff">swapoff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="swapon">
+        <term><command>swapon</command></term>
+        <listitem>
+          <para>Enables devices and files for paging and swapping and
+          lists the devices and files currently in use</para>
+          <indexterm zone="ch-system-util-linux swapon">
+            <primary sortas="b-swapon">swapon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tunelp">
+        <term><command>tunelp</command></term>
+        <listitem>
+          <para>Tunes the parameters of the line printer</para>
+          <indexterm zone="ch-system-util-linux tunelp">
+            <primary sortas="b-tunelp">tunelp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ul">
+        <term><command>ul</command></term>
+        <listitem>
+          <para>A filter for translating underscores into escape sequences
+          indicating underlining for the terminal in use</para>
+          <indexterm zone="ch-system-util-linux ul">
+            <primary sortas="b-ul">ul</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="umount">
+        <term><command>umount</command></term>
+        <listitem>
+          <para>Disconnects a file system from the system's file tree</para>
+          <indexterm zone="ch-system-util-linux umount">
+            <primary sortas="b-umount">umount</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vidmode">
+        <term><command>vidmode</command></term>
+        <listitem>
+          <para>Sets the video mode in a bootable image</para>
+          <indexterm zone="ch-system-util-linux vidmode">
+            <primary sortas="b-vidmode">vidmode</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="whereis">
+        <term><command>whereis</command></term>
+        <listitem>
+          <para>Reports the location of the binary, source, and man page
+          for the given command</para>
+          <indexterm zone="ch-system-util-linux whereis">
+            <primary sortas="b-whereis">whereis</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="write">
+        <term><command>write</command></term>
+        <listitem>
+          <para>Sends a message to the given user <emphasis>if</emphasis> that
+          user has not disabled receipt of such messages</para>
+          <indexterm zone="ch-system-util-linux write">
+            <primary sortas="b-write">write</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index d58dbb6b7..08e2d3661 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -1,128 +1,151 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-system-vim" role="wrap">
-<title>Vim-&vim-version;</title>
-<?dbhtml filename="vim.html"?>
-
-<indexterm zone="ch-system-vim"><primary sortas="a-Vim">Vim</primary></indexterm>
-
-<sect2 role="package"><title/>
-<para>The Vim package contains a powerful text editor.</para>
-
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.4 SBU</seg><seg>38.0 MB</seg></seglistitem>
-</segmentedlist>
-
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
-</segmentedlist>
-
-<tip>
-<title>Alternatives to Vim</title>
-<para>If you prefer another editor&mdash;such as Emacs, Joe, or
-Nano&mdash;please refer to <ulink url="&blfs-root;view/svn/postlfs/editors.html"/>
-for suggested installation instructions.</para>
-</tip>
-</sect2>
-
-<sect2 role="installation">
-<title>Installation of Vim</title>
-
-<para>First, unpack both
-<filename>vim-&vim-version;.tar.bz2</filename> and (optionally)
-<filename>vim-&vim-version;-lang.tar.gz</filename> archives into the
-same directory. Then, change the default location of the
-<filename>vimrc</filename> configuration file to <filename
-class="directory">/etc</filename>:</para>
+  <?dbhtml filename="vim.html"?>
+
+  <title>Vim-&vim-version;</title>
+
+  <indexterm zone="ch-system-vim">
+    <primary sortas="a-Vim">Vim</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Vim package contains a powerful text editor.</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>0.4 SBU</seg>
+        <seg>38.0 MB</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
+
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
+        Ncurses, and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <tip>
+      <title>Alternatives to Vim</title>
+
+      <para>If you prefer another editor&mdash;such as Emacs, Joe, or
+      Nano&mdash;please refer to <ulink
+      url="&blfs-root;view/svn/postlfs/editors.html"/> for suggested
+      installation instructions.</para>
+    </tip>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Vim</title>
+
+    <para>First, unpack both
+    <filename>vim-&vim-version;.tar.bz2</filename> and (optionally)
+    <filename>vim-&vim-version;-lang.tar.gz</filename> archives into the
+    same directory. Then, change the default location of the
+    <filename>vimrc</filename> configuration file to <filename
+    class="directory">/etc</filename>:</para>
 
 <screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h</userinput></screen>
 
-<para>Now prepare Vim for compilation:</para>
+    <para>Now prepare Vim for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
 
-<para>The meaning of the configure options:</para>
+    <variablelist>
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--enable-multibyte</parameter></term>
+        <listitem>
+          <para>This switch enables support for editing files in multibyte
+          character encodings.  This is needed if using a locale with a
+          multibyte character set. This switch is also helpful to be able
+          to edit text files initially created in Linux distributions like
+          Fedora Core that use UTF-8 as a default character set.</para>
+        </listitem>
+      </varlistentry>
 
-<variablelist>
-<varlistentry>
-<term><parameter>--enable-multibyte</parameter></term>
-<listitem><para>This switch enables support for
-editing files in multibyte character encodings.  This is needed if using a
-locale with a multibyte character set. This switch is also helpful to be able to
-edit text files initially created in Linux distributions like Fedora Core that
-use UTF-8 as a default character set.</para>
-</listitem>
-</varlistentry>
-</variablelist>
+    </variablelist>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue: <userinput>make test</userinput>. However,
-this test suite outputs a lot of binary data to the screen, which can cause
-issues with the settings of the current terminal. This can be resolved by
-redirecting the output to a log file.</para>
+    <para>To test the results, issue: <userinput>make test</userinput>. However,
+    this test suite outputs a lot of binary data to the screen, which can cause
+    issues with the settings of the current terminal. This can be resolved by
+    redirecting the output to a log file.</para>
 
-<para>Install the package:</para>
+    <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>In UTF-8 locales, the <command>vimtutor</command> program
-tries to convert the tutorials from ISO-8859-1 to UTF-8. Since
-some tutorials are not in ISO-8859-1, the text in them is thus made unreadable.
-If you unpacked the <filename>vim-&vim-version;-lang.tar.gz</filename>
-archive and are going to use a UTF-8 based locale, remove non-ISO-8859-1
-tutorials. An English tutorial will be used instead.</para>
-<!-- Removal is used instead of conversion in order for the user to be able to
-painlessly revert his UTF-8 locale choice. -->
+    <para>In UTF-8 locales, the <command>vimtutor</command> program tries to
+    convert the tutorials from ISO-8859-1 to UTF-8. Since some tutorials are
+    not in ISO-8859-1, the text in them is thus made unreadable. If you
+    unpacked the <filename>vim-&vim-version;-lang.tar.gz</filename> archive
+    and are going to use a UTF-8 based locale, remove non-ISO-8859-1 tutorials.
+    An English tutorial will be used instead.</para>
+    <!-- Removal is used instead of conversion in order for the user to be able to
+    painlessly revert his UTF-8 locale choice. -->
 
 <screen><userinput>rm -f /usr/share/vim/vim64/tutor/tutor.{gr,pl,ru,sk}
 rm -f /usr/share/vim/vim64/tutor/tutor.??.*</userinput></screen>
 
-<para>Many users are used to using <command>vi</command> instead of
-<command>vim</command>. To allow execution of <command>vim</command>
-when users habitually enter <command>vi</command>, create a
-symlink:</para>
+    <para>Many users are used to using <command>vi</command> instead of
+    <command>vim</command>. To allow execution of <command>vim</command>
+    when users habitually enter <command>vi</command>, create a
+    symlink:</para>
 
 <screen><userinput>ln -sv vim /usr/bin/vi</userinput></screen>
 
-<para>By default, Vim's documentation is installed in
-<filename class="directory">/usr/share/vim</filename>.  The following symlink
-allows the documentation to be accessed via
-<filename class="directory">/usr/share/doc/vim-&vim-version;</filename>, making
-it consistent with the location of documentation for other packages:</para>
+    <para>By default, Vim's documentation is installed in <filename
+    class="directory">/usr/share/vim</filename>. The following symlink
+    allows the documentation to be accessed via <filename
+    class="directory">/usr/share/doc/vim-&vim-version;</filename>, making
+    it consistent with the location of documentation for other packages:</para>
 
 <screen><userinput>ln -sv ../vim/vim64/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
 
-<para>If an X Window System is going to be installed on the LFS
-system, it may be necessary to recompile Vim after installing X. Vim
-comes with a GUI version of the editor that requires X and some
-additional libraries to be installed. For more information on this
-process, refer to the Vim documentation and the Vim installation page
-in the BLFS book at <ulink
-url="&blfs-root;view/svn/postlfs/editors.html#postlfs-editors-vim"/>.</para>
+    <para>If an X Window System is going to be installed on the LFS
+    system, it may be necessary to recompile Vim after installing X. Vim
+    comes with a GUI version of the editor that requires X and some
+    additional libraries to be installed. For more information on this
+    process, refer to the Vim documentation and the Vim installation page
+    in the BLFS book at <ulink
+    url="&blfs-root;view/svn/postlfs/editors.html#postlfs-editors-vim"/>.</para>
 
-</sect2>
+  </sect2>
 
-<sect2 id="conf-vim" role="configuration"><title>Configuring Vim</title>
-<indexterm zone="conf-vim"><primary sortas="e-/etc/vimrc">/etc/vimrc</primary></indexterm>
+  <sect2 id="conf-vim" role="configuration">
+    <title>Configuring Vim</title>
 
-<para>By default, <command>vim</command> runs in vi-incompatible mode. This may
-be new to users who have used other editors in the past. The
-<quote>nocompatible</quote> setting is included below to highlight the fact that
-a new behavior is being used. It also reminds those who would change to
-<quote>compatible</quote> mode that it should be the first setting in the
-configuration file. This is necessary because it changes other settings, and
-overrides must come after this setting. Create a default <command>vim</command>
-configuration file by running the following:</para>
+    <indexterm zone="conf-vim">
+      <primary sortas="e-/etc/vimrc">/etc/vimrc</primary>
+    </indexterm>
+
+    <para>By default, <command>vim</command> runs in vi-incompatible mode.
+    This may be new to users who have used other editors in the past. The
+    <quote>nocompatible</quote> setting is included below to highlight the
+    fact that a new behavior is being used. It also reminds those who would
+    change to <quote>compatible</quote> mode that it should be the first
+    setting in the configuration file. This is necessary because it changes
+    other settings, and overrides must come after this setting. Create a default
+    <command>vim</command> configuration file by running the following:</para>
 
 <screen><userinput>cat &gt; /etc/vimrc &lt;&lt; "EOF"
 <literal>" Begin /etc/vimrc
@@ -137,217 +160,272 @@ endif
 " End /etc/vimrc</literal>
 EOF</userinput></screen>
 
-<para>The <parameter>set nocompatible</parameter> makes
-<command>vim</command> behave in a more useful way (the default) than
-the vi-compatible manner. Remove the <quote>no</quote> to keep the
-old <command>vi</command> behavior. The <parameter>set
-backspace=2</parameter> allows backspacing over line breaks,
-autoindents, and the start of insert. The <parameter>syntax
-on</parameter> enables vim's syntax highlighting. Finally, the
-<emphasis>if</emphasis> statement with the <parameter>set
-background=dark</parameter> corrects <command>vim</command>'s guess
-about the background color of some terminal emulators. This gives the
-highlighting a better color scheme for use on the black background of
-these programs.</para>
-
-<para>Documentation for other available options can be obtained by
-running the following command:</para>
+    <para>The <parameter>set nocompatible</parameter> makes
+    <command>vim</command> behave in a more useful way (the default) than
+    the vi-compatible manner. Remove the <quote>no</quote> to keep the
+    old <command>vi</command> behavior. The <parameter>set
+    backspace=2</parameter> allows backspacing over line breaks,
+    autoindents, and the start of insert. The <parameter>syntax
+    on</parameter> enables vim's syntax highlighting. Finally, the
+    <emphasis>if</emphasis> statement with the <parameter>set
+    background=dark</parameter> corrects <command>vim</command>'s guess
+    about the background color of some terminal emulators. This gives the
+    highlighting a better color scheme for use on the black background of
+    these programs.</para>
+
+    <para>Documentation for other available options can be obtained by
+    running the following command:</para>
 
 <screen role="nodump"><userinput>vim -c ':options'</userinput></screen>
 
-</sect2>
-
-<sect2 id="contents-vim" role="content"><title>Contents of Vim</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk,
-pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl, tcltags, vi (link to vim),
-view (link to vim), vim, vim132, vim2html.pl, vimdiff (link to vim), vimm, vimspell.sh,
-vimtutor, and xxd</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="efm_filter.pl">
-<term><command>efm_filter.pl</command></term>
-<listitem>
-<para>A filter for creating an error file that can be read by <command>vim</command></para>
-<indexterm zone="ch-system-vim efm_filter.pl"><primary sortas="b-efm_filter.pl">efm_filter.pl</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="efm_perl.pl">
-<term><command>efm_perl.pl</command></term>
-<listitem>
-<para>Reformats the error messages of the
-Perl interpreter for use with the <quote>quickfix</quote> mode of <command>vim</command></para>
-<indexterm zone="ch-system-vim efm_perl.pl"><primary sortas="b-efm_perl.pl">efm_perl.pl</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ex">
-<term><command>ex</command></term>
-<listitem>
-<para>Starts <command>vim</command> in ex mode</para>
-<indexterm zone="ch-system-vim ex"><primary sortas="b-ex">ex</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="less.sh">
-<term><command>less.sh</command></term>
-<listitem>
-<para>A script that starts <command>vim</command> with less.vim</para>
-<indexterm zone="ch-system-vim less.sh"><primary sortas="b-less.sh">less.sh</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="mve.awk">
-<term><command>mve.awk</command></term>
-<listitem>
-<para>Processes <command>vim</command> errors</para>
-<indexterm zone="ch-system-vim mve.awk"><primary sortas="b-mve.awk">mve.awk</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="pltags.pl">
-<term><command>pltags.pl</command></term>
-<listitem>
-<para>Creates a tags file for Perl code for use by <command>vim</command></para>
-<indexterm zone="ch-system-vim pltags.pl"><primary sortas="b-pltags.pl">pltags.pl</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="ref">
-<term><command>ref</command></term>
-<listitem>
-<para>Checks the spelling of arguments</para>
-<indexterm zone="ch-system-vim ref"><primary sortas="b-ref">ref</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="rview">
-<term><command>rview</command></term>
-<listitem>
-<para>Is a restricted version of <command>view</command>; no shell
-commands can be started and <command>view</command> cannot be suspended</para>
-<indexterm zone="ch-system-vim rview"><primary sortas="b-rview">rview</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="rvim">
-<term><command>rvim</command></term>
-<listitem>
-<para>Is a restricted version of <command>vim</command>; no shell
-commands can be started and <command>vim</command> cannot be suspended</para>
-<indexterm zone="ch-system-vim rvim"><primary sortas="b-rvim">rvim</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="shtags.pl">
-<term><command>shtags.pl</command></term>
-<listitem>
-<para>Generates a tags file for Perl scripts</para>
-<indexterm zone="ch-system-vim shtags.pl"><primary sortas="b-shtags.pl">shtags.pl</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="tcltags">
-<term><command>tcltags</command></term>
-<listitem>
-<para>Generates a tags file for TCL code</para>
-<indexterm zone="ch-system-vim tcltags"><primary sortas="b-tcltags">tcltags</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="view">
-<term><command>view</command></term>
-<listitem>
-<para>Starts <command>vim</command> in read-only mode</para>
-<indexterm zone="ch-system-vim view"><primary sortas="b-view">view</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="vi">
-<term><command>vi</command></term>
-<listitem>
-<para>Is the editor</para>
-<indexterm zone="ch-system-vim vi"><primary sortas="b-vi">vi</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="vim">
-<term><command>vim</command></term>
-<listitem>
-<para>Is the editor</para>
-<indexterm zone="ch-system-vim vim"><primary sortas="b-vim">vim</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="vim132">
-<term><command>vim132</command></term>
-<listitem>
-<para>Starts <command>vim</command> with the terminal in 132-column mode</para>
-<indexterm zone="ch-system-vim vim132"><primary sortas="b-vim132">vim132</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="vim2html.pl">
-<term><command>vim2html.pl</command></term>
-<listitem>
-<para>Converts Vim documentation to HypterText Markup Language (HTML)</para>
-<indexterm zone="ch-system-vim vim2html.pl"><primary sortas="b-vim2html.pl">vim2html.pl</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="vimdiff">
-<term><command>vimdiff</command></term>
-<listitem>
-<para>Edits two or three versions of a file with <command>vim</command> and show differences</para>
-<indexterm zone="ch-system-vim vimdiff"><primary sortas="b-vimdiff">vimdiff</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="vimm">
-<term><command>vimm</command></term>
-<listitem>
-<para>Enables the DEC locator input model on a remote terminal</para>
-<indexterm zone="ch-system-vim vimm"><primary sortas="b-vimm">vimm</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="vimspell.sh">
-<term><command>vimspell.sh</command></term>
-<listitem>
-<para>Spell checks a file and generates the syntax statements necessary to
-highlight in <command>vim</command>. This script requires the old Unix
-<command>spell</command> command, which is provided neither in LFS nor in
-BLFS</para>
-<indexterm zone="ch-system-vim vimspell.sh"><primary sortas="b-vimspell.sh">vimspell.sh</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="vimtutor">
-<term><command>vimtutor</command></term>
-<listitem>
-<para>Teaches the basic keys and commands of <command>vim</command></para>
-<indexterm zone="ch-system-vim vimtutor"><primary sortas="b-vimtutor">vimtutor</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="xxd">
-<term><command>xxd</command></term>
-<listitem>
-<para>Creates a hex dump of the given file; it can
-also do the reverse, so it can be used for binary patching</para>
-<indexterm zone="ch-system-vim xxd"><primary sortas="b-xxd">xxd</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
+
+  <sect2 id="contents-vim" role="content">
+    <title>Contents of Vim</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk,
+        pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl,
+        tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl,
+        vimdiff (link to vim), vimm, vimspell.sh, vimtutor, and xxd</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="efm_filter.pl">
+        <term><command>efm_filter.pl</command></term>
+        <listitem>
+          <para>A filter for creating an error file that can be read
+          by <command>vim</command></para>
+          <indexterm zone="ch-system-vim efm_filter.pl">
+            <primary sortas="b-efm_filter.pl">efm_filter.pl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="efm_perl.pl">
+        <term><command>efm_perl.pl</command></term>
+        <listitem>
+          <para>Reformats the error messages of the Perl interpreter for use
+          with the <quote>quickfix</quote> mode of <command>vim</command></para>
+          <indexterm zone="ch-system-vim efm_perl.pl">
+            <primary sortas="b-efm_perl.pl">efm_perl.pl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ex">
+        <term><command>ex</command></term>
+        <listitem>
+          <para>Starts <command>vim</command> in ex mode</para>
+          <indexterm zone="ch-system-vim ex">
+            <primary sortas="b-ex">ex</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="less.sh">
+        <term><command>less.sh</command></term>
+        <listitem>
+          <para>A script that starts <command>vim</command> with less.vim</para>
+          <indexterm zone="ch-system-vim less.sh">
+            <primary sortas="b-less.sh">less.sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mve.awk">
+        <term><command>mve.awk</command></term>
+        <listitem>
+          <para>Processes <command>vim</command> errors</para>
+          <indexterm zone="ch-system-vim mve.awk">
+            <primary sortas="b-mve.awk">mve.awk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pltags.pl">
+        <term><command>pltags.pl</command></term>
+        <listitem>
+          <para>Creates a tags file for Perl code for use by
+          <command>vim</command></para>
+          <indexterm zone="ch-system-vim pltags.pl">
+            <primary sortas="b-pltags.pl">pltags.pl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ref">
+        <term><command>ref</command></term>
+        <listitem>
+          <para>Checks the spelling of arguments</para>
+          <indexterm zone="ch-system-vim ref">
+            <primary sortas="b-ref">ref</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rview">
+        <term><command>rview</command></term>
+        <listitem>
+          <para>Is a restricted version of <command>view</command>; no shell
+          commands can be started and <command>view</command> cannot be
+          suspended</para>
+          <indexterm zone="ch-system-vim rview">
+            <primary sortas="b-rview">rview</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rvim">
+        <term><command>rvim</command></term>
+        <listitem>
+          <para>Is a restricted version of <command>vim</command>; no shell
+          commands can be started and <command>vim</command> cannot be
+          suspended</para>
+          <indexterm zone="ch-system-vim rvim">
+            <primary sortas="b-rvim">rvim</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="shtags.pl">
+        <term><command>shtags.pl</command></term>
+        <listitem>
+          <para>Generates a tags file for Perl scripts</para>
+          <indexterm zone="ch-system-vim shtags.pl">
+            <primary sortas="b-shtags.pl">shtags.pl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tcltags">
+        <term><command>tcltags</command></term>
+        <listitem>
+          <para>Generates a tags file for TCL code</para>
+          <indexterm zone="ch-system-vim tcltags">
+            <primary sortas="b-tcltags">tcltags</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="view">
+        <term><command>view</command></term>
+        <listitem>
+          <para>Starts <command>vim</command> in read-only mode</para>
+          <indexterm zone="ch-system-vim view">
+            <primary sortas="b-view">view</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vi">
+        <term><command>vi</command></term>
+        <listitem>
+          <para>Link to <command>vim</command></para>
+          <indexterm zone="ch-system-vim vi">
+            <primary sortas="b-vi">vi</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vim">
+        <term><command>vim</command></term>
+        <listitem>
+          <para>Is the editor</para>
+          <indexterm zone="ch-system-vim vim">
+            <primary sortas="b-vim">vim</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vim132">
+        <term><command>vim132</command></term>
+        <listitem>
+          <para>Starts <command>vim</command> with the terminal in 132-column
+          mode</para>
+          <indexterm zone="ch-system-vim vim132">
+            <primary sortas="b-vim132">vim132</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vim2html.pl">
+        <term><command>vim2html.pl</command></term>
+        <listitem>
+          <para>Converts Vim documentation to HypterText Markup Language
+          (HTML)</para>
+          <indexterm zone="ch-system-vim vim2html.pl">
+            <primary sortas="b-vim2html.pl">vim2html.pl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vimdiff">
+        <term><command>vimdiff</command></term>
+        <listitem>
+          <para>Edits two or three versions of a file with <command>vim</command>
+          and show differences</para>
+          <indexterm zone="ch-system-vim vimdiff">
+            <primary sortas="b-vimdiff">vimdiff</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vimm">
+        <term><command>vimm</command></term>
+        <listitem>
+          <para>Enables the DEC locator input model on a remote terminal</para>
+          <indexterm zone="ch-system-vim vimm">
+            <primary sortas="b-vimm">vimm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vimspell.sh">
+        <term><command>vimspell.sh</command></term>
+        <listitem>
+          <para>Spell checks a file and generates the syntax statements
+          necessary to highlight in <command>vim</command>. This script
+          requires the old Unix <command>spell</command> command, which
+          is provided neither in LFS nor in BLFS</para>
+          <indexterm zone="ch-system-vim vimspell.sh">
+            <primary sortas="b-vimspell.sh">vimspell.sh</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="vimtutor">
+        <term><command>vimtutor</command></term>
+        <listitem>
+          <para>Teaches the basic keys and commands of
+          <command>vim</command></para>
+          <indexterm zone="ch-system-vim vimtutor">
+            <primary sortas="b-vimtutor">vimtutor</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xxd">
+        <term><command>xxd</command></term>
+        <listitem>
+          <para>Creates a hex dump of the given file; it can
+          also do the reverse, so it can be used for binary patching</para>
+          <indexterm zone="ch-system-vim xxd">
+            <primary sortas="b-xxd">xxd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index efe52b533..14dbbdbbe 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -1,105 +1,128 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
+
 <sect1 id="ch-system-zlib" role="wrap">
-<title>Zlib-&zlib-version;</title>
-<?dbhtml filename="zlib.html"?>
+  <?dbhtml filename="zlib.html"?>
+
+  <title>Zlib-&zlib-version;</title>
+
+  <indexterm zone="ch-system-zlib">
+    <primary sortas="a-Zlib">Zlib</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-system-zlib"><primary sortas="a-Zlib">Zlib</primary></indexterm>
+    <para>The Zlib package contains compression and decompression routines used by
+    some programs.</para>
 
-<sect2 role="package"><title/>
-<para>The Zlib package contains compression and decompression routines used by
-some programs.</para>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>2.7 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.1 SBU</seg>
+        <seg>2.7 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Binutils, Coreutils, GCC, Glibc, Make, and Sed</seg></seglistitem>
-</segmentedlist>
-</sect2>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-<sect2 role="installation">
-<title>Installation of Zlib</title>
+      <seglistitem>
+        <seg>Binutils, Coreutils, GCC, Glibc, Make, and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<note><para>Zlib is known to build its shared library incorrectly if
-<envar>CFLAGS</envar> is specified in the environment. If using a 
-specified <envar>CFLAGS</envar>
-variable, be sure to add the <parameter>-fPIC</parameter> directive to
-the <envar>CFLAGS</envar> variable for the duration of the
-configure command below, then remove it afterwards.</para></note>
+  </sect2>
 
-<para>Prepare Zlib for compilation:</para>
+  <sect2 role="installation">
+    <title>Installation of Zlib</title>
+
+    <note>
+      <para>Zlib is known to build its shared library incorrectly if
+      <envar>CFLAGS</envar> is specified in the environment. If using
+      a specified <envar>CFLAGS</envar> variable, be sure to add the
+      <parameter>-fPIC</parameter> directive to the <envar>CFLAGS</envar>
+      variable for the duration of the configure command below, then
+      remove it afterwards.</para>
+    </note>
+
+    <para>Prepare Zlib for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --shared --libdir=/lib</userinput></screen>
 
-<para>Compile the package:</para>
+    <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue:
-<userinput>make check</userinput>.</para>
+    <para>To test the results, issue:
+    <userinput>make check</userinput>.</para>
 
-<para>Install the shared library:</para>
+    <para>Install the shared library:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>The previous command installed a <filename
-class="extension">.so</filename> file in <filename
-class="directory">/lib</filename>. We will remove it and relink it into
-<filename class="directory">/usr/lib</filename>:</para>
+    <para>The previous command installed a <filename
+    class="extension">.so</filename> file in <filename
+    class="directory">/lib</filename>. We will remove it and relink it into
+    <filename class="directory">/usr/lib</filename>:</para>
 
 <screen><userinput>rm -v /lib/libz.so
 ln -sfv ../../lib/libz.so.&zlib-version; /usr/lib/libz.so</userinput></screen>
 
-<para>Build the static library:</para>
+    <para>Build the static library:</para>
 
 <screen><userinput>make clean
 ./configure --prefix=/usr
 make</userinput></screen>
 
-<para>To test the results again, issue:
-<userinput>make check</userinput>.</para>
+    <para>To test the results again, issue:
+    <userinput>make check</userinput>.</para>
 
-<para>Install the static library:</para>
+    <para>Install the static library:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>Fix the permissions on the static library:</para>
+    <para>Fix the permissions on the static library:</para>
 
 <screen><userinput>chmod -v 644 /usr/lib/libz.a</userinput></screen>
 
-</sect2>
+  </sect2>
 
+  <sect2 id="contents-zlib" role="content">
+    <title>Contents of Zlib</title>
 
-<sect2 id="contents-zlib" role="content"><title>Contents of Zlib</title>
+    <segmentedlist>
+      <segtitle>Installed libraries</segtitle>
 
-<segmentedlist>
-<segtitle>Installed libraries</segtitle>
-<seglistitem><seg>libz.[a,so]</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>libz.[a,so]</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-<varlistentry id="libz">
-<term><filename class="libraryfile">libz</filename></term>
-<listitem>
-<para>Contains compression and decompression
-functions used by some programs</para>
-<indexterm zone="ch-system-zlib libz"><primary sortas="c-libz">libz</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
+      <varlistentry id="libz">
+        <term><filename class="libraryfile">libz</filename></term>
+        <listitem>
+          <para>Contains compression and decompression functions used by
+          some programs</para>
+          <indexterm zone="ch-system-zlib libz">
+            <primary sortas="c-libz">libz</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
 
-</sect1>
+  </sect2>
 
+</sect1>