Index: gnome/core/gnome2-user-docs.xml
===================================================================
--- gnome/core/gnome2-user-docs.xml	(revision 6b86df82cdb8ce7e123e234d4fd86e3c14ea83e5)
+++ gnome/core/gnome2-user-docs.xml	(revision e95e587f12f4e02ec0dfb5bc6d16087d42ae761d)
@@ -5,117 +5,129 @@
   %general-entities;
 
-<!ENTITY gnome2-user-docs-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome2-user-docs/2.8/gnome2-user-docs-&gnome2-user-docs-version;.tar.bz2">
-<!ENTITY gnome2-user-docs-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome2-user-docs/2.8/gnome2-user-docs-&gnome2-user-docs-version;.tar.bz2">
-<!ENTITY gnome2-user-docs-md5sum "90bdd21ea3e3e794f641dd805216f275">
-<!ENTITY gnome2-user-docs-size "1.0 MB">
-<!ENTITY gnome2-user-docs-buildsize "6 MB">
-<!ENTITY gnome2-user-docs-time "less than 0.1 SBU">
+  <!ENTITY gnome2-user-docs-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome2-user-docs/2.8/gnome2-user-docs-&gnome2-user-docs-version;.tar.bz2">
+  <!ENTITY gnome2-user-docs-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome2-user-docs/2.8/gnome2-user-docs-&gnome2-user-docs-version;.tar.bz2">
+  <!ENTITY gnome2-user-docs-md5sum "90bdd21ea3e3e794f641dd805216f275">
+  <!ENTITY gnome2-user-docs-size "1.0 MB">
+  <!ENTITY gnome2-user-docs-buildsize "6 MB">
+  <!ENTITY gnome2-user-docs-time "less than 0.1 SBU">
 ]>
 
 <sect1 id="gnome2-user-docs" xreflabel="GNOME2 User Docs-&gnome2-user-docs-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="gnome2-user-docs.html"?>
-<title><application><acronym>GNOME</acronym></application>2 User 
-Docs-&gnome2-user-docs-version;</title>
+  <?dbhtml filename="gnome2-user-docs.html"?>
 
-<sect2>
-<title>Introduction to <application><acronym>GNOME</acronym>2 User 
-Docs</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application><acronym>GNOME</acronym>2 User Docs</application> 
-package contains end user documents for 
-<application><acronym>GNOME</acronym></application>.</para>
+  <title>GNOME2 User Docs-&gnome2-user-docs-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&gnome2-user-docs-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&gnome2-user-docs-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &gnome2-user-docs-md5sum;</para></listitem>
-<listitem><para>Download size: &gnome2-user-docs-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&gnome2-user-docs-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&gnome2-user-docs-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="gnome2-user-docs">
+    <primary sortas="a-GNOME2-User-Docs">GNOME2 User Docs</primary>
+  </indexterm>
 
-<sect3><title><application><acronym>GNOME</acronym>2 User Docs</application> 
-dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="scrollkeeper"/></para>
-</sect4>
+  <sect2 role="package">
+    <title>Introduction to GNOME2 User Docs</title>
 
-<sect4><title>Optional</title>
-<para><xref linkend="docbook-utils"/></para>
-</sect4>
-</sect3>
+    <para>The <application>GNOME2 User Docs</application> package contains
+    end user documents for <application>GNOME</application>.</para>
 
-</sect2>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gnome2-user-docs-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gnome2-user-docs-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnome2-user-docs-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnome2-user-docs-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnome2-user-docs-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnome2-user-docs-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of <application><acronym>GNOME</acronym>2 User 
-Docs</application></title>
+    <bridgehead renderas="sect3">GNOME2 User Docs Dependencies</bridgehead>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../without-gnome.xml"/>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="scrollkeeper"/></para>
 
-<para>Install <application><acronym>GNOME</acronym>2 User Docs</application> 
-by running the following commands:</para>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="docbook-utils"/></para>
 
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME2 User Docs</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../without-gnome.xml"/>
+
+    <para>Install <application>GNOME2 User Docs</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 &amp;&amp;
-chmod 644 `pkg-config --variable=prefix ORBit-2.0`/share/gnome/help/\
-{gnome-access-guide,system-admin-guide,user-guide}/C/*.xml</command></userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+chmod -v 644 `pkg-config --variable=prefix ORBit-2.0`/share/gnome/help/\
+{gnome-access-guide,system-admin-guide,user-guide}/C/*.xml</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>
 
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-<seglistitem>
-<seg>None</seg>
-<seg>None</seg>
-<seg>$GNOME_PREFIX/share/gnome/help/[gnome-access-guide,system-admin-guide,user-guide] 
-and $GNOME_PREFIX/share/omf/[gnome2-user-docs,user-guide]</seg>
-</seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>None</seg>
+        <seg>None</seg>
+        <seg>$GNOME_PREFIX/share/gnome/help/[gnome-access-guide,system-admin-guide,user-guide]
+        and $GNOME_PREFIX/share/omf/[gnome2-user-docs,user-guide]</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<para>The <application><acronym>GNOME</acronym>2 User Docs</application> 
-package contains <acronym>OMF</acronym> files.</para>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-</sect2>
+      <varlistentry>
+        <term>OMF files</term>
+        <listitem>
+          <para>contain user documentation. These include introductions
+          and help on the core packages.</para>
+        </listitem>
+      </varlistentry>
 
-<sect2><title>Description</title>
+    </variablelist>
 
-<sect3><title>OMF files</title>
-<para><acronym>OMF</acronym> files contain user documentation.  These include 
-introductions and help on the core packages.</para></sect3>
-
-</sect2>
+  </sect2>
 
 </sect1>
