Index: basicnet/netprogs/ncpfs/ncpfs-config.xml
===================================================================
--- basicnet/netprogs/ncpfs/ncpfs-config.xml	(revision d7c254a3211fdc0c5c5a6f4ead3bec80f2541645)
+++ basicnet/netprogs/ncpfs/ncpfs-config.xml	(revision c442d195794914ce7d05d5a0b71f15fc56078f21)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring nfs-utils</title>
+<title>Configuring <application>nfs-utils</application></title>
 
 <sect3><title>Config files</title>
@@ -9,12 +9,12 @@
 
 <para>A config file <filename>~/.nwclient</filename> should be placed
-in the home directory of each user that intends to use ncpfs.
-The permissions on this file should be set to 600, for obvious security
-reasons.  The configuration file should contain a single line
+in the home directory of each user that intends to use <application>ncpfs
+</application>. The permissions on this file should be set to 600, for obvious 
+security reasons.  The configuration file should contain a single line
 per server that the user will use.  Each line should contain
 the server name, the user name, and optionally the password.  Below is a
 sample <filename>.nwclient</filename> file.</para>
 
-<para><screen># Begin example <filename>~/.nwclient</filename> config file
+<screen><userinput># Begin example <filename>~/.nwclient</filename> config file
 
 Server1/User1 Password
@@ -22,5 +22,5 @@
 Server2/Guest1 -
 
-# End example .nwclient config file</screen></para>
+# End example .nwclient config file</userinput></screen>
 
 <para>The syntax for the <filename>.nwclient</filename> file is simple,
@@ -30,8 +30,8 @@
 after the username.  If this space is substituted by a tab or multiple 
 spaces, you will not get the expected results when attempting to use 
-the ncpfs tools.  If no password is supplied, the client utilities will 
-ask for a password when it is needed.  If no password is needed, for 
-instance when using a guest account, a single '-' should be put in 
-place of a password.</para>
+the <application>ncpfs</application> tools.  If no password is supplied, 
+the client utilities will ask for a password when it is needed.  If no 
+password is needed, for instance when using a guest account, a single '-' 
+should be put in place of a password.</para>
 
 <para>It should be noted that the ncpmount is not intended to mount
@@ -41,10 +41,11 @@
 under one mount point uses only one client connection.</para>
 
-<para>If you need to set up the IPX protocol at boot, you can create the 
-following scripts.  These scripts assume IPX will be set up on eth0  
+<para>If you need to set up the <acronym>IPX</acronym> protocol at boot, 
+you can create the following scripts.  These scripts assume <acronym>IPX
+</acronym> will be set up on <emphasis role="strong">eth0</emphasis>  
 and the network frame type is 802.2.  You should confirm that these 
 are the correct settings and adjust as necessary.</para>
 
-<para><screen>cat &gt; /etc/sysconfig/network-devices/ifup-ipx0 &lt;&lt; "EOF"
+<screen><userinput><command>cat &gt; /etc/sysconfig/network-devices/ifup-ipx0 &lt;&lt; "EOF"</command>
 #!/bin/sh
 # Begin /etc/sysconfig/network-devices/ifup-ipx0
@@ -59,6 +60,6 @@
 
 # End /etc/sysconfig/network-devices/ifup-ipx0
-EOF
-cat &gt; /etc/sysconfig/network-devices/ifdown-ipx0 &lt;&lt; "EOF"
+<command>EOF
+cat &gt; /etc/sysconfig/network-devices/ifdown-ipx0 &lt;&lt; "EOF"</command>
 #!/bin/sh
 # Begin /etc/sysconfig/network-devices/ifdown-ipx0
@@ -73,8 +74,8 @@
 
 # End /etc/sysconfig/network-devices/ifdown-ipx0
-EOF
+<command>EOF
 echo "ONBOOT=yes" &gt; /etc/sysconfig/network-devices/ifconfig.ipx0
 chmod 755 /etc/sysconfig/network-devices/ifup-ipx0
