Index: basicnet/basicnet.xml
===================================================================
--- basicnet/basicnet.xml	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
+++ basicnet/basicnet.xml	(revision bfe245f017c5de8294362fb71d242be29b438db0)
@@ -1,2 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
 <part id="basicnet" xreflabel="Basic Networking">
 <?dbhtml filename="basicnet.html" dir="basicnet"?>
@@ -4,10 +11,9 @@
 
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basicnet/netlibs/netlibs.xml"/>  
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basicnet/textweb/textweb.xml"/>  
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basicnet/netprogs/netprogs.xml"/>  
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basicnet/netutils/netutils.xml"/>  
-
-&basicnet-mailnews;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="netlibs/netlibs.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="textweb/textweb.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="netprogs/netprogs.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="netutils/netutils.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mailnews/mailnews.xml"/>  
 
 </part>
Index: basicnet/mailnews/fetchmail.xml
===================================================================
--- basicnet/mailnews/fetchmail.xml	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
+++ basicnet/mailnews/fetchmail.xml	(revision bfe245f017c5de8294362fb71d242be29b438db0)
@@ -1,11 +1,140 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY fetchmail-download-http "http://www.catb.org/~esr/fetchmail/fetchmail-&fetchmail-version;.tar.gz">
+  <!ENTITY fetchmail-download-ftp  "ftp://gnome.dti.ad.jp/.1/unix/net/mail/fetchmail/fetchmail-&fetchmail-version;.tar.gz">
+  <!ENTITY fetchmail-size          "1.2 MB">
+  <!ENTITY fetchmail-buildsize     "5.8 MB">
+  <!ENTITY fetchmail-time          "0.14 SBU">
+]>
+
 <sect1 id="fetchmail" xreflabel="Fetchmail">
 <?dbhtml filename="fetchmail.html"?>
 <title>Fetchmail-&fetchmail-version;</title>
 
-&fetchmail-intro;
-&fetchmail-inst;
-&fetchmail-exp;
-&fetchmail-config;
-&fetchmail-desc;
+<sect2>
+<title>Introduction to <application>Fetchmail</application></title>
+
+<para>The <application>Fetchmail</application> package contains a mail
+retrieval 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>
+
+<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>
+
+<sect4><title>Optional</title>
+<para><xref linkend="Python"/> and <xref linkend="tk"/>.</para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Fetchmail</application></title>
+
+<para>Install <application>Fetchmail</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr --with-ssl --enable-fallback=procmail &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><option>--with-ssl</option>: This enables
+<acronym>SSL</acronym> if found, so that you can handle connections to
+secure <acronym>POP</acronym>3 and <acronym>IMAP</acronym> servers.</para>
+
+<para><parameter>--enable-fallback=procmail</parameter>: 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>
+
+<sect2>
+<title>Configuring <application>Fetchmail</application></title>
+
+<sect3><title>Config files</title>
+<para><filename>~/.fetchmailrc</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<screen><userinput><command>cat &gt; ~/.fetchmailrc &lt;&lt; "EOF"</command> 
+set logfile /var/log/fetchmail.log
+set no bouncemail
+set postmaster root
+
+poll SERVERNAME :
+    user <replaceable>[username]</replaceable> pass <replaceable>[password]</replaceable>;
+    mda "/usr/bin/procmail -f %F -d %T";
+<command>EOF</command>
+
+<command>chmod 0600 ~/.fetchmailrc</command></userinput></screen>
+
+<para>This 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><command>man fetchmail</command>: Look for the section near
+the bottom named <emphasis role="strong">CONFIGURATION EXAMPLES</emphasis>. It 
+gives some quick examples. There are countless other config options once 
+you get used to it.</para>
+
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Fetchmail</application> package contains 
+<command>fetchmail</command> and <command>fetchmailconf</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>fetchmail</title>
+<para>When executed as a user, this will source that users
+<filename>~/.fetchmailrc</filename> and download the appropriate mail.
+</para></sect3>
+
+<sect3>
+<title>fetchmailconf</title>
+
+<para>This program provides a <application>Tk</application>
+<acronym>GUI</acronym> interface to your <filename>~/.fetchmailrc</filename>
+file making it much easier to configure.  However, you will require
+<application>Python</application>, and it must have the Tkinker module
+available.</para>
+
+</sect3>
+
+</sect2>
 
 </sect1>
Index: basicnet/mailnews/mailnews.xml
===================================================================
--- basicnet/mailnews/mailnews.xml	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
+++ basicnet/mailnews/mailnews.xml	(revision bfe245f017c5de8294362fb71d242be29b438db0)
@@ -1,2 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
 <chapter id="basicnet-mailnews">
 <?dbhtml filename="mailnews.html"?>
