15 files changed, 116 insertions, 81 deletions
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index 65c58de60..46185fe39 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -72,7 +72,7 @@ pre-grohtml, refer, soelim, tbl, tfmtodit, troff and zsoelim (link to soelim)</s
 <listitem>
 <indexterm zone="ch-system-groff addftinfo"><primary sortas="b-addftinfo">addftinfo</primary></indexterm>
 <para>reads a troff font file and adds some
-additional font-metric information that is used by the groff system.</para>
+additional font-metric information that is used by the <command>groff</command> system.</para>
 </listitem>
 </varlistentry>
 
@@ -80,7 +80,7 @@ additional font-metric information that is used by the groff system.</para>
 <term><command>afmtodit</command></term>
 <listitem>
 <indexterm zone="ch-system-groff afmtodit"><primary sortas="b-afmtodit">afmtodit</primary></indexterm>
-<para>creates a font file for use with groff and grops.</para>
+<para>creates a font file for use with <command>groff</command> and <command>grops</command>.</para>
 </listitem>
 </varlistentry>
 
@@ -89,7 +89,7 @@ additional font-metric information that is used by the groff system.</para>
 <listitem>
 <indexterm zone="ch-system-groff eqn"><primary sortas="b-eqn">eqn</primary></indexterm>
 <para>compiles descriptions of equations embedded
-within troff input files into commands that are understood by troff.</para>
+within troff input files into commands that are understood by <command>troff</command>.</para>
 </listitem>
 </varlistentry>
 
@@ -105,7 +105,7 @@ within troff input files into commands that are understood by troff.</para>
 <term><command>grn</command></term>
 <listitem>
 <indexterm zone="ch-system-groff grn"><primary sortas="b-grn">grn</primary></indexterm>
-<para>is a groff preprocessor for gremlin files.</para>
+<para>is a <command>groff</command> preprocessor for gremlin files.</para>
 </listitem>
 </varlistentry>
 
@@ -113,7 +113,7 @@ within troff input files into commands that are understood by troff.</para>
 <term><command>grodvi</command></term>
 <listitem>
 <indexterm zone="ch-system-groff grodvi"><primary sortas="b-grodvi">grodvi</primary></indexterm>
-<para>is a driver for groff that produces TeX dvi format.</para>
+<para>is a driver for <command>groff</command> that produces TeX dvi format.</para>
 </listitem>
 </varlistentry>
 
@@ -122,7 +122,7 @@ within troff input files into commands that are understood by troff.</para>
 <listitem>
 <indexterm zone="ch-system-groff groff"><primary sortas="b-groff">groff</primary></indexterm>
 <para>is a front-end to the groff document
-formatting system. Normally it runs the troff program and a post-processor
+formatting system. Normally it runs the <command>troff</command> program and a post-processor
 appropriate for the selected device.</para>
 </listitem>
 </varlistentry>
@@ -139,9 +139,12 @@ appropriate for the selected device.</para>
 <term><command>grog</command></term>
 <listitem>
 <indexterm zone="ch-system-groff grog"><primary sortas="b-grog">grog</primary></indexterm>
-<para>reads files and guesses which of the groff
-options -e, -man, -me, -mm, -ms, -p, -s, and -t are required for printing
-files, and reports the groff command including those options.</para>
+<para>reads files and guesses which of the <command>groff</command>
+options <parameter>-e</parameter>, <parameter>-man</parameter>, 
+<parameter>-me</parameter>, <parameter>-mm</parameter>,
+<parameter>-ms</parameter>, <parameter>-p</parameter>, <parameter>-s</parameter>, 
+and <parameter>-t</parameter> are required for printing
+files, and reports the <command>groff</command> command including those options.</para>
 </listitem>
 </varlistentry>
 
@@ -149,7 +152,7 @@ files, and reports the groff command including those options.</para>
 <term><command>grolbp</command></term>
 <listitem>
 <indexterm zone="ch-system-groff grolbp"><primary sortas="b-grolbp">grolbp</primary></indexterm>
-<para>is a groff driver for Canon CAPSL printers
+<para>is a <command>groff</command> driver for Canon CAPSL printers
 (LBP-4 and LBP-8 series laser printers).</para>
 </listitem>
 </varlistentry>
@@ -158,7 +161,7 @@ files, and reports the groff command including those options.</para>
 <term><command>grolj4</command></term>
 <listitem>
 <indexterm zone="ch-system-groff grolj4"><primary sortas="b-grolj4">grolj4</primary></indexterm>
