Index: connect/dhcp/dhcpcd.xml
===================================================================
--- connect/dhcp/dhcpcd.xml	(revision 8d9eb0f4ab5e4bf398a95608bc27219e2d343b53)
+++ connect/dhcp/dhcpcd.xml	(revision 7ee98495b25ef22ac0fa5348ce04ca481b9d6390)
@@ -44,5 +44,6 @@
 <itemizedlist spacing='compact'>
 <listitem><para>Required Patch:
-<ulink url="&patch-root;/dhcpcd-&dhcpcd-version;-fhs-1.patch"/></para></listitem>
+<ulink url="&patch-root;/dhcpcd-&dhcpcd-version;-fhs-1.patch"/></para>
+</listitem>
 </itemizedlist>
 </sect3>
@@ -127,9 +128,10 @@
 DHCP_STOP="-k <replaceable>[insert additional stop options here]</replaceable>"
 
-# Set PRINTIP="yes" to have the script print the DHCP assigned IP address.
+# Set PRINTIP="yes" to have the script print 
+# the DHCP assigned IP address
 PRINTIP="no"
 
-# Set PRINTALL="yes" to print the DHCP assigned values for IP, SM, DG, and 1st NS.
-# This requires PRINTIP="yes"
+# Set PRINTALL="yes" to print the DHCP assigned values for 
+# IP, SM, DG, and 1st NS. This requires PRINTIP="yes".
 PRINTALL="no"
 <command>EOF</command></userinput></screen>
Index: general/prog/tcl.xml
===================================================================
--- general/prog/tcl.xml	(revision 8d9eb0f4ab5e4bf398a95608bc27219e2d343b53)
+++ general/prog/tcl.xml	(revision 7ee98495b25ef22ac0fa5348ce04ca481b9d6390)
@@ -64,6 +64,7 @@
 sed -i "s:${DIR}/unix:/usr/lib:" tclConfig.sh &amp;&amp;
 sed -i "s:${DIR}:/usr/include/tcl${V}:" tclConfig.sh &amp;&amp;
-sed -i "s,^TCL_LIB_FILE='libtcl${V}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${V}\$\{TCL_DBGX\}.so\"," \
-    tclConfig.sh &amp;&amp;
+sed -i \
+  "s,^TCL_LIB_FILE='libtcl${V}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${V}\$\{TCL_DBGX\}.so\"," \
+  tclConfig.sh &amp;&amp;
 make install &amp;&amp;
 install -d /usr/include/tcl${V}/unix &amp;&amp;
@@ -137,6 +138,4 @@
 </listitem>
 </varlistentry>
-
-
 </variablelist>
 
Index: server/mail/courier.xml
===================================================================
--- server/mail/courier.xml	(revision 8d9eb0f4ab5e4bf398a95608bc27219e2d343b53)
+++ server/mail/courier.xml	(revision 7ee98495b25ef22ac0fa5348ce04ca481b9d6390)
@@ -40,17 +40,21 @@
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&courier-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&courier-download-ftp;"/></para></listitem>
+<listitem><para>Download (HTTP): 
+<ulink url="&courier-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): 
+<ulink url="&courier-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &courier-size;</para></listitem>
-<listitem><para>Estimated disk space required: &courier-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &courier-time;</para></listitem></itemizedlist>
+<listitem><para>Estimated disk space required: 
+&courier-buildsize;</para></listitem>
+<listitem><para>Estimated build time: 
+&courier-time;</para></listitem></itemizedlist>
 </sect3>
 
 <sect3><title><application>Courier</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="gdbm"/><!-- or <xref linkend="db"/> --></para></sect4>
+<para><xref linkend="gdbm"/><!-- or <xref linkend="db"/> --></para>
+</sect4>
 <sect4><title>Optional</title>
-<para>
-<xref linkend="mysql"/> or <xref linkend="postgresql"/>, 
+<para><xref linkend="mysql"/> or <xref linkend="postgresql"/>, 
 <xref linkend="Linux_PAM"/>,
 <xref linkend="openssl-package"/>, 
@@ -76,5 +80,6 @@
 
 <screen><userinput><command>groupadd courier &amp;&amp;
-useradd -c 'Courier Mail Server' -d /dev/null -g courier -s /bin/false courier</command></userinput></screen>
+useradd -c 'Courier Mail Server' -d /dev/null \
+        -g courier -s /bin/false courier</command></userinput></screen>
 
 <para> You also need to create a bin user. If you already have a user
@@ -95,10 +100,12 @@
 chown courier:courier /var/run/courier</command></userinput></screen>
 
-<para>Install <application>courier</application> by running the following commands:</para>
+<para>Install <application>courier</application> by running the following 
+commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr --libexecdir=/usr/lib/courier \
     --datadir=/usr/share/courier --sysconfdir=/etc/courier \
     --localstatedir=/var/lib/courier --with-piddir=/var/run/courier \
-    --disable-root-check --with-mailuser=courier --with-mailgroup=courier \
+    --disable-root-check --with-mailuser=courier \
+    --with-mailgroup=courier \
     --with-paranoid-smtpext --disable-autorenamesent \
     --enable-workarounds-for-imap-client-bugs --with-db=gdbm &amp;&amp;
@@ -185,7 +192,7 @@
 of <application>aspell</application>.</para>
 
-<para><parameter>--enable-mimetypes=<replaceable>[location of mime.types file]</replaceable></parameter>: 
-Use this switch if you receive an error saying that the
-<filename>mime.types</filename> file could not be found.</para>
+<para><parameter>--enable-mimetypes=<replaceable>[location of mime.types 
+file]</replaceable></parameter>: Use this switch if you receive an error 
+saying that the <filename>mime.types</filename> file could not be found.</para>
     
 </sect2>
