Index: multimedia/libdriv/libvorbis.xml
===================================================================
--- multimedia/libdriv/libvorbis.xml	(revision fee89d15e5a5471de93e087a55dfedafc58ae981)
+++ multimedia/libdriv/libvorbis.xml	(revision 93d50f56b2e29f15de4af2272b764d756c9ad0da)
@@ -56,5 +56,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Libvorbis Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
Index: multimedia/libdriv/nas.xml
===================================================================
--- multimedia/libdriv/nas.xml	(revision fee89d15e5a5471de93e087a55dfedafc58ae981)
+++ multimedia/libdriv/nas.xml	(revision 93d50f56b2e29f15de4af2272b764d756c9ad0da)
@@ -70,5 +70,5 @@
  -->
 
-    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
+    <bridgehead renderas="sect3">NAS Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
Index: multimedia/libdriv/sdl.xml
===================================================================
--- multimedia/libdriv/sdl.xml	(revision fee89d15e5a5471de93e087a55dfedafc58ae981)
+++ multimedia/libdriv/sdl.xml	(revision 93d50f56b2e29f15de4af2272b764d756c9ad0da)
@@ -56,5 +56,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
+    <bridgehead renderas="sect3">SDL Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: multimedia/libdriv/speex.xml
===================================================================
--- multimedia/libdriv/speex.xml	(revision fee89d15e5a5471de93e087a55dfedafc58ae981)
+++ multimedia/libdriv/speex.xml	(revision 93d50f56b2e29f15de4af2272b764d756c9ad0da)
@@ -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,78 +14,120 @@
 
 <sect1 id="speex" xreflabel="Speex-&speex-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="speex.html"?>
-<title>Speex-&speex-version;</title>
+  <?dbhtml filename="speex.html"?>
 
-<sect2>
-<title>Introduction to <application>Speex</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para><application>Speex</application> is an audio compression format designed
-especially for speech. It is well-adapted to Internet applications and
-provides useful features that are not present in most other
-<acronym>CODEC</acronym>s.</para>
+  <title>Speex-&speex-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&speex-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&speex-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &speex-md5sum;</para></listitem>
-<listitem><para>Download size: &speex-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&speex-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&speex-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="speex">
+    <primary sortas="a-Speex">Speex</primary>
+  </indexterm>
 
-<sect3><title><application>Speex</application> dependencies</title>
-<sect4><title>Optional</title>
-<para><xref linkend="libogg"/></para>
-</sect4>
-</sect3>
+  <sect2 role="package">
+    <title>Introduction to Speex</title>
 
-</sect2>
+    <para><application>Speex</application> is an audio compression format 
+    designed especially for speech. It is well-adapted to Internet applications and
+    provides useful features that are not present in most other CODECs.</para>
 
-<sect2>
-<title>Installation of <application>Speex</application></title>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&speex-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&speex-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &speex-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &speex-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &speex-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &speex-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<para>Install <application>Speex</application> by running the
-following commands:</para>
+    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
 
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="libogg"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Speex</title>
+
+    <para>Install <application>Speex</application> by running the
+    following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</command></userinput></screen>
+make install</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Contents</title>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<para>The <application>Speex</application> package provides 
-<command>speexdec</command>,
-<command>speexenc</command> and 
-<filename class="libraryfile">libspeex</filename>.</para>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-</sect2>
+      <seglistitem>
+        <seg>speexdec and speexenc</seg>
+        <seg>libspeex.[so,a]</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<sect2><title>Description</title>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-<sect3><title>speexdec</title>
-<para><command>speexdec</command> decodes a <application>Speex</application> 
-file and produces a <acronym>WAV</acronym> or raw file.</para></sect3>
+      <varlistentry id="speexdec">
+        <term><command>speexdec</command></term>
+        <listitem>
+          <para>decodes a <application>Speex</application> file and 
+          produces a WAV or raw file.</para>
+          <indexterm zone="speex speexdec">
+            <primary sortas="b-speexdec">speexdec</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<sect3><title>speexenc</title>
-<para><command>speexenc</command> encodes a <acronym>WAV</acronym> or
-raw files using <application>Speex</application>.</para></sect3>
+      <varlistentry id="speexenc">
+        <term><command>speexenc</command></term>
+        <listitem>
+          <para>encodes a WAV or raw files using 
+          <application>Speex</application>.</para>
+          <indexterm zone="speex speexenc">
+            <primary sortas="b-speexenc">speexenc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<sect3><title>libspeex</title>
-<para><filename class="libraryfile">libspeex</filename> provides
-functions for the audio encoding/decoding programs.</para></sect3>
+      <varlistentry id="libspeex">
+        <term><filename class='libraryfile'>libspeex.[so,a]</filename></term>
+        <listitem>
+          <para>provides functions for the audio encoding/decoding programs.</para>
+          <indexterm zone="speex libspeex">
+            <primary sortas="c-libspeex">libspeex.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
+
+  </sect2>
 
 </sect1>
