Index: multimedia/audioutils/mpg123/mpg123-exp.xml
===================================================================
--- multimedia/audioutils/mpg123/mpg123-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/audioutils/mpg123/mpg123-exp.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -2,8 +2,8 @@
 <title>Command explanations</title>
 
-<para><command>make linux</command> : This command builds 
+<para><command>make linux</command>: This command builds 
 <application>mpg123</application> for Linux.</para>
 
-<para><command>make linux-help</command> : This command lists 
+<para><command>make linux-help</command>: This command lists 
 all build-options for <application>mpg123</application>.</para>
 
Index: multimedia/cdwriteutils/udftools/udftools-exp.xml
===================================================================
--- multimedia/cdwriteutils/udftools/udftools-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/cdwriteutils/udftools/udftools-exp.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>COMMAND</command> : This command does something.</para>
+<para><command>COMMAND</command>: This command does something.</para>
 
 </sect2>
Index: multimedia/libdriv/alsa/alsa-driver.xml
===================================================================
--- multimedia/libdriv/alsa/alsa-driver.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/alsa-driver.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,5 +1,5 @@
-<sect1 id="alsa-driver" xreflabel="ALSA-driver-&alsa-driver-version;">
+<sect1 id="alsa-driver" xreflabel="ALSA Driver-&alsa-driver-version;">
 <?dbhtml filename="alsa-driver.html" dir="multimedia"?>
-<title>ALSA-driver-&alsa-driver-version;</title>
+<title>ALSA Driver-&alsa-driver-version;</title>
 
 &alsa-driver-intro;
Index: multimedia/libdriv/alsa/alsa-lib.xml
===================================================================
--- multimedia/libdriv/alsa/alsa-lib.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/alsa-lib.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,5 +1,5 @@
-<sect1 id="alsa-lib" xreflabel="ALSA-lib-&alsa-lib-version;">
+<sect1 id="alsa-lib" xreflabel="ALSA Library-&alsa-lib-version;">
 <?dbhtml filename="alsa-lib.html" dir="multimedia"?>
-<title>ALSA-lib-&alsa-lib-version;</title>
+<title>ALSA Library-&alsa-lib-version;</title>
 
 &alsa-lib-intro;
Index: multimedia/libdriv/alsa/alsa-oss.xml
===================================================================
--- multimedia/libdriv/alsa/alsa-oss.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/alsa-oss.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,5 +1,5 @@
-<sect1 id="alsa-oss" xreflabel="ALSA-OSS-&alsa-oss-version;">
+<sect1 id="alsa-oss" xreflabel="ALSA OSS-&alsa-oss-version;">
 <?dbhtml filename="alsa-oss.html" dir="multimedia"?>
-<title>ALSA-OSS-&alsa-oss-version;</title>
+<title>ALSA OSS-&alsa-oss-version;</title>
 
 &alsa-oss-intro;
Index: multimedia/libdriv/alsa/alsa-tools.xml
===================================================================
--- multimedia/libdriv/alsa/alsa-tools.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/alsa-tools.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,5 +1,5 @@
-<sect1 id="alsa-tools" xreflabel="ALSA-tools-&alsa-tools-version;">
+<sect1 id="alsa-tools" xreflabel="ALSA Tools-&alsa-tools-version;">
 <?dbhtml filename="alsa-tools.html" dir="multimedia"?>
-<title>ALSA-tools-&alsa-tools-version;</title>
+<title>ALSA Tools-&alsa-tools-version;</title>
 
 &alsa-tools-intro;
Index: multimedia/libdriv/alsa/alsa-utils.xml
===================================================================
--- multimedia/libdriv/alsa/alsa-utils.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/alsa-utils.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,5 +1,5 @@
-<sect1 id="alsa-utils" xreflabel="ALSA-utils-&alsa-utils-version;">
+<sect1 id="alsa-utils" xreflabel="ALSA Utilities-&alsa-utils-version;">
 <?dbhtml filename="alsa-utils.html" dir="multimedia"?>
-<title>ALSA-utils-&alsa-utils-version;</title>
+<title>ALSA Utilities-&alsa-utils-version;</title>
 
 &alsa-utils-intro;