@@ -282,5 +289,6 @@
 <filename>/etc/courier/authmysqlrc</filename> file:</para>
 
-<screen><userinput><command>GRANT ALL PRIVILEGES ON *.* TO courier@localhost IDENTIFIED BY '<replaceable>[password]</replaceable>' WITH GRANT OPTION;
+<screen><userinput><command>GRANT ALL PRIVILEGES ON *.* TO courier@localhost \
+    IDENTIFIED BY '<replaceable>[password]</replaceable>' WITH GRANT OPTION;
 QUIT</command></userinput></screen>
 
@@ -576,5 +584,6 @@
 
 <sect3><title>cancelmsg</title>
-<para><command>cancelmsg</command> removes a message from the mail queue.</para></sect3>
+<para><command>cancelmsg</command> removes a message from the mail 
+queue.</para></sect3>
 
 <sect3><title>courier</title>
@@ -590,5 +599,6 @@
 
 <sect3><title>couriermlm</title>
-<para><command>couriermlm</command> is the Courier mailing list manager.</para></sect3>
+<para><command>couriermlm</command> is the Courier mailing list 
+manager.</para></sect3>
 
 <sect3><title>filterctl</title>
@@ -598,27 +608,34 @@
 
 <sect3><title>lockmail</title>
-<para><command>lockmail</command> is a helper utility for working with mailbox files.</para></sect3>
+<para><command>lockmail</command> is a helper utility for working with mailbox 
+files.</para></sect3>
 
 <sect3><title>mailbot</title>
-<para><command>mailbot</command> reads an E-mail message on standard input and creates an E-mail message
-replying to the original message's sender.</para></sect3>
+<para><command>mailbot</command> 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><command>maildirkw</command> modifies Courier-IMAP compatible maildir message keywords.</para></sect3>
+<para><command>maildirkw</command> modifies Courier-IMAP compatible maildir 
+message keywords.</para></sect3>
 
 <sect3><title>maildrop</title>
-<para><command>maildrop</command> is a replacement local mail delivery agent that includes a mail filtering
-language.</para></sect3>
+<para><command>maildrop</command> is a replacement local mail delivery agent 
+that includes a mail filtering language.</para></sect3>
 
 <sect3><title>makeacceptmailfor</title>
-<para><command>makeacceptmailfor</command> Build a list of domains to accept mail for from the
-<filename>/etc/courier/esmtpacceptmailfor.dir</filename> directory.</para></sect3>
+<para><command>makeacceptmailfor</command> 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><command>makealiases</command> Build a list of aliases from the <filename>/etc/courier/aliases</filename>
+<para><command>makealiases</command> Build a list of aliases from the 
+<filename>/etc/courier/aliases</filename>
 or <filename>/etc/courier/aliasdir</filename> directories.</para></sect3>
 
 <sect3><title>makehosteddomains</title>
-<para><command>makehostedomains</command> Build a database of hosted domains from <filename>hosteddomains</filename>.</para></sect3>
+<para><command>makehostedomains</command> Build a database of hosted domains 
+from <filename>hosteddomains</filename>.</para></sect3>
 
 <sect3><title>makepercentrelay</title>
@@ -639,29 +656,37 @@
 <sect3><title>makeuucpneighbors</title>
 <para><command>makeuucpneighbors</command> Builds a list of
-<acronym>UUCP</acronym> recipients using <filename>/etc/courier/uucpneighbors</filename>.</para></sect3>
+<acronym>UUCP</acronym> recipients using 
+<filename>/etc/courier/uucpneighbors</filename>.</para></sect3>
 
 <sect3><title>reformail</title>
-<para><command>reformail</command> program reads a message on standard input, reformats it in some way,
- and writes the message to standard output.</para></sect3>
+<para><command>reformail</command> 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><command>reformime</command> is a utility for reformatting MIME messages.</para></sect3>
+<para><command>reformime</command> is a utility for reformatting MIME 
+messages.</para></sect3>
 
 <sect3><title>sendmail</title>
-<para><command>sendmail</command> 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>
+<para><command>sendmail</command> 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>showconfig</title>
-<para><command>showconfig</command> Shows the current Courier configuration.</para></sect3>
+<para><command>showconfig</command> Shows the current Courier 
+configuration.</para></sect3>
 
 <sect3><title>showmodules</title>
-<para><command>showmodules</command> Shows the current Courier modules.</para></sect3>
+<para><command>showmodules</command> Shows the current Courier 
+modules.</para></sect3>
 
 <sect3><title>testmxlookup</title>
-<para><command>testmxlookup</command> 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>
+<para><command>testmxlookup</command> 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>
 
 </sect2>
+
 </sect1>
 
Index: server/other/bind.xml
===================================================================
--- server/other/bind.xml	(revision 8d9eb0f4ab5e4bf398a95608bc27219e2d343b53)
+++ server/other/bind.xml	(revision 7ee98495b25ef22ac0fa5348ce04ca481b9d6390)
@@ -86,5 +86,6 @@
 install -m644 rfc/* \
     /usr/share/doc/bind-9.3.0/rfc &amp;&amp;
-install -m644 misc/{dnssec,ipv6,migrat*,options,rfc-compliance,roadmap,sdb} \
+install -m644 \
+    misc/{dnssec,ipv6,migrat*,options,rfc-compliance,roadmap,sdb} \
     /usr/share/doc/bind-9.3.0/misc</command></userinput></screen>
 
