1 files changed, 25 insertions, 14 deletions
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index 834b772f9..de27b3b3f 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-ncurses">
+<sect1 id="ch-tools-ncurses" role="wrap">
 <title>Ncurses-&ncurses-version;</title>
 <?dbhtml filename="ncurses.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Ncurses">Ncurses</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/ncurses.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/ncurses.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.7 SBU
-&diskspace; 26 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.7 SBU</seg><seg>26 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/ncurses.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/ncurses.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Ncurses</title>
 
 <para>Prepare Ncurses for compilation:</para>
@@ -29,17 +34,23 @@
 
 <para>The meaning of the configure options:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--without-ada</userinput>: This tells Ncurses not
+<variablelist>
+<varlistentry>
+<term><userinput>--without-ada</userinput></term>
+<listitem><para>This tells Ncurses not
 to build its Ada bindings, even if an Ada compiler is installed on the host.
 This must be done because once we enter the chroot environment, Ada will no
 longer be available.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--enable-overwrite</userinput>: This tells Ncurses
-to install its header files into <filename class="directory">/tools/include</filename>
-instead of <filename class="directory">/tools/include/ncurses</filename> to
-ensure that other packages can find the Ncurses headers successfully.</para>
-</listitem></itemizedlist>
+<varlistentry>
+<term><userinput>--enable-overwrite</userinput></term>
+<listitem><para>This tells Ncurses to install its header files into 
+<filename class="directory">/tools/include</filename> instead of 
+<filename class="directory">/tools/include/ncurses</filename> to ensure that 
+other packages can find the Ncurses headers successfully.</para></listitem>
+</varlistentry>
+</variablelist>
 
 <para>Compile the programs and libraries:</para>
 
@@ -51,7 +62,7 @@ ensure that other packages can find the Ncurses headers successfully.</para>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-ncurses"/>.</para>
 </sect2>