1 files changed, 18 insertions, 10 deletions
diff --git a/chapter05/perl.xml b/chapter05/perl.xml
index 256beaf84..5038d25bc 100644
--- a/chapter05/perl.xml
+++ b/chapter05/perl.xml
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-perl">
+<sect1 id="ch-tools-perl" role="wrap">
 <title>Perl-&perl-version;</title>
 <?dbhtml filename="perl.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Perl">Perl</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/perl.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/perl.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.8 SBU
-&diskspace; 74 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.8 SBU</seg><seg>74 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/perl.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/perl.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Perl</title>
 
 <para>First adapt some hard-wired paths to the C library:</para>
@@ -33,11 +38,14 @@ right, they are all letters):</para>
 
 <para>The meaning of the configure option:</para>
 
-<itemizedlist>
-<listitem><para><userinput>-Dstatic_ext='IO Fcntl POSIX'</userinput>: This tells
+<variablelist>
+<varlistentry>
+<term><userinput>-Dstatic_ext='IO Fcntl POSIX'</userinput></term>
+<listitem><para>This tells
 Perl to build the minimum set of static extensions needed for installing and
 testing the Coreutils package in the next chapter.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>Compile only the required tools:</para>
 
@@ -51,7 +59,7 @@ cp -R lib/* /tools/lib/perl5/&perl-version;</userinput></screen>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-perl"/>.</para>
 </sect2>