Index: server/mail/postfix/postfix-config.xml
===================================================================
--- server/mail/postfix/postfix-config.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ server/mail/postfix/postfix-config.xml	(revision a11e412d48a154656848dfd52fee100b38d91426)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring postfix</title>
+<title>Configuring <application>postfix</application></title>
 
 <sect3><title>Config files</title>
@@ -10,5 +10,5 @@
 <sect3><title>Configuration Information</title>
 
-<para><screen><userinput>cat &gt; /etc/aliases &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; /etc/aliases &lt;&lt; "EOF"</command>
 # Begin /etc/aliases
 
@@ -18,25 +18,28 @@
 root:             LOGIN
 # End /etc/aliases
-<userinput>EOF</userinput></screen></para>
+<command>EOF</command></userinput></screen>
 
 <para>The <filename>/etc/aliases</filename> file that was just created,
 the <filename>main.cf</filename> and the <filename>master.cf</filename>
-must be personalized for your system. The <filename>aliases</filename> file needs your 
-non-root login identity so mail addressed to root can be forwarded to 
-you at the user level.  The <filename>main.cf</filename> file needs your fully qualified 
-hostname.  All of these edits can be done 
-with sed commands entered into the console with appropriate substitutions of 
-your non-root login name for [user] and your fully qualified hostname for 
-[localhost.localdomain]. You will find the <filename>main.cf</filename> file is self documenting, so load it into your editor to make the changes you need for your situation.</para>
+must be personalized for your system. The <filename>aliases</filename> file 
+needs your non-root login identity so mail addressed to root can be forwarded 
+to you at the user level.  The <filename>main.cf</filename> file needs your 
+fully qualified hostname.  All of these edits can be done with sed commands 
+entered into the console with appropriate substitutions of your non-root 
+login name for <replaceable>[user]</replaceable> and your fully qualified 
+hostname for <replaceable>[localhost.localdomain]</replaceable>. You will 
+find the <filename>main.cf</filename> file 
+is self documenting, so load it into your editor to make the changes you need 
+for your situation.</para>
 
-<para><screen><userinput>cp /etc/aliases /etc/aliases.bak
+<screen><userinput><command>cp /etc/aliases /etc/aliases.bak
 cp /etc/postfix/main.cf /etc/postfix/main.cf.bak
 cp /etc/postfix/master.cf /etc/postfix/master.cf.bak
-sed "s/LOGIN/[user]/" /etc/aliases.bak > /etc/aliases
+sed "s/LOGIN/<replaceable>[user]</replaceable>/" /etc/aliases.bak > /etc/aliases
 sed "s/#myhostname = host.domain.tld/myhostname = \ 
-	[localhost.localdomain]/" \
+	<replaceable>[localhost.localdomain]</replaceable>/" \
 	/etc/postfix/main.cf.bak > /etc/postfix/main.cf
 /usr/bin/newaliases
-/usr/sbin/postfix start</userinput></screen></para></sect3>
+/usr/sbin/postfix start</command></userinput></screen></sect3>
 
 <sect3><title>postfix init.d script</title>
@@ -44,5 +47,5 @@
 <para>To automate the running of postfix, use following command to create the init.d script:</para>
 
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/postfix &lt;&lt; "EOF"</userinput>
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/postfix &lt;&lt; "EOF"</command>
 #!/bin/sh
 # Begin $rc_base/init.d/postfix
@@ -84,11 +87,11 @@
 
 # End $rc_base/init.d/postfix
-<userinput>EOF
-chmod 755 /etc/rc.d/init.d/postfix</userinput></screen></para>
+<command>EOF
+chmod 755 /etc/rc.d/init.d/postfix</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>cd /etc/rc.d/init.d &amp;&amp;
+<screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
 ln -sf ../init.d/postfix ../rc0.d/K25postfix &amp;&amp;
 ln -sf ../init.d/postfix ../rc1.d/K25postfix &amp;&amp;
@@ -97,5 +100,5 @@
 ln -sf ../init.d/postfix ../rc4.d/S35postfix &amp;&amp;
 ln -sf ../init.d/postfix ../rc5.d/S35postfix &amp;&amp;
