Index: basicnet/djb/daemontools/daemontools-exp.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/djb/daemontools/daemontools-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -17,9 +17,9 @@
 difficulty.</para>
 
-<para><command>cd admin/daemontools-0.76</command> : First off, the package is 
+<para><command>cd admin/daemontools-0.76</command>: First off, the package is 
 unpacked in an <filename>admin</filename> directory. You will find the actual 
 packages two directory levels below this.</para>
 
-<para><command>package/compile</command> : This command actually 
+<para><command>package/compile</command>: This command actually 
 compiles the source and prepares the binaries.</para>
 
@@ -41,5 +41,5 @@
 the <filename>/service</filename> directory for daemons to run.</para>
 
-<para><command>cp * /usr/sbin</command> : We must manually copy the 
+<para><command>cp * /usr/sbin</command>: We must manually copy the 
 binaries to the <filename>/usr/sbin</filename> directory.</para>
 
@@ -50,10 +50,10 @@
 </para>
 
-<para><command>mkdir /etc/service</command> : This command creates 
+<para><command>mkdir /etc/service</command>: This command creates 
 the <application>daemontools</application> control directory, which - even if 
 empty - needs to exist for 
 <application>daemontools</application> to run properly.</para>
 
-<para><command>telinit Q</command> : This command tells the <command>init
+<para><command>telinit Q</command>: This command tells the <command>init
 </command> process to re-read its configuration file 
 (<filename>inittab</filename>) and act upon any changes that have been made. 
Index: basicnet/djb/daemontools/daemontools-man-exp.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-man-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/djb/daemontools/daemontools-man-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>gzip -9 *.8</command> : You can compress the man pages
+<para><command>gzip -9 *.8</command>: You can compress the man pages
 to save space, but it isn't needed for the man pages to work.</para>
 
Index: basicnet/mailnews/fetchmail/fetchmail-config.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-config.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/mailnews/fetchmail/fetchmail-config.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -20,5 +20,5 @@
 can add as many users and servers as you need using the same syntax.</para>
 
-<para><command>man fetchmail</command> : Look for the section near
+<para><command>man fetchmail</command>: Look for the section near
 the bottom named <emphasis role="strong">CONFIGURATION EXAMPLES</emphasis> it 
 gives some quick examples too. There are countless other config options once 
Index: basicnet/mailnews/fetchmail/fetchmail-exp.xml
===================================================================
--- basicnet/mailnews/fetchmail/fetchmail-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/mailnews/fetchmail/fetchmail-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,9 +2,9 @@
 <title>Command explanations</title>
 
-<para><command>--with-ssl</command> : This enables
+<para><option>--with-ssl</option>: This enables
 <acronym>SSL</acronym> if found, so that you can handle connections to
 secure <acronym>POP</acronym>3 and <acronym>IMAP</acronym> servers.</para>
 
-<para><command>--enable-fallback=procmail</command> : This tells
+<para><parameter>--enable-fallback=procmail</parameter>: This tells
 <application>Fetchmail</application> to hand incoming mail to
 <application>Procmail</application> for delivery if your port 25 mail server is
Index: basicnet/mailnews/mutt/mutt-exp.xml
===================================================================
--- basicnet/mailnews/mutt/mutt-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/mailnews/mutt/mutt-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,6 +2,7 @@
 <title>Command explanations</title>
 
-<para><command>--sysconfdir=/etc</command> : This installs the configuration 
-files into <filename>/etc</filename> instead of <filename>/usr/etc</filename>.</para>
+<para><parameter>--sysconfdir=/etc</parameter>: This installs the configuration 
+files into <filename class="directory">/etc</filename> instead of
+<filename class="directory">/usr/etc</filename>.</para>
 
 </sect2>
Index: basicnet/mailnews/pine/pine-exp.xml
===================================================================
--- basicnet/mailnews/pine/pine-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/mailnews/pine/pine-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>patch -Np1 -i ../pine-&pine-version;-fhs.patch</command> : This
+<para><command>patch -Np1 -i ../pine-&pine-version;-fhs.patch</command>: This
 patch will make <application>Pine</application> use <filename
 class="directory">/etc</filename> for configuration files.</para>
@@ -11,5 +11,5 @@
 line to the <command>./build</command> script.</para>
 
-<para><command>./build slx</command> : <application>Pine</application> offers 
+<para><command>./build slx</command>: <application>Pine</application> offers 
 quite a few target platforms, slx specifies Linux using
 -lcrypt to get the crypt function.  See the
@@ -17,7 +17,7 @@
 other authentication options.</para>
 <!--
-<para><command>DEBUG='-Os '</command> : Optimize binaries for size.</para>
+<para><command>DEBUG='-Os '</command>: Optimize binaries for size.</para>
 -->
-<para><command>MAILSPOOL='/var/mail'</command> : Location of mail spool files, <filename>/var/mail.</filename></para>
+<para><command>MAILSPOOL='/var/mail'</command>: Location of mail spool files, <filename>/var/mail.</filename></para>
 
 <para><screen><command>cd bin &amp;&amp;
Index: basicnet/mailnews/procmail/procmail-exp.xml
===================================================================
--- basicnet/mailnews/procmail/procmail-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/mailnews/procmail/procmail-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,7 +2,7 @@
 <title>Command explanations</title>
 
-<para><command>BASENAME=/usr</command> : The equivalent of <command>./configure --prefix=/usr</command> on other package installations.</para>
+<para><parameter>BASENAME=/usr</parameter>: The equivalent of <command>./configure --prefix=/usr</command> on other package installations.</para>
 
-<para><command>make install-suid</command> : Modifies permissions of
+<para><command>make install-suid</command>: Modifies permissions of
 the installed files.</para>
 </sect2>
Index: basicnet/mailnews/slrn/slrn-exp.xml
===================================================================
--- basicnet/mailnews/slrn/slrn-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/mailnews/slrn/slrn-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,8 +2,9 @@
 <title>Command explanations</title>
 
-<para><command>./configure --prefix=/usr</command> : Specify
-<filename>/usr</filename> to install to instead of <filename>/usr/local</filename>.</para>
+<para><command>./configure --prefix=/usr</command>: Specify
+<filename class="directory">/usr</filename> to install to instead of
+<filename class="directory">/usr/local</filename>.</para>
 
-<para><command>./configure --with-slrnpull</command> : Build the slrnpull executable.</para>
+<para><command>./configure --with-slrnpull</command>: Build the slrnpull executable.</para>
 
 </sect2>
Index: basicnet/netlibs/gnet/gnet-exp.xml
===================================================================
--- basicnet/netlibs/gnet/gnet-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/netlibs/gnet/gnet-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>--enable-glib2</command> : This switch ensures that
+<para><option>--enable-glib2</option>: This switch ensures that
 <application>gnet</application> will link against
 <applicatin>GLib</application> version 2.  Configure defaults to
Index: basicnet/netlibs/wvstreams/wvstreams-exp.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/netlibs/wvstreams/wvstreams-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>make PREFIX=/usr LDFLAGS="-lcrypt"</command> : 
+<para><parameter>make PREFIX=/usr LDFLAGS="-lcrypt"</parameter>: 
 This fixes <filename class="libraryfile">libwvstreams</filename>' issues 
 with <application>Open<acronym>SSL</acronym></application>'s crypto library.</para>