-<para>is a driver for groff that produces output
+<para>is a driver for <command>groff</command> that produces output
 in PCL5 format suitable for an HP Laserjet 4 printer.</para>
 </listitem>
 </varlistentry>
@@ -167,7 +170,7 @@ in PCL5 format suitable for an HP Laserjet 4 printer.</para>
 <term><command>grops</command></term>
 <listitem>
 <indexterm zone="ch-system-groff grops"><primary sortas="b-grops">grops</primary></indexterm>
-<para>translates the output of GNU troff to Postscript.</para>
+<para>translates the output of GNU <command>troff</command> to PostScript.</para>
 </listitem>
 </varlistentry>
 
@@ -175,7 +178,7 @@ in PCL5 format suitable for an HP Laserjet 4 printer.</para>
 <term><command>grotty</command></term>
 <listitem>
 <indexterm zone="ch-system-groff grotty"><primary sortas="b-grotty">grotty</primary></indexterm>
-<para>translates the output of GNU troff into
+<para>translates the output of GNU <command>troff</command> into
 a form suitable for typewriter-like devices.</para>
 </listitem>
 </varlistentry>
@@ -184,7 +187,7 @@ a form suitable for typewriter-like devices.</para>
 <term><command>gtbl</command></term>
 <listitem>
 <indexterm zone="ch-system-groff gtbl"><primary sortas="b-gtbl">gtbl</primary></indexterm>
-<para>is the GNU implementation of tbl.</para>
+<para>is the GNU implementation of <command>tbl</command>.</para>
 </listitem>
 </varlistentry>
 
@@ -193,7 +196,7 @@ a form suitable for typewriter-like devices.</para>
 <listitem>
 <indexterm zone="ch-system-groff hpftodit"><primary sortas="b-hpftodit">hpftodit</primary></indexterm>
 <para>creates a font file for use with
-groff -Tlj4 from an HP-tagged font metric file.</para>
+<command>groff -Tlj4</command> from an HP-tagged font metric file.</para>
 </listitem>
 </varlistentry>
 
@@ -202,7 +205,7 @@ groff -Tlj4 from an HP-tagged font metric file.</para>
 <listitem>
 <indexterm zone="ch-system-groff indxbib"><primary sortas="b-indxbib">indxbib</primary></indexterm>
 <para>makes an inverted index for the bibliographic databases a specified file for 
-use with refer, lookbib, and lkbib.</para>
+use with <command>refer</command>, <command>lookbib</command>, and <command>lkbib</command>.</para>
 </listitem>
 </varlistentry>
 
@@ -232,7 +235,7 @@ end of input.</para>
 <term><command>mmroff</command></term>
 <listitem>
 <indexterm zone="ch-system-groff mmroff"><primary sortas="b-mmroff">mmroff</primary></indexterm>
-<para>is a simple preprocessor for groff.</para>
+<para>is a simple preprocessor for <command>groff</command>.</para>
 </listitem>
 </varlistentry>
 
@@ -249,7 +252,7 @@ Interchange) output.</para>
 <term><command>nroff</command></term>
 <listitem>
 <indexterm zone="ch-system-groff nroff"><primary sortas="b-nroff">nroff</primary></indexterm>
-<para>is a script that emulates the nroff command using groff.</para>
+<para>is a script that emulates the <command>nroff</command> command using <command>groff</command>.</para>
 </listitem>
 </varlistentry>
 
@@ -257,7 +260,7 @@ Interchange) output.</para>
 <term><command>pfbtops</command></term>
 <listitem>
 <indexterm zone="ch-system-groff pfbtops"><primary sortas="b-pfbtops">pfbtops</primary></indexterm>
-<para>translates a Postscript font in .pfb format to ASCII.</para>
+<para>translates a PostScript font in <filename class="extension">.pfb</filename> format to ASCII.</para>
 </listitem>
 </varlistentry>
 
@@ -266,7 +269,7 @@ Interchange) output.</para>
 <listitem>
 <indexterm zone="ch-system-groff pic"><primary sortas="b-pic">pic</primary></indexterm>
 <para>compiles descriptions of pictures embedded
-within troff or TeX input files into commands understood by TeX or troff.</para>
+within troff or TeX input files into commands understood by TeX or <command>troff</command>.</para>
 </listitem>
 </varlistentry>
 
@@ -282,7 +285,7 @@ within troff or TeX input files into commands understood by TeX or troff.</para>
 <term><command>pre-grohtml </command></term>
 <listitem>
 <indexterm zone="ch-system-groff pre-grohtml"><primary sortas="b-pre-grohtml">pre-grohtml</primary></indexterm>
