Index: gnome/otherlibs/orbit.xml
===================================================================
--- gnome/otherlibs/orbit.xml	(revision 84e2a4f2f7b2c2577c15a636d209036f1f064afa)
+++ gnome/otherlibs/orbit.xml	(revision 4dd70a720ef8c33a89f12b9d8623e5fffd2de232)
@@ -5,133 +5,150 @@
   %general-entities;
 
-<!ENTITY ORBit-download-http "http://ftp.gnome.org/pub/GNOME/sources/ORBit/0.5/ORBit-&ORBit-version;.tar.bz2">
-<!ENTITY ORBit-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/ORBit/0.5/ORBit-&ORBit-version;.tar.bz2">
-<!ENTITY ORBit-md5sum "35acc6f8d49d930b566104fcceb893d3">
-<!ENTITY ORBit-size "1 MB">
-<!ENTITY ORBit-buildsize "29.1 MB">
-<!ENTITY ORBit-time "0.59 SBU">
+  <!ENTITY ORBit-download-http "http://ftp.gnome.org/pub/GNOME/sources/ORBit/0.5/ORBit-&ORBit-version;.tar.bz2">
+  <!ENTITY ORBit-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/ORBit/0.5/ORBit-&ORBit-version;.tar.bz2">
+  <!ENTITY ORBit-md5sum "35acc6f8d49d930b566104fcceb893d3">
+  <!ENTITY ORBit-size "1 MB">
+  <!ENTITY ORBit-buildsize "29.1 MB">
+  <!ENTITY ORBit-time "0.59 SBU">
 ]>
 
 <sect1 id="ORBit" xreflabel="ORBit-&ORBit-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="ORBit.html"?>
-<title><application>
-<acronym>ORB</acronym>it</application>-&ORBit-version;</title>
-<indexterm zone="ORBit">
-<primary sortas="a-ORBit">ORBit</primary></indexterm>
+  <?dbhtml filename="ORBit.html"?>
 
-<sect2>
-<title>Introduction to 
-<application><acronym>ORB</acronym>it</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application><acronym>ORB</acronym>it</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>ORBit-&ORBit-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&ORBit-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&ORBit-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &ORBit-md5sum;</para></listitem>
-<listitem><para>Download size: &ORBit-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&ORBit-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&ORBit-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="ORBit">
+    <primary sortas="a-ORBit">ORBit</primary>
+  </indexterm>
 
-<sect3><title><application><acronym>ORB</acronym>it</application> 
-dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="GLib"/></para>
-</sect4>
+  <sect2 role="package">
+    <title>Introduction to ORBit</title>
 
-<sect4><title>Optional</title>
-<para><xref linkend="tcpwrappers"/></para>
-</sect4>
-</sect3>
+    <para>The <application>ORBit</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="&ORBit-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&ORBit-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &ORBit-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &ORBit-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &ORBit-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &ORBit-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of <application><acronym>ORB</acronym>it</application>
-</title>
+    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
 
-<para>Install <application><acronym>ORB</acronym>it</application> by running 
-the following commands:</para>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="GLib"/></para>
 
-<screen><userinput><command>./configure --prefix=/opt/gnome &amp;&amp;
-make</command></userinput></screen>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="tcpwrappers"/></para>
 
-<para>Now, as the root user:</para>
+  </sect2>
 
-<screen><userinput role='root'><command>make install</command></userinput></screen>
+  <sect2 role="installation">
+    <title>Installation of ORBit</title>
 
-</sect2>
+    <para>Install <application>ORBit</application> by running
+    the following commands:</para>
 
