Index: gnome/core/libgnomeui.xml
===================================================================
--- gnome/core/libgnomeui.xml	(revision 80ed143886211340b26ab05ee3f29a9559f2695a)
+++ gnome/core/libgnomeui.xml	(revision cc71fc306dd4f87117907046512d9ead0d49e256)
@@ -5,117 +5,148 @@
   %general-entities;
 
-<!ENTITY libgnomeui-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/&gnome-version;/libgnomeui-&libgnomeui-version;.tar.bz2">
-<!ENTITY libgnomeui-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgnomeui/&gnome-version;/libgnomeui-&libgnomeui-version;.tar.bz2">
-<!ENTITY libgnomeui-md5sum "e17c0d97e5f240513ac2d36268d696ed">
-<!ENTITY libgnomeui-size "1.6 MB">
-<!ENTITY libgnomeui-buildsize "37 MB">
-<!ENTITY libgnomeui-time "0.9 SBU">
+  <!ENTITY libgnomeui-download-http "http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/&gnome-version;/libgnomeui-&libgnomeui-version;.tar.bz2">
+  <!ENTITY libgnomeui-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libgnomeui/&gnome-version;/libgnomeui-&libgnomeui-version;.tar.bz2">
+  <!ENTITY libgnomeui-md5sum "e17c0d97e5f240513ac2d36268d696ed">
+  <!ENTITY libgnomeui-size "1.6 MB">
+  <!ENTITY libgnomeui-buildsize "37 MB">
+  <!ENTITY libgnomeui-time "0.9 SBU">
 ]>
 
 <sect1 id="libgnomeui" xreflabel="libgnomeui-&libgnomeui-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="libgnomeui.html"?>
-<title>libgnomeui-&libgnomeui-version;</title>
+  <?dbhtml filename="libgnomeui.html"?>
 
-<sect2>
-<title>Introduction to <application>libgnomeui</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>libgnomeui</application> package contains
-<filename class="libraryfile">libgnomeui</filename> libraries.</para>
+  <title>Libgnomeui-&libgnomeui-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&libgnomeui-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&libgnomeui-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &libgnomeui-md5sum;</para></listitem>
-<listitem><para>Download size: &libgnomeui-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&libgnomeui-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&libgnomeui-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="libgnomeui">
+    <primary sortas="a-Libgnomeui">Libgnomeui</primary>
+  </indexterm>
 
-<sect3><title><application>libgnomeui</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="libbonoboui"/> and <xref linkend="gnome-keyring"/></para>
-</sect4>
+  <sect2 role="package">
+    <title>Introduction to Libgnomeui</title>
 
-<sect4><title>Optional</title>
-<para><xref linkend="libjpeg"/> and <xref linkend="gtk-doc"/></para>
-</sect4>
-</sect3>
+    <para>The <application>libgnomeui</application> package contains
+    <filename class="libraryfile">libgnomeui</filename> libraries.</para>
 
-</sect2>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libgnomeui-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libgnomeui-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libgnomeui-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libgnomeui-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libgnomeui-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libgnomeui-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of <application>libgnomeui</application></title>
+    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
 
-<para>Install <application>libgnomeui</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="libbonoboui"/> and <xref linkend="gnome-keyring"/></para>
 
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="libjpeg"/> and <xref linkend="gtk-doc"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Libgnomeui</title>
+
+    <para>Install <application>libgnomeui</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 &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>--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>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Configuring <application>libgnomeui</application></title>
+  <sect2 role="configuration">
+    <title>Configuring Libgnomeui</title>
 
-<sect3><title>Configuration information</title>
-<para>Some applications cannot properly discover the 
-<application>libglade</application> interface library installed by 
-<application>libgnomeui</application>. Get around this problem by initializing 
-an environment variable which identifies the location of the library. Add the
-following line to the system-wide <filename>/etc/profile</filename> file, or 
-to individual user's <filename>~/.profile</filename> or 
-<filename>~/.bashrc</filename> files:</para>
+    <sect3>
+      <title>Configuration Information</title>
 
-<screen><userinput>export LIBGLADE_MODULE_PATH=$GNOME_PREFIX/lib/libglade/2.0</userinput></screen>
-</sect3>
+      <para>Some applications cannot properly discover the
+      <application>libglade</application> interface library installed by
+      <application>libgnomeui</application>. Get around this problem by
+      initializing an environment variable which identifies the location
+      of the library. Add the following line to the system-wide
+      <filename>/etc/profile</filename> file, or to individual user's
+      <filename>~/.profile</filename> or <filename>~/.bashrc</filename>
+      files:</para>
 
-</sect2>
+<screen><literal>export LIBGLADE_MODULE_PATH=$GNOME_PREFIX/lib/libglade/2.0</literal></screen>
 
-<sect2>
-<title>Contents</title>
+    </sect3>
 
-<para>The <application>libgnomeui</application> package contains
-<command>gnome_segv2</command>, 
-<filename class="libraryfile">libgnomeui</filename> libraries, 
-<filename class='libraryfile'>libgnome-vfs</filename> 
-<application><acronym>GTK</acronym>+</application> libraries and 
-<filename class='libraryfile'>libgnome</filename> glade libraries.</para>
+  </sect2>
 
-</sect2>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<sect2><title>Description</title>
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-<sect3><title>libgnomeui libraries</title>
-<para><filename class="libraryfile">libgnomeui</filename> libraries are the
-<acronym>GUI</acronym> portion of the
-<application><acronym>GNOME</acronym></application> libraries.</para></sect3>
+      <seglistitem>
+        <seg>gnome_segv2</seg>
+        <seg>libgnomeui-2[so,a], libgnome[so,a] glade library, and
+        libgnome-vfs[so,a] <application>GTK+</application> library.</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
 
-</sect2>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libgnomeui-2">
+        <term><filename class='libraryfile'>libgnomeui-2.[so,a]</filename></term>
+        <listitem>
+          <para>are the GUI portion of the <application>GNOME</application>
+          libraries.</para>
+          <indexterm zone="libgnomeui libgnomeui-2">
+            <primary sortas="c-libgnomeui-2">libgnomeui-2.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
