Ported r7351 from trunk to alphabetical branch.

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

8 files changed, 880 insertions, 710 deletions

diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index 64397da3c..96a992878 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -1,98 +1,112 @@
 <?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-iproute2" role="wrap">
+  <?dbhtml filename="iproute2.html"?>
+
   <title>IPRoute2-&iproute2-version;</title>
-<?dbhtml filename="iproute2.html"?>
+
   <indexterm zone="ch-system-iproute2">
     <primary sortas="a-IPRoute2">IPRoute2</primary>
   </indexterm>
+
   <sect2 role="package">
     <title/>
-    <para>The IPRoute2 package contains programs for basic and advanced
-          IPV4-based networking.
-    </para>
+
+    <para>The IPRoute2 package contains programs for basic and advanced IPV4-based
+    networking.</para>
+
     <segmentedlist>
       <segtitle>&buildtime;</segtitle>
       <segtitle>&diskspace;</segtitle>
+
       <seglistitem>
         <seg>0.1 SBU</seg>
         <seg>4.3 MB</seg>
       </seglistitem>
     </segmentedlist>
+
     <segmentedlist>
       <segtitle>&dependencies;</segtitle>
+
       <seglistitem>
         <seg>Berkeley DB, GCC, Glibc, Make, and Linux-Headers</seg>
       </seglistitem>
     </segmentedlist>
+
   </sect2>
+
   <sect2 role="installation">
     <title>Installation of IPRoute2</title>
 
     <para>Prepare IPRoute2 for compilation:</para>
-    <screen><userinput>chmod u+x configure &amp;&amp;
+
+<screen><userinput>chmod u+x configure &amp;&amp;
 ./configure</userinput></screen>
 
     <para>Compile the package:</para>
 
-    <screen><userinput>make SBINDIR=/sbin</userinput></screen>
-
-    <para>The meaning of the make option:</para>
+<screen><userinput>make SBINDIR=/sbin</userinput></screen>
 
     <variablelist>
-    <varlistentry>
-    <term><parameter>SBINDIR=/sbin</parameter></term>
-    <listitem><para>This ensures that the IPRoute2 binaries will install into
-      <filename class="directory">/sbin</filename>. This is the correct location
-      according to the FHS, because some of the IPRoute2 binaries are used by
-      the LFS-Bootscripts package.</para>
-    </listitem>
-    </varlistentry>
+      <title>The meaning of the make option:</title>
+
+      <varlistentry>
+        <term><parameter>SBINDIR=/sbin</parameter></term>
+        <listitem>
+          <para>This ensures that the IPRoute2 binaries will install into
+          <filename class="directory">/sbin</filename>. This is the correct
+          location according to the FHS, because some of the IPRoute2 binaries
+          are used by the LFS-Bootscripts package.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>This package does not come with a test suite.</para>
 
     <para>Install the package:</para>
 
-    <screen><userinput>make SBINDIR=/sbin install</userinput></screen>
-    
-    <para>The <command>arpd</command> binary links against the Berkeley DB libraries
-          that reside in <filename class="directory">/usr</filename> and
-          uses a database in <filename>/var/lib/arpd/arpd.db</filename>. Thus,
-          according to the FHS, it must be
-          in <filename class="directory">/usr/sbin</filename>. Move it there:
-    </para>
+<screen><userinput>make SBINDIR=/sbin install</userinput></screen>
+
+    <para>The <command>arpd</command> binary links against the Berkeley DB
+    libraries that reside in <filename class="directory">/usr</filename> and
+    uses a database in <filename>/var/lib/arpd/arpd.db</filename>. Thus,
+    according to the FHS, it must be in <filename
+    class="directory">/usr/sbin</filename>. Move it there:</para>
 
     <screen><userinput>mv -v /sbin/arpd /usr/sbin</userinput></screen>
-      
+
   </sect2>
 
   <sect2 id="contents-iproute2" role="content">
     <title>Contents of IPRoute2</title>
+
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+
       <seglistitem>
         <seg>arpd, ctstat (link to lnstat), ifcfg, ifstat, ip, lnstat, nstat,
-	     routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
-	     and tc.
-        </seg>
+        routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
+        and tc.</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="arpd">
-        <term>
-          <command>arpd</command>
-        </term>
+        <term><command>arpd</command></term>
         <listitem>
-          <para>Userspace ARP daemon, useful in really large networks, where
-	        the kernelspace ARP implementation is insufficient, or
-	        when setting up a honeypot</para>
+          <para>Userspace ARP daemon, useful in really large networks, where the
+          kernelspace ARP implementation is insufficient, or when setting up a
+          honeypot</para>
           <indexterm zone="ch-system-iproute2 arpd">
             <primary sortas="b-arpd">arpd</primary>
           </indexterm>
@@ -100,9 +114,7 @@
       </varlistentry>
 
       <varlistentry id="ctstat">
-        <term>
-          <command>ctstat</command>
-        </term>
+        <term><command>ctstat</command></term>
         <listitem>
           <para>Connection status utility</para>
           <indexterm zone="ch-system-iproute2 ctstat">
@@ -112,9 +124,7 @@
       </varlistentry>
 
       <varlistentry id="ifcfg">
-        <term>
-          <command>ifcfg</command>
-        </term>
+        <term><command>ifcfg</command></term>
         <listitem>
           <para>A shell script wrapper for the <command>ip</command> command</para>
           <indexterm zone="ch-system-iproute2 ifcfg">
@@ -124,12 +134,10 @@
       </varlistentry>
 
       <varlistentry id="ifstat">
-        <term>
-          <command>ifstat</command>
-        </term>
+        <term><command>ifstat</command></term>
         <listitem>
-          <para>Shows the interface statistics, including the amount of transmitted
-                and received packets by interface</para>
+          <para>Shows the interface statistics, including the amount of
+          transmitted and received packets by interface</para>
           <indexterm zone="ch-system-iproute2 ifstat">
             <primary sortas="b-ifstat">ifstat</primary>
           </indexterm>
@@ -137,49 +145,37 @@
       </varlistentry>
 
       <varlistentry id="ip">
-        <term>
-          <command>ip</command>
-        </term>
+        <term><command>ip</command></term>
         <listitem>
-
           <para>The main executable. It has several different functions:</para>
 
           <para><command>ip link <replaceable>[device]</replaceable></command>
-                allows users to look at the state of devices and to make changes
-          </para>
+          allows users to look at the state of devices and to make changes</para>
 
           <para><command>ip addr</command> allows users to look at addresses and
-                their properties, add new addresses, and delete old ones
-          </para>
+          their properties, add new addresses, and delete old ones</para>
 