Index: basicnet/netprogs/inetutils/inetutils-exp.xml
===================================================================
--- basicnet/netprogs/inetutils/inetutils-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/netprogs/inetutils/inetutils-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,17 +2,17 @@
 <title>Command explanations</title>
 
-<para><command>--disable-dependancy-tracking</command> : This switch
+<para><option>--disable-dependancy-tracking</option>: This switch
 speeds up one time builds.</para>
 
-<para><command>--disable-syslogd</command> : This switch  prevents
+<para><option>--disable-syslogd</option>: This switch  prevents
 <application>Inetutils</application> installing a System Log Daemon, which is 
 installed in the <acronym>LFS</acronym> Book.</para>
 
-<para><command>--with-wrap</command> : This switch makes <application>Inetutils
+<para><option>--with-wrap</option>: This switch makes <application>Inetutils
 </application> compile against <application>tcp-wrappers</application>. Omit 
 this option if you didn't install <application>tcp-wrappers</application>.
 </para>
 
-<para><command>--with-pam</command> : This switch makes <application>Inetutils
+<para><option>--with-pam</option>: This switch makes <application>Inetutils
 </application> compile against for <application>Linux-<acronym>PAM</acronym>
 </application>. Add this option if you want to utilize <acronym>PAM</acronym>.
Index: basicnet/netprogs/portmap/portmap-exp.xml
===================================================================
--- basicnet/netprogs/portmap/portmap-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/netprogs/portmap/portmap-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,10 +2,10 @@
 <title>Command explanations</title>
 
-<para><command>patch -Np1 -i ../portmap_5-1.diff</command> : This patch 
+<para><command>patch -Np1 -i ../portmap_5-1.diff</command>: This patch 
 provides added security for the <application>portmap</application> package, 
 including only allowing <command>portmap</command> table changes from the local 
 host.</para>
 
-<para><command>mkdir /usr/share/doc/portmap</command> : This directory must be 
+<para><command>mkdir /usr/share/doc/portmap</command>: This directory must be 
 created before installation.  </para>
 
Index: basicnet/netprogs/tcpwrappers/tcpwrappers-exp.xml
===================================================================
--- basicnet/netprogs/tcpwrappers/tcpwrappers-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/netprogs/tcpwrappers/tcpwrappers-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>patch -Np1 -i ../tcp_wrappers_7.6.diff</command> : This patch 
+<para><command>patch -Np1 -i ../tcp_wrappers_7.6.diff</command>: This patch 
 alters the original path and logging facility of the original tcpwrappers 
 program.</para>
Index: basicnet/netprogs/wget/wget-exp.xml
===================================================================
--- basicnet/netprogs/wget/wget-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/netprogs/wget/wget-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,11 +2,11 @@
 <title>Command explanations</title>
 
-<para><command>--prefix=/usr "</command> : This compiles and installs
-<command>wget</command> into the <filename>/usr</filename> hierarchy instead 
-of <filename>/usr/local</filename>.</para>
+<para><parameter>--prefix=/usr "</parameter>: This compiles and installs
+<command>wget</command> into the <filename class="directory">/usr</filename> hierarchy instead 
+of <filename class="directory">/usr/local</filename>.</para>
 
-<para><command>--sysconfigdir=/etc</command> : This relocates
-the configuration file from <filename>/usr/etc</filename> to
-<filename>/etc</filename>.</para>
+<para><parameter>--sysconfigdir=/etc</parameter>: This relocates
+the configuration file from <filename class="directory">/usr/etc</filename> to
+<filename class="directory">/etc</filename>.</para>
 
 </sect2>
Index: basicnet/netutils/traceroute/traceroute-exp.xml
===================================================================
--- basicnet/netutils/traceroute/traceroute-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/netutils/traceroute/traceroute-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -7,5 +7,5 @@
 <acronym>LFS</acronym> system).</para>
 
-<para><command>make install</command> : Installs <command>traceroute</command> 
+<para><command>make install</command>: Installs <command>traceroute</command> 
 setuid root in the <filename>/usr/sbin</filename> directory. This makes it 
 possible for all users to execute <command>traceroute</command>. For absolute 
Index: basicnet/textweb/links/links-exp.xml
===================================================================
--- basicnet/textweb/links/links-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/textweb/links/links-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>--enable-graphics</command> : Add this switch if you want to 
+<para><option>--enable-graphics</option>: Add this switch if you want to 
 use <application>Links</application> in graphics mode. You will also need to 
 enable framebuffer support in your kernel and install <xref linkend="gpm"/> 
Index: basicnet/textweb/lynx/lynx-exp.xml
===================================================================
--- basicnet/textweb/lynx/lynx-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/textweb/lynx/lynx-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,20 +2,20 @@
 <title>Command explanations</title>
 
-<para><command>--libdir=/etc</command> : For some reason, the
+<para><parameter>--libdir=/etc</parameter>: For some reason, the
 configure and make routine for lynx uses libdir as the prefix for the
-configuration file.  We set this to <filename>/etc</filename> so that the 
+configuration file.  We set this to <filename class="directory">/etc</filename> so that the 
 system wide configuration file is <filename>/etc/lynx.cfg</filename>.</para>
 
-<para><command>--with-ssl</command> : This enables support for
+<para><option>--with-ssl</option>: This enables support for
 linking <acronym>SSL</acronym> into <application>lynx</application>.</para>
 
-<para><command>--with-zlib</command> : This enables support for
+<para><option>--with-zlib</option>: This enables support for
 linking <application>zlib</application> into <application>Lynx</application>.</para>
 
-<para><command>DOCDIR=... HELPDIR=...</command> : We set these
+<para><parameter>DOCDIR=... HELPDIR=...</parameter>: We set these
 variables to avoid getting the help and documentation files installed
 under <filename>/etc</filename>.</para>
 
-<para><command>sed... mv /etc/lynx.bak /etc/lynx.cfg</command> : This 
+<para><command>sed... mv /etc/lynx.bak /etc/lynx.cfg</command>: This 
 <command>sed</command> command changes the <filename>/etc/lynx.cfg</filename> 
 file so it looks for the help files in the correct place.</para>
Index: basicnet/textweb/w3m/w3m-exp.xml
===================================================================
--- basicnet/textweb/w3m/w3m-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ basicnet/textweb/w3m/w3m-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,11 +2,11 @@
 <title>Command explanations</title>
 
-<para><command>./configure -yes</command> : Set all parameters to
+<para><command>./configure -yes</command>: Set all parameters to
 their default values.</para>
 
-<para><command>-lang=en</command> : Set the default language to
+<para><parameter>-lang=en</parameter>: Set the default language to
 English.</para>
 
-<para><command>-model=monster</command> : This sets the build model
+<para><parameter>-model=monster</parameter>: This sets the build model
 to monster. Alternative build models are discussed above.</para>
 
Index: connect/dhcp/dhcpcd/dhcpcd-exp.xml
===================================================================
--- connect/dhcp/dhcpcd/dhcpcd-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ connect/dhcp/dhcpcd/dhcpcd-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -3,27 +3,28 @@
 
 <para><command>patch -Np1 -i ../dhcpcd-&dhcpcd-version;.patch
