Index: basicnet/djb/daemontools/daemontools-desc.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-desc.xml	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ basicnet/djb/daemontools/daemontools-desc.xml	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -3,13 +3,13 @@
 
 <para>The daemontools package contains
-<userinput>svscanboot</userinput>, <userinput>svscan</userinput>,
-<userinput>supervise</userinput>, <userinput>svc</userinput>,
-<userinput>svok</userinput>, <userinput>svstat</userinput>,
-<userinput>fghack</userinput>, <userinput>pgrphack</userinput>,
-<userinput>readproctitle</userinput>, <userinput>multilog</userinput>,
-<userinput>tai64n</userinput>, <userinput>tai64nlocal</userinput>,
-<userinput>setuidgid</userinput>, <userinput>envuidgid</userinput>,
-<userinput>envdir</userinput>, <userinput>softlimit</userinput> and 
-<userinput>setlock</userinput>. More detailed descriptions of these 
+<command>svscanboot</command>, <command>svscan</command>,
+<command>supervise</command>, <command>svc</command>,
+<command>svok</command>, <command>svstat</command>,
+<command>fghack</command>, <command>pgrphack</command>,
+<command>readproctitle</command>, <command>multilog</command>,
+<command>tai64n</command>, <command>tai64nlocal</command>,
+<command>setuidgid</command>, <command>envuidgid</command>,
+<command>envdir</command>, <command>softlimit</command> and 
+<command>setlock</command>. More detailed descriptions of these 
 commands may be found at <ulink url="http://cr.yp.to/daemontools.html"/>.</para>
 
@@ -19,70 +19,74 @@
 
 <sect3><title>svscanboot</title>
-<para>svscanboot is simply a script that calls svscan and pipes its output 
-to readproctitle.</para></sect3>
+<para><command>svscanboot</command> is simply a script that calls svscan and 
+pipes its output to readproctitle.</para></sect3>
 
 <sect3><title>svscan</title>
-<para>svscan checks the service directory for daemons to run and starts 
-a supervise process for each run script that it finds.</para></sect3>
+<para><command>svscan</command> checks the service directory for daemons to run 
+and starts a <command>supervise</command> process for each run script that it 
+finds.</para></sect3>
 
 <sect3><title>supervise</title>
-<para>supervise runs the run script passed to it by svscan and monitors 
-the process the script starts so that if it dies, supervise restarts it.
-</para></sect3>
+<para><command>supervise</command> runs the run script passed to it by
+<command>svscan</command> and monitors the process the script starts so that 
+if it dies, <command>supervise</command> restarts it.</para></sect3>
 
 <sect3><title>svc</title>
-<para>svc sends signals to processes being run under supervise.
+<para><command>svc</command> sends signals to processes being run under 
+<command>supervise</command>.
 </para></sect3>
 
 <sect3><title>svok</title>
-<para>svok checks to see that supervise is running in the directory 
+<para><command>svok</command> checks to see that
+<command>supervise</command> is running in the directory 
 passed to it.</para></sect3>
 
 <sect3><title>svstat</title>
-<para>svstat prints the status of processes monitored by supervise.
+<para><command>svstat</command> prints the status of processes monitored by 
+<command>supervise</command>.</para></sect3>
+
+<sect3><title>fghack</title>
+<para><command>fghack</command> prevents processes from putting themselves into 
+the background.</para></sect3>
+
+<sect3><title>pgrphack</title>
+<para><command>pgrphack</command> runs a process in a separate process group.
 </para></sect3>
 
-<sect3><title>fghack</title>
-<para>fghack prevents processes from putting themselves into the 
-background.</para></sect3>
+<sect3><title>readproctitle</title>
+<para><command>readproctitle</command> displays log entries in the output of ps.
+</para></sect3>
 
-<sect3><title>pgrphack</title>
-<para>pgrphack runs a process in a separate process group.</para>
+<sect3><title>multilog</title>
+<para><command>multilog</command> is a logging program. It takes output from a 
+daemon and appends it to any number of logs.</para></sect3>
+
+<sect3><title>tai64n</title>
+<para><command>tai64n</command> is a timestamp generating program.</para>
 </sect3>
 
