HEAD: Retaged the SBUs/disk-usage sections, the lists of options and the contents sections in chapter05.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3600 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

chapter05/bash.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-bash">
+<sect1 id="ch-tools-bash" role="wrap">
 <title>Bash-&bash-version;</title>
 <?dbhtml filename="bash.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Bash">Bash</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bash.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bash.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 1.2 SBU
-&diskspace; 27 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>1.2 SBU</seg><seg>27 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bash.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bash.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Bash</title>
 
 <para>Bash contains several known bugs. Fix these with the following
@@ -49,7 +54,7 @@ for a shell:</para>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-bash"/>.</para>
 </sect2>
 

chapter05/binutils-pass1.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-binutils-pass1">
+<sect1 id="ch-tools-binutils-pass1" role="wrap">
 <title>Binutils-&binutils-version; - Pass 1</title>
 <?dbhtml filename="binutils-pass1.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Binutils">Binutils</primary>
 <secondary>tools, pass 1</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/binutils.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/binutils.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 1.0 SBU
-&diskspace; 194 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>1.0 SBU</seg><seg>194 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/binutils.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/binutils.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Binutils</title>
 
 <para>It is important that Binutils be the first package to get compiled,
@@ -51,16 +56,20 @@ like this: <userinput>time { ./configure ... &amp;&amp; ... &amp;&amp; ...
 
 <para>The meaning of the configure options:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--prefix=/tools</userinput>: This tells the
-configure script to prepare to install the Binutils programs in the
-<filename>/tools</filename> directory.</para></listitem>
-
-<listitem><para><userinput>--disable-nls</userinput>: This disables
-internationalization (a word often shortened to i18n). We don't need this
-for our static programs and <emphasis>nls</emphasis> often causes problems
-when linking statically.</para></listitem>
-</itemizedlist>
+<variablelist>
+<varlistentry>
+<term><userinput>--prefix=/tools</userinput></term>
+<listitem><para>This tells the configure script to prepare to install the Binutils
+programs in the <filename>/tools</filename> directory.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><userinput>--disable-nls</userinput></term>
+<listitem><para>This disables internationalization (a word often shortened to 
+i18n). We don't need this for our static programs and <emphasis>nls</emphasis>
+often causes problems when linking statically.</para></listitem>
+</varlistentry>
+</variablelist>
 
 <para>Continue with compiling the package:</para>
 
@@ -69,18 +78,22 @@ make LDFLAGS="-all-static"</userinput></screen>
 
 <para>The meaning of the make parameters:</para>
 
-<itemizedlist>
-<listitem><para><userinput>configure-host</userinput>: This forces all the
-subdirectories to be configured immediately. A statically linked build will
-fail without it. We therefore use this option to work around the
-problem.</para></listitem>
-
-<listitem><para><userinput>LDFLAGS="-all-static"</userinput>: This tells the
-linker that all the Binutils programs should be linked statically. However,
-strictly speaking, <emphasis>"-all-static"</emphasis> is passed to the
-<command>libtool</command> program, which then passes
+<variablelist>
+<varlistentry>
+<term><userinput>configure-host</userinput></term>
+<listitem><para>This forces all the subdirectories to be configured immediately. 
+A statically linked build will fail without it. We therefore use this option to work 
+around the problem.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><userinput>LDFLAGS="-all-static"</userinput></term>
+<listitem><para>This tells the linker that all the Binutils programs should be 
+linked statically. However, strictly speaking, <emphasis>"-all-static"</emphasis> 
+is passed to the <command>libtool</command> program, which then passes
 <emphasis>"-static"</emphasis> to the linker.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>Compilation is complete. Normally we would now run the test suite, but
 at this early stage the test suite framework (Tcl, Expect and DejaGnu) is not
@@ -99,18 +112,24 @@ make -C ld LDFLAGS="-all-static" LIB_PATH=/tools/lib</userinput></screen>
 
 <para>The meaning of the make parameters:</para>
 
-<itemizedlist>
-<listitem><para><userinput>-C ld clean</userinput>: This tells the make program
-to remove all the compiled files in the <filename class="directory">ld</filename> subdirectory.</para></listitem>
-
-<listitem><para><userinput>-C ld LDFLAGS="-all-static"
-LIB_PATH=/tools/lib</userinput>: This option rebuilds everything in the
+<variablelist>
+<varlistentry>
+<term><userinput>-C ld clean</userinput></term>
+<listitem><para>This tells the make program to remove all the compiled files 
+in the <filename class="directory">ld</filename> subdirectory.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><userinput>-C ld LDFLAGS="-all-static" 
+LIB_PATH=/tools/lib</userinput></term>
+<listitem><para>This option rebuilds everything in the
 <filename class="directory">ld</filename> subdirectory. Specifying the LIB_PATH
 makefile variable on the command line allows us to override the default value
 and have it point to our temporary tools location. The value of this variable
 specifies the linker's default library search path. You will see how this
 preparation is used later on in the chapter.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 
 <warning><para><emphasis>Do not yet remove</emphasis> the Binutils build and
@@ -120,7 +139,7 @@ further on in this chapter.</para></warning>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-binutils"/>.</para>
 </sect2>
 

chapter05/binutils-pass2.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-binutils-pass2">
+<sect1 id="ch-tools-binutils-pass2" role="wrap">
 <title>Binutils-&binutils-version; - Pass 2</title>
 <?dbhtml filename="binutils-pass2.html"?>
 
@@ -11,11 +11,17 @@
 <primary sortas="a-Binutils">Binutils</primary>
 <secondary>tools, pass 2</secondary></indexterm>
 
-<screen>&buildtime; 1.5 SBU
-&diskspace; 108 MB</screen>
+<sect2 role="package"><title/>
 
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>1.5 SBU</seg><seg>108 MB</seg></seglistitem>
+</segmentedlist>
 
-<sect2>
+</sect2>
+
+<sect2 role="installation">
 <title>Re-installation of Binutils</title>
 
 <para>Create a separate build directory again:</para>
@@ -30,13 +36,15 @@ cd ../binutils-build</userinput></screen>
 
 <para>The meaning of the new configure option:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--with-lib-path=/tools/lib</userinput>: This tells
-the configure script to specify the library search path during the compilation
-of Binutils, resulting in <emphasis>/tools/lib</emphasis> to be passed to the
-linker. This prevents the linker from searching through library directories on
-the host.</para></listitem>
-</itemizedlist>
+<variablelist>
+<varlistentry>
+<term><userinput>--with-lib-path=/tools/lib</userinput></term>
+<listitem><para>This tells the configure script to specify the library search path 
+during the compilation of Binutils, resulting in <emphasis>/tools/lib</emphasis> 
+to be passed to the linker. This prevents the linker from searching through library 
+directories on the host.</para></listitem>
+</varlistentry>
+</variablelist>
 
 <para>Before starting to build Binutils, remember to unset any environment
 variables that override the default optimization flags.</para>
@@ -88,7 +96,7 @@ in the state they are in now.</para></warning>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-binutils"/>.</para>
 </sect2>
 

chapter05/bison.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-bison" xreflabel="Bison">
+<sect1 id="ch-tools-bison" xreflabel="Bison" role="wrap">
 <title>Bison-&bison-version;</title>
 <?dbhtml filename="bison.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Bison">Bison</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bison.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bison.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.6 SBU
-&diskspace; 10.6 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.6 SBU</seg><seg>10.6 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bison.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bison.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Bison</title>
 
 <para>Prepare Bison for compilation:</para>
@@ -39,7 +44,7 @@
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-bison"/>.</para>
 </sect2>
 

chapter05/bzip2.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-bzip2">
+<sect1 id="ch-tools-bzip2" role="wrap">
 <title>Bzip2-&bzip2-version;</title>
 <?dbhtml filename="bzip2.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Bzip2">Bzip2</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bzip2.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bzip2.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 2.5 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>2.5 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bzip2.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bzip2.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Bzip2</title>
 
 <para>The Bzip2 package doesn't contain a <command>configure</command>
@@ -33,7 +38,7 @@ script. Compile it with a straightforward:</para>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-bzip2"/>.</para>
 </sect2>
 

chapter05/coreutils.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-coreutils">
+<sect1 id="ch-tools-coreutils" role="wrap">
 <title>Coreutils-&coreutils-version;</title>
 <?dbhtml filename="coreutils.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Coreutils">Coreutils</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/coreutils.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/coreutils.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.9 SBU
-&diskspace; 69 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.9 SBU</seg><seg>69 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/coreutils.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/coreutils.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Coreutils</title>
 
 <para>Prepare Coreutils for compilation:</para>
@@ -57,7 +62,7 @@ platforms but generally are not a problem on Linux.)</para>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-coreutils"/>.</para>
 </sect2>
 

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>
 

