Index: multimedia/audioutils/xmms.xml
===================================================================
--- multimedia/audioutils/xmms.xml	(revision 43530f8f4cd553709abbd0d40f0cac6b637e7814)
+++ multimedia/audioutils/xmms.xml	(revision f6c02f1f503a6509d237ac483ade31ac006bc86d)
@@ -1,2 +1,3 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
@@ -13,151 +14,174 @@
 
 <sect1 id="xmms" xreflabel="XMMS-&XMMS-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="xmms.html"?>
-<title>XMMS-&XMMS-version;</title>
-<indexterm zone="xmms">
-<primary sortas="a-XMMS">XMMS</primary></indexterm>
+  <?dbhtml filename="xmms.html"?>
 
-<sect2>
-<title>Introduction to 
-<application><acronym>XMMS</acronym></application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para><application><acronym>XMMS</acronym></application> is an audio player 
-for the <application>X</application> Window System. </para>
+  <title>XMMS-&XMMS-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&XMMS-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&XMMS-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &XMMS-md5sum;</para></listitem>
-<listitem><para>Download size: &XMMS-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&XMMS-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&XMMS-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="xmms">
+    <primary sortas="a-XMMS">XMMS</primary>
+  </indexterm>
 
-<sect3><title><application><acronym>XMMS</acronym></application> 
-dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="GTK"/></para>
-</sect4>
+  <sect2 role="package">
+    <title>Introduction to XMMS</title>
 
-<sect4><title>Optional</title>
-<para><xref linkend="alsa"/>, 
-<xref linkend="esound"/>, 
-<xref linkend="libogg"/>, 
-<xref linkend="libvorbis"/> and 
-<xref linkend="libmikmod"/></para>
-</sect4>
-</sect3>
+    <para><application>XMMS</application> is an audio player 
+    for the <application>X Window System</application>.</para>
 
-</sect2>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&XMMS-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&XMMS-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &XMMS-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &XMMS-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &XMMS-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &XMMS-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of 
-<application><acronym>XMMS</acronym></application></title>
+    <bridgehead renderas="sect3">XMMS Dependencies</bridgehead>
 
-<para>Install <application><acronym>XMMS</acronym></application> by running 
-the following commands:</para>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="GTK"/></para>
 
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make</command></userinput></screen>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="alsa"/>, 
+    <xref linkend="esound"/>, 
+    <xref linkend="libogg"/>, 
+    <xref linkend="libvorbis"/> and 
+    <xref linkend="libmikmod"/></para>
 
-<para>This package does not come with a test suite.</para>
+  </sect2>
 
-<para>Now, as the root user:</para>
+  <sect2 role="installation">
+    <title>Installation of XMMS</title>
 
-<screen><userinput role='root'><command>make install</command></userinput></screen>
-</sect2>
+    <para>Install <application>XMMS</application> by running 
+    the following commands:</para>
 
-<sect2>
-<title>Configuring <application><acronym>XMMS</acronym></application></title>
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
 
-<sect3 id="xmms-config-config"><title>Config files</title>
-<para><filename>~/.xmms/config</filename></para>
-<indexterm zone="xmms xmms-config-config">
-<primary sortas="e-AA.xmms-config">~/.xmms/config</primary>
-</indexterm>
-</sect3>
+    <para>This package does not come with a test suite.</para>
 
-<sect3><title>Configuration Information</title>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<para>When you start <command>xmms</command> 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>
+<screen role="root"><userinput>make install</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Contents</title>
+  <sect2 role="configuration">
+    <title>Configuring XMMS</title>
 
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-<seglistitem>
-<seg>xmms, xmms-config and wmxmms</seg>
-<seg>libxmms.[so,a] and numerous input, output, effects and general 
-plugins</seg>
-<seg>/usr/include/xmms, /usr/lib/xmms and /usr/share/xmms</seg>
-</seglistitem>
-</segmentedlist>
+    <sect3 id="xmms-config-config">
+      <title>Config Files</title>
 
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
+      <para><filename>~/.xmms/config</filename></para>
 