-<sect3><title>readproctitle</title>
-<para>readproctitle displays log entries in the output of ps.</para>
-</sect3>
-
-<sect3><title>multilog</title>
-<para>multilog is a logging program. It takes output from a daemon and 
-appends it to any number of logs.</para></sect3>
-
-<sect3><title>tai64n</title>
-<para>tai64n is a timestamp generating program.</para></sect3>
-
 <sect3><title>tai64nlocal</title>
-<para>tai64nlocal converts output of tai64n into a human readable 
-format.</para></sect3>
+<para><command>tai64nlocal</command> converts output of tai64n into a human 
+readable format.</para></sect3>
 
 <sect3><title>setuidgid</title>
-<para>setuidgid runs a specified program under a given account's uid 
-and gid.</para></sect3>
+<para><command>setuidgid</command> runs a specified program under a given 
+account's uid and gid.</para></sect3>
 
 <sect3><title>envuidgid</title>
-<para>envuidgid performs the same function as setuidgid, but sets 
-environment variables $UID and $GID equal to the uid and gid of the 
-account specified.</para></sect3>
+<para><command>envuidgid</command> performs the same function as setuidgid, 
+but sets environment variables <envar>UID</envar> and <envar>GID</envar> equal 
+to the uid and gid of the account specified.</para></sect3>
 
 <sect3><title>envdir</title>
-<para>envdir runs a given program with environment variables specified 
-by files in a directory.</para></sect3>
+<para><command>envdir</command> runs a given program with environment variables 
+specified by files in a directory.</para></sect3>
 
 <sect3><title>softlimit</title>
-<para>softlimit allows resource limits to be set for a given program.
-</para></sect3>
+<para><command>softlimit</command> allows resource limits to be set for a given 
+program.</para></sect3>
 
 <sect3><title>setlock</title>
-<para>setlock locks a file and runs a program.</para></sect3>
+<para><command>setlock</command> locks a file and runs a program.</para></sect3>
 
 </sect2>
Index: basicnet/djb/daemontools/daemontools-exp.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-exp.xml	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ basicnet/djb/daemontools/daemontools-exp.xml	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -4,54 +4,57 @@
 <para>The first thing to understand in installing any package written 
 by Daniel J. Bernstein, and 
-this includes qmail, djbdns and ucspi-tcp in addition to daemontools, is 
-that he is willing to completely disregard standards if his idea of the 
-correct thing to do differs from an particular standard. Professor 
-Bernstein is a standards body unto himself when it comes to his own 
-software. </para>
+this includes <application>qmail</application>, <application>djbdns
+</application> and <application>ucspi-tcp</application> in addition to 
+<application>daemontools</application>, is that he is willing to completely 
+disregard standards if his idea of the correct thing to do differs from an 
+particular standard. Professor Bernstein is a standards body unto himself when 
+it comes to his own software. </para>
 
 <para>It is therefore necessary to make quite a few changes to the 
 installation commands for his packages to get them to install in a manner 
-that is compliant with the Filesystem Hierarchy Standard (FHS). Most of 
-the following commands are due to this difficulty.</para>
+that is compliant with the Filesystem Hierarchy Standard
+(<acronym>FHS</acronym>). Most of the following commands are due to this 
+difficulty.</para>
 
-<para><userinput>cd admin/daemontools-0.76</userinput> : First off, the 
-package is unpacked in an <filename>admin</filename> directory. You will find the actual 
+<para><command>cd admin/daemontools-0.76</command> : First off, the package is 
+unpacked in an <filename>admin</filename> directory. You will find the actual 
 packages two directory levels below this.</para>
 
-<para><userinput>package/compile</userinput> : This command actually 
+<para><command>package/compile</command> : This command actually 
 compiles the source and prepares the binaries.</para>
 