-<para>translates the output of GNU troff to html.</para>
+<para>translates the output of GNU <command>troff</command> to html.</para>
 </listitem>
 </varlistentry>
 
@@ -290,7 +293,7 @@ within troff or TeX input files into commands understood by TeX or troff.</para>
 <term><command>post-grohtml</command></term>
 <listitem>
 <indexterm zone="ch-system-groff post-grohtml"><primary sortas="b-post-grohtml">post-grohtml</primary></indexterm>
-<para>translates the output of GNU troff to html.</para>
+<para>translates the output of GNU <command>troff</command> to html.</para>
 </listitem>
 </varlistentry>
 
@@ -320,7 +323,7 @@ how citations are to be processed.</para>
 <listitem>
 <indexterm zone="ch-system-groff tbl"><primary sortas="b-tbl">tbl</primary></indexterm>
 <para>compiles descriptions of tables embedded
-within troff input files into commands that are understood by troff.</para>
+within troff input files into commands that are understood by <command>troff</command>.</para>
 </listitem>
 </varlistentry>
 
@@ -328,7 +331,7 @@ within troff input files into commands that are understood by troff.</para>
 <term><command>tfmtodit</command></term>
 <listitem>
 <indexterm zone="ch-system-groff tfmtodit"><primary sortas="b-tfmtodit">tfmtodit</primary></indexterm>
-<para>creates a font file for use with groff -Tdvi.</para>
+<para>creates a font file for use with <command>groff -Tdvi</command>.</para>
 </listitem>
 </varlistentry>
 
@@ -336,8 +339,8 @@ within troff input files into commands that are understood by troff.</para>
 <term><command>troff</command></term>
 <listitem>
 <indexterm zone="ch-system-groff troff"><primary sortas="b-troff">troff</primary></indexterm>
-<para>is highly compatible with Unix troff. Usually it should be invoked using the 
-groff command, which will also run preprocessors and post-processors in the 
+<para>is highly compatible with Unix <command>troff</command>. Usually it should be invoked using the
+<command>groff</command> command, which will also run preprocessors and post-processors in the
 appropriate order and with the appropriate options.</para>
 </listitem>
 </varlistentry>
@@ -346,7 +349,7 @@ appropriate order and with the appropriate options.</para>
 <term><command>zsoelim</command></term>
 <listitem>
 <indexterm zone="ch-system-groff zsoelim"><primary sortas="b-zsoelim">zsoelim</primary></indexterm>
-<para>is the GNU implementation of soelim.</para>
+<para>is the GNU implementation of <command>soelim</command>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index 2c5875b74..cd6e88bfa 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -29,7 +29,8 @@ GCC, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
 <title>Installation of Grub</title>
 
 <para>This package is known to behave badly when you have changed its default
-optimization flags (including the -march and -mcpu options). Therefore, if you
+optimization flags (including the <parameter>-march</parameter> and 
+<parameter>-mcpu</parameter> options). Therefore, if you
 have defined any environment variables that override default optimizations,
 such as CFLAGS and CXXFLAGS, we recommend un-setting them when building
 Grub.</para>
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 0cb8f2b57..a72baf83a 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -106,7 +106,7 @@ zegrep, zfgrep, zforce, zgrep, zless, zmore and znew</seg></seglistitem>
 <term><command>zcmp</command></term>
 <listitem>
 <indexterm zone="ch-system-gzip zcmp"><primary sortas="b-zcmp">zcmp</primary></indexterm>
-<para>runs cmp on gzipped files.</para>
+<para>runs <command>cmp</command> on gzipped files.</para>
 </listitem>
 </varlistentry>
 
@@ -114,7 +114,7 @@ zegrep, zfgrep, zforce, zgrep, zless, zmore and znew</seg></seglistitem>
 <term><command>zdiff</command></term>
 <listitem>
 <indexterm zone="ch-system-gzip zdiff"><primary sortas="b-zdiff">zdiff</primary></indexterm>
-<para>runs diff on gzipped files.</para>
+<para>runs <command>diff</command> on gzipped files.</para>
 </listitem>
 </varlistentry>
 
@@ -122,7 +122,7 @@ zegrep, zfgrep, zforce, zgrep, zless, zmore and znew</seg></seglistitem>
 <term><command>zegrep</command></term>
 <listitem>
 <indexterm zone="ch-system-gzip zegrep"><primary sortas="b-zegrep">zegrep</primary></indexterm>
-<para>runs egrep on gzipped files.</para>
+<para>runs <command>egrep</command> on gzipped files.</para>
 </listitem>
 </varlistentry>
 
