Index: appendices/glossary.xml
===================================================================
--- appendices/glossary.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ appendices/glossary.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -24,7 +24,6 @@
 <glossdef><para>Accessibility Tool Kit</para></glossdef></glossentry>
 
-<glossentry id="gBICS"><glossterm><acronym>BICS</acronym></glossterm>
-<glossdef><para>Binnenvaart Informatie en Communicatie Systeem (inland
-shipping information and communication system)</para></glossdef></glossentry>
+<glossentry id="gBIC"><glossterm><acronym>BICS</acronym></glossterm>
+<glossdef><para>Berkeley/IRCAM/CARL</para></glossdef></glossentry>
 
 
@@ -81,4 +80,7 @@
 <glossdef><para>File Alteration Monitor</para></glossdef></glossentry>
 
+<glossentry id="gFAME"><glossterm><acronym>FAME</acronym></glossterm>
+<glossdef><para>Fast Assembly Mpeg Encoder</para></glossdef></glossentry>
+
 <glossentry id="gFB"><glossterm><acronym>FB</acronym></glossterm>
 <glossdef><para>Frame Buffer</para></glossdef></glossentry>
@@ -86,4 +88,7 @@
 <glossentry id="gFHS"><glossterm><acronym>FHS</acronym></glossterm>
 <glossdef><para>File Hierarchy Standard</para></glossdef></glossentry>
+
+<glossentry id="gFLAC"><glossterm><acronym>FLAC</acronym></glossterm>
+<glossdef><para>Free Lossless Audio Codec</para></glossdef></glossentry>
 
 <glossentry id="gFTP"><glossterm><acronym>FTP</acronym></glossterm>
@@ -131,5 +136,5 @@
 
 <glossentry id="gLAME"><glossterm><acronym>LAME</acronym></glossterm>
-<glossdef><para>Lame Aint an MP3 Encoder</para></glossdef></glossentry>
+<glossdef><para>Lame Ain't an MP3 Encoder</para></glossdef></glossentry>
 
 <glossentry id="gLAN"><glossterm><acronym>LAN</acronym></glossterm>
Index: multimedia/libdriv/alsa.xml
===================================================================
--- multimedia/libdriv/alsa.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,24 +1,26 @@
-<sect1 id="alsa" xreflabel="alsa-&alsa-version;">
+<sect1 id="alsa" xreflabel="ALSA-&alsa-version;">
 <?dbhtml filename="alsa.html" dir="multimedia"?>
-<title>alsa-&alsa-version;</title>
+<title>ALSA-&alsa-version;</title>
 
-<para>The first question which people tend to ask about ALSA is why they
-should use it over the sound drivers included in the kernel - there are
-several reasons.  Firstly, the ALSA drivers support more sound cards
-than those in the kernel.  Secondly, the OSS emulation is in some cases
-faster and better than the original OSS driver itself.  And finally, there are
-some programs which can use ALSA's enhanced features to better drive the
-soundcard.</para>
+<para>The first question which people tend to ask about <acronym>ALSA</acronym> 
+is why they should use it over the sound drivers included in the kernel - there 
+are several reasons.  First, the <acronym>ALSA</acronym> drivers support more 
+sound cards than those in the kernel.  Second, the <acronym>OSS</acronym> 
+emulation is in some cases faster and better than the original <acronym>OSS
+</acronym> driver itself.  And finally, there are some programs which can use 
+<acronym>ALSA</acronym>'s enhanced features to better drive the soundcard.
+</para>
 
-<para>ALSA is also likely to be the future of Linux Sound (hence the
-name <emphasis>Advanced Linux Sound Architecture</emphasis>), and the
-ALSA drivers will probably be included into the main linux kernel at
-some point during the 2.5 development series, leading eventually to ALSA
-being the "standard" sound drivers into the future 2.6 stable
-kernel.</para>
+<para><acronym>ALSA</acronym> is also likely to be the future of Linux Sound 
+(hence the name <emphasis>Advanced Linux Sound Architecture</emphasis>), and 
+the <acronym>ALSA</acronym> drivers will probably be included into the main 
+linux kernel at some point during the 2.5 development series, leading 
+eventually to <acronym>ALSA</acronym> being the "standard" sound drivers into 
+the future 2.6 stable kernel.</para>
 
 <para>The following five sections of the book deal with the five separate
-components of alsa: the drivers, the libraries, the utilities, the tools and
-the OSS compatibility libraries.</para>
+components of <acronym>ALSA</acronym>: the drivers, the libraries, the 
+utilities, the tools and the <acronym>OSS</acronym> compatibility libraries.
+</para>
 
 </sect1>
Index: multimedia/libdriv/alsa/alsa-driver.xml
===================================================================
--- multimedia/libdriv/alsa/alsa-driver.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/alsa-driver.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -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 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/alsa-lib.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,5 +1,5 @@
-<sect1 id="alsa-lib" xreflabel="alsa-lib-&alsa-lib-version;">
+<sect1 id="alsa-lib" xreflabel="ALSA-lib-&alsa-lib-version;">
 <?dbhtml filename="alsa-lib.html" dir="multimedia"?>