-<para>Since we are installing the binaries in
-<filename>/usr/sbin</filename> rather than creating 
-a non-standard <filename>/command</filename> directory, several paths have to be changed:</para>
-<para><screen><userinput>sed 's|command|usr/sbin|' boot.inittab &gt; boot.inittab~</userinput>
-<userinput>mv boot.inittab~ boot.inittab</userinput></screen></para>
+<para>Since we are installing the binaries in <filename>/usr/sbin</filename> 
+rather than creating a non-standard <filename>/command</filename> directory, 
+several paths have to be changed:</para>
+<screen><command>sed 's|command|usr/sbin|' boot.inittab &gt; boot.inittab~
+mv boot.inittab~ boot.inittab</command></screen>
 <para>In <filename>boot.inittab</filename>,
 <filename>/command/svscanboot</filename> is changed to
 <filename>/usr/sbin/svscanboot</filename>.</para>
 
-<para><screen><userinput>sed -e 's|/command:/usr/local/bin:/usr/local/sbin:||' \</userinput>
-<userinput>    -e 's|command|usr/sbin|' \</userinput>
-<userinput>    -e 's|/service|/etc/service|g' svscanboot &gt; svscanboot~ &amp;&amp;</userinput></screen></para>
-<para>Here various paths are adjusted in the svscanboot script. In our setup svscan 
-will check the <filename>/etc/service</filename> directory instead of
-the <filename>/service</filename> directory for 
-daemons to run.</para>
+<screen><command>sed -e 's|/command:/usr/local/bin:/usr/local/sbin:||' \
+    -e 's|command|usr/sbin|' \
+    -e 's|/service|/etc/service|g' svscanboot &gt; svscanboot~ &amp;&amp;</command></screen>
+<para>Here various paths are adjusted in the svscanboot script. In our setup 
+svscan will check the <filename>/etc/service</filename> directory instead of
+the <filename>/service</filename> directory for daemons to run.</para>
 
-<para><userinput>cp * /usr/sbin</userinput> : We must manually copy the 
+<para><command>cp * /usr/sbin</command> : We must manually copy the 
 binaries to the <filename>/usr/sbin</filename> directory.</para>
 
-<para><screen><userinput>cat /etc/inittab boot.inittab &gt; /etc/inittab~</userinput>
-<userinput>mv -f /etc/inittab~ /etc/inittab</userinput></screen>
-These commands append a line to <filename>/etc/inittab</filename> so that init will launch 
-the svscanboot script.</para>
+<para><screen><command>cat /etc/inittab boot.inittab &gt; /etc/inittab~
+mv -f /etc/inittab~ /etc/inittab</command></screen>
+These commands append a line to <filename>/etc/inittab</filename> so that 
+<command>init</command> will launch the <command>svscanboot</command> script.
+</para>
 
-<para><userinput>mkdir /etc/service</userinput> : This command creates 
+<para><command>mkdir /etc/service</command> : This command creates 
 the daemontools control directory, which - even if empty - needs to exist for 
-daemontools to run properly.</para>
+<application>daemontools</application> to run properly.</para>
 
-<para><userinput>telinit Q</userinput> : This command tells the init 
-process to re-read its configuration file (inittab) and act upon any 
-changes that have been made. The svscanboot script is started.</para>
+<para><command>telinit Q</command> : This command tells the <command>init
+</command> process to re-read its configuration file 
+(<filename>inittab</filename>) and act upon any changes that have been made. 
+The <command>svscanboot</command> script is started.</para>
 
 
Index: basicnet/djb/daemontools/daemontools-inst.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-inst.xml	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ basicnet/djb/daemontools/daemontools-inst.xml	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -1,8 +1,9 @@
 <sect2>
-<title>Installation of daemontools</title>
+<title>Installation of <application>daemontools</application></title>
 
-<para>Install daemontools by running the following commands:</para>
+<para>Install <application>daemontools</application> by running the following 
+commands:</para>
 
-<para><screen><userinput>cd admin/daemontools-0.76 &amp;&amp; 
+<screen><userinput><command>cd admin/daemontools-0.76 &amp;&amp; 
 patch -Np1 -i ../../daemontools-0.76.errno.patch &amp;&amp;
 package/compile &amp;&amp;