@@ -130,7 +130,7 @@ zegrep, zfgrep, zforce, zgrep, zless, zmore and znew</seg></seglistitem>
 <term><command>zfgrep</command></term>
 <listitem>
 <indexterm zone="ch-system-gzip zfgrep"><primary sortas="b-zfgrep">zfgrep</primary></indexterm>
-<para>runs fgrep on gzipped files.</para>
+<para>runs <command>fgrep</command> on gzipped files.</para>
 </listitem>
 </varlistentry>
 
@@ -138,8 +138,8 @@ zegrep, zfgrep, zforce, zgrep, zless, zmore and znew</seg></seglistitem>
 <term><command>zforce</command></term>
 <listitem>
 <indexterm zone="ch-system-gzip zforce"><primary sortas="b-zforce">zforce</primary></indexterm>
-<para>forces a .gz extension on all given files
-that are gzipped files, so that gzip will not compress them again. This can be
+<para>forces a <filename class="extension">.gz</filename> extension on all given files
+that are gzipped files, so that <command>gzip</command> will not compress them again. This can be
 useful when file names were truncated during a file transfer.</para>
 </listitem>
 </varlistentry>
@@ -148,7 +148,7 @@ useful when file names were truncated during a file transfer.</para>
 <term><command>zgrep</command></term>
 <listitem>
 <indexterm zone="ch-system-gzip zgrep"><primary sortas="b-zgrep">zgrep</primary></indexterm>
-<para>runs grep on gzipped files.</para>
+<para>runs <command>grep</command> on gzipped files.</para>
 </listitem>
 </varlistentry>
 
@@ -156,7 +156,7 @@ useful when file names were truncated during a file transfer.</para>
 <term><command>zless</command></term>
 <listitem>
 <indexterm zone="ch-system-gzip zless"><primary sortas="b-zless">zless</primary></indexterm>
-<para>runs less on gzipped files.</para>
+<para>runs <command>less</command> on gzipped files.</para>
 </listitem>
 </varlistentry>
 
@@ -164,7 +164,7 @@ useful when file names were truncated during a file transfer.</para>
 <term><command>zmore</command></term>
 <listitem>
 <indexterm zone="ch-system-gzip zmore"><primary sortas="b-zmore">zmore</primary></indexterm>
-<para>runs more on gzipped files.</para>
+<para>runs <command>more</command> on gzipped files.</para>
 </listitem>
 </varlistentry>
 
@@ -172,7 +172,8 @@ useful when file names were truncated during a file transfer.</para>
 <term><command>znew</command></term>
 <listitem>
 <indexterm zone="ch-system-gzip znew"><primary sortas="b-znew">znew</primary></indexterm>
-<para>re-compresses files from compress format to gzip format -- .Z to .gz.</para>
+<para>re-compresses files from <command>compress</command> format to <command>gzip</command> format 
+-- <filename class="extension">.Z</filename> to <filename class="extension">.gz</filename>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml
index 411421a5b..18b57e7be 100644
--- a/chapter06/hotplug.xml
+++ b/chapter06/hotplug.xml
@@ -29,7 +29,7 @@ modules into the running kernel.
 
 <para>
 Apply the patch that avoids bogus dependencies of the
-<filename>usb.rc</filename> script
+<command>usb.rc</command> script
 upon <application>which</application> and
 <application>usbutils</application> packages:
 </para>
@@ -45,18 +45,18 @@ following patch:
 
 <para>
 At last, there is an optional patch that adds ISAPNP hardware detection
-capabilities to hotplug. It is not well tested. If you chose to apply it,
+capabilities to Hotplug. It is not well tested. If you chose to apply it,
 run the following command:
 </para>
 
 <screen><userinput>patch -Np1 -i ../hotplug-&hotplug-version;-isapnp-2.patch</userinput></screen>
 
 
-<para>And finally install the hotplug package:</para>
+<para>And finally install the Hotplug package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>Remove hotplug's not-so-clean init script, since we're going to be using
+<para>Remove Hotplug's not-so-clean init script, since we're going to be using
 the script including with LFS-Bootscripts:</para>
 
 <screen><userinput>rm -rf /etc/init.d</userinput></screen>
@@ -65,7 +65,7 @@ the script including with LFS-Bootscripts:</para>
 If you have applied the ISAPNP patch, add some required entries to
 <filename>/etc/modprobe.conf</filename>:</para>
 
