Index: server/mail/courier.xml
===================================================================
--- server/mail/courier.xml	(revision 17143f330f408687c68961ba6a51193fdc9ae26f)
+++ server/mail/courier.xml	(revision c6301dc5c1692cbfc3f3e01187b6a50bdf603cfc)
@@ -72,5 +72,5 @@
 <title>Installation of <application>Courier</application></title>
 <note><para><application>Courier's</application> tarball must be extacted as an
-unpriveleged user or the configure script will fail.</para></note>
+unprivileged user or the configure script will fail.</para></note>
  
 <para>Before you compile the program, you need to create the courier user 
@@ -98,5 +98,5 @@
 install -d /var/lock/subsys -o root -g root -m755</command></userinput></screen>
 
-<para>Build <application>Courier</application> as an unpriveledged user
+<para>Build <application>Courier</application> as an unprivileged user
 with the following commands:</para>
 
@@ -254,5 +254,5 @@
 domains, you must add them to 
 <filename>/etc/courier/hosteddomains</filename>. This file should exist 
-wether you need a hosted domain list or not:</para>
+whether you need a hosted domain list or not:</para>
 
 <screen><userinput role="root"><command>touch /etc/courier/hosteddomains</command></userinput></screen>
@@ -282,7 +282,7 @@
 mkpop3dcert</command></userinput></screen>
 
-<para>All of courier's configuration files reside in the directory
-<filename class="directory">/etc/courier/</filename>.  For each service
-<acronym>SMTP</acronym>, <acronym>POP3</acronym> and
+<para>All of <application>Courier</application>'s configuration files reside 
+in the directory <filename class="directory">/etc/courier/</filename>.  For 
+each service <acronym>SMTP</acronym>, <acronym>POP3</acronym> and
 <acronym>IMAP</acronym>, you will have a standard config file, and an 
 <acronym>SSL</acronym> config file.  For each service that you
@@ -307,15 +307,16 @@
 
 <para>You will also need to copy the <filename>webmail</filename> file from
-<filename>/usr/lib/courier/courier/webmail</filename> to your <filename>cgi-bin
-</filename> directory of your <application>Apache</application>
-server.</para>
+<filename>/usr/lib/courier/courier/webmail</filename> to the 
+<filename class='directory'>cgi-bin</filename> directory of your 
+<application>Apache</application> server.</para>
 
 <screen><userinput role="root"><command>cp -a /usr/lib/courier/courier/webmail/webmail /srv/www/cgi-bin</command></userinput></screen>
 
 <para>You will then need to copy the images to a directory under your
-<filename>htdocs</filename> directory of your
+<filename class='directory'>htdocs</filename> directory of your
 <application>Apache</application> server. The directory needs to be named 
-<filename>webmail</filename> or you need to specify it during the configure
-phase with <parameter>--enable-imageurl=<replaceable>[URL]</replaceable></parameter>.</para>
+<filename class='directory'>webmail</filename> or you need to specify it 
+during the configure phase with 
+<parameter>--enable-imageurl=<replaceable>[URL]</replaceable></parameter>.</para>
 
 <screen><userinput role="root"><command>cp -a /usr/share/courier/sqwebmail/images /srv/www/htdocs/webmail</command></userinput></screen>
@@ -343,5 +344,5 @@
 <screen><userinput role="root"><command>touch /etc/courier/webadmin/unsecureok</command></userinput></screen>
 
-<para>If you use <application>LinuxPAM</application> on your system, 
+<para>If you use <application>Linux-PAM</application> on your system, 
 you will need to create the <acronym>PAM</acronym> configuration files:</para>
 
@@ -383,5 +384,6 @@
 <command>EOF</command></userinput></screen>
 
-<para id="courier-init">Finally, if you wish to start courier at boot, install 
+<para id="courier-init">Finally, if you wish to start the 
+<application>Courier</application> server at boot, install 
 the <filename>/etc/rc.d/init.d/courier</filename> bootscript included in the
 <xref linkend="intro-important-bootscripts"/> package.</para>
@@ -515,6 +517,6 @@
 userdbpw, vchkpw2userdb, webgpg, webmaild</seg>
 
-<seg>/etc/courier, /usr/lib/courier, /usr/share/courier and
-/var/lib/courier</seg>
+<seg>/etc/courier, /usr/lib/courier, /usr/share/courier, /var/lib/courier, 
+/var/lock/subsys, /var/run/courier and /var/spool/courier</seg>
 
 </seglistitem>
@@ -535,6 +537,6 @@
 <varlistentry id="courier">
 <term><command>courier</command></term>
-<listitem><para>administrative command used to control the courier
-scheduling engine.</para>
+<listitem><para>administrative command used to control the 
+<application>Courier</application> scheduling engine.</para>
 <indexterm zone="courier-package courier">
 <primary sortas="b-courier">courier</primary></indexterm>
