Index: gnome/core/gnome-desktop.xml
===================================================================
--- gnome/core/gnome-desktop.xml	(revision 0cb71f4d43c86aa6d212c729fbcf8dc4d2086de2)
+++ gnome/core/gnome-desktop.xml	(revision a8de889e377aef414f7aa7797699703466d640d2)
@@ -5,106 +5,139 @@
   %general-entities;
 
-<!ENTITY gnome-desktop-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/&gnome-version;/gnome-desktop-&gnome-desktop-version;.tar.bz2">
-<!ENTITY gnome-desktop-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/&gnome-version;/gnome-desktop-&gnome-desktop-version;.tar.bz2">
-<!ENTITY gnome-desktop-md5sum "5d6d21e4b5d66975c9c2c04add7da6e2">
-<!ENTITY gnome-desktop-size "1.0 MB">
-<!ENTITY gnome-desktop-buildsize "12 MB">
-<!ENTITY gnome-desktop-time "0.2 SBU">
+  <!ENTITY gnome-desktop-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/&gnome-version;/gnome-desktop-&gnome-desktop-version;.tar.bz2">
+  <!ENTITY gnome-desktop-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/&gnome-version;/gnome-desktop-&gnome-desktop-version;.tar.bz2">
+  <!ENTITY gnome-desktop-md5sum "5d6d21e4b5d66975c9c2c04add7da6e2">
+  <!ENTITY gnome-desktop-size "1.0 MB">
+  <!ENTITY gnome-desktop-buildsize "12 MB">
+  <!ENTITY gnome-desktop-time "0.2 SBU">
 ]>
 
 <sect1 id="gnome-desktop" xreflabel="GNOME Desktop-&gnome-desktop-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="gnome-desktop.html"?>
-<title>GNOME Desktop-&gnome-desktop-version;</title>
+  <?dbhtml filename="gnome-desktop.html"?>
 
-<sect2>
-<title>Introduction to <application><acronym>GNOME</acronym> Desktop</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application><acronym>GNOME</acronym> Desktop</application>
-package contains the <command>gnome-about</command> program, the 
-<filename class='libraryfile'>libgnome-desktop-2</filename> library and 
-<application><acronym>GNOME</acronym></application>'s core graphics files 
-and icons.</para>
+  <title>GNOME Desktop-&gnome-desktop-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&gnome-desktop-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&gnome-desktop-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &gnome-desktop-md5sum;</para></listitem>
-<listitem><para>Download size: &gnome-desktop-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&gnome-desktop-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&gnome-desktop-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="gnome-desktop">
+    <primary sortas="a-GNOME-Desktop">GNOME Desktop</primary>
+  </indexterm>
 
-<sect3><title><application><acronym>GNOME</acronym> Desktop</application> 
-dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="libgnomeui"/> and 
-<xref linkend="scrollkeeper"/></para>
-</sect4>
+  <sect2 role="package">
+    <title>Introduction to GNOME Desktop</title>
 
-<sect4><title>Recommended</title>
-<para><xref linkend="startup-notification"/></para>
-</sect4>
-</sect3>
+    <para>The <application>GNOME Desktop</application> package contains
+    the <command>gnome-about</command> program, the
+    <filename class='libraryfile'>libgnome-desktop-2</filename> library and
+    <application>GNOME</application>'s core graphics files and icons.</para>
 
-</sect2>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gnome-desktop-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gnome-desktop-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnome-desktop-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnome-desktop-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnome-desktop-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnome-desktop-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of <application><acronym>GNOME</acronym> 
-Desktop</application></title>
+    <bridgehead renderas="sect3">GNOME Desktop Dependencies</bridgehead>
 
-<para>Install <application><acronym>GNOME</acronym> Desktop</application> by 
-running the following commands:</para>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="libgnomeui"/> 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="startup-notification"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME Desktop</title>
+
+    <para>Install <application>GNOME Desktop</application> by
+    running the following commands:</para>
+
+<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
     --sysconfdir=/etc/gnome --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>--sysconfdir=/etc/gnome</parameter>: This switch
-puts configuration files in <filename class="directory">/etc/gnome</filename> 
-instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
+    <para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch
+    puts configuration files in <filename class="directory">/etc/gnome</filename>
+    instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Contents</title>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<para>The <application><acronym>GNOME</acronym> Desktop</application> package 
-contains the <filename class="libraryfile">libgnome-desktop-2</filename> library 
-and <command>gnome-about</command>.</para>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-</sect2>
+      <seglistitem>
+        <seg>gnome-about</seg>
+        <seg>libgnome-desktop-2.[so,a]</seg>
+        <seg>$GNOME_PREFIX/share/gnome-about</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<sect2><title>Description</title>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-<sect3><title>libgnome-desktop libraries</title>
-<para><filename class="libraryfile">libgnome-desktop</filename> library
-contains <acronym>API</acronym>s being tested for inclusion in 
-<application>libgnome</application> or
-<application>libgnomeui</application>.</para></sect3>
+      <varlistentry id="gnome-about">
+        <term><command>gnome-about</command></term>
+        <listitem>
+          <para>produces the about screen.</para>
+          <indexterm zone="gnome-desktop gnome-about">
+            <primary sortas="b-gnome-about">gnome-about</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<sect3><title>gnome-about</title>
-<para><command>gnome-about</command> produces the about screen.</para></sect3>
+      <varlistentry id="libgnome-desktop-2">
+        <term><filename class='libraryfile'>libgnome-desktop-2.[so,a]</filename></term>
+        <listitem>
+          <para>contains APIs being tested for inclusion in
+          <application>libgnome</application> or
+          <application>libgnomeui</application>.</para>
+          <indexterm zone="gnome-desktop libgnome-desktop-2">
+            <primary sortas="c-libgnome-desktop-2">libgnome-desktop-2.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
+
+  </sect2>
 
 </sect1>
