Index: gnome/core/libgnome.xml
===================================================================
--- gnome/core/libgnome.xml	(revision d0de39a308969d9c8b315f4ca3ae701e9c98bd74)
+++ gnome/core/libgnome.xml	(revision 80ed143886211340b26ab05ee3f29a9559f2695a)
@@ -5,105 +5,134 @@
   %general-entities;
 
-<!ENTITY libgnome-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
-<!ENTITY libgnome-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
-<!ENTITY libgnome-md5sum "f8e1225d96126f5139232821a6723d15">
-<!ENTITY libgnome-size "871 KB">
-<!ENTITY libgnome-buildsize "18 MB">
-<!ENTITY libgnome-time "0.2 SBU">
+  <!ENTITY libgnome-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
+  <!ENTITY libgnome-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgnome/&gnome-version;/libgnome-&libgnome-version;.tar.bz2">
+  <!ENTITY libgnome-md5sum "f8e1225d96126f5139232821a6723d15">
+  <!ENTITY libgnome-size "871 KB">
+  <!ENTITY libgnome-buildsize "18 MB">
+  <!ENTITY libgnome-time "0.2 SBU">
 ]>
 
 <sect1 id="libgnome" xreflabel="libgnome-&libgnome-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="libgnome.html"?>
-<title>libgnome-&libgnome-version;</title>
+  <?dbhtml filename="libgnome.html"?>
 
-<sect2>
-<title>Introduction to libgnome</title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>libgnome</application> package contains the
-<filename class="libraryfile">libgnome</filename> library.</para>
+  <title>Libgnome-&libgnome-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&libgnome-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&libgnome-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &libgnome-md5sum;</para></listitem>
-<listitem><para>Download size: &libgnome-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&libgnome-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&libgnome-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="libgnome">
+    <primary sortas="a-Libgnome">Libgnome</primary>
+  </indexterm>
 
-<sect3><title><application>libgnome</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="gnome-vfs"/> and <xref linkend="esound"/></para>
-</sect4>
+  <sect2 role="package">
+    <title>Introduction to Libgnome</title>
 
-<sect4><title>Optional</title>
-<para><xref linkend="gtk-doc"/></para>
-</sect4>
-</sect3>
+    <para>The <application>libgnome</application> package contains the
+    <filename class="libraryfile">libgnome</filename> library.</para>
 
-</sect2>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libgnome-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libgnome-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libgnome-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libgnome-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libgnome-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libgnome-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of <application>libgnome</application></title>
+    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
 
-<para>Install <application>libgnome</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="gnome-vfs"/> and <xref linkend="esound"/></para>
 
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="gtk-doc"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Libgnome</title>
+
+    <para>Install <application>libgnome</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
     --sysconfdir=/etc/gnome --localstatedir=/var/lib &amp;&amp;
-make</command></userinput></screen>
+make</userinput></screen>
 
-<para>This package does not come with a test suite.</para>
+    <para>This package does not come with a test suite.</para>
 
-<para>Now, as the root user:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen><userinput role='root'><command>make install</command></userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Command explanations</title>
+  <sect2 role="commands">
+    <title>Command Explanations</title>
 
-<para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch
-puts configuration files in <filename class="directory">/etc/gnome</filename> 
-instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+    <para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch
+    puts configuration files in <filename class="directory">/etc/gnome</filename>
+    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
-<para><parameter>--localstatedir=/var/lib</parameter>: This switch sets 
-<envar>LIBGNOME_LOCALSTATEDIR</envar> to 
-<filename class='directory'>/var/lib</filename> instead of 
-<filename class='directory'>$GNOME_PREFIX/var</filename> to syncronize with
-the <application><acronym>GNOME</acronym> Games</application> installation 
-and properly record high scores in 
-<filename class='directory'>/var/lib/games</filename>.</para>
+    <para><parameter>--localstatedir=/var/lib</parameter>: This
+    switch sets <envar>LIBGNOME_LOCALSTATEDIR</envar> to
+    <filename class='directory'>/var/lib</filename> instead
+    of <filename class='directory'>$GNOME_PREFIX/var</filename>
+    to syncronize with the <application>GNOME Games</application>
+    installation and properly record high scores in
+    <filename class='directory'>/var/lib/games</filename>.</para>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Contents</title>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<para>The <application>libgnome</application> package contains 
-<command>gnome-open</command>, 
-<filename class="libraryfile">libgnome</filename> and 
-<filename class='libraryfile'>libmoniker_extra_2</filename> libraries.</para>
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-</sect2>
+      <seglistitem>
+        <seg>gnome-open</seg>
+        <seg>libgnome-2.[so,a] and the libmoniker_extra_2.[so,a] bonobo
+        library</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>libgnome libraries</title>
-<para><filename class="libraryfile">libgnome</filename> libraries are the
-non-<acronym>GUI</acronym> portion of the
-<application><acronym>GNOME</acronym></application> libraries.</para></sect3>
+      <varlistentry id="libgnome-2">
+        <term><filename class='libraryfile'>libgnome-2.[so,a]</filename></term>
+        <listitem>
+          <para>are the non-GUI portion of the <application>GNOME</application>
+          libraries.</para>
+          <indexterm zone="libgnome libgnome-2">
+            <primary sortas="c-libgnome-2">libgnome-2.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
+
+  </sect2>
 
 </sect1>
