Index: gnome/otherlibs/gdk.xml
===================================================================
--- gnome/otherlibs/gdk.xml	(revision 377e46c479c906539eb6f4483f3f8167dc223908)
+++ gnome/otherlibs/gdk.xml	(revision 717f4c3cb8fc3727e645d60069e513b49562e552)
@@ -5,92 +5,118 @@
   %general-entities;
 
-<!ENTITY gdk-download-http "http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/0.22/gdk-pixbuf-&gdk-version;.tar.bz2">
-<!ENTITY gdk-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/0.22/gdk-pixbuf-&gdk-version;.tar.bz2">
-<!ENTITY gdk-md5sum "05fcb68ceaa338614ab650c775efc2f2">
-<!ENTITY gdk-size "396 KB">
-<!ENTITY gdk-buildsize "8.9 MB">
-<!ENTITY gdk-time "0.32 SBU">
+  <!ENTITY gdk-download-http "http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/0.22/gdk-pixbuf-&gdk-version;.tar.bz2">
+  <!ENTITY gdk-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/0.22/gdk-pixbuf-&gdk-version;.tar.bz2">
+  <!ENTITY gdk-md5sum "05fcb68ceaa338614ab650c775efc2f2">
+  <!ENTITY gdk-size "396 KB">
+  <!ENTITY gdk-buildsize "8.9 MB">
+  <!ENTITY gdk-time "0.32 SBU">
 ]>
 
 <sect1 id="gdk" xreflabel="GDK Pixel Buffer-&gdk-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="gdkpixbuf.html"?>
-<title><application>GDK Pixel Buffer</application>-&gdk-version;</title>
+  <?dbhtml filename="gdkpixbuf.html"?>
 
-<sect2>
-<title>Introduction to <application><acronym>GDK</acronym> Pixel 
-Buffer</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application><acronym>GDK</acronym> Pixel Buffer</application> 
-package is the <acronym>GTK</acronym>+ pixel buffer library.</para>
+  <title>GDK Pixel Buffer-&gdk-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&gdk-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&gdk-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &gdk-md5sum;</para></listitem>
-<listitem><para>Download size: &gdk-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&gdk-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&gdk-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="gdk">
+    <primary sortas="a-GDK-Pixel-Buffer">GDK Pixel Buffer</primary>
+  </indexterm>
 
-<sect3><title><application><acronym>GDK</acronym> Pixel Buffer</application> 
-dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="GTK"/></para>
-</sect4>
+  <sect2 role="package">
+    <title>Introduction to GDK Pixel Buffer</title>
 
-<sect4><title>Optional</title>
-<para><xref linkend="gnome-libs"/>, 
-<xref linkend="gtk-doc"/> and 
-<xref linkend="docbook-utils"/></para>
-</sect4>
-</sect3>
+    <para>The <application>GDK Pixel Buffer</application> package
+    is the <application>GTK+</application> pixel buffer library.</para>
 
-</sect2>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gdk-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gdk-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gdk-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gdk-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gdk-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gdk-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of <application><acronym>GDK</acronym> Pixel 
-Buffer</application></title>
+    <bridgehead renderas="sect3">GDK Pixel Buffer Dependencies</bridgehead>
 
-<para>The <command>make</command> command attempts to open an 
-<application>X</application> display during the compile, so an 
-<application>X</application> server must be running during this process.</para>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="GTK"/></para>
 
-<para>Install <application><acronym>GDK</acronym> Pixel Buffer</application> 
-by running the following commands:</para>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="gnome-libs"/>,
+    <xref linkend="gtk-doc"/> and
+    <xref linkend="docbook-utils"/></para>
 
-<screen><userinput><command>./configure --prefix=/opt/gnome --disable-gtk-doc &amp;&amp;
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GDK Pixel Buffer</title>
+
+    <para>The <command>make</command> command attempts to open an
+    <application>X</application> display during the compile, so an
+    <application>X</application> server must be running during this
+    process.</para>
+
+    <para>Install <application>GDK Pixel Buffer</application>
+    by running the following commands:</para>
+
+<screen><userinput>./configure --prefix=/opt/gnome --disable-gtk-doc &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><acronym>GDK</acronym> Pixel Buffer</application> 
-package contains <filename class="libraryfile">libgdk_pixbuf</filename> 
-and <filename class='libraryfile'>libgnomecanvaspixbuf</filename> libraries, 
-along with many gdk-pixbuf loader modules.</para>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-</sect2>
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libgdk_pixbuf.[so,a], libgnomecanvaspixbuf.[so,a], and
+        many gdk-pixbuf loader modules</seg>
+        <seg>Not determined at this time</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<sect2><title>Description</title>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-<sect3><title>libgdk_pixbuf libraries</title>
-<para><filename class="libraryfile">libdgk_pixbuf</filename> libraries 
-contain the <acronym>GTK</acronym>+ pixel buffer libraries for the 
-<application><acronym>GIMP</acronym></application> Toolkit.</para></sect3>
+      <varlistentry id="libgdk_pixbuf">
+        <term><filename class='libraryfile'>libgdk_pixbuf.[so,a]</filename></term>
+        <listitem>
+          <para>contain the <application>GTK+</application> pixel buffer
+          libraries for the <application>GIMP</application> Toolkit.</para>
+          <indexterm zone="gdk libgdk_pixbuf">
+            <primary sortas="c-libgdk_pixbuf">libgdk_pixbuf.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