-chmod 755 /etc/sysconfig/network-devices/ifdown-ipx0</screen></para>
+chmod 755 /etc/sysconfig/network-devices/ifdown-ipx0</command></userinput></screen>
 
 </sect3>
Index: basicnet/netprogs/ncpfs/ncpfs-desc.xml
===================================================================
--- basicnet/netprogs/ncpfs/ncpfs-desc.xml	(revision d7c254a3211fdc0c5c5a6f4ead3bec80f2541645)
+++ basicnet/netprogs/ncpfs/ncpfs-desc.xml	(revision c442d195794914ce7d05d5a0b71f15fc56078f21)
@@ -14,5 +14,5 @@
 nwtrustee2, nwuserlist, amd nwvolinfo</filename>.</para></listitem>
 
-<listitem><para><emphasis>IPX Interface Utilities:</emphasis> 
+<listitem><para><emphasis><acronym>IPX</acronym> Interface Utilities:</emphasis> 
 <filename> ipx_cmd, ipx_configure, ipx_interface, ipx_internal_net, 
 and ipx_route</filename>.</para></listitem>
Index: postlfs/config/bootdisk.xml
===================================================================
--- postlfs/config/bootdisk.xml	(revision d7c254a3211fdc0c5c5a6f4ead3bec80f2541645)
+++ postlfs/config/bootdisk.xml	(revision c442d195794914ce7d05d5a0b71f15fc56078f21)
@@ -220,7 +220,7 @@
 <filename>lost+found</filename> directory, which is not needed because
 it is only used by <command>fsck</command>.  Since <command>fsck</command> 
-will never be run on this file system, it is unneeded.
-
-<screen><userinput><command>rmdir /mnt/loop1/lost+found/</command></userinput></screen></para>
+will never be run on this file system, it is unneeded.</para>
+
+<screen><userinput><command>rmdir /mnt/loop1/lost+found/</command></userinput></screen>
 
 <para>Now make a minimal set of directories.</para>
Index: postlfs/config/vimrc.xml
===================================================================
--- postlfs/config/vimrc.xml	(revision d7c254a3211fdc0c5c5a6f4ead3bec80f2541645)
+++ postlfs/config/vimrc.xml	(revision c442d195794914ce7d05d5a0b71f15fc56078f21)
@@ -32,5 +32,5 @@
 you do copy anything directly from <filename>/etc/skel</filename>.</para>
 
-<para><screen>" Begin .vimrc
+<screen>" Begin .vimrc
 
 set nocompatible
@@ -45,5 +45,5 @@
 set noexpandtab
 
-" End .vimrc</screen></para>
+" End .vimrc</screen>
 
 <para>A <acronym>FAQ</acronym> on the lfs mailing lists regards the 
Index: postlfs/security/pam/linux_pam-inst.xml
===================================================================
--- postlfs/security/pam/linux_pam-inst.xml	(revision d7c254a3211fdc0c5c5a6f4ead3bec80f2541645)
+++ postlfs/security/pam/linux_pam-inst.xml	(revision c442d195794914ce7d05d5a0b71f15fc56078f21)
@@ -6,5 +6,5 @@
 running the following commands:</para>
 
-<para><screen><userinput><command>./configure --enable-static-libpam --with-mailspool=/var/mail \
+<screen><userinput><command>./configure --enable-static-libpam --with-mailspool=/var/mail \
 --enable-read-both-confs --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
@@ -13,5 +13,5 @@
 ln -sf ../../lib/libpam.so.&Linux_PAM-version; /usr/lib/libpam.so &amp;&amp;
 ln -sf ../../lib/libpam_misc.so.&Linux_PAM-version; /usr/lib/libpam_misc.so &amp;&amp;
