Index: basicnet/netprogs/portmap/portmap-config.xml
===================================================================
--- basicnet/netprogs/portmap/portmap-config.xml	(revision aff3a6f2a5225f227356615a24563bba7bb3ef3b)
+++ basicnet/netprogs/portmap/portmap-config.xml	(revision dbed00df548a10f18e66b8237042c814deadf373)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring portmap</title>
+<title>Configuring <application>portmap</application></title>
 
 <sect3><title>Config files</title>
@@ -6,7 +6,7 @@
 </sect3>
 
-<sect3><title>Create the portmap boot script</title>
+<sect3><title>Create the <command>portmap</command> boot script</title>
 
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/portmap &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/portmap &lt;&lt; "EOF"</command>
 #!/bin/sh
 # Begin /etc/rc.d/init.d/portmap
@@ -39,5 +39,5 @@
 
 # End /etc/rc.d/init.d/portmap
-<userinput>EOF
+<command>EOF
 chmod 754 /etc/rc.d/init.d/portmap &amp;&amp;
 cd /etc/rc.d/init.d &amp;&amp;
@@ -48,6 +48,6 @@
 ln -sf ../init.d/portmap ../rc4.d/S22portmap &amp;&amp;
 ln -sf ../init.d/portmap ../rc5.d/S22portmap &amp;&amp;
-ln -sf ../init.d/portmap ../rc6.d/K49portmap
-</userinput></screen></para>
+ln -sf ../init.d/portmap ../rc6.d/K49portmap</command></userinput></screen>
+
 </sect3>
 
Index: basicnet/netprogs/portmap/portmap-desc.xml
===================================================================
--- basicnet/netprogs/portmap/portmap-desc.xml	(revision aff3a6f2a5225f227356615a24563bba7bb3ef3b)
+++ basicnet/netprogs/portmap/portmap-desc.xml	(revision dbed00df548a10f18e66b8237042c814deadf373)
@@ -2,8 +2,8 @@
 <title>Contents</title>
 
-<para>The portmap package contains
-<userinput>portmap</userinput>,
-<userinput>pmap_dump</userinput> and
-<userinput>pmap_set</userinput>.</para>
+<para>The <application>portmap</application> package contains
+<command>portmap</command>,
+<command>pmap_dump</command> and
+<command>pmap_set</command>.</para>
 </sect2>
 
@@ -11,11 +11,14 @@
 
 <sect3><title>portmap</title>
-<para>portmap is the rpc port mapper.</para></sect3>
+<para><command>portmap</command> is the <acronym>RPC</acronym> port mapper.
+</para></sect3>
 
 <sect3><title>pmap_dump</title>
-<para>pmap_dump saves the port mapping table to an ascii file.</para></sect3>
+<para><command>pmap_dump</command> saves the port mapping table to an
+<acronym>ASCII</acronym> file.</para></sect3>
 
 <sect3><title>pmap_set</title>
-<para>pmap_set restores the port mapping table from an ascii file.</para></sect3>
+<para><command>pmap_set</command> restores the port mapping table from an 
+<acronym>ASCII</acronym> file.</para></sect3>
 </sect2>
 
Index: basicnet/netprogs/portmap/portmap-exp.xml
===================================================================
--- basicnet/netprogs/portmap/portmap-exp.xml	(revision aff3a6f2a5225f227356615a24563bba7bb3ef3b)
+++ basicnet/netprogs/portmap/portmap-exp.xml	(revision dbed00df548a10f18e66b8237042c814deadf373)
@@ -2,7 +2,11 @@
 <title>Command explanations</title>
 
-<para><userinput>patch -Np1 -i ../portmap_5-1.diff</userinput> : This patch provides added security for the portmap package, including only allowing portmap table changes from the local host.</para>
+<para><command>patch -Np1 -i ../portmap_5-1.diff</command> : This patch 
+provides added security for the <application>portmap</application> package, 
+including only allowing <command>portmap</command> table changes from the local 
+host.</para>
 
-<para><userinput>mkdir /usr/share/doc/portmap</userinput> : This directory must be created before installation.  </para>
+<para><command>mkdir /usr/share/doc/portmap</command> : This directory must be 
+created before installation.  </para>
 
 </sect2>
Index: basicnet/netprogs/portmap/portmap-inst.xml
===================================================================
--- basicnet/netprogs/portmap/portmap-inst.xml	(revision aff3a6f2a5225f227356615a24563bba7bb3ef3b)
+++ basicnet/netprogs/portmap/portmap-inst.xml	(revision dbed00df548a10f18e66b8237042c814deadf373)
@@ -4,9 +4,9 @@
 <para>Install <application>portmap</application> with the following commands:</para>
 
-<para><screen><userinput><command>patch -Np1 -i ../portmap_5-1.diff &amp;&amp;
+<screen><userinput><command>patch -Np1 -i ../portmap_5-1.diff &amp;&amp;
 patch -Np1 -i ../portmap_5-errno.patch &amp;&amp;
 mkdir /usr/share/doc/portmap &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: basicnet/netprogs/portmap/portmap-intro.xml