chapter05/diffutils.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-diffutils">
+<sect1 id="ch-tools-diffutils" role="wrap">
 <title>Diffutils-&diffutils-version;</title>
 <?dbhtml filename="diffutils.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Diffutils">Diffutils</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/diffutils.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/diffutils.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 7.5 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>7.5 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/diffutils.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/diffutils.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Diffutils</title>
 
 <para>Prepare Diffutils for compilation:</para>
@@ -36,7 +41,7 @@
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-diffutils"/>.</para>
 </sect2>
 

chapter05/expect.xml

@@ -3,24 +3,30 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-expect" xreflabel="Expect">
+<sect1 id="ch-tools-expect" xreflabel="Expect" role="wrap">
 <title>Expect-&expect-version;</title>
 <?dbhtml filename="expect.html"?>
 
 <indexterm zone="ch-tools-expect"><primary sortas="a-Expect">Expect</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Expect package contains a program for doing scripted dialogues with
 other interactive programs.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 3.9 MB</screen>
-
-<para>Expect installation depends on: Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Sed, Tcl.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>3.9 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Expect installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+GCC, Glibc, Grep, Make, Sed, Tcl</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Expect</title>
 
 <para>First fix a bug that can result in bogus failures during the GCC test
@@ -34,16 +40,22 @@ suite run:</para>
 
 <para>The meaning of the configure options:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--with-tcl=/tools/lib</userinput>: This ensures that