-          <para><command>ip neighbor</command> allows users to look at
-		neighbor bindings and their properties, add new
-		neighbor entries, and delete old ones
-          </para>
+          <para><command>ip neighbor</command> allows users to look at neighbor
+          bindings and their properties, add new neighbor entries, and delete
+          old ones</para>
 
           <para><command>ip rule</command> allows users to look at the routing
-                policies and change them
-          </para>
+          policies and change them</para>
 
           <para><command>ip route</command> allows users to look at the routing
-                table and change routing table rules
-          </para>
+          table and change routing table rules</para>
 
           <para><command>ip tunnel</command> allows users to look at the IP
-                tunnels and their properties, and change them
-          </para>
+          tunnels and their properties, and change them</para>
 
           <para><command>ip maddr</command> allows users to look at the multicast
-                addresses and their properties, and change them
-          </para>
+          addresses and their properties, and change them</para>
 
           <para><command>ip mroute</command> allows users to set, change, or
-                delete the multicast routing
-          </para>
+          delete the multicast routing</para>
 
-          <para><command>ip monitor</command> allows users to
-		continously monitor the state of devices, addresses and routes
-          </para>
+          <para><command>ip monitor</command> allows users to continously monitor
+          the state of devices, addresses and routes</para>
           <indexterm zone="ch-system-iproute2 ip">
             <primary sortas="b-ip">ip</primary>
           </indexterm>
@@ -187,13 +183,11 @@
       </varlistentry>
 
       <varlistentry id="lnstat">
-        <term>
-          <command>lnstat</command>
-        </term>
+        <term><command>lnstat</command></term>
         <listitem>
           <para>Provides Linux network statistics.  It is a generalized and more
-                feature-complete replacement for the old
-                <command>rtstat</command> program</para>
+          feature-complete replacement for the old <command>rtstat</command>
+          program</para>
           <indexterm zone="ch-system-iproute2 lnstat">
             <primary sortas="b-lnstat">lnstat</primary>
           </indexterm>
@@ -201,9 +195,7 @@
       </varlistentry>
 
       <varlistentry id="nstat">
-        <term>
-          <command>nstat</command>
-        </term>
+        <term><command>nstat</command></term>
         <listitem>
           <para>Shows network statistics</para>
           <indexterm zone="ch-system-iproute2 nstat">
@@ -213,13 +205,10 @@
       </varlistentry>
 
       <varlistentry id="routef">
-        <term>
-          <command>routef</command>
-        </term>
+        <term><command>routef</command></term>
         <listitem>
-          <para>A component of <command>ip route</command>. This is for flushing the routing
-                tables
-          </para>
+          <para>A component of <command>ip route</command>. This is for flushing
+          the routing tables</para>
           <indexterm zone="ch-system-iproute2 routef">
             <primary sortas="b-routef">routef</primary>
           </indexterm>
@@ -227,13 +216,10 @@
       </varlistentry>
 
       <varlistentry id="routel">
-        <term>
-          <command>routel</command>
-        </term>
+        <term><command>routel</command></term>
         <listitem>
-          <para>A component of <command>ip route</command>. This is for listing the routing
-                tables
-          </para>
+          <para>A component of <command>ip route</command>. This is for listing
+          the routing tables</para>
           <indexterm zone="ch-system-iproute2 routel">
             <primary sortas="b-routel">routel</primary>
           </indexterm>
@@ -241,11 +227,10 @@
       </varlistentry>
 
       <varlistentry id="rtacct">
-        <term>
-          <command>rtacct</command>
-        </term>
+        <term><command>rtacct</command></term>
         <listitem>
-          <para>Displays the contents of <filename>/proc/net/rt_acct</filename></para>
+          <para>Displays the contents of
+          <filename>/proc/net/rt_acct</filename></para>
           <indexterm zone="ch-system-iproute2 rtacct">
             <primary sortas="b-rtacct">rtacct</primary>
           </indexterm>
@@ -253,9 +238,7 @@
       </varlistentry>
 
       <varlistentry id="rtmon">
-        <term>
-          <command>rtmon</command>
-        </term>
+        <term><command>rtmon</command></term>
         <listitem>
           <para>Route monitoring utility</para>
           <indexterm zone="ch-system-iproute2 rtmon">
@@ -265,12 +248,10 @@
       </varlistentry>
 
       <varlistentry id="rtpr">
-        <term>
-          <command>rtpr</command>
-        </term>
+        <term><command>rtpr</command></term>
         <listitem>
           <para>Converts the output of <command>ip -o</command> back into a
-                readable form</para>
+          readable form</para>
           <indexterm zone="ch-system-iproute2 rtpr">
             <primary sortas="b-rtpr">rtpr</primary>
           </indexterm>
@@ -278,9 +259,7 @@
       </varlistentry>
 
       <varlistentry id="rtstat">
-        <term>
-          <command>rtstat</command>
-        </term>
+        <term><command>rtstat</command></term>
         <listitem>
           <para>Route status utility</para>
           <indexterm zone="ch-system-iproute2 rtstat">
@@ -290,11 +269,10 @@
       </varlistentry>
 
       <varlistentry id="ss">
-        <term>
-          <command>ss</command>
-        </term>
+        <term><command>ss</command></term>
         <listitem>
-          <para>Similar to the <command>netstat</command> command; shows active connections</para>
+          <para>Similar to the <command>netstat</command> command; shows active
+          connections</para>
           <indexterm zone="ch-system-iproute2 ss">
             <primary sortas="b-ss">ss</primary>
           </indexterm>
@@ -302,40 +280,33 @@
       </varlistentry>
 
       <varlistentry id="tc">
-        <term>
-          <command>tc</command>
-        </term>
+        <term><command>tc</command></term>
         <listitem>
-          <para>Traffic Controlling Executable; this is for Quality Of
-                Service (QOS) and Class Of Service (COS)
-                implementations
-          </para>
+          <para>Traffic Controlling Executable; this is for Quality Of Service
+          (QOS) and Class Of Service (COS) implementations</para>
 
           <para><command>tc qdisc</command> allows users to setup the queueing
-                discipline
-          </para>
+          discipline</para>
 
-          <para><command>tc class</command> allows users to setup classes based on
-                the queuing discipline scheduling
-          </para>
+          <para><command>tc class</command> allows users to setup classes based
+          on the queuing discipline scheduling</para>
 
           <para><command>tc estimator</command> allows users to estimate the
-                network flow into a network
-          </para>
+          network flow into a network</para>
 
           <para><command>tc filter</command> allows users to setup the QOS/COS
-                packet filtering
-          </para>
+          packet filtering</para>
 
           <para><command>tc policy</command> allows users to setup the QOS/COS