-<sect2>
-<title>Contents</title>
+<screen><userinput>./configure --prefix=/opt/gnome &amp;&amp;
+make</userinput></screen>
 
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<seglistitem>
-<seg>ior-decode, libIDL-config, name-client, old-name-server, orbit-config, 
-orbit-idl, orbit-ird, orbit-event-server and orbit-name-server</seg>
-<seg>libIDL.[so,a], libIIOP.[so,a], libname-server.a, liborbit-c-backend.a, 
-libORBit.[so,a], libORBitCosNaming.[so,a] and libORBitutil.[so,a]</seg>
-<seg>/opt/gnome/share/idl, /opt/gnome/include/libIDL-1.0 and
-/opt/gnome/include/orbit-1.0</seg>
-</seglistitem>
-</segmentedlist>
+<screen role="root"><userinput>make install</userinput></screen>
 
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
+  </sect2>
 
-<varlistentry id="libIDL-ORBit">
-<term><filename class='libraryfile'>libIDL.[so,a]</filename></term>
-<listitem><para>library is the Interface Definition Language mappings for 
-CORBA.</para>
-<indexterm zone="ORBit libIDL-ORBit">
-<primary sortas="c-libIDL">libIDL.[so,a]</primary>
-</indexterm></listitem>
-</varlistentry>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<varlistentry id="libIIOP">
-<term><filename class='libraryfile'>libIIOP.[so,a]</filename></term>
-<listitem><para>is for low level CORBA communications.</para>
-<indexterm zone="ORBit libIIOP">
-<primary sortas="c-libIIOP">libIIOP.[so,a]</primary>
-</indexterm></listitem>
-</varlistentry>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-<varlistentry id="libORBit">
-<term><filename class='libraryfile'>libORBit.[so,a]</filename></term>
-<listitem><para>is the CORBA <acronym>API</acronym>.</para>
-<indexterm zone="ORBit libORBit">
-<primary sortas="c-libORBit">libORBit.[so,a]</primary>
-</indexterm></listitem>
-</varlistentry>
+      <seglistitem>
+        <seg>ior-decode, libIDL-config, name-client, old-name-server,
+        orbit-config, orbit-idl, orbit-ird, orbit-event-server, and
+        orbit-name-server</seg>
+        <seg>libIDL.[so,a], libIIOP.[so,a], libname-server.a,
+        liborbit-c-backend.a, libORBit.[so,a], libORBitCosNaming.[so,a],
+        and libORBitutil.[so,a]</seg>
+        <seg>/opt/gnome/share/idl, /opt/gnome/include/libIDL-1.0, and
+        /opt/gnome/include/orbit-1.0</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<varlistentry id="libORBitutil">
-<term><filename class='libraryfile'>libORBitutil.[so,a]</filename></term>
-<listitem><para>contains the convenience routines for 
-<application>ORBit</application>.</para>
-<indexterm zone="ORBit libORBitutil">
-<primary sortas="c-libORBitutil">libORBitutil.[so,a]</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-</sect2>
+      <varlistentry id="libIDL-ORBit">
+        <term><filename class='libraryfile'>libIDL.[so,a]</filename></term>
+        <listitem>
+          <para>library is the Interface Definition Language mappings for
+          CORBA.</para>
+          <indexterm zone="ORBit libIDL-ORBit">
+            <primary sortas="c-libIDL">libIDL.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libIIOP">
+        <term><filename class='libraryfile'>libIIOP.[so,a]</filename></term>
+        <listitem>
+          <para>is for low level CORBA communications.</para>
+          <indexterm zone="ORBit libIIOP">
+            <primary sortas="c-libIIOP">libIIOP.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libORBit">
+        <term><filename class='libraryfile'>libORBit.[so,a]</filename></term>
+        <listitem>
+          <para>is the CORBA API.</para>
+          <indexterm zone="ORBit libORBit">
+            <primary sortas="c-libORBit">libORBit.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libORBitutil">
+        <term><filename class='libraryfile'>libORBitutil.[so,a]</filename></term>
+        <listitem>
+          <para>contains the convenience routines for
+          <application>ORBit</application>.</para>
+          <indexterm zone="ORBit libORBitutil">
+            <primary sortas="c-libORBitutil">libORBitutil.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