+<variablelist>
+<varlistentry>
+<term><userinput>--with-tcl=/tools/lib</userinput></term>
+<listitem><para>This ensures that
 the configure script finds the Tcl installation in our temporary tools location.
 We don't want it to find an existing one that may possibly reside on the host
 system.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--with-x=no</userinput>: This tells the configure
+<varlistentry>
+<term><userinput>--with-x=no</userinput></term>
+<listitem><para>This tells the configure
 script not to search for Tk (the Tcl GUI component) or the X Window System
 libraries, both of which may possibly reside on the host system.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>Build the package:</para>
 
@@ -61,30 +73,38 @@ considered critical.)</para>
 
 <para>The meaning of the make parameter:</para>
 
-<itemizedlist>
-<listitem><para><userinput>SCRIPTS=""</userinput>: This prevents installation
+<variablelist>
+<varlistentry>
+<term><userinput>SCRIPTS=""</userinput></term>
+<listitem><para>This prevents installation
 of the supplementary expect scripts which are not needed.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>You can now remove the source directories of both Tcl and Expect.</para>
 
 </sect2>
 
 
-<sect2 id="contents-expect"><title>Contents of Expect</title>
-
-<para><emphasis>Installed program</emphasis>: expect</para>
-
-<para><emphasis>Installed library</emphasis>: libexpect&expect-version;.a</para>
-
-</sect2>
+<sect2 id="contents-expect" role="content"><title>Contents of Expect</title>
 
+<segmentedlist>
+<segtitle>Installed program</segtitle>
+<segtitle>Installed library</segtitle>
+<seglistitem><seg>expect</seg><seg>libexpect&expect-version;.a</seg></seglistitem>
+</segmentedlist>
 
-<sect2><title>Short description</title>
+<variablelist><title>Short description</title>
 
+<varlistentry>
+<term id="expect"><command>expect</command></term>
+<listitem>
 <indexterm zone="ch-tools-expect expect"><primary sortas="b-expect">expect</primary></indexterm>
-<para id="expect"><command>expect</command> <quote>talks</quote> to other interactive
+<para><quote>talks</quote> to other interactive
 programs according to a script.</para>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
 

chapter05/findutils.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-findutils">
+<sect1 id="ch-tools-findutils" role="wrap">
 <title>Findutils-&findutils-version;</title>
 <?dbhtml filename="findutils.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Findutils">Findutils</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/findutils.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/findutils.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 7.6 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>7.6 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/findutils.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/findutils.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Findutils</title>
 
 <para>Prepare Findutils for compilation:</para>
@@ -39,7 +44,7 @@
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-findutils"/>.</para>
 </sect2>
 