@@ -21,5 +22,5 @@
 mv -f /etc/inittab~ /etc/inittab &amp;&amp; 
 mkdir /etc/service &amp;&amp;
-telinit Q</userinput></screen></para>
+telinit Q</command></userinput></screen>
 
 </sect2>
Index: basicnet/djb/daemontools/daemontools-intro.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-intro.xml	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ basicnet/djb/daemontools/daemontools-intro.xml	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -1,15 +1,31 @@
 <sect2>
-<title>Introduction to Daemontools</title>
+<title>Introduction to <application>daemontools</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&daemontools-download-http;"/>
-Download location (FTP):        <ulink url="&daemontools-download-ftp;"/>
-Version used:                   &daemontools-version;
-Package size:                   &daemontools-size;
-Estimated Disk space required:  &daemontools-buildsize;</screen>
-<screen>Additional downloads:
-<ulink url="ftp://moni.csi.hu/pub/glibc-2.3.1/daemontools-0.76.errno.patch">daemontools errno patch</ulink></screen>
-<para>The daemontools package is a replacement for inetd or xinetd. The main 
-reason for using it here is because it is recommended for use with qmail 
-and djbdns.</para>
+<para>The <application>daemontools</application> package is a replacement for 
+<application>inetd</application> or <application>xinetd</application>. The main 
+reason for using it here is because it is recommended for use with 
+<application>qmail</application> and <application>djbdns</application>.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&daemontools-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&daemontools-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &daemontools-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&daemontools-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&daemontools-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch:
+<ulink
+url="ftp://moni.csi.hu/pub/glibc-2.3.1/daemontools-0.76.errno.patch">daemontools
+errno patch</ulink></para></listitem></itemizedlist>
+</sect3>
+
 
 </sect2>
Index: basicnet/djb/daemontools/daemontools-man-desc.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-man-desc.xml	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ basicnet/djb/daemontools/daemontools-man-desc.xml	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -2,15 +2,16 @@
 <title>Contents</title>
 
-<para>The daemontools-man package contains man pages for the daemontools
-commands <userinput>envdir</userinput>,
-<userinput>envuidgid</userinput>, <userinput>fghack</userinput>,
-<userinput>multilog</userinput>, <userinput>pgrphack</userinput>,
-<userinput>readproctitle</userinput>, <userinput>setlock</userinput>,
-<userinput>setuidgid</userinput>, <userinput>softlimit</userinput>,
-<userinput>supervise</userinput>, <userinput>svc</userinput>,
-<userinput>svok</userinput>, <userinput>svscan</userinput>,
-<userinput>svscanboot</userinput>, <userinput>svstat</userinput>,
-<userinput>tai64n</userinput> and
-<userinput>tai64nlocal</userinput>.</para>
+<para>The <application>daemontools-man</application> package contains man pages 
+for the <application>daemontools</application> commands 
+<command>envdir</command>,
+<command>envuidgid</command>, <command>fghack</command>,
+<command>multilog</command>, <command>pgrphack</command>,
+<command>readproctitle</command>, <command>setlock</command>,
+<command>setuidgid</command>, <command>softlimit</command>,
+<command>supervise</command>, <command>svc</command>,
+<command>svok</command>, <command>svscan</command>,
+<command>svscanboot</command>, <command>svstat</command>,
+<command>tai64n</command> and
+<command>tai64nlocal</command>.</para>
 
 </sect2>
Index: basicnet/djb/daemontools/daemontools-man-exp.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-man-exp.xml	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ basicnet/djb/daemontools/daemontools-man-exp.xml	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>gzip -9 *.8</userinput> : You can compress the man pages
+<para><command>gzip -9 *.8</command> : You can compress the man pages
 to save space, but it isn't needed for the man pages to work.</para>
 
Index: basicnet/djb/daemontools/daemontools-man-inst.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-man-inst.xml	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ basicnet/djb/daemontools/daemontools-man-inst.xml	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -1,11 +1,12 @@
 <sect2>