@@ -12,11 +19,11 @@
 (<acronym>NNTP</acronym>).</para>
 
-&nail;
-&procmail;
-&fetchmail;
-&mutt;
-&pine;
-&slrn;
-&basicnet-mailnews-othermn;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nail.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="procmail.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="fetchmail.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mutt.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pine.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="slrn.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="other.xml"/> 
 
 </chapter>
Index: basicnet/mailnews/mutt.xml
===================================================================
--- basicnet/mailnews/mutt.xml	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
+++ basicnet/mailnews/mutt.xml	(revision bfe245f017c5de8294362fb71d242be29b438db0)
@@ -1,11 +1,123 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY mutt-download-http "http://gd.tuwien.ac.at/infosys/mail/mutt/mutt-&mutt-version;.tar.gz">
+  <!ENTITY mutt-download-ftp  "ftp://ftp.mutt.org/mutt/mutt-&mutt-version;.tar.gz">
+  <!ENTITY mutt-size          "2.6 MB">
+  <!ENTITY mutt-buildsize     "16.9 MB">
+  <!ENTITY mutt-time          "0.35 SBU">
+]>
+
 <sect1 id="mutt" xreflabel="Mutt-&mutt-version;">
 <?dbhtml filename="mutt.html"?>
 <title>Mutt-&mutt-version;</title>
 
-&mutt-intro;
-&mutt-inst;
-&mutt-exp;
-&mutt-config;
-&mutt-desc;
+<sect2>
+<title>Introduction to <application>Mutt</application></title>
+
+<para>The <application>Mutt</application> 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>
+<sect3><title><application>Mutt</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="gnupg"/></para></sect4>
+</sect3>
+
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Mutt</application></title>
+
+<para><application>Mutt</application> requires a group named 'mail'.  You can 
+add this group, if it does not exist, with this command:</para>
+<screen><userinput><command>groupadd mail</command></userinput></screen>
+
+<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:</para>
+<screen><userinput><command>chgrp mail /var/mail</command></userinput></screen>
+
+<para>Install <application>Mutt</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--sysconfdir=/etc</parameter>: This installs the configuration 
+files into <filename class="directory">/etc</filename> instead of
+<filename class="directory">/usr/etc</filename>.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>Mutt</application></title>
+
+<sect3><title>Config files</title>
+<para><filename>/etc/Muttrc</filename>,
+<filename>~/.muttrc</filename>,
+<filename>/etc/mime.types</filename>, <filename>~/.mime.types</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<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>
+
+<para>In order to utilize <application>GnuPG</application>, use the following 
+command:</para>
+<screen><userinput><command>cat /usr/share/doc/mutt/samples/gpg.rc &gt;&gt; ~/.muttrc</command></userinput></screen>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<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>
+
+<sect2><title>Description</title>
+
+<sect3><title>mutt</title>
+<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><command>flea</command> is a bug submitter for
+<application>Mutt</application>.</para></sect3>
+
+<sect3><title>muttbug</title>
+<para><command>muttbug</command> is a script that executes
+<command>flea</command>.</para></sect3>
+
+<sect3><title>mutt_dotlock</title>
+<para><command>mutt_dotlock</command> implements the mail spool file lock.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: basicnet/mailnews/nail.xml
===================================================================
--- basicnet/mailnews/nail.xml	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
+++ basicnet/mailnews/nail.xml	(revision bfe245f017c5de8294362fb71d242be29b438db0)
@@ -1,11 +1,85 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY nail-download-http "http://prdownloads.sourceforge.net/nail/nail-&nail-version;.tar.bz2">
+  <!ENTITY nail-download-ftp  " ">
+  <!ENTITY nail-size          "152 KB">
+  <!ENTITY nail-buildsize     "3.8 MB">
+  <!ENTITY nail-time          "0.10 SBU">
+]>
+
 <sect1 id="nail" xreflabel="Nail-&nail-version;">
 <?dbhtml filename="nail.html"?>
 <title>Nail-&nail-version;</title>
 
+<sect2>
+<title>Introduction to <application>Nail</application></title>
 