chapter05/flex.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-flex" xreflabel="Flex">
+<sect1 id="ch-tools-flex" xreflabel="Flex" role="wrap">
 <title>Flex-&flex-version;</title>
 <?dbhtml filename="flex.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Flex">Flex</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/flex.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/flex.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.6 SBU
-&diskspace; 10.6 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.6 SBU</seg><seg>10.6 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/flex.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/flex.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Bison</title>
 
 <para>Flex contains several known bugs. Fix these with the following patch:</para>
@@ -50,7 +55,7 @@ get renegerated:</para>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-flex"/>.</para>
 </sect2>
 

chapter05/gawk.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-gawk">
+<sect1 id="ch-tools-gawk" role="wrap">
 <title>Gawk-&gawk-version;</title>
 <?dbhtml filename="gawk.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Gawk">Gawk</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gawk.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gawk.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 17 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>17 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gawk.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gawk.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Gawk</title>
 
 <para>Prepare Gawk for compilation:</para>
@@ -39,7 +44,7 @@
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-gawk"/>.</para>
 </sect2>
 

chapter05/gcc-pass1.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-gcc-pass1">
+<sect1 id="ch-tools-gcc-pass1" role="wrap">
 <title>GCC-&gcc-version; - Pass 1</title>
 <?dbhtml filename="gcc-pass1.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-GCC">GCC</primary>
 <secondary>tools, pass 1</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gcc.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gcc.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 4.4 SBU
-&diskspace; 300 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>4.4 SBU</seg><seg>300 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gcc.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gcc.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of GCC</title>
 
 <para>Unpack only the GCC-core tarball, as we won't be needing the C++ compiler
@@ -45,14 +50,18 @@ cd ../gcc-build</userinput></screen>
 
 <para>The meaning of the configure options:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--with-local-prefix=/tools</userinput>: The
-purpose of this switch is to remove <filename>/usr/local/include</filename>
+<variablelist>
+<varlistentry>
+<term><userinput>--with-local-prefix=/tools</userinput></term>
+<listitem><para>The purpose of this switch is to remove <filename>/usr/local/include</filename>
 from <command>gcc</command>'s include search path. This is not absolutely
 essential; however, we want to try to minimize the influence of the host
 system, so this a sensible thing to do.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--enable-shared</userinput>: This switch may
+<varlistentry>
+<term><userinput>--enable-shared</userinput></term>
+<listitem><para>This switch may
 seem counter-intuitive at first. But using it allows the building of
 <filename>libgcc_s.so.1</filename> and <filename>libgcc_eh.a</filename>, and
 having <filename>libgcc_eh.a</filename> available ensures that the configure
@@ -60,11 +69,15 @@ script for Glibc (the next package we compile) produces the proper results.
 Note that the <command>gcc</command> binaries will still be linked
 statically, as this is controlled by the <emphasis>-static</emphasis>
 value of BOOT_LDFLAGS in the next step.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--enable-languages=c</userinput>: This option
+<varlistentry>
+<term><userinput>--enable-languages=c</userinput></term>
+<listitem><para>This option
 ensures that only the C compiler is built. The option is only needed when you
 have downloaded and unpacked the full GCC tarball.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>Continue with compiling the package:</para>
 
@@ -72,17 +85,22 @@ have downloaded and unpacked the full GCC tarball.</para></listitem>
 
 <para>The meaning of the make parameters:</para>
 
-<itemizedlist>
-<listitem><para><userinput>BOOT_LDFLAGS="-static"</userinput>: This tells
-GCC to link its programs statically.</para></listitem>
+<variablelist>
+<varlistentry>
+<term><userinput>BOOT_LDFLAGS="-static"</userinput></term>
+<listitem><para>This tells GCC to link its programs statically.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>bootstrap</userinput>: This target doesn't just
+<varlistentry>
+<term><userinput>bootstrap</userinput></term>
+<listitem><para>This target doesn't just
 compile GCC, but compiles it several times. It uses the programs compiled in
 a first round to compile itself a second time, and then again a third time.
 It then compares these second and third compiles to make sure it can
 reproduce itself flawlessly, which most probably means that it was
 compiled correctly.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>Compilation is now complete, and at this point we would normally run the
 test suite. But, as mentioned before, the test suite framework is not in place
@@ -104,7 +122,7 @@ C compiler to install, as long as there's a symlink pointing to it:</para>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-gcc"/>.</para>
 </sect2>
 

