Index: general/prog/dejagnu.xml
===================================================================
--- general/prog/dejagnu.xml	(revision 6dc368793d24aa827550cb1d91f3465fd83e1bbf)
+++ general/prog/dejagnu.xml	(revision d107c86d3c3f284dce40037b6bd24435aebb9c93)
@@ -14,97 +14,109 @@
 
 <sect1 id="dejagnu" xreflabel="DejaGnu-&dejagnu-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="dejagnu.html"?>
-<title>DejaGnu-&dejagnu-version;</title>
-<indexterm zone="dejagnu">
-<primary sortas="a-DejaGnu">DejaGnu</primary>
-</indexterm>
+  <?dbhtml filename="dejagnu.html"?>
 
-<sect2>
-<title>Introduction to <application>DejaGnu</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para><application>DejaGnu</application> is a framework for running test suites 
-on <acronym>GNU</acronym> tools. It is written in <command>expect</command>, 
-which uses <application>Tcl</application> (Tool command language).</para>
+  <title>DejaGnu-&dejagnu-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing="compact">
-<listitem><para>Download (HTTP): 
-<ulink url="&dejagnu-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&dejagnu-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &dejagnu-md5sum;</para></listitem>
-<listitem><para>Download size: &dejagnu-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&dejagnu-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&dejagnu-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="dejagnu">
+    <primary sortas="a-DejaGnu">DejaGnu</primary>
+  </indexterm>
 
-<sect3><title><application>DejaGnu</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="expect"/></para>
-</sect4>
+  <sect2 role="package">
+    <title>Introduction to DejaGnu</title>
 
-<sect4><title>Optional</title>
-<para><xref linkend="docbook-utils"/></para>
-</sect4>
-</sect3>
+    <para><application>DejaGnu</application> is a framework for running test suites 
+    on GNU tools. It is written in <command>expect</command>, 
+    which uses <application>Tcl</application> (Tool command language).</para>
 
-</sect2>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&dejagnu-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&dejagnu-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &dejagnu-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &dejagnu-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &dejagnu-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &dejagnu-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of <application>DejaGnu</application></title>
+    <bridgehead renderas="sect3">DejaGnu Dependencies</bridgehead>
 
-<para>Install <application>DejaGnu</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="expect"/></para>
 
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make</command></userinput></screen>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="docbook-utils"/></para>
 
-<para>Now, as the root user:</para>
+  </sect2>
 
-<screen><userinput role='root'><command>make install &amp;&amp;
-make install-doc</command></userinput></screen>
+  <sect2 role="installation">
+    <title>Installation of DejaGnu</title>
 
-</sect2>
+    <para>Install <application>DejaGnu</application> by running the following 
+    commands:</para>
 
-<sect2>
-<title>Contents</title>
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
 
-<segmentedlist>
-<segtitle>Installed Program</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Scripts</segtitle>
-<segtitle>Installed Directory</segtitle>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<seglistitem>
-<seg>runtest</seg>
-<seg>None</seg>
-<seg>There are numerous <application>Expect</application> scripts installed in 
-the <filename class='directory'>/usr/share/dejagnu</filename> hierarchy.</seg>
-<seg>/usr/share/dejagnu</seg>
-</seglistitem>
-</segmentedlist>
+<screen role="root"><userinput>make install &amp;&amp;
+make install-doc</userinput></screen>
 
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
+  </sect2>
 
-<varlistentry id="runtest">
-<term><command>runtest</command></term>
-<listitem><para>is the <application>DejaGnu</application> test driver program. 
-It is used to control what tests to run, and variations on how to run 
-them.</para>
-<indexterm zone="dejagnu runtest">
-<primary sortas="b-runtest">runtest</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
+  <sect2 role="content">
+    <title>Contents</title>
 
-</sect2>
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Scripts</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>runtest</seg>
+        <seg>None</seg>
+        <seg>There are numerous <application>Expect</application> scripts installed in 
+        the <filename class='directory'>/usr/share/dejagnu</filename> hierarchy.</seg>
+        <seg>/usr/share/dejagnu</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="runtest">
+        <term><command>runtest</command></term>
+        <listitem>
+          <para>is the <application>DejaGnu</application> test driver program. It is 
+          used to control what tests to run, and variations on how to run them.</para>
+          <indexterm zone="dejagnu runtest">
+            <primary sortas="b-runtest">runtest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
