1 files changed, 28 insertions, 16 deletions
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index 9a526f212..044374f8a 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-dejagnu" xreflabel="DejaGnu">
+<sect1 id="ch-tools-dejagnu" xreflabel="DejaGnu" role="wrap">
 <title>DejaGnu-&dejagnu-version;</title>
 <?dbhtml filename="dejagnu.html"?>
 
 <indexterm zone="ch-tools-dejagnu"><primary sortas="a-DejaGnu">DejaGnu</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The DejaGnu package contains a framework for testing other programs.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 8.6 MB</screen>
-
-<para>For its installation Dejagnu depends on: Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>8.6 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Dejagnu installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+GCC, Glibc, Grep, Make, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of DejaGnu</title>
 
 <para>Prepare DejaGnu for compilation:</para>
@@ -33,18 +39,24 @@ GCC, Glibc, Grep, Make, Sed.</para>
 </sect2>
 
 
-<sect2 id="contents-dejagnu"><title>Contents of DejaGnu</title>
-
-<para><emphasis>Installed program</emphasis>: runtest</para>
-
-</sect2>
+<sect2 id="contents-dejagnu" role="content"><title>Contents of DejaGnu</title>
 
+<segmentedlist>
+<segtitle>Installed program</segtitle>
+<seglistitem><seg>runtest</seg></seglistitem>
+</segmentedlist>
 
-<sect2><title>Short description</title>
+<variablelist><title>Short description</title>
 
+<varlistentry>
+<term id="runtest"><command>rutest</command></term>
+<listitem>
 <indexterm zone="ch-tools-dejagnu runtest"><primary sortas="b-runtest">runtest</primary></indexterm>
-<para id="runtest"><command>runtest</command> is the wrapper script that finds the proper
+<para>is the wrapper script that finds the proper
 expect shell and then runs DejaGnu.</para>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>