1 files changed, 24 insertions, 11 deletions
diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index 91b28a8f6..6eb398cf8 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-gettext">
+<sect1 id="ch-tools-gettext" role="wrap">
 <title>Gettext-&gettext-version;</title>
 <?dbhtml filename="gettext.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Gettext">Gettext</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gettext.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gettext.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.5 SBU
-&diskspace; 55 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.5 SBU</seg><seg>55 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gettext.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gettext.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Gettext</title>
 
 <para>Prepare Gettext for compilation:</para>
@@ -27,17 +32,25 @@
 <screen><userinput>./configure --prefix=/tools --disable-libasprintf \
     --disable-csharp</userinput></screen>
 
-<itemizedlist>
-<listitem><para><userinput>--disable-libasprintf</userinput>: This flag tells
+<para>The meaning of the configure options:</para>
+
+<variablelist>
+<varlistentry>
+<term><userinput>--disable-libasprintf</userinput></term>
+<listitem><para>This flag tells
 Gettext that we don't want its asprintf library.  Nothing in Chapter 5 or 6
 requires this, and gettext gets rebuilt later, so we exclude it to save
 time/space.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--disable-csharp</userinput>: Gettext has a nasty
+<varlistentry>
+<term><userinput>--disable-csharp</userinput></term>
+<listitem><para>Gettext has a nasty
 habit of searching for a C# compiler on the host, and building bindings for it.
 We've already <quote>locked</quote> ourselves into the temporary tools though,
 which doesn't have a C# compiler.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>Compile the programs:</para>
 
@@ -56,7 +69,7 @@ project).)</para>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-gettext"/>.</para>
 </sect2>