Index: multimedia/libdriv/alsa/driver/alsa-driver-config.xml
===================================================================
--- multimedia/libdriv/alsa/driver/alsa-driver-config.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/driver/alsa-driver-config.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application><acronym>ALSA</acronym>-driver</application></title>
+<title>Configuring <application><acronym>ALSA</acronym> Driver</application></title>
 
 <sect3><title>Config files</title>
Index: multimedia/libdriv/alsa/driver/alsa-driver-desc.xml
===================================================================
--- multimedia/libdriv/alsa/driver/alsa-driver-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/driver/alsa-driver-desc.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application><acronym>ALSA</acronym>-driver</application> package 
+<para>The <application><acronym>ALSA</acronym> Driver</application> package 
 contains the <acronym>ALSA</acronym> sound card drivers and include files.
 </para>
@@ -17,5 +17,5 @@
 <para>These are installed in <filename class="directory">/usr/include/sound
 </filename> and are required to compile certain packages such as
-<application><acronym>ALSA</acronym>-lib</application>.
+<application><acronym>ALSA</acronym> Libraries</application>.
 </para></sect3>
 
Index: multimedia/libdriv/alsa/driver/alsa-driver-exp.xml
===================================================================
--- multimedia/libdriv/alsa/driver/alsa-driver-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/driver/alsa-driver-exp.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -2,24 +2,24 @@
 <title>Command explanations</title>
 
-<para><command>--with-sequencer=yes</command> : This tells the <application>
-<acronym>ALSA</acronym>-driver</application> package to build the sequencer 
+<para><parameter>--with-sequencer=yes</parameter>: This tells the <application>
+<acronym>ALSA</acronym> Driver</application> package to build the sequencer 
 modules for whichever soundcards for which you are building. Most people want 
 them so you will usually want to leave it set to yes.</para>
 
-<para><command>--with-oss=yes</command> : This tells the package to
+<para><parameter>--with-oss=yes</parameter>: This tells the package to
 build the <acronym>OSS</acronym>/Free emulation modules. Again, most people 
 want this so it's probably best to stick with yes.</para>
 
-<para><command>--with-isapnp=no</command> : Most sound cards these days
+<para><parameter>--with-isapnp=no</parameter>: Most sound cards these days
 are <acronym>PCI</acronym> and so <acronym>ISA</acronym> Plug and Play 
 support isn't needed. If you are using an <acronym>ISA</acronym> soundcard, 
 it's best to say yes here.</para>
 
-<para><command>--with-cards=all</command> : You can tell the script just
+<para><parameter>--with-cards=all</parameter>: You can tell the script just
 to build the drivers for your particular sound card here. For full information
 on which drivers are available see <command>./configure
 --help</command>. If you aren't sure which chipset your soundcard uses,
 have a look in <filename>CARDS-STATUS</filename> in the
-<application><acronym>ALSA</acronym>-driver</application> source
+<application><acronym>ALSA</acronym> Driver</application> source
 tree. The default specified here will build all drivers.</para>
 
Index: multimedia/libdriv/alsa/driver/alsa-driver-inst.xml
===================================================================
--- multimedia/libdriv/alsa/driver/alsa-driver-inst.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/driver/alsa-driver-inst.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Installation of <application><acronym>ALSA</acronym>-driver</application></title>
+<title>Installation of <application><acronym>ALSA</acronym> Driver</application></title>
 
 <para>Before installing the <application><acronym>ALSA</acronym></application> 
@@ -15,5 +15,5 @@
 used.</para></note>
 
-<para>Install <application><acronym>ALSA</acronym>-driver</application> using 
+<para>Install <application><acronym>ALSA</acronym> Driver</application> using 
 the following commands as a template:</para>
 
@@ -32,5 +32,5 @@
 will need to create the <filename class="directory">/dev</filename> entries
 using the script provided in the
-<application><acronym>ALSA</acronym></application> driver source
+<application><acronym>ALSA</acronym> Driver</application> source
 tree:</para>
 <screen><userinput><command>./snddevices</command></userinput></screen>
Index: multimedia/libdriv/alsa/driver/alsa-driver-intro.xml
===================================================================
--- multimedia/libdriv/alsa/driver/alsa-driver-intro.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/driver/alsa-driver-intro.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Introduction to <application><acronym>ALSA</acronym>-driver</application>
+<title>Introduction to <application><acronym>ALSA</acronym> Driver</application>
 </title>
 
