Index: multimedia/libdriv/libvorbis.xml
===================================================================
--- multimedia/libdriv/libvorbis.xml	(revision fc9cf96a9474f7bc7bd11c8227b13f210f3a2e58)
+++ multimedia/libdriv/libvorbis.xml	(revision 331f41690e6a22f253d51b844d13fdf846d56025)
@@ -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,110 +14,124 @@
 
 <sect1 id="libvorbis" xreflabel="libvorbis-&libvorbis-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="libvorbis.html"?>
-<title>libvorbis-&libvorbis-version;</title>
-<indexterm zone="libvorbis">
-<primary sortas="a-Libvorbis">Libvorbis</primary></indexterm>
+  <?dbhtml filename="libvorbis.html"?>
 
-<sect2>
-<title>Introduction to <application>libvorbis</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>libvorbis</application> package contains a general 
-purpose audio and music encoding format. This is useful for creating (encoding) 
-and playing (decoding) sound in an open (patent free) format.</para>
+  <title>Libvorbis-&libvorbis-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&libvorbis-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&libvorbis-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &libvorbis-md5sum;</para></listitem>
-<listitem><para>Download size: &libvorbis-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&libvorbis-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&libvorbis-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="libvorbis">
+    <primary sortas="a-Libvorbis">Libvorbis</primary>
+  </indexterm>
 
-<sect3><title><application>libvorbis</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="libogg"/></para>
-</sect4>
+  <sect2 role="package">
+    <title>Introduction to Libvorbis</title>
 
-<sect4><title>Optional</title>
-<para><xref linkend="pkgconfig"/>, and 
-<xref linkend="libxslt"/> and 
-<ulink url="http://www.tei-c.org/Software/passivetex/">PassiveTeX</ulink> 
-(to build the <acronym>PDF</acronym> documentation)</para>
-</sect4>
-</sect3>
+    <para>The <application>libvorbis</application> package contains a general 
+    purpose audio and music encoding format. This is useful for creating (encoding) 
+    and playing (decoding) sound in an open (patent free) format.</para>
 
-</sect2>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libvorbis-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libvorbis-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libvorbis-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libvorbis-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libvorbis-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libvorbis-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of <application>libvorbis</application></title>
+    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
 
-<para>Install <application>libvorbis</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="libogg"/></para>
 
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make</command></userinput></screen>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="pkgconfig"/>, and 
+    <xref linkend="libxslt"/> and 
+    <ulink url="http://www.tei-c.org/Software/passivetex/">PassiveTeX</ulink> 
+    (to build the PDF documentation)</para>
 
-<para><application>libvorbis</application> is known to cause compiler errors 
-on certain machines. If you get errors, insert this command after running
-the configure script:</para>
+  </sect2>
 
-<screen><userinput><command>sed -i.bak -e 's/-mno-ieee-fp//' lib/Makefile</command></userinput></screen>
+  <sect2 role="installation">
+    <title>Installation of Libvorbis</title>
 
-<para>This package does not come with a test suite.</para>
+    <para>Install <application>libvorbis</application> by running the following 
+    commands:</para>
 
-<para>Now, as the root user:</para>
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
 
-<screen><userinput role='root'><command>make install</command></userinput></screen>
+    <para><application>libvorbis</application> is known to cause compiler errors 
+    on certain machines. If you get errors, insert this command after running
+    the configure script:</para>
 
-</sect2>
+<screen><userinput>sed -i.bak -e 's/-mno-ieee-fp//' lib/Makefile</userinput></screen>
 
-<sect2>
-<title>Command explanations</title>
+    <para>This package does not come with a test suite.</para>
 
-<para><option>--enable-docs</option>: This switch enables building the 
-documentation.</para>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-</sect2>
+<screen role="root"><userinput>make install</userinput></screen>
 
-<sect2>
-<title>Contents</title>
+  </sect2>
 
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-<seglistitem>
-<seg>None</seg>
-<seg>libvorbis.[so,a], libvorbisenc.[so,a] and
-libvorbisfile.[so,a]</seg>
-<seg>/usr/include/vorbis and /usr/share/doc/libvorbis-&libvorbis-version;</seg>
-</seglistitem>
-</segmentedlist>
+  <sect2 role="commands">
+    <title>Command Explanations</title>
 
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
+    <para><option>--enable-docs</option>: This switch enables building the 
+    documentation.</para>
 
-<varlistentry id="libvorbis-lib">
-<term><filename class='libraryfile'>libvorbis*.[so,a]</filename></term>
-<listitem><para>libraries provide the functions to read and write sound
-files.</para>
-<indexterm zone="libvorbis libvorbis-lib">
-<primary sortas="c-libvorbis">libvorbis*.[so,a]</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
+  </sect2>
 
-</sect2>
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libvorbis.[so,a], libvorbisenc.[so,a], and
+        libvorbisfile.[so,a]</seg>
+        <seg>/usr/include/vorbis and /usr/share/doc/libvorbis-&libvorbis-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libvorbis-lib">
+        <term><filename class='libraryfile'>libvorbis*.[so,a]</filename></term>
+        <listitem>
+          <para>libraries provide the functions to read and write sound files.</para>
+          <indexterm zone="libvorbis libvorbis-lib">
+            <primary sortas="c-libvorbis">libvorbis*.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
