Index: gnome/core/gnome-doc-utils.xml
===================================================================
--- gnome/core/gnome-doc-utils.xml	(revision a8de889e377aef414f7aa7797699703466d640d2)
+++ gnome/core/gnome-doc-utils.xml	(revision 34d0cf25aedc211fbe0b94883d3c6a01722164bf)
@@ -13,137 +13,145 @@
 ]>
 
-<sect1 id="gnome-doc-utils" 
-xreflabel="GNOME Doc Utils-&gnome-doc-utils-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="gnome-doc-utils.html"?>
-<title><application><acronym>GNOME</acronym> Doc 
-Utils</application>-&gnome-doc-utils-version;</title>
-<indexterm zone="gnome-doc-utils">
-<primary sortas="a-GNOME-Doc-Utils">GNOME Doc Utils</primary>
-</indexterm>
+<sect1 id="gnome-doc-utils" xreflabel="GNOME Doc Utils-&gnome-doc-utils-version;">
+  <?dbhtml filename="gnome-doc-utils.html"?>
 
-<sect2>
-<title>Introduction to <application><acronym>GNOME</acronym> Doc 
-Utils</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application><acronym>GNOME</acronym> Doc Utils</application> 
-package is a collection of documentation utilities for the 
-<application><acronym>GNOME</acronym></application> project. Notably, it 
-contains utilities for building documentation and all auxiliary files in your 
-source tree, and it contains the DocBook <acronym>XSLT</acronym> stylesheets 
-that were once distributed with <application>Yelp</application>. Starting with 
-<application><acronym>GNOME</acronym></application> 2.8, 
-<application>Yelp</application> will require 
-<application><acronym>GNOME</acronym> Doc Utils</application> for the 
-<acronym>XSLT</acronym>.</para>
+  <title>GNOME Doc Utils-&gnome-doc-utils-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing="compact">
-<listitem><para>Download (HTTP): 
-<ulink url="&gnome-doc-utils-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&gnome-doc-utils-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &gnome-doc-utils-md5sum;</para></listitem>
-<listitem><para>Download size: &gnome-doc-utils-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&gnome-doc-utils-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&gnome-doc-utils-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="gnome-doc-utils">
+    <primary sortas="a-GNOME-Doc-Utils">GNOME Doc Utils</primary>
+  </indexterm>
 
-<sect3><title><application><acronym>GNOME</acronym> Doc Utils</application> 
-dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="scrollkeeper"/></para>
-</sect4>
+  <sect2 role="package">
+    <title>Introduction to GNOME Doc Utils</title>
 
-<sect4><title>Optional</title>
-<para><xref linkend="pkgconfig"/> and <xref linkend="python"/></para>
-</sect4>
-</sect3>
+    <para>The <application>GNOME Doc Utils</application> package is a collection
+    of documentation utilities for the <application>GNOME</application> project.
+    Notably, it contains utilities for building documentation and all auxiliary
+    files in your source tree, and it contains the DocBook XSLT stylesheets that
+    were once distributed with <application>Yelp</application>. Starting with
+    <application>GNOME</application> 2.8, <application>Yelp</application> will
+    require <application>GNOME Doc Utils</application> for the XSLT.</para>
 
-</sect2>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gnome-doc-utils-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gnome-doc-utils-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnome-doc-utils-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnome-doc-utils-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnome-doc-utils-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnome-doc-utils-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of <application><acronym>GNOME</acronym> Doc 
-Utils</application></title>
+    <bridgehead renderas="sect3">GNOME Doc Utils 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> Doc Utils</application> 
-by running the following commands:</para>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="pkgconfig"/> and <xref linkend="python"/></para>
 
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME Doc Utils</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../without-gnome.xml"/>
+
+    <para>Install <application>GNOME Doc Utils</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>To test the results, issue: <command>make check</command>.</para>
+    <para>To test the results, issue: <command>make check</command>.</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>
 
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-<segtitle>Installed Stylesheets</segtitle>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Stylesheets</segtitle>
 
-<seglistitem>
-<seg>gnome-doc-prepare and xml2po</seg>
-<seg>None</seg>
-<seg>$GNOME_PREFIX/share/gnome-doc-utils, 
-$GNOME_PREFIX/share/gnome/help/gnome-doc-make, 
-$GNOME_PREFIX/share/gnome/help/gnome-doc-xslt, 
-$GNOME_PREFIX/share/omf/gnome-doc-make, 
-$GNOME_PREFIX/share/omf/gnome-doc-xslt, 
-$GNOME_PREFIX/share/xml and
-$GNOME_PREFIX/share/xml2po</seg>
-<seg>Custom DocBook XSLT stylesheets used by Yelp</seg>
-</seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>gnome-doc-prepare and xml2po</seg>
+        <seg>None</seg>
+        <seg>$GNOME_PREFIX/share/gnome-doc-utils,
+        $GNOME_PREFIX/share/gnome/help/gnome-doc-make,
+        $GNOME_PREFIX/share/gnome/help/gnome-doc-xslt,
+        $GNOME_PREFIX/share/omf/gnome-doc-make,
+        $GNOME_PREFIX/share/omf/gnome-doc-xslt,
+        $GNOME_PREFIX/share/xml and
+        $GNOME_PREFIX/share/xml2po</seg>
+        <seg>Custom DocBook XSLT stylesheets used by Yelp</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-<varlistentry id="gnome-doc-prepare">
-<term><command>gnome-doc-prepare</command></term>
-<listitem><para>prepares a package to use 
-<application>gnome-doc-utils</application>.</para>
-<indexterm zone="gnome-doc-utils gnome-doc-prepare">
-<primary sortas="b-gnome-doc-prepare">gnome-doc-prepare</primary>
-</indexterm></listitem>
-</varlistentry>
+      <varlistentry id="gnome-doc-prepare">
+        <term><command>gnome-doc-prepare</command></term>
+        <listitem>
+          <para>prepares a package to use
+          <application>gnome-doc-utils</application>.</para>
+          <indexterm zone="gnome-doc-utils gnome-doc-prepare">
+            <primary sortas="b-gnome-doc-prepare">gnome-doc-prepare</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="xml2po">
-<term><command>xml2po</command></term>
-<listitem><para>is a <application>Python</application> script used to 
-translate <acronym>XML</acronym> documents.</para>
-<indexterm zone="gnome-doc-utils xml2po">
-<primary sortas="b-xml2po">xml2po</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
+      <varlistentry id="xml2po">
+        <term><command>xml2po</command></term>
+        <listitem>
+          <para>is a <application>Python</application> script used to
+          translate XML documents.</para>
+          <indexterm zone="gnome-doc-utils xml2po">
+            <primary sortas="b-xml2po">xml2po</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
+
+  </sect2>
 
 </sect1>