-                policies
-          </para>
+          policies</para>
           <indexterm zone="ch-system-iproute2 ss">
             <primary sortas="b-tc">tc</primary>
           </indexterm>
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
-</sect1>
 
+</sect1>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 317a1a95f..e43254ebe 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -1,310 +1,385 @@
 <?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-kbd" role="wrap">
-<title>Kbd-&kbd-version;</title>
-<?dbhtml filename="kbd.html"?>
+  <?dbhtml filename="kbd.html"?>
+
+  <title>Kbd-&kbd-version;</title>
+
+  <indexterm zone="ch-system-kbd">
+    <primary sortas="a-Kbd">Kbd</primary>
+  </indexterm>
 
-<indexterm zone="ch-system-kbd"><primary sortas="a-Kbd">Kbd</primary></indexterm>
+  <sect2 role="package">
+    <title/>
 
-<sect2 role="package"><title/>
-<para>The Kbd package contains key-table files and keyboard utilities.</para>
+    <para>The Kbd package contains key-table files and keyboard utilities.</para>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>11.8 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.1 SBU</seg>
+        <seg>11.8 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Bison, Coreutils, Diffutils, Flex, GCC,
-Gettext, Glibc, Grep, Gzip, M4, Make, Patch, and Sed</seg></seglistitem>
-</segmentedlist>
-</sect2>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-<sect2 role="installation">
-<title>Installation of Kbd</title>
+      <seglistitem>
+        <seg>Bash, Binutils, Bison, Coreutils, Diffutils, Flex, GCC, Gettext,
+        Glibc, Grep, Gzip, M4, Make, Patch, and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<para>The behaviour of the Backspace and Delete keys is not consistent across the
-keymaps in the Kbd package. The following patch fixes this issue for
-i386 keymaps:</para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Kbd</title>
+
+    <para>The behaviour of the Backspace and Delete keys is not consistent
+    across the keymaps in the Kbd package. The following patch fixes this
+    issue for i386 keymaps:</para>
 
 <screen><userinput>patch -Np1 -i ../&kbd-backspace-patch;</userinput></screen>
 
-<para>After patching, the Backspace key generates the character with code 127,
-and the Delete key generates a well-known escape sequence.</para>
+    <para>After patching, the Backspace key generates the character with code 127,
+    and the Delete key generates a well-known escape sequence.</para>
 
-<para>Patch Kbd to fix a bug in <command>setfont</command> that is triggered
-when compiling with GCC-&gcc-version;:</para>
+    <para>Patch Kbd to fix a bug in <command>setfont</command> that is triggered
+    when compiling with GCC-&gcc-version;:</para>
 
 <screen><userinput>patch -Np1 -i ../&kbd-gcc4_fixes-patch;</userinput></screen>
 
-<para>Prepare Kbd for compilation:</para>
+    <para>Prepare Kbd for compilation:</para>
 
 <screen><userinput>./configure</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>
 
