Index: gnome/core/gnome-session.xml
===================================================================
--- gnome/core/gnome-session.xml	(revision cfb54bdefe36eab3563c38088fb1f946ba074fce)
+++ gnome/core/gnome-session.xml	(revision ed9b56b8e96292cd39eb294bd29d08aee5bc8f51)
@@ -5,122 +5,166 @@
   %general-entities;
 
-<!ENTITY gnome-session-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-session/&gnome-version;/gnome-session-&gnome-session-version;.tar.bz2">
-<!ENTITY gnome-session-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-session/&gnome-version;/gnome-session-&gnome-session-version;.tar.bz2">
-<!ENTITY gnome-session-md5sum "cbeb2db49dac11bf8088e6b025265fff">
-<!ENTITY gnome-session-size "796 KB">
-<!ENTITY gnome-session-buildsize "11 MB">
-<!ENTITY gnome-session-time "0.2 SBU">
+  <!ENTITY gnome-session-download-http "http://ftp.gnome.org/pub/GNOME/sources/gnome-session/&gnome-version;/gnome-session-&gnome-session-version;.tar.bz2">
+  <!ENTITY gnome-session-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gnome-session/&gnome-version;/gnome-session-&gnome-session-version;.tar.bz2">
+  <!ENTITY gnome-session-md5sum "cbeb2db49dac11bf8088e6b025265fff">
+  <!ENTITY gnome-session-size "796 KB">
+  <!ENTITY gnome-session-buildsize "11 MB">
+  <!ENTITY gnome-session-time "0.2 SBU">
 ]>
 
 <sect1 id="gnome-session" xreflabel="GNOME Session-&gnome-session-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="gnome-session.html"?>
-<title>GNOME Session-&gnome-session-version;</title>
+  <?dbhtml filename="gnome-session.html"?>
 
-<sect2>
-<title>Introduction to <application><acronym>GNOME</acronym> 
-Session</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application><acronym>GNOME</acronym> Session</application>
-package contains the <application><acronym>GNOME</acronym></application> 
-session manager.</para>
+  <title>GNOME Session-&gnome-session-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&gnome-session-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&gnome-session-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &gnome-session-md5sum;</para></listitem>
-<listitem><para>Download size: &gnome-session-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&gnome-session-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&gnome-session-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="gnome-session">
+    <primary sortas="a-GNOME Session">GNOME Session</primary>
+  </indexterm>
 
-<sect3><title><application><acronym>GNOME</acronym> Session</application> 
-dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="libgnomeui"/></para>
-</sect4>
+  <sect2 role="package">
+    <title>Introduction to GNOME Session</title>
 
-<sect4><title>Optional</title>
-<para><xref linkend="tcpwrappers"/></para>
-</sect4>
-</sect3>
+    <para>The <application>GNOME Session</application> package contains
+    the <application>GNOME</application> session manager.</para>
 
-</sect2>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gnome-session-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gnome-session-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnome-session-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnome-session-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnome-session-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnome-session-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of <application><acronym>GNOME</acronym> 
-Session</application></title>
+    <bridgehead renderas="sect3">GNOME Session Dependencies</bridgehead>
 
-<para>Install <application><acronym>GNOME</acronym> Session</application> by 
-running the following commands:</para>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="libgnomeui"/></para>
 
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="tcpwrappers"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of GNOME Session</title>
+
+    <para>Install <application>GNOME Session</application> by
+    running the following commands:</para>
+
+<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
     --localstatedir=/var/lib --sysconfdir=/etc/gnome  &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>
 
-<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> Session</application> package 
-contains 
-<command>gnome-session</command>, 
-<command>gnome-session-<replaceable>[utilities]</replaceable></command>, 
-<command>gnome-smproxy</command> and 
-<command>gnome-wm</command>.</para>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-</sect2>
+      <seglistitem>
+        <seg>gnome-session, gnome-session-properties, gnome-session-remove,
+        gnome-session-save, gnome-smproxy, and gnome-wm</seg>
+        <seg>None</seg>
+        <seg>None</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-session</title>
-<para><command>gnome-session</command> starts up the
-<application><acronym>GNOME</acronym></application> desktop.</para></sect3>
+      <varlistentry id="gnome-session-prog">
+        <term><command>gnome-session</command></term>
+        <listitem>
+          <para>starts up the <application>GNOME</application> desktop.</para>
+          <indexterm zone="gnome-session gnome-session-prog">
+            <primary sortas="b-gnome-session">gnome-session</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<sect3><title>session utilities</title>
-<para>session utilities includes a configuration program and other
-session management related utilities.</para></sect3>
+      <varlistentry id="gnome-session-utils">
+        <term><command>gnome-session-*</command></term>
+        <listitem>
+          <para>session utilities includes a configuration program and
+          other session management related utilities.</para>
+          <indexterm zone="gnome-session gnome-session-utils">
+            <primary sortas="b-gnome-session-*">gnome-session-*</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<sect3><title>gnome-smproxy</title>
-<para><command>gnome-smproxy</command> handles basic session management for 
-applications that do not support <acronym>XSM</acronym>.</para></sect3>
+      <varlistentry id="gnome-smproxy">
+        <term><command>gnome-smproxy</command></term>
+        <listitem>
+          <para>handles basic session management for applications that
+          do not support XSM.</para>
+          <indexterm zone="gnome-session gnome-smproxy">
+            <primary sortas="b-gnome-smproxy">gnome-smproxy</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<sect3><title>gnome-wm</title>
-<para><command>gnome-wm</command> uses the <envar>$WINDOW_MANAGER</envar> 
-environment variable to allow a user to define a window manager of choice. If 
-no <envar>$WINDOW_MANAGER</envar> is defined, <command>gnome-wm</command> 
-defaults to <command>metacity</command> as the default window manager.</para>
-</sect3>
+      <varlistentry id="gnome-wm">
+        <term><command>gnome-wm</command></term>
+        <listitem>
+          <para>uses the <envar>$WINDOW_MANAGER</envar> environment variable
+          to allow a user to define a window manager of choice. If no
+          <envar>$WINDOW_MANAGER</envar> is defined, <command>gnome-wm</command>
+          defaults to <command>metacity</command> as the default window
+          manager.</para>
+          <indexterm zone="gnome-session gnome-wm">
+            <primary sortas="b-gnome-wm">gnome-wm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
+
+  </sect2>
 
 </sect1>