chapter05/gcc-pass2.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-gcc-pass2">
+<sect1 id="ch-tools-gcc-pass2" role="wrap">
 <title>GCC-&gcc-version; - Pass 2</title>
 <?dbhtml filename="gcc-pass2.html"?>
 
@@ -11,11 +11,17 @@
 <primary sortas="a-GCC">GCC</primary>
 <secondary>tools, pass 2</secondary></indexterm>
 
-<screen>&buildtime; 11.0 SBU
-&diskspace; 274 MB</screen>
+<sect2 role="package"><title/>
 
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>11.0 SBU</seg><seg>274 MB</seg></seglistitem>
+</segmentedlist>
 
-<sect2>
+</sect2>
+
+<sect2 role="installation">
 <title>Re-installation of GCC</title>
 
 <para>The tools required to test GCC and Binutils are installed now: Tcl,
@@ -90,32 +96,47 @@ variables that override the default optimization flags.</para>
 
 <para>The meaning of the new configure options:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--enable-clocale=gnu</userinput>: This option
+<variablelist>
+<varlistentry>
+<term><userinput>--enable-clocale=gnu</userinput></term>
+<listitem><para>This option
 ensures the correct locale model is selected for the C++ libraries under all
 circumstances. If the configure script finds the <emphasis>de_DE</emphasis>
 locale installed, it will select the correct <emphasis>gnu</emphasis> locale
 model. However, people who don't install the <emphasis>de_DE</emphasis> locale
 would run the risk of building ABI incompatible C++ libraries due to the wrong
 <emphasis>generic</emphasis> locale model being selected.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--enable-threads=posix</userinput>: This enables
+<varlistentry>
+<term><userinput>--enable-threads=posix</userinput></term>
+<listitem><para>This enables
 C++ exception handling for multi-threaded code.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--enable-__cxa_atexit</userinput>: This option
+<varlistentry>
+<term><userinput>--enable-__cxa_atexit</userinput></term>
+<listitem><para>This option
 allows use of __cxa_atexit, rather than atexit, to register C++ destructors for
 local statics and global objects and is essential for fully standards-compliant
 handling of destructors. It also affects the C++ ABI and therefore results in
 C++ shared libraries and C++ programs that are interoperable with other Linux
 distributions.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--enable-languages=c,c++</userinput>: This option
+<varlistentry>
+<term><userinput>--enable-languages=c,c++</userinput></term>
+<listitem><para>This option
 ensures that both the C and C++ compilers are built.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--disable-libstdcxx-pch</userinput>: Don't build the
+<varlistentry>
+<term><userinput>--disable-libstdcxx-pch</userinput></term>
+<listitem><para>Don't build the
 PCH (pre-compiled header) for libstdc++. It takes up a ton of space, and we
 have no use for it.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>Compile the package:</para>
 
@@ -164,7 +185,7 @@ GCC Specs patch.</para></note>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-gcc"/>.</para>
 </sect2>
 

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>
 

chapter05/glibc.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-glibc">
+<sect1 id="ch-tools-glibc" role="wrap">
 <title>Glibc-&glibc-version;</title>
 <?dbhtml filename="glibc.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Glibc">Glibc</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/glibc.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/glibc.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 11.8 SBU
-&diskspace; 800 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>11.8 SBU</seg><seg>800 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/glibc.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/glibc.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Glibc</title>
 
 <para>This package is known to behave badly when you change its default
@@ -46,38 +51,56 @@ cd ../glibc-build</userinput></screen>
 
 <para>The meaning of the configure options:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--disable-profile</userinput>: This builds the
+<variablelist>
+<varlistentry>
+<term><userinput>--disable-profile</userinput></term>
+<listitem><para>This builds the
 libraries without profiling information. Omit this option if you plan to do
