Index: server/mail/exim/exim-config.xml
===================================================================
--- server/mail/exim/exim-config.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/mail/exim/exim-config.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -9,9 +9,9 @@
 <para>Create the exim configuration files with the following commands:
 </para> 
-<para><screen><userinput>cat &gt;&gt; /etc/aliases &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt;&gt; /etc/aliases &lt;&lt; "EOF"</userinput>
 postmaster: root
 MAILER-DAEMON: root
-EOF
-exim -v -bi
+<userinput>EOF
+exim -v -bi &amp;&amp;
 /usr/sbin/exim -bd -q1m</userinput></screen></para>
 
Index: server/mail/exim/exim-exp.xml
===================================================================
--- server/mail/exim/exim-exp.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/mail/exim/exim-exp.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -2,17 +2,14 @@
 <title>Installation command explanations</title>
 
-<para><userinput>
+<para><screen><userinput>
 groupadd exim
-useradd -g exim exim : </userinput>
+useradd -g exim exim</userinput></screen>
 Create the group and user exim which will run the the exim
 daemon.</para>
 
-<para><screen><userinput>
-sed -e 's/^BIN_DIR.*$/BIN_DIRECTORY=\/usr\/sbin/' src/EDITME | \
+<para><screen><userinput>sed -e 's/^BIN_DIR.*$/BIN_DIRECTORY=\/usr\/sbin/' src/EDITME | \
   sed -e 's/^CONF.*$/CONFIGURE_FILE=\/etc\/exim.conf/' | \
   sed -e 's/^EXIM_USER.*$/EXIM_USER=exim/' | \
-  sed -e 's/^EXIM_MONITOR/#EXIM_MONITOR/' > Local/Makefile : 
-</userinput></screen>
-
+  sed -e 's/^EXIM_MONITOR/#EXIM_MONITOR/' > Local/Makefile</userinput></screen>
 Many of exim's configuration options are compiled in.  Here, we
 specify the minimum set of options, BIN_DIRECTORY, CONFIGURE_FILE and
@@ -21,7 +18,5 @@
 the Makefile.</para>
 
-<para><userinput> ln -s /usr/sbin/exim /usr/sbin/sendmail :
-</userinput>
-Create a link to sendmail for applications which need it.  exim will
+<para><userinput>ln -s /usr/sbin/exim /usr/sbin/sendmail</userinput> : Create a link to sendmail for applications which need it.  exim will
 accept most Sendmail command line options.</para>
 
Index: server/mail/qmail/qmail-config.xml
===================================================================
--- server/mail/qmail/qmail-config.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/mail/qmail/qmail-config.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -17,5 +17,5 @@
 entry to <filename>/etc/xinetd.conf</filename>: </para>
 
-<para><screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</userinput>
 service smtp
 {
@@ -32,10 +32,10 @@
     log_on_failture         += USERID
 }
-EOF</userinput></screen></para>
+<userinput>EOF</userinput></screen></para>
 
 <para>To automate the running of qmail, use following command to
 create the init.d script:</para> 
 
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/qmail &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/qmail &lt;&lt; "EOF"</userinput>
 #!/bin/sh
 # Begin $rc_base/init.d/qmail
@@ -72,5 +72,5 @@
 
 # End $rc_base/init.d/qmail
-EOF
+<userinput>EOF
 chmod 755 /etc/rc.d/init.d/qmail</userinput></screen></para>
 
Index: server/mail/sendmail/sendmail-config.xml
===================================================================
--- server/mail/sendmail/sendmail-config.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/mail/sendmail/sendmail-config.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -10,8 +10,8 @@
 <sect3><title>Configuring sendmail</title>
 <para><screen><userinput>echo `hostname` > /etc/mail/local-host-names
-cat &gt; /etc/mail/aliases &lt;&lt; "EOF"
+cat &gt; /etc/mail/aliases &lt;&lt; "EOF"</userinput>
 postmaster: root
 MAILER-DAEMON: root