-<title>Installation of daemontools</title>
+<title>Installation of <application>daemontools-man</application></title>
 
-<para>Install daemontools by running the following commands:</para>
+<para>Install <application>daemontools-man</application> by running the 
+following commands:</para>
 
-<para><screen><userinput>cd daemontools-man &amp;&amp; 
+<screen><userinput><command>cd daemontools-man &amp;&amp; 
 gzip -9 *.8 &amp;&amp;
 package/compile &amp;&amp;
-cp *.8.gz /usr/share/man/man8/</userinput></screen></para>
+cp *.8.gz /usr/share/man/man8/</command></userinput></screen>
 </sect2>
 
Index: basicnet/djb/daemontools/daemontools-man-intro.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-man-intro.xml	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ basicnet/djb/daemontools/daemontools-man-intro.xml	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -1,13 +1,23 @@
 <sect2>
-<title>Introduction to Daemontools-man</title>
+<title>Introduction to <application>daemontools-man</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&daemontools-man-download-http;"/>
-Download location (FTP):        <ulink url="&daemontools-man-download-ftp;"/>
-Version used:                   &daemontools-man-version;
-Package size:                   &daemontools-man-size;
-Estimated Disk space required:  &daemontools-man-buildsize;</screen>
 
-<para>The Daemontools package does not come with man pages, so install
-this package if you want online help with the daemontools programs.</para>
+<para>The <application>daemontools</application> package does not come with 
+man pages, so install this package if you want online help with the 
+<application>daemontools</application> programs.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&daemontools-man-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&daemontools-man-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &daemontools-man-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&daemontools-man-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&daemontools-man-time;</para></listitem></itemizedlist>
+</sect3>
+
 
 </sect2>
Index: basicnet/djb/daemontools/daemontools.ent
===================================================================
--- basicnet/djb/daemontools/daemontools.ent	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ basicnet/djb/daemontools/daemontools.ent	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -9,4 +9,5 @@
 <!ENTITY daemontools-download-ftp "">
 <!ENTITY daemontools-size "162 KB">
+<!ENTITY daemontools-time "">
 
 <!ENTITY daemontools-man SYSTEM "../daemontools-man.xml">
@@ -20,2 +21,3 @@
 <!ENTITY daemontools-man-download-ftp "">
 <!ENTITY daemontools-man-size "8 KB">
+<!ENTITY daemontools-man-time "">
Index: basicnet/djb/djb.xml
===================================================================
--- basicnet/djb/djb.xml	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ basicnet/djb/djb.xml	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -1,5 +1,10 @@
 <chapter id="basicnet-djb">
 <?dbhtml filename="djb.html" dir="basicnet"?>
-<title>DJB's Utilities</title>
+<title>D.J. Bernstein's Utilities</title>
+
+<para>This chapter includes applicatons needed for the qmail server.
+Their installation instructions are different than most packages in the
+book because we want to support the <acronym>FHS</acronym> throughout
+the book.</para>
 
 &daemontools;
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -2,13 +2,13 @@
 <title>Contents</title>
 
-<para>The ucspi-tcp package contains <userinput>tcpserver</userinput>,
-<userinput>tcprules</userinput>, <userinput>tcprulescheck</userinput>,
-<userinput>argv0</userinput>, <userinput>fixcrio</userinput>,
-<userinput>recordio</userinput>, <userinput>rblsmtpd</userinput>,
-<userinput>tcpclient</userinput>, <userinput>who@</userinput>,
-<userinput>date@</userinput>, <userinput>finger@</userinput>,
-<userinput>http@</userinput>, <userinput>tcpcat</userinput>,
-<userinput>mconnect</userinput>, <userinput>addcr</userinput> and
-<userinput>delcr</userinput></para>
+<para>The ucspi-tcp package contains <command>tcpserver</command>,
+<command>tcprules</command>, <command>tcprulescheck</command>,
+<command>argv0</command>, <command>fixcrio</command>,
+<command>recordio</command>, <command>rblsmtpd</command>,
+<command>tcpclient</command>, <command>who@</command>,
+<command>date@</command>, <command>finger@</command>,
+<command>http@</command>, <command>tcpcat</command>,
+<command>mconnect</command>, <command>addcr</command> and
+<command>delcr</command></para>
 
 <para>You can also find detailed descriptions of each of these programs at 
