Index: server/mail/courier.xml
===================================================================
--- server/mail/courier.xml	(revision 95079c366bbab2ef8182e1ed01ece953b97fa2f1)
+++ server/mail/courier.xml	(revision 1a1da481fe957e332f6c65bd37c787ef9de25464)
@@ -1,5 +1,5 @@
-<sect1 id="courier" xreflabel="courier-&courier-version;">
+<sect1 id="courier" xreflabel="Courier-&courier-version;">
 <?dbhtml filename="courier.html" dir="server"?>
-<title>courier-&courier-version;</title>
+<title>Courier-&courier-version;</title>
 
 &courier-intro;
Index: server/mail/courier/courier-config.xml
===================================================================
--- server/mail/courier/courier-config.xml	(revision 95079c366bbab2ef8182e1ed01ece953b97fa2f1)
+++ server/mail/courier/courier-config.xml	(revision 1a1da481fe957e332f6c65bd37c787ef9de25464)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>courier</application></title>
+<title>Configuring <application>Courier</application></title>
 
 <sect3><title>Config files</title>
@@ -100,33 +100,26 @@
 <command>EOF</command></userinput></screen>
 
+<para><filename>/etc/courier/me</filename></para>
+
+<screen><userinput><command>cat &gt; /etc/courier/me &lt;&lt; "EOF"</command>
+{servername.yourdomain}
+<command>EOF</command></userinput></screen>
+
 <para><filename>/etc/courier/locals</filename></para>
-
 
 <screen><userinput><command>cat &gt; /etc/courier/locals &lt;&lt; "EOF"</command>
 localhost
 {yourdomain}
-.{yourdomain}
-<command>EOF</command></userinput></screen>
-
-<para><filename>/etc/courier/esmtpacceptmailfor</filename></para>
-
-
-<screen><userinput><command>cat &gt; /etc/courier/esmtpacceptmailfor &lt;&lt; "EOF"</command>
+<command>EOF</command></userinput></screen>
+
+<para><filename>/etc/courier/esmtpacceptmailfor.dir/system</filename></para>
+
+<screen><userinput><command>cat &gt;/etc/courier/esmtpacceptmailfor.dir/system &lt;&lt; "EOF"</command>
 localhost
 {yourdomain}
-.{yourdomain}
-<command>EOF</command></userinput></screen>
-
-<para><filename>/etc/courier/hosteddomains</filename></para>
-
-<screen><userinput><command>cat &gt; /etc/courier/hosteddomains &lt;&lt; "EOF"</command>
-{yourdomain}
-.{yourdomain}
-<command>EOF</command></userinput></screen>
-
+<command>EOF</command></userinput></screen>
 
 <para>You will also need to edit the aliases file and change the
 following entry.</para>
-
 
 <para><filename>/etc/courier/aliases/system</filename></para>
@@ -231,14 +224,10 @@
 system.</para>
 
-<para><emphasis role="strong">Edit note: Remove /usr/libexec with
-configure flag, should be /usr/sbin. Sync apache directory with apache
-install for BLFS.</emphasis></para>
-
-<para>You will need to copy the file webemail from
-<filename>/usr/libexec/courier/webmail</filename> to your <filename>cgi-bin
+<para>You will need to copy the file webmail from
+<filename>/usr/libexec/courier/webmail/webmail</filename> to your <filename>cgi-bin
 </filename> directory of your <application>Apache</application>
 server.</para>
 
-<screen><userinput><command>cp -a /usr/libexec/courier/webmail /var/www/cgi-bin</command></userinput></screen>
+<screen><userinput><command>cp -a /usr/libexec/courier/webmail/webmail /var/www/cgi-bin</command></userinput></screen>
 
 <para>You will then need to copy the images to a folder under your
@@ -249,5 +238,52 @@
 
 <screen><userinput><command>cp -a /usr/share/courier/sqwebmail/images /var/www/htdocs/webmail</command></userinput></screen>