-<title>alsa-lib-&alsa-lib-version;</title>
+<title>ALSA-lib-&alsa-lib-version;</title>
 
 &alsa-lib-intro;
Index: multimedia/libdriv/alsa/alsa-oss.xml
===================================================================
--- multimedia/libdriv/alsa/alsa-oss.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/alsa-oss.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -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 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/alsa-tools.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -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 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/alsa-utils.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,5 +1,5 @@
-<sect1 id="alsa-utils" xreflabel="alsa-utils-&alsa-utils-version;">
+<sect1 id="alsa-utils" xreflabel="ALSA-utils-&alsa-utils-version;">
 <?dbhtml filename="alsa-utils.html" dir="multimedia"?>
-<title>alsa-utils-&alsa-utils-version;</title>
+<title>ALSA-utils-&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 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/driver/alsa-driver-config.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring alsa-driver</title>
+<title>Configuring <application><acronym>ALSA</acronym>-driver</application></title>
 
 <sect3><title>Config files</title>
@@ -10,6 +10,6 @@
 <sect3><title>Configuration Information</title>
 
-<para>To configure the alsa drivers, you need to add some lines to
-<filename>/etc/modules.conf</filename>:</para>
+<para>To configure the <acronym>ALSA</acronym> drivers, you need to add some 
+lines to <filename>/etc/modules.conf</filename>:</para>
 
 <screen><userinput><command>cat &gt;&gt; /etc/modules.conf &lt;&lt; "EOF"
@@ -17,5 +17,5 @@
 alias char-major-116 snd
 
-alias snd-card-0 snd-&lt;soundcard-name&gt;
+alias snd-card-0 snd-<replaceable>[soundcard-name]</replaceable>
 
 alias sound-slot-0 snd-card-0
@@ -27,17 +27,17 @@
 EOF</command></userinput></screen>
 
-<para>&lt;soundcard-name&gt; needs to be replaced with the driver relevant
-to your soundcard.  If you have more than one soundcard, you can add
-additional sections by repeating the above but changing the first 0 to 1 and
-so on.</para>
+<para><replaceable>[soundcard-name]</replaceable> needs to be replaced with the 
+driver relevant to your soundcard.  If you have more than one soundcard, you 
+can add additional sections by repeating the above but changing the first 0 to 
+1 and so on.</para>
 
 <para>After editing <filename>/etc/modules.conf</filename> you need to run
-<filename>depmod</filename>.  If the drivers you have compiled are for the
+<command>depmod</command>.  If the drivers you have compiled are for the
 version of the kernel you are currently running, simply run
-<screen><userinput><command>depmod</command></userinput></screen>  If you are compiling 
-drivers for a different kernel version than those you are running, you 
-will need to use a line along the lines of:
-<screen><userinput><command>depmod -a 2.4.19 -F /boot/System.map-2.4.19</command>
-</userinput></screen></para>
+<screen><userinput><command>depmod</command></userinput></screen>  
+If you are compiling  drivers for a different kernel version than those you are 
+running, you will need to use a line along the lines of:
+<screen><userinput><command>depmod -a 2.4.22 -F /boot/System.map-2.4.22
+</command></userinput></screen></para>
 
 </sect3>
Index: multimedia/libdriv/alsa/driver/alsa-driver-desc.xml
===================================================================
--- multimedia/libdriv/alsa/driver/alsa-driver-desc.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/driver/alsa-driver-desc.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -2,6 +2,7 @@
 <title>Contents</title>
 
-<para>The alsa-driver package contains the alsa sound card
-drivers and include files.</para>
+<para>The <application><acronym>ALSA</acronym>-driver</application> package 
+contains the <acronym>ALSA</acronym> sound card drivers and include files.
+</para>
 
 </sect2>
@@ -9,13 +10,13 @@
 <sect2><title>Description</title>
 
-<sect3><title>alsa sound card drivers</title>
-<para>These are kernel modules which provide audio and
-<acronym>MIDI</acronym> functionality
-to the operating system.</para></sect3>
+<sect3><title><acronym>ALSA</acronym> sound card drivers</title>
+<para>These are kernel modules which provide audio and <acronym>MIDI</acronym> 
+functionality to the operating system.</para></sect3>
 
 <sect3><title>include files</title>
-<para>These are installed in <filename
-class="directory">/usr/include/sound</filename> and are required to compile
-certain packages such as alsa-lib.</para></sect3>
+<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>.
+</para></sect3>
 
 </sect2>
Index: multimedia/libdriv/alsa/driver/alsa-driver-exp.xml
===================================================================
--- multimedia/libdriv/alsa/driver/alsa-driver-exp.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/driver/alsa-driver-exp.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -2,17 +2,17 @@
 <title>Command explanations</title>
 
-<para><command>--with-sequencer=yes</command> : This tells the
-alsa-driver 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-sequencer=yes</command> : 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
-build the <acronym>OSS</acronym>/Free emulation modules. Again, most people want this so it's
-probably best to stick with yes.</para>
+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
 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>
+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
@@ -20,5 +20,6 @@
 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 alsa-driver source