-EOF
+<userinput>EOF
 cd /etc/mail &amp;&amp;
 cp -R  /usr/src/sendmail-&sendmail-version;/cf/* . &amp;&amp;
Index: server/mail/sendmail/sendmail-inst.xml
===================================================================
--- server/mail/sendmail/sendmail-inst.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/mail/sendmail/sendmail-inst.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -13,5 +13,5 @@
 <para>Install sendmail with the following commands:</para>
 
-<para><screen><userinput>cat &gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt; devtools/Site/site.config.m4 &lt;&lt; "EOF"</userinput>
 define(`confMANGRP',`root')
 define(`confMANOWN',`root')
@@ -19,5 +19,5 @@
 define(`confUBINGRP',`root')
 define(`confUBINOWN',`root')
-EOF
+<userinput>EOF
 cd sendmail &amp;&amp;
 sh Build &amp;&amp;
Index: server/other/bind/bind-config-exp.xml
===================================================================
--- server/other/bind/bind-config-exp.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/bind/bind-config-exp.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -9,34 +9,23 @@
 chmod 666 /home/named/dev/{null,random}
 mkdir /home/named/etc/namedb/pz
-cp /etc/localtime /home/named/etc : </userinput></screen>
-
+cp /etc/localtime /home/named/etc</userinput></screen>
 Create the unprivileged user and group named, along with device files
 that named will need access to inside the chroot jail.</para>
 
-<para><userinput>
-cat &gt; /home/named/etc/named.conf &lt;&lt; "EOF" :</userinput>
-Create the BIND configuration file, from which named will read the
+<para><userinput>cat &gt; /home/named/etc/named.conf &lt;&lt;
+"EOF"</userinput> : Create the BIND configuration file, from which named will read the
 location of zone files, root nameservers and secure DNS keys.</para>
-<para><userinput>
-cat &gt; /home/named/etc/namedb/pz/127.0.0 &lt;&lt; "EOF" :</userinput>
-Create a single zone file.</para>
-<para><userinput>
-cat &gt; /home/named/etc/namedb/root.hints &lt;&lt; "EOF" :</userinput>
-The root.hints file is a list of root nameservers.  This file must be
+<para><userinput>cat &gt; /home/named/etc/namedb/pz/127.0.0 &lt;&lt; "EOF"</userinput> : Create a single zone file.</para>
+<para><userinput>cat &gt; /home/named/etc/namedb/root.hints &lt;&lt; "EOF"</userinput> : The root.hints file is a list of root nameservers.  This file must be
 updated periodically with the dig utility.  Consult the BIND 9
 Administrator Reference Manual for details.</para>
-<para><userinput>
-cat &gt; /etc/rndc.conf &lt;&lt; "EOF" :</userinput>
-The rndc.conf file contains information for controlling named
+<para><userinput>cat &gt; /etc/rndc.conf &lt;&lt; "EOF"</userinput> : The rndc.conf file contains information for controlling named
 operations with the rndc utility.</para>
 
-<para><userinput>
-cat &gt; /etc/resolv.conf &lt;&lt; "EOF" :</userinput>
-The resolv.conf file will specify the local host(127.0.0.1) as the
+<para><userinput>cat &gt; /etc/resolv.conf &lt;&lt; "EOF"</userinput> : The resolv.conf file will specify the local host(127.0.0.1) as the
 nameserver.</para>
 
-<para><userinput>
-cat &gt; /etc/rc.d/init.d/bind &lt;&lt; "EOF" :</userinput>
-Create the boot script for BIND 9, used to start and stop the name
+<para><userinput>cat &gt; /etc/rc.d/init.d/bind &lt;&lt;
+"EOF"</userinput> : Create the boot script for BIND 9, used to start and stop the name
 server daemon, named.</para>
 
Index: server/other/bind/bind-config.xml
===================================================================
--- server/other/bind/bind-config.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/bind/bind-config.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -8,6 +8,5 @@
 <para>First we set up some files and directories needed by
 BIND:</para>
-<para><screen><userinput>
-groupadd -g 200 named &amp;&amp;
+<para><screen><userinput>groupadd -g 200 named &amp;&amp;
 useradd -m -g named -u 200 -s /bin/false named &amp;&amp;
 cd /home/named &amp;&amp;
@@ -17,14 +16,13 @@
 chmod 666 /home/named/dev/{null,random} &amp;&amp;
 mkdir /home/named/etc/namedb/pz &amp;&amp;
-cp /etc/localtime /home/named/etc
-</userinput></screen></para>
+cp /etc/localtime /home/named/etc</userinput></screen></para>
 
 <sect3><title>Config files</title>
-<para><userinput>named.conf, root.hints, 127.0.0, rndc.conf
-</userinput></para>
+<para><userinput>named.conf</userinput>,
+<userinput>root.hints</userinput>, <userinput>127.0.0</userinput> and
+<userinput>rndc.conf</userinput></para>
 
 <para>Create the named.conf file with the following commands:</para>
-<para><screen><userinput>
-cat &gt; /home/named/etc/named.conf &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt; /home/named/etc/named.conf &lt;&lt; "EOF"</userinput>
  options {
      directory "/etc/namedb";
@@ -48,9 +46,7 @@
      file "pz/127.0.0";
  };
-EOF
-</userinput></screen></para>
+<userinput>EOF</userinput></screen></para>
 <para>Create a zone file with the following contents: </para>
-<para><screen><userinput>
-cat &gt; /home/named/etc/namedb/pz/127.0.0 &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt; /home/named/etc/namedb/pz/127.0.0 &lt;&lt; "EOF"</userinput>
 $TTL 3D
 @      IN      SOA     ns.local.domain. hostmaster.local.domain. (
@@ -62,12 +58,10 @@
                 NS      ns.local.domain.
 1               PTR     localhost.
-EOF
-</userinput></screen></para>
+<userinput>EOF</userinput></screen></para>
 
 <para>Create the root.hints file with the following commands: </para>
 <note><para>Caution must be used to insure no leading spaces in this
 file.</para></note>
-<para><screen><userinput>
-cat &gt; /home/named/etc/namedb/root.hints &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt; /home/named/etc/namedb/root.hints &lt;&lt; "EOF"</userinput>
 .                       6D  IN      NS      A.ROOT-SERVERS.NET.
 .                       6D  IN      NS      B.ROOT-SERVERS.NET.
@@ -96,10 +90,8 @@
 L.ROOT-SERVERS.NET.     6D  IN      A       198.32.64.12
 M.ROOT-SERVERS.NET.     6D  IN      A       202.12.27.33
-EOF
-</userinput></screen></para>
+<userinput>EOF</userinput></screen></para>
 
 <para>Create the rndc.conf with the following commands:</para>
-<para><screen><userinput>
-cat &gt; /etc/rndc.conf &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt; /etc/rndc.conf &lt;&lt; "EOF"</userinput>
 key rndc_key {
 algorithm "hmac-md5";
@@ -111,6 +103,5 @@
     default-key    rndc_key;
 };
-EOF
-</userinput></screen></para>
+<userinput>EOF</userinput></screen></para>
 
 <para>Create or modify resolv.conf to use the new nameserver with the
@@ -119,21 +110,16 @@
 name.</para></note>
 
-<para><screen><userinput>
-cp /etc/resolv.conf /etc/resolv.conf.bak
-cat &gt; /etc/resolv.conf &lt;&lt; "EOF"
+<para><screen><userinput>cp /etc/resolv.conf /etc/resolv.conf.bak &amp;&amp;
+cat &gt; /etc/resolv.conf &lt;&lt; "EOF"</userinput>
 search yourdomain.com
 nameserver 127.0.0.1
-EOF
-</userinput></screen></para>
+<userinput>EOF</userinput></screen></para>
 
 <para>Set permissions on the chroot jail with the following
 command:</para>
-<para><screen><userinput>
-chown -R named.named /home/named
-</userinput></screen></para>
+<para><screen><userinput>chown -R named.named /home/named</userinput></screen></para>
 
 <para>Create the BIND boot script:</para>
-<para><screen><userinput>
-cat &gt; /etc/rc.d/init.d/bind &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/bind &lt;&lt; "EOF"</userinput>
 #!/bin/bash
 # Begin $rc_base/init.d/bind
@@ -171,10 +157,8 @@
 esac
 # End $rc_base/init.d/bind
-EOF
-</userinput></screen></para>
+<userinput>EOF</userinput></screen></para>
 
 <para>Add the run level symlinks:</para>
-<para><screen><userinput>
-chmod 754 /etc/rc.d/init.d/bind &amp;&amp;
+<para><screen><userinput>chmod 754 /etc/rc.d/init.d/bind &amp;&amp;
 ln -s  /etc/rc.d/init.d/bind /etc/rc.d/rc0.d/K49bind &amp;&amp;
 ln -s  /etc/rc.d/init.d/bind /etc/rc.d/rc1.d/K49bind &amp;&amp;
@@ -183,25 +167,18 @@
 ln -s  /etc/rc.d/init.d/bind /etc/rc.d/rc4.d/S22bind &amp;&amp;
 ln -s  /etc/rc.d/init.d/bind /etc/rc.d/rc5.d/S22bind &amp;&amp;
-ln -s  /etc/rc.d/init.d/bind /etc/rc.d/rc6.d/K49bind
-</userinput></screen></para>
+ln -s  /etc/rc.d/init.d/bind /etc/rc.d/rc6.d/K49bind</userinput></screen></para>
 
 <para>Now start BIND with the new boot script: </para>
-<para><screen><userinput>
-/etc/rc.d/init.d/bind start
-</userinput></screen></para></sect3>
+<para><screen><userinput>/etc/rc.d/init.d/bind start</userinput></screen></para></sect3>
 
 <sect3><title>Testing BIND</title>
 <para>Test out the new BIND 9 installation.  First query the local
 host address with dig:</para>
-<para><screen><userinput>
-dig -x 127.0.0.1
-</userinput></screen></para>
+<para><screen><userinput>dig -x 127.0.0.1</userinput></screen></para>
 <para>Now try an external name lookup, taking note of the speed
 difference in repeated lookups due to the caching.  Run the dig
 command twice on the same address:</para>
-<para><screen><userinput>
-dig beyond.linuxfromscratch.org &amp;&amp;
-dig beyond.linuxfromscratch.org
-</userinput></screen>
+<para><screen><userinput>dig beyond.linuxfromscratch.org &amp;&amp;
+dig beyond.linuxfromscratch.org</userinput></screen>
 You can see almost instantaneous results with the named caching
 lookups.  Consult bind-&bind-version;/doc/arm/Bv9ARM.html, the BIND
Index: server/other/cvsserver/cvsserver-exp.xml
===================================================================
--- server/other/cvsserver/cvsserver-exp.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/cvsserver/cvsserver-exp.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -2,18 +2,18 @@
 <title>Command explanations</title>
 
-<para><userinput>mkdir /cvsroot :</userinput> Create the CVS repository
+<para><userinput>mkdir /cvsroot</userinput> : Create the CVS repository
 directory.</para>
 
-<para><userinput>chmod 1777 /cvsroot :</userinput> Sticky bit
+<para><userinput>chmod 1777 /cvsroot</userinput> : Sticky bit
 permissions for CVSROOT.</para>
 
-<para><userinput>export CVSROOT=/cvsroot :</userinput> Specify new
+<para><userinput>export CVSROOT=/cvsroot</userinput> : Specify new
 CVSROOT for all cvs commands.</para>
 
-<para><userinput>cvs init :</userinput> Initialize the new CVS
+<para><userinput>cvs init</userinput> : Initialize the new CVS
 repository.</para>
 
 <para><userinput>cvs import -m "repository test" cvstest vendortag
-releasetag :</userinput> All source code modules must be imported
+releasetag</userinput> : All source code modules must be imported
 into the CVS repository before use, with the cvs import command.  the
 -m flags specifies an initial descriptive entry for the new module.
@@ -24,13 +24,12 @@
 
 <para><userinput>(grep anonymous /etc/passwd || useradd anonymous -s
-/bin/false) :</userinput>  Check for an existing anonymous user and
+/bin/false)</userinput>  : Check for an existing anonymous user and
 create one if not found.</para>
 
-<para><userinput>echo anonymous: > /cvsroot/CVSROOT/passwd
-:</userinput> Add the anonymous user to the CVS passwd file, which is
+<para><userinput>echo anonymous: &gt; /cvsroot/CVSROOT/passwd
+</userinput> : Add the anonymous user to the CVS passwd file, which is
 unused for anything else in this configuration.</para>
 
-<para><userinput>echo anonymous > /cvsroot/CVSROOT/readers :
-</userinput> Add the anonymous user to the CVS readers file, a list of
+<para><userinput>echo anonymous &gt; /cvsroot/CVSROOT/readers</userinput> : Add the anonymous user to the CVS readers file, a list of
 users who have read only access to the repository.</para>
 
Index: server/other/cvsserver/cvsserver-inst.xml
===================================================================
--- server/other/cvsserver/cvsserver-inst.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/cvsserver/cvsserver-inst.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -17,5 +17,5 @@
 <para><screen><userinput>mkdir /cvsroot &amp;&amp;
 chmod 1777 /cvsroot &amp;&amp;
-export CVSROOT=/cvsroot
+export CVSROOT=/cvsroot &amp;&amp;
 cvs init</userinput></screen></para></sect3>
 
@@ -56,6 +56,6 @@
 
 <para><screen><userinput>(grep anonymous /etc/passwd || useradd anonymous -s /bin/false) &amp;&amp;
-echo anonymous: > /cvsroot/CVSROOT/passwd &amp;&amp;
-echo anonymous > /cvsroot/CVSROOT/readers</userinput></screen></para>
+echo anonymous: &gt; /cvsroot/CVSROOT/passwd &amp;&amp;
+echo anonymous &gt; /cvsroot/CVSROOT/readers</userinput></screen></para>
 
 <para>If you use inetd, the following command will add the pserver
@@ -71,5 +71,5 @@
 entry to /etc/xinetd.conf:</para>
 
-<para><screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</userinput>
      service cvspserver
      {
@@ -83,5 +83,5 @@
          server_args = -f --allow-root=/cvsroot pserver
      }
-EOF</userinput></screen></para>
+<userinput>EOF</userinput></screen></para>
 <para>Issue a killall -HUP xinetd to reread the changed xinetd.conf
 file.</para>
Index: server/other/dhcp/dhcp-exp.xml
===================================================================
--- server/other/dhcp/dhcp-exp.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/dhcp/dhcp-exp.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -2,8 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>make CC="gcc $CFLAGS" :</userinput> This makes dhcp
-compile using our CFLAGS for optimizations.</para>
-
-<para><userinput>LIBDIR=/usr/lib INCDIR=/usr/include :</userinput> This
+<para><userinput>LIBDIR=/usr/lib INCDIR=/usr/include</userinput> : This
 command installs the library and include files in <filename
 class="directory">/usr</filename> instead of <filename
Index: server/other/dhcp/dhcp-inst.xml
===================================================================
--- server/other/dhcp/dhcp-inst.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/dhcp/dhcp-inst.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -5,5 +5,5 @@
 
 <para><screen><userinput>./configure &amp;&amp;
-make CC="gcc $CFLAGS" &amp;&amp;
+make &amp;&amp;
 make LIBDIR=/usr/lib INCDIR=/usr/include install</userinput></screen></para>
 
Index: server/other/leafnode/leafnode-config.xml
===================================================================
--- server/other/leafnode/leafnode-config.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/leafnode/leafnode-config.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -3,6 +3,6 @@
 
 <sect3><title>Config files</title>
-<para><userinput>/etc/leafnode/config,
-/etc/inetd.conf, /etc/xinetd.conf</userinput></para>
+<para><userinput>/etc/leafnode/config</userinput>,
+<userinput>/etc/inetd.conf</userinput> and <userinput>/etc/xinetd.conf</userinput></para>
 
 <para>leafnode may be configured to use inetd or xinetd as follows:
@@ -18,5 +18,5 @@
 <para>Add a leafnode entry to the <filename>/etc/xinetd.conf</filename>
 file with the following command:
-<screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
+<screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</userinput>
         service nntp
         {
@@ -31,5 +31,5 @@
            per_source      = 3
         }
-EOF</userinput></screen></para>
+<userinput>EOF</userinput></screen></para>
 
 <para>The <filename>/etc/news/config</filename> file must be
Index: server/other/leafnode/leafnode-exp.xml
===================================================================
--- server/other/leafnode/leafnode-exp.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/leafnode/leafnode-exp.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -10,12 +10,9 @@
 ignored.</para> 
 
-<para><userinput> --prefix=/usr : </userinput>
-Change the default installation directory of /usr/local.</para>
+<para><userinput> --prefix=/usr</userinput> : Change the default installation directory of /usr/local.</para>
 
-<para><userinput> --localstatedir=/var : </userinput>
-Change the default spool directory of /usr/var.</para>
+<para><userinput> --localstatedir=/var</userinput> : Change the default spool directory of /usr/var.</para>
 
-<para><userinput> --sysconfdir=/etc/news : </userinput>
-leafnode reads it's configuration data from an file called
+<para><userinput> --sysconfdir=/etc/news</userinput> : leafnode reads it's configuration data from an file called
 <filename>config</filename>, this with be created in
 <filename>/etc/news</filename> to avoid any potential conflict with
@@ -23,6 +20,5 @@
 </para>
 
-<para><userinput> make update : </userinput>
-Create an initial <filename>/etc/news/config.example</filename> file,
+<para><userinput> make update</userinput> : Create an initial <filename>/etc/news/config.example</filename> file,
 which must be renamed to <filename>/etc/news/config</filename>.</para>
 
Index: server/other/openldap/openldap-desc.xml
===================================================================
--- server/other/openldap/openldap-desc.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/openldap/openldap-desc.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -2,6 +2,7 @@
 <title>Contents</title>
 
-<para>The OpenLDAP package contains slapd, slurpd, LDAP libraries, and
-various utilities, tools, and sample clients.  </para>
+<para>The OpenLDAP package contains <userinput>slapd</userinput>,
+<userinput>slurpd</userinput>, <userinput>LDAP libraries</userinput> and
+<userinput>various utilities, tools, and sample clients</userinput>.</para>
 
 </sect2>
Index: server/other/openldap/openldap-exp.xml
===================================================================
--- server/other/openldap/openldap-exp.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/openldap/openldap-exp.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -2,16 +2,16 @@
 <title>Installation command explanations</title>
 
-<para><userinput>--prefix=/usr:</userinput> Sets the prefix for almost all the file 
+<para><userinput>--prefix=/usr</userinput> : Sets the prefix for almost all the file 
 paths to /usr.</para>
 
-<para><userinput>--sysconfdir=/etc:</userinput> Sets the configuration file directory to 
+<para><userinput>--sysconfdir=/etc</userinput> : Sets the configuration file directory to 
 avoid the default of /usr/etc.</para>
 
-<para><userinput>--libexecdir=/usr/sbin:</userinput> Puts the server executables in 
+<para><userinput>--libexecdir=/usr/sbin</userinput> : Puts the server executables in 
 /usr/sbin instead of /usr/libexec.</para>
 
-<para><userinput>--enable-ldbm:</userinput>  Enable the most recent version of the Berkely DB.</para> 
+<para><userinput>--enable-ldbm</userinput> : Enable the most recent version of the Berkely DB.</para> 
 
-<para><userinput>--disable-debug:</userinput> Disable debugging code.</para>  
+<para><userinput>--disable-debug</userinput> : Disable debugging code.</para>  
 <para><userinput>make test:</userinput> Validate correct build of the package.</para>  
 
Index: server/other/openldap/openldap-intro.xml
===================================================================
--- server/other/openldap/openldap-intro.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/openldap/openldap-intro.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -2,5 +2,6 @@
 <title>Introduction to OpenLDAP</title>
 
-<screen>Download location (FTP): <ulink url="&openldap-download-ftp;"/>
+<screen>Download location (HTTP):       <ulink url="&openldap-download-http;"/>
+Download location (FTP):        <ulink url="&openldap-download-ftp;"/>
 Version used:                   &openldap-version;
 Package size:                   &openldap-size;
Index: server/other/openldap/openldap.ent
===================================================================
--- server/other/openldap/openldap.ent	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/openldap/openldap.ent	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -10,4 +10,3 @@
 <!ENTITY openldap-size          "2.0 MB">
 <!ENTITY openldap-download-http "">
-<!ENTITY openldap-download-ftp 
-"ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
+<!ENTITY openldap-download-ftp "ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
Index: server/other/openssh/openssh-config.xml
===================================================================
--- server/other/openssh/openssh-config.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/openssh/openssh-config.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -4,5 +4,5 @@
 <sect3><title>Config files</title>
 
-<para><userinput>/etc/ssh/ssh_config, /etc/ssh/sshd_config </userinput></para>
+<para><userinput>/etc/ssh/ssh_config</userinput>, <userinput>/etc/ssh/sshd_config </userinput></para>
 <para>There are no required changes in either of these files.  However
 you may wish to view them to make changes for appropriate security to
Index: server/other/openssh/openssh-exp.xml
===================================================================
--- server/other/openssh/openssh-exp.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/openssh/openssh-exp.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -2,8 +2,8 @@
 <title>Command explanations</title>
 
-<para><userinput>--sysconfigdir=/etc/ssh :</userinput> This prevents the 
+<para><userinput>--sysconfigdir=/etc/ssh</userinput> : This prevents the 
 configuration files from going to /usr/etc.</para>
 
-<para><userinput>--with-md5-passwords :</userinput> This is required
+<para><userinput>--with-md5-passwords</userinput> : This is required
 if you made the changes recommended by the shadowpasswd_plus lfs hint on
 your ssh server when you installed the Shadow Password Suite or if you
@@ -11,5 +11,5 @@
 md5. </para>
 
-<para><userinput>--libexecdir=/usr/sbin :</userinput> OpenSSH puts
+<para><userinput>--libexecdir=/usr/sbin</userinput> : OpenSSH puts
 programs called by programs in /usr/libexec.  sftp-server is a sshd
 utility and ssh-askpass is a ssh-add utility that is installed as a
Index: server/other/samba/samba-config-exp.xml
===================================================================
--- server/other/samba/samba-config-exp.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/samba/samba-config-exp.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -1,6 +1,6 @@
 <sect2>
 <title>Configuration command explanations</title>
-<para><userinput>cat &gt; /etc/samba/smb.conf &lt;&lt; "EOF" :</userinput>
-Create a default Samba configuration file.  This configuration will
+<para><userinput>cat &gt; /etc/samba/smb.conf &lt;&lt; "EOF"</userinput>
+: Create a default Samba configuration file.  This configuration will
 allow Samba to act as a Primary Domain Controller for a Microsoft
 Windows based network.  If this is not desired, a simpler default
@@ -12,10 +12,10 @@
 
 
-<para><userinput>cat &gt; /etc/rc.d/init.d/samba &lt;&lt; "EOF" :</userinput>
-Create the Samba boot script, used to start and stop Samba
+<para><userinput>cat &gt; /etc/rc.d/init.d/samba &lt;&lt;
+"EOF"</userinput> : Create the Samba boot script, used to start and stop Samba
 automatically on machine startup and shutdown.</para>
 
 <para><screen><userinput>/usr/sbin/useradd -g 100 -d /dev/null -c \
-    "Win2k Server" -s /bin/false win2kbox$ :</userinput></screen>
+    "Win2k Server" -s /bin/false win2kbox$</userinput></screen>
 This command creates a machine trust account, necessary only for
 Windows 2000/NT servers to authenticate to our new PDC.  Machine trust
@@ -23,14 +23,13 @@
 
 <para>
-<userinput>echo "swat 901/tcp" &gt;&gt; /etc/services :</userinput>
-Register the swat service to run on port 901.</para> 
+<userinput>echo "swat 901/tcp" &gt;&gt; /etc/services</userinput> : Register the swat service to run on port 901.</para> 
 
 <para><userinput>echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" &gt;&gt;
-/etc/inetd.conf :</userinput> Instruct inetd where to find and how to
+/etc/inetd.conf</userinput> : Instruct inetd where to find and how to
 run swat.</para> 
 
 <para>
-<userinput>ln -s  /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/S600samba, etc. :</userinput>
-Create the Samba boot scripts, used to start and stop Samba
+<userinput>ln -s  /etc/rc.d/init.d/samba
+/etc/rc.d/rc3.d/S600samba</userinput> etc. : Create the Samba boot scripts, used to start and stop Samba
 automatically on machine startup and shutdown.</para>
 </sect2>
Index: server/other/samba/samba-config.xml
===================================================================
--- server/other/samba/samba-config.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/samba/samba-config.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -12,5 +12,5 @@
 
 <sect3><title>Config files</title>
-<para><userinput>/etc/samba/smb.conf, /etc/rc.d/init.d/samba </userinput></para>
+<para><userinput>/etc/samba/smb.conf</userinput>, <userinput>/etc/rc.d/init.d/samba </userinput></para>
 
 <para>First we set up some directories needed by Samba:</para>
@@ -22,5 +22,5 @@
 
 <para>And the Samba configuration file: </para>
-<para><screen><userinput>cat &gt; /etc/samba/smb.conf &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt; /etc/samba/smb.conf &lt;&lt; "EOF"</userinput>
 [global]
     netbios name = SAMBABOX
@@ -59,5 +59,5 @@
         read only = no
         public = no
-EOF </userinput></screen></para>
+<userinput>EOF </userinput></screen></para>
 
 <para>Now add the machine trust account for WIN2KBOX:</para>
@@ -68,5 +68,5 @@
 
 <para>Create the Samba boot script:</para>
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/samba &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/samba &lt;&lt; "EOF"</userinput>
 #!/bin/bash
 # Begin $rc_base/init.d/samba
@@ -109,5 +109,5 @@
 esac
 # End $rc_base/init.d/samba
-EOF</userinput></screen></para>
+<userinput>EOF</userinput></screen></para>
 <para>Add the run level symlinks:</para>
 <para><screen><userinput>chmod 754 /etc/rc.d/init.d/samba &amp;&amp;
@@ -130,7 +130,5 @@
 first machine we'll join to DOMAIN01 will be WIN2KBOX, the Windows
 2000 Server box we created the machine trust account for.  On
-WIN2KBOX:</para><para><screen><userinput>
-
-1.  Right click on My Computer.
+WIN2KBOX:</para><para><screen><userinput>1.  Right click on My Computer.
 2.  Click on Properties.
 3.  Click on the Network Identification notebook tab.
@@ -145,5 +143,5 @@
 9.  Click OK in the reboot reminder dialog box.
 10. Click OK to close the System Properties window.
-11. Click Yes to reboot WIN2KBOX.  </userinput></screen></para></sect3>
+11. Click Yes to reboot WIN2KBOX.</userinput></screen></para></sect3>
 
 <sect3><title>Add a new user to the DOMAIN01 domain.</title>
@@ -173,5 +171,5 @@
 <para>If xinetd is used, the following command will add the swat entry
 to <filename>/etc/xinetd.conf</filename>: </para>
-<para><screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</userinput>
 service swat
 {
@@ -184,5 +182,5 @@
     log_on_failure  += USERID
 }
-EOF</userinput></screen></para>
+<userinput>EOF</userinput></screen></para>
 
 <para>The Samba Web Administration Tool, swat, can be launched with the
Index: server/other/samba/samba-desc.xml
===================================================================
--- server/other/samba/samba-desc.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/samba/samba-desc.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -34,5 +34,5 @@
 <sect3><title>mount.smbfs</title>
 <para>mount.smbfs provides /bin/mount with a way to mount remote
-windows (or samba) fileshares</para></sect3>
+windows (or samba) fileshares.</para></sect3>
 <sect3><title>nmbd</title>
 <para>nmbd is the Samba NetBIOS name server.</para></sect3>
Index: server/other/samba/samba-exp.xml
===================================================================
--- server/other/samba/samba-exp.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/samba/samba-exp.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -3,18 +3,18 @@
 
 <para><screen><userinput>mkdir -p /etc/samba/private
-mkdir -p /var/cache/samba :</userinput></screen>
+mkdir -p /var/cache/samba</userinput></screen>
 Directories needed for proper operation of the smbd and nmbd daemons.</para>
 
-<para><userinput>--prefix=/usr :</userinput> Sets the prefix for almost all the file paths to /usr.</para>
+<para><userinput>--prefix=/usr</userinput> : Sets the prefix for almost all the file paths to /usr.</para>
 
-<para><userinput>--sysconfdir=/etc :</userinput> Sets the configuration file directory to avoid the default of /usr/etc.</para>
+<para><userinput>--sysconfdir=/etc</userinput> : Sets the configuration file directory to avoid the default of /usr/etc.</para>
 
-<para><userinput>--localstatedir=/var :</userinput> Sets the variable data directory to avoid the default of /usr/var.</para>
+<para><userinput>--localstatedir=/var</userinput> : Sets the variable data directory to avoid the default of /usr/var.</para>
 
-<para><userinput>--with-fhs :</userinput> Assigns all other file paths in a manner compliant with the Filesystem Hierarchy Standard.</para>
+<para><userinput>--with-fhs</userinput> : Assigns all other file paths in a manner compliant with the Filesystem Hierarchy Standard.</para>
 
-<para><userinput>--with-smbmount :</userinput> Orders the creation of an extra binary for use by the mount command so that mounting remote SMB (windows) shares becomes no more complex than mounting remote NFS shares.</para>
+<para><userinput>--with-smbmount</userinput> : Orders the creation of an extra binary for use by the mount command so that mounting remote SMB (windows) shares becomes no more complex than mounting remote NFS shares.</para>
 
-<para><userinput>rm -rf /usr/private : </userinput> Removes a directory erroneously created by source/scripts/installbin.sh during the make install.</para>
+<para><userinput>rm -rf /usr/private</userinput> : Removes a directory erroneously created by source/scripts/installbin.sh during the make install.</para>
 
 </sect2>
Index: server/other/samba/samba-intro.xml
===================================================================
--- server/other/samba/samba-intro.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/samba/samba-intro.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -3,4 +3,5 @@
 
 <screen>Download location (HTTP):       <ulink url="&samba-download-http;"/>
+Download location (FTP):        <ulink url="&samba-download-ftp;"/>
 Version used:                   &samba-version;
 Package size:                   &samba-size;
Index: server/other/samba/samba.ent
===================================================================
--- server/other/samba/samba.ent	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/samba/samba.ent	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -7,7 +7,6 @@
 <!ENTITY samba-config SYSTEM "samba-config.xml">
 <!ENTITY samba-buildsize "45 MB">
-<!ENTITY samba-version "2.2.7a">
-<!ENTITY samba-download-http
-"http://us1.samba.org/samba/ftp/samba-&samba-version;.tar.gz">
+<!ENTITY samba-version "2.2.8">
+<!ENTITY samba-download-http "http://us1.samba.org/samba/ftp/samba-&samba-version;.tar.bz2">
 <!ENTITY samba-download-ftp "">
 <!ENTITY samba-size "5.0 MB">
Index: server/other/xinetd/xinetd-config.xml
===================================================================
--- server/other/xinetd/xinetd-config.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/xinetd/xinetd-config.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -10,5 +10,5 @@
 
 <para>Create the xinetd boot script:</para>
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/xinetd &lt;&lt; "EOF"
+<para><screen><userinput>cat &gt; /etc/rc.d/init.d/xinetd &lt;&lt; "EOF"</userinput>
 #!/bin/bash
 # Begin $rc_base/init.d/xinetd
@@ -44,5 +44,5 @@
 esac
 # End $rc_base/init.d/xinetd
-EOF</userinput></screen></para>
+<userinput>EOF</userinput></screen></para>
 
 <para>Add the run level symlinks:</para>
Index: server/other/xinetd/xinetd-desc.xml
===================================================================
--- server/other/xinetd/xinetd-desc.xml	(revision 79df62689dba842c77b2ae538dbfc25a2e76652f)
+++ server/other/xinetd/xinetd-desc.xml	(revision 677a0f7b622af2726d9b748435d6a35cd821a2a1)
@@ -5,5 +5,5 @@
 <userinput>xinetd</userinput>,
 <userinput>itox</userinput> and
-<userinput>xconv.pl.</userinput></para></sect2>
+<userinput>xconv.pl</userinput>.</para></sect2>
 
 <sect2><title>Description</title>
