Index: multimedia/libdriv/audiofile/audiofile-config.xml
===================================================================
--- multimedia/libdriv/audiofile/audiofile-config.xml	(revision 6b012d98b66304beccaa3c6a90b075c4edcb6606)
+++ multimedia/libdriv/audiofile/audiofile-config.xml	(revision d7c69b8566a5b8dd263cd10f5183ce5e817041de)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring audiofile</title>
+<title>Configuring <application>audiofile</application></title>
 
 <sect3><title>Configuration Information</title>
Index: multimedia/libdriv/audiofile/audiofile-desc.xml
===================================================================
--- multimedia/libdriv/audiofile/audiofile-desc.xml	(revision 6b012d98b66304beccaa3c6a90b075c4edcb6606)
+++ multimedia/libdriv/audiofile/audiofile-desc.xml	(revision d7c69b8566a5b8dd263cd10f5183ce5e817041de)
@@ -2,7 +2,7 @@
 <title>Contents</title>
 
-<para>The audiofile package contains <filename>libaudiofile</filename> libraries,
-<userinput>audiofile-config</userinput>, <userinput>sfinfo
-</userinput>and <userinput>sfconvert</userinput>.</para>
+<para>The audiofile package contains <filename>libaudiofile</filename> 
+libraries, <command>audiofile-config</command>, <command>sfinfo
+</command>and <command>sfconvert</command>.</para>
 
 </sect2>
@@ -11,18 +11,21 @@
 
 <sect3><title>audiofile libraries</title>
-<para>The audiofile library is used by programs to support AIFF,
-AIFF-compressed, SUN/NeXT, WAVE and BICS audio formats.</para></sect3>
+<para>The <filename>libaudiofile</filename> library is used by programs to 
+support <acronym>AIFF</acronym>, <acronym>AIFF</acronym>-compressed,
+SUN/NeXT, <acronym>WAV</acronym> and <acronym>BICS</acronym> audio formats.</para></sect3>
 
 <sect3><title>audiofile-config</title>
-<para>The audiofile-config script is used during the compile process by
-programs linking to this library.</para></sect3>
+<para>The <command>audiofile-config</command> script is used during the compile 
+process by programs linking to this library.</para></sect3>
 
 <sect3><title>sfinfo</title>
-<para>The sfinfo program displays the sound file format, audio encoding, 
-sampling rate and duration for audio formats supported by this library.</para></sect3>
+<para>The <command>sfinfo</command> program displays the sound file format, 
+audio encoding, sampling rate and duration for audio formats supported by this 
+library.</para></sect3>
 
 <sect3><title>sfconvert</title>
-<para>The sfconvert program converts sound file formats where the
-original format and destination format are supported by this library.</para></sect3>
+<para>The <command>sfconvert</command> program converts sound file formats 
+where the original format and destination format are supported by this library.
+</para></sect3>
 
 </sect2>
Index: multimedia/libdriv/audiofile/audiofile-inst.xml
===================================================================
--- multimedia/libdriv/audiofile/audiofile-inst.xml	(revision 6b012d98b66304beccaa3c6a90b075c4edcb6606)
+++ multimedia/libdriv/audiofile/audiofile-inst.xml	(revision d7c69b8566a5b8dd263cd10f5183ce5e817041de)
@@ -1,10 +1,11 @@
 <sect2>
-<title>Installation of audiofile</title>
+<title>Installation of <application>audiofile</application></title>
 
-<para>Install audiofile by running the following commands:</para>
+<para>Install <application>audiofile</application> by running the following 
+commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: multimedia/libdriv/audiofile/audiofile-intro.xml
===================================================================
--- multimedia/libdriv/audiofile/audiofile-intro.xml	(revision 6b012d98b66304beccaa3c6a90b075c4edcb6606)
+++ multimedia/libdriv/audiofile/audiofile-intro.xml	(revision d7c69b8566a5b8dd263cd10f5183ce5e817041de)
@@ -1,15 +1,22 @@
 <sect2>
-<title>Introduction to audiofile</title>
+<title>Introduction to <application>audiofile</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&audiofile-download-http;"/>
-Download location (FTP):        <ulink url="&audiofile-download-ftp;"/>
-Version used:                   &audiofile-version;
-Package size:                   &audiofile-size;
-Estimated Disk space required:  &audiofile-buildsize;
-Estimated build time:           &audiofile-time;</screen>
+<para>The <application>audiofile</application> package contains the audiofile 
+libraries and two sound file support programs. These are useful to support 
+basic sound file formats.</para>
 