+have a look in <filename>CARDS-STATUS</filename> in the
+<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 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/driver/alsa-driver-inst.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,19 +1,19 @@
 <sect2>
-<title>Installation of <application>alsa-driver</application></title>
+<title>Installation of <application><acronym>ALSA</acronym>-driver</application></title>
 
-<para>Before installing the alsa-drivers note that in your kernel
-configuration you should have <userinput>Sound Card Support
+<para>Before installing the <acronym>ALSA</acronym> drivers note that in your 
+kernel configuration you should have <userinput>Sound Card Support
 (CONFIG_SOUND)</userinput> enabled but <emphasis>nothing</emphasis> else in
 the Sound menu (with the possible exception of TV Card Mixer support.  In
 particular you should <emphasis>not</emphasis> have <userinput>OSS Sound
 Modules</userinput> enabled as this will cause problems when loading the
-alsa driver modules.</para>
+<acronym>ALSA</acronym> driver modules.</para>
 
-<note><para>Because alsa drivers are kernel
+<note><para>Because <acronym>ALSA</acronym> drivers are kernel
 modules, they must be compiled with the same compiler the kernel has
 used.</para></note>
 
-<para>Install <application>alsa-driver</application> using the following 
-commands as a template:</para>
+<para>Install <application><acronym>ALSA</acronym>-driver</application> using 
+the following commands as a template:</para>
 
 <screen><userinput><command>CC=/opt/gcc-2.95.3/bin/gcc ./configure \
@@ -29,5 +29,5 @@
 <para>If this is the first time you have installed the alsa drivers, you
 will need to create the <filename class="directory">/dev</filename> entries
-using the script provided in the alsa-driver source tree:
+using the script provided in the <acronym>ALSA</acronym>-driver source tree:
 <screen><userinput><command>./snddevices</command></userinput></screen></para>
 
Index: multimedia/libdriv/alsa/driver/alsa-driver-intro.xml
===================================================================
--- multimedia/libdriv/alsa/driver/alsa-driver-intro.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/driver/alsa-driver-intro.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,6 +1,8 @@
 <sect2>
-<title>Introduction to <application>alsa-driver</application></title>
+<title>Introduction to <application><acronym>ALSA</acronym>-driver</application>
+</title>
 
-<para>The <application>alsa-driver</application> package contains the alsa sound drivers. These are
+<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 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/lib/alsa-lib-config.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring alsa-lib</title>
+<title>Configuring <application><acronym>ALSA</acronym>-lib</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 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/lib/alsa-lib-desc.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -2,6 +2,7 @@
 <title>Contents</title>
 
-<para>The alsa-lib package contains <command>aserver</command> and the
-<filename class="libraryfile">libasound</filename> library.</para>
+<para>The <application><acronym>ALSA</acronym>-lib</application> package 
+contains <command>aserver</command> and the <filename class="libraryfile">
+libasound</filename> library.</para>
 
 </sect2>
@@ -10,6 +11,6 @@
 
 <sect3><title>libasound (alsa library)</title>
-<para><filename class="libraryfile">libasound</filename> provides alsa 
-functions for application programs.</para></sect3>
+<para><filename class="libraryfile">libasound</filename> provides
+<acronym>ALSA</acronym> functions for application programs.</para></sect3>
 
 </sect2>
Index: multimedia/libdriv/alsa/lib/alsa-lib-inst.xml
===================================================================
--- multimedia/libdriv/alsa/lib/alsa-lib-inst.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/lib/alsa-lib-inst.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,6 +1,8 @@
 <sect2>
-<title>Installation of <application>alsa-lib</application></title>
+<title>Installation of <application><acronym>ALSA</acronym>-lib</application>
+</title>
 
-<para>Install <application>alsa-lib</application> by running the following commands:</para>
+<para>Install <application><acronym>ALSA</acronym>-lib</application> by running 
+the following commands:</para>
 
 <screen><userinput><command>./configure &amp;&amp;
Index: multimedia/libdriv/alsa/lib/alsa-lib-intro.xml
===================================================================
--- multimedia/libdriv/alsa/lib/alsa-lib-intro.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/lib/alsa-lib-intro.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,7 +1,9 @@
 <sect2>
-<title>Introduction to <application>alsa-lib</application></title>
+<title>Introduction to <application><acronym>ALSA</acronym>-lib</application></title>
 
-<para>The <application>alsa-lib</application> package contains the alsa library.  This is used by
-programs (including alsa-utils) which wish to use the alsa sound interface.</para>
+<para>The <application><acronym>ALSA</acronym>-lib</application> package 
+contains the <acronym>ALSA</acronym> library.  This is used by programs 
+(including <application><acronym>ALSA</acronym>-utils</application>) which wish 
+to use the <acronym>ALSA</acronym> sound interface.</para>
 
 <sect3><title>Package information</title>
@@ -14,5 +16,5 @@
 </sect3>
 
-<sect3><title><application>alsa-lib</application> dependencies</title>
+<sect3><title><application><acronym>ALSA</acronym>-lib</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 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/oss/alsa-oss-config.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring alsa-oss</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 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/oss/alsa-oss-desc.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -2,6 +2,8 @@
 <title>Contents</title>
 
-<para>The alsa-oss package contains <command>aoss</command> and the
-<filename class="libraryfile">libaoss</filename> (alsa oss compatibility
+<para>The <application><acronym>ALSA</acronym>-<acronym>OSS</acronym>
+</application> package contains <command>aoss</command> and the
+<filename class="libraryfile">libaoss</filename>
+(<acronym>ALSA</acronym> <acronym>OSS</acronym> compatibility
 library) library.</para>
 
Index: multimedia/libdriv/alsa/oss/alsa-oss-inst.xml
===================================================================
--- multimedia/libdriv/alsa/oss/alsa-oss-inst.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/oss/alsa-oss-inst.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>alsa-oss</application></title>
+<title>Installation of <application><acronym>ALSA</acronym>-<acronym>OSS</acronym></application></title>
 
-<para>Install <application>alsa-oss</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 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/oss/alsa-oss-intro.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,7 +1,10 @@
 <sect2>
-<title>Introduction to <application>alsa-oss</application></title>
+<title>Introduction to <application><acronym>ALSA</acronym>-<acronym>OSS</acronym></application></title>
 
-<para>The alsa-oss package contains the alsa oss compatibility library.
-This is used by programs which wish to use the alsa oss sound interface</para>
+<para>The
+<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
+<acronym>ALSA</acronym> <acronym>OSS</acronym> sound interface</para>
 
 <sect3><title>Package information</title>
@@ -14,5 +17,5 @@
 </sect3>
 
-<sect3><title><application>alsa-oss</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 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/tools/alsa-tools-desc.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -14,19 +14,21 @@
 
 <sect3><title>as10k1</title>
-<para><command>as10k1</command> is an assembler for the emu10k1 DSP chip present in the
-Creative SB Live, PCI 512, and emu APS sound cards. It is used to make 
-audio effects such as a flanger, chorus or reverb.</para></sect3>
+<para><command>as10k1</command> is an assembler for the emu10k1 <acronym>DSP
+</acronym> chip present in the Creative <acronym>SB</acronym> 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>
 
 <sect3><title>envy24control</title>
-<para><command>envy24control</command> is a control tool for Envy24 (ice1712) based 
-soundcards</para></sect3>
+<para><command>envy24control</command> is a control tool for Envy24 (ice1712) 
+based soundcards</para></sect3>
 
 <sect3><title>sb16_csp</title>
-<para><command>sb16_csp</command> is an SB16/AWE32 Creative Signal Processor (ASP/CSP) control
-program.</para></sect3>
+<para><command>sb16_csp</command> is an <acronym>SB</acronym>16/<acronym>AWE
+</acronym>32 Creative Signal Processor (<acronym>ASP</acronym>/<acronym>CSP
+</acronym>) control program.</para></sect3>
 
 <sect3><title>sbiload</title>
-<para><command>sbiload</command>is an OPL2/3 FM instrument loader for
-the <acronym>ALSA</acronym> sequencer.</para></sect3>
+<para><command>sbiload</command>is an <acronym>OPL</acronym>2/3 FM instrument 
+loader for the <acronym>ALSA</acronym> sequencer.</para></sect3>
 
 </sect2>
Index: multimedia/libdriv/alsa/tools/alsa-tools-inst.xml
===================================================================
--- multimedia/libdriv/alsa/tools/alsa-tools-inst.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/tools/alsa-tools-inst.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,9 +1,10 @@
 <sect2>
-<title>Installation of <application>alsa-tools</application></title>
+<title>Installation of <application><acronym>ALSA</acronym>-tools</application></title>
 
-<para>The <application>alsa-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> into the directory of each
-tool you wish to compile and run the following commands:</para>
+<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> 
+into the directory of each tool you wish to compile and run the following 
+commands:</para>
 
 <screen><userinput><command>./configure &amp;&amp;
Index: multimedia/libdriv/alsa/tools/alsa-tools-intro.xml
===================================================================
--- multimedia/libdriv/alsa/tools/alsa-tools-intro.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/tools/alsa-tools-intro.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>alsa-tools</application></title>
+<title>Introduction to <application><acronym>ALSA</acronym>-tools</application></title>
 
-<para>The <application>alsa-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>alsa-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 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/utils/alsa-utils-config.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring alsa-utils</title>
+<title>Configuring <application><acronym>ALSA</acronym>-utils</application></title>
 
 <sect3><title>Config files</title>
@@ -16,13 +16,13 @@
 those readers who wish to do this.</para>
 
-<para>The alsa-drivers 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 isn't needed on an
-LFS system and so we create our own script
-<filename>/etc/rc.d/init.d/alsa</filename>.</para>
+<para>The <application><acronym>ALSA</acronym>-drivers</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 
+isn't needed on an <acronym>LFS</acronym> system and so we create our own 
+script <filename>/etc/rc.d/init.d/alsa</filename>.</para>
 
 <para>To create the alsa script, do the following:</para>
 
-<screen><userinput><command>cat &gt; /etc/rc.d/init.d/alsa &lt;&lt; "EOF"
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/alsa &lt;&lt; "EOF"</command>
 #!/bin/sh
 # Begin $rc_base/init.d/alsa
@@ -65,5 +65,5 @@
 
 # End $rc_base/init.d/alsa
-EOF
+<command>EOF
 chmod 755 /etc/rc.d/init.d/alsa</command></userinput></screen>
 
@@ -79,10 +79,12 @@
 
 <para>Note that all channels of your soundcard are muted by default. You can
-use the <command>alsamixer</command> program from alsa-utils (or any other
+use the <command>alsamixer</command> program from
+<application><acronym>ALSA</acronym>-utils</application> (or any other
 <acronym>OSS</acronym> mixer) to change this.</para>
 
 <para>Also, the first time the above script is run, it will complain that
 there is no state in <filename>/etc/asound.state</filename>.  You can
-prevent this by running the following commands after installing alsa-utils:
+prevent this by running the following commands after installing
+<application><acronym>ALSA</acronym>-utils</application>:
 <screen><userinput><command>touch /etc/asound.state &amp;&amp;
 alsactl store</command></userinput></screen></para>
@@ -91,8 +93,9 @@
 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 AWE and Live! users.  It is
-designed for loading "sound-fonts" (which are used for MIDI output).  You
-may wish to delete these lines and add your own or, if you have the relevant
-soundcard, install <filename>sfxload</filename> and uncomment them.</para>
+separate package of interest to SoundBlaster <acronym>AWE</acronym> 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 
+your own or, if you have the relevant soundcard, install <filename>sfxload
+</filename> and uncomment them.</para>
 
 </sect3>
Index: multimedia/libdriv/alsa/utils/alsa-utils-desc.xml
===================================================================
--- multimedia/libdriv/alsa/utils/alsa-utils-desc.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/utils/alsa-utils-desc.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The alsa-utils package contains <command>aconnect</command>, 
+<para>The <application><acronym>ALSA</acronym>-utils</application> package 
+contains <command>aconnect</command>, 
 <command>alsactl</command>, <command>alsamixer</command>,
 <command>amixer</command>, <command>aplay</command>,
@@ -12,6 +13,6 @@
 
 <sect3><title>aconnect</title>
-<para><command>aconnect</command> is a utility for connecting and disconnecting two existing
-ports in the <acronym>ALSA</acronym> sequencer system.</para></sect3>
+<para><command>aconnect</command> is a utility for connecting and disconnecting two existing ports in the <acronym>ALSA</acronym> sequencer system.</para>
+</sect3>
 
 <sect3><title>alsactl</title>
Index: multimedia/libdriv/alsa/utils/alsa-utils-inst.xml
===================================================================
--- multimedia/libdriv/alsa/utils/alsa-utils-inst.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/utils/alsa-utils-inst.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>alsa-utils</application></title>
+<title>Installation of <application><acronym>ALSA</acronym>-utils</application></title>
 
-<para>Install <application>alsa-utils</application> by running the following commands:</para>
+<para>Install <application><acronym>ALSA</acronym>-utils</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 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/alsa/utils/alsa-utils-intro.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,7 +1,8 @@
 <sect2>
-<title>Introduction to <application>alsa-utils</application></title>
+<title>Introduction to <application><acronym>ALSA</acronym>-utils</application></title>
 
-<para>The <application>alsa-utils</application> package contains various 
-utilities which are useful for controlling your sound card.</para>
+<para>The <application><acronym>ALSA</acronym>-utils</application> package 
+contains various utilities which are useful for controlling your sound card.
+</para>
 
 <sect3><title>Package information</title>
@@ -14,5 +15,5 @@
 </sect3>
 
-<sect3><title><application>alsa-utils</application> dependencies</title>
+<sect3><title><application><acronym>ALSA</acronym>-utils</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="alsa-lib"/>
Index: multimedia/libdriv/arts.xml
===================================================================
--- multimedia/libdriv/arts.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/arts.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,19 +1,19 @@
-<sect1 id="arts" xreflabel="arts-&arts-version;">
+<sect1 id="arts" xreflabel="aRts-&arts-version;">
 <?dbhtml filename="arts.html" dir="multimedia"?>
 <title>aRts-&arts-version;</title>
 
 <para>
-The Analog Real-time Synthesizer (aRts) provides  
-software that can 
-simulate a complete "modular analog synthesizer" on your computer. 
-It creates sounds and music using small modules like oscillators for creating 
-waveforms, various filters, modules for playing data on your speakers, mixers, 
-and faders. You can build a complete setup with the gui of the system, using the 
-modules - generators, effects and output - connected to each other.</para>
+The Analog Real-time Synthesizer (<acronym>aRts</acronym>) provides  
+software that can simulate a complete "modular analog synthesizer" on your 
+computer. It creates sounds and music using small modules like oscillators for 
+creating waveforms, various filters, modules for playing data on your speakers, 
+mixers, and faders. You can build a complete setup with the <acronym>GUI
+</acronym> of the system, using the modules - generators, effects and output - 
+connected to each other.</para>
 
-<para>aRts provides necessary libraries 
+<para><acronym>aRts</acronym> provides necessary libraries 
 for KDE, however it can be installed as a standalone package.  
-The installation
-instructions for aRts can be found in the <xref linkend="kde-core-arts"/> portion
+The installation instructions for aRts can be found in the 
+<xref linkend="kde-core-arts"/> portion
 of the KDE installation instructions.</para>
 
Index: multimedia/libdriv/audiofile.xml
===================================================================
--- multimedia/libdriv/audiofile.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/audiofile.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,5 +1,5 @@
-<sect1 id="audiofile" xreflabel="audiofile-&audiofile-version;">
+<sect1 id="audiofile" xreflabel="Audio File-&audiofile-version;">
 <?dbhtml filename="audiofile.html" dir="multimedia"?>
-<title>audiofile-&audiofile-version;</title>
+<title>Audio File-&audiofile-version;</title>
 
 &audiofile-intro;
Index: multimedia/libdriv/audiofile/audiofile-config.xml
===================================================================
--- multimedia/libdriv/audiofile/audiofile-config.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/audiofile/audiofile-config.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring <application>audiofile</application></title>
+<title>Configuring <application>Audio File</application></title>
 
 <sect3><title>Configuration Information</title>
Index: multimedia/libdriv/audiofile/audiofile-desc.xml
===================================================================
--- multimedia/libdriv/audiofile/audiofile-desc.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/audiofile/audiofile-desc.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The audiofile package contains <filename>libaudiofile</filename> 
+<para>The <application>Audio File</application> package contains 
+<filename>libaudiofile</filename> 
 libraries, <command>audiofile-config</command>, <command>sfinfo
 </command>and <command>sfconvert</command>.</para>
@@ -13,6 +14,6 @@
 <para>The <filename>libaudiofile</filename> library is used by programs to 
 support <filename>AIFF</filename>, <acronym>AIFF
-</acronym>-compressed, SUN/NeXT, <filename>WAV</filename> and 
-<acronym>BICS</acronym> audio formats.</para></sect3>
+</acronym>-compressed, Sun/NeXT, <filename>WAV</filename> and 
+<acronym>BIC</acronym> audio formats.</para></sect3>
 
 <sect3><title>audiofile-config</title>
Index: multimedia/libdriv/audiofile/audiofile-inst.xml
===================================================================
--- multimedia/libdriv/audiofile/audiofile-inst.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/audiofile/audiofile-inst.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>audiofile</application></title>
+<title>Installation of <application>Audio File</application></title>
 
-<para>Install <application>audiofile</application> by running the following 
+<para>Install <application>Audio File</application> by running the following 
 commands:</para>
 
Index: multimedia/libdriv/audiofile/audiofile-intro.xml
===================================================================
--- multimedia/libdriv/audiofile/audiofile-intro.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/audiofile/audiofile-intro.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>audiofile</application></title>
+<title>Introduction to <application>Audio File</application></title>
 
-<para>The <application>audiofile</application> package contains the audiofile 
+<para>The <application>Audio File</application> package contains the audio file 
 libraries and two sound file support programs. These are useful to support 
 basic sound file formats.</para>
Index: multimedia/libdriv/esound.xml
===================================================================
--- multimedia/libdriv/esound.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/esound.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,5 +1,5 @@
-<sect1 id="esound" xreflabel="esound-&esound-version;">
+<sect1 id="esound" xreflabel="EsounD-&esound-version;">
 <?dbhtml filename="esound.html" dir="multimedia"?>
-<title>esound-&esound-version;</title>
+<title>EsounD-&esound-version;</title>
 
 &esound-intro;
Index: multimedia/libdriv/esound/esound-config.xml
===================================================================
--- multimedia/libdriv/esound/esound-config.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/esound/esound-config.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring esound</title>
+<title>Configuring <application>EsounD</application></title>
 
 <sect3><title>Config files</title>
@@ -9,5 +9,6 @@
 
 <para>Instructions and information about the configuration file is
-located in the <filename>TIPS</filename> file in the esound source directory.</para>
+located in the <filename>TIPS</filename> file in the <application>EsounD
+</application> source directory.</para>
 </sect3>
 
Index: multimedia/libdriv/esound/esound-desc.xml
===================================================================
--- multimedia/libdriv/esound/esound-desc.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/esound/esound-desc.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The esound package contains <command>esd</command>,
+<para>The <application>EsounD</application> package contains 
+<command>esd</command>,
 <command>esdcat</command>, <command>esdctl</command>,
 <command>esdloop</command>, <command>esdmon</command>,
@@ -16,5 +17,6 @@
 
 <sect3><title>esdcat</title>
-<para><command>esdcat</command> plays a raw audio stream through the daemon.</para></sect3>
+<para><command>esdcat</command> plays a <filename>raw</filename> audio stream 
+through the daemon.</para></sect3>
 
 <sect3><title>esdctl</title>
@@ -22,6 +24,6 @@
 
 <sect3><title>esdloop</title>
-<para><command>esdloop</command> is test scaffolding for sample cache, loop, and
-free.</para></sect3>
+<para><command>esdloop</command> is test scaffolding for sample cache, loop, 
+and free.</para></sect3>
 
 <sect3><title>esdmon</title>
@@ -33,9 +35,10 @@
 
 <sect3><title>esdsample</title>
-<para><command>esdsample</command> is test scaffolding for sample cache, play back, and
-free.</para></sect3>
+<para><command>esdsample</command> is test scaffolding for sample cache, play 
+back, and free.</para></sect3>
 
 <sect3><title>esd libraries</title>
-<para>esd libraries contain the functions used by esd.</para></sect3>
+<para><filename>libesd</filename> libraries contain the functions used
+by <command>esd</command>.</para></sect3>
 
 </sect2>
Index: multimedia/libdriv/esound/esound-exp.xml
===================================================================
--- multimedia/libdriv/esound/esound-exp.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/esound/esound-exp.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -3,5 +3,6 @@
 
 <para><command>--sysconfdir=/etc</command> : This switch puts configuration 
-files in <filename>/etc</filename> instead of <filename>/use/etc</filename>.</para>
+files in <filename>/etc</filename> instead of <filename>/use/etc</filename>.
+</para>
 
 </sect2>
Index: multimedia/libdriv/esound/esound-inst.xml
===================================================================
--- multimedia/libdriv/esound/esound-inst.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/esound/esound-inst.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,6 +1,7 @@
 <sect2>
-<title>Installation of <application>esound</application></title>
+<title>Installation of <application>EsounD</application></title>
 
-<para>Install <application>esound</application> by running the following commands:</para>
+<para>Install <application>EsounD</application> by running the following 
+commands:</para>
 
 <para><screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
Index: multimedia/libdriv/esound/esound-intro.xml
===================================================================
--- multimedia/libdriv/esound/esound-intro.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/esound/esound-intro.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,8 +1,8 @@
 <sect2>
-<title>Introduction to esound</title>
+<title>Introduction to <application>EsounD</application></title>
 
-<para>The esound package contains Enlightened Sound Daemon. This is
-useful for mixing together several digitized audio streams for playback
-by a single device.</para>
+<para>The <application>EsounD</application> package contains Enlightened Sound 
+Daemon. This is useful for mixing together several digitized audio streams for 
+playback by a single device.</para>
 
 <sect3><title>Package information</title>
@@ -15,5 +15,5 @@
 </sect3>
 
-<sect3><title><application>esound</application> dependencies</title>
+<sect3><title><application>EsounD</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="audiofile"/></para></sect4>
Index: multimedia/libdriv/flac/flac-desc.xml
===================================================================
--- multimedia/libdriv/flac/flac-desc.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/flac/flac-desc.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -33,5 +33,5 @@
 <sect3><title>libxmms-flac</title>
 <para><filename class="libraryfile">libxmms-flac</filename> is a plugin
-for xmms.</para></sect3>
+for <application><acronym>XMMS</acronym></application>.</para></sect3>
 
 </sect2>
Index: multimedia/libdriv/libfame/libfame-desc.xml
===================================================================
--- multimedia/libdriv/libfame/libfame-desc.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/libfame/libfame-desc.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The libFAME package contains <command>libfame-config</command> and
+<para>The <application>lib<acronym>FAME</acronym></application> package 
+contains <command>libfame-config</command> and
 <filename class="libraryfile">libfame</filename>.</para>
 
@@ -11,6 +12,6 @@
 <sect3><title>libfame-config</title>
 <para><command>libfame-config</command>
-provides configuration information for <filename
-class="libraryfile">libfame</filename>.
+provides configuration information for <filename class="libraryfile">libfame
+</filename>.
 </para></sect3>
 
Index: multimedia/libdriv/libfame/libfame-inst.xml
===================================================================
--- multimedia/libdriv/libfame/libfame-inst.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/libfame/libfame-inst.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Installation of <application>libFAME</application></title>
+<title>Installation of <application>lib<acronym>FAME</acronym></application></title>
 
-<para>Install <application>libFAME</application> by running the
-following commands:</para>
+<para>Install <application>lib<acronym>FAME</acronym></application> by running 
+the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr &amp;&amp;
Index: multimedia/libdriv/libfame/libfame-intro.xml
===================================================================
--- multimedia/libdriv/libfame/libfame-intro.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/libfame/libfame-intro.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Introduction to <application>libFAME</application></title>
+<title>Introduction to <application>lib<acronym>FAME</acronym></application></title>
 
-<para><application>libFAME</application> is a 
+<para><application>lib<acronym>FAME</acronym></application> is a 
 fast (real-time) MPEG-1 as well as MPEG-4 rectangular and arbitrary shaped
 video encoding library.</para>
Index: multimedia/libdriv/libmpeg3/libmpeg3-desc.xml
===================================================================
--- multimedia/libdriv/libmpeg3/libmpeg3-desc.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/libmpeg3/libmpeg3-desc.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The libmpeg3 package provides <filename
+<para>The <application>libmpeg3</application> package provides <filename
 class="libraryfile">libmpeg3</filename> library,
 <command>mpeg3cat</command>, <command>mpeg3dump</command>
@@ -22,5 +22,5 @@
 <sect3><title>mpeg3dump</title>
 <para><command>mpeg3dump</command> dumps information or extracts audio
-to a 24 bit pcm file.</para></sect3>
+to a 24 bit <acronym>PCM</acronym> file.</para></sect3>
 
 <sect3><title>mpeg3toc</title>
Index: multimedia/libdriv/nas/nas-desc.xml
===================================================================
--- multimedia/libdriv/nas/nas-desc.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/nas/nas-desc.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The <acronym>NAS</acronym> package contains <acronym>NAS</acronym> utils, headers and libraries.</para>
+<para>The <application><acronym>NAS</acronym></application> package contains 
+<acronym>NAS</acronym> utils, headers and libraries.</para>
 
 </sect2>
Index: multimedia/libdriv/nas/nas-intro.xml
===================================================================
--- multimedia/libdriv/nas/nas-intro.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/nas/nas-intro.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -3,6 +3,6 @@
 
 <para>The Network Audio System is a network transparent, client/server audio
-transport system. It can be described as the audio equivalent of an X
-server.</para>
+transport system. It can be described as the audio equivalent of an
+<application>X</application> server.</para>
 
 <sect3><title>Package information</title>
Index: multimedia/libdriv/sdl/sdl-config.xml
===================================================================
--- multimedia/libdriv/sdl/sdl-config.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/sdl/sdl-config.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring SDL</title>
+<title>Configuring <application><acronym>SDL</acronym></application></title>
 
 <sect3><title>Configuration Information</title>
Index: multimedia/libdriv/sdl/sdl-desc.xml
===================================================================
--- multimedia/libdriv/sdl/sdl-desc.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/sdl/sdl-desc.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The SDL package contains the <userinput>Simple DirectMedia 
-Layer</userinput>.</para>
+<para>The <application><acronym>SDL</acronym></application> package contains 
+the <userinput>Simple DirectMedia Layer</userinput>.</para>
 
 </sect2>
@@ -10,7 +10,7 @@
 
 <sect3><title>Simple DirectMedia Layer</title>
-<para>The Simple DirectMedia Layer is a generic API that provides low level
-access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL, and 
-2D framebuffer across multiple platforms.</para></sect3>
+<para>The Simple DirectMedia Layer is a generic <acronym>API</acronym> that 
+provides low level access to audio, keyboard, mouse, joystick, 3D hardware via 
+OpenGL, and 2D framebuffer across multiple platforms.</para></sect3>
 
 </sect2>
Index: multimedia/libdriv/sdl/sdl-exp.xml
===================================================================
--- multimedia/libdriv/sdl/sdl-exp.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/sdl/sdl-exp.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -2,8 +2,11 @@
 <title>Command explanations</title>
 
-<para><command>--disable-debug</command> : This switch configures SDL to build with aggressive optimizations.</para>
+<para><command>--disable-debug</command> : This switch configures
+<application><acronym>SDL</acronym></application> to build with aggressive 
+optimizations.</para>
 
 <para><command>--enable-video-aalib</command> : This optional switch
-is required to build SDL with AAlib video support.</para>
+is required to build <application><acronym>SDL</acronym></application>
+with <acronym>AA</acronym>lib video support.</para>
 
 </sect2>
Index: multimedia/libdriv/sdl/sdl-inst.xml
===================================================================
--- multimedia/libdriv/sdl/sdl-inst.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/sdl/sdl-inst.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,6 +1,6 @@
 <sect2>
-<title>Installation of <application>SDL</application></title>
+<title>Installation of <application><acronym>SDL</acronym></application></title>
 
-<para>Install <application>SDL</application> by running the following commands:</para>
+<para>Install <application><acronym>SDL</acronym></application> by running the following commands:</para>
 
 <screen><userinput><command>./configure --prefix=/usr --disable-debug &amp;&amp;
Index: multimedia/libdriv/sdl/sdl-intro.xml
===================================================================
--- multimedia/libdriv/sdl/sdl-intro.xml	(revision 2f81a4dd52bd71a0563ae50be61fef90e5f77a94)
+++ multimedia/libdriv/sdl/sdl-intro.xml	(revision 8c3989b227425700eea0e20b73d9d4a3a5cedaec)
@@ -1,8 +1,8 @@
 <sect2>
-<title>Introduction to <application>SDL</application></title>
+<title>Introduction to <application><acronym>SDL</acronym></application></title>
 
-<para>The Simple DirectMedia Layer (<application>SDL</application> for 
-short) is a cross-platform library designed to make it easy to write 
-multimedia software, such as games and emulators.</para>
+<para>The Simple DirectMedia Layer (<application><acronym>SDL</acronym>
+</application> for short) is a cross-platform library designed to make it easy 
+to write multimedia software, such as games and emulators.</para>
 
 <sect3><title>Package information</title>
@@ -15,5 +15,5 @@
 </sect3>
 
-<sect3><title><application>SDL</application> dependencies</title>
+<sect3><title><application><acronym>SDL</acronym></application> dependencies</title>
 <sect4><title>Optional</title>
 <para><xref linkend="alsa"/>, <xref linkend="esound"/>, <xref