===================================================================
--- basicnet/netprogs/portmap/portmap-intro.xml	(revision aff3a6f2a5225f227356615a24563bba7bb3ef3b)
+++ basicnet/netprogs/portmap/portmap-intro.xml	(revision dbed00df548a10f18e66b8237042c814deadf373)
@@ -2,21 +2,36 @@
 <title>Introduction to <application>portmap</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&portmap-download-http;"/>
-Download location (FTP):        <ulink url="&portmap-download-ftp;"/>
-Version used:                   &portmap-version;
-Package size:                   &portmap-size;
-Estimated Disk space required:  &portmap-buildsize;
-Estimated build time:           &portmap-time;</screen>
-<screen>
-Required Downloads:
-Download location (HTTP):        <ulink url="&portmap-patch-http;"/>
-Download location (HTTP):        <ulink url="&hfile-root;/portmap_5-errno.patch"/></screen>
+<para>The <application>portmap</application> package is a more secure 
+replacement for the original SUN <application>portmap</application> package.  
+<application>Portmap</application> is used to forward <acronym>RPC</acronym>
+requests to <acronym>RPC</acronym> daemons such as <acronym>NFS</acronym>
+and <acronym>NIS</acronym>.</para>
 
-<para>The portmap package is a more secure replacement for the
-original SUN portmap package.  Portmap is used to forward rpc
-requests to rpc daemons such as NFS and NIS.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&portmap-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&portmap-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &portmap-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&portmap-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&portmap-time;</para></listitem></itemizedlist>
+</sect3>
 
-<para><screen>portmap depends on:
-<xref linkend="tcpwrappers"/></screen></para>
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch (HTTP): <ulink
+url="&portmap-patch-http;"/></para></listitem>
+<listitem><para>Required patch (HTTP): <ulink url="&hfile-root;/portmap_5-errno.patch"/></para></listitem></itemizedlist>
+</sect3>
+
+                                                                                
+<sect3><title><application>portmap</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="tcpwrappers"/></para></sect4>
+</sect3>
+
 
 </sect2>
Index: basicnet/netprogs/tcpwrappers/tcpwrappers-config.xml
===================================================================
--- basicnet/netprogs/tcpwrappers/tcpwrappers-config.xml	(revision aff3a6f2a5225f227356615a24563bba7bb3ef3b)
+++ basicnet/netprogs/tcpwrappers/tcpwrappers-config.xml	(revision dbed00df548a10f18e66b8237042c814deadf373)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring tcpwrappers</title>
+<title>Configuring <application>tcpwrappers</application></title>
 
 <sect3><title>Config files</title>
@@ -11,15 +11,15 @@
 555). Do not install the wrapper set-uid.</para>
 
-<para>
-Then perform the following edits on the
-<filename>/etc/inetd.conf</filename> configuration file :
+<para>Then perform the following edits on the
+<filename>/etc/inetd.conf</filename> configuration file:
 <screen><userinput>finger stream tcp nowait nobody /usr/sbin/in.fingerd in.fingerd</userinput></screen>
 becomes:
 <screen><userinput>finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd</userinput></screen></para>
+
 <note><para>The finger server is used as an example here.</para></note>
-<para>Similar changes must be made if xinetd is used, with the
-emphasis being on calling <command>/usr/sbin/tcpd</command> instead of calling the
-service daemon directly, and passing the name of the service daemon to
-tcpd.</para>
+
+<para>Similar changes must be made if xinetd is used, with the emphasis being 
+on calling <command>/usr/sbin/tcpd</command> instead of calling the service 
+daemon directly, and passing the name of the service daemon to tcpd.</para>
 </sect3>
 
Index: basicnet/netprogs/tcpwrappers/tcpwrappers-desc.xml
===================================================================
--- basicnet/netprogs/tcpwrappers/tcpwrappers-desc.xml	(revision aff3a6f2a5225f227356615a24563bba7bb3ef3b)
+++ basicnet/netprogs/tcpwrappers/tcpwrappers-desc.xml	(revision dbed00df548a10f18e66b8237042c814deadf373)
@@ -2,13 +2,7 @@
 <title>Contents</title>
 
-<para>The tcpwrappers package contains
-
-safe_finger tcpd tcpdchk tcpdmatch try-from
-
-<userinput>tcpd</userinput>,
-<userinput>tcpdchk</userinput>,
-<userinput>tcpdmatch</userinput>,
-<userinput>try-from</userinput> and
-<userinput>safe_finger</userinput>.</para>
+<para>The <application>tcpwrappers</application> package contains <command>
+tcpd</command>, <command>tcpdchk</command>, <command>tcpdmatch</command>,
+<command>try-from</command> and <command>safe_finger</command>.</para>
 </sect2>
 
@@ -16,23 +10,24 @@
 
 <sect3><title>tcpd</title>
-<para>tcpd is the main access control daemon for all internet
-services, which inetd or xinetd will run instead of running the
+<para><command>tcpd</command> is the main access control daemon for all 
+internet services, which <command>inetd</command> or
+<command>xinetd</command> will run instead of running the
 requested service daemon.</para></sect3>
 
 <sect3><title>tcpdchk</title>
