Index: gnome/core/libbonobo.xml
===================================================================
--- gnome/core/libbonobo.xml	(revision f8a6196ea34c81715fb023244d4d28ae49e70028)
+++ gnome/core/libbonobo.xml	(revision 4f7bd2db4e4ee143416fb8bb7d2b0fda38758d74)
@@ -5,123 +5,148 @@
   %general-entities;
 
-<!ENTITY libbonobo-download-http "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.8/libbonobo-&libbonobo-version;.tar.bz2">
-<!ENTITY libbonobo-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.8/libbonobo-&libbonobo-version;.tar.bz2">
-<!ENTITY libbonobo-md5sum "54f863c20016cf8a2cf25056f6c7cda7">
-<!ENTITY libbonobo-size "1.0 MB">
-<!ENTITY libbonobo-buildsize "35 MB">
-<!ENTITY libbonobo-time "0.8 SBU (additional 0.2 SBU to run the test suite)">
+  <!ENTITY libbonobo-download-http "http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.8/libbonobo-&libbonobo-version;.tar.bz2">
+  <!ENTITY libbonobo-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.8/libbonobo-&libbonobo-version;.tar.bz2">
+  <!ENTITY libbonobo-md5sum "54f863c20016cf8a2cf25056f6c7cda7">
+  <!ENTITY libbonobo-size "1.0 MB">
+  <!ENTITY libbonobo-buildsize "35 MB">
+  <!ENTITY libbonobo-time "0.8 SBU (additional 0.2 SBU to run the test suite)">
 ]>
 
 <sect1 id="libbonobo" xreflabel="libbonobo-&libbonobo-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="libbonobo.html"?>
-<title>libbonobo-&libbonobo-version;</title>
+  <?dbhtml filename="libbonobo.html"?>
 
-<sect2>
-<title>Introduction to <application>libbonobo</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>libbonobo</application> package contains
-<filename class="libraryfile">libbonobo</filename> libraries. This is a
-component and compound document system for
-<application><acronym>GNOME</acronym>-2</application>.</para>
+  <title>Libbonobo-&libbonobo-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&libbonobo-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&libbonobo-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &libbonobo-md5sum;</para></listitem>
-<listitem><para>Download size: &libbonobo-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&libbonobo-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&libbonobo-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="libbonobo">
+    <primary sortas="a-Libbonobo">Libbonobo</primary>
+  </indexterm>
 
-<sect3><title><application>libbonobo</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="ORBit2"/>, 
-<xref linkend="libxml2"/> and 
-<xref linkend="perl-modules"/>: XML Parser</para>
-</sect4>
+  <sect2 role="package">
+    <title>Introduction to Libbonobo</title>
 
-<sect4><title>Optional</title>
-<para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>) and 
-<xref linkend="gtk-doc"/></para>
-</sect4>
-</sect3>
+    <para>The <application>libbonobo</application> package contains
+    <filename class="libraryfile">libbonobo</filename> libraries.
+    This is a component and compound document system for
+    <application>GNOME-2</application>.</para>
 
-</sect2>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libbonobo-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libbonobo-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libbonobo-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libbonobo-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libbonobo-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libbonobo-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of <application>libbonobo</application></title>
+    <bridgehead renderas="sect3">Libbonobo Dependencies</bridgehead>
 
-<para>Install <application>libbonobo</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="ORBit2"/>,
+    <xref linkend="libxml2"/> and
+    <xref linkend="perl-modules"/>: XML Parser</para>
 
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>) and
+    <xref linkend="gtk-doc"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Libbonobo</title>
+
+    <para>Install <application>libbonobo</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
     --libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin \
     --sysconfdir=/etc/gnome &amp;&amp;
-make</command></userinput></screen>
+make</userinput></screen>
 
-<para>To test the results, issue: <command>make check</command>.</para>
+    <para>To test the results, issue: <command>make check</command>.</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>--prefix=`pkg-config --variable=prefix ORBit-2.0`</parameter>: 
-Setting the prefix with this command instead of
-with <envar>GNOME_PREFIX</envar> will ensure that the prefix is
-consistent with the installation environment.</para>
+    <para><parameter>--prefix=`pkg-config --variable=prefix
+    ORBit-2.0`</parameter>: Setting the prefix with this command instead of
+    with <envar>GNOME_PREFIX</envar> will ensure that the prefix is
+    consistent with the installation environment.</para>
 
-<para><parameter>--libexecdir=`pkg-config --variable=prefix 
-ORBit-2.0`/sbin</parameter>: This switch puts libexec files in 
-<filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
-<filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+    <para><parameter>--libexecdir=`pkg-config --variable=prefix
+    ORBit-2.0`/sbin</parameter>: This switch puts libexec files in
+    <filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
+    <filename class="directory">$GNOME_PREFIX/libexec</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>--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><option>--enable-gtk-doc</option>: This switch rebuilds the
-documentation during the <command>make</command> command.</para>
+    <para><option>--enable-gtk-doc</option>: This switch rebuilds the
+    documentation during the <command>make</command> command.</para>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Contents</title>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<para>The <application>libbonobo</application> package contains
-<command>activation-client</command>, 
-<command>bonobo-slay</command>, 
-<command>echo-client-2</command>, 
-<command>bonobo-activation-run-query</command>, 
-<command>bonobo-activation-server</command>, 
-<command>bonobo-activation-sysconf</command>, 
-<filename class="libraryfile">libbonobo-2</filename> and 
-<filename class="libraryfile">libbonobo-activation</filename> libraries, 
-the <application><acronym>ORB</acronym>it-2</application> bonobo module and the 
-bonobo <filename class="libraryfile">libmoniker</filename> library.</para>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-</sect2>
+      <seglistitem>
+        <seg>activation-client, bonobo-slay, echo-client-2,
+        bonobo-activation-run-query, bonobo-activation-server, and
+        bonobo-activation-sysconf</seg>
+        <seg>libbonobo-2.[so,a], libbonobo-activation.[so,a],
+        <application>ORBit-2</application> bonobo module, and
+        libmoniker_std_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>libbonobo libraries</title>
-<para><filename class="libraryfile">libbonobo</filename> libraries are a set of 
-language and system independent <acronym>CORBA</acronym> interfaces for 
-creating reusable components and compound documents.</para></sect3>
+      <varlistentry id="libbonobo-2">
+        <term><filename class='libraryfile'>libbonobo-2.[so,a]</filename></term>
+        <listitem>
+          <para>are a set of language and system independent CORBA interfaces
+          for creating reusable components and compound documents.</para>
+          <indexterm zone="libbonobo libbonobo-2">
+            <primary sortas="c-libbonobo-2">libbonobo-2.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
+
+  </sect2>
 
 </sect1>