-</command> : <application>Dhcpcd</application> unpatched puts all configuration 
+</command>: <application>Dhcpcd</application> unpatched puts all configuration 
 and temporary files in <filename>/etc/dhcpc</filename>. This becomes very 
 annoying when <application>dhcpcd</application> tells you it's running and it's 
-not.  You look in <filename>/var/run</filename> for the pid file, but it's not 
+not.  You look in <filename class="directory">/var/run</filename> for the pid file, but it's not 
 there, the pid file that needs deleting is in <filename>/etc/dhcpc</filename>. 
 This patch brings this program into <acronym>FHS</acronym> compliance, but more 
 importantly, puts files where you expect them to be.</para>
 
-<para><command>--prefix=""</command> : There may be a good reason for
+<para><parameter>--prefix=""</parameter>: There may be a good reason for
 abandoning the normal <acronym>BLFS</acronym> convention of using --prefix=/usr 
 here.  If you are installing <acronym>DHCP</acronym>, it is likely that it is 
-required during the boot process and <filename>/usr</filename> may be network 
+required during the boot process and <filename class="directory">/usr</filename> may be network 
 mounted in which case, <command>dhcpcd</command> wouldn't be available due to 
 being on the network!  Therefore, depending on your situation, you may want it 
-to be installed in <filename>/sbin</filename> or <filename>/usr/sbin
-</filename>.  This command installs to <filename>/sbin</filename>.</para>
+to be installed in <filename class="directory">/sbin</filename> or <filename
+class="directory">/usr/sbin
+</filename>.  This command installs to <filename class="directory">/sbin</filename>.</para>
 
-<para><command>--sysconfdir=/var/lib</command> : This command install
-configuration files in the <filename>/var/lib</filename>
+<para><parameter>--sysconfdir=/var/lib</parameter>: This command install
+configuration files in the <filename class="directory">/var/lib</filename>
 directory.</para>
 
-<para><command>--mandir=/usr/share/man</command> : This command
-install the man pages to the <filename>/usr/share/man</filename>
+<para><parameter>--mandir=/usr/share/man</parameter>: This command
+install the man pages to the <filename class="directory">/usr/share/man</filename>
 directory.</para>
 
Index: content/databases/db-3.3/db-3.3-exp.xml
===================================================================
--- content/databases/db-3.3/db-3.3-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ content/databases/db-3.3/db-3.3-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>sed 's/^DB185/DB/' /usr/include/db_185.h > /usr/include/db_185.h.new</command> : Change the DB185 database pointer to DB.</para>
+<para><command>sed 's/^DB185/DB/' /usr/include/db_185.h > /usr/include/db_185.h.new</command>: Change the DB185 database pointer to DB.</para>
 
 </sect2>
Index: content/databases/db/db-exp.xml
===================================================================
--- content/databases/db/db-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ content/databases/db/db-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -3,5 +3,5 @@
 
 <para><command>cd build_unix &amp;&amp; ../dist/configure --prefix=/usr
---enable-compat185</command> : 
+--enable-compat185</command>: 
 This replaces the normal <command>./configure</command> command as
 <application>Berkeley DB</application> comes with the various 
@@ -9,5 +9,5 @@
 
 <para><command>make docdir=/usr/share/doc/db-&db-version; 
-install</command> : This installs the documentation in
+install</command>: This installs the documentation in
 the correct place.</para>
 
Index: content/databases/mysql/mysql-exp.xml
===================================================================
--- content/databases/mysql/mysql-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ content/databases/mysql/mysql-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -3,5 +3,5 @@
 
 <para><command>sed -e "s%mysql-test/Makefile%%" -e "s% mysql-test%%"
-configure.old &gt; configure</command> : This sed is used to disable 
+configure.old &gt; configure</command>: This sed is used to disable 
 the mysql test suite.</para>
 
Index: content/web/apache/apache-exp.xml
===================================================================
--- content/web/apache/apache-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ content/web/apache/apache-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>--enable-mods-shared=all</command> : We want modules
+<para><parameter>--enable-mods-shared=all</parameter>: We want modules
 to be compiled and used as Dynamic Shared Objects
 (<acronym>DSO</acronym>s) so they can be included and excluded from the
Index: general/genlib/gdbm/gdbm-exp.xml
===================================================================
--- general/genlib/gdbm/gdbm-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/genlib/gdbm/gdbm-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,10 +2,10 @@
 <title>Command explanations</title>
 
-<para><command>--infodir=/usr/share/info
---mandir=/usr/share/man</command> : These switches set the documentation
+<para><parameter>--infodir=/usr/share/info
+--mandir=/usr/share/man</parameter>: These switches set the documentation
 directory to <filename class="directory">/usr/share</filename> instead of 
 <filename class="directory">/usr</filename>.</para>
 
-<para><command>BINOWN=root BINGRP=root</command> : This command
+<para><parameter>BINOWN=root BINGRP=root</parameter>: This command
 changes the file ownership to root instead of the bin user.</para>
 
Index: general/genlib/glib/glib2-exp.xml
===================================================================
--- general/genlib/glib/glib2-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/genlib/glib/glib2-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>--enable-gtk-doc</command> : This switch will rebuild
+<para><option>--enable-gtk-doc</option>: This switch will rebuild
 the <acronym>API</acronym> documentation during the
 <command>make</command> command.</para>
Index: general/genlib/gmp/gmp-exp.xml
===================================================================
--- general/genlib/gmp/gmp-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/genlib/gmp/gmp-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,6 +2,8 @@
 <title>Command explanations</title>
 
-<para><command>--infodir=/usr/share/info --mandir=/usr/share/man</command> : These switches set the documentation directory to <filename>/usr/share
-</filename> instead of <filename>/usr</filename>.</para>
+<para><parameter>--infodir=/usr/share/info
+--mandir=/usr/share/man</parameter>: These switches set the
+documentation directory to <filename class="directory">/usr/share
+</filename> instead of <filename class="directory">/usr</filename>.</para>
 
 </sect2>
Index: general/genlib/libfam/libfam-exp.xml
===================================================================
--- general/genlib/libfam/libfam-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/genlib/libfam/libfam-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>patch -Np1 -i ../fam-dnotify.patch</command> : This patch causes 
+<para><command>patch -Np1 -i ../fam-dnotify.patch</command>: This patch causes 
 <application><acronym>FAM</acronym></application> to use the Linux kernel 
 dnotify mechanism to inform the calling process of 
@@ -8,5 +8,5 @@
 modifications.</para>
 
-<para><command>patch -Np1 -i ../fam-gcc3.patch</command> : This patch is 
+<para><command>patch -Np1 -i ../fam-gcc3.patch</command>: This patch is 
 necessary to get <application><acronym>FAM</acronym></application> to compile 
 with gcc-&gcc-version;.</para>
Index: general/genlib/openssl/openssl-exp.xml
===================================================================
--- general/genlib/openssl/openssl-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/genlib/openssl/openssl-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,11 +2,12 @@
 <title>Command explanations</title>
 