-<note><para>For some languages (e.g., Belarusian) the Kbd package doesn't
-provide a useful keymap (the stock <quote>by</quote> keymap assumes the
-ISO-8859-5 encoding, while everybody uses CP1251 instead). Users of such
-languages have to download working keymaps separately.</para></note>
-
-</sect2>
-
-<sect2 id="contents-kbd" role="content"><title>Contents of Kbd</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>chvt, deallocvt, dumpkeys,
-fgconsole, getkeycodes, getunimap, kbd_mode, kbdrate, loadkeys, loadunimap,
-mapscrn, openvt, psfaddtable (link to psfxtable), psfgettable (link to
-psfxtable), psfstriptable (link to psfxtable), psfxtable, resizecons,
-setfont, setkeycodes, setleds, setlogcons, setmetamode, setvesablank,
-showconsolefont, showkey, unicode_start, and unicode_stop</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="chvt">
-<term><command>chvt</command></term>
-<listitem>
-<para>Changes the foreground virtual terminal</para>
-<indexterm zone="ch-system-kbd chvt"><primary sortas="b-chvt">chvt</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="deallocvt">
-<term><command>deallocvt</command></term>
-<listitem>
-<para>Deallocates unused virtual terminals</para>
-<indexterm zone="ch-system-kbd deallocvt"><primary sortas="b-deallocvt">deallocvt</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="dumpkeys">
-<term><command>dumpkeys</command></term>
-<listitem>
-<para>Dumps the keyboard translation tables</para>
-<indexterm zone="ch-system-kbd dumpkeys"><primary sortas="b-dumpkeys">dumpkeys</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="fgconsole">
-<term><command>fgconsole</command></term>
-<listitem>
-<para>Prints the number of the active virtual terminal</para>
-<indexterm zone="ch-system-kbd fgconsole"><primary sortas="b-fgconsole">fgconsole</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="getkeycodes">
-<term><command>getkeycodes</command></term>
-<listitem>
-<para>Prints the kernel scancode-to-keycode mapping table</para>
-<indexterm zone="ch-system-kbd getkeycodes"><primary sortas="b-getkeycodes">getkeycodes</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="getunimap">
-<term><command>getunimap</command></term>
-<listitem>
-<para>Prints the currently used unicode-to-font mapping table</para>
-<indexterm zone="ch-system-kbd getunimap"><primary sortas="b-getunimap">getunimap</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="kbd_mode">
-<term><command>kbd_mode</command></term>
-<listitem>
-<para>Reports or sets the keyboard mode</para>
-<indexterm zone="ch-system-kbd kbd_mode"><primary sortas="b-kbd_mode">kbd_mode</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="kbdrate">
-<term><command>kbdrate</command></term>
-<listitem>
-<para>Sets the keyboard repeat and delay rates</para>
-<indexterm zone="ch-system-kbd kbdrate"><primary sortas="b-kbdrate">kbdrate</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="loadkeys">
-<term><command>loadkeys</command></term>
-<listitem>
-<para>Loads the keyboard translation tables</para>
-<indexterm zone="ch-system-kbd loadkeys"><primary sortas="b-loadkeys">loadkeys</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="loadunimap">
-<term><command>loadunimap</command></term>
-<listitem>
-<para>Loads the kernel unicode-to-font mapping table</para>
-<indexterm zone="ch-system-kbd loadunimap"><primary sortas="b-loadunimap">loadunimap</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="mapscrn">
-<term><command>mapscrn</command></term>
-<listitem>
-<para>An obsolete program that used to load
-a user-defined output character mapping table into the console driver; this is
-now done by <command>setfont</command></para>
-<indexterm zone="ch-system-kbd mapscrn"><primary sortas="b-mapscrn">mapscrn</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="openvt">
-<term><command>openvt</command></term>
-<listitem>
-<para>Starts a program on a new virtual terminal (VT)</para>
-<indexterm zone="ch-system-kbd openvt"><primary sortas="b-openvt">openvt</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="psfaddtable">
-<term><command>psfaddtable</command></term>
-<listitem>
-<para>A link to <command>psfxtable</command></para>
-<indexterm zone="ch-system-kbd psfaddtable"><primary sortas="b-psfaddtable">psfaddtable</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="psfgettable">
-<term><command>psfgettable</command></term>
-<listitem>
-<para>A link to <command>psfxtable</command></para>
-<indexterm zone="ch-system-kbd psfgettable"><primary sortas="b-psfgettable">psfgettable</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="psfstriptable">
-<term><command>psfstriptable</command></term>
-<listitem>
-<para>A link to <command>psfxtable</command></para>
-<indexterm zone="ch-system-kbd psfstriptable"><primary sortas="b-psfstriptable">psfstriptable</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="psfxtable">
-<term><command>psfxtable</command></term>
-<listitem>
-<para>Handle Unicode character tables for console fonts</para>
-<indexterm zone="ch-system-kbd psfxtable"><primary sortas="b-psfxtable">psfxtable</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="resizecons">
-<term><command>resizecons</command></term>
-<listitem>
-<para>Changes the kernel idea of the console size</para>
-<indexterm zone="ch-system-kbd resizecons"><primary sortas="b-resizecons">resizecons</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="setfont">
-<term><command>setfont</command></term>
-<listitem>
-<para>Changes the Enhanced Graphic Adapter (EGA) and Video Graphics
-Array (VGA) fonts on the console</para>
-<indexterm zone="ch-system-kbd setfont"><primary sortas="b-setfont">setfont</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="setkeycodes">
-<term><command>setkeycodes</command></term>
-<listitem>
-<para>Loads kernel scancode-to-keycode mapping table entries; this is
-useful if there are unusual keys on the keyboard</para>
-<indexterm zone="ch-system-kbd setkeycodes"><primary sortas="b-setkeycodes">setkeycodes</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="setleds">
-<term><command>setleds</command></term>
-<listitem>
-<para>Sets the keyboard flags and Light Emitting Diodes (LEDs)</para>
-<indexterm zone="ch-system-kbd setleds"><primary sortas="b-setleds">setleds</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="setlogcons">
-<term><command>setlogcons</command></term>
-<listitem>
-<para>Sends kernel messages to the console</para>
-<indexterm zone="ch-system-kbd setlogcons"><primary sortas="b-setlogcons">setlogcons</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="setmetamode">
-<term><command>setmetamode</command></term>
-<listitem>
-<para>Defines the keyboard meta-key handling</para>
-<indexterm zone="ch-system-kbd setmetamode"><primary sortas="b-setmetamode">setmetamode</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="setvesablank">
-<term><command>setvesablank</command></term>
-<listitem>
-<para>Lets the user adjust the built-in hardware screensaver (a blank
-screen)</para>
-<indexterm zone="ch-system-kbd setvesablank"><primary sortas="b-setvesablank">setvesablank</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="showconsolefont">
-<term><command>showconsolefont</command></term>
-<listitem>
-<para>Shows the current EGA/VGA console screen font</para>
-<indexterm zone="ch-system-kbd showconsolefont"><primary sortas="b-showconsolefont">showconsolefont</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="showkey">
-<term><command>showkey</command></term>
-<listitem>
-<para>Reports the scancodes, keycodes, and ASCII codes of the keys
-pressed on the keyboard</para>
-<indexterm zone="ch-system-kbd showkey"><primary sortas="b-showkey">showkey</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="unicode_start">
-<term><command>unicode_start</command></term>
-<listitem>
-<para>Puts the keyboard and console in UNICODE mode. Don't use this program
-unless your keymap file is in the ISO-8859-1 encoding. For other encodings,
-this utility produces incorrect results.</para>
-<indexterm zone="ch-system-kbd unicode_start"><primary sortas="b-unicode_start">unicode_start</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="unicode_stop">
-<term><command>unicode_stop</command></term>
-<listitem>
-<para>Reverts keyboard and console from UNICODE mode</para>
-<indexterm zone="ch-system-kbd unicode_stop"><primary sortas="b-unicode_stop">unicode_stop</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+    <note>
+      <para>For some languages (e.g., Belarusian) the Kbd package doesn't
+      provide a useful keymap (the stock <quote>by</quote> keymap assumes the
+      ISO-8859-5 encoding, while everybody uses CP1251 instead). Users of such
+      languages have to download working keymaps separately.</para>
+    </note>
+
+  </sect2>
+
+  <sect2 id="contents-kbd" role="content">
+    <title>Contents of Kbd</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>chvt, deallocvt, dumpkeys,
+        fgconsole, getkeycodes, getunimap, kbd_mode, kbdrate, loadkeys, loadunimap,
+        mapscrn, openvt, psfaddtable (link to psfxtable), psfgettable (link to
+        psfxtable), psfstriptable (link to psfxtable), psfxtable, resizecons,
+        setfont, setkeycodes, setleds, setlogcons, setmetamode, setvesablank,
+        showconsolefont, showkey, unicode_start, and unicode_stop</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="chvt">
+        <term><command>chvt</command></term>
+        <listitem>
+          <para>Changes the foreground virtual terminal</para>
+          <indexterm zone="ch-system-kbd chvt">
+            <primary sortas="b-chvt">chvt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="deallocvt">
+        <term><command>deallocvt</command></term>
+        <listitem>
+          <para>Deallocates unused virtual terminals</para>
+          <indexterm zone="ch-system-kbd deallocvt">
+            <primary sortas="b-deallocvt">deallocvt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dumpkeys">
+        <term><command>dumpkeys</command></term>
+        <listitem>
+          <para>Dumps the keyboard translation tables</para>
+          <indexterm zone="ch-system-kbd dumpkeys">
+            <primary sortas="b-dumpkeys">dumpkeys</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="fgconsole">
+        <term><command>fgconsole</command></term>
+        <listitem>
+          <para>Prints the number of the active virtual terminal</para>
+          <indexterm zone="ch-system-kbd fgconsole">
+            <primary sortas="b-fgconsole">fgconsole</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getkeycodes">
+        <term><command>getkeycodes</command></term>
+        <listitem>
+          <para>Prints the kernel scancode-to-keycode mapping table</para>
+          <indexterm zone="ch-system-kbd getkeycodes">
+            <primary sortas="b-getkeycodes">getkeycodes</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getunimap">
+        <term><command>getunimap</command></term>
+        <listitem>
+          <para>Prints the currently used unicode-to-font mapping table</para>
+          <indexterm zone="ch-system-kbd getunimap">
+            <primary sortas="b-getunimap">getunimap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kbd_mode">
+        <term><command>kbd_mode</command></term>
+        <listitem>
+          <para>Reports or sets the keyboard mode</para>
+          <indexterm zone="ch-system-kbd kbd_mode">
+            <primary sortas="b-kbd_mode">kbd_mode</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="kbdrate">
+        <term><command>kbdrate</command></term>
+        <listitem>
+          <para>Sets the keyboard repeat and delay rates</para>
+          <indexterm zone="ch-system-kbd kbdrate">
+            <primary sortas="b-kbdrate">kbdrate</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="loadkeys">
+        <term><command>loadkeys</command></term>
+        <listitem>
+          <para>Loads the keyboard translation tables</para>
+          <indexterm zone="ch-system-kbd loadkeys">
+            <primary sortas="b-loadkeys">loadkeys</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="loadunimap">
+        <term><command>loadunimap</command></term>
+        <listitem>
+          <para>Loads the kernel unicode-to-font mapping table</para>
+          <indexterm zone="ch-system-kbd loadunimap">
+            <primary sortas="b-loadunimap">loadunimap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mapscrn">
+        <term><command>mapscrn</command></term>
+        <listitem>
+          <para>An obsolete program that used to load a user-defined output
+          character mapping table into the console driver; this is now done
+          by <command>setfont</command></para>
+          <indexterm zone="ch-system-kbd mapscrn">
+            <primary sortas="b-mapscrn">mapscrn</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="openvt">
+        <term><command>openvt</command></term>
+        <listitem>
+          <para>Starts a program on a new virtual terminal (VT)</para>
+          <indexterm zone="ch-system-kbd openvt">
+            <primary sortas="b-openvt">openvt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="psfaddtable">
+        <term><command>psfaddtable</command></term>
+        <listitem>
+          <para>A link to <command>psfxtable</command></para>
+          <indexterm zone="ch-system-kbd psfaddtable">
+            <primary sortas="b-psfaddtable">psfaddtable</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="psfgettable">
+        <term><command>psfgettable</command></term>
+        <listitem>
+          <para>A link to <command>psfxtable</command></para>
+          <indexterm zone="ch-system-kbd psfgettable">
+            <primary sortas="b-psfgettable">psfgettable</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="psfstriptable">
+        <term><command>psfstriptable</command></term>
+        <listitem>
+          <para>A link to <command>psfxtable</command></para>
+          <indexterm zone="ch-system-kbd psfstriptable">
+            <primary sortas="b-psfstriptable">psfstriptable</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="psfxtable">
+        <term><command>psfxtable</command></term>
+        <listitem>
+          <para>Handle Unicode character tables for console fonts</para>
+          <indexterm zone="ch-system-kbd psfxtable">
+            <primary sortas="b-psfxtable">psfxtable</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="resizecons">
+        <term><command>resizecons</command></term>
+        <listitem>
+          <para>Changes the kernel idea of the console size</para>
+          <indexterm zone="ch-system-kbd resizecons">
+            <primary sortas="b-resizecons">resizecons</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setfont">
+        <term><command>setfont</command></term>
+        <listitem>
+          <para>Changes the Enhanced Graphic Adapter (EGA) and Video Graphics
+          Array (VGA) fonts on the console</para>
+          <indexterm zone="ch-system-kbd setfont">
+            <primary sortas="b-setfont">setfont</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setkeycodes">
+        <term><command>setkeycodes</command></term>
+        <listitem>
+          <para>Loads kernel scancode-to-keycode mapping table entries; this is
+          useful if there are unusual keys on the keyboard</para>
+          <indexterm zone="ch-system-kbd setkeycodes">
+            <primary sortas="b-setkeycodes">setkeycodes</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setleds">
+        <term><command>setleds</command></term>
+        <listitem>
+          <para>Sets the keyboard flags and Light Emitting Diodes (LEDs)</para>
+          <indexterm zone="ch-system-kbd setleds">
+            <primary sortas="b-setleds">setleds</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setlogcons">
+        <term><command>setlogcons</command></term>
+        <listitem>
+          <para>Sends kernel messages to the console</para>
+          <indexterm zone="ch-system-kbd setlogcons">
+            <primary sortas="b-setlogcons">setlogcons</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setmetamode">
+        <term><command>setmetamode</command></term>
+        <listitem>
+          <para>Defines the keyboard meta-key handling</para>
+          <indexterm zone="ch-system-kbd setmetamode">
+            <primary sortas="b-setmetamode">setmetamode</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setvesablank">
+        <term><command>setvesablank</command></term>
+        <listitem>
+          <para>Lets the user adjust the built-in hardware screensaver (a blank
+          screen)</para>
+          <indexterm zone="ch-system-kbd setvesablank">
+            <primary sortas="b-setvesablank">setvesablank</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="showconsolefont">
+        <term><command>showconsolefont</command></term>
+        <listitem>
+          <para>Shows the current EGA/VGA console screen font</para>
+          <indexterm zone="ch-system-kbd showconsolefont">
+            <primary sortas="b-showconsolefont">showconsolefont</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="showkey">
+        <term><command>showkey</command></term>
+        <listitem>
+          <para>Reports the scancodes, keycodes, and ASCII codes of the keys
+          pressed on the keyboard</para>
+          <indexterm zone="ch-system-kbd showkey">
+            <primary sortas="b-showkey">showkey</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="unicode_start">
+        <term><command>unicode_start</command></term>
+        <listitem>
+          <para>Puts the keyboard and console in UNICODE mode. Don't use this
+          program unless your keymap file is in the ISO-8859-1 encoding. For
+          other encodings, this utility produces incorrect results.</para>
+          <indexterm zone="ch-system-kbd unicode_start">
+            <primary sortas="b-unicode_start">unicode_start</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="unicode_stop">
+        <term><command>unicode_stop</command></term>
+        <listitem>
+          <para>Reverts keyboard and console from UNICODE mode</para>
+          <indexterm zone="ch-system-kbd unicode_stop">
+            <primary sortas="b-unicode_stop">unicode_stop</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
diff --git a/chapter06/kernfs.xml b/chapter06/kernfs.xml
index 34273b7b2..2bdf9f9c3 100644
--- a/chapter06/kernfs.xml
+++ b/chapter06/kernfs.xml
@@ -1,37 +1,40 @@
 <?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-kernfs">