-<para>The <application><acronym>ALSA</acronym>-driver</application> package 
+<para>The <application><acronym>ALSA</acronym> Driver</application> package 
 contains the <acronym>ALSA</acronym> sound drivers. These are
 the next generation of sound drivers for Linux.</para>
Index: multimedia/libdriv/alsa/lib/alsa-lib-config.xml
===================================================================
--- multimedia/libdriv/alsa/lib/alsa-lib-config.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/lib/alsa-lib-config.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application><acronym>ALSA</acronym>-lib</application></title>
+<title>Configuring <application><acronym>ALSA</acronym> Library</application></title>
 
 <sect3><title>Configuration Information</title>
Index: multimedia/libdriv/alsa/lib/alsa-lib-desc.xml
===================================================================
--- multimedia/libdriv/alsa/lib/alsa-lib-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/lib/alsa-lib-desc.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application><acronym>ALSA</acronym>-lib</application> package 
+<para>The <application><acronym>ALSA</acronym> Library</application> package 
 contains <command>aserver</command> and the <filename class="libraryfile">
 libasound</filename> library.</para>
Index: multimedia/libdriv/alsa/lib/alsa-lib-inst.xml
===================================================================
--- multimedia/libdriv/alsa/lib/alsa-lib-inst.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/lib/alsa-lib-inst.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Installation of <application><acronym>ALSA</acronym>-lib</application>
+<title>Installation of <application><acronym>ALSA</acronym> Library</application>
 </title>
 
-<para>Install <application><acronym>ALSA</acronym>-lib</application> by running 
+<para>Install <application><acronym>ALSA</acronym> Library</application> by running 
 the following commands:</para>
 
Index: multimedia/libdriv/alsa/lib/alsa-lib-intro.xml
===================================================================
--- multimedia/libdriv/alsa/lib/alsa-lib-intro.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/lib/alsa-lib-intro.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,8 +1,8 @@
 <sect2>
-<title>Introduction to <application><acronym>ALSA</acronym>-lib</application></title>
+<title>Introduction to <application><acronym>ALSA</acronym> Library</application></title>
 
-<para>The <application><acronym>ALSA</acronym>-lib</application> package 
+<para>The <application><acronym>ALSA</acronym> Library</application> package 
 contains the <acronym>ALSA</acronym> library.  This is used by programs 
-(including <application><acronym>ALSA</acronym>-utils</application>) which wish 
+(including <application><acronym>ALSA</acronym> Utilities</application>) which wish 
 to use the <acronym>ALSA</acronym> sound interface.</para>
 
@@ -16,5 +16,5 @@
 </sect3>
 
-<sect3><title><application><acronym>ALSA</acronym>-lib</application> dependencies</title>
+<sect3><title><application><acronym>ALSA</acronym> Library</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="alsa-driver"/>
Index: multimedia/libdriv/alsa/oss/alsa-oss-config.xml
===================================================================
--- multimedia/libdriv/alsa/oss/alsa-oss-config.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/oss/alsa-oss-config.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application><acronym>ALSA</acronym>-<acronym>OSS</acronym></application></title>
+<title>Configuring <application><acronym>ALSA</acronym> <acronym>OSS</acronym></application></title>
 
 <sect3><title>Configuration Information</title>
Index: multimedia/libdriv/alsa/oss/alsa-oss-desc.xml
===================================================================
--- multimedia/libdriv/alsa/oss/alsa-oss-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/oss/alsa-oss-desc.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application><acronym>ALSA</acronym>-<acronym>OSS</acronym>
+<para>The <application><acronym>ALSA</acronym> <acronym>OSS</acronym>
 </application> package contains <command>aoss</command> and the
 <filename class="libraryfile">libaoss</filename>
Index: multimedia/libdriv/alsa/oss/alsa-oss-inst.xml
===================================================================
--- multimedia/libdriv/alsa/oss/alsa-oss-inst.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/oss/alsa-oss-inst.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application><acronym>ALSA</acronym>-<acronym>OSS</acronym></application></title>
+<title>Installation of <application><acronym>ALSA</acronym> <acronym>OSS</acronym></application></title>
 
-<para>Install <application><acronym>ALSA</acronym>-<acronym>OSS</acronym></application> by running the following commands:</para>
+<para>Install <application><acronym>ALSA</acronym> <acronym>OSS</acronym></application> by running the following commands:</para>
 
 <screen><userinput><command>./configure &amp;&amp;
