Index: basicnet/mailnews/fetchmail/fetchmail-config.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-config.xml	(revision 3fedd093fd49bcc83f536c6520e3da93d2c5ab54)
+++ basicnet/mailnews/fetchmail/fetchmail-config.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring fetchmail</title>
+<title>Configuring <application>fetchmail</application></title>
 
 <sect3><title>Config files</title>
@@ -8,20 +8,20 @@
 <sect3><title>Configuration Information</title>
 
-<para><screen><userinput>set logfile /var/log/fetchmail.log</userinput>
-<userinput>set no bouncemail</userinput>
-<userinput>set postmaster root</userinput>
+<screen>set logfile /var/log/fetchmail.log
+set no bouncemail
+set postmaster root
 
-<userinput>poll SERVERNAME :</userinput>
-<userinput>        user "username" pass "password";</userinput>
-<userinput>        mda "/usr/bin/procmail -f %F -d %T";</userinput></screen>
-</para>
+poll SERVERNAME :
+    user "username" pass "password";
+    mda "/usr/bin/procmail -f %F -d %T";</screen>
+
 
 <para>Is an example configuration that should suffice for most people.  You 
 can add as many users and servers as you need using the same syntax.</para>
 
-<para><userinput>man fetchmail</userinput> : Look for the section near
-the bottom named <emphasis role="strong">CONFIGURATION EXAMPLES</emphasis> it gives some quick 
-examples too. There are countless other config options once you get used to 
-it.</para>
+<para><command>man fetchmail</command> : Look for the section near
+the bottom named <emphasis role="strong">CONFIGURATION EXAMPLES</emphasis> it 
+gives some quick examples too. There are countless other config options once 
+you get used to it.</para>
 
 </sect3>
Index: basicnet/mailnews/fetchmail/fetchmail-desc.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-desc.xml	(revision 3fedd093fd49bcc83f536c6520e3da93d2c5ab54)
+++ basicnet/mailnews/fetchmail/fetchmail-desc.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The fetchmail package contains <userinput>fetchmail</userinput>
-and <userinput>fetchmailconf</userinput>.</para>
+<para>The <application>fetchmail</application> package contains 
+<command>fetchmail</command> and <command>fetchmailconf</command>.</para>
 
 </sect2>
@@ -10,13 +10,14 @@
 
 <sect3><title>fetchmail</title>
-<para>When executed as a user this will source that users <filename>~/.fetchmailrc</filename> and 
-download the appropriate mail.  When run as root ALL users who have a 
-<filename>.fetchmailrc</filename> will have their mail downloaded and delivered accordingly.
-</para></sect3>
+<para>When executed as a user this will source that users <filename>~/.fetchmailrc</filename> and download the appropriate mail.  When run as root ALL users 
+who have a <filename>.fetchmailrc</filename> will have their mail downloaded 
+and delivered accordingly.</para></sect3>
 
 <sect3><title>fetchmailconf</title>
-<para>This program provides a Tk GUI interface to your
+<para>This program provides a <application>Tk</application>
+<acronym>GUI</acronym> interface to your
 <filename>~/.fetchmailrc</filename> making it 
-much easier to configure.  However you will require, Python, and it must 
+much easier to configure.  However you will require,
+<application>Python</application>, and it must 
 have the Tkinker module available.</para></sect3>
 
Index: basicnet/mailnews/fetchmail/fetchmail-exp.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-exp.xml	(revision 3fedd093fd49bcc83f536c6520e3da93d2c5ab54)
+++ basicnet/mailnews/fetchmail/fetchmail-exp.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -2,9 +2,13 @@
 <title>Command explanations</title>
 
-<para><userinput>--with-ssl</userinput> : This enables SSL if found, so that you can handle connections to secure POP3 and IMAP servers.</para>
+<para><command>--with-ssl</command> : This enables
+<acronym>SSL</acronym> if found, so that you can handle connections to
+secure <acronym>POP3</acronym> and <acronym>IMAP</acronym> servers.</para>
 
-<para><userinput>--enable-fallback=procmail</userinput> : This tells fetchmail 
-to hand incoming mail to procmail for delivery if your port 25 mail server is 
+<para><command>--enable-fallback=procmail</command> : This tells
+<application>fetchmail</application> to hand incoming mail to
+<application>procmail</application> for delivery if your port 25 mail server is
 not present or not responding.</para>
+
 </sect2>
 
Index: basicnet/mailnews/fetchmail/fetchmail-inst.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-inst.xml	(revision 3fedd093fd49bcc83f536c6520e3da93d2c5ab54)
+++ basicnet/mailnews/fetchmail/fetchmail-inst.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -1,12 +1,10 @@
 <sect2>