-
+<para><emphasis>Setup for Web-based Email</emphasis></para>
+
+<para>This section will explain how to setup Courier Web-based administration
+system.</para>
+
+<para>You will need to copy the file webadmin from
+<filename>/usr/libexec/courier/webmail/webmin</filename> to your <filename>cgi-bin
+</filename> directory of your <application>Apache</application>
+server.</para>
+
+<screen><userinput><command>cp -a /usr/libexec/courier/webmail/webadmin /var/www/cgi-bin</command></userinput></screen>
+
+<para><filename>/etc/courier/webadmin/password</filename></para>
+
+<screen><userinput><command>cat &gt; /etc/courier/webadmin/password &lt;&lt; "EOF"</command>
+{password}
+<command>EOF</command></userinput></screen>
+
+<para>If you are not using <acronym>SSL</acronym> on your <application>Apache
+</application> server, you will need to add
+<filename>/etc/courier/webadmin/unsecureok</filename>, so you will be able
+to use your web based administration tool.
+
+<screen><userinput><command>touch /etc/courier/webadmin/unsecureok</command></userinput></screen></para>
+</sect3>
+
+<sect3><title>Courier init.d script</title>
+
+<para>The startup script from the <application>Courier</application> package is 
+the easiest to use. It will automatically create missing data files, and 
+<acronym>SSL</acronym> certificates if they are missing. To install the 
+init.d file for <application>Courier</application> you will need to use the 
+follow commands:</para>
+
+<screen><userinput><command>cp /usr/src/courier-&courier-version;/courier.sysvinit /etc/rc.d/init.d/courier &amp;&amp;
+chmod 755 /etc/rc.d/init.d/courier</command></userinput></screen>
+
+<para>Create the symbolic links to this file in the relevant
+<filename>rc.d</filename> directory with the following commands:
+
+<screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
+ln -sf ../init.d/courier ../rc0.d/K25courier &amp;&amp;
+ln -sf ../init.d/courier ../rc1.d/K25courier &amp;&amp;
+ln -sf ../init.d/courier ../rc2.d/K25courier &amp;&amp;
+ln -sf ../init.d/courier ../rc3.d/S35courier &amp;&amp;
+ln -sf ../init.d/courier ../rc4.d/S35courier &amp;&amp;
+ln -sf ../init.d/courier ../rc5.d/S35courier &amp;&amp;
+ln -sf ../init.d/courier ../rc6.d/K25courier</command></userinput></screen></para>
 
 </sect3>
Index: server/mail/courier/courier-desc.xml
===================================================================
--- server/mail/courier/courier-desc.xml	(revision 95079c366bbab2ef8182e1ed01ece953b97fa2f1)
+++ server/mail/courier/courier-desc.xml	(revision 1a1da481fe957e332f6c65bd37c787ef9de25464)
@@ -2,6 +2,44 @@
 <title>Contents</title>
 
-<para>The <application>courier</application> package contains <command>
-LISTOFEXEC</command>, <filename>LISTOFFILES</filename>.</para>
+<para>The <application>Courier</application> package contains <command>
+cancelmsg</command>, <filename>courier-config</filename>, <command>couriermlm</command>,
+<filename>couriertls</filename>, <filename>deliverquota</filename>, 
+<filename>dotforward</filename>, <filename>imapd</filename>, 
+<command>lockmail</command>, <command>mailbot</command>,
+<command>maildirkw</command>, <command>maildrop</command>,
+<command>mailq</command>, <filename>makedat</filename>,
+<filename>makemime</filename>, <filename>mimegpg</filename>,
+<filename>preline</filename>, <command>reformail</command>,
+<command>reformime</command>, <filename>rmail</filename>,
+<command>sendmail</command>, <command>testmxlookup</command>,
+<command>courier</command>, <command>courierfilter</command>,
+<filename>courierlogger</filename>, <filename>couriertcpd</filename>,
+<filename>esmtpd</filename>, <filename>esmtpd-msa</filename>, 
+<filename>esmtp-ssl</filename>, <command>filterctl</command>,
+<filename>imapd</filename>, <filename>imapd-ssl</filename>,
+<command>makeacceptmailfor</command>, <command>makealiases</command>,
+<command>makehosteddomains</command>, <command>makepercentrelay</command>,
+<command>makesmtpacces</command>, <command>makesmtpaccess-msa</command>,
+<filename>makeuserdb</filename>, <command>makeuucpneighbors</command>,
+<filename>mksmtpcert</filename>, <filename>mkimapdcert</filename>,
+<filename>mkpop3cert</filename>, <filename>pop3d</filename>,
+<filename>pop3d-ssl</filename>, <filename>pw2userdb</filename>,
+<command>showconfig</command>, <command>showmodules</command>,
+<filename>userdb</filename>, <filename>userdbpw</filename>,
+<filename>webgpg</filename>, <command>authdaemon</command>,
+<filename>authdaemon.mysql</filename>, <filename>authdaemon.plain</filename>,
+<filename>aliascombine</filename>, <filename>aliascreate</filename>,
+<filename>aliasexp</filename>, <filename>courierd</filename>,
+<filename>courierpop3d</filename>, <filename>courierpop3login</filename>,
+<filename>imaplogin</filename>, <filename>makedatprog</filename>,
+<filename>pcpd</filename>, <filename>submit</filename>,
+<filename>submitmkdir</filename>, <filename>webadmin</filename>,
+<filename>webmail</filename>, <filename>courierdsn</filename>,
+<filename>addcr</filename>, <filename>authend</filename>,
+<filename>authstate</filename>, <filename>courieresmtp</filename>,
+<filename>courieresmtpd</filename>, <filename>courierfax</filename>,
+<filename>courierdeliver</filename>, <filename>courierlocal</filename>,
+<filename>courieruucp</filename>, <filename>perlfilter</filename>,
+<filename>dupfilter</filename>.</para>
 
 </sect2>
