Index: multimedia/audioutils/CDParanoia.xml
===================================================================
--- multimedia/audioutils/CDParanoia.xml	(revision 2537abaea639ac9a5cd221e2dde7c1790fb1b61c)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect1 id="CDParanoia" xreflabel="CDParanoia-&CDParanoia-version;">
-<?dbhtml filename="cdparanoia.html" dir="multimedia"?>
-<title>CDParanoia-&CDParanoia-version;</title>
-
-&CDParanoia-intro;
-&CDParanoia-inst;
-&CDParanoia-config;
-&CDParanoia-desc;
-
-</sect1>
-
Index: multimedia/audioutils/XMMS.xml
===================================================================
--- multimedia/audioutils/XMMS.xml	(revision 2537abaea639ac9a5cd221e2dde7c1790fb1b61c)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<sect1 id="xmms" xreflabel="xmms-&XMMS-version;">
-<?dbhtml filename="xmms.html" dir="multimedia"?>
-<title>xmms-&XMMS-version;</title>
-
-&XMMS-intro;
-&XMMS-inst;
-&XMMS-exp;
-&XMMS-config;
-&XMMS-desc;
-
-</sect1>
-
Index: multimedia/audioutils/cdparanoia.xml
===================================================================
--- multimedia/audioutils/cdparanoia.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
+++ multimedia/audioutils/cdparanoia.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -0,0 +1,11 @@
+<sect1 id="CDParanoia" xreflabel="CDParanoia-&CDParanoia-version;">
+<?dbhtml filename="cdparanoia.html" dir="multimedia"?>
+<title>CDParanoia-&CDParanoia-version;</title>
+
+&CDParanoia-intro;
+&CDParanoia-inst;
+&CDParanoia-config;
+&CDParanoia-desc;
+
+</sect1>
+
Index: multimedia/audioutils/cdparanoia/CDParanoia-config.xml
===================================================================
--- multimedia/audioutils/cdparanoia/CDParanoia-config.xml	(revision 2537abaea639ac9a5cd221e2dde7c1790fb1b61c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-<sect2>
-<title>Configuring CDParanoia</title>
-
-<sect3><title>Configuration Information</title>
-
-<para>CDParanoia itself needs little configuration; information can be
-found from the man page.</para>
-
-&library-config;
-
-</sect3>
-
-</sect2>
-
Index: multimedia/audioutils/cdparanoia/CDParanoia-desc.xml
===================================================================
--- multimedia/audioutils/cdparanoia/CDParanoia-desc.xml	(revision 2537abaea639ac9a5cd221e2dde7c1790fb1b61c)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The CDParanoia package contains <userinput>cdparanoia</userinput>
-and the <userinput>libcdda library</userinput>.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>cdparanoia</title>
-<para>This is used for 'ripping' an audio-cd. Ripping is the process of 
-digitally extracting music from an audio-cd.</para></sect3>
-
-<sect3><title>libcdda library</title>
-<para>No description is currently available.</para></sect3>
-
-</sect2>
-
Index: multimedia/audioutils/cdparanoia/CDParanoia-inst.xml
===================================================================
--- multimedia/audioutils/cdparanoia/CDParanoia-inst.xml	(revision 2537abaea639ac9a5cd221e2dde7c1790fb1b61c)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect2>
-<title>Installation of CDParanoia</title>
-
-<para>Install CDParanoia by running the following commands:</para>
-
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</userinput></screen></para>
-
-</sect2>
-
Index: multimedia/audioutils/cdparanoia/CDParanoia-intro.xml
===================================================================
--- multimedia/audioutils/cdparanoia/CDParanoia-intro.xml	(revision 2537abaea639ac9a5cd221e2dde7c1790fb1b61c)
+++ 	(revision )
@@ -1,14 +1,0 @@
-<sect2>
-<title>Introduction to CDParanoia</title>
-
-<screen>Download location (HTTP):       <ulink url="&CDParanoia-download-http;"/>
-Download location (FTP):        <ulink url="&CDParanoia-download-ftp;"/>
-Version used:                   &CDParanoia-version;
-Package size:                   &CDParanoia-size;
-Estimated Disk space required:  &CDParanoia-buildsize;</screen>
-
-<para>The CDParanoia package contains cdparanoia. This is useful for
-extracting wave files from audio cd's.  A CDDA capable CDROM drive is
-needed.  Practically all drives supported by Linux can be used.</para>
-
-</sect2>
Index: multimedia/audioutils/cdparanoia/cdparanoia-config.xml
===================================================================
--- multimedia/audioutils/cdparanoia/cdparanoia-config.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
+++ multimedia/audioutils/cdparanoia/cdparanoia-config.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Configuring CDParanoia</title>
+
+<sect3><title>Configuration Information</title>
+
+<para>CDParanoia itself needs little configuration; information can be
+found from the man page.</para>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: multimedia/audioutils/cdparanoia/cdparanoia-desc.xml
===================================================================
--- multimedia/audioutils/cdparanoia/cdparanoia-desc.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
+++ multimedia/audioutils/cdparanoia/cdparanoia-desc.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Contents</title>
+
+<para>The CDParanoia package contains <userinput>cdparanoia</userinput>
+and the <filename>libcdda</filename> library.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>cdparanoia</title>
+<para>This is used for 'ripping' an audio-cd. Ripping is the process of 
+digitally extracting music from an audio-cd.</para></sect3>
+
+<sect3><title>libcdda library</title>
+<para>No description is currently available.</para></sect3>
+
+</sect2>
+
Index: multimedia/audioutils/cdparanoia/cdparanoia-inst.xml
===================================================================
--- multimedia/audioutils/cdparanoia/cdparanoia-inst.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
+++ multimedia/audioutils/cdparanoia/cdparanoia-inst.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of CDParanoia</title>
+
+<para>Install CDParanoia by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: multimedia/audioutils/cdparanoia/cdparanoia-intro.xml
===================================================================
--- multimedia/audioutils/cdparanoia/cdparanoia-intro.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
+++ multimedia/audioutils/cdparanoia/cdparanoia-intro.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Introduction to CDParanoia</title>
+
+<screen>Download location (HTTP):       <ulink url="&CDParanoia-download-http;"/>
+Download location (FTP):        <ulink url="&CDParanoia-download-ftp;"/>
+Version used:                   &CDParanoia-version;
+Package size:                   &CDParanoia-size;
+Estimated Disk space required:  &CDParanoia-buildsize;</screen>
+
+<para>The CDParanoia package contains cdparanoia. This is useful for
+extracting wave files from audio cd's.  A CDDA capable CDROM drive is
+needed.  Practically all drives supported by Linux can be used.</para>
+
+</sect2>
Index: multimedia/audioutils/cdparanoia/cdparanoia.ent
===================================================================
--- multimedia/audioutils/cdparanoia/cdparanoia.ent	(revision 2537abaea639ac9a5cd221e2dde7c1790fb1b61c)
+++ multimedia/audioutils/cdparanoia/cdparanoia.ent	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -1,7 +1,7 @@
-<!ENTITY CDParanoia SYSTEM "../CDParanoia.xml">
-<!ENTITY CDParanoia-intro SYSTEM "CDParanoia-intro.xml">
-<!ENTITY CDParanoia-inst SYSTEM "CDParanoia-inst.xml">
-<!ENTITY CDParanoia-desc SYSTEM "CDParanoia-desc.xml">
-<!ENTITY CDParanoia-config SYSTEM "CDParanoia-config.xml">
+<!ENTITY CDParanoia SYSTEM "../cdparanoia.xml">
+<!ENTITY CDParanoia-intro SYSTEM "cdparanoia-intro.xml">
+<!ENTITY CDParanoia-inst SYSTEM "cdparanoia-inst.xml">
+<!ENTITY CDParanoia-desc SYSTEM "cdparanoia-desc.xml">
+<!ENTITY CDParanoia-config SYSTEM "cdparanoia-config.xml">
 <!ENTITY CDParanoia-buildsize "1.3 MB">
 <!ENTITY CDParanoia-version "III-9.8">
Index: multimedia/audioutils/lame/lame-desc.xml
===================================================================
--- multimedia/audioutils/lame/lame-desc.xml	(revision 2537abaea639ac9a5cd221e2dde7c1790fb1b61c)
+++ multimedia/audioutils/lame/lame-desc.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The lame package contains <userinput>lame</userinput> and <userinput>libmp3lame libraries</userinput>.</para>
+<para>The lame package contains <userinput>lame</userinput> and
+<filename>libmp3lame</filename> libraries.</para>
 
 </sect2>
Index: multimedia/audioutils/xmms.xml
===================================================================
--- multimedia/audioutils/xmms.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
+++ multimedia/audioutils/xmms.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -0,0 +1,12 @@
+<sect1 id="xmms" xreflabel="xmms-&XMMS-version;">
+<?dbhtml filename="xmms.html" dir="multimedia"?>
+<title>xmms-&XMMS-version;</title>
+
+&XMMS-intro;
+&XMMS-inst;
+&XMMS-exp;
+&XMMS-config;
+&XMMS-desc;
+
+</sect1>
+
Index: multimedia/audioutils/xmms/XMMS-config.xml
===================================================================
--- multimedia/audioutils/xmms/XMMS-config.xml	(revision 2537abaea639ac9a5cd221e2dde7c1790fb1b61c)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<sect2>
-<title>Configuring xmms</title>
-
-<sect3><title>Config files</title>
-<para><userinput>~/.xmms/config</userinput></para>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para>When you start XMMS for the first time, you can configure it with 
-<userinput>CTRL+P</userinput> Note that you can extend XMMS' functionality
-with plugins and skins. You can find these at <ulink url="http://xmms.org"/>. 
-</para>
-</sect3>
-
-</sect2>
-
Index: multimedia/audioutils/xmms/XMMS-desc.xml
===================================================================
--- multimedia/audioutils/xmms/XMMS-desc.xml	(revision 2537abaea639ac9a5cd221e2dde7c1790fb1b61c)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The xmms package contains <userinput>xmms</userinput>, <userinput>xmms-config</userinput>, <userinput>gnomexmss</userinput> and <userinput>wmxmms.</userinput></para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>xmms</title>
-<para>XMMS, which stands for X Multimedia System, is a program comparable in
-function with WinAMP. It's main function is playing audio files like wav and
-mp3. It can be extended with plugins to play a number of other audio or video
-formats. It's look can be customized with WinAMP style skins.</para></sect3>
-
-<sect3><title>xmms-config</title>
-<para>This script is used by other programs which need to link with xmms to
-retrieve the library and include paths XMMS was compiled with. </para></sect3>
-
-<sect3><title>gnomexmms</title>
-<para>This is an applet for the GNOME desktop environment that will dock into
-the GNOME panel. From the applet you can start and control xmms.</para></sect3>
-
-<sect3><title>wmxmms</title>
-<para>wmxmms is a dock applet for the Window Maker window manager. From the 
-applet you ca start and control xmms.</para></sect3>
-</sect2>
Index: multimedia/audioutils/xmms/XMMS-exp.xml
===================================================================
--- multimedia/audioutils/xmms/XMMS-exp.xml	(revision 2537abaea639ac9a5cd221e2dde7c1790fb1b61c)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><screen><userinput>./configure --prefix=/usr \
---enable-one-plugin-dir &amp;&amp;</userinput></screen>
-This command ensures that all plugins are located under
-/usr/lib/xmms/Plugins.</para>
-</sect2>
-
Index: multimedia/audioutils/xmms/XMMS-inst.xml
===================================================================
--- multimedia/audioutils/xmms/XMMS-inst.xml	(revision 2537abaea639ac9a5cd221e2dde7c1790fb1b61c)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect2>
-<title>Installation of XMMS</title>
-
-<para>Install XMMS by running the following commands:</para>
-
-<para><screen><userinput>./configure --prefix=/usr \
---enable-one-plugin-dir &amp;&amp;</userinput>
-<userinput>make &amp;&amp;</userinput>
-<userinput>make install</userinput></screen></para>
-</sect2>
-
Index: multimedia/audioutils/xmms/XMMS-intro.xml
===================================================================
--- multimedia/audioutils/xmms/XMMS-intro.xml	(revision 2537abaea639ac9a5cd221e2dde7c1790fb1b61c)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<sect2>
-<title>Introduction to XMMS</title>
-
-<screen>Download location (HTTP):       <ulink url="&XMMS-download-http;"/>
-Download location (FTP):        <ulink url="&XMMS-download-ftp;"/>
-Version used:                   &XMMS-version;
-Package size:                   &XMMS-size;
-Estimated Disk space required:  &XMMS-buildsize;</screen>
-
-<para>XMMS is an audio player for the X Window System. </para>
-
-<screen>XMMS depends on:
-a working soundcard, <xref linkend="xfree86"/>, <xref linkend="GTK"/> and <xref linkend="GLib"/>
-XMMS will utilize:
-<xref linkend="esound"/>, <xref linkend="gnome-libs"/>, gnome-applets, libmikmod, 
-<xref linkend="libogg"/>, <xref linkend="libvorbis"/> and <xref linkend="libxml"/></screen>
-</sect2>
Index: multimedia/audioutils/xmms/xmms-config.xml
===================================================================
--- multimedia/audioutils/xmms/xmms-config.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
+++ multimedia/audioutils/xmms/xmms-config.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Configuring xmms</title>
+
+<sect3><title>Config files</title>
+<para><userinput>~/.xmms/config</userinput></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>When you start XMMS for the first time, you can configure it with 
+<userinput>CTRL+P</userinput> Note that you can extend XMMS' functionality
+with plugins and skins. You can find these at <ulink url="http://xmms.org"/>. 
+</para>
+</sect3>
+
+</sect2>
+
Index: multimedia/audioutils/xmms/xmms-desc.xml
===================================================================
--- multimedia/audioutils/xmms/xmms-desc.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
+++ multimedia/audioutils/xmms/xmms-desc.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -0,0 +1,27 @@
+<sect2>
+<title>Contents</title>
+
+<para>The xmms package contains <userinput>xmms</userinput>, <userinput>xmms-config</userinput>, <userinput>gnomexmss</userinput> and <userinput>wmxmms.</userinput></para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>xmms</title>
+<para>XMMS, which stands for X Multimedia System, is a program comparable in
+function with WinAMP. It's main function is playing audio files like wav and
+mp3. It can be extended with plugins to play a number of other audio or video
+formats. It's look can be customized with WinAMP style skins.</para></sect3>
+
+<sect3><title>xmms-config</title>
+<para>This script is used by other programs which need to link with xmms to
+retrieve the library and include paths XMMS was compiled with. </para></sect3>
+
+<sect3><title>gnomexmms</title>
+<para>This is an applet for the GNOME desktop environment that will dock into
+the GNOME panel. From the applet you can start and control xmms.</para></sect3>
+
+<sect3><title>wmxmms</title>
+<para>wmxmms is a dock applet for the Window Maker window manager. From the 
+applet you ca start and control xmms.</para></sect3>
+</sect2>
Index: multimedia/audioutils/xmms/xmms-exp.xml
===================================================================
--- multimedia/audioutils/xmms/xmms-exp.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
+++ multimedia/audioutils/xmms/xmms-exp.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -0,0 +1,9 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><screen><userinput>./configure --prefix=/usr \
+--enable-one-plugin-dir &amp;&amp;</userinput></screen>
+This command ensures that all plugins are located under
+/usr/lib/xmms/Plugins.</para>
+</sect2>
+
Index: multimedia/audioutils/xmms/xmms-inst.xml
===================================================================
--- multimedia/audioutils/xmms/xmms-inst.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
+++ multimedia/audioutils/xmms/xmms-inst.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of XMMS</title>
+
+<para>Install XMMS by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr \
+--enable-one-plugin-dir &amp;&amp;</userinput>
+<userinput>make &amp;&amp;</userinput>
+<userinput>make install</userinput></screen></para>
+</sect2>
+
Index: multimedia/audioutils/xmms/xmms-intro.xml
===================================================================
--- multimedia/audioutils/xmms/xmms-intro.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
+++ multimedia/audioutils/xmms/xmms-intro.xml	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to XMMS</title>
+
+<screen>Download location (HTTP):       <ulink url="&XMMS-download-http;"/>
+Download location (FTP):        <ulink url="&XMMS-download-ftp;"/>
+Version used:                   &XMMS-version;
+Package size:                   &XMMS-size;
+Estimated Disk space required:  &XMMS-buildsize;</screen>
+
+<para>XMMS is an audio player for the X Window System. </para>
+
+<screen>XMMS depends on:
+a working soundcard, <xref linkend="xfree86"/>, <xref linkend="GTK"/> and <xref linkend="GLib"/>
+XMMS will utilize:
+<xref linkend="esound"/>, <xref linkend="gnome-libs"/>, gnome-applets, libmikmod, 
+<xref linkend="libogg"/>, <xref linkend="libvorbis"/> and <xref linkend="libxml"/></screen>
+</sect2>
Index: multimedia/audioutils/xmms/xmms.ent
===================================================================
--- multimedia/audioutils/xmms/xmms.ent	(revision 2537abaea639ac9a5cd221e2dde7c1790fb1b61c)
+++ multimedia/audioutils/xmms/xmms.ent	(revision 0d1379a705498c944e920f8eef4f07bd5a28aa22)
@@ -1,8 +1,8 @@
-<!ENTITY XMMS SYSTEM "../XMMS.xml">
-<!ENTITY XMMS-intro SYSTEM "XMMS-intro.xml">
-<!ENTITY XMMS-inst SYSTEM "XMMS-inst.xml">
-<!ENTITY XMMS-exp SYSTEM "XMMS-exp.xml">
-<!ENTITY XMMS-desc SYSTEM "XMMS-desc.xml">
-<!ENTITY XMMS-config SYSTEM "XMMS-config.xml">
+<!ENTITY XMMS SYSTEM "../xmms.xml">
+<!ENTITY XMMS-intro SYSTEM "xmms-intro.xml">
+<!ENTITY XMMS-inst SYSTEM "xmms-inst.xml">
+<!ENTITY XMMS-exp SYSTEM "xmms-exp.xml">
+<!ENTITY XMMS-desc SYSTEM "xmms-desc.xml">
+<!ENTITY XMMS-config SYSTEM "xmms-config.xml">
 <!ENTITY XMMS-buildsize "17 MB">
 <!ENTITY XMMS-version "1.2.7">