-<title>Installation of fetchmail</title>
+<title>Installation of <application>fetchmail</application></title>
 
-<para>Install fetchmail by running the following commands:</para>
+<para>Install <application>fetchmail</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --with-ssl --enable-fallback=procmail &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput>
-</screen>
-</para>
+<screen><userinput><command>./configure --prefix=/usr --with-ssl --enable-fallback=procmail &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
 
 </sect2>
Index: basicnet/mailnews/fetchmail/fetchmail-intro.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-intro.xml	(revision 3fedd093fd49bcc83f536c6520e3da93d2c5ab54)
+++ basicnet/mailnews/fetchmail/fetchmail-intro.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -1,19 +1,29 @@
 <sect2>
-<title>Introduction to fetchmail</title>
+<title>Introduction to <application>fetchmail</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&fetchmail-download-http;"/>
-Download location (FTP):        <ulink url="&fetchmail-download-ftp;"/>
-Version used:                   &fetchmail-version;
-Package size:                   &fetchmail-size;
-Estimated Disk space required:  &fetchmail-buildsize;
-Estimated build time:           &fetchmail-time;</screen>
-
-<para>The fetchmail package contains the fetchmail program. &quot;It
+<para>The <application>fetchmail</application> package contains the
+<command>fetchmail</command> program. &quot;It
 retrieves mail from remote mail servers and forwards it to your local
 (client) machine's delivery system, so it can then be read by
 normal mail user agents.&quot; </para>
 
-<screen>fetchmail depends on:
-<xref linkend="openssl"/> and a local MDA (<xref linkend="procmail"/>)</screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&fetchmail-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&fetchmail-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &fetchmail-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&fetchmail-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&fetchmail-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>fetchmail</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="openssl"/> and a local MDA (<xref
+linkend="procmail"/>) </para></sect4>
+</sect3>
 
 </sect2>
Index: basicnet/mailnews/mutt/mutt-config.xml
===================================================================
--- basicnet/mailnews/mutt/mutt-config.xml	(revision 3fedd093fd49bcc83f536c6520e3da93d2c5ab54)
+++ basicnet/mailnews/mutt/mutt-config.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring mutt</title>
+<title>Configuring <application>mutt</application></title>
 
 <sect3><title>Config files</title>
@@ -10,7 +10,7 @@
 <sect3><title>Configuration Information</title>
 
-<para>No changes in these files are necessary to begin using mutt.  When
-you are ready to make changes, the man page for muttrc is a good starting
-place.</para>
+<para>No changes in these files are necessary to begin using
+<application>mutt</application>.  When you are ready to make changes, the 
+man page for <filename>muttrc</filename> is a good starting place.</para>
 </sect3>
 
Index: basicnet/mailnews/mutt/mutt-desc.xml
===================================================================
--- basicnet/mailnews/mutt/mutt-desc.xml	(revision 3fedd093fd49bcc83f536c6520e3da93d2c5ab54)
+++ basicnet/mailnews/mutt/mutt-desc.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -2,7 +2,7 @@
 <title>Contents</title>
 
-<para>The mutt package contains <userinput>mutt</userinput>,
-<userinput>flea</userinput>, <userinput>muttbug</userinput>,
-<userinput>mutt_dotlock</userinput>, <userinput>pgpwrap</userinput> and <userinput>pgpring</userinput>.</para>
+<para>The <application>mutt</application> package contains <command>mutt</command>,
+<command>flea</command>, <command>muttbug</command>,
+<command>mutt_dotlock</command>, <command>pgpwrap</command> and <command>pgpring</command>.</para>
 
 </sect2>
@@ -11,15 +11,18 @@
 
 <sect3><title>mutt</title>
-<para>mutt is a Mail User Agent (MUA) which enables you to read, write
+<para><command>mutt</command> is a Mail User Agent
+(<acronym>MUA</acronym>) which enables you to read, write
 and delete your email.</para></sect3>
 
 <sect3><title>flea</title>
-<para>flea is a bug submitter for mutt.</para></sect3>
+<para><command>flea</command> is a bug submitter for
+<application>mutt</application>.</para></sect3>
 
 <sect3><title>muttbug</title>
-<para>muttbug is a script that executes flea.</para></sect3>
+<para><command>muttbug</command> is a script that executes
+<command>flea</command>.</para></sect3>
 
 <sect3><title>mutt_dotlock</title>