-<varlistentry id="xmms-prog">
-<term><command>xmms</command></term>
-<listitem><para> (an acronym for X MultiMedia System) is a program comparable 
-in function with <application>WinAMP</application>. Its main function is 
-playing audio files like <filename>WAV</filename> and 
-<filename>MP3</filename>. It can be extended with plugins to play a number of 
-other audio or video formats. Its look can be customized with 
-<application>WinAMP</application> style skins.</para>
-<indexterm zone="xmms xmms-prog">
-<primary sortas="b-xmms">xmms</primary></indexterm>
-</listitem>
-</varlistentry>
+      <indexterm zone="xmms xmms-config-config">
+        <primary sortas="e-AA.xmms-config">~/.xmms/config</primary>
+      </indexterm>
 
-<varlistentry id="xmms-config">
-<term><command>xmms-config</command></term>
-<listitem><para>is used by other programs which need to link with 
-<command>xmms</command> to retrieve the library and include paths.</para>
-<indexterm zone="xmms xmms-config">
-<primary sortas="b-xmms-config">xmms-config</primary></indexterm>
-</listitem>
-</varlistentry>
+    </sect3>
 
-<varlistentry id="wmxmms">
-<term><command>wmxmms</command></term>
-<listitem><para>is a dock applet for the 
-<application>Window Maker</application> window manager. From the applet you 
-can start and control <command>xmms</command>.</para>
-<indexterm zone="xmms wmxmms">
-<primary sortas="b-wmxmms">wmxmms</primary></indexterm>
-</listitem>
-</varlistentry>
+    <sect3>
+      <title>Configuration Information</title>
 
-<varlistentry id="libxmms">
-<term><filename class='libraryfile'>libxmms.[so,a]</filename></term>
-<listitem><para>contains graphics and playback functions used by 
-<command>xmms</command>. These functions can also be utilized by other 
-packages.</para>
-<indexterm zone="xmms libxmms">
-<primary sortas="c-libxmms">libxmms.[so,a]</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
+      <para>When you start <command>xmms</command> for the first time, you can 
+      configure it with <keycap>CTRL+P</keycap>. Note that you can extend 
+      <application>XMMS</application>' functionality with plugins and skins. 
+      You can find these at <ulink url="http://xmms.org"/>.</para>
 
-</sect2>
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>xmms, xmms-config, and wmxmms</seg>
+        <seg>libxmms.[so,a] and numerous input, output, effects, and general 
+        plugins</seg>
+        <seg>/usr/include/xmms, /usr/lib/xmms, and /usr/share/xmms</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="xmms-prog">
+        <term><command>xmms</command></term>
+        <listitem>
+          <para> (an acronym for X MultiMedia System) is a program comparable 
+          in function with <application>WinAMP</application>. Its 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. Its look can be customized with 
+          <application>WinAMP</application> style skins.</para>
+          <indexterm zone="xmms xmms-prog">
+            <primary sortas="b-xmms">xmms</primary></indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xmms-config">
+        <term><command>xmms-config</command></term>
+        <listitem>
+          <para>is used by other programs which need to link with 
+          <command>xmms</command> to retrieve the library and include paths.</para>
+          <indexterm zone="xmms xmms-config">
+            <primary sortas="b-xmms-config">xmms-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="wmxmms">
+        <term><command>wmxmms</command></term>
+        <listitem>
+          <para>is a dock applet for the <application>Window Maker</application> 
+          window manager. From the applet you 
+          can start and control <command>xmms</command>.</para>
+          <indexterm zone="xmms wmxmms">
+            <primary sortas="b-wmxmms">wmxmms</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libxmms">
+        <term><filename class='libraryfile'>libxmms.[so,a]</filename></term>
+        <listitem>
+          <para>contains graphics and playback functions used by 
+          <command>xmms</command>. These functions can also be utilized by other 
+          packages.</para>
+          <indexterm zone="xmms libxmms">
+            <primary sortas="c-libxmms">libxmms.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