-ln -sf ../../lib/libpamc.so.&Linux_PAM-version; /usr/lib/libpamc.so</command></userinput></screen></para>
+ln -sf ../../lib/libpamc.so.&Linux_PAM-version; /usr/lib/libpamc.so</command></userinput></screen>
 
 
Index: postlfs/security/shadow.xml
===================================================================
--- postlfs/security/shadow.xml	(revision d7c254a3211fdc0c5c5a6f4ead3bec80f2541645)
+++ postlfs/security/shadow.xml	(revision c442d195794914ce7d05d5a0b71f15fc56078f21)
@@ -13,7 +13,6 @@
 <screen><userinput>#MD5_CRYPT_ENAB no</userinput></screen>
 to read:
-<screen><userinput>MD5_CRYPT_ENAB yes</userinput></screen></para>
-
-<para>Passwords created after this change will be encrypted using MD5
+<screen><userinput>MD5_CRYPT_ENAB yes</userinput></screen>
+Passwords created after this change will be encrypted using MD5
 instead of using DES encryption.</para>
 
Index: postlfs/security/shadow/shadow-inst.xml
===================================================================
--- postlfs/security/shadow/shadow-inst.xml	(revision d7c254a3211fdc0c5c5a6f4ead3bec80f2541645)
+++ postlfs/security/shadow/shadow-inst.xml	(revision c442d195794914ce7d05d5a0b71f15fc56078f21)
@@ -3,6 +3,12 @@
 <application><acronym>PAM</acronym></application></title>
 
-<screen>shadow requires:
-<xref linkend="Linux_PAM"/></screen>
+<sect3><title><application>template</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="Linux_PAM"/></para></sect4>
+</sect3>
+</sect2>
+
+<sect2>
+<title>Installation of <application>shadow</application></title>
 
 <para>Download the patch for shadow from <ulink url="&patch-root;"/>.</para>
@@ -10,5 +16,5 @@
 <para>Reinstall shadow by running the following commands:</para>
 
-<para><screen><userinput><command>patch -Np1 -i ../shadow-4.0.3-pamfix-1.patch &amp;&amp;
+<screen><userinput><command>patch -Np1 -i ../shadow-4.0.3-pamfix-1.patch &amp;&amp;
 LDFLAGS="-lpam -lpam_misc" ./configure --prefix=/usr --libdir=/usr/lib \
 --enable-shared --with-libpam &amp;&amp;
@@ -21,5 +27,5 @@
 ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so &amp;&amp;
 ln -sf ../../lib/libmisc.so.0 /usr/lib/libmisc.so &amp;&amp;
-cp debian/securetty /etc/securetty</command></userinput></screen></para>
+cp debian/securetty /etc/securetty</command></userinput></screen>
 
 
Index: server/mail/courier/courier-config.xml
===================================================================
--- server/mail/courier/courier-config.xml	(revision d7c254a3211fdc0c5c5a6f4ead3bec80f2541645)
+++ server/mail/courier/courier-config.xml	(revision c442d195794914ce7d05d5a0b71f15fc56078f21)
@@ -9,5 +9,5 @@
 
 <para>Make the following changes in this file if you are utilizing
-<application>MySQL</application>:
+<application>MySQL</application>:</para>
 <screen><userinput>MYSQL_SERVER            localhost
 MYSQL_USERNAME          courier
@@ -19,8 +19,8 @@
 MYSQL_CLEAR_PWFIELD     clear
 DEFAULT DOMAIN          (your domain)
-MYSQL_QUOTA_FIELD       quota</userinput></screen></para>
-
-
-<para>If you utilize <application>PAM</application>:
+MYSQL_QUOTA_FIELD       quota</userinput></screen>
+
+
+<para>If you utilize <application>PAM</application>:</para>
 <screen><userinput><command>cat &gt; /etc/pam.d/esmtp &lt;&lt; "EOF</command>
 # Begin /etc/pam.d/esmtp
@@ -58,7 +58,198 @@
 
 # End /etc/pam.d/webmail