-profiling on the temporary tools.</para></listitem> 
-
-<listitem><para><userinput>--enable-add-ons=nptl</userinput>: This
-tells Glibc to use the NPTL add-on as its threading library.</para></listitem>
-
-<listitem><para><userinput>--with-tls</userinput>: This tells Glibc to include
-support for TLS (thread-local storage).  This is required for NPTL to work.
-</para></listitem>
-
-<listitem><para><userinput>--with-binutils=/tools/bin</userinput>: Strictly
-speaking this switch is not required. But it does ensure nothing can go wrong
-with regard to what Binutils programs get used during the Glibc build.</para></listitem>
-
-<listitem><para><userinput>--without-gd</userinput>: This prevents the build
-of the <command>memusagestat</command> program, which strangely enough insists
-on linking against the host's libraries (libgd, libpng, libz, and so forth).
-</para></listitem>
-
-<listitem><para><userinput>--without-cvs</userinput>: This is meant to prevent
+profiling on the temporary tools.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><userinput>--enable-add-ons=nptl</userinput></term>
+<listitem><para>This tells Glibc to use the NPTL add-on as its threading 
+library.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><userinput>--with-tls</userinput></term>
+<listitem><para>This tells Glibc to include support for TLS (thread-local storage).
+This is required for NPTL to work. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><userinput>--with-binutils=/tools/bin</userinput></term>
+<listitem><para>Strictly speaking this switch is not required. But it does ensure 
+nothing can go wrong with regard to what Binutils programs get used during the 
+Glibc build.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><userinput>--without-gd</userinput></term>
+<listitem><para>This prevents the build of the <command>memusagestat</command>
+program, which strangely enough insists on linking against the host's libraries 
+(libgd, libpng, libz, and so forth). </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><userinput>--without-cvs</userinput></term>
+<listitem><para>This is meant to prevent
 the Makefiles from attempting automatic CVS checkouts when using a CVS
 snapshot. But it's not actually needed these days. We use it because it
 suppresses an annoying but harmless warning about a missing
 <command>autoconf</command> program.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--with-headers=/tools/glibc-kernheaders</userinput>:
-This tells Glibc to compile against the <quote>raw</quote> kernel headers, so
-that it knows exactly what features the kernel has, and can optimize itself
-accordingly.  Not strictly necessary, but nice to have.</para></listitem>
-</itemizedlist>
+<varlistentry>
+<term><userinput>--with-headers=/tools/glibc-kernheaders</userinput></term>
+<listitem><para>This tells Glibc to compile against the <quote>raw</quote> 
+kernel headers, so that it knows exactly what features the kernel has, and can 
+optimize itself accordingly.  Not strictly necessary, but nice to have.</para></listitem>
+</varlistentry>
+</variablelist>
 
 <para>During this stage you might see the following warning:</para>
 
@@ -193,7 +216,7 @@ localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-glibc"/>.</para>
 </sect2>
 

chapter05/grep.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-grep">
+<sect1 id="ch-tools-grep" role="wrap">
 <title>Grep-&grep-version;</title>
 <?dbhtml filename="grep.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Grep">Grep</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/grep.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/grep.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 5.8 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>5.8 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/grep.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/grep.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Grep</title>
 
 <para>Prepare Grep for compilation:</para>
@@ -29,15 +34,21 @@
 
 <para>The meaning of the configure options:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--disable-perl-regexp</userinput>: This makes sure
-that <command>grep</command> does not get linked against a PCRE library
-that may be present on the host and would not be available once we enter the
-chroot environment.</para></listitem>
-<listitem><para><userinput>--with-included-regex</userinput>: This ensures that
+<variablelist>
+<varlistentry>
+<term><userinput>--disable-perl-regexp</userinput></term>
+<listitem><para>This makes sure that <command>grep</command> does not 
+get linked against a PCRE library that may be present on the host and would not be 
+available once we enter the chroot environment.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><userinput>--with-included-regex</userinput></term>
+<listitem><para>This ensures that
 Grep uses its internal regular expression code. Without this switch, Grep will
 use the code from Glibc, which is known to be slightly buggy.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>Compile the programs:</para>
 
@@ -52,7 +63,7 @@ use the code from Glibc, which is known to be slightly buggy.</para></listitem>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-grep"/>.</para>
 </sect2>
 

chapter05/gzip.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-gzip">
+<sect1 id="ch-tools-gzip" role="wrap">
 <title>Gzip-&gzip-version;</title>
 <?dbhtml filename="gzip.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Gzip">Gzip</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gzip.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gzip.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 2.6 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>2.6 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gzip.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gzip.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Gzip</title>
 
 <para>Prepare Gzip for compilation:</para>
@@ -36,7 +41,7 @@
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-gzip"/>.</para>
 </sect2>
 