-&nail-intro;
-&nail-inst;
-&nail-config;
-&nail-desc;
+<para>The <application>Nail</application> package contains a
+command-line Mail User Agent that is compatible with the <command>mail
+</command> command available in commercial Unix versions. The <command>
+mail</command> command is useful for writing scripts.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&nail-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&nail-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &nail-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&nail-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&nail-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>Nail</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="openssl"/> and
+<ulink url="../server/mail.html">MTA</ulink></para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Nail</application></title>
+
+<para>Install <application>Nail</application> by running the following commands.
+(Note: If you would like Nail to be linked against <application>OpenSSL</application>,
+add <parameter>--with-openssl</parameter> to the configure 
+command mentioned below.)</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+ln -sf nail /usr/bin/mail</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>Nail</application></title>
+
+<sect3><title>Config files</title>
+<para><filename>/etc/nail.rc</filename></para>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+<para>The <application>Nail</application> package contains
+<command>nail</command>, a program compatible with
+<command>mail</command> found on commercial Unix versions.</para>
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>nail</title>
+<para><command>nail</command> is a command-line mail user agent.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: basicnet/mailnews/other.xml
===================================================================
--- basicnet/mailnews/other.xml	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
+++ basicnet/mailnews/other.xml	(revision bfe245f017c5de8294362fb71d242be29b438db0)
@@ -1,2 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
 <sect1 id="basicnet-mailnews-other">
 <?dbhtml filename="othermn.html"?>
Index: basicnet/mailnews/pine.xml
===================================================================
--- basicnet/mailnews/pine.xml	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
+++ basicnet/mailnews/pine.xml	(revision bfe245f017c5de8294362fb71d242be29b438db0)
@@ -1,11 +1,180 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY pine-download-http "http://mirror.sit.wisc.edu/pub/net/mail/pine/pine&pine-version;.tar.bz2">
+  <!ENTITY pine-download-ftp  "ftp://ftp.cac.washington.edu/pine/pine&pine-version;.tar.bz2">
+  <!ENTITY pine-size          "2.9 MB">
+  <!ENTITY pine-buildsize     "50 MB">
+  <!ENTITY pine-time          "0.95 SBU">
+]>
+
 <sect1 id="pine" xreflabel="Pine-&pine-version;">
 <?dbhtml filename="pine.html"?>
 <title>Pine-&pine-version;</title>
 