@@ -20,68 +20,79 @@
 
 <sect3><title>tcpserver</title>
-<para>tcpserver listens for incoming tcp connections on a given port, and runs 
-a program of your choosing in response to a connection.</para></sect3>
+<para><command>tcpserver</command> listens for incoming <acronym>TCP</acronym> 
+connections on a given port, and runs a program of your choosing in response to 
+a connection.</para></sect3>
 
 <sect3><title>tcprules</title>
-<para>tcprules compiles rules that govern access control for tcpserver into a 
-fast access database format.</para></sect3>
+<para><command>tcprules</command> compiles rules that govern access
+control for <command>tcpserver</command> into a fast access database format.
+</para></sect3>
 
 <sect3><title>tcprulescheck</title>
-<para>tcprulescheck makes it possible to see how tcpserver will react to 
-connections from a given address without actually having to connect via that 
-address. This is useful for checking to see if the access control rules you 
-are using are doing what you expected.</para></sect3>
+<para><command>tcprulescheck</command> makes it possible to see how
+<command>tcpserver</command> will react to connections from a given address 
+without actually having to connect via that address. This is useful for 
+checking to see if the access control rules you are using are doing what you 
+expected.</para></sect3>
 
 <sect3><title>argv0</title>
-<para>argv0 runs a given program with a specified 0th argument.</para></sect3>
+<para><command>argv0</command> runs a given program with a specified 0th 
+argument.</para></sect3>
 
 <sect3><title>fixcrio</title>
-<para>fixcrio inserts carriage returns at the end of lines when they are 
-missing.</para></sect3>
+<para><command>fixcrio</command> inserts carriage returns at the end of lines 
+when they are missing.</para></sect3>
 
 <sect3><title>recordio</title>
-<para>recordio records all input and output of a program given as an 
-argument.</para></sect3>
+<para><command>recordio</command> records all input and output of a program 
+given as an argument.</para></sect3>
 
 <sect3><title>rblsmtpd</title>
-<para>rblsmtpd is a spam blocking program that works in conjunction with your 
-smtp daemon and tcpserver.</para></sect3>
+<para><command>rblsmtpd</command> is a spam blocking program that works in 
+conjunction with your <acronym>SMTP</acronym> daemon and <command>tcpserver
+</command>.</para></sect3>
 
 <sect3><title>tcpclient</title>
-<para>tcpclient creates a connection to a tcp port for a given 
-program.</para></sect3>
+<para><command>tcpclient</command> creates a connection to a <acronym>TCP
+</acronym> port for a given program.</para></sect3>
 
 <sect3><title>who@</title>
-<para>who@ is a demonstration program using tcpclient that has the 
-functionality of the rwho program. It requires a server running sysstat 
-on port 11.</para></sect3>
+<para><command>who@</command> is a demonstration program using <command>
+tcpclient</command> that has the functionality of the <command>rwho</command> 
+program. It requires a server running <command>sysstat</command> on port 11.
+</para></sect3>
 
 <sect3><title>date@</title>
-<para>date@ is a demonstration program using tcpclient that will return the 
-system time of a remote host which is running a daytime service on 
-port 13.</para></sect3>
+<para><command>date@</command> is a demonstration program using <command>
+tcpclient</command> that will return the system time of a remote host which 
+is running a <command>daytime</command> service on port 13.</para></sect3>
 
 <sect3><title>finger@</title>
-<para>finger@ is a demonstration program using tcpclient that mimics the 
-functionality of the finger program. It requires a server running fingerd 
+<para><command>finger@</command> is a demonstration program using <command>
+tcpclient</command> that mimics the functionality of the <command>finger
+</command> program. It requires a server running <command>fingerd</command> 
 on port 79.</para></sect3>
 
 <sect3><title>http@</title>