-ln -sf ../init.d/postfix ../rc6.d/K25postfix</userinput></screen></para>
+ln -sf ../init.d/postfix ../rc6.d/K25postfix</command></userinput></screen></para>
 </sect3>
 
Index: server/mail/postfix/postfix-desc.xml
===================================================================
--- server/mail/postfix/postfix-desc.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ server/mail/postfix/postfix-desc.xml	(revision a11e412d48a154656848dfd52fee100b38d91426)
@@ -2,21 +2,21 @@
 <title>Contents</title>
 
-<para>The postfix package contains <userinput>bounce</userinput>,
-<userinput>cleanup</userinput>, <userinput>error</userinput>,
-<userinput>flush</userinput>, <userinput>lmtp</userinput>,
-<userinput>local</userinput>, <userinput>mailq</userinput>,
-<userinput>master</userinput>, <userinput>newaliases</userinput>,
-<userinput>nqmgr</userinput>, <userinput>pickup</userinput>,
-<userinput>pipe</userinput>, <userinput>postalias</userinput>,
-<userinput>postcat</userinput>, <userinput>postconf</userinput>,
-<userinput>postdrop</userinput>, <userinput>postfix</userinput>,
-<userinput>postkick</userinput>, <userinput>postlock</userinput>,
-<userinput>postlog</userinput>, <userinput>postmap</userinput>,
-<userinput>postqueue</userinput>, <userinput>postsuper</userinput>,
-<userinput>qmgr</userinput>, <userinput>qmqpd</userinput>,
-<userinput>sendmail</userinput>, <userinput>showq</userinput>,
-<userinput>smtp</userinput>, <userinput>smtpd</userinput>,
-<userinput>spawn</userinput>, <userinput>trivial-rewrite</userinput>,
-and <userinput>virtual</userinput>.</para>
+<para>The <application>postfix</application> package contains <filename>bounce
+</filename>, <filename>cleanup</filename>, <filename>error</filename>,
+<filename>flush</filename>, <filename>lmtp</filename>,
+<filename>local</filename>, <filename class="symlink">mailq</filename>,
+<filename>master</filename>, <filename class="symlink">newaliases</filename>,
+<filename>nqmgr</filename>, <filename>pickup</filename>,
+<filename>pipe</filename>, <command>postalias</command>,
+<command>postcat</command>, <command>postconf</command>,
+<command>postdrop</command>, <command>postfix</command>,
+<command>postkick</command>, <command>postlock</command>,
+<command>postlog</command>, <command>postmap</command>,
+<command>postqueue</command>, <command>postsuper</command>,
+<filename>qmgr</filename>, <filename>qmqpd</filename>,
+<command>sendmail</command>, <command>showq</command>,
+<filename>smtp</filename>, <filename>smtpd</filename>,
+<filename>spawn</filename>, <filename>trivial-rewrite</filename>,
+and <filename>virtual</filename>.</para>
 
 </sect2>
@@ -25,57 +25,77 @@
 
 <sect3><title>postfix</title>
-<para>postfix is the program that starts and stops the mail delivery system.</para></sect3>
+<para><command>postfix</command> is the program that starts and stops the mail delivery system.</para></sect3>
 
 <sect3><title>master</title>
-<para>master is the resident process that runs bounce, cleanup, error, flush, 
-lmtp, local, nqmgr, pickup, pipe, qmgr, qmqpd, showq, smtp, smtpd, spawn, 
-trivial-rewrite and virtual on demand. These programs are not designed to 
+<para><filename>master</filename> is the resident process that runs
+<filename>bounce</filename>, <filename>cleanup</filename>,
+<filename>error</filename>, <filename>flush</filename>, 
+<filename>lmtp</filename>, <filename>local</filename>,
+<filename>nqmgr</filename>, <filename>pickup</filename>,
+<filename>pipe</filename>, <filename>qmgr</filename>,
+<filename>qmqpd</filename>, <filename>showq</filename>,
+<filename>smtp</filename>, <filename>smtpd</filename>,
+<filename>spawn</filename>, <filename>trivial-rewrite</filename> and
+<filename>virtual</filename> on demand. These programs are not designed to 
 work as user commands.</para></sect3>
 
 <sect3><title>postqueue</title>