-&pine-intro;
-&pine-inst;
-&pine-exp;
-&pine-config;
-&pine-desc;
+<sect2>
+<title>Introduction to <application>Pine</application></title>
+
+<para>The <application>Pine</application> package contains the
+<application>Pine</application> Mail User Agent and several
+server daemons for various mail protocols, in addition to some nice
+file and directory editing/browsing programs.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&pine-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&pine-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &pine-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&pine-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&pine-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Recommended patch: <ulink
+url="&patch-root;/pine-&pine-version;-fhs-3.patch"/></para></listitem>
+</itemizedlist>
+</sect3>
+
+<sect3><title><application>Pine</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="openssl"/></para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="openldap"/> and
+<xref linkend="mitkrb"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Pine</application></title>
+
+<para>Install <application>Pine</application> by running the following commands: </para>
+
+<screen><userinput><command>patch -Np1 -i ../pine-&pine-version;-fhs-3.patch &amp;&amp;
+./build DEBUG=-O MAILSPOOL=/var/mail \
+    SSLDIR=/usr SSLCERTS=/etc/ssl/certs slx &amp;&amp;
+cp doc/*.1 /usr/share/man/man1 &amp;&amp;    
+cd bin &amp;&amp;
+install pine imapd ipop2d ipop3d mailutil mtest pico \
+    pilot rpdump rpload /usr/bin</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><command>patch -Np1 -i ../pine-&pine-version;-fhs.patch</command>: This
+patch will make <application>Pine</application> use <filename
+class="directory">/etc</filename> for configuration files.</para>
+
+<para>The build procedure for <application>Pine</application> is somewhat 
+unusual, in that options usually passed as <command>./configure</command> 
+options or housed in $<envar>CFLAGS</envar> must all be passed on the command 
+line to the <command>./build</command> script.</para>
+
+<para><command>./build slx</command>: <application>Pine</application> offers 
+quite a few target platforms, slx specifies Linux using
+-lcrypt to get the crypt function.  See the
+<filename>doc/pine-ports</filename> file for more information and
+other authentication options.</para>
+
+<para><command>DEBUG=-O</command>: This flag compiles an optimized
+version of <command>pine</command> and <command>pico</command> that
+produces no debug files.</para>
+
+<para><command>MAILSPOOL=/var/mail</command>: Location of mail spool
+files, <filename>/var/mail.</filename></para>
+
+<para><command>SSLDIR=/usr SSLCERTS=/etc/ssl/certs</command>: Location
+of OpenSSL files.</para>
+
+<para><screen><command>cd bin &amp;&amp;
+install pine imapd ipop2d ipop3d mailutil mtest pico \
+    pilot rpdump rpload /usr/bin</command></screen>
+This installs <application>Pine</application>.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>Pine</application></title>
+
+<sect3><title>Config files</title>
+<para><filename>~/.pinerc</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>The <command>pine</command> executable needs no global configuration to 
+use.  Users set <application>Pine</application> options in <filename>~/.pinerc
+</filename> using an internal configuration menu.</para>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+<para>The <application>Pine</application> package contains
+<command>pine</command>,
+<command>pico</command>,
+<command>pilot</command>,
+<command>imapd</command>,
+<command>ipop2d</command>,
+<command>ipop3d</command>,
+<command>mtest</command>,
+<command>rpload</command> and
+<command>rpdump</command>.</para>
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>pine</title>
+<para><command>pine</command> is the <application>Pine</application> mail user 
+agent.</para></sect3>
+
+<sect3><title>pico</title>
+<para><command>pico</command> is a stand-alone editor, similar to the
+<application>Pine</application> internal message composer.</para></sect3>
+
+<sect3><title>pilot</title>
+<para><command>pilot</command> is a file and directory navigator and browser.</para></sect3>
+
+<sect3><title>imapd</title>
+<para><command>imapd</command> is the <acronym>IMAP</acronym> server daemon.</para></sect3>
+
+<sect3><title>ipop2d</title>
+<para><command>ipop2d</command> is an <acronym>IMAP</acronym> to
+<acronym>POP</acronym>2 conversion server.</para></sect3>
+
+<sect3><title>ipop3d</title>
+<para><command>ipop3d</command> is an <acronym>IMAP</acronym> to
+<acronym>POP</acronym>3 conversion server.</para></sect3>
+
+<sect3><title>mtest</title>
+<para><command>mtest</command> is a minimal <acronym>IMAP</acronym> mail user 
+agent, used for debugging.</para></sect3>
+
+<sect3><title>rpload</title>
+<para><command>rpload</command> is the <application>Pine</application> remote 
+data utility, used to convert local <application>Pine</application> 
+configuration files or address  books into remote configurations
+or address books.</para></sect3>
+
+
+<sect3><title>rpdump</title>
+<para><command>rpdump</command> is used to copy data from remote
+<application>Pine</application> configuration files or address books into a 
+local file.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: basicnet/mailnews/procmail.xml
===================================================================
--- basicnet/mailnews/procmail.xml	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
+++ basicnet/mailnews/procmail.xml	(revision bfe245f017c5de8294362fb71d242be29b438db0)
@@ -1,11 +1,104 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY procmail-download-http "http://www.procmail.org/procmail-&procmail-version;.tar.gz">
+  <!ENTITY procmail-download-ftp  "ftp://ftp.procmail.net/pub/procmail/procmail-&procmail-version;.tar.gz">
+  <!ENTITY procmail-size          "338 KB">
+  <!ENTITY procmail-buildsize     "1.5 MB">
+  <!ENTITY procmail-time          "0.38 SBU">
+]>
+
 <sect1 id="procmail" xreflabel="Procmail-&procmail-version;">
 <?dbhtml filename="procmail.html"?>
 <title>Procmail-&procmail-version;</title>
 
-&procmail-intro;
-&procmail-inst;
-&procmail-exp;
-&procmail-config;
-&procmail-desc;
+<sect2>
+<title>Introduction to <application>Procmail</application></title>
+
+<para>The <application>Procmail</application> 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>
+
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Procmail</application></title>
+
+<para>Install <application>Procmail</application> by running the following commands:</para>
+
+<screen><userinput><command>make BASENAME=/usr install &amp;&amp;
+make install-suid</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>BASENAME=/usr</parameter>: The equivalent of <command>./configure --prefix=/usr</command> on other package installations.</para>
+
+<para><command>make install-suid</command>: Modifies permissions of
+the installed files.</para>
+</sect2>
+
+<sect2>
+<title>Configuring <application>Procmail</application></title>
+
+<sect3><title>Config files</title>
+<para><filename>/etc/procmailrc</filename>,
+<filename>~/.procmailrc</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>Recipes have to be written and placed in your
+<filename>~/.procmailrc</filename> for execution. The procmailex man
+page is the starting place to learn how to write recipes.</para>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Procmail</application> package contains <command>procmail</command>, <command>formail</command>, <command>lockfile</command> and <command>mailstat</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>procmail</title>
+<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><command>formail</command> is a filter that can be used to format mail 
+into mailbox format.</para></sect3>
+
+<sect3><title>lockfile</title>
+<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><command>mailstat</command> prints a summary report of mail that has been
+filtered by <command>procmail</command> since the last time <command>
+mailstat</command> was ran.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: basicnet/mailnews/slrn.xml
===================================================================
--- basicnet/mailnews/slrn.xml	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
+++ basicnet/mailnews/slrn.xml	(revision bfe245f017c5de8294362fb71d242be29b438db0)
@@ -1,11 +1,119 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY slrn-download-http "http://prdownloads.sourceforge.net/slrn/slrn-&slrn-version;.tar.bz2">
+  <!ENTITY slrn-download-ftp  "ftp://ftp.fh-heilbronn.de/pub/mirrors/slrn/slrn-&slrn-version;.tar.bz2">
+  <!ENTITY slrn-size          "972 KB">
+  <!ENTITY slrn-buildsize     "9.3 MB">
+  <!ENTITY slrn-time          "0.19 SBU">
+]>
+
 <sect1 id="slrn" xreflabel="slrn-&slrn-version;">
 <?dbhtml filename="slrn.html"?>
 <title>slrn-&slrn-version;</title>
 
-&slrn-intro;
-&slrn-inst;
-&slrn-exp;
-&slrn-config;
-&slrn-desc;
+<sect2>
+<title>Introduction to <application>slrn</application></title>
+
+<para><application>slrn</application> is a slang-based news reader, capable of reading local news
+spools as well as groups from an <acronym>NNTP</acronym> server.  Small local news spools
+can also be created with the use of the slrnpull program included in
+the slrn distribution.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&slrn-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&slrn-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &slrn-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &slrn-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &slrn-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>slrn</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="slang"/> and <acronym>MTA</acronym> (See <xref linkend="server-mail"/>)</para></sect4>
+
+<sect4><title>Optional</title>
+<para><xref linkend="openssl"/></para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>slrn</application></title>
+
+<para>Install <application>slrn</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc \
+    --with-slrnpull &amp;&amp;
+make LDFLAGS="-ldl" &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><command>./configure --with-slrnpull</command>: Build the slrnpull executable.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>slrn</application></title>
+
+<sect3><title>Config files</title>
+<para><filename>/etc/slrn.rc</filename>,
+<filename>~/.slrnrc</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>The first time <command>slrn</command> is run, the
+<filename>~/.jnewsrc</filename> file must be
+created. For this configuration to work, you must have an environmental
+variable, <envar>NNTPSERVER</envar>, set. In normal operation it would be exported into
+the environment by a startup file, like <filename>/etc/profile</filename>
+or <filename>~/.bashrc</filename>. Here we will just put it into the
+environment of the configuration step. We will use the
+<acronym>LFS</acronym> news server in this example, but you should use
+whatever server you prefer.</para>
+
+<para>Create the <filename>~/.jnewsrc</filename> file with the following
+command:</para>
+
+<screen><userinput><command>NNTPSERVER=<replaceable>news.linuxfromscratch.org</replaceable> \
+    slrn -f ~/.jnewsrc --create</command></userinput></screen>
+
+<para>You will also have to edit one of the configuration files. There
+is a sample startup <filename>/usr/share/doc/slrn/slrn.rc</filename>
+file that comes with slrn. It is extensively documented but if you
+need more information, look at <ulink
+url="http://slrn.sourceforge.net/docs/">the slrn
+website</ulink>.</para>
+
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+<para>The <application>slrn</application> package contains 
+<command>slrn</command> and
+<command>slrnpull</command>.</para>
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>slrn</title>
+<para><command>slrn</command> is the slang-based news reader.</para></sect3>
+
+<sect3><title>slrnpull</title>
+<para><command>slrnpull</command> is used to pull a small news feed from
+an <acronym>NNTP</acronym> server for offline reading.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
+++ general.ent	(revision bfe245f017c5de8294362fb71d242be29b438db0)
@@ -92,6 +92,11 @@
 <!ENTITY bind-version        "9.2.3"> 
 
-
 <!-- Chapter 20 -->
+<!ENTITY nail-version        "10.7"> 
+<!ENTITY procmail-version    "3.22">  
+<!ENTITY fetchmail-version   "6.2.5">  
+<!ENTITY mutt-version        "1.4.2.1i"> 
+<!ENTITY pine-version        "4.60">  
+<!ENTITY slrn-version        "0.9.8.0"> 
 
 
Index: index.xml
===================================================================
--- index.xml	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
+++ index.xml	(revision bfe245f017c5de8294362fb71d242be29b438db0)
@@ -32,5 +32,5 @@
 %general;
 <!-- %connect; -->
-%basicnet;
+<!-- %basicnet; -->
 %server;
 %content;
@@ -59,5 +59,5 @@
 
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="connect/connect.xml"/>
-&basicnet;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basicnet/basicnet.xml"/>
 &server;
 &content;