-<para>tcpdchk is a tool to examine a tcpd wrapper configuration and
-report problems with it.</para></sect3>
+<para><command>tcpdchk</command> is a tool to examine a tcpd wrapper 
+configuration and report problems with it.</para></sect3>
 
 <sect3><title>tcpdmatch</title>
-<para>tcpdmatch is used to predict how the tcp wrapper would handle a
-specific request for a service.</para></sect3>
+<para><command>tcpdmatch</command> is used to predict how the tcp wrapper 
+would handle a specific request for a service.</para></sect3>
 
 <sect3><title>try-from</title>
-<para>try-from can be called via a remote shell command to find out if
-the host name and address are properly recognized.</para></sect3>
+<para><command>try-from</command> can be called via a remote shell command to 
+find out if the host name and address are properly recognized.</para></sect3>
 
 <sect3><title>safe_finger</title>
-<para>safe_finger is a wrapper for the finger utility, to provide
-automatic reverse name lookups.</para></sect3>
+<para><command>safe_finger</command> is a wrapper for the <command>finger
+</command> utility, to provide automatic reverse name lookups.</para></sect3>
 
 </sect2>
Index: basicnet/netprogs/tcpwrappers/tcpwrappers-exp.xml
===================================================================
--- basicnet/netprogs/tcpwrappers/tcpwrappers-exp.xml	(revision aff3a6f2a5225f227356615a24563bba7bb3ef3b)
+++ basicnet/netprogs/tcpwrappers/tcpwrappers-exp.xml	(revision dbed00df548a10f18e66b8237042c814deadf373)
@@ -2,5 +2,7 @@
 <title>Command explanations</title>
 
-<para><userinput>patch -Np1 -i ../tcp_wrappers_7.6.diff</userinput> : This patch alters the original path and logging facility of the original tcpwrappers program.</para>
+<para><command>patch -Np1 -i ../tcp_wrappers_7.6.diff</command> : This patch 
+alters the original path and logging facility of the original tcpwrappers 
+program.</para>
 
 </sect2>
Index: basicnet/netprogs/tcpwrappers/tcpwrappers-inst.xml
===================================================================
--- basicnet/netprogs/tcpwrappers/tcpwrappers-inst.xml	(revision aff3a6f2a5225f227356615a24563bba7bb3ef3b)
+++ basicnet/netprogs/tcpwrappers/tcpwrappers-inst.xml	(revision dbed00df548a10f18e66b8237042c814deadf373)
@@ -1,8 +1,9 @@
 <sect2>
-<title>Installation of tcpwrappers</title>
+<title>Installation of <application>tcpwrappers</application></title>
 
-<para>Install tcpwrappers with the following commands:</para>
+<para>Install <application>tcpwrappers</application> with the following 
+commands:</para>
 
-<para><screen><userinput>patch -Np1 -i ../tcp_wrappers_7.6.diff &amp;&amp;
+<screen><userinput><command>patch -Np1 -i ../tcp_wrappers_7.6.diff &amp;&amp;
 make REAL_DAEMON_DIR=/usr/sbin linux &amp;&amp;
 cp libwrap.a /usr/lib &amp;&amp;
@@ -15,5 +16,5 @@
 cp -av *.3 /usr/share/man/man3 &amp;&amp;
 cp -av *.5 /usr/share/man/man5 &amp;&amp;
-cp -av *.8 /usr/share/man/man8</userinput></screen></para>
+cp -av *.8 /usr/share/man/man8</command></userinput></screen>
 
 </sect2>
Index: basicnet/netprogs/tcpwrappers/tcpwrappers-intro.xml
===================================================================
--- basicnet/netprogs/tcpwrappers/tcpwrappers-intro.xml	(revision aff3a6f2a5225f227356615a24563bba7bb3ef3b)
+++ basicnet/netprogs/tcpwrappers/tcpwrappers-intro.xml	(revision dbed00df548a10f18e66b8237042c814deadf373)
@@ -1,18 +1,27 @@
 <sect2>
-<title>Introduction to tcpwrappers</title>
+<title>Introduction to <application>tcpwrappers</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&tcpwrappers-download-http;"/>
-Download location (FTP):       <ulink url="&tcpwrappers-download-ftp;"/>
-Version used:                   &tcpwrappers-version;
-Package size:                   &tcpwrappers-size;
-Estimated Disk space required:  &tcpwrappers-buildsize;
-Estimated build time:           &tcpwrappers-time;</screen>
-<screen>
-Required patch:
-Download location (HTTP):        <ulink url="&tcpwrappers-patch-http;"/></screen>
+<para>The <application>tcpwrappers</application> package provides daemon 
+wrapper programs that report the name of the client requesting network services and the requested service.</para> 
 
-<para>The tcpwrappers package provides daemon wrapper programs that
-report the name of the client requesting network services and the
-requested service.</para> 
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&tcpwrappers-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&tcpwrappers-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &tcpwrappers-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&tcpwrappers-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&tcpwrappers-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&tcpwrappers-patch-http;"/></para></listitem></itemizedlist>
+</sect3>
+
 
 </sect2>