-<title>Mounting Virtual Kernel File Systems</title>
-<?dbhtml filename="kernfs.html"?>
+  <?dbhtml filename="kernfs.html"?>
+
+  <title>Mounting Virtual Kernel File Systems</title>
 
-<para>Various file systems exported by the kernel are used to communicate to and
-from the kernel itself. These file systems are virtual in that no disk space is
-used for them. The content of the file systems resides in memory.</para>
+  <para>Various file systems exported by the kernel are used to communicate to and
+  from the kernel itself. These file systems are virtual in that no disk space is
+  used for them. The content of the file systems resides in memory.</para>
 
-<para>Begin by creating directories onto which the file systems will be mounted:</para>
+  <para>Begin by creating directories onto which the file systems will be
+  mounted:</para>
 
 <screen><userinput>mkdir -pv $LFS/{proc,sys}</userinput></screen>
 
-<para>Now mount the file systems:</para>
+  <para>Now mount the file systems:</para>
 
 <screen><userinput>mount -vt proc proc $LFS/proc
 mount -vt sysfs sysfs $LFS/sys</userinput></screen>
 
-<para>Remember that if for any reason you stop working on the LFS
-system and start again later, it is important to check that these file
-systems are mounted again before entering the chroot
-environment.</para>
+  <para>Remember that if for any reason you stop working on the LFS
+  system and start again later, it is important to check that these file
+  systems are mounted again before entering the chroot
+  environment.</para>
 