-<para><command>no-rc5 no-idea</command> : When added to the ./config 
+<para><option>no-rc5 no-idea</option>: When added to the
+<command>./config</command> 
 command, this will eliminate the building of those encryption methods.
 Patent licenses may be needed for you to utilize either of those methods in 
 your projects.</para>
 
-<para><command>rm doc/apps/passwd.pod </command> : We do this because
-otherwise <application>OpenSSL</application> installs its passwd man page over 
+<para><command>rm doc/apps/passwd.pod </command>: We do this because
+otherwise <application>Open<acronym>SSL</acronym></application> installs its passwd man page over 
 the existing system one which isn't what we want.</para>
 
@@ -18,5 +19,5 @@
 class='directory'>/etc/ssl/man</filename>.</para>
  
-<para><command>rmdir /etc/ssl/lib</command> : This is simply a tidy-up command. For some reason, the <application>openssl</application> install routine creates
+<para><command>rmdir /etc/ssl/lib</command>: This is simply a tidy-up command. For some reason, the <application>openssl</application> install routine creates
 the <filename class='directory'>/etc/ssl/lib</filename> directory even though 
 the libraries have been installed in <filename class='directory'>/usr/lib
Index: general/genlib/readline/readline-exp.xml
===================================================================
--- general/genlib/readline/readline-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/genlib/readline/readline-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>make SHLIB_LIBS=-lcurses</command> : These command makes
+<para><command>make SHLIB_LIBS=-lcurses</command>: These command makes
 the proper symbols available for applications that assume
 <application>readline</application> is compiled linked to
Index: general/genlib/stlport/stlport-exp.xml
===================================================================
--- general/genlib/stlport/stlport-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/genlib/stlport/stlport-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,15 +2,15 @@
 <title>Command explanations</title>
 
-<para><command>GCC_VERSION=...</command> : <application>STLport</application> 
+<para><command>GCC_VERSION=...</command>: <application>STLport</application> 
 needs the location of the <application>C++</application> headers, which are 
 installed in <filename>/usr/include/c++/$GCC_VERSION</filename> if
 installed as per the instructions in <acronym>LFS</acronym>.</para>
 
-<para><command>sed -e ...</command> : Replace the location where <application>
+<para><command>sed -e ...</command>: Replace the location where <application>
 STLport</application> looks for <application>C++</application> headers.</para>
 
-<para><command>cd src</command> : Change to the source directory.</para>
+<para><command>cd src</command>: Change to the source directory.</para>
 
-<para><command>ln -sf gcc-linux.mak Makefile</command> : Use the appropriate
+<para><command>ln -sf gcc-linux.mak Makefile</command>: Use the appropriate
 makefile for our environment.</para>
 
Index: general/graphlib/imlib/imlib-exp.xml
===================================================================
--- general/graphlib/imlib/imlib-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/graphlib/imlib/imlib-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,9 +2,9 @@
 <title>Command explanations</title>
  
-<!--<para><userinput>CPPFLAGS=-w</userinput> : This disables gcc-&gcc-version; 
+<!--<para><userinput>CPPFLAGS=-w</userinput>: This disables gcc-&gcc-version; 
 warnings that confuse configure.</para>-->
 
-<para><command>--sysconfdir=/etc/imlib</command> : This installs and
-combines the configurations files into <filename>/etc</filename> instead
-of <filename>/usr/etc</filename>.</para>
+<para><parameter>--sysconfdir=/etc/imlib</parameter>: This installs and
+combines the configurations files into <filename class="directory">/etc</filename> instead
+of <filename class="directory">/usr/etc</filename>.</para>
 </sect2>
Index: general/graphlib/lcms/lcms-exp.xml
===================================================================
--- general/graphlib/lcms/lcms-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/graphlib/lcms/lcms-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,10 +2,10 @@
 <title>Command explanations</title>
 
-<para><command>make utils</command> : This command can be added to the
+<para><command>make utils</command>: This command can be added to the
 installation to build utilities for converting images using icc
 profiles. This command requires that <xref linkend="libtiff"/> and <xref
 linkend="libjpeg"/> are already installed.</para> 
 
-<para><command>make CC=g++ python</command> :  This command can be added
+<para><command>make CC=g++ python</command>:  This command can be added
 to allow access to <filename class="libraryfile">liblcms</filename> by
 <application>Python</application>.
Index: general/graphlib/libjpeg/libjpeg-exp.xml
===================================================================
--- general/graphlib/libjpeg/libjpeg-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/graphlib/libjpeg/libjpeg-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>./configure --enable-static --enable-shared --prefix=/usr</command> : This command tells libjpeg to build both shared and static libraries and 
+<para><command>./configure --enable-static --enable-shared --prefix=/usr</command>: This command tells libjpeg to build both shared and static libraries and 
 to install them with a base of <filename>/usr</filename>.</para>
 
Index: general/graphlib/libmng/libmng-exp.xml
===================================================================
--- general/graphlib/libmng/libmng-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/graphlib/libmng/libmng-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -3,10 +3,10 @@
 
 <para><screen><command>./configure --prefix=/usr --with-zlib \
---with-jpeg --with-lcms </command></screen>
+--with-jpeg --with-lcms</command></screen>
 This command sets the install directory and also tells the configuration
 routine to look and find <application>zlib</application>, <application>libjpeg
 </application> and <application>lcms</application>.</para>
 