Index: multimedia/libdriv/alsa/oss/alsa-oss-intro.xml
===================================================================
--- multimedia/libdriv/alsa/oss/alsa-oss-intro.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/oss/alsa-oss-intro.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Introduction to <application><acronym>ALSA</acronym>-<acronym>OSS</acronym></application></title>
+<title>Introduction to <application><acronym>ALSA</acronym> <acronym>OSS</acronym></application></title>
 
 <para>The
-<application><acronym>ALSA</acronym>-<acronym>OSS</acronym></application> 
+<application><acronym>ALSA</acronym> <acronym>OSS</acronym></application> 
 package contains the <acronym>ALSA</acronym> <acronym>OSS</acronym> 
 compatibility library. This is used by programs which wish to use the
@@ -17,5 +17,5 @@
 </sect3>
 
-<sect3><title><application><acronym>ALSA</acronym>-<acronym>OSS</acronym></application> dependencies</title>
+<sect3><title><application><acronym>ALSA</acronym> <acronym>OSS</acronym></application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="alsa-lib"/>
Index: multimedia/libdriv/alsa/tools/alsa-tools-desc.xml
===================================================================
--- multimedia/libdriv/alsa/tools/alsa-tools-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/tools/alsa-tools-desc.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -15,5 +15,5 @@
 <sect3><title>as10k1</title>
 <para><command>as10k1</command> is an assembler for the emu10k1 <acronym>DSP
-</acronym> chip present in the Creative <acronym>SB</acronym> Live,
+</acronym> chip present in the Creative SB Live,
 <acronym>PCI</acronym> 512, and emu <acronym>APS</acronym> sound cards. It is 
 used to make audio effects such as a flanger, chorus or reverb.</para></sect3>
@@ -24,6 +24,5 @@
 
 <sect3><title>sb16_csp</title>
-<para><command>sb16_csp</command> is an <acronym>SB</acronym>16/<acronym>AWE
-</acronym>32 Creative Signal Processor (<acronym>ASP</acronym>/<acronym>CSP
+<para><command>sb16_csp</command> is an SB16/AWE32 Creative Signal Processor (<acronym>ASP</acronym>/<acronym>CSP
 </acronym>) control program.</para></sect3>
 
Index: multimedia/libdriv/alsa/tools/alsa-tools-inst.xml
===================================================================
--- multimedia/libdriv/alsa/tools/alsa-tools-inst.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/tools/alsa-tools-inst.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application><acronym>ALSA</acronym>-tools</application></title>
+<title>Installation of <application><acronym>ALSA</acronym> Tools</application></title>
 
-<para>The <application><acronym>ALSA</acronym>-tools</application> package is 
+<para>The <application><acronym>ALSA</acronym> Tools</application> package is 
 only needed by those with advanced requirements for their sound card.  The 
 tools are not all built together, instead you need to <command>cd</command> 
Index: multimedia/libdriv/alsa/tools/alsa-tools-intro.xml
===================================================================
--- multimedia/libdriv/alsa/tools/alsa-tools-intro.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/tools/alsa-tools-intro.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application><acronym>ALSA</acronym>-tools</application></title>
+<title>Introduction to <application><acronym>ALSA</acronym> Tools</application></title>
 
-<para>The <application><acronym>ALSA</acronym>-tools</application> package contains 
+<para>The <application><acronym>ALSA</acronym> Tools</application> package contains 
 advanced tools for certain soundcards.</para>
 
@@ -14,5 +14,5 @@
 </sect3>
 
-<sect3><title><application><acronym>ALSA</acronym>-tools</application> dependencies</title>
+<sect3><title><application><acronym>ALSA</acronym> Tools</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="alsa-lib"/>
Index: multimedia/libdriv/alsa/utils/alsa-utils-config.xml
===================================================================
--- multimedia/libdriv/alsa/utils/alsa-utils-config.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/utils/alsa-utils-config.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application><acronym>ALSA</acronym>-utils</application></title>
+<title>Configuring <application><acronym>ALSA</acronym> Utilities</application></title>
 
 <sect3><title>Config files</title>
@@ -16,5 +16,5 @@
 those readers who wish to do this.</para>
 
-<para>The <application><acronym>ALSA</acronym>-drivers</application> package 
+<para>The <application><acronym>ALSA</acronym> Driver</application> package 
 installs a script as <filename>/etc/rc.d/init.d/alsasound</filename>.  While it 
 is possible to use this script, it contains a lot of extraneous detail which 
@@ -38,5 +38,5 @@
 case "$1" in
     start)