@@ -587,5 +589,6 @@
 <varlistentry id="courierperlfilter">
 <term><command>courierperlfilter</command></term>
-<listitem><para>a sample filter written in perl.</para>
+<listitem><para>a sample filter written in 
+<application>Perl</application>.</para>
 <indexterm zone="courier-package courierperlfilter">
 <primary sortas="b-courierperlfilter">courierperlfilter</primary></indexterm>
@@ -595,5 +598,6 @@
 <varlistentry id="courierpop3d">
 <term><command>courierpop3d</command></term>
-<listitem><para>courier pop3 server.</para>
+<listitem><para>is a <application>Courier</application> 
+<acronym>POP</acronym>3 server.</para>
 <indexterm zone="courier-package courierpop3d">
 <primary sortas="b-courierpop3d">courierpop3d</primary></indexterm>
@@ -603,6 +607,6 @@
 <varlistentry id="courierpop3login">
 <term><command>courierpop3login</command></term>
-<listitem><para>reads the POP3 userid and password and passes them to the
-authentication modules.</para>
+<listitem><para>reads the <acronym>POP</acronym>3 userid and password and 
+passes them to the authentication modules.</para>
 <indexterm zone="courier-package courierpop3login">
 <primary sortas="b-courierpop3login">courierpop3login</primary></indexterm>
@@ -613,5 +617,6 @@
 <term><command>couriertcpd</command></term>
 <listitem><para>accepts incoming network connections, and runs other
-courier programs after establishing each network connection.</para>
+<application>Courier</application> programs after establishing each network 
+connection.</para>
 <indexterm zone="courier-package couriertcpd">
 <primary sortas="b-couriertcpd">couriertcpd</primary></indexterm>
@@ -621,6 +626,6 @@
 <varlistentry id="couriertls">
 <term><command>couriertls</command></term>
-<listitem><para>used by applications to encrypt a network connection
-using SSL/TLS</para>
+<listitem><para>is used by applications to encrypt a network connection
+using <acronym>SSL</acronym>/<acronym>TLS</acronym>.</para>
 <indexterm zone="courier-package couriertls">
 <primary sortas="b-couriertls">couriertls</primary></indexterm>
@@ -630,6 +635,6 @@
 <varlistentry id="dotforward">
 <term><command>dotforward</command></term>
-<listitem><para>a compatibility module that reads forwarding
-instructions in $HOME/.forward.</para>
+<listitem><para>is a compatibility module that reads forwarding
+instructions in <filename>$HOME/.forward</filename>.</para>
 <indexterm zone="courier-package dotforward">
 <primary sortas="b-dotforward">dotforward</primary></indexterm>
@@ -639,5 +644,5 @@
 <varlistentry id="dupfilter">
 <term><command>dupfilter</command></term>
-<listitem><para>a threaded filter that tries to block junk E-mail by
+<listitem><para>is a threaded filter that tries to block junk E-mail by
 attempting to detect multiple copies of the same message, which are
 rejected.</para>
@@ -649,5 +654,5 @@
 <varlistentry id="esmtpd">
 <term><command>esmtpd</command></term>
-<listitem><para>a control script for courieresmtpd.</para>
+<listitem><para>is a control script for courieresmtpd.</para>
 <indexterm zone="courier-package esmtpd">
 <primary sortas="b-esmtpd">esmtpd</primary></indexterm>
@@ -657,5 +662,5 @@
 <varlistentry id="esmtpd-msa">
 <term><command>esmtpd-msa</command></term>
-<listitem><para>a control script for courieresmtpd, but adds message
+<listitem><para>is a control script for courieresmtpd, but adds message
 submission port 587 for the <acronym>MSA</acronym> protocol.</para>
 <indexterm zone="courier-package esmtpd-msa">
@@ -674,5 +679,7 @@
 <varlistentry id="imapd">
 <term><command>imapd</command></term>
-<listitem><para>the Courier-IMAP server.</para>
+<listitem><para>is the 
+<application>Courier</application>-<acronym>IMAP</acronym> 
+server.</para>
 <indexterm zone="courier-package imapd">
 <primary sortas="b-imapd">imapd</primary></indexterm>
@@ -682,5 +689,5 @@
 <varlistentry id="lockmail">
 <term><command>lockmail</command></term>
-<listitem><para>a helper utility for locking  mailbox files.</para>
+<listitem><para>is a helper utility for locking  mailbox files.</para>
 <indexterm zone="courier-package lockmail">
 <primary sortas="b-lockmail">lockmail</primary></indexterm>
@@ -690,5 +697,5 @@
 <varlistentry id="mailbot">
 <term><command>mailbot</command></term>
-<listitem><para>a <acronym>MIME</acronym>-aware autoresponder utility.</para>
+<listitem><para>is a <acronym>MIME</acronym>-aware autoresponder utility.</para>
 <indexterm zone="courier-package mailbot">
 <primary sortas="b-mailbot">mailbot</primary></indexterm>
