Index: gnome/add/gcalctool.xml
===================================================================
--- gnome/add/gcalctool.xml	(revision 6445f3b2cca40e7a724da67f753435609c0778a1)
+++ gnome/add/gcalctool.xml	(revision f59baa801b26e1c2b332bcec2904dae75a302821)
@@ -5,103 +5,144 @@
   %general-entities;
 
-<!ENTITY gcalctool-download-http "http://ftp.gnome.org/pub/GNOME/sources/gcalctool/5.5/gcalctool-&gcalctool-version;.tar.bz2">
-<!ENTITY gcalctool-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gcalctool/5.5/gcalctool-&gcalctool-version;.tar.bz2">
-<!ENTITY gcalctool-md5sum "0f42e6e437f64c844b7b30e3255b02aa">
-<!ENTITY gcalctool-size "1.0 MB">
-<!ENTITY gcalctool-buildsize "16 MB">
-<!ENTITY gcalctool-time "0.2 SBU">
+  <!ENTITY gcalctool-download-http "http://ftp.gnome.org/pub/GNOME/sources/gcalctool/5.5/gcalctool-&gcalctool-version;.tar.bz2">
+  <!ENTITY gcalctool-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gcalctool/5.5/gcalctool-&gcalctool-version;.tar.bz2">
+  <!ENTITY gcalctool-md5sum "0f42e6e437f64c844b7b30e3255b02aa">
+  <!ENTITY gcalctool-size "1.0 MB">
+  <!ENTITY gcalctool-buildsize "16 MB">
+  <!ENTITY gcalctool-time "0.2 SBU">
 ]>
 
 <sect1 id="gcalctool" xreflabel="gcalctool-&gcalctool-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="gcalctool.html"?>
-<title>gcalctool-&gcalctool-version;</title>
+  <?dbhtml filename="gcalctool.html"?>
 
-<sect2>
-<title>Introduction to <application>gcalctool</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para><application>gcalctool</application> is a powerful graphical calculator 
-with financial, logical and scientific modes. It uses a multiple
-precision package to do its arithmetic to give a high degree of
-accuracy.</para>
+  <title>gcalctool-&gcalctool-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&gcalctool-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&gcalctool-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &gcalctool-md5sum;</para></listitem>
-<listitem><para>Download size: &gcalctool-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&gcalctool-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&gcalctool-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="gcalctool">
+    <primary sortas="a-gcalctool">gcalctool</primary>
+  </indexterm>
 
-<sect3><title><application>gcalctool</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="libgnomeui"/> and 
-<xref linkend="scrollkeeper"/></para>
-</sect4>
-</sect3>
+  <sect2 role="package">
+    <title>Introduction to gcalctool</title>
 
-</sect2>
+    <para><application>gcalctool</application> is a powerful graphical
+    calculator with financial, logical and scientific modes. It uses a
+    multiple precision package to do its arithmetic to give a high degree
+    of accuracy.</para>
 
-<sect2>
-<title>Installation of <application>gcalctool</application></title>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gcalctool-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gcalctool-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gcalctool-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gcalctool-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gcalctool-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gcalctool-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<para>Install <application>gcalctool</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect3">gcalctool Dependencies</bridgehead>
 
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="libgnomeui"/> and
+    <xref linkend="scrollkeeper"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of gcalctool</title>
+
+    <para>Install <application>gcalctool</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>
 
-<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>gcalctool</application> package contains
-<command>gcalctool</command> (a.k.a.
-<command>gnome-calculator</command>).</para>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-</sect2>
+      <seglistitem>
+        <seg>gcalctool and gnome-calculator</seg>
+        <seg>None</seg>
+        <seg>/etc/gnome/gconf/gconf.xml.defaults/apps/gcalctool,
+        /etc/gnome/gconf/gconf.xml.defaults/schemas/apps/gcalctool,
+        $GNOME_PREFIX/share/gnome/help/gcalctool, and
+        $GNOME_PREFIX/share/omf/gcalctool</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<sect2><title>Description</title>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-<sect3><title>gcalctool</title>
-<para><command>gcalctool</command> is a desktop calculator for
-<application><acronym>GNOME</acronym></application>.</para></sect3>
+      <varlistentry id="gcalctool-prog">
+        <term><command>gcalctool</command></term>
+        <listitem>
+          <para>is a desktop calculator for
+          <application>GNOME</application>.</para>
+          <indexterm zone="gcalctool gcalctool-prog">
+            <primary sortas="b-gcalctool">gcalctool</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<sect3><title>gnome-calculator</title>
-<para><command>gnome-calculator</command> is a symlink to the 
-<command>gcalctool</command> program.</para></sect3>
+      <varlistentry id="gnome-calculator">
+        <term><command>gnome-calculator</command></term>
+        <listitem>
+          <para>is a symlink to the <command>gcalctool</command>
+          program.</para>
+          <indexterm zone="gcalctool gnome-calculator">
+            <primary sortas="g-gnome-calculator">gnome-calculator</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
+
+  </sect2>
 
 </sect1>