-        echo "Starting alsa...    Restoring volumes..."
+        echo "Starting ALSA...    Restoring volumes..."
         loadproc /usr/sbin/alsactl restore
         #echo "                    Loading MIDI font..."
@@ -45,5 +45,5 @@
 
     stop)
-        echo "Stopping alsa...    Saving volumes......"
+        echo "Stopping ALSA...    Saving volumes......"
         loadproc /usr/sbin/alsactl store
         #echo "            Removing MIDI font.........."
@@ -80,5 +80,5 @@
 <para>Note that all channels of your soundcard are muted by default. You can
 use the <command>alsamixer</command> program from
-<application><acronym>ALSA</acronym>-utils</application> (or any other
+<application><acronym>ALSA</acronym> Utilities</application> (or any other
 <acronym>OSS</acronym> mixer) to change this.</para>
 
@@ -86,5 +86,5 @@
 there is no state in <filename>/etc/asound.state</filename>.  You can
 prevent this by running the following commands after installing
-<application><acronym>ALSA</acronym>-utils</application>:</para>
+<application><acronym>ALSA</acronym> Utilities</application>:</para>
 <screen><userinput><command>touch /etc/asound.state &amp;&amp;
 alsactl store</command></userinput></screen>
@@ -93,5 +93,5 @@
 are commented out.  They are there as an example of other things you may
 wish to do in the startup script.  <filename>sfxload</filename> is a
-separate package of interest to SoundBlaster <acronym>AWE</acronym> and Live! 
+separate package of interest to SoundBlaster AWE and Live! 
 users.  It is designed for loading "sound-fonts" (which are used for
 <acronym>MIDI</acronym> output).  You may wish to delete these lines and add 
Index: multimedia/libdriv/alsa/utils/alsa-utils-desc.xml
===================================================================
--- multimedia/libdriv/alsa/utils/alsa-utils-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/utils/alsa-utils-desc.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The <application><acronym>ALSA</acronym>-utils</application> package 
+<para>The <application><acronym>ALSA</acronym> Utilities</application> package 
 contains <command>aconnect</command>, 
 <command>alsactl</command>, <command>alsamixer</command>,
Index: multimedia/libdriv/alsa/utils/alsa-utils-inst.xml
===================================================================
--- multimedia/libdriv/alsa/utils/alsa-utils-inst.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/utils/alsa-utils-inst.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application><acronym>ALSA</acronym>-utils</application></title>
+<title>Installation of <application><acronym>ALSA</acronym> Utilities</application></title>
 
-<para>Install <application><acronym>ALSA</acronym>-utils</application> by running the following commands:</para>
+<para>Install <application><acronym>ALSA</acronym> Utilities</application> by running the following commands:</para>
 
 <screen><userinput><command>./configure &amp;&amp;
Index: multimedia/libdriv/alsa/utils/alsa-utils-intro.xml
===================================================================
--- multimedia/libdriv/alsa/utils/alsa-utils-intro.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/alsa/utils/alsa-utils-intro.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application><acronym>ALSA</acronym>-utils</application></title>
+<title>Introduction to <application><acronym>ALSA</acronym> Utilities</application></title>
 
-<para>The <application><acronym>ALSA</acronym>-utils</application> package 
+<para>The <application><acronym>ALSA</acronym> Utilities</application> package 
 contains various utilities which are useful for controlling your sound card.
 </para>
@@ -15,5 +15,5 @@
 </sect3>
 
-<sect3><title><application><acronym>ALSA</acronym>-utils</application> dependencies</title>
+<sect3><title><application><acronym>ALSA</acronym> Utilities</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="alsa-lib"/>
Index: multimedia/libdriv/esound/esound-desc.xml
===================================================================
--- multimedia/libdriv/esound/esound-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/esound/esound-desc.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -7,5 +7,5 @@
 <command>esdloop</command>, <command>esdmon</command>,
 <command>esdrec</command>, <command>esdsample</command> and
-<filename>libesd</filename> libraries.</para>
+<filename class="libraryfile">libesd</filename> libraries.</para>
 
 </sect2>
@@ -39,5 +39,5 @@
 
 <sect3><title>esd libraries</title>
-<para><filename>libesd</filename> libraries contain the functions used
+<para><filename class="libraryfile">libesd</filename> libraries contain the functions used
 by <command>esd</command>.</para></sect3>
 
Index: multimedia/libdriv/esound/esound-exp.xml
===================================================================
--- multimedia/libdriv/esound/esound-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/esound/esound-exp.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -2,6 +2,7 @@
 <title>Command explanations</title>
 
-<para><command>--sysconfdir=/etc</command> : This switch puts configuration 
-files in <filename>/etc</filename> instead of <filename>/use/etc</filename>.
+<para><parameter>--sysconfdir=/etc</parameter>: This switch puts configuration 
+files in <filename class="directory">/etc</filename> instead of
+<filename class="directory">/use/etc</filename>.
 </para>
 
Index: multimedia/libdriv/libao/libao-desc.xml
===================================================================
--- multimedia/libdriv/libao/libao-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/libao/libao-desc.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The <application>libao</application> package contains <filename>libao</filename> libraries.</para>
+<para>The <application>libao</application> package contains <filename
+class="libraryfile">libao</filename> libraries.</para>
 
 </sect2>
@@ -9,5 +10,5 @@
 
 <sect3><title>ao libraries</title>
-<para><filename>libao</filename> libraries provide functions for programs 
+<para><filename class="libraryfile">libao</filename> libraries provide functions for programs 
 wishing to output sound over supported platforms.</para></sect3>
 
Index: multimedia/libdriv/libao/libao-exp.xml
===================================================================
--- multimedia/libdriv/libao/libao-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/libao/libao-exp.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><command>make CC="gcc $CFLAGS"</command> : This makes libao
+<para><command>make CC="gcc $CFLAGS"</command>: This makes libao
 compile using our CFLAGS for optimizations.</para>
 
Index: multimedia/libdriv/libdvdread/libdvdread-exp.xml
===================================================================
--- multimedia/libdriv/libdvdread/libdvdread-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/libdvdread/libdvdread-exp.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -2,6 +2,6 @@
 <title>Command explanations</title>
 
-<para><command>--with-libdvdcss</command> : 
-This switch is needed if you want libdvdread to be able to read
+<para><option>--with-libdvdcss</option>: 
+This switch is needed if you want <application>libdvdread</application> to be able to read
 <acronym>CSS</acronym> encrypted <acronym>DVD</acronym>s.</para>
 
Index: multimedia/libdriv/libmpeg3/libmpeg3-exp.xml
===================================================================
--- multimedia/libdriv/libmpeg3/libmpeg3-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/libmpeg3/libmpeg3-exp.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -3,5 +3,5 @@
 
 <para><command>cp i686/libmpeg3.a /usr/lib &amp;&amp; cp libmpeg3.h
-mpeg3private.h /usr/include</command> : Since make install 
+mpeg3private.h /usr/include</command>: Since make install 
 doesn't copy the library and header files to proper locations, 
 we have to do it manually.</para>
Index: multimedia/libdriv/nas/nas-desc.xml
===================================================================
--- multimedia/libdriv/nas/nas-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/nas/nas-desc.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -3,5 +3,5 @@
 
 <para>The <application><acronym>NAS</acronym></application> package contains 
-<acronym>NAS</acronym> utils, headers and libraries.</para>
+<acronym>NAS</acronym> utilities, headers and libraries.</para>
 
 </sect2>
Index: multimedia/libdriv/nas/nas-exp.xml
===================================================================
--- multimedia/libdriv/nas/nas-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/nas/nas-exp.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -2,11 +2,10 @@
 <title>Command explanations</title>
 
-<para><command>xmkmf...</command> : Compile using the standard way
-for compiling X based apps.</para>
+<para><command>xmkmf...</command>: These commands use the standard for compiling <application>X</application> based applications.</para>
 
-<para><command>make INCROOT=...</command> : Install with
-<filename class="directory">/usr</filename> prefix
-instead of the default <filename class="directory">/usr/X11R6</filename>. 
-Also install man pages.</para>
+<para><command>make INCROOT=...</command>: These commands install with
+the <filename class="directory">/usr</filename> prefix
+instead of the default <filename class="directory">/usr/X11R6</filename>
+prefix.  They also install the man pages.</para>
 
 </sect2>
Index: multimedia/libdriv/sdl/sdl-exp.xml
===================================================================
--- multimedia/libdriv/sdl/sdl-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ multimedia/libdriv/sdl/sdl-exp.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -2,9 +2,9 @@
 <title>Command explanations</title>
 
-<para><command>--disable-debug</command> : This switch configures
+<para><option>--disable-debug</option>: This switch configures
 <application><acronym>SDL</acronym></application> to build with aggressive 
 optimizations.</para>
 
-<para><command>--enable-video-aalib</command> : This optional switch
+<para><option>--enable-video-aalib</option>: This optional switch
 is required to build <application><acronym>SDL</acronym></application>
 with <acronym>AA</acronym>lib video support.</para>
Index: xsoft/graphweb/mozilla/mozilla-exp.xml
===================================================================
--- xsoft/graphweb/mozilla/mozilla-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ xsoft/graphweb/mozilla/mozilla-exp.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -8,5 +8,5 @@
 are ok with the <acronym>LGPL</acronym> versioned libart.</para>
 
-<para><command>--prefix=&mozilla-prefix;</command>: Previously mozilla did
+<para><parameter>--prefix=&mozilla-prefix;</parameter>: Previously mozilla did
 not support the make install option. Hence the package was installed in 
 <filename>/opt</filename>. The package now supports "make install" and follows 
@@ -15,24 +15,24 @@
 </filename>.</para>
 
-<para><screen><command>--enable-toolkit-gtk2</command></screen>Use gtk2
+<para><screen><option>--enable-toolkit-gtk2</option></screen>Use gtk2
 toolkit</para>
 
-<para><screen><command>--with-system-zlib --with-system-jpeg \
---with-system-png --with-system-mng"</command></screen>
+<para><screen><option>--with-system-zlib --with-system-jpeg \
+--with-system-png --with-system-mng"</option></screen>
 Use the system versions for these packages.</para>
 
-<para><command>--enable-xft</command> : Enable the Xft support. You need 
+<para><option>--enable-xft</option>: Enable the Xft support. You need 
 <application>fontconfig</application> or the latest <application>XFree86
 </application> version to enable xft.</para>
 
-<para><command>--enable-crypto</command> : Enable the Personal
+<para><option>--enable-crypto</option>: Enable the Personal
 Security Manager to enable <acronym>SSL</acronym> connections.</para>
 
-<para><screen><command>--disable-jsd --disable-accessibility \
+<para><screen><option>--disable-jsd --disable-accessibility \
 --disable-tests --disable-debug \
 --disable-dtd-debug \
 --disable-logging --enable-reorder \
 --enable-strip \
---enable-cpp-rtti</command></screen>
+--enable-cpp-rtti</option></screen>
 Various options that affect what components are built and some optimization
 options. You can pick and choose from these options.  More information on them 
@@ -41,7 +41,7 @@
 above.</para>
 
-<para><command>--enable-extensions=...</command> : Enables extensions.  If you 
+<para><option>--enable-extensions=...</option>: Enables extensions.  If you 
 want, you can disable all extensions other than the browser by changing this 
-switch to <command>--enable-extensions="default,-venkman,-inspector,-irc"</command>.</para>
+switch to <parameter>--enable-extensions="default,-venkman,-inspector,-irc"</parameter>.</para>
 
 <para><screen><command>install -d &mozilla-prefix;/include/mozilla-&mozilla-version;/nss
@@ -56,5 +56,5 @@
 -->
 
-<para><command>ln -nsf mozilla-&mozilla-version; ...</command> :
+<para><command>ln -nsf mozilla-&mozilla-version; ...</command>:
 <application>Mozilla</application> installs headers and libraries in version 
 specific directories. This link makes symbolic links so that applications that 
Index: xsoft/graphweb/mozilla/mozilla-inst.xml
===================================================================
--- xsoft/graphweb/mozilla/mozilla-inst.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ xsoft/graphweb/mozilla/mozilla-inst.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -70,17 +70,17 @@
 
 <para>Each of these switches can be added to the configure line in order to
-have the described effect on the mozilla compile.</para>
+have the described effect on the <application>Mozilla</application> compile.</para>
 
-<para><command>--enable-elf-dynstr-gc</command> : Removes unreferenced
+<para><option>--enable-elf-dynstr-gc</option>: Removes unreferenced
 strings from <acronym>ELF</acronym> shared objects generated during the build. 
 Note that this option breaks build on alpha.</para>
 
-<para><command>--disable-mailnews</command> : Disable the mail and news
+<para><option>--disable-mailnews</option>: Disable the mail and news
 clients.</para>
 
-<para><command>--disable-ldap</command> : Disable <acronym>LDAP</acronym> 
+<para><option>--disable-ldap</option>: Disable <acronym>LDAP</acronym> 
 Support, recommended if mail is disabled.</para>
 
-<para><command>--enable-calendar</command> : Build the calendar client.
+<para><option>--enable-calendar</option>: Build the calendar client.
 You will need to download the calendar source via
 <application><acronym>CVS</acronym></application> since it is not included
@@ -88,9 +88,9 @@
 (Warning, this option is not yet stable).</para>
 
-<para><command>--enable-xterm-updates</command> : This option is
+<para><option>--enable-xterm-updates</option>: This option is
 for enabling the <command>xterm</command> title with the current command when 
 compiling.</para>
 
-<para><command>--enable-plaintext-editor-only</command> : Disable support
+<para><option>--enable-plaintext-editor-only</option>: Disable support
 for <acronym>HTML</acronym> editing. Do not use this switch if you are building 
 the mail-news component.</para>
Index: xsoft/other/balsa/balsa-desc.xml
===================================================================
--- xsoft/other/balsa/balsa-desc.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ xsoft/other/balsa/balsa-desc.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -9,5 +9,6 @@
 
 <sect3><title>balsa</title>
-<para><command>balsa</command> is the GNOME 2 based mail reader.</para>
+<para><command>balsa</command> is the
+<application><acronym>GNOME</acronym></application> 2 based mail reader.</para>
 </sect3>
 
Index: xsoft/other/balsa/balsa-exp.xml
===================================================================
--- xsoft/other/balsa/balsa-exp.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ xsoft/other/balsa/balsa-exp.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -2,18 +2,19 @@
 <title>Command explanations</title>
 
-<para><command>--localstatedir=/var/lib</command> : This switch puts
-scrollkeeper files in <filename>/var/lib/scrollkeeper</filename> instead
-of <filename>$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+<para><parameter>--localstatedir=/var/lib</parameter>: This switch puts
+<application>ScrollKeeper</application> files in <filename
+class="directory">/var/lib/scrollkeeper</filename> instead
+of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
-<para><command>--with-ssl</command> : Change the default of no ssl support.</para>
+<para><option>--with-ssl</option>: Change the default of no ssl support.</para>
 
-<para><command>--sysconfdir=/etc/gnome</command> : This switch puts
-configuration files in <filename>/etc/gnome</filename> instead of
-<filename>$GNOME_PREFIX/etc</filename>.</para>
+<para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch puts
+configuration files in <filename class="directory">/etc/gnome</filename> instead of
+<filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
-<para><command>--with-ldap</command> : Change the default to
+<para><option>--with-ldap</option>: Change the default to
 support <acronym>LDAP</acronym> if it is available.</para>
 
-<para><command>--with-gpgme</command> : Change the default to
+<para><option>--with-gpgme</option>: Change the default to
 support <acronym>GPG</acronym> if 'GnuPG made easy'
 (<acronym>GPGME</acronym>) is
Index: xsoft/other/balsa/balsa-intro.xml
===================================================================
--- xsoft/other/balsa/balsa-intro.xml	(revision bb363985ba1eec993290d4c14d863b45fe67f64c)
+++ xsoft/other/balsa/balsa-intro.xml	(revision 237b6d973d0feaf73ffcf05ed0807bc7f4ca3ce3)
@@ -2,5 +2,6 @@
 <title>Introduction to <application>Balsa</application></title>
 
-<para>The <application>Balsa</application> package contains a GNOME 2 based mail reader.</para>
+<para>The <application>Balsa</application> package contains a
+<application><acronym>GNOME</acronym></application> 2 based mail reader.</para>
 
 <sect3><title>Package information</title>