@@ -9,9 +47,95 @@
 <sect2><title>Description</title>
 
-<sect3><title>item1</title>
-<para><command>item1</command> does this</para></sect3>
+<sect3><title>cancelmsg</title>
+<para><command>cancelmsg</command> removes a message from the mail queue.</para></sect3>
 
-<sect3><title>item2</title>
-<para><filename>item2</filename> does that</para></sect3>
+<sect3><title>couriermlm</title>
+<para><filename>couriermlm</filename> is the Courier mailing list manager.</para></sect3>
+
+<sect3><title>lockmail</title>
+<para><filename>lockmail</filename> is a helper utility for working with mailbox files..</para></sect3>
+
+<sect3><title>mailbot</title>
+<para><filename>mailbot</filename> reads an E-mail message on standard input and creates an E-mail message
+replying to the original message's sender..</para></sect3>
+
+<sect3><title>maildirkw</title>
+<para><filename>maildirkw</filename> modifies Courier-IMAP compatible maildir message keywords.</para></sect3>
+
+<sect3><title>maildrop</title>
+<para><filename>maildrop</filename> is a replacement local mail delivery agent that includes a mail filtering
+language.</para></sect3>
+
+<sect3><title>mailq</title>
+<para><filename>mailq</filename> displays  a list of all messages that have not been delivered yet.</para></sect3>
+
+<sect3><title>reformail</title>
+<para><filename>reformail</filename> program reads a message on standard input, reformats it in some way,
+ and writes the message to standard output.</para></sect3>
+
+<sect3><title>reformime</title>
+<para><filename>reformime</filename> is a utility for reformatting MIME messages.</para></sect3>
+
+<sect3><title>sendmail</title>
+<para><filename>sendmail</filename> command reads an E-mail message and delivers the message to its recipients.
+This sendmail command is part of the Courier mail server, although it attempts to emulate the behavior of the
+original sendmail MTA.</para></sect3>
+
+<sect3><title>testmxlookup</title>
+<para><filename>testmxlookup</filename> lists the names and IP addresses of mail relays that receive mail for the
+domain.  This is useful in diagnosing mail delivery problems..</para></sect3>
+
+<sect3><title>courier</title>
+<para><filename>courier</filename> Courier is a modular multi-protocol E-mail transport agent. The courier
+command is an administrative command, and most of its options are only available to the superuser..</para></sect3>
+
+<sect3><title>courierfilter</title>
+<para><filename>courierfilter</filename> commands install or uninstall global mail filters. Global mail filters
+are used to selectively block unwanted mail.</para></sect3>
+
+<sect3><title>filterctl</title>
+<para><filename>filterctl</filename> commands install or uninstall global mail filters. Global mail filters are
+used to selectively block unwanted mail.</para></sect3>
+
+<sect3><title>makeacceptmailfor</title>
+<para><filename>makeacceptmailfor</filename> Build a list of domains to accept mail for from the
+<filename>/etc/courier/esmtpacceptmailfor.dir</filename>directory.</para></sect3>
+
+<sect3><title>makealiases</title>
+<para><filename>makealiases</filename> Build a list of aliases from <filename>/etc/courier/aliases</filename>
+or <filename>/etc/courier/aliasdir</filename> directories.</para></sect3>
+
+<sect3><title>makehosteddomains</title>
+<para><filename>makehostedomains</filename> Build a database of hosted domains from <filename>hosteddomains</filename>
+.</para></sect3>
+
+<sect3><title>makepercentrelay</title>
+<para><filename>makepercentrelay</filename> Build a list of %-relayed domains from <filename>percentrelay.dir</filename>
+directory.</para></sect3>
+
+<sect3><title>makesmtpaccess</title>
+<para><filename>makesmtpacces</filename> Build ESMTP server access file from <filename>/etc/courier/smtpaccess</filename>
+directory.</para></sect3>
+
+<sect3><title>makesmtpaccess-msa</title>
+<para><filename>makesmtpaccess-msa</filename> Build ESMTP server access file from <filename>/etc/courier/smtpaccess</filename>
+directory. This esmtp list is for the MSA protocol.</para></sect3>
+
+<sect3><title>makeuucpneighbors</title>
+<para><filename>makeuucpneighbors</filename> Builds a list of uucp recipient's using <filename>/etc/courier/uucpneighbors
+</filename>.</para></sect3>
+
+<sect3><title>showconfig</title>
+<para><filename>showconfig</filename> Shows the current Courier configuration.</para></sect3>
+
+<sect3><title>showmodules</title>
+<para><filename>showmodules</filename> Shows the current Courier modules.</para></sect3>
+
+<sect3><title>authdaemon</title>
+<para><filename>authdaemon</filename> Courier Authentication Library.</para></sect3>
+
+<sect3><title> </title>
+<para><filename> </filename> .</para></sect3>
+
 
 </sect2>
