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

1 files changed, 45 insertions, 25 deletions

diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 24d1cbcac..d3f63773d 100644
--- a/chapter05/expect.xml
+++ b/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>