-<screen><userinput>cat &gt;&gt;/etc/modprobe.conf &lt;&lt;"EOF"</userinput>
+<screen><userinput>cat &gt;&gt;/etc/modprobe.conf &lt;&lt;"EOF"
 # Begin /etc/modprobe.conf entries for ISAPNP hardware detection script
 # by Marco d'Itri
 alias pnp:dPNP0511 irtty-sir
@@ -76,7 +76,7 @@ alias pnp:dPNP0303 atkbd
 alias pnp:dPNP0F13 psmouse
 alias pnp:dPNPB02F analog
 # End /etc/modprobe.conf entries for ISAPNP hardware detection script
-<userinput>EOF</userinput></screen>
+EOF</userinput></screen>
 
 <para>These entries may become unneded for newer versions of Linux kernel,
 since Marco d'Itri will try to convince developers to put them into the
@@ -94,7 +94,7 @@ corresponding modules themselves.</para>
 <indexterm zone="ch-system-hotplug hotplug"><primary
 sortas="b-hotplug">hotplug</primary></indexterm>
 <para>This script is called by default by Linux kernel when something
-changes in its internal state (e.g. a new device is added or removed).</para>
+changes in its internal state (e.g., a new device is added or removed).</para>
 </listitem>
 </varlistentry>
 
@@ -102,7 +102,9 @@ changes in its internal state (e.g. a new device is added or removed).</para>
 <term><command>*.rc</command> files in
 <filename class="directory">/etc/hotplug</filename> directory</term>
 <listitem>
