Index: gnome/core/yelp.xml
===================================================================
--- gnome/core/yelp.xml	(revision d718d6adc348a10218a6c7bb26b8e93e181463ae)
+++ gnome/core/yelp.xml	(revision ce861f38006198dd1b4a23fb8a8c648bc73f21ca)
@@ -5,104 +5,138 @@
   %general-entities;
 
-<!ENTITY yelp-download-http "http://ftp.gnome.org/pub/GNOME/sources/yelp/2.6/yelp-&yelp-version;.tar.bz2">
-<!ENTITY yelp-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/yelp/2.6/yelp-&yelp-version;.tar.bz2">
-<!ENTITY yelp-md5sum "9bd94af344ee6a0bf69aa6f9cbd6b7e9">
-<!ENTITY yelp-size "654 KB">
-<!ENTITY yelp-buildsize "9 MB">
-<!ENTITY yelp-time "0.2 SBU">
+  <!ENTITY yelp-download-http "http://ftp.gnome.org/pub/GNOME/sources/yelp/2.6/yelp-&yelp-version;.tar.bz2">
+  <!ENTITY yelp-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/yelp/2.6/yelp-&yelp-version;.tar.bz2">
+  <!ENTITY yelp-md5sum "9bd94af344ee6a0bf69aa6f9cbd6b7e9">
+  <!ENTITY yelp-size "654 KB">
+  <!ENTITY yelp-buildsize "9 MB">
+  <!ENTITY yelp-time "0.2 SBU">
 ]>
 
 <sect1 id="yelp" xreflabel="Yelp-&yelp-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="yelp.html"?>
-<title>Yelp-&yelp-version;</title>
+  <?dbhtml filename="yelp.html"?>
 
-<sect2>
-<title>Introduction to <application>Yelp</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>Yelp</application> package contains the help browser. 
-This is useful for viewing help files.</para>
+  <title>Yelp-&yelp-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&yelp-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&yelp-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &yelp-md5sum;</para></listitem>
-<listitem><para>Download size: &yelp-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&yelp-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&yelp-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="yelp">
+    <primary sortas="a-Yelp">Yelp</primary>
+  </indexterm>
 
-<sect3><title><application>Yelp</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="libgnomeui"/>, 
-<xref linkend="libgtkhtml"/> and 
-<xref linkend="scrollkeeper"/></para>
-</sect4>
+  <sect2 role="package">
+    <title>Introduction to Yelp</title>
 
-<sect4><title>Recommended</title>
-<para><xref linkend="gnome-doc-utils"/> (required for <acronym>XSLT</acronym> 
-transformations)</para>
-</sect4>
-</sect3>
+    <para>The <application>Yelp</application> package contains the help
+    browser. This is useful for viewing help files.</para>
 
-</sect2>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&yelp-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&yelp-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &yelp-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &yelp-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &yelp-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &yelp-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of <application>Yelp</application></title>
+    <bridgehead renderas="sect3">Yelp Dependencies</bridgehead>
 
-<para>Install <application>Yelp</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="libgnomeui"/>,
+    <xref linkend="libgtkhtml"/> and
+    <xref linkend="scrollkeeper"/></para>
 
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para><xref linkend="gnome-doc-utils"/> (required for XSLT
+    transformations)</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Yelp</title>
+
+    <para>Install <application>Yelp</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
     --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>--localstatedir=/var/lib</parameter>: This switch puts
-<application>ScrollKeeper</application> files in 
-<filename class='directory'>/var/lib/scrollkeeper</filename> instead of
-<filename class='directory'>$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+    <para><parameter>--localstatedir=/var/lib</parameter>: This switch puts
+    <application>ScrollKeeper</application> files in
+    <filename class='directory'>/var/lib/scrollkeeper</filename> instead of
+    <filename class='directory'>$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Contents</title>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<para>The <application>Yelp</application> package contains 
-<command>gnome-help</command> and <command>yelp</command>.</para>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
-</sect2>
+      <seglistitem>
+        <seg>gnome-help and yelp</seg>
+        <seg>GNOME_Yelp.server bonobo server</seg>
+        <seg>$GNOME_PREFIX/share/yelp</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<sect2><title>Description</title>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-<sect3><title>gnome-help</title>
-<para><command>gnome-help</command> is a symbolic link to 
-<command>yelp</command>.</para>
-</sect3>
+      <varlistentry id="gnome-help">
+        <term><command>gnome-help</command></term>
+        <listitem>
+          <para>is a symbolic link to <command>yelp</command>.</para>
+          <indexterm zone="yelp gnome-help">
+            <primary sortas="b-gnome-help">gnome-help</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<sect3><title>yelp</title>
-<para><command>yelp</command> is the
-<application><acronym>GNOME</acronym></application> help browser.</para>
-</sect3>
+      <varlistentry id="yelp-prog">
+        <term><command>yelp</command></term>
+        <listitem>
+          <para>is the <application>GNOME</application> help browser.</para>
+          <indexterm zone="yelp yelp-prog">
+            <primary sortas="b-yelp">yelp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
+
+  </sect2>
 
 </sect1>