-<para>http@ downloads web pages from web servers.</para></sect3>
+<para><command>http@</command> downloads web pages from web servers.</para>
+</sect3>
 
 <sect3><title>tcpcat</title>
-<para>tcpcat connects to a tcp port and prints all that is returned from the 
-port.</para></sect3>
+<para><command>tcpcat</command> connects to a <acronym>TCP</acronym> port and 
+prints all that is returned from the port.</para></sect3>
 
 <sect3><title>mconnect</title>
-<para>mconnect connects to a tcp port, delivers any input specified to the 
-port, and prints any output from the port.</para></sect3>
+<para><command>mconnect</command> connects to a <acronym>TCP</acronym> port, 
+delivers any input specified to the port, and prints any output from the port.
+</para></sect3>
 
 <sect3><title>addcr</title>
-<para>addcr adds carriage returns to files. This and delcr are useful for 
-converting between Windows to UNIX file formats.</para></sect3>
+<para><command>addcr</command> adds carriage returns to files. This and
+<command>delcr</command> are useful for converting between Windows to UNIX file 
+formats.</para></sect3>
 
 <sect3><title>delcr</title>
-<para>delcr removes carriage returns from files.</para></sect3>
+<para><command>delcr</command> removes carriage returns from files.</para>
+</sect3>
 
 </sect2>
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -8,12 +8,13 @@
 These commands change the installation directory to
 <filename>/usr/sbin</filename> from the default 
-of <filename>/usr/local/bin</filename>. Since these tools are used in conjunction with daemons, 
+of <filename>/usr/local/bin</filename>. Since these tools are used in 
+conjunction with daemons, 
 they don't make much sense in general user directories. However, some of the 
 example programs and the tcpclient program might be of use to non-root users. 
 If you wish to make these available, then we would suggest installing as above, 
 and then executing the following commands: 
-<screen><userinput>cd /usr/sbin
-mv tcpclient *@ mconnect delcr addcr tcpcat /usr/bin</userinput></screen>This 
-will place the client related programs into <filename>/usr/bin</filename> for general use.</para>
+<screen><userinput>cd /usr/sbin mv tcpclient *@ mconnect delcr addcr tcpcat /usr/bin</userinput></screen>
+This will place the client related programs into <filename>/usr/bin</filename> 
+for general use.</para>
 
 </sect2>
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -1,13 +1,15 @@
 <sect2>
-<title>Installation of ucspi-tcp</title>
+<title>Installation of <application>ucspi-tcp</application></title>
 
-<para>Install ucspi-tcp by running the following commands:</para>
-<para><screen><userinput>patch -Np1 -i ../ucspi-tcp-0.88.errno.patch &amp;&amp;
-sed 's|/usr/local|/usr|' conf-home &gt; conf-home~ &amp;&amp;</userinput>
-<userinput>mv conf-home~ conf-home &amp;&amp;</userinput>
-<userinput>sed 's/bin/sbin/' hier.c &gt; hier.c~ &amp;&amp;</userinput>
-<userinput>mv hier.c~ hier.c &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make setup check</userinput></screen></para>
+<para>Install <application>ucspi-tcp</application> by running the following 
+commands:</para>
+
+<screen><userinput><command>patch -Np1 -i ../ucspi-tcp-0.88.errno.patch &amp;&amp;
+sed 's|/usr/local|/usr|' conf-home &gt; conf-home~ &amp;&amp;
+mv conf-home~ conf-home &amp;&amp;
+sed 's/bin/sbin/' hier.c &gt; hier.c~ &amp;&amp;
+mv hier.c~ hier.c &amp;&amp;
+make &amp;&amp;
+make setup check</command></userinput></screen>
 
 </sect2>
Index: basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -1,19 +1,34 @@
 <sect2>