@@ -706,6 +713,7 @@
 <varlistentry id="maildirkw">
 <term><command>maildirkw</command></term>
-<listitem><para>modifies Courier-IMAP compatible maildir message
-keywords.</para>
+<listitem><para>modifies 
+<application>Courier</application>-<acronym>IMAP</acronym> compatible maildir 
+message keywords.</para>
 <indexterm zone="courier-package maildirkw">
 <primary sortas="b-maildirkw">maildirkw</primary></indexterm>
@@ -723,5 +731,5 @@
 <varlistentry id="maildrop">
 <term><command>maildrop</command></term>
-<listitem><para>a replacement local mail delivery agent that includes a
+<listitem><para>is a replacement local mail delivery agent that includes a 
 mail filtering language.</para>
 <indexterm zone="courier-package maildrop">
@@ -760,6 +768,6 @@
 <varlistentry id="makedat">
 <term><command>makedat</command></term>
-<listitem><para>a utility to create GDBM or DB files from plain text
-files.</para>
+<listitem><para>is a utility to create <application>GDBM</application> or 
+<application>DB</application> files from plain text files.</para>
 <indexterm zone="courier-package makedat">
 <primary sortas="b-makedat">makedat</primary></indexterm>
@@ -796,5 +804,5 @@
 <varlistentry id="makesmtpaccess">
 <term><command>makesmtpaccess</command></term>
-<listitem><para>builds <acronym>ESMTP</acronym> server access file from the 
+<listitem><para>builds <acronym>ESMTP</acronym> server access files from the 
 <filename class="directory">/etc/courier/smtpaccess</filename> 
 directory.</para>
@@ -806,5 +814,5 @@
 <varlistentry id="makesmtpaccess-msa">
 <term><command>makesmtpaccess-msa</command></term>
-<listitem><para>builds <acronym>ESMTP</acronym> server access file from the 
+<listitem><para>builds <acronym>ESMTP</acronym> server access files from the 
 <filename class="directory">/etc/courier/smtpaccess</filename> directory. 
 This esmtp list is for the <acronym>MSA</acronym> protocol.</para>
@@ -816,5 +824,5 @@
 <varlistentry id="makeuserdb">
 <term><command>makeuserdb</command></term>
-<listitem><para>builds user/password db from the contents
+<listitem><para>builds a user/password db from the contents
 of <filename class="directory">/tools/etc/courier/userdb</filename>.</para>
 <indexterm zone="courier-package makeuserdb">
@@ -861,5 +869,5 @@
 <varlistentry id="pop3d">
 <term><command>pop3d</command></term>
-<listitem><para>a wrapper script for <command>couriertcpd</command> to
+<listitem><para>is a wrapper script for <command>couriertcpd</command> to
 start and stop the <acronym>POP3</acronym> service.</para>
 <indexterm zone="courier-package pop3d">
@@ -870,5 +878,5 @@
 <varlistentry id="pop3d-ssl">
 <term><command>pop3d-ssl</command></term>
-<listitem><para>a wrapper script for <command>couriertcpd</command> to
+<listitem><para>is a wrapper script for <command>couriertcpd</command> to
 start and stop the <acronym>POP3</acronym> over <acronym>SSL</acronym> 
 service.</para>
@@ -880,5 +888,6 @@
 <varlistentry id="preline">
 <term><command>preline</command></term>
-<listitem><para>prepends legacy mbox headers to mail messages.</para>
+<listitem><para>prepends legacy <filename>mbox</filename> headers to mail 
+messages.</para>
 <indexterm zone="courier-package preline">
 <primary sortas="b-preline">preline</primary></indexterm>
@@ -897,5 +906,6 @@
 <varlistentry id="reformime">
 <term><command>reformime</command></term>
-<listitem><para>a utility for reformatting MIME messages.</para>
+<listitem><para>is a utility for reformatting <acronym>MIME</acronym> 
+messages.</para>
 <indexterm zone="courier-package reformime">
 <primary sortas="b-reformime">reformime</primary></indexterm>
@@ -905,5 +915,5 @@
 <varlistentry id="sendmail-courier">
 <term><command>sendmail</command></term>
-<listitem><para>reads an email message and delivers the message to it's
+<listitem><para>reads an email message and delivers the message to its
 recipients.</para>
 <indexterm zone="courier-package sendmail-courier">
@@ -914,5 +924,5 @@
 <varlistentry id="submit">
 <term><command>submit</command></term>
-<listitem><para>submits messages to <application>Courier</application>for 
+<listitem><para>submits messages to <application>Courier</application> for 
 processing.</para>
 <indexterm zone="courier-package submit">
@@ -932,5 +942,5 @@
 <varlistentry id="userdb">
 <term><command>userdb</command></term>
-<listitem><para>a script to individually manipulate entries in
+<listitem><para>is a script to individually manipulate entries in
 <filename>/tools/etc/courier/userdb.</filename></para>
 <indexterm zone="courier-package userdb">