-<command>EOF</command></userinput></screen></para>
+<command>EOF</command></userinput></screen>
+
+<para>This command will create the mysql database for authentication:</para>
+
+<screen><userinput><command>mysqladmin -uroot -p{password} create courier-mail</command></userinput></screen>
+
+<para>This command will setup the table users for the courier-mail
+database:</para>
+
+<screen><userinput><command>mysql -uroot -p{password} courier-mail
+
+        CREATE TABLE users (
+        id                    char(128) DEFAULT '' NOT NULL,
+        crypt                 char(128) DEFAULT '' NOT NULL,
+        clear                 char(128) DEFAULT '' NOT NULL,
+        name                  char(128) DEFAULT '' NOT NULL,
+        uid                   int(10) unsigned DEFAULT '65534' NOT NULL,
+        gid                   int(10) unsigned DEFAULT '65534' NOT NULL,
+        home                  char(255) DEFAULT '' NOT NULL,
+        quota                 char(255) DEFAULT '' NOT NULL,
+        KEY id (id(128))
+        );</command></userinput></screen>
+
+<para>This will add the courier user that we specified earilier in the
+authmysql file:</para>
+
+<screen><userinput><command>mysql -uroot -p{password} mysql
+
+grant all privileges on *.* to courier@localhost identified by '{password}' with grant option;</command></userinput></screen>
+
+
+<para><emphasis>General Settings for Mail</emphasis></para>
+
+<para>You will need to create the following files with the contents
+specified.</para>
+
+<para><filename>/etc/courier/defaultdomain</filename></para>
+
+<screen><userinput><command>cat &gt; /etc/courier/defaultdomain &lt;&lt; "EOF"</command>
+{yourdomain}
+<command>EOF</command></userinput></screen>
+
+<para><filename>/etc/courier/locals</filename></para>
+
+
+<screen><userinput><command>cat > /etc/courier/locals << "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>
+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>
+
+
+<para>You will also need to edit the aliases file and change the
+following entry.</para>
+
+
+<para><filename>/etc/courier/aliases/system</filename></para>
+
+<screen><userinput>postmaster: {your adminstrator email}</userinput></screen>
+
+<para>If you want to deny access from some hosts from sending mail you
+will need to edit the <filename>/etc/courier/smtpaccess/default</filename>.</para>
+
+<para>After the above steps are completed you will need to run the
+following commands:</para>
+
+<screen><userinput><command>makesmtpaccess
+makehosteddomains
+makealiases</command></userinput></screen>
+
+<para><emphasis><acronym>SMTP</acronym>/<acronym>SMTMP</acronym>-<acronym>SSL
+</acronym> Configuration</emphasis></para>
+
+<para>This section will enable the <acronym>SMTP</acronym> Server from Courier</para>
+
+<para><filename>/etc/courier/esmtpd</filename></para>
+
+<screen><userinput>ESMTPDSTART=YES</userinput></screen>
+
+<para><filename>/etc/courier/esmtpd-ssl</filename></para>
+
+<screen><userinput>ESMTPDSSLSTART=YES</userinput></screen>
+
+<para><emphasis><acronym>POP</acronym>3/<acronym>POP</acronym>3-<acronym>SSL
+</acronym> Configuration</emphasis></para>
+
+<para>This section will enable the <acronym>POP3</acronym> Server from
+Courier</para>
+
+
+<para><filename>/etc/courier/pop3d</filename></para>
+
+<screen><userinput>POP3DSTART=YES</userinput></screen>
+
+<para><filename>/etc/courier/pop3d-ssl</filename></para>
+
+<screen><userinput>POP3DSLLSTART=YES</userinput></screen>
+
+<para><emphasis><acronym>IMAP</acronym>/<acronym>IMAP</acronym>-<acronym>SSL
+</acronym> Configuration</emphasis></para>
+
+<para>This section will enable the <acronym>IMAP</acronym> Server from
+Courier</para>
+
+<para><filename>/etc/courier/imapd</filename></para>
+
+<screen><userinput>IMAPDSTART=YES</userinput></screen>
+
+<para><filename>/etc/courierd/imapd-ssl</filename></para>
+
+<screen><userinput>IMAPDSSLSTART=YES</userinput></screen>
+
+<para><emphasis>Creating Maildirectories for System Users</emphasis></para>
+
+
+<para>This section will explain on how to create MailDirs for
+your system users.</para>
+
+<screen><userinput><command>cd /home/{username}
+maildirmake Maildir
+chown {username}.{username} Maildir -R</command></userinput></screen>
+
+<para><emphasis>Setup for Virtual users</emphasis></para>
+
+<para>This section will explain how to setup Maildir for your virtual
+users.</para>
+
+<screen><userinput><command>echo "vmailman:x:9000:9000:Virtual Mailman:/home/vmailman:/bin/bash" &gt;&gt; /etc/passwd
+echo "vmailman:x:9000:" &gt;&gt; /etc/group</command></userinput></screen>
+
+<para>Now to setup the maildir for these virutal users.</para>
+
+<screen><userinput><command>cd /home/vmailman
+mkdir {virtual_user}
+cd {virtual_user}
+maildirmake Maildir
+chown vmailman.vmailman Maildir -R</command></userinput></screen>
+
+<para>Add the virtual user to the MySQL database. You need to enter at
+least on version of the password either clear text or encrypted.</para>
+
+<screen><userinput><command>mysql -ucourier -p{password} courier-mail
+
+insert into users values('{virtual_users}@{domain.com},
+'{encrypted password or blank}','{clear text password or blank}',
+'{User's Name}',9000,9000,'{location of Maildir}','{Quota in Bytes'});</command></userinput></screen>
+
+<para>example</para>
+
+<screen><userinput>insert into users values ('blfsuser@linuxfromscratch.org','
+','password','BLFS User',9000,9000,'/home/vmailman/blfsuser','');</userinput></screen>
+
+<para><emphasis>Setup for Web-based Email</emphasis></para>
+
+<para>This section will explain how to setup Courier Web-based email
+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
+</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>
+
+<para>You will then need to copy the images to a folder under your
+<filename>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 <command>--enable-imageurl=/url</command>.</para>
+
+<screen><userinput><command>cp -a /usr/share/courier/sqwebmail/images /var/www/htdocs/webmail</command></userinput></screen>
+
+
 </sect3>
-
 </sect2>
 
Index: server/mail/courier/courier-exp.xml
===================================================================
--- server/mail/courier/courier-exp.xml	(revision d7c254a3211fdc0c5c5a6f4ead3bec80f2541645)
+++ server/mail/courier/courier-exp.xml	(revision c442d195794914ce7d05d5a0b71f15fc56078f21)
@@ -2,5 +2,26 @@
 <title>Command explanations</title>
 
-<para><command>COMMAND</command> : This command does something.</para>
+<para><command>--sysconfdir=/etc/courier</command> : This switch does something.</para>
+
+<para><command>--with-piddir=/var/run</command> : This switch does something.</para>
+
+<para><command>--libexecdir=/usr/libexec</command> : This switch does something.</para>
+
+<para><command>--datadir=/usr/share/courier</command> : This switch does something.</para>
+
+<para><command> --localstatedir=/var/lib/courier</command> : This switch does something.</para>
+
+<para><command>--disable-root-check</command> : This switch does something.</para>
+
+<para><command>--with-db=db</command> : This switch does something.</para>
+
+<para><command>--with-mailuser=courier</command> : This switch does something.</para>
+
+<para><command>--withmailgroup=courier</command> : This switch does something.</para>
+
+<para><command>--enable-workarounds-for-imap-client-bugs</command> : This 
+switch does something.</para>
+
+<para><command>--with-ispell=/usr/bin/aspell</command> : This switch does something.</para>
 
 </sect2>