chapter05/kernel-headers.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-kernel-headers">
+<sect1 id="ch-tools-kernel-headers" role="wrap">
 <title>Linux-&linux-version; headers</title>
 <?dbhtml filename="kernel-headers.html"?>
 
@@ -11,11 +11,17 @@
 <primary sortas="a-Linux">Linux</primary>
 <secondary>tools, headers</secondary></indexterm>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 186 MB</screen>
+<sect2 role="package"><title/>
 
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>186 MB</seg></seglistitem>
+</segmentedlist>
 
-<sect2>
+</sect2>
+
+<sect2 role="installation">
 <title>Installation of the kernel headers</title>
 
 <para>As some packages need to refer to the kernel header files, we're going

chapter05/linux-libc-headers.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-linux-libc-headers">
+<sect1 id="ch-tools-linux-libc-headers" role="wrap">
 <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
 <?dbhtml filename="linux-libc-headers.html"?>
 
@@ -11,11 +11,17 @@
 <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
 <secondary>tools, headers</secondary></indexterm>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 22 MB</screen>
+<sect2 role="package"><title/>
 
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>22 MB</seg></seglistitem>
+</segmentedlist>
 
-<sect2>
+</sect2>
+
+<sect2 role="installation">
 <title>Installation of Linux-Libc-Headers</title>
 
 <para>For years it has been common practice to use so-called <quote>raw</quote>

chapter05/m4.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-m4" xreflabel="M4">
+<sect1 id="ch-tools-m4" xreflabel="M4" role="wrap">
 <title>M4-&m4-version;</title>
 <?dbhtml filename="m4.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-M4">M4</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/m4.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/m4.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 3.0 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>3.0 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/m4.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/m4.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of M4</title>
 
 <para>Prepare M4 for compilation:</para>
@@ -39,7 +44,7 @@
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-m4"/>.</para>
 </sect2>
 

chapter05/make.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-make">
+<sect1 id="ch-tools-make" role="wrap">
 <title>Make-&make-version;</title>
 <?dbhtml filename="make.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Make">Make</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/make.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/make.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 8.8 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>8.8 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/make.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/make.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Make</title>
 
 <para>Prepare Make for compilation:</para>
@@ -39,7 +44,7 @@
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-make"/>.</para>
 </sect2>
 

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>
 

chapter05/patch.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-patch">
+<sect1 id="ch-tools-patch" role="wrap">
 <title>Patch-&patch-version;</title>
 <?dbhtml filename="patch.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Patch">Patch</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/patch.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/patch.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 1.9 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>1.9 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/patch.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/patch.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Patch</title>
 
 <para>Prepare Patch for compilation (the preprocessor flag
@@ -38,7 +43,7 @@ other architectures you can leave it out):</para>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-patch"/>.</para>
 </sect2>
 

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>
 

chapter05/sed.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-sed">
+<sect1 id="ch-tools-sed" role="wrap">
 <title>Sed-&sed-version;</title>
 <?dbhtml filename="sed.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Sed">Sed</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/sed.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/sed.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 5.2 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>5.2 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/sed.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/sed.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Sed</title>
 
 <para>Prepare Sed for compilation:</para>
@@ -39,7 +44,7 @@
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-sed"/>.</para>
 </sect2>
 

chapter05/tar.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-tar">
+<sect1 id="ch-tools-tar" role="wrap">
 <title>Tar-&tar-version;</title>
 <?dbhtml filename="tar.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Tar">Tar</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/tar.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/tar.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 10 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>10 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/tar.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/tar.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Tar</title>
 
 <para>Prepare Tar for compilation:</para>
@@ -39,7 +44,7 @@
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-tar"/>.</para>
 </sect2>
 

chapter05/tcl.xml

@@ -3,23 +3,30 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-tcl" xreflabel="Tcl">
+<sect1 id="ch-tools-tcl" xreflabel="Tcl" role="wrap">
 <title>Tcl-&tcl-version;</title>
 <?dbhtml filename="tcl.html"?>
 
 <indexterm zone="ch-tools-tcl"><primary sortas="a-Tcl">Tcl</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Tcl package contains the Tool Command Language.</para>
 
-<screen>&buildtime; 0.9 SBU
-&diskspace; 23 MB</screen>
-
-<para>Tcl installation depends on: Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Sed.</para>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.9 SBU</seg><seg>23 MB</seg></seglistitem>
+</segmentedlist>
 
