Index: gnome/core/orbit2.xml
===================================================================
--- gnome/core/orbit2.xml	(revision c56320f3c9ef27947b868808b62f4955496ebbc2)
+++ gnome/core/orbit2.xml	(revision c1c961804b209201113c838942663ea9e80a471c)
@@ -5,116 +5,133 @@
   %general-entities;
 
-<!ENTITY ORBit2-download-http "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.12/ORBit2-&ORBit2-version;.tar.bz2">
-<!ENTITY ORBit2-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.12/ORBit2-&ORBit2-version;.tar.bz2">
-<!ENTITY ORBit2-md5sum "7f963dcd0d84e6854460449383cc8c70">
-<!ENTITY ORBit2-size "678 KB">
-<!ENTITY ORBit2-buildsize "32 MB">
-<!ENTITY ORBit2-time "0.7 SBU (additional 0.2 SBU to run the test suite)">
+  <!ENTITY ORBit2-download-http "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.12/ORBit2-&ORBit2-version;.tar.bz2">
+  <!ENTITY ORBit2-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.12/ORBit2-&ORBit2-version;.tar.bz2">
+  <!ENTITY ORBit2-md5sum "7f963dcd0d84e6854460449383cc8c70">
+  <!ENTITY ORBit2-size "678 KB">
+  <!ENTITY ORBit2-buildsize "32 MB">
+  <!ENTITY ORBit2-time "0.7 SBU (additional 0.2 SBU to run the test suite)">
 ]>
 
 <sect1 id="ORBit2" xreflabel="ORBit2-&ORBit2-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="ORBit2.html"?>
-<title>ORBit2-&ORBit2-version;</title>
+  <?dbhtml filename="ORBit2.html"?>
 
-<sect2>
-<title>Introduction to 
-<application><acronym>ORB</acronym>it2</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application><acronym>ORB</acronym>it2</application> package
-contains a high-performance <acronym>CORBA</acronym> Object
-Request Broker.  This allows programs to send requests and receive
-replies from other programs.</para>
+  <title>ORBit2-&ORBit2-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&ORBit2-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&ORBit2-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &ORBit2-md5sum;</para></listitem>
-<listitem><para>Download size: &ORBit2-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&ORBit2-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&ORBit2-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="ORBit2">
+    <primary sortas="a-ORBit2">ORBit2</primary>
+  </indexterm>
 
-<sect3><title><application><acronym>ORB</acronym>it2</application> 
-dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="libidl"/> and <xref linkend="popt"/></para>
-</sect4>
+  <sect2 role="package">
+    <title>Introduction to ORBit2</title>
 
-<sect4><title>Optional</title>
-<para><xref linkend="gtk-doc"/> and <xref linkend="openssl"/></para>
-</sect4>
-</sect3>
+    <para>The <application>ORBit2</application> package contains a
+    high-performance CORBA Object Request Broker. This allows programs
+    to send requests and receive replies from other programs.</para>
 
-</sect2>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&ORBit2-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&ORBit2-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &ORBit2-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &ORBit2-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &ORBit2-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &ORBit2-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of 
-<application><acronym>ORB</acronym>it2</application></title>
+    <bridgehead renderas="sect3">ORBit2 Dependencies</bridgehead>
 
-<para>Install <application><acronym>ORB</acronym>it2</application> by running 
-the following commands:</para>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="libidl"/> and <xref linkend="popt"/></para>
 
-<screen><userinput><command>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome &amp;&amp;
-make</command></userinput></screen>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="gtk-doc"/> and <xref linkend="openssl"/></para>
 
-<para>To test the results, issue: <command>make check</command>.</para>
+  </sect2>
 
-<para>Now, as the root user:</para>
+  <sect2 role="installation">
+    <title>Installation of ORBit2</title>
 
-<screen><userinput role='root'><command>make install</command></userinput></screen>
+    <para>Install <application>ORBit2</application> by running
+    the following commands:</para>
 
-</sect2>
+<screen><userinput>./configure --prefix=$GNOME_PREFIX --sysconfdir=/etc/gnome &amp;&amp;
+make</userinput></screen>
 
-<sect2>
-<title>Command explanations</title>
+    <para>To test the results, issue: <command>make check</command>.</para>
 
-<para><parameter>--prefix=$GNOME_PREFIX</parameter>: This is the Base
-installation for <application>GNOME-2</application> from which all future
-installations will receive their prefix parameter.  Be sure that 
-<envar>GNOME_PREFIX</envar> is set for this install or globally to your
-install directory as described in the introduction of this Section.</para>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</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>
+<screen role="root"><userinput>make install</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Contents</title>
+  <sect2 role="commands">
+    <title>Command Explanations</title>
 
-<para>The <application><acronym>ORB</acronym>it2</application> package contains 
-<command>ior-decode-2</command>, 
-<command>linc-cleanup-sockets</command>, 
-<command>orbit-idl-2</command>, 
-<command>orbit2-config</command>, 
-<command>typelib-dump</command>, 
-<filename class="libraryfile">libORBit-2</filename>, 
-<filename class="libraryfile">libORBitCosNaming-2</filename>, 
-<filename class="libraryfile">libORBit-imodule-2</filename>, 
-<filename class='libraryfile'>libname-server-2</filename> and the 
-<application><acronym>ORB</acronym>it2</application> 
-<filename class='libraryfile'>Everything_module</filename>
-libraries.</para>
+    <para><parameter>--prefix=$GNOME_PREFIX</parameter>: This is the Base
+    installation for <application>GNOME-2</application> from which all future
+    installations will receive their prefix parameter.  Be sure that
+    <envar>GNOME_PREFIX</envar> is set for this install or globally to your
+    install directory as described in the introduction of this Chapter.</para>
 
-</sect2>
+    <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>
 
-<sect2><title>Description</title>
+  </sect2>
 
-<sect3><title>libORBit-2</title>
-<para><filename class="libraryfile">libORBit-2</filename> is the 
-<acronym>CORBA</acronym> <acronym>API</acronym>.</para></sect3>
+  <sect2 role="content">
+    <title>Contents</title>
 
-</sect2>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>ior-decode-2, linc-cleanup-sockets, orbit-idl-2,
+        orbit2-config and typelib-dump</seg>
+        <seg>libname-server-2.a, libORBit-2.[so,a], libORBit-imodule-2.[so,a],
+        libORBitCosNaming-2.[so,a], and Everything_module.[so,a]</seg>
+        <seg>$GNOME_PREFIX/include/orbit-2.0, $GNOME_PREFIX/lib/orbit-2.0,
+        and $GNOME_PREFIX/share/idl/orbit-2.0</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libORBit-2">
+        <term><filename class='libraryfile'>libORBit-2.[so,a]</filename></term>
+        <listitem>
+          <para>is the CORBA API.</para>
+          <indexterm zone="ORBit2 libORBit-2">
+            <primary sortas="c-libORBit-2">libORBit-2.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