-<para>mutt_dotlock implements the mail spool file lock.</para></sect3>
+<para><command>mutt_dotlock</command> implements the mail spool file lock.</para></sect3>
 
 <sect3><title>pgpwrap</title>
Index: basicnet/mailnews/mutt/mutt-exp.xml
===================================================================
--- basicnet/mailnews/mutt/mutt-exp.xml	(revision 3fedd093fd49bcc83f536c6520e3da93d2c5ab54)
+++ basicnet/mailnews/mutt/mutt-exp.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -2,5 +2,6 @@
 <title>Command explanations</title>
 
-<para><userinput>--sysconfdir=/etc</userinput> : This installs the configuration files into <filename>/etc</filename> instead of <filename>/usr/etc</filename>.</para>
+<para><command>--sysconfdir=/etc</command> : This installs the configuration 
+files into <filename>/etc</filename> instead of <filename>/usr/etc</filename>.</para>
 
 </sect2>
Index: basicnet/mailnews/mutt/mutt-inst.xml
===================================================================
--- basicnet/mailnews/mutt/mutt-inst.xml	(revision 3fedd093fd49bcc83f536c6520e3da93d2c5ab54)
+++ basicnet/mailnews/mutt/mutt-inst.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -1,19 +1,19 @@
 <sect2>
-<title>Installation of mutt</title>
+<title>Installation of <application>mutt</application></title>
 
-<para>Mutt requires a group named 'mail'.  You can add this group, if it
-does not exist, with this command:
-<screen><userinput>groupadd mail</userinput></screen></para>
+<para><application>Mutt</application> requires a group named 'mail'.  You can 
+add this group, if it does not exist, with this command:
+<screen><userinput><command>groupadd mail</command></userinput></screen></para>
 
-<para>If you did not install a MTA, such as <xref linkend="postfix"/> or <xref
-linkend="sendmail"/>, you need to modify the ownership of
-<filename>/var/mail</filename> with this command:
-<screen><userinput>chgrp mail /var/mail</userinput></screen></para> 
+<para>If you did not install a <acronym>MTA</acronym>, such as <xref 
+linkend="postfix"/> or <xref linkend="sendmail"/>, you need to modify the 
+ownership of <filename>/var/mail</filename> with this command:
+<screen><userinput><command>chgrp mail /var/mail</command></userinput></screen></para> 
 
-<para>Install mutt by running the following commands:</para>
+<para>Install <application>mutt</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
-make install </userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: basicnet/mailnews/mutt/mutt-intro.xml
===================================================================
--- basicnet/mailnews/mutt/mutt-intro.xml	(revision 3fedd093fd49bcc83f536c6520e3da93d2c5ab54)
+++ basicnet/mailnews/mutt/mutt-intro.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -1,15 +1,19 @@
 <sect2>
-<title>Introduction to mutt</title>
+<title>Introduction to <application>mutt</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&mutt-download-http;"/>
-Download location (FTP):        <ulink url="&mutt-download-ftp;"/>
-Version used:                   &mutt-version;
-Package size:                   &mutt-size;
-Estimated Disk space required:  &mutt-buildsize;
-Estimated build time:           &mutt-time;</screen>
+<para>The <application>mutt</application> package contains a Mail User Agent. This is useful for reading, writing, replying, saving, and deleting your email.</para>
 
-<para>The mutt package contains a Mail User Agent. This is useful for
-reading, writing, replying, saving, and deleting your email.</para>
-
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&mutt-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&mutt-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &mutt-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&mutt-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&mutt-time;</para></listitem></itemizedlist>
+</sect3>
 
 </sect2>
Index: basicnet/mailnews/procmail/procmail-config.xml
===================================================================
--- basicnet/mailnews/procmail/procmail-config.xml	(revision 3fedd093fd49bcc83f536c6520e3da93d2c5ab54)
+++ basicnet/mailnews/procmail/procmail-config.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring procmail</title>
+<title>Configuring <application>procmail</application></title>
 
 <sect3><title>Config files</title>
Index: basicnet/mailnews/procmail/procmail-desc.xml
===================================================================
--- basicnet/mailnews/procmail/procmail-desc.xml	(revision 3fedd093fd49bcc83f536c6520e3da93d2c5ab54)
+++ basicnet/mailnews/procmail/procmail-desc.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The procmail package contains <userinput>procmail</userinput>, <userinput>formail</userinput>, <userinput>lockfile</userinput> and <userinput>mailstat</userinput>.</para>
+<para>The <application>procmail</application> package contains <command>procmail</command>, <command>formail</command>, <command>lockfile</command> and <command>mailstat</command>.</para>
 
 </sect2>