-<para>postqueue implements the Postfix user interface for queue management.  
-It implements all the operations that are traditionally available via the 
-sendmail command.</para></sect3>
+<para><command>postqueue</command> implements the
+<application>Postfix</application> user interface for 
+queue management.  It implements all the operations that are traditionally 
+available via the <command>sendmail</command> command.</para></sect3>
 
 <sect3><title>sendmail</title>
-<para>sendmail implements the Postfix to Sendmail compatibility interface.  
-mailq and newaliases are symlinks to sendmail.</para></sect3>
+<para><command>sendmail</command> implements the
+<application>Postfix</application> to
+<application>Sendmail</application> compatibility interface.  
+<filename class="symlink">mailq</filename> and <filename
+class="symlink">newaliases</filename> are symlinks to 
+<command>sendmail</command>.</para></sect3>
 
 <sect3><title>showq</title>
-<para>showq will emulate the mailq command when the Postfix mail system is 
+<para><command>showq</command> will emulate the <filename
+class="symlink">mailq</filename> command when the
+<application>Postfix</application> mail system is 
 not running.</para></sect3>
 
 <sect3><title>postsuper</title>
-<para>postsuper does maintenance jobs on the Postfix queue.</para></sect3>
+<para><command>postsuper</command> does maintenance jobs on the
+<application>Postfix</application> queue.</para></sect3>
 
 <sect3><title>postalias</title>
-<para>postalias creates, queries or updates Postfix alias 
+<para><command>postalias</command> creates, queries or updates
+<application>Postfix</application> alias 
 databases.</para></sect3>
 
 <sect3><title>postcat</title>
-<para>postcat prints the contents of a Postfix queue file in human-readable 
+<para><command>postcat</command> prints the contents of a
+<application>Postfix</application> queue file in human-readable 
 form.</para></sect3>
 
 <sect3><title>postconf</title>
-<para>postconf prints or changes the value of configuration 
+<para><command>postconf</command> prints or changes the value of configuration 
 parameters.</para></sect3>
 
 <sect3><title>postdrop</title>
-<para>postdrop creates a file in the maildrop directory and copies its standard input to the file.</para></sect3>
+<para><command>postdrop</command> creates a file in the maildrop directory and 
+copies its standard input to the file.</para></sect3>
 
 <sect3><title>postkick</title>
-<para>postkick makes the mail system private IPC accessible for use in shell 
+<para><command>postkick</command> makes the mail system private
+<acronym>IPC</acronym> accessible for use in shell 
 scripts.</para></sect3>
 
 <sect3><title>postlock</title>
-<para>postlock locks a file for exclusive access and executes a command
-on that file.</para></sect3>
+<para><command>postlock</command> locks a file for exclusive access and 
+executes a command on that file.</para></sect3>
 
 <sect3><title>postlog</title>
-<para>postlog implements a logging interface for use in shell 
-scripts.</para></sect3>
+<para><command>postlog</command> implements a logging interface for use in 
+shell scripts.</para></sect3>
 
 <sect3><title>postmap</title>
-<para>postmap creates, queries or updates Postfix lookup tables.</para></sect3>
+<para><command>postmap</command> creates, queries or updates
+<application>Postfix</application> lookup tables.</para></sect3>
 
 </sect2>
Index: server/mail/postfix/postfix-inst.xml
===================================================================
--- server/mail/postfix/postfix-inst.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ server/mail/postfix/postfix-inst.xml	(revision a11e412d48a154656848dfd52fee100b38d91426)
@@ -1,28 +1,32 @@
 <sect2>
-<title>Installation of postfix</title>
+<title>Installation of <application>postfix</application></title>
 
-<para>Before you compile the program, you need to create users and groups that will be expected to be in place when the install script executes.  Add the users and groups with the following commands:</para>
+<para>Before you compile the program, you need to create users and groups that 
+will be expected to be in place when the install script executes.  Add the 
+users and groups with the following commands:</para>
 