-<title>Introduction to ucspi-tcp</title>
+<title>Introduction to <application>ucspi-tcp</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&ucspi-tcp-download-http;"/>
-Download location (FTP):        <ulink url="&ucspi-tcp-download-ftp;"/>
-Version used:                   &ucspi-tcp-version;
-Package size:                   &ucspi-tcp-size;
-Estimated Disk space required:  &ucspi-tcp-buildsize;</screen>
-<screen>Additional downloads:
-<ulink url="ftp://moni.csi.hu/pub/glibc-2.3.1/ucspi-tcp-0.88.errno.patch">ucspi-tcp errno patch</ulink></screen>
+<para>The <application>ucspi-tcp</application> package consists of a suite of 
+tools that allow the easy creation of client-server tcp daemons. <command>
+tcpserver</command> is a more secure alternative to <command>inetd</command>. 
+It has built in functionality for rule based access control, and 
+will gracefully defer connections when the configurable maximum load is reached,
+unlike <command>inetd</command>. <command>tcpserver</command> is also 
+recommended for use with <application>qmail</application>, and was written by 
+the same author.</para>
 
-<para>The ucspi-tcp package consists of a suite of tools that allow the easy 
-creation of client-server tcp daemons. Tcpserver is a more secure alternative 
-to inetd. It has built in functionality for rule based access control, and 
-will gracefully defer connections when the configurable maximum load is reached,
-unlike inetd. Tcpserver is also recommended for use with Qmail, and was 
-written by the same author.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&ucspi-tcp-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&ucspi-tcp-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &ucspi-tcp-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&ucspi-tcp-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&ucspi-tcp-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch: <ulink
+url="ftp://moni.csi.hu/pub/glibc-2.3.1/ucspi-tcp-0.88.errno.patch">ucspi-tcp
+errno patch</ulink>
+</para></listitem></itemizedlist>
+</sect3>
 
 </sect2>
Index: basicnet/djb/ucspi-tcp/ucspi-tcp.ent
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp.ent	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ basicnet/djb/ucspi-tcp/ucspi-tcp.ent	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -9,2 +9,3 @@
 <!ENTITY ucspi-tcp-download-ftp "">
 <!ENTITY ucspi-tcp-size "56 KB">
+<!ENTITY ucspi-tcp-time "">
Index: basicnet/netutils/whois/whois-intro.xml
===================================================================
--- basicnet/netutils/whois/whois-intro.xml	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ basicnet/netutils/whois/whois-intro.xml	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -4,7 +4,7 @@
 <para>whois is a client-side application which queries the whois
 directory service for information pertaining to a particular domain
-name. Note that you already have this program from your LFS
+name. <!--Note that you already have this program from your LFS
 installation, it can handle COM, NET and EDU queries. You will need
-this application for any other domains.</para>
+this application for any other domains. --></para>
 
 <sect3><title>Package information</title>
Index: multimedia/videoutils/ffmpeg/ffmpeg-desc.xml
===================================================================
--- multimedia/videoutils/ffmpeg/ffmpeg-desc.xml	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ multimedia/videoutils/ffmpeg/ffmpeg-desc.xml	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -13,5 +13,5 @@
 <sect3><title>ffmpeg</title>
 <para><command>ffmpeg</command> is a command line tool to convert video files, 
-network streams, input from a TV card to several video formats.</para></sect3>
+network streams and input from a TV card to several video formats.</para></sect3>
 
 <sect3><title>ffserver</title>
Index: xsoft/graphweb/mozilla/mozilla-intro.xml
===================================================================
--- xsoft/graphweb/mozilla/mozilla-intro.xml	(revision af68f9848e4ce337ff160174eb49b363a956f6ff)
+++ xsoft/graphweb/mozilla/mozilla-intro.xml	(revision 29f033ae0db7cf9c24c8c52448bfaf0f5148b432)
@@ -37,5 +37,5 @@
 <sect2><title>Additional Downloads and Information</title>
 <para>Download the patch for various fixes to the build from
-<filename><ulink url="&hfile-root;"/></filename>. The patches begin with
+<ulink url="&hfile-root;"/>. The patches begin with
 <filename>mozilla-&mozilla-version;</filename>. Note that none of the
 patches are required, all are optional. Refer to the notes at the top