-<para><command>cp doc/man/*.X /usr/share/man/manX</command> : The
+<para><command>cp doc/man/*.X /usr/share/man/manX</command>: The
 install procedure doesn't properly install the man pages so we do it
 manually.</para>
Index: general/graphlib/libpng/libpng-exp.xml
===================================================================
--- general/graphlib/libpng/libpng-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/graphlib/libpng/libpng-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,7 +2,9 @@
 <title>Command explanations</title>
 
-<para><command>ZLIBINC=/usr/include ZLIBLIB=/usr/lib</command> : This forces libpng to look for the zlib includes and libraries where we have them installed.</para>
+<para><parameter>ZLIBINC=/usr/include ZLIBLIB=/usr/lib</parameter>: This
+forces <application>libpng</application> to look for the
+<application>zlib</application> includes and libraries where we have them installed.</para>
 
-<para><command>-f scripts/makefile.linux</command> : This points
+<para><parameter>-f scripts/makefile.linux</parameter>: This points
 make at the Linux version of the makefile as
 <application>libpng</application> doesn't use a
Index: general/graphlib/libtiff/libtiff-exp.xml
===================================================================
--- general/graphlib/libtiff/libtiff-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/graphlib/libtiff/libtiff-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,14 +2,14 @@
 <title>Command explanations</title>
 
-<para><command>--noninteractive</command> : This switch is used to
+<para><option>--noninteractive</option>: This switch is used to
 avoid the configuration routine asking for confirmation of the
 directories to install to (which we pass using switches to configure
 anyways).</para> 
 
-<para><command>--with-DIR_MAN=/usr/share/man</command> : This is
+<para><parameter>--with-DIR_MAN=/usr/share/man</parameter>: This is
 used because despite the fact we pass
-<command>--prefix=/usr</command>, the configure
+<parameter>--prefix=/usr</parameter>, the configure
 routine tries to install the man pages in
-<filename>/usr/local/man</filename> instead of the
+<filename class="directory">/usr/local/man</filename> instead of the
 correct place.</para>
 
Index: general/graphlib/svgalib/svgalib-exp.xml
===================================================================
--- general/graphlib/svgalib/svgalib-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/graphlib/svgalib/svgalib-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -3,5 +3,6 @@
 
 <para><command>cd doc &amp;&amp; for dir in man?; do for file in $dir/*; do
-gunzip /usr/share/man/$file; done; done</command> : SVGAlib installs it's man
+gunzip /usr/share/man/$file; done; done</command>:
+<application>SVGAlib</application> installs it's man
 pages in compressed format so we uncompress them.</para>
 
Index: general/prog/gcc/gcc-exp.xml
===================================================================
--- general/prog/gcc/gcc-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/prog/gcc/gcc-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,9 +2,9 @@
 <title>Command explanations</title>
 
-<para><command>PATH_HOLD=$PATH</command> : This command
+<para><command>PATH_HOLD=$PATH</command>: This command
 stores your current path before it's modified so that it can be restored after
 installation.</para>
 
-<para><command>export PATH=/opt/gnat/bin:$PATH</command> : This
+<para><command>export PATH=/opt/gnat/bin:$PATH</command>: This
 command allows the build to find
 <application><acronym>GNAT</acronym></application>'s
@@ -12,5 +12,5 @@
 <application>Ada</application>.</para>
 
-<para><command>touch treeprs.ads [es]info.h nmake.ad[bs]</command> :
+<para><command>touch treeprs.ads [es]info.h nmake.ad[bs]</command>:
 This command creates necessary files for the
 <application>Ada</application> build. This step
@@ -18,21 +18,20 @@
 <application>Ada</application> frontend.</para>
 
-<para><command>CC=/usr/bin/gcc</command> : This command works around the
+<para><parameter>CC=/usr/bin/gcc</parameter>: This command works around the
 new <envar>PATH</envar> which puts <application><acronym>GNAT</acronym>
 </application>'s <command>gcc</command> as the primary compiler.</para>
 
-<para><command>--enable-languages=c,c++,objc,f77,ada,java</command>
-: This command builds all available languages in the
+<para><parameter>--enable-languages=c,c++,objc,f77,ada,java</parameter>: This command builds all available languages in the
 <application><acronym>GCC</acronym></application> package.
 You may modify this command to remove unwanted languages.</para>
 
-<para><command>--enable-shared --enable-threads=posix
---enable-__cxa_atexit</command> : These commands are required to build
+<para><parameter>--enable-shared --enable-threads=posix
+--enable-__cxa_atexit</parameter>: These commands are required to build
 the <application>C++</application> libraries to published standards.</para>
 
-<para><command>--enable-clocale=gnu</command> : This command is a
+<para><parameter>--enable-clocale=gnu</parameter>: This command is a
 failsafe for incomplete locale data.</para>
 
-<para><command>make gnatlib_and tools</command> : This command
+<para><command>make gnatlib_and tools</command>: This command
 completes the <application>Ada</application> build process. Skip this step if 
 you have not enabled <application>Ada</application> as one of the languages.
Index: general/prog/jdk/j2sdk-exp.xml
===================================================================
--- general/prog/jdk/j2sdk-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/prog/jdk/j2sdk-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,62 +2,62 @@
 <title>Command explanations</title>
 
-<para><command>T=`grep...</command> : Determines the part where the tarfile 
+<para><command>T=`grep...</command>: Determines the part where the tarfile 
 begins in the self extracting archive.</para>
 
-<para><command>patch -Np1 -i j2sdk-${VERSION}-fix-intl-files.patch</command> : 
+<para><command>patch -Np1 -i j2sdk-${VERSION}-fix-intl-files.patch</command>: 
 Patch to fix duplicate messages in the intl files.</para>
-<para><command>patch -Np1 -i j2sdk-${VERSION}-link-missing-libs.patch</command> : Patch to add missing libs to fix unresolved symbols.</para>
+<para><command>patch -Np1 -i j2sdk-${VERSION}-link-missing-libs.patch</command>: Patch to add missing libs to fix unresolved symbols.</para>
 <para><command>patch -Np1 -i j2sdk-${VERSION}-remove-fixed-paths.patch
-</command> : The build wants the binaries in specific locations, this patch 
+</command>: The build wants the binaries in specific locations, this patch 
 modifies this to use the current <envar>PATH</envar> environment to find 
 binaries.</para>
-<para><command>patch -Np1 -i j2sdk-${VERSION}-syntax-fixes.patch</command> : 
+<para><command>patch -Np1 -i j2sdk-${VERSION}-syntax-fixes.patch</command>: 
 Patch to fix syntax for <application><acronym>GCC</acronym>-3</application>.
 </para>
 <para><command>patch -Np1 -i j2sdk-${VERSION}-use-included-motif.patch
-</command> : Patch to rename the internal motif library to avoid conflicts with 
+</command>: Patch to rename the internal motif library to avoid conflicts with 
 an incompatible system installed version.</para>
 
-<para><command>export ALT_BOOTDIR="$JAVA_HOME"</command> : This var sets 
+<para><command>export ALT_BOOTDIR="$JAVA_HOME"</command>: This var sets 
 location of the bootstrap <acronym>JDK</acronym>.
 </para>
 
-<para><command>export ALT_MOZILLA_PATH=$PWD</command> : This sets the
+<para><command>export ALT_MOZILLA_PATH=$PWD</command>: This sets the
 variable that points to where you unzipped the <application>Mozilla
 </application> headers.</para>
 
-<para><command>export ALT_DEVTOOLS_PATH="/usr/bin"</command> : This
+<para><command>export ALT_DEVTOOLS_PATH="/usr/bin"</command>: This
 changes the location where the build finds the needed executables.
 </para>
 
-<para><command>export BUILD_NUMBER="blfs-`date +%s`"</command> : This will
+<para><command>export BUILD_NUMBER="blfs-`date +%s`"</command>: This will
 help you identify this compiled version of the runtime environment and
 virtual machine by appending this information to the version in the
 output to <command>java -version</command>.</para>
 
-<para><command>export DEV_ONLY=true</command> : This command
+<para><command>export DEV_ONLY=true</command>: This command
 eliminates compiling the documentation and eliminates a dependency for
 <application>rpm</application>. </para>
 
-<para><command>unset JAVA_HOME</command> : This clears the
+<para><command>unset JAVA_HOME</command>: This clears the
 <envar>JAVA_HOME</envar>
 variable and prevents misdirection during compile.</para>
 
-<para><command>unset CLASSPATH</command> : This clears the
+<para><command>unset CLASSPATH</command>: This clears the
 <envar>CLASSPATH</envar> variable and prevents misdirection during compile.
 </para>
 
-<para><command>unset CFLAGS...</command> : These flags cause miscompilation
+<para><command>unset CFLAGS...</command>: These flags cause miscompilation
 of the build. Never set these.</para>
 
-<para><command>export INSANE=true</command> : Unless you specify that you
+<para><command>export INSANE=true</command>: Unless you specify that you
 are insane the build will not proceed. The certified platform for the build is
 Redhat 6.1. The above variable ensures that all the errors related to
 compiling on a non-certified platform will be converted to warnings.</para>
 
-<para><command>export MAKE_VERBOSE=true</command> : Allows the current
+<para><command>export MAKE_VERBOSE=true</command>: Allows the current
 compilation command to be displayed on the console.</para>
 
-<para><command>export ALT_CACERTS_FILE...</command> : Specifies the 
+<para><command>export ALT_CACERTS_FILE...</command>: Specifies the 
 certificate file to use.</para>
 
Index: general/prog/librep/librep-exp.xml
===================================================================
--- general/prog/librep/librep-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/prog/librep/librep-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,7 +2,7 @@
 <title>Command explanations</title>
 
-<para><command>--libexec=/usr/lib</command> : This command installs
-files to <filename>/usr/lib/rep</filename> instead of
-<filename>/user/libexec/rep</filename>.</para>
+<para><parameter>--libexec=/usr/lib</parameter>: This command installs
+files to <filename class="directory">/usr/lib/rep</filename> instead of
+<filename class="directory">/user/libexec/rep</filename>.</para>
 
 </sect2>
Index: general/sysutils/cpio/cpio-exp.xml
===================================================================
--- general/sysutils/cpio/cpio-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/sysutils/cpio/cpio-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,11 +2,11 @@
 <title>Command explanations</title>
 
-<para><command>--libexec=/usr/bin</command> : This command installs
-<command>rmt</command> to <filename>/usr/sbin</filename> instead of
-<filename>/usr/libexec</filename>.</para>
+<para><parameter>--libexec=/usr/sbin</parameter>: This command installs
+<command>rmt</command> to <filename class="directory">/usr/sbin</filename> instead of
+<filename class="directory">/usr/libexec</filename>.</para>
 
-<para><command>--bindir=/bin</command> : This command installs
-<command>cpio</command> to <filename>/bin</filename> instead of
-<filename>/usr/bin</filename> as per <acronym>FHS</acronym> guidelines.</para>
+<para><parameter>--bindir=/bin</parameter>: This command installs
+<command>cpio</command> to <filename class="directory">/bin</filename> instead of
+<filename class="directory">/usr/bin</filename> as per <acronym>FHS</acronym> guidelines.</para>
 
 </sect2>
Index: general/sysutils/fcron/fcron-exp.xml
===================================================================
--- general/sysutils/fcron/fcron-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/sysutils/fcron/fcron-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,12 +2,12 @@
 <title>Command explanations</title>
 
-<para><command>--without-sendmail</command> : <application>Fcron</application> 
+<para><option>--without-sendmail</option>: <application>Fcron</application> 
 does not require an <acronym>MTA</acronym> to run but will use one, if it is 
 installed, to email you the results of the <command>fcron</command> script. If 
 you wish to utilize this feature change the switch to 
-<command>--with-sendmail=<replaceable>[path to your MTA]</replaceable>
-</command>.</para>
+<parameter>--with-sendmail=<replaceable>[path to your MTA]</replaceable>
+</parameter>.</para>
 
-<para><command>--with-answer-all=no</command> : After the files are
+<para><parameter>--with-answer-all=no</parameter>: After the files are
 installed, the make install script enters into a configuration routine.
 The first test will be whether to install a boot script in the <filename
@@ -18,6 +18,6 @@
 <acronym>BLFS</acronym> template we answer 'n' to both tests.</para>
 
-<para><command>--with-dsssl-dir=/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;
-</command> : Can be added if you have installed
+<para><parameter>--with-dsssl-dir=/usr/share/sgml/docbook/dsssl-stylesheets-&docbook-dsssl-version;
+</parameter>: Can be added if you have installed
 <application>OpenJade</application> and
 dsssl-stylesheets to generate the documentation from the DocBook source
Index: general/sysutils/gpm/gpm-inst.xml
===================================================================
--- general/sysutils/gpm/gpm-inst.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ general/sysutils/gpm/gpm-inst.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -22,5 +22,5 @@
 <title>Command explanations</title>
 
-<para><command>export LDFLAGS="-lm"</command> : The math library
+<para><command>export LDFLAGS="-lm"</command>: The math library
  must be linked with <command>gpm</command>, as ceil() is used in some cursor 
 scrolling logic. <envar>LDFLAGS</envar> is only needed if you optimize
Index: server/mail/courier/courier-exp.xml
===================================================================
--- server/mail/courier/courier-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ server/mail/courier/courier-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,24 +2,30 @@
 <title>Command explanations</title>
 
-<para><command>--sysconfdir=/etc/courier</command> : Specifies the directory where Courier's configuration
+<para><parameter>--sysconfdir=/etc/courier</parameter>: Specifies the
+directory where <application>Courier</application>'s configuration
 files are installed.</para>
 
-<para><command>--with-piddir=/var/run</command> : Specfies the directory where Courier's pid files are stored
-when Courier is active.</para>
+<para><parameter>--with-piddir=/var/run</parameter>: Specfies the
+directory where <application>Courier</application>'s pid files are stored
+when <application>Courier</application> is active.</para>
 
-<para><command>--libexecdir=/usr/libexec</command> : libexecdir contains programs and libraries that cannot
+<para><parameter>--libexecdir=/usr/sbin</parameter>: libexecdir contains programs and libraries that cannot
 be directly executed from the command line.</para>
 
-<para><command>--datadir=/usr/share/courier</command> : Specifies the directory where miscellaneous shell
-scripts, Perl scripts, and data files will be installed.</para>
+<para><parameter>--datadir=/usr/share/courier</parameter>: Specifies the directory where miscellaneous shell
+scripts, <application>Perl</application> scripts, and data files will be installed.</para>
 
-<para><command> --localstatedir=/var/lib/courier</command> : specifies the directory that will hold the mail 
+<para><parameter>--localstatedir=/var/lib/courier</parameter>: specifies the directory that will hold the mail 
 queue, and other temporary data. This option defaults to the subdirectory "var" in the directory specified
 by the --prefix option.</para>
 
-<para><command>--disable-root-check</command> : Allows Courier to be built as the root user.</para>
+<para><option>--disable-root-check</option>: Allows
+<application>Courier</application> to be built as the root user.</para>
 
-<para><command>--with-db=gbbm</command> : Courier requires either the GDBM or the DB database library.
-GDBM is used if both are present. This option forces the selection of the database library.
+<para><parameter>--with-db=gbbm</parameter>:
+<application>Courier</application> requires either the
+<application><acronym>GDBM</acronym></application> or the
+<application>DB</application> database library.
+<application><acronym>GDBM</acronym></application> is used if both are present. This option forces the selection of the database library.
 </para>
 
@@ -27,17 +33,22 @@
 will not be created correctly -->
 
-<para><command>--with-mailuser=courier</command> : All except two Courier daemons run as a non-privileged
-user. This option specifies the userid that Courier will install and run as.</para>
+<para><parameter>--with-mailuser=courier</parameter>: All except two
+<application>Courier</application> daemons run as a non-privileged
+user. This option specifies the userid that
+<application>Courier</application> will install and run as.</para>
 
-<para><command>--withmailgroup=courier</command> : like --with-mailuser, but specifies the group ID.</para>
+<para><parameter>--withmailgroup=courier</parameter>: like --with-mailuser, but specifies the group ID.</para>
 
-<para><command>--enable-workarounds-for-imap-client-bugs</command> : there are several confirmed bugs in some
-IMAP clients that do not properly implement the IMAP4rev1 protocol. This option enables some workarounds for
-those buggy IMAP clients. NOTE: make check will fail if this option is used. You should first configure
+<para><option>--enable-workarounds-for-imap-client-bugs</option>: there are several confirmed bugs in some
+<acronym>IMAP</acronym> clients that do not properly implement the
+<acronym>IMAP</acronym>4rev1 protocol. This option enables some workarounds for
+those buggy <acronym>IMAP</acronym> clients. NOTE: make check will fail if this option is used. You should first configure
 without this option, and if all post-configuration tests succeed, rerun configure with this option and recompile.</para>
 
-<para><command>--with-ispell=/usr/bin/aspell</command> : Courier's webmail server can use spell checking, if
+<para><parameter>--with-ispell=/usr/bin/aspell</parameter>:
+<application>Courier</application>'s webmail server can use spell checking, if
 the aspell program is available. If configure finds ispell, spell checking is enabled. If aspell is not in the
-current search path, use --with-ispell=program to explicitly set the location of aspell.</para>
+current search path, use --with-ispell=program to explicitly set the
+location of <application>aspell</application>.</para>
 
 </sect2>
Index: server/mail/courier/courier-inst.xml
===================================================================
--- server/mail/courier/courier-inst.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ server/mail/courier/courier-inst.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -13,5 +13,5 @@
 
 <screen><userinput><command>./configure ./configure --prefix=/usr --sysconfdir=/etc/courier --with-piddir=/var/run \
---libexecdir=/usr/libexec --datadir=/usr/share/courier \
+--libexecdir=/usr/sbin --datadir=/usr/share/courier \
 --localstatedir=/var/lib/courier --disable-root-check --with-db=gdbm \
 --with-mailuser=courier --withmailgroup=courier \
Index: server/mail/exim/exim-exp.xml
===================================================================
--- server/mail/exim/exim-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ server/mail/exim/exim-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>sed -e ... > Local/Makefile</command> : Many of exim's
+<para><command>sed -e ... > Local/Makefile</command>: Many of exim's
 configuration options are compiled in. Here, we specify the minimum set
 of options, BIN_DIRECTORY, CONFIGURE_FILE and EXIM_USER. We also defer
@@ -8,5 +8,5 @@
 support, by commenting out the EXIM_MONITOR line in the Makefile.</para>
 
-<para><command>ln -s exim /usr/sbin/sendmail</command> :
+<para><command>ln -s exim /usr/sbin/sendmail</command>:
 Create a link to sendmail for applications which need it. exim will
 accept most Sendmail command line options.</para>
Index: server/other/cvsserver/cvsserver-exp.xml
===================================================================
--- server/other/cvsserver/cvsserver-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ server/other/cvsserver/cvsserver-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,18 +2,18 @@
 <title>Command explanations</title>
 
-<para><command>mkdir /cvsroot</command> : Create the <acronym>CVS</acronym> 
+<para><command>mkdir /cvsroot</command>: Create the <acronym>CVS</acronym> 
 repository directory.</para>
 
-<para><command>chmod 1777 /cvsroot</command> : Sticky bit permissions for 
+<para><command>chmod 1777 /cvsroot</command>: Sticky bit permissions for 
 <envar>CVSROOT</envar>.</para>
 
-<para><command>export CVSROOT=/cvsroot</command> : Specify new <envar>CVSROOT
+<para><command>export CVSROOT=/cvsroot</command>: Specify new <envar>CVSROOT
 </envar> for all <command>cvs</command> commands.</para>
 
-<para><command>cvs init</command> : Initialize the new <acronym>CVS</acronym> 
+<para><command>cvs init</command>: Initialize the new <acronym>CVS</acronym> 
 repository.</para>
 
 <para><command>cvs import -m "repository test" cvstest vendortag
-releasetag</command> : All source code modules must be imported
+releasetag</command>: All source code modules must be imported
 into the <acronym>CVS</acronym> repository before use, with the
 <command>cvs import</command> command.  the <userinput>-m</userinput> 
@@ -25,12 +25,12 @@
 
 <para><command>(grep anonymous /etc/passwd || useradd anonymous -s
-/bin/false)</command>  : Check for an existing anonymous user and
+/bin/false)</command>: Check for an existing anonymous user and
 create one if not found.</para>
 
 <para><command>echo anonymous: &gt; /cvsroot/CVSROOT/passwd
-</command> : Add the anonymous user to the <acronym>CVS</acronym> passwd file, 
+</command>: Add the anonymous user to the <acronym>CVS</acronym> passwd file, 
 which is unused for anything else in this configuration.</para>
 
-<para><command>echo anonymous &gt; /cvsroot/CVSROOT/readers</command> : Add the 
+<para><command>echo anonymous &gt; /cvsroot/CVSROOT/readers</command>: Add the 
 anonymous user to the <acronym>CVS</acronym> readers file, a list of
 users who have read only access to the repository.</para>
Index: server/other/dhcp/dhcp-exp.xml
===================================================================
--- server/other/dhcp/dhcp-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ server/other/dhcp/dhcp-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>LIBDIR=/usr/lib INCDIR=/usr/include</command> : This
+<para><parameter>LIBDIR=/usr/lib INCDIR=/usr/include</parameter>: This
 command installs the library and include files in <filename
 class="directory">/usr</filename> instead of <filename
Index: server/other/leafnode/leafnode-exp.xml
===================================================================
--- server/other/leafnode/leafnode-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ server/other/leafnode/leafnode-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,13 +2,13 @@
 <title>Installation command explanations</title>
 
-<para><command>--localstatedir=/var</command> : Change the default
-spool directory of <filename>/usr/var</filename>.</para>
+<para><parameter>--localstatedir=/var</parameter>: Change the default
+spool directory of <filename class="directory">/usr/var</filename>.</para>
 
-<para><command>--sysconfdir=/etc/news</command> : leafnode reads its
+<para><parameter>--sysconfdir=/etc/news</parameter>: leafnode reads its
 configuration data from a file called <filename>config</filename> which
 will be created in <filename class="directory">/etc/news</filename> to
 avoid any potential conflict with other packages.</para>
 
-<para><command>make update</command> : Create an initial
+<para><command>make update</command>: 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-exp.xml
===================================================================
--- server/other/openldap/openldap-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ server/other/openldap/openldap-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,19 +2,19 @@
 <title>Command explanations</title>
 
-<para><command>--sysconfdir=/etc</command> : Sets the configuration file directory to 
+<para><parameter>--sysconfdir=/etc</parameter>: Sets the configuration file directory to 
 avoid the default of <filename class="directory">/usr/etc</filename>.</para>
 
-<para><command>--libexecdir=/usr/sbin</command> : Puts the server executables in 
+<para><parameter>--libexecdir=/usr/sbin</parameter>: Puts the server executables in 
 <filename class="directory">/usr/sbin</filename> instead of <filename
 class="directory">/usr/libexec</filename>.</para>
 
-<para><command>--enable-ldbm</command> : Build <command>slapd</command>
+<para><option>--enable-ldbm</option>: Build <command>slapd</command>
 with primary database backend using either <application>Berkeley
 DB</application> or
 <application><acronym>GNU</acronym> Database Manager</application>.</para> 
 
-<para><command>--disable-debug</command> : Disable debugging code.</para>  
+<para><option>--disable-debug</option>: Disable debugging code.</para>  
 
-<para><command>make test</command> : Validate correct build of the package.</para>  
+<para><command>make test</command>: Validate correct build of the package.</para>  
 
 </sect2>
Index: server/other/openssh/openssh-exp.xml
===================================================================
--- server/other/openssh/openssh-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ server/other/openssh/openssh-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,8 +2,8 @@
 <title>Command explanations</title>
 
-<para><command>--sysconfigdir=/etc/ssh</command> : This prevents the 
-configuration files from going to <filename>/usr/etc</filename>.</para>
+<para><parameter>--sysconfigdir=/etc/ssh</parameter>: This prevents the 
+configuration files from going to <filename class="directory">/usr/etc</filename>.</para>
 
-<para><command>--with-md5-passwords</command> : This is required
+<para><parameter>--with-md5-passwords</parameter>: This is required
 if you made the changes recommended by the shadowpasswd_plus lfs hint on
 your <acronym>SSH</acronym> server when you installed the Shadow Password 
@@ -11,5 +11,5 @@
 user passwords encrypted with md5. </para>
 
-<para><command>--libexecdir=/usr/sbin</command> :
+<para><parameter>--libexecdir=/usr/sbin</parameter>:
 <application>Open<acronym>SSH</acronym></application> puts
 programs called by programs in <filename class="directory">/usr/libexec
Index: server/other/samba/samba-config-exp.xml
===================================================================
--- server/other/samba/samba-config-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ server/other/samba/samba-config-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -14,5 +14,5 @@
 
 <para><command>cat &gt; /etc/rc.d/init.d/samba &lt;&lt;
-"EOF"</command> : Create the <application>Samba</application> boot script, 
+"EOF"</command>: Create the <application>Samba</application> boot script, 
 used to start and stop <application>Samba</application> automatically on 
 machine startup and shutdown.</para>
@@ -24,13 +24,13 @@
 Machine trust accounts are not necessary for Win95/98 clients.</para>
 
-<para><command>echo "swat 901/tcp" &gt;&gt; /etc/services</command> : Register 
+<para><command>echo "swat 901/tcp" &gt;&gt; /etc/services</command>: Register 
 the swat service to run on port 901.</para> 
 
 <para><command>echo "swat stream tcp nowait.400 root /usr/sbin/swat swat" 
-&gt;&gt; /etc/inetd.conf</command> : Instruct <command>inetd</command> where to find and how to
+&gt;&gt; /etc/inetd.conf</command>: Instruct <command>inetd</command> where to find and how to
 run swat.</para> 
 
 <para><command>ln -s  /etc/rc.d/init.d/samba /etc/rc.d/rc3.d/S600samba
-</command> etc. : Create the <application>Samba</application> boot scripts, 
+</command> etc.: Create the <application>Samba</application> boot scripts, 
 used to start and stop <application>Samba</application> automatically on 
 machine startup and shutdown.</para>
Index: server/other/samba/samba-exp.xml
===================================================================
--- server/other/samba/samba-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ server/other/samba/samba-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -7,22 +7,22 @@
 and <command>nmbd</command> daemons.</para>
 
-<para><command>--prefix=/usr</command> : Sets the prefix for almost
-all the file paths to <filename>/usr</filename>.</para>
+<para><parameter>--prefix=/usr</parameter>: Sets the prefix for almost
+all the file paths to <filename class="directory">/usr</filename>.</para>
 
-<para><command>--sysconfdir=/etc</command> : Sets the configuration
-file directory to avoid the default of <filename>/usr/etc</filename>.</para>
+<para><parameter>--sysconfdir=/etc</parameter>: Sets the configuration
+file directory to avoid the default of <filename class="directory">/usr/etc</filename>.</para>
 
-<para><command>--localstatedir=/var</command> : Sets the variable
-data directory to avoid the default of <filename>/usr/var</filename>.</para>
+<para><parameter>--localstatedir=/var</parameter>: Sets the variable
+data directory to avoid the default of <filename class="directory">/usr/var</filename>.</para>
 
-<para><command>--with-fhs</command> : Assigns all other file paths in a manner 
-compliant with the Filesystem Hierarchy Standard (FHS).</para>
+<para><option>--with-fhs</option>: Assigns all other file paths in a manner 
+compliant with the Filesystem Hierarchy Standard (<acronym>FHS</acronym>).</para>
 
-<para><command>--with-smbmount</command> : Orders the creation of an extra 
+<para><option>--with-smbmount</option>: Orders the creation of an extra 
 binary for use by the <command>mount</command> command so that mounting remote 
 <acronym>SMB</acronym> (windows) shares becomes no more complex than mounting 
 remote <acronym>NFS</acronym> shares.</para>
 
-<para><command>rm -rf /usr/private</command> : Removes a directory
+<para><command>rm -rf /usr/private</command>: Removes a directory
 erroneously created by <filename>source/scripts/installbin.sh</filename> during the make install.</para>
 
Index: server/other/xinetd/xinetd-exp.xml
===================================================================
--- server/other/xinetd/xinetd-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ server/other/xinetd/xinetd-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>./configure --prefix=/usr</command> : Change 
+<para><command>./configure --prefix=/usr</command>: Change 
 the default installation directory of 
 <filename class="directory">/usr/local</filename>.</para>
Index: x/wm/enlightenment/enlightenment-exp.xml
===================================================================
--- x/wm/enlightenment/enlightenment-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ x/wm/enlightenment/enlightenment-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -2,7 +2,9 @@
 <title>Command explanations</title>
 
-<para><userinput>--enable-fsstd</userinput> : This command installs
-files in <filename>/usr/bin</filename> and <filename> /usr/share</filename> 
-instead of <filename>/usr/enlightenment/bin</filename> and <filename> usr/enlightenment</filename>.</para>
+<para><option>--enable-fsstd</option>: This command installs
+files in <filename class="directory">/usr/bin</filename> and <filename
+class="directory">/usr/share</filename> 
+instead of <filename class="directory">/usr/enlightenment/bin</filename>
+and <filename class="directory">usr/enlightenment</filename>.</para>
 
 </sect2>
Index: x/wm/sawfish/sawfish-exp.xml
===================================================================
--- x/wm/sawfish/sawfish-exp.xml	(revision 0d2f891b0e632eaea353e6e06a297b421ce06e85)
+++ x/wm/sawfish/sawfish-exp.xml	(revision 0482b012c6d5a409f6aaf2928fbd4220ef27d332)
@@ -9,5 +9,5 @@
 sawfish</application> to use the Enlightened Sound Daemon.</para>
 
-<para><option>--with-gnome-prefix=/opt/gnome-&gnome-version;</option> : This
+<para><option>--with-gnome-prefix=/opt/gnome-&gnome-version;</option>: This
 command directs <application>sawfish</application> to
 <application><acronym>GNOME</acronym></application>'s directory.</para> 