@@ -9,18 +9,19 @@
 
 <sect3><title>procmail</title>
-<para>procmail is an autonomous mail processor.  It performs all the
-functions of a MDA (Mail Delivery Agent).</para></sect3>
+<para><command>procmail</command> is an autonomous mail processor.  It performs
+all the functions of a <acronym>MDA</acronym> (Mail Delivery Agent).</para></sect3>
 
 <sect3><title>formail</title>
-<para>formail is a filter that can be used to format mail into mailbox
-format.</para></sect3>
+<para><command>formail</command> is a filter that can be used to format mail 
+into mailbox format.</para></sect3>
 
 <sect3><title>lockfile</title>
-<para>lockfile is a utility that can lock a file for single use
-interactively or in a script.</para></sect3>
+<para><command>lockfile</command> is a utility that can lock a file for single 
+use interactively or in a script.</para></sect3>
 
 <sect3><title>mailstat</title>
-<para>mailstat prints a summary report of mail that has been filtered by
-procmail since the last time mailstat was ran.</para></sect3>
+<para><command>mailstat</command> prints a summary report of mail that has been
+filtered by <application>procmail</application> since the last time <command>
+mailstat</command> was ran.</para></sect3>
 
 </sect2>
Index: basicnet/mailnews/procmail/procmail-exp.xml
===================================================================
--- basicnet/mailnews/procmail/procmail-exp.xml	(revision 3fedd093fd49bcc83f536c6520e3da93d2c5ab54)
+++ basicnet/mailnews/procmail/procmail-exp.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -2,7 +2,7 @@
 <title>Command explanations</title>
 
-<para><userinput>BASENAME=/usr</userinput> : The equivalent of <userinput>./configure --prefix=/usr</userinput> on other package installations.</para>
+<para><command>BASENAME=/usr</command> : The equivalent of <command>./configure --prefix=/usr</command> on other package installations.</para>
 
-<para><userinput>make install-suid</userinput> : Modifies permissions of
+<para><command>make install-suid</command> : Modifies permissions of
 the installed files.</para>
 </sect2>
Index: basicnet/mailnews/procmail/procmail-inst.xml
===================================================================
--- basicnet/mailnews/procmail/procmail-inst.xml	(revision 3fedd093fd49bcc83f536c6520e3da93d2c5ab54)
+++ basicnet/mailnews/procmail/procmail-inst.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -1,9 +1,9 @@
 <sect2>
-<title>Installation of procmail</title>
+<title>Installation of <application>procmail</application></title>
 
-<para>Install procmail by running the following commands:</para>
+<para>Install <application>procmail</application> by running the following commands:</para>
 
-<para><screen><userinput>make BASENAME=/usr install &amp;&amp;
-make install-suid</userinput></screen></para>
+<screen><userinput><command>make BASENAME=/usr install &amp;&amp;
+make install-suid</command></userinput></screen>
 
 </sect2>
Index: basicnet/mailnews/procmail/procmail-intro.xml
===================================================================
--- basicnet/mailnews/procmail/procmail-intro.xml	(revision 3fedd093fd49bcc83f536c6520e3da93d2c5ab54)
+++ basicnet/mailnews/procmail/procmail-intro.xml	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -1,13 +1,20 @@
 <sect2>
-<title>Introduction to procmail</title>
+<title>Introduction to <application>procmail</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&procmail-download-http;"/>
-Download location (FTP):        <ulink url="&procmail-download-ftp;"/>
-Version used:                   &procmail-version;
-Package size:                   &procmail-size;
-Estimated Disk space required:  &procmail-buildsize;</screen>
+<para>The <application>procmail</application> package contains an autonomous mail processor. This
+is useful for filtering and sorting incoming mail.</para>
 
-<para>The procmail package contains an autonomous mail processor. This
-is useful for filtering and sorting incoming mail.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&procmail-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&procmail-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &procmail-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&procmail-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&procmail-time;</para></listitem></itemizedlist>
+</sect3>
 
 
Index: basicnet/mailnews/procmail/procmail.ent
===================================================================
--- basicnet/mailnews/procmail/procmail.ent	(revision 3fedd093fd49bcc83f536c6520e3da93d2c5ab54)
+++ basicnet/mailnews/procmail/procmail.ent	(revision be352a7dcd57cd6989fbbf6b348aff96166f8f54)
@@ -10,2 +10,3 @@
 <!ENTITY procmail-download-ftp "ftp://ftp.procmail.net/pub/procmail/procmail-3.22.tar.gz">
 <!ENTITY procmail-size "338 KB">
+<!ENTITY procmail-time "">