-<para><screen><userinput>groupadd postfix &amp;&amp;
+<screen><userinput><command>groupadd postfix &amp;&amp;
 groupadd postdrop &amp;&amp;
 groupadd -g 65534 nogroup &amp;&amp;
 useradd -c postfix -d /dev/null -g postfix -s /bin/false postfix &amp;&amp;
 useradd -c nobody -d /home -g nogroup -s /bin/bash -u 65534 nobody &amp;&amp;
-chown postfix:postfix /var/mail</userinput></screen></para>
+chown postfix:postfix /var/mail</command></userinput></screen>
 
-<para>Install postfix by running the following commands:</para>
+<para>Install <application>postfix</application> by running the following commands:</para>
 
-<para><screen><userinput>make &amp;&amp;
-make install</userinput></screen></para>
+<screen><userinput><command>make &amp;&amp;
+make install</command></userinput></screen>
 
-<para>The install script will enter an interactive stage with questions in the form of '*_directory:[default]input'.  Defaults can be accepted in all but three cases.  The following shows the three cases and the modified response.</para>
+<para>The install script will enter an interactive stage with questions in the 
+form of '*_directory:[default]input'.  Defaults can be accepted in all but 
+three cases.  The following shows the three cases and the modified response.</para>
 
-<para><screen><userinput>daemon_directory:[/usr/libexec/postfix]/usr/sbin
-manpage_directory:[/usr/local/man]/usr/share/man
-sample_directory:[/etc/postfix]/usr/share/doc/postfix</userinput></screen></para>
+<screen><prompt>daemon_directory:[/usr/libexec/postfix]</prompt><userinput>/usr/sbin</userinput>
+<prompt>manpage_directory:[/usr/local/man]</prompt><userinput>/usr/share/man</userinput>
+<prompt>sample_directory:[/etc/postfix]</prompt><userinput>/usr/share/doc/postfix</userinput></screen>
 
 <para>The final installation step is to install the program's documentation with this command:</para>
 
-<para><screen><userinput>cp -rf html/* /usr/share/doc/postfix</userinput></screen></para>
+<screen><userinput><command>cp -rf html/* /usr/share/doc/postfix</command></userinput></screen>
 
 </sect2>
Index: server/mail/postfix/postfix-intro.xml
===================================================================
--- server/mail/postfix/postfix-intro.xml	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ server/mail/postfix/postfix-intro.xml	(revision a11e412d48a154656848dfd52fee100b38d91426)
@@ -2,19 +2,28 @@
 <title>Introduction to postfix</title>
 
-<screen>Download location (HTTP):       <ulink url="&postfix-download-http;"/>
-Download location (FTP):        <ulink url="&postfix-download-ftp;"/>
-Version used:                   &postfix-version;
-Package size:                   &postfix-size;
-Estimated Disk space required:  &postfix-buildsize;
-Estimated build time:           &postfix-time;</screen>
+<para>The <application>postfix</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, a mail relay agent or simply a mail 
+delivery agent to your local Internet Service Provider
+(<acronym>ISP</acronym>).</para>
 
-<para>The postfix package contains a Mail Transport Agent (MTA). 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, a mail
-relay agent or simply a mail delivery agent to your local Internet
-Service Provider (ISP).</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&postfix-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&postfix-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &postfix-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&postfix-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&postfix-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>postfix depends on: 
-<xref linkend="db"/></screen>
+<sect3><title><application>postfix</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="db"/></para></sect4>
+</sect3>
 
 </sect2>
Index: server/mail/postfix/postfix.ent
===================================================================
--- server/mail/postfix/postfix.ent	(revision ca2217b433eb5780e79b15b61ad7c49e13c157dc)
+++ server/mail/postfix/postfix.ent	(revision a11e412d48a154656848dfd52fee100b38d91426)
@@ -4,6 +4,6 @@
 <!ENTITY postfix-desc SYSTEM "postfix-desc.xml">
 <!ENTITY postfix-config SYSTEM "postfix-config.xml">
-<!ENTITY postfix-buildsize "71.9 MB">
-<!ENTITY postfix-version "2.0.7">
+<!ENTITY postfix-buildsize "71 MB">
+<!ENTITY postfix-version "2.0.9">
 <!ENTITY postfix-download-http "">
 <!ENTITY postfix-download-ftp "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-&postfix-version;.tar.gz">