+<segmentedlist>
+<segtitle>Tcl 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 Tcl</title>
 
 <para>This package and the next two are only installed to support running the
@@ -53,38 +60,43 @@ will be given later on in <xref linkend="chapter-bootscripts"/>.</para>
 
 <screen><userinput>make install</userinput></screen>
 
-
 <warning><para><emphasis>Do not remove</emphasis> the
 <filename>tcl&tcl-version;</filename> source directory yet, as the next package
 will need its internal headers.</para></warning>
 
-
 <para>Now make a necessary symbolic link:</para>
 
 <screen><userinput>ln -s tclsh8.4 /tools/bin/tclsh</userinput></screen>
 
 </sect2>
 
+<sect2 id="contents-tcl" role="content"><title>Contents of Tcl</title>
 
-<sect2 id="contents-tcl"><title>Contents of Tcl</title>
-
-<para><emphasis>Installed programs</emphasis>: tclsh (link to tclsh8.4),
-tclsh8.4</para>
+<segmentedlist>
+<segtitle>Installed programs</segtitle>
+<segtitle>Installed library</segtitle>
+<seglistitem><seg>tclsh (link to tclsh8.4), tclsh8.4</seg><seg>libtcl8.4.so</seg></seglistitem>
+</segmentedlist>
 
-<para><emphasis>Installed library</emphasis>: libtcl8.4.so</para>
-
-</sect2>
-
-
-<sect2><title>Short descriptions</title>
+<variablelist><title>Short descriptions</title>
 
+<varlistentry>
+<term id="tclsh8.4"><command>tclsh8.4</command></term>
+<listitem>
 <indexterm zone="ch-tools-tcl tclsh8.4"><primary sortas="b-tclsh8.4">tclsh8.4</primary></indexterm>
-<para id="tclsh8.4"><command>tclsh8.4</command> is the Tcl command shell.</para>
+<para>is the Tcl command shell.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="libtcl8.4.so"><command>libtcl8.4.so</command></term>
+<listitem>
 <indexterm zone="ch-tools-tcl libtcl8.4.so"><primary sortas="c-libtcl8.4.so">libtcl8.4.so</primary></indexterm>
-<para id="libtcl8.4.so"><command>libtcl8.4.so</command> is the Tcl library.</para>
+<para>is the Tcl library.</para>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
 
-
 </sect1>

chapter05/texinfo.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-texinfo">
+<sect1 id="ch-tools-texinfo" role="wrap">
 <title>Texinfo-&texinfo-version;</title>
 <?dbhtml filename="texinfo.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Texinfo">Texinfo</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/texinfo.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/texinfo.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 16 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>16 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/texinfo.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/texinfo.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Texinfo</title>
 
 <para>Prepare Texinfo for compilation:</para>
@@ -39,7 +44,7 @@
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-texinfo"/>.</para>
 </sect2>
 

chapter05/udev.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-udev">
+<sect1 id="ch-tools-udev" role="wrap">
 <title>Udev-&udev-version;</title>
 <?dbhtml filename="udev.html"?>
 
@@ -11,18 +11,24 @@
 <primary sortas="a-Udev">Udev</primary>
 <secondary>tools</secondary></indexterm>
 
+<sect2 role="package"><title/>
 <!--
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/udev.xml" xpointer="xpointer(/sect1/para[1])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/udev.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
  -->
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 5.2 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>5.2 MB</seg></seglistitem>
+</segmentedlist>
 
 <!--
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/udev.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/udev.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
  -->
 
-<sect2>
+</sect2>
+
+<sect2 role="installation">
 <title>Installation of Udev</title>
 
 <para>By default, the permissions udev assigns to nodes are all uniform,
@@ -58,7 +64,7 @@ configuration files:</para>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-udev"/>.</para>
 </sect2>
 

chapter05/util-linux.xml

@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-util-linux">
+<sect1 id="ch-tools-util-linux" role="wrap">
 <title>Util-linux-&util-linux-version;</title>
 <?dbhtml filename="util-linux.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Util-linux">Util-linux</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/util-linux.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/util-linux.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 16 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>16 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/util-linux.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/util-linux.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Util-linux</title>
 
 <para>Util-linux has issues with the Linux 2.6 kernel series - fix these issues
@@ -53,7 +58,7 @@ make -C text-utils more</userinput></screen>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-utillinux"/>.</para>
 </sect2>
 </sect1>