-<para>The audiofile package contains the audiofile libraries and two
-sound file support programs. These are useful to support basic sound
-file formats.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&audiofile-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&audiofile-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &audiofile-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&audiofile-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&audiofile-time;</para></listitem></itemizedlist>
+</sect3>
+
 
 </sect2>
Index: multimedia/libdriv/libao/libao-config.xml
===================================================================
--- multimedia/libdriv/libao/libao-config.xml	(revision 6b012d98b66304beccaa3c6a90b075c4edcb6606)
+++ multimedia/libdriv/libao/libao-config.xml	(revision d7c69b8566a5b8dd263cd10f5183ce5e817041de)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring libao</title>
+<title>Configuring <application>libao</application></title>
 
 <sect3><title>Configuration Information</title>
Index: multimedia/libdriv/libao/libao-desc.xml
===================================================================
--- multimedia/libdriv/libao/libao-desc.xml	(revision 6b012d98b66304beccaa3c6a90b075c4edcb6606)
+++ multimedia/libdriv/libao/libao-desc.xml	(revision d7c69b8566a5b8dd263cd10f5183ce5e817041de)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The libao package contains <filename>libao</filename> libraries.</para>
+<para>The <application>libao</application> package contains <filename>libao</filename> libraries.</para>
 
 </sect2>
@@ -9,6 +9,6 @@
 
 <sect3><title>ao libraries</title>
-<para>libao provides functions for programs wishing to output sound over
-supported platforms.</para></sect3>
+<para><filename>libao</filename> libraries provide functions for programs 
+wishing to output sound over supported platforms.</para></sect3>
 
 </sect2>
Index: multimedia/libdriv/libao/libao-exp.xml
===================================================================
--- multimedia/libdriv/libao/libao-exp.xml	(revision 6b012d98b66304beccaa3c6a90b075c4edcb6606)
+++ multimedia/libdriv/libao/libao-exp.xml	(revision d7c69b8566a5b8dd263cd10f5183ce5e817041de)
@@ -2,5 +2,5 @@
 <title>Command explanations</title>
 
-<para><userinput>make CC="gcc $CFLAGS"</userinput> : This makes libao
+<para><command>make CC="gcc $CFLAGS"</command> : This makes libao
 compile using our CFLAGS for optimizations.</para>
 
Index: multimedia/libdriv/libao/libao-inst.xml
===================================================================
--- multimedia/libdriv/libao/libao-inst.xml	(revision 6b012d98b66304beccaa3c6a90b075c4edcb6606)
+++ multimedia/libdriv/libao/libao-inst.xml	(revision d7c69b8566a5b8dd263cd10f5183ce5e817041de)
@@ -1,10 +1,11 @@
 <sect2>
-<title>Installation of libao</title>
+<title>Installation of <application>libao</application></title>
 
-<para>Install libao by running the following commands:</para>
+<para>Install <application>libao</application> by running the following 
+commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: multimedia/libdriv/libao/libao-intro.xml
===================================================================
--- multimedia/libdriv/libao/libao-intro.xml	(revision 6b012d98b66304beccaa3c6a90b075c4edcb6606)
+++ multimedia/libdriv/libao/libao-intro.xml	(revision d7c69b8566a5b8dd263cd10f5183ce5e817041de)
@@ -1,15 +1,25 @@
 <sect2>
-<title>Introduction to libao</title>
+<title>Introduction to <application>libao</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&libao-download-http;"/>
-Download location (FTP):        <ulink url="&libao-download-ftp;"/>
-Version used:                   &libao-version;
-Package size:                   &libao-size;
-Estimated Disk space required:  &libao-buildsize;</screen>
+<para>The <application>libao</application> package contains a cross-platform 
+audio library. This is useful to output audio on a wide variety of platforms.  
+It currently supports <acronym>WAV</acronym> files,
+<acronym>OSS</acronym> (Open Sound System), <acronym>ESD</acronym> (Enlighten 
+Sound Daemon) and <acronym>ALSA</acronym> (Advanced Linux Sound Architecture).
+</para>
 
-<para>The libao package contains a cross-platform audio library. This is
-useful to output audio on a wide variety of platforms.  It currently
-supports WAV files, OSS (Open Sound System), ESD (Enlighten Sound
-Daemon) and ALSA (Advanced Linux Sound Architecture).</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&libao-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&libao-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libao-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&libao-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&libao-time;</para></listitem></itemizedlist>
+</sect3>
+
 
 </sect2>