Index: server/mail/courier/courier-exp.xml
===================================================================
--- server/mail/courier/courier-exp.xml	(revision 95079c366bbab2ef8182e1ed01ece953b97fa2f1)
+++ server/mail/courier/courier-exp.xml	(revision 1a1da481fe957e332f6c65bd37c787ef9de25464)
@@ -2,26 +2,42 @@
 <title>Command explanations</title>
 
-<para><command>--sysconfdir=/etc/courier</command> : This switch does something.</para>
+<para><command>--sysconfdir=/etc/courier</command> : Specifies the directory where Courier's configuration
+files are installed.</para>
 
-<para><command>--with-piddir=/var/run</command> : This switch does something.</para>
+<para><command>--with-piddir=/var/run</command> : Specfies the directory where Courier's pid files are stored
+when Courier is active.</para>
 
-<para><command>--libexecdir=/usr/libexec</command> : This switch does something.</para>
+<para><command>--libexecdir=/usr/libexec</command> : libexecdir contains programs and libraries that cannot
+be directly executed from the command line.</para>
 
-<para><command>--datadir=/usr/share/courier</command> : This switch does something.</para>
+<para><command>--datadir=/usr/share/courier</command> : Specifies the directory where miscellaneous shell
+scripts, Perl scripts, and data files will be installed.</para>
 
-<para><command> --localstatedir=/var/lib/courier</command> : This switch does something.</para>
+<para><command> --localstatedir=/var/lib/courier</command> : specifies the directory that will hold the mail 
+queue, and other temporary data. This option defaults to the subdirectory "var" in the directory specified
+by the --prefix option.</para>
 
-<para><command>--disable-root-check</command> : This switch does something.</para>
+<para><command>--disable-root-check</command> : Allows Courier to be built as the root user.</para>
 
-<para><command>--with-db=db</command> : This switch does something.</para>
+<para><command>--with-db=gbbm</command> : Courier requires either the GDBM or the DB database library.
+GDBM is used if both are present. This option forces the selection of the database library.
+</para>
 
-<para><command>--with-mailuser=courier</command> : This switch does something.</para>
+<!-- # Note - Courier will build fine with <xref linkend="db"/>, but all the database files
+will not be created correctly -->
 
-<para><command>--withmailgroup=courier</command> : This switch does something.</para>
+<para><command>--with-mailuser=courier</command> : All except two Courier daemons run as a non-privileged
+user. This option specifies the userid that Courier will install and run as.</para>
 
-<para><command>--enable-workarounds-for-imap-client-bugs</command> : This 
-switch does something.</para>
+<para><command>--withmailgroup=courier</command> : like --with-mailuser, but specifies the group ID.</para>
 
-<para><command>--with-ispell=/usr/bin/aspell</command> : This switch does something.</para>
+<para><command>--enable-workarounds-for-imap-client-bugs</command> : there are several confirmed bugs in some
+IMAP clients that do not properly implement the IMAP4rev1 protocol. This option enables some workarounds for
+those buggy IMAP clients. NOTE: make check will fail if this option is used. You should first configure
+without this option, and if all post-configuration tests succeed, rerun configure with this option and recompile.</para>
+
+<para><command>--with-ispell=/usr/bin/aspell</command> : Courier's webmail server can use spell checking, if
+the aspell program is available. If configure finds ispell, spell checking is enabled. If aspell is not in the
+current search path, use --with-ispell=program to explicitly set the location of aspell.</para>
 
 </sect2>