-<para>These scripts are used for cold plugging, i.e. detection and other
+<indexterm zone="ch-system-hotplug hotplug-rc"><primary
+sortas="e-/etc/hotplug/*.rc">/etc/hotplug/*.rc</primary></indexterm>
+<para>These scripts are used for cold plugging, i.e., detection and other
 specific actions upon hardware already present during system startup. 
 They are called by the <filename>hotplug</filename> initscript that comes
 from the lfs-bootscripts package.
@@ -117,6 +119,8 @@ them into the running kernel.
 <term><command>*.agent</command> files in
 <filename class="directory">/etc/hotplug</filename> directory</term>
 <listitem>
+<indexterm zone="ch-system-hotplug hotplug-agent"><primary
+sortas="e-/etc/hotplug/*.agent">/etc/hotplug/*.agent</primary></indexterm>
 <para>These scripts are called by <command>/sbin/hotplug</command>
 in response to different types of hotplug events generated by the kernel.
 Their action is to insert corresponding kernel modules and call user-provided
@@ -128,7 +132,9 @@ scripts, if any.
 <varlistentry id="hotplug-functions">
 <term><filename>/etc/hotplug/hotplug.functions</filename></term>
 <listitem>
-<para>This file contains common functions used by other scripts in hotplug
+<indexterm zone="ch-system-hotplug hotplug-functions"><primary
+sortas="e-/etc/hotplug/hotplug.functions">/etc/hotplug/hotplug.functions</primary></indexterm>
+<para>This file contains common functions used by other scripts in Hotplug
 package.
 </para>
 </listitem>
@@ -148,6 +154,8 @@ inserted into the kernel by hotplug scripts.
 <varlistentry id="hotplug-subdirs">
 <term><filename class="directory">/etc/hotplug/{pci,usb}</filename></term>
 <listitem>
+<indexterm zone="ch-system-hotplug hotplug-subdirs"><primary
+sortas="e-/etc/hotplug/{pci,usb}">/etc/hotplug/{pci,usb}</primary></indexterm>
 <para>These directories are supposed to contain user-written handlers for
 hotplug events.
 </para>
@@ -168,6 +176,8 @@ call for each USB device, based on its vendor, id and other attributes.
 <varlistentry id="hotplug-hotplug.d">
 <term><filename class="directory">/etc/hotplug.d</filename></term>
 <listitem>
+<indexterm zone="ch-system-hotplug hotplug-hotplug.d"><primary
+sortas="e-/etc/hotplug.d">/etc/hotplug.d</primary></indexterm>
 <para>This directory contains programs (or symlinks to them)
 that are interested in receiving all hotplug events. E.g.,
 <application>udev</application> puts its symlink here during installation.
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 2b282aa93..6e8f60628 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -50,29 +50,29 @@ pages anyway. The following patch will correct this situation:</para>
 
 <variablelist>
 <varlistentry>
-<term><userinput>--disable-logger</userinput></term>
+<term><parameter>--disable-logger</parameter></term>
 <listitem><para>This option
-prevents Inetutils from installing the logger program, which is used by
+prevents Inetutils from installing the <command>logger</command> program, which is used by
 scripts to pass messages to the System Log Daemon. We do not install it
 because Util-linux installs a better version later.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><userinput>--disable-syslogd</userinput></term>
+<term><parameter>--disable-syslogd</parameter></term>
 <listitem><para>This option
 prevents Inetutils from installing the System Log Daemon, which is
 installed with the Sysklogd package.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><userinput>--disable-whois</userinput></term>
+<term><parameter>--disable-whois</parameter></term>
 <listitem><para>This option disables
 the building of the Inetutils whois client, which is woefully out of date.
 Instructions for a better whois client are in the BLFS book.</para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term><userinput>--disable-servers</userinput></term>
+<term><parameter>--disable-servers</parameter></term>
 <listitem><para>This disables the
 installation of the various network servers included as part of the Inetutils
 package. These servers are deemed not appropriate in a basic LFS system. Some
diff --git a/chapter06/introduction.xml b/chapter06/introduction.xml
index 4e0ef7cbb..bed434755 100644
--- a/chapter06/introduction.xml
+++ b/chapter06/introduction.xml
@@ -52,8 +52,7 @@ is removed.</para>
 <para>Before the installation instructions each installation page gives some
 information about the package: a concise description of what it contains,
 approximately how long it will take to build it, how much disk space it needs
-during this building process, the official download location of the package
-(in case you just want to update a few of them), and which other packages it
+during this building process, and which other packages it
 needs in order to be built successfully. After the installation instructions
 follows a list of programs and libraries that the package installs, together
 with a series of short descriptions of these.</para>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 7529ff3ca..4217adda0 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -145,7 +145,7 @@ showconsolefont, showkey, unicode_start and unicode_stop</seg></seglistitem>
 <indexterm zone="ch-system-kbd mapscrn"><primary sortas="b-mapscrn">mapscrn</primary></indexterm>
 <para>is an obsolete program that used to load
 a user-defined output character mapping table into the console driver. This is
-now done by setfont.</para>
+now done by <command>setfont</command>.</para>
 </listitem>
 </varlistentry>
 
@@ -195,7 +195,7 @@ mapping table entries, useful if you have some unusual keys on your keyboard.</p
 <listitem>
 <indexterm zone="ch-system-kbd setleds"><primary sortas="b-setleds">setleds</primary></indexterm>
 <para>sets the keyboard flags and LEDs. Many
-people find it useful to have "Num Lock" on by default, setleds +num achieves this.</para>
+people find it useful to have <quote>Num Lock</quote> on by default, <command>setleds +num</command> achieves this.</para>
 </listitem>
 </varlistentry>
 
diff --git a/chapter06/less.xml b/chapter06/less.xml
index 48be223b6..8ab252fc0 100644
--- a/chapter06/less.xml
+++ b/chapter06/less.xml
@@ -36,9 +36,9 @@ GCC, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
 
 <variablelist>
 <varlistentry>
-<term><userinput>--sysconfdir=/etc</userinput></term>
+<term><parameter>--sysconfdir=/etc</parameter></term>
 <listitem><para>This option tells the programs created by the package to look in 
-<filename>/etc</filename> for their configuration files.</para></listitem>
+<filename class="directory">/etc</filename> for their configuration files.</para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -82,7 +82,7 @@ scroll around, find strings, and jump to marks.</para>
 <term><command>lesskey</command></term>
 <listitem>
 <indexterm zone="ch-system-less lesskey"><primary sortas="b-lesskey">lesskey</primary></indexterm>
-<para>is used to specify the key bindings for less.</para>
+<para>is used to specify the key bindings for <command>less</command>.</para>
 </listitem>
 </varlistentry>
 </variablelist>
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index 47d06f46a..830d38af8 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -75,7 +75,7 @@ GCC, Glibc, Grep, Make, Sed</seg></seglistitem>
 </varlistentry>
 
 <varlistentry id="libltdl">
-<term><command>libltdl</command></term>
+<term><filename class="libraryfile">libltdl</filename></term>
 <listitem>
 <indexterm zone="ch-system-libtool libltdl"><primary sortas="c-libltdl">libltdl</primary></indexterm>
 <para>hides the various difficulties of dlopening libraries.</para>
diff --git a/chapter06/linux-libc-headers.xml b/chapter06/linux-libc-headers.xml
index 487f09798..64d1e93bb 100644
--- a/chapter06/linux-libc-headers.xml
+++ b/chapter06/linux-libc-headers.xml
@@ -25,7 +25,7 @@
 <title>Installation of Linux-Libc-Headers</title>
 
 <para>For years it has been common practice to use so-called <quote>raw</quote>
-kernel headers (straight from a kernel tarball) in /usr/include, but over the
+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 such
 things should not be done.  Thus was born the linux-libc-headers project,
 designed to maintain an API stable version of the Linux headers.</para>
@@ -46,4 +46,25 @@ find /usr/include/{asm,linux} -type f -exec chmod 644 {} \;</userinput></screen>
 
 </sect2>
 
+
+<sect2 id="contents-linux-libc-headers" role="content"><title>Contents of Linux-Libc-Headers</title>
+
+<segmentedlist>
+<segtitle>Installed headers</segtitle>
+<seglistitem><seg>/usr/include/{asm,linux}/*.h</seg></seglistitem>
+</segmentedlist>
+
+<variablelist><title>Short description</title>
+
+<varlistentry id="linux-libc-headers">
+<term><filename class="headerfile">/usr/include/{asm,linux}/*.h</filename></term>
+<listitem>
+<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>
+<para>This files are the Linux headers API.</para>
+</listitem>
+</varlistentry>
+</variablelist>
+
+</sect2>
+
 </sect1>
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index 5a55147b6..ae0c573d2 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -62,9 +62,9 @@ Gettext, Glibc, Grep, Make, Perl, Sed</seg></seglistitem>
 <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 just doing macro
-expansion, m4 has built-in functions for including named files, running Unix
+expansion, <command>m4</command> has built-in functions for including named files, running Unix
 commands, doing integer arithmetic, manipulating text in various ways,
-recursion, and so on. The m4 program can be used either as a front-end to a
+recursion, and so on. 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>
 </listitem>
 </varlistentry>
diff --git a/chapter06/man.xml b/chapter06/man.xml
index 54f7174a6..01c8c9c5d 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -36,7 +36,7 @@ width instead of being limited to 80 characters:</para>
 
 <screen><userinput>patch -Np1 -i ../man-&man-version;-80cols-1.patch</userinput></screen>
 
-<para>The second is a sed substitution to add the <emphasis>-R</emphasis>
+<para>The second is a sed substitution to add the <parameter>-R</parameter>
 switch to the <emphasis>PAGER</emphasis> variable so that escape sequences are
 properly handled by Less:</para>
 
@@ -56,10 +56,10 @@ redundant results when using programs such as <command>whatis</command>:</para>
 
 <variablelist>
 <varlistentry>
-<term><userinput>-confdir=/etc</userinput></term>
+<term><parameter>-confdir=/etc</parameter></term>
 <listitem><para>This tells the
 <command>man</command> program to look for the <filename>man.conf</filename>
-configuration file in the <filename>/etc</filename> directory.</para></listitem>
+configuration file in the <filename class="directory">/etc</filename> directory.</para></listitem>
 </varlistentry>
 </variablelist>
 
@@ -72,23 +72,23 @@ configuration file in the <filename>/etc</filename> directory.</para></listitem>
 <screen><userinput>make install</userinput></screen>
 
 <note><para>If you wish to disable SGR (Select Graphic Rendition) escape sequences, you should edit the
-<filename>man.conf</filename> file and add the <emphasis>-c</emphasis> switch
+<filename>man.conf</filename> file and add the <parameter>-c</parameter> switch
 to NROFF.</para></note>
 
 <para>If your character set uses 8-bit characters, search for the line
-beginning with "NROFF" in /etc/man.conf, and verify that it coincides
+beginning with <quote>NROFF</quote> in <filename>/etc/man.conf</filename>, and verify that it coincides
 with the following:</para>
 
 <screen>NROFF  /usr/bin/nroff -Tlatin1 -mandoc</screen>
 
-<para>Note that you should use "latin1" even if it is not the character set
+<para>Note that you should use <quote>latin1</quote> even if it is not the character set
 of your locale. The reason is that,
 according to the specification, <application>groff</application> has
 no means of typesetting characters outside ISO-8859-1
 without some strange escape codes, and localized manual
 pages are therefore really a hack. When formatting manual pages,
 <application>groff</application> thinks that they are in the ISO-8859-1
-encoding and this <emphasis>-Tlatin1</emphasis> switch tells
+encoding and this <parameter>-Tlatin1</parameter> switch tells
 <application>groff</application> to use the same encoding for output.
 Since <application>groff</application> does no recoding of input characters,
 the formatted result is really in the same encoding as input (although
diff --git a/chapter06/mktemp.xml b/chapter06/mktemp.xml
index 2b3a2582b..3e2e6226c 100644
--- a/chapter06/mktemp.xml
+++ b/chapter06/mktemp.xml
@@ -28,7 +28,7 @@ files in shell scripts.</para>
 
 <para>Many scripts still use the deprecated <command>tempfile</command>
 program, which has functionality much the same as <command>mktemp</command>.
-Patch mktemp to include a <command>tempfile</command> wrapper:</para>
+Patch Mktemp to include a <command>tempfile</command> wrapper:</para>
 
 <screen><userinput>patch -Np1 -i ../mktemp-&mktemp-version;-add_tempfile-1.patch</userinput></screen>
 
@@ -40,7 +40,7 @@ Patch mktemp to include a <command>tempfile</command> wrapper:</para>
 
 <variablelist>
 <varlistentry>
-<term><userinput>--with-libc</userinput></term>
+<term><parameter>--with-libc</parameter></term>
 <listitem><para>This causes the <command>mktemp</command> program to 
 use the <emphasis>mkstemp</emphasis> and <emphasis>mkdtemp</emphasis>
 functions from the system C library.</para></listitem>
@@ -53,8 +53,8 @@ functions from the system C library.</para></listitem>
 
 <para>Now install it:</para>
 
-<screen><userinput>make install</userinput>
-<userinput>make install-tempfile</userinput></screen>
+<screen><userinput>make install
+make install-tempfile</userinput></screen>
 
 </sect2>
 
diff --git a/chapter06/module-init-tools.xml b/chapter06/module-init-tools.xml
index 227cc37e4..2871f606e 100644
--- a/chapter06/module-init-tools.xml
+++ b/chapter06/module-init-tools.xml
@@ -139,7 +139,7 @@ a kernel module and displays any information that it can glean.</para>
 <listitem>
 <indexterm zone="ch-system-module-init-tools modprobe"><primary sortas="b-modprobe">modprobe</primary></indexterm>
 <para>uses a dependency file, created by
-depmod, to automatically load the relevant modules.</para>
+<command>depmod</command>, to automatically load the relevant modules.</para>
 </listitem>
 </varlistentry>
 
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index fb17b42a8..88c276898 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -49,7 +49,7 @@ Gawk, GCC, Glibc, Grep, Make, Sed</seg></seglistitem>
 
 <screen><userinput>chmod 644 /usr/lib/libncurses++.a</userinput></screen>
 
-<para>Move the libraries to the <filename>/lib</filename> directory,
+<para>Move the libraries to the <filename class="directory">/lib</filename> directory,
 where they're expected to reside:</para>
 
 <screen><userinput>mv /usr/lib/libncurses.so.5* /lib</userinput></screen>
@@ -163,17 +163,17 @@ a terminal, or report its long name.</para>
 </varlistentry>
 
 <varlistentry id="libncurses">
-<term><command>libncurses*</command></term>
+<term><filename class="libraryfile">>libncurses*</filename></term>
 <listitem>
 <indexterm zone="ch-system-ncurses libncurses"><primary sortas="c-libncurses*">libncurses*</primary></indexterm>
 <para>contains functions to display text in
 many complicated ways on a terminal screen. A good example of the use of these
-functions is the menu displayed during the kernel's make menuconfig.</para>
+functions is the menu displayed during the kernel's <command>make menuconfig</command>.</para>
 </listitem>
 </varlistentry>
 
 <varlistentry id="libform">
-<term><command>libform*</command></term>
+<term><filename class="libraryfile">libform*</filename></term>
 <listitem>
 <indexterm zone="ch-system-ncurses libform"><primary sortas="c-libform*">libform*</primary></indexterm>
 <para>contains functions to implement forms.</para>
@@ -181,7 +181,7 @@ functions is the menu displayed during the kernel's make menuconfig.</para>
 </varlistentry>
 
 <varlistentry id="libmenu">
-<term><command>libmenu*</command></term>
+<term><filename class="libraryfile">libmenu*</filename></term>
 <listitem>
 <indexterm zone="ch-system-ncurses libmenu"><primary sortas="c-libmenu*">libmenu*</primary></indexterm>
 <para>contains functions to implement menus.</para>
@@ -189,7 +189,7 @@ functions is the menu displayed during the kernel's make menuconfig.</para>
 </varlistentry>
 
 <varlistentry id="libpanel">
-<term><command>libpanel*</command></term>
+<term><filename class="libraryfile">libpanel*</filename></term>
 <listitem>
 <indexterm zone="ch-system-ncurses libpanel"><primary sortas="c-libpanel*">libpanel*</primary></indexterm>
 <para>contains functions to implement panels.</para>