-<para>Additional file systems will soon be mounted from within the
-chroot environment. To keep the host up to date, perform a <quote>fake
-mount</quote> for each of these now:</para>
+  <para>Additional file systems will soon be mounted from within the
+  chroot environment. To keep the host up to date, perform a <quote>fake
+  mount</quote> for each of these now:</para>
 
 <screen><userinput>mount -vft tmpfs tmpfs $LFS/dev
 mount -vft tmpfs tmpfs $LFS/dev/shm
 mount -vft devpts -o gid=4,mode=620 devpts $LFS/dev/pts</userinput></screen>
 
 </sect1>
-
diff --git a/chapter06/less.xml b/chapter06/less.xml
index 817a6c67e..5d1f9d626 100644
--- a/chapter06/less.xml
+++ b/chapter06/less.xml
@@ -1,97 +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-less" role="wrap">
-<title>Less-&less-version;</title>
-<?dbhtml filename="less.html"?>
+  <?dbhtml filename="less.html"?>
+
+  <title>Less-&less-version;</title>
+
+  <indexterm zone="ch-system-less">
+    <primary sortas="a-Less">Less</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Less package contains a text file viewer.</para>
 
-<indexterm zone="ch-system-less"><primary sortas="a-Less">Less</primary></indexterm>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<sect2 role="package"><title/>
-<para>The Less package contains a text file viewer.</para>
+      <seglistitem>
+        <seg>0.1 SBU</seg>
+        <seg>2.3 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>2.3 MB</seg></seglistitem>
-</segmentedlist>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
-</segmentedlist>
-</sect2>
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
+        Ncurses, and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<sect2 role="installation">
-<title>Installation of Less</title>
+  </sect2>
 
-<para>Prepare Less for compilation:</para>
+  <sect2 role="installation">
+    <title>Installation of Less</title>
+
+    <para>Prepare Less for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --sysconfdir=/etc</userinput></screen>
 
-<para>The meaning of the configure options:</para>
+    <variablelist>
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--sysconfdir=/etc</parameter></term>
+        <listitem>
+          <para>This option tells the programs created by the package to look
+          in <filename class="directory">/etc</filename> for the configuration
+          files.</para>
+        </listitem>
+      </varlistentry>
 
-<variablelist>
-<varlistentry>
-<term><parameter>--sysconfdir=/etc</parameter></term>
-<listitem><para>This option tells the programs created by the package to look in 
-<filename class="directory">/etc</filename> for the configuration files.</para></listitem>
-</varlistentry>
-</variablelist>
+    </variablelist>
 
-<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 id="contents-less" role="content"><title>Contents of Less</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>less, lessecho, and lesskey</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="less">
-<term><command>less</command></term>
-<listitem>
-<para>A file viewer or pager; it displays the contents of the given
-file, letting the user scroll, find strings, and jump to marks</para>
-<indexterm zone="ch-system-less less"><primary sortas="b-less">less</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="lessecho">
-<term><command>lessecho</command></term>
-<listitem>
-<para>Needed to expand meta-characters, such as <emphasis>*</emphasis>
-and <emphasis>?</emphasis>, in filenames on Unix systems</para>
-<indexterm zone="ch-system-less lessecho"><primary sortas="b-lessecho">lessecho</primary></indexterm>
-</listitem>
-</varlistentry>
-
-<varlistentry id="lesskey">
-<term><command>lesskey</command></term>
-<listitem>
-<para>Used to specify the key bindings for <command>less</command></para>
-<indexterm zone="ch-system-less lesskey"><primary sortas="b-lesskey">lesskey</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
 
-</sect1>
+  </sect2>
+
+  <sect2 id="contents-less" role="content">
+    <title>Contents of Less</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>less, lessecho, and lesskey</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="less">
+        <term><command>less</command></term>
+        <listitem>
+          <para>A file viewer or pager; it displays the contents of the given
+          file, letting the user scroll, find strings, and jump to marks</para>
+          <indexterm zone="ch-system-less less">
+            <primary sortas="b-less">less</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lessecho">
+        <term><command>lessecho</command></term>
+        <listitem>
+          <para>Needed to expand meta-characters, such as <emphasis>*</emphasis>
+          and <emphasis>?</emphasis>, in filenames on Unix systems</para>
+          <indexterm zone="ch-system-less lessecho">
+            <primary sortas="b-lessecho">lessecho</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lesskey">
+        <term><command>lesskey</command></term>
+        <listitem>
+          <para>Used to specify the key bindings for <command>less</command></para>
+          <indexterm zone="ch-system-less lesskey">
+            <primary sortas="b-lesskey">lesskey</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
+</sect1>
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index 3e6ab3258..6d554cf48 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -1,91 +1,119 @@
 <?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-libtool" role="wrap">
-<title>Libtool-&libtool-version;</title>
-<?dbhtml filename="libtool.html"?>
-
-<indexterm zone="ch-system-libtool"><primary sortas="a-Libtool">Libtool</primary></indexterm>
 
-<sect2 role="package"><title/>
-<para>The Libtool package contains the GNU generic library support script.
-It wraps the complexity of using shared libraries in a consistent, portable
-interface.</para>
+<sect1 id="ch-system-libtool" role="wrap">
+  <?dbhtml filename="libtool.html"?>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>1.8 SBU</seg><seg>19.0 MB</seg></seglistitem>
-</segmentedlist>
+  <title>Libtool-&libtool-version;</title>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, and Sed</seg></seglistitem>
-</segmentedlist>
-</sect2>
+  <indexterm zone="ch-system-libtool">
+    <primary sortas="a-Libtool">Libtool</primary>
+  </indexterm>
 
-<sect2 role="installation">
-<title>Installation of Libtool</title>
+  <sect2 role="package">
+    <title/>
 
-<para>Prepare Libtool for compilation:</para>
+    <para>The Libtool package contains the GNU generic library support script.
+    It wraps the complexity of using shared libraries in a consistent, portable
+    interface.</para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<para>Compile the package:</para>
+      <seglistitem>
+        <seg>1.8 SBU</seg>
+        <seg>19.0 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<screen><userinput>make</userinput></screen>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-<para>To test the results, issue:
-<userinput>make check</userinput>.</para>
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, Diffutils,
+        GCC, Glibc, Grep, Make, and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<para>Install the package:</para>
+  </sect2>
 
-<screen><userinput>make install</userinput></screen>
+  <sect2 role="installation">
+    <title>Installation of Libtool</title>
 
-</sect2>
+    <para>Prepare Libtool for compilation:</para>
 
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
 
-<sect2 id="contents-libtool" role="content"><title>Contents of Libtool</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<segtitle>Installed libraries</segtitle>
-<seglistitem><seg>libtool and libtoolize</seg><seg>libltdl.[a,so]</seg></seglistitem>
-</segmentedlist>
+    <para>Compile the package:</para>
 
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
+<screen><userinput>make</userinput></screen>
 
-<varlistentry id="libtool">
-<term><command>libtool</command></term>
-<listitem>
-<para>Provides generalized library-building support services</para>
-<indexterm zone="ch-system-libtool libtool"><primary sortas="b-libtool">libtool</primary></indexterm>
-</listitem>
-</varlistentry>
+    <para>To test the results, issue:
+    <userinput>make check</userinput>.</para>
 
-<varlistentry id="libtoolize">
-<term><command>libtoolize</command></term>
-<listitem>
-<para>Provides a standard way to add <command>libtool</command> support to a package</para>
-<indexterm zone="ch-system-libtool libtoolize"><primary sortas="b-libtoolize">libtoolize</primary></indexterm>
-</listitem>
-</varlistentry>
+    <para>Install the package:</para>
 
-<varlistentry id="libltdl">
-<term><filename class="libraryfile">libltdl</filename></term>
-<listitem>
-<para>Hides the various difficulties of dlopening libraries</para>
-<indexterm zone="ch-system-libtool libltdl"><primary sortas="c-libltdl">libltdl</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
+<screen><userinput>make install</userinput></screen>
 
-</sect2>
+  </sect2>
+
+
+  <sect2 id="contents-libtool" role="content">
+    <title>Contents of Libtool</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+
+      <seglistitem>
+        <seg>libtool and libtoolize</seg>
+        <seg>libltdl.[a,so]</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libtool">
+        <term><command>libtool</command></term>
+        <listitem>
+          <para>Provides generalized library-building support services</para>
+          <indexterm zone="ch-system-libtool libtool">
+            <primary sortas="b-libtool">libtool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libtoolize">
+        <term><command>libtoolize</command></term>
+        <listitem>
+          <para>Provides a standard way to add <command>libtool</command>
+          support to a package</para>
+          <indexterm zone="ch-system-libtool libtoolize">
+            <primary sortas="b-libtoolize">libtoolize</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libltdl">
+        <term><filename class="libraryfile">libltdl</filename></term>
+        <listitem>
+          <para>Hides the various difficulties of dlopening libraries</para>
+          <indexterm zone="ch-system-libtool libltdl">
+            <primary sortas="c-libltdl">libltdl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
diff --git a/chapter06/linux-libc-headers.xml b/chapter06/linux-libc-headers.xml
index a3cb12579..51b859fce 100644
--- a/chapter06/linux-libc-headers.xml
+++ b/chapter06/linux-libc-headers.xml
@@ -1,83 +1,101 @@
 <?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-linux-libc-headers" role="wrap">
-<title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
-<?dbhtml filename="linux-libc-headers.html"?>
+  <?dbhtml filename="linux-libc-headers.html"?>
+
+  <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
+
+  <indexterm zone="ch-system-linux-libc-headers">
+    <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
 
-<indexterm zone="ch-system-linux-libc-headers">
-<primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-</indexterm>
+    <para>The Linux-Libc-Headers package contains the
+    <quote>sanitized</quote> kernel headers.</para>
 
-<sect2 role="package"><title/>
-<para>The Linux-Libc-Headers package contains the
-<quote>sanitized</quote> kernel headers.</para>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>26.9 MB</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>0.1 SBU</seg>
+        <seg>26.9 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Coreutils and Findutils</seg></seglistitem>
-</segmentedlist>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-</sect2>
+      <seglistitem>
+        <seg>Coreutils and Findutils</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<sect2 role="installation">
-<title>Installation of Linux-Libc-Headers</title>
+  </sect2>
 
-<para>For years it has been common practice to use <quote>raw</quote>
-kernel headers (straight from a kernel tarball) in <filename
-class="directory">/usr/include</filename>, but over the last few
-years, the kernel developers have taken a strong stance that this
-should not be done. This gave birth to the Linux-Libc-Headers Project,
-which was designed to maintain an API stable version of the Linux
-headers.</para>
+  <sect2 role="installation">
+    <title>Installation of Linux-Libc-Headers</title>
 