Index: server/mail/courier/courier-inst.xml
===================================================================
--- server/mail/courier/courier-inst.xml	(revision 95079c366bbab2ef8182e1ed01ece953b97fa2f1)
+++ server/mail/courier/courier-inst.xml	(revision 1a1da481fe957e332f6c65bd37c787ef9de25464)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Installation of <application>courier</application></title>
+<title>Installation of <application>Courier</application></title>
 
 <para> Before you compile the program, you need to create users and groups that 
@@ -14,5 +14,5 @@
 <screen><userinput><command>./configure ./configure --prefix=/usr --sysconfdir=/etc/courier --with-piddir=/var/run \
 --libexecdir=/usr/libexec --datadir=/usr/share/courier \
---localstatedir=/var/lib/courier --disable-root-check --with-db=db \
+--localstatedir=/var/lib/courier --disable-root-check --with-db=gdbm \
 --with-mailuser=courier --withmailgroup=courier \
 --enable-workarounds-for-imap-client-bugs \
Index: server/mail/courier/courier-intro.xml
===================================================================
--- server/mail/courier/courier-intro.xml	(revision 95079c366bbab2ef8182e1ed01ece953b97fa2f1)
+++ server/mail/courier/courier-intro.xml	(revision 1a1da481fe957e332f6c65bd37c787ef9de25464)
@@ -1,14 +1,14 @@
 <sect2>
-<title>Introduction to <application>courier</application></title>
+<title>Introduction to <application>Courier</application></title>
 
-<para>The <application>courier</application> package contains a Mail Transport 
+<para>The <application>Courier</application> package contains a Mail Transport 
 Agent (<acronym>MTA</acronym>). This is useful for sending email to other users 
 of your host machine. It can also be configured to be a central mail server for
-your domain or a mail relay agent. The <application>courier</application> 
+your domain or a mail relay agent. The <application>Courier</application> 
 packages also includes a web-based email interface, <acronym>IMAP</acronym>,
 <acronym>IMAP-SSL</acronym>, <acronym>POP3</acronym>, and
 <acronym>POP3</acronym>-<acronym>SSL</acronym>. The configuration
 listed below will allow users with <acronym>PAM</acronym> and virtual-users in 
-a <application>Mysql</application> Database access to email.</para>
+a <application>MySQL</application> Database access to email.</para>
 
 
@@ -22,10 +22,12 @@
 </sect3>
 
-<sect3><title><application>courier</application> dependencies</title>
+<sect3><title><application>Courier</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="db"/>, <xref linkend="Linux_PAM"/>, <xref
-linkend="openssl"/> and <xref linkend="apache"/></para></sect4>
+<para><xref linkend="gdbm"/> or <xref linkend="db"/></para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="mysql"/> and <xref linkend="aspell"/></para></sect4>
+<para><xref linkend="mysql"/> or <xref linkend="postgres"/>, 
+<xref linkend="Linux_PAM"/>, <xref linkend="openssl"/>, 
+<xref linkend="libfam"/>, <xref linkend="openldap"/>, expect, 
+<xref linkend="apache"/> and <xref linkend="aspell"/></para></sect4>
 </sect3>
 
Index: server/mail/courier/courier.ent
===================================================================
--- server/mail/courier/courier.ent	(revision 95079c366bbab2ef8182e1ed01ece953b97fa2f1)
+++ server/mail/courier/courier.ent	(revision 1a1da481fe957e332f6c65bd37c787ef9de25464)
@@ -6,7 +6,7 @@
 <!ENTITY courier-config SYSTEM "courier-config.xml">
 <!ENTITY courier-buildsize "55 MB">
-<!ENTITY courier-version "0.41.0">
-<!ENTITY courier-download-http "http://osdn.dl.sourceforge.net/sourceforge/courier/courier-0.41.0.tar.bz2">
-<!ENTITY courier-download-ftp "ftp://courier.sourceforge.net/courier/courier-0.41.0.tar.bz2">
-<!ENTITY courier-size "3.1 MB">
+<!ENTITY courier-version "0.42.2">
+<!ENTITY courier-download-http "http://osdn.dl.sourceforge.net/sourceforge/courier/courier-0.42.2.tar.bz2">
+<!ENTITY courier-download-ftp "ftp://courier.sourceforge.net/courier/courier-0.42.2.tar.bz2">
+<!ENTITY courier-size "3.3 MB">
 <!ENTITY courier-time "">