-<para>Install the header files:</para>
+    <para>For years it has been common practice to use <quote>raw</quote>
+    kernel headers (straight from a kernel tarball) in <filename
+    class="directory">/usr/include</filename>, but over the last few
+    years, the kernel developers have taken a strong stance that this
+    should not be done. This gave birth to the Linux-Libc-Headers Project,
+    which was designed to maintain an API stable version of the Linux
+    headers.</para>
+
+    <para>Install the header files:</para>
 
 <screen><userinput>install -d /usr/include/asm
 cp -Rv include/asm-i386/* /usr/include/asm
 cp -Rv include/linux /usr/include</userinput></screen>
 
-<para>Ensure that all the headers are owned by root:</para>
+    <para>Ensure that all the headers are owned by root:</para>
 
 <screen><userinput>chown -Rv root:root /usr/include/{asm,linux}</userinput></screen>
 
-<para>Make sure the users can read the headers:</para>
+    <para>Make sure the users can read the headers:</para>
 
 <screen><userinput>find /usr/include/{asm,linux} -type d -exec chmod -v 755 {} \;
 find /usr/include/{asm,linux} -type f -exec chmod -v 644 {} \;</userinput></screen>
 
-</sect2>
+  </sect2>
 
+  <sect2 id="contents-linux-libc-headers" role="content">
+    <title>Contents of Linux-Libc-Headers</title>
 
-<sect2 id="contents-linux-libc-headers" role="content"><title>Contents of Linux-Libc-Headers</title>
+    <segmentedlist>
+      <segtitle>Installed headers</segtitle>
 
-<segmentedlist>
-<segtitle>Installed headers</segtitle>
-<seglistitem><seg>/usr/include/{asm,linux}/*.h</seg></seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>/usr/include/{asm,linux}/*.h</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="linux-libc-headers">
-<term><filename class="headerfile">/usr/include/{asm,linux}/*.h</filename></term>
-<listitem>
-<para>The Linux API headers</para>
-<indexterm zone="ch-system-linux-libc-headers linux-libc-headers"><primary sortas="e-/usr/include/{asm,linux}/*.h">/usr/include/{asm,linux}/*.h</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
+      <varlistentry id="linux-libc-headers">
+        <term><filename class="headerfile">/usr/include/{asm,linux}/*.h</filename></term>
+        <listitem>
+          <para>The Linux API headers</para>
+          <indexterm zone="ch-system-linux-libc-headers linux-libc-headers">
+            <primary sortas="e-/usr/include/{asm,linux}/*.h">/usr/include/{asm,linux}/*.h</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
 
-</sect1>
+  </sect2>
 
+</sect1>
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index 2fb465252..8a4be1db7 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -1,79 +1,101 @@
 <?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-m4" role="wrap">
-<title>M4-&m4-version;</title>
-<?dbhtml filename="m4.html"?>
+  <?dbhtml filename="m4.html"?>
+
+  <title>M4-&m4-version;</title>
+
+  <indexterm zone="ch-system-m4">
+    <primary sortas="a-M4">M4</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The M4 package contains a macro processor.</para>
 
-<indexterm zone="ch-system-m4"><primary sortas="a-M4">M4</primary></indexterm>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<sect2 role="package"><title/>
-<para>The M4 package contains a macro processor.</para>
+      <seglistitem>
+        <seg>0.1 SBU</seg>
+        <seg>2.8 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>2.8 MB</seg></seglistitem>
-</segmentedlist>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils, GCC,
-Gettext, Glibc, Grep, Make, Perl, and Sed</seg></seglistitem>
-</segmentedlist>
-</sect2>
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc,
+        Grep, Make, Perl, and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<sect2 role="installation">
-<title>Installation of M4</title>
+  </sect2>
 
-<para>Prepare M4 for compilation:</para>
+  <sect2 role="installation">
+    <title>Installation of M4</title>
+
+    <para>Prepare M4 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>
 
-</sect2>
+  </sect2>
 
 
-<sect2 id="contents-m4" role="content"><title>Contents of M4</title>
+  <sect2 id="contents-m4" role="content">
+    <title>Contents of M4</title>
 
-<segmentedlist>
-<segtitle>Installed program</segtitle>
-<seglistitem><seg>m4</seg></seglistitem>
-</segmentedlist>
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
 
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
+      <seglistitem>
+        <seg>m4</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<varlistentry id="m4">
-<term><command>m4</command></term>
-<listitem>
-<para>copies the given files while expanding the macros that they
-contain. These macros are either built-in or user-defined and can take
-any number of arguments. Besides performing macro expansion,
-<command>m4</command> has
-built-in functions for including named files, running Unix commands,
-performing integer arithmetic, manipulating text, recursion, etc. The
-<command>m4</command> program can be used either as a front-end to a compiler or as a
-macro processor in its own right.</para>
-<indexterm zone="ch-system-m4 m4"><primary sortas="b-m4">m4</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-</sect2>
+      <varlistentry id="m4">
+        <term><command>m4</command></term>
+        <listitem>
+          <para>copies the given files while expanding the macros that they
+          contain. These macros are either built-in or user-defined and can
+          take any number of arguments. Besides performing macro expansion,
+          <command>m4</command> has built-in functions for including named
+          files, running Unix commands, performing integer arithmetic,
+          manipulating text, recursion, etc. The <command>m4</command> program
+          can be used either as a front-end to a compiler or as a macro processor
+          in its own right.</para>
+          <indexterm zone="ch-system-m4 m4">
+            <primary sortas="b-m4">m4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect1>
+    </variablelist>
 
+  </sect2>
+
+</sect1>
diff --git a/chapter06/make.xml b/chapter06/make.xml
index 7f5bca110..6f8496caf 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -1,73 +1,95 @@
 <?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-make" role="wrap">
-<title>Make-&make-version;</title>
-<?dbhtml filename="make.html"?>
+  <?dbhtml filename="make.html"?>
+
+  <title>Make-&make-version;</title>
+
+  <indexterm zone="ch-system-make">
+    <primary sortas="a-Make">Make</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Make package contains a program for compiling packages.</para>
 
-<indexterm zone="ch-system-make"><primary sortas="a-Make">Make</primary></indexterm>
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
 
-<sect2 role="package"><title/>
-<para>The Make package contains a program for compiling packages.</para>
+      <seglistitem>
+        <seg>0.2 SBU</seg>
+        <seg>7.1 MB</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.2 SBU</seg><seg>7.1 MB</seg></seglistitem>
-</segmentedlist>
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
 
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
-GCC, Gettext, Glibc, Grep, and Sed</seg></seglistitem>
-</segmentedlist>
-</sect2>
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc,
+        Grep, and Sed</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<sect2 role="installation">
-<title>Installation of Make</title>
+  </sect2>
 
-<para>Prepare Make for compilation:</para>
+  <sect2 role="installation">
+    <title>Installation of Make</title>
+
+    <para>Prepare Make 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>
 
-</sect2>
+  </sect2>
 
 
-<sect2 id="contents-make" role="content"><title>Contents of Make</title>
+  <sect2 id="contents-make" role="content">
+    <title>Contents of Make</title>
 
-<segmentedlist>
-<segtitle>Installed program</segtitle>
-<seglistitem><seg>make</seg></seglistitem>
-</segmentedlist>
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
 
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
+      <seglistitem>
+        <seg>make</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<varlistentry id="make">
-<term><command>make</command></term>
-<listitem>
-<para>Automatically determines which pieces of a package need to
-be (re)compiled and then issues the relevant commands</para>
-<indexterm zone="ch-system-make make"><primary sortas="b-make">make</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-</sect2>
+      <varlistentry id="make">
+        <term><command>make</command></term>
+        <listitem>
+          <para>Automatically determines which pieces of a package need to
+          be (re)compiled and then issues the relevant commands</para>
+          <indexterm zone="ch-system-make make">
+            <primary sortas="b-make">make</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect1>
+    </variablelist>
 
+  </sect2>
+
+</sect1>