HEAD: Retaged the introductori packages sections in chapter0{6,7,8}

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

49 files changed, 708 insertions, 415 deletions

diff --git a/chapter06/autoconf.xml b/chapter06/autoconf.xml
index 07b6b5cbe..7e6cc0151 100644
--- a/chapter06/autoconf.xml
+++ b/chapter06/autoconf.xml
@@ -3,23 +3,30 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-autoconf" xreflabel="Autoconf">
+<sect1 id="ch-system-autoconf" xreflabel="Autoconf" role="wrap">
 <title>Autoconf-&autoconf-version;</title>
 <?dbhtml filename="autoconf.html"?>
 
 <indexterm zone="ch-system-autoconf"><primary sortas="a-Autoconf">Autoconf</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Autoconf package contains programs for producing shell scripts that
 can automatically configure source code.</para>
 
-<screen>&buildtime; 0.5 SBU
-&diskspace; 7.7 MB</screen>
-
-<para>Autoconf installation depends on: Bash, Coreutils, Diffutils, Grep,
-M4, Make, Perl, Sed.</para>
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.5 SBU</seg><seg>7.7 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Autoconf installation depends on</segtitle>
+<seglistitem><seg>Bash, Coreutils, Diffutils, Grep,
+M4, Make, Perl, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Autoconf</title>
 
 <para>Prepare Autoconf for compilation:</para>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index e2e492719..606e3f742 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -3,24 +3,30 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-automake" xreflabel="Automake">
+<sect1 id="ch-system-automake" xreflabel="Automake" role="wrap">
 <title>Automake-&automake-version;</title>
 <?dbhtml filename="automake.html"?>
 
 <indexterm zone="ch-system-automake"><primary sortas="a-Automake">Automake</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Automake package contains programs for generating Makefiles for use
 with Autoconf.</para>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 6.8 MB</screen>
-
-<para>Automake installation depends on: Autoconf, Bash, Coreutils,
-Diffutils, Grep, M4, Make, Perl, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>6.8 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Automake installation depends on</segtitle>
+<seglistitem><seg>Autoconf, Bash, Coreutils,
+Diffutils, Grep, M4, Make, Perl, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Automake</title>
 
 <para>Prepare Automake for compilation:</para>
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 36baa30a5..7050853ff 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -3,22 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-bash" xreflabel="Bash">
+<sect1 id="ch-system-bash" xreflabel="Bash" role="wrap">
 <title>Bash-&bash-version;</title>
 <?dbhtml filename="bash.html"?>
 
 <indexterm zone="ch-system-bash"><primary sortas="a-Bash">Bash</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Bash package contains the Bourne-Again SHell.</para>
 
-<screen>Approximate build time:  1.2 SBU
-Required disk space:     27 MB</screen>
-
-<para>Bash installation depends on: Binutils, Coreutils, Diffutils, Gawk,
-GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>1.2 SBU</seg><seg>27 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Bash installation depends on</segtitle>
+<seglistitem><seg>Binutils, Coreutils, Diffutils, Gawk,
+GCC, Glibc, Grep, Make, Ncurses, Sed.</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Bash</title>
 
 <para>Bash has a number of bugs in it that cause it to not behave the 
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 9edbb24f2..d0eb862a6 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -3,24 +3,31 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-binutils" xreflabel="Binutils">
+<sect1 id="ch-system-binutils" xreflabel="Binutils" role="wrap">
 <title>Binutils-&binutils-version;</title>
 <?dbhtml filename="binutils.html"?>
 
 <indexterm zone="ch-system-binutils"><primary sortas="a-Binutils">Binutils</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Binutils package contains a linker, an assembler, and other tools for
 handling object files.</para>
 
-<screen>&buildtime; 1.4 SBU
-&diskspace; 167 MB</screen>
-
-<para>Binutils installation depends on: Bash, Coreutils, Diffutils, GCC, Gettext,
-Glibc, Grep, Make, Perl, Sed, Texinfo.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>1.4 SBU</seg><seg>167 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Binutils installation depends on</segtitle>
+<seglistitem><seg>Bash, Coreutils, Diffutils, GCC, Gettext,
+Glibc, Grep, Make, Perl, Sed, Texinfo</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2><title>Installation of Binutils</title>
+<sect2 role="installation">
+<title>Installation of Binutils</title>
 
 <para>Now is an appropriate time to verify that your pseudo terminals (PTYs) are
 working properly inside the chroot environment. We will again quickly check that
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index 64ed98ec5..562fcacf6 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-bison" xreflabel="Bison">
+<sect1 id="ch-system-bison" xreflabel="Bison" role="wrap">
 <title>Bison-&bison-version;</title>
 <?dbhtml filename="bison.html"?>
 
 <indexterm zone="ch-system-bison"><primary sortas="a-Bison">Bison</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Bison package contains a parser generator.</para>
 
-<screen>&buildtime; 0.6 SBU
-&diskspace; 10.6 MB</screen>
-
-<para>Bison installation depends on: Bash, Binutils, Coreutils, Diffutils,
-GCC, Gettext, Glibc, Grep, M4, Make, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.6 SBU</seg><seg>10.6 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Bison installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+GCC, Gettext, Glibc, Grep, M4, Make, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Bison</title>
 
 <para>Prepare Bison for compilation:</para>
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index d52cde737..742f63bff 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -3,25 +3,31 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-bzip2" xreflabel="Bzip2">
+<sect1 id="ch-system-bzip2" xreflabel="Bzip2" role="wrap">
 <title>Bzip2-&bzip2-version;</title>
 <?dbhtml filename="bzip2.html"?>
 
 <indexterm zone="ch-system-bzip2"><primary sortas="a-Bzip2">Bzip2</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Bzip2 package contains programs for compressing and decompressing
 files. On text files they achieve a much better compression than the
 traditional <command>gzip</command>.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 3.0 MB</screen>
-
-<para>Bzip2 installation depends on: Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Make.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>3.0 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Bzip2 installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+GCC, Glibc, Make</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Bzip2</title>
 
 <para>Prepare Bzip2 for compilation with:</para>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index c65ca6a34..2259585c6 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -3,24 +3,30 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-coreutils" xreflabel="Coreutils">
+<sect1 id="ch-system-coreutils" xreflabel="Coreutils" role="wrap">
 <title>Coreutils-&coreutils-version;</title>
 <?dbhtml filename="coreutils.html"?>
 
 <indexterm zone="ch-system-coreutils"><primary sortas="a-Coreutils">Coreutils</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Coreutils package contains utilities for showing and setting the
 basic system characteristics.</para>
 
-<screen>&buildtime; 0.9 SBU
-&diskspace; 69 MB</screen>
-
-<para>Coreutils installation depends on: Bash, Binutils, Coreutils, Diffutils, GCC,
-Gettext, Glibc, Grep, Make, Perl, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.9 SBU</seg><seg>69 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Coreutils installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils, GCC,
+Gettext, Glibc, Grep, Make, Perl, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Coreutils</title>
 
 <para>Normally the functionality of <command>uname</command> is somewhat
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index 845b83818..01a7d031c 100644
--- a/chapter06/diffutils.xml
+++ b/chapter06/diffutils.xml
@@ -3,24 +3,30 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-diffutils" xreflabel="Diffutils">
+<sect1 id="ch-system-diffutils" xreflabel="Diffutils" role="wrap">
 <title>Diffutils-&diffutils-version;</title>
 <?dbhtml filename="diffutils.html"?>
 
 <indexterm zone="ch-system-diffutils"><primary sortas="a-Diffutils">Diffutils</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Diffutils package contains programs that show the differences
 between files or directories.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 7.5 MB</screen>
-
-<para>Diffutils installation depends on: Bash, Binutils, Coreutils, Diffutils, GCC,
-Gettext, Glibc, Grep, Make, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>7.5 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Diffutils installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils, GCC,
+Gettext, Glibc, Grep, Make, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Diffutils</title>
 
 <para>Prepare Diffutils for compilation:</para>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 56828e140..f9195efcf 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -3,24 +3,30 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-e2fsprogs" xreflabel="E2fsprogs">
+<sect1 id="ch-system-e2fsprogs" xreflabel="E2fsprogs" role="wrap">
 <title>E2fsprogs-&e2fsprogs-version;</title>
 <?dbhtml filename="e2fsprogs.html"?>
 
 <indexterm zone="ch-system-e2fsprogs"><primary sortas="a-E2fsprogs">E2fsprogs</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The E2fsprogs package contains the utilities for handling the ext2
 file system. It also supports the ext3 journaling file system.</para>
 
-<screen>&buildtime; 0.6 SBU
-&diskspace; 48.4 MB</screen>
-
-<para>E2fsprogs installation depends on: Bash, Binutils, Coreutils,
-Diffutils, Gawk, GCC, Gettext, Glibc, Grep, Make, Sed, Texinfo.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.6 SBU</seg><seg>48.4 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>E2fsprogs installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils,
+Diffutils, Gawk, GCC, Gettext, Glibc, Grep, Make, Sed, Texinfo</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of E2fsprogs</title>
 
 <para>Prepare E2fsprogs for compilation:</para>
diff --git a/chapter06/file.xml b/chapter06/file.xml
index 4b4bb8cd0..88c5ef383 100644
--- a/chapter06/file.xml
+++ b/chapter06/file.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-file" xreflabel="File">
+<sect1 id="ch-system-file" xreflabel="File" role="wrap">
 <title>File-&file-version;</title>
 <?dbhtml filename="file.html"?>
 
 <indexterm zone="ch-system-file"><primary sortas="a-File">File</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The File package contains a utility for determining the type of files.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 6.3 MB</screen>
-
-<para>File installation depends on: Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Sed, Zlib.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>6.3 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>File installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+GCC, Glibc, Grep, Make, Sed, Zlib</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of File</title>
 
 <para>Prepare File for compilation:</para>
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index 82000777c..f0e7030e4 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -3,26 +3,32 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-findutils" xreflabel="Findutils">
+<sect1 id="ch-system-findutils" xreflabel="Findutils" role="wrap">
 <title>Findutils-&findutils-version;</title>
 <?dbhtml filename="findutils.html"?>
 
 <indexterm zone="ch-system-findutils"><primary sortas="a-Findutils">Findutils</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Findutils package contains programs to find files. Processes
 are provided to recursively search through a directory tree and to
 create, maintain and search a database (often faster than the recursive
 find, but unreliable if the database has not been recently updated).</para>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 7.5 MB</screen>
-
-<para>Findutils installation depends on: Bash, Binutils, Coreutils,
-Diffutils, GCC, Gettext, Glibc, Grep, Make, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>7.5 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Findutils installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils,
+Diffutils, GCC, Gettext, Glibc, Grep, Make, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Findutils</title>
 
 <para>Prepare Findutils for compilation:</para>
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 34f0fbc1e..855238aa6 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -3,24 +3,30 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-flex" xreflabel="Flex">
+<sect1 id="ch-system-flex" xreflabel="Flex" role="wrap">
 <title>Flex-&flex-version;</title>
 <?dbhtml filename="flex.html"?>
 
 <indexterm zone="ch-system-flex"><primary sortas="a-Flex">Flex</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Flex package contains a utility for generating programs that
 recognize patterns in text.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 3.4 MB</screen>
-
-<para>Flex installation depends on: Bash, Binutils, Bison, Coreutils, Diffutils,
-GCC, Gettext, Glibc, Grep, M4, Make, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>3.4 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Flex installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Bison, Coreutils, Diffutils,
+GCC, Gettext, Glibc, Grep, M4, Make, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Flex</title>
 
 <para>Flex contains several known bugs. Fix these with the following patch:</para>
diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml
index 8eea05d14..99420f0b8 100644
--- a/chapter06/gawk.xml
+++ b/chapter06/gawk.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-gawk" xreflabel="Gawk">
+<sect1 id="ch-system-gawk" xreflabel="Gawk" role="wrap">
 <title>Gawk-&gawk-version;</title>
 <?dbhtml filename="gawk.html"?>
 
 <indexterm zone="ch-system-gawk"><primary sortas="a-Gawk">Gawk</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Gawk package contains programs for manipulating text files.</para>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 17 MB</screen>
-
-<para>Gawk installation depends on: Bash, Binutils, Coreutils,
-Diffutils, GCC, Gettext, Glibc, Grep, Make, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>17 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Gawk installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils,
+Diffutils, GCC, Gettext, Glibc, Grep, Make, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Gawk</title>
 
 <para>Prepare Gawk for compilation:</para>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 73e4cab92..79dcc7974 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -3,24 +3,30 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-gcc" xreflabel="GCC">
+<sect1 id="ch-system-gcc" xreflabel="GCC" role="wrap">
 <title>GCC-&gcc-version;</title>
 <?dbhtml filename="gcc.html"?>
 
 <indexterm zone="ch-system-gcc"><primary sortas="a-GCC">GCC</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The GCC package contains the GNU compiler collection, which includes
 the C and C++ compilers.</para>
 
-<screen>&buildtime; 11.7 SBU
-&diskspace; 294 MB</screen>
-
-<para>GCC installation depends on: Bash, Binutils, Coreutils, Diffutils, Findutils,
-Gawk, Gettext, Glibc, Grep, Make, Perl, Sed, Texinfo.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>11.7 SBU</seg><seg>294 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>GCC installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils, Findutils,
+Gawk, Gettext, Glibc, Grep, Make, Perl, Sed, Texinfo</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of GCC</title>
 
 <para>This package is known to behave badly when you have changed its
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index 9c3b449cd..09f139014 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -3,25 +3,31 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-gettext" xreflabel="Gettext">
+<sect1 id="ch-system-gettext" xreflabel="Gettext" role="wrap">
 <title>Gettext-&gettext-version;</title>
 <?dbhtml filename="gettext.html"?>
 
 <indexterm zone="ch-system-gettext"><primary sortas="a-Gettext">Gettext</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Gettext package contains utilities for internationalization and
 localization. These allow programs to be compiled with Native Language Support
 (NLS), enabling them to output messages in the user's native language.</para>
 
-<screen>&buildtime; 0.5 SBU
-&diskspace; 55 MB</screen>
-
-<para>Gettext installation depends on: Bash, Binutils, Bison, Coreutils,
-Diffutils, Gawk, GCC, Glibc, Grep, Make, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.5 SBU</seg><seg>55 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Gettext installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Bison, Coreutils,
+Diffutils, Gawk, GCC, Glibc, Grep, Make, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Gettext</title>
 
 <para>Prepare Gettext for compilation:</para>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index a6e3c3d71..cc59f02c0 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -3,26 +3,32 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-glibc" xreflabel="Glibc">
+<sect1 id="ch-system-glibc" xreflabel="Glibc" role="wrap">
 <title>Glibc-&glibc-version;</title>
 <?dbhtml filename="glibc.html"?>
 
 <indexterm zone="ch-system-glibc"><primary sortas="a-Glibc">Glibc</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Glibc package contains the main C library. This library provides all
 the basic routines for allocating memory, searching directories, opening and
 closing files, reading and writing them, string handling, pattern matching,
 arithmetic, and so on.</para>
 
-<screen>&buildtime; 12.3 SBU
-&diskspace; 784 MB</screen>
-
-<para>Glibc installation depends on: Bash, Binutils, Coreutils, Diffutils,
-Gawk, GCC, Gettext, Grep, Make, Perl, Sed, Texinfo.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>12.3 SBU</seg><seg>784 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Glibc installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+Gawk, GCC, Gettext, Grep, Make, Perl, Sed, Texinfo</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Glibc</title>
 
 <para>The Glibc build system is very well self-contained and will install
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index 5e7c5a58a..344fb0700 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-grep" xreflabel="Grep">
+<sect1 id="ch-system-grep" xreflabel="Grep" role="wrap">
 <title>Grep-&grep-version;</title>
 <?dbhtml filename="grep.html"?>
 
 <indexterm zone="ch-system-grep"><primary sortas="a-Grep">Grep</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Grep package contains programs for searching through files.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 5.8 MB</screen>
-
-<para>Grep installation depends on: Bash, Binutils, Coreutils,
-Diffutils, GCC, Gettext, Glibc, Make, Sed, Texinfo.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>5.8 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Grep installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils,
+Diffutils, GCC, Gettext, Glibc, Make, Sed, Texinfo</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Grep</title>
 
 <para>Prepare Grep for compilation:</para>
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index 7e48a9456..5ad0f34b0 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-groff" xreflabel="Groff">
+<sect1 id="ch-system-groff" xreflabel="Groff" role="wrap">
 <title>Groff-&groff-version;</title>
 <?dbhtml filename="groff.html"?>
 
 <indexterm zone="ch-system-groff"><primary sortas="a-Groff">Groff</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Groff package contains programs for processing and formatting text.</para>
 
-<screen>&buildtime; 0.5 SBU
-&diskspace; 43 MB</screen>
-
-<para>Groff installation depends on: Bash, Binutils, Coreutils, Diffutils,
-Gawk, GCC, Glibc, Grep, Make, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.5 SBU</seg><seg>43 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Groff installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+Gawk, GCC, Glibc, Grep, Make, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Groff</title>
 
 <para>Groff expects the environment variable PAGE to contain the default paper
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index 3abecc041..1195d3292 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-grub" xreflabel="Grub">
+<sect1 id="ch-system-grub" xreflabel="Grub" role="wrap">
 <title>Grub-&grub-version;</title>
 <?dbhtml filename="grub.html"?>
 
 <indexterm zone="ch-system-grub"><primary sortas="a-Grub">Grub</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Grub package contains the GRand Unified Bootloader.</para>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 10 MB</screen>
-
-<para>Grub installation depends on: Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>10 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Grub installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+GCC, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Grub</title>
 
 <para>This package is known to behave badly when you have changed its default
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 3b609ac7d..419005823 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -3,24 +3,30 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-gzip" xreflabel="Gzip">
+<sect1 id="ch-system-gzip" xreflabel="Gzip" role="wrap">
 <title>Gzip-&gzip-version;</title>
 <?dbhtml filename="gzip.html"?>
 
 <indexterm zone="ch-system-gzip"><primary sortas="a-Gzip">Gzip</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Gzip package contains programs for compressing and decompressing
 files.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 2.6 MB</screen>
-
-<para>Gzip installation 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>2.6 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Gzip 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 Gzip</title>
 
 <para>Prepare Gzip for compilation:</para>
diff --git a/chapter06/iana-etc.xml b/chapter06/iana-etc.xml
index e83ec168c..b1b3b1420 100644
--- a/chapter06/iana-etc.xml
+++ b/chapter06/iana-etc.xml
@@ -3,22 +3,26 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-iana-etc" xreflabel="Iana-Etc">
+<sect1 id="ch-system-iana-etc" xreflabel="Iana-Etc" role="wrap">
 <title>Iana-Etc-&iana-etc-version;</title>
 <?dbhtml filename="iana-etc.html"?>
 
 <indexterm zone="ch-system-iana-etc"><primary sortas="a-Iana-Etc">Iana-Etc</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Iana-Etc package provides data for network services and protocols.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 641 KB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>641 KB</seg></seglistitem>
+</segmentedlist>
 
 <para>The installation dependencies for Iana-Etc haven't been checked yet.</para>
 
+</sect2>
 
-
-<sect2>
+<sect2 role="installation">
 <title>Installation of Iana-Etc</title>
 
 <para>Parse the data:</para>
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index a68f78abd..954ce8f6d 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-inetutils" xreflabel="Inetutils">
+<sect1 id="ch-system-inetutils" xreflabel="Inetutils" role="wrap">
 <title>Inetutils-&inetutils-version;</title>
 <?dbhtml filename="inetutils.html"?>
 
 <indexterm zone="ch-system-inetutils"><primary sortas="a-Inetutils">Inetutils</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Inetutils package contains programs for basic networking.</para>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 11 MB</screen>
-
-<para>Inetutils installation depends on: Bash, Binutils, Coreutils,
-Diffutils, GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>11 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Inetutils installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils,
+Diffutils, GCC, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Inetutils</title>
 
 <para>Inetutils has issues with the Linux 2.6 kernel series - fix these isues
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index edc0abb1a..574cb181e 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-kbd" xreflabel="Kbd">
+<sect1 id="ch-system-kbd" xreflabel="Kbd" role="wrap">
 <title>Kbd-&kbd-version;</title>
 <?dbhtml filename="kbd.html"?>
 
 <indexterm zone="ch-system-kbd"><primary sortas="a-Kbd">Kbd</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Kbd package contains key-table files and keyboard utilities.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 12 MB</screen>
-
-<para>Kbd installation depends on: Bash, Binutils, Bison, Coreutils,
-Diffutils, Flex, GCC, Gettext, Glibc, Grep, Gzip, M4, Make, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>12 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Kbd installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Bison, Coreutils,
+Diffutils, Flex, GCC, Gettext, Glibc, Grep, Gzip, M4, Make, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Kbd</title>
 
 <para>Prepare Kbd for compilation:</para>
diff --git a/chapter06/less.xml b/chapter06/less.xml
index e404cc8fa..f855c9e85 100644
--- a/chapter06/less.xml
+++ b/chapter06/less.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-less" xreflabel="Less">
+<sect1 id="ch-system-less" xreflabel="Less" role="wrap">
 <title>Less-&less-version;</title>
 <?dbhtml filename="less.html"?>
 
 <indexterm zone="ch-system-less"><primary sortas="a-Less">Less</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Less package contains a text file viewer.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 3.4 MB</screen>
-
-<para>Less installation depends on: Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>3.4 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Less installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+GCC, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Less</title>
 
 <para>Prepare Less for compilation:</para>
diff --git a/chapter06/libtool.xml b/chapter06/libtool.xml
index 0cd065c3b..5c212f9e2 100644
--- a/chapter06/libtool.xml
+++ b/chapter06/libtool.xml
@@ -3,25 +3,31 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-libtool" xreflabel="Libtool">
+<sect1 id="ch-system-libtool" xreflabel="Libtool" role="wrap">
 <title>Libtool-&libtool-version;</title>
 <?dbhtml filename="libtool.html"?>
 
 <indexterm zone="ch-system-libtool"><primary sortas="a-Libtool">Libtool</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Libtool package contains the GNU generic library support script.
 It wraps the complexity of using shared libraries in a consistent, portable
 interface.</para>
 
-<screen>&buildtime; 1.5 SBU
-&diskspace; 20 MB</screen>
-
-<para>Libtool installation depends on: Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>1.5 SBU</seg><seg>20 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Libtool 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 Libtool</title>
 
 <para>Prepare Libtool for compilation:</para>
diff --git a/chapter06/linux-libc-headers.xml b/chapter06/linux-libc-headers.xml
index 03cf0ecaa..487f09798 100644
--- a/chapter06/linux-libc-headers.xml
+++ b/chapter06/linux-libc-headers.xml
@@ -3,19 +3,25 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-linux-libc-headers">
+<sect1 id="ch-system-linux-libc-headers" role="wrap">
 <title>Linux-Libc-Headers-&linux-libc-headers-version;</title>
 <?dbhtml filename="linux-libc-headers.html"?>
 
 <indexterm zone="ch-system-linux-libc-headers">
 <primary sortas="a-Linux-Libc-Headers">Linux-Libc-Headers</primary>
-<secondary>system, headers</secondary></indexterm>
+</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>
diff --git a/chapter06/m4.xml b/chapter06/m4.xml
index 1ca0a6861..72e2b2d56 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-m4" xreflabel="M4">
+<sect1 id="ch-system-m4" xreflabel="M4" role="wrap">
 <title>M4-&m4-version;</title>
 <?dbhtml filename="m4.html"?>
 
 <indexterm zone="ch-system-m4"><primary sortas="a-M4">M4</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The M4 package contains a macro processor.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 3.0 MB</screen>
-
-<para>M4 installation depends on: Bash, Binutils, Coreutils, Diffutils, GCC,
-Gettext, Glibc, Grep, Make, Perl, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>3.0 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>M4 installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils, GCC,
+Gettext, Glibc, Grep, Make, Perl, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of M4</title>
 
 <para>Prepare M4 for compilation:</para>
diff --git a/chapter06/make.xml b/chapter06/make.xml
index 99b4d57bf..82ce7671b 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-make" xreflabel="Make">
+<sect1 id="ch-system-make" xreflabel="Make" role="wrap">
 <title>Make-&make-version;</title>
 <?dbhtml filename="make.html"?>
 
 <indexterm zone="ch-system-make"><primary sortas="a-Make">Make</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Make package contains a program for compiling large packages.</para>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 8.8 MB</screen>
-
-<para>Make installation depends on: Bash, Binutils, Coreutils, Diffutils,
-GCC, Gettext, Glibc, Grep, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>8.8 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Make installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+GCC, Gettext, Glibc, Grep, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Make</title>
 
 <para>Prepare Make for compilation:</para>
diff --git a/chapter06/man-pages.xml b/chapter06/man-pages.xml
index 755522fa5..ae5d0dca5 100644
--- a/chapter06/man-pages.xml
+++ b/chapter06/man-pages.xml
@@ -3,22 +3,28 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-man-pages" xreflabel="Man-pages">
+<sect1 id="ch-system-man-pages" xreflabel="Man-pages" role="wrap">
 <title>Man-pages-&man-pages-version;</title>
 <?dbhtml filename="man-pages.html"?>
 
 <indexterm zone="ch-system-man-pages"><primary sortas="a-Man-pages">Man-pages</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Man-pages package contains over 1200 manual pages.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 15 MB</screen>
-
-<para>For its installation Man-pages depends on: Bash, Coreutils, Make.</para>
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>15 MB</seg></seglistitem>
+</segmentedlist>
 
+<segmentedlist>
+<segtitle>For its installation Man-pages depends on</segtitle>
+<seglistitem><seg>Bash, Coreutils, Make</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Man-pages</title>
 
 <para>Install Man-pages by running:</para>
diff --git a/chapter06/man.xml b/chapter06/man.xml
index 8f58f14e7..a1de7a956 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-man" xreflabel="Man">
+<sect1 id="ch-system-man" xreflabel="Man" role="wrap">
 <title>Man-&man-version;</title>
 <?dbhtml filename="man.html"?>
 
 <indexterm zone="ch-system-man"><primary sortas="a-Man">Man</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Man package contains programs for finding and viewing manual pages.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 1.9MB</screen>
-
-<para>Man installation depends on: Bash, Binutils, Coreutils, Gawk, GCC,
-Glibc, Grep, Make, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>1.9MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Man installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Gawk, GCC,
+Glibc, Grep, Make, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Man</title>
 
 <para>We'll make three adjustments to the sources of Man.</para>
diff --git a/chapter06/mktemp.xml b/chapter06/mktemp.xml
index 90087d771..0640f1afb 100644
--- a/chapter06/mktemp.xml
+++ b/chapter06/mktemp.xml
@@ -3,23 +3,27 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-mktemp" xreflabel="Mktemp">
+<sect1 id="ch-system-mktemp" xreflabel="Mktemp" role="wrap">
 <title>Mktemp-&mktemp-version;</title>
 <?dbhtml filename="mktemp.html"?>
 
 <indexterm zone="ch-system-mktemp"><primary sortas="a-Mktemp">Mktemp</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Mktemp package contains programs used to create secure temporary
 files in shell scripts.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 317 KB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>317 KB</seg></seglistitem>
+</segmentedlist>
 
 <para>The installation dependencies for Mktemp haven't been checked yet.</para>
 
+</sect2>
 
-
-<sect2>
+<sect2 role="installation">
 <title>Installation of Mktemp</title>
 
 <para>Many scripts still use the deprecated <command>tempfile</command>
diff --git a/chapter06/module-init-tools.xml b/chapter06/module-init-tools.xml
index a98fe2773..150d93dfb 100644
--- a/chapter06/module-init-tools.xml
+++ b/chapter06/module-init-tools.xml
@@ -3,23 +3,30 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-module-init-tools" xreflabel="Module-Init-Tools">
+<sect1 id="ch-system-module-init-tools" xreflabel="Module-Init-Tools" role="wrap">
 <title>Module-Init-Tools-&module-init-tools-version;</title>
 <?dbhtml filename="module-init-tools.html"?>
 
 <indexterm zone="ch-system-module-init-tools"><primary sortas="a-Module-Init-Tools">Module-Init-Tools</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Module-Init-Tools package contains programs for handling kernel
 modules in Linux kernels greater than or equal to version 2.5.47.</para>
 
-<screen>&buildtime; 0.1 SBU
-&buildtime; 650 KB</screen>
-
-<para>Module-Init-Tools installation depends on: Bash, Binutils, Bison,
-Coreutils, Diffutils, Flex, GCC, Glibc, Grep, M4, Make, Sed.</para>
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>650 KB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Module-Init-Tools installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Bison,
+Coreutils, Diffutils, Flex, GCC, Glibc, Grep, M4, Make, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Module-Init-Tools</title>
 
 <para>Prepare Module-Init-Tools for compilation:</para>
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 4be199096..686ea1a0c 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -3,24 +3,30 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-ncurses" xreflabel="Ncurses">
+<sect1 id="ch-system-ncurses" xreflabel="Ncurses" role="wrap">
 <title>Ncurses-&ncurses-version;</title>
 <?dbhtml filename="ncurses.html"?>
 
 <indexterm zone="ch-system-ncurses"><primary sortas="a-Ncurses">Ncurses</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Ncurses package contains libraries for terminal-independent
 handling of character screens.</para>
 
-<screen>&buildtime; 0.6 SBU
-&diskspace; 27 MB</screen>
-
-<para>Ncurses installation depends on: Bash, Binutils, Coreutils, Diffutils,
-Gawk, GCC, Glibc, Grep, Make, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.6 SBU</seg><seg>27 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Ncurses installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+Gawk, GCC, Glibc, Grep, Make, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Ncurses</title>
 
 <para>Prepare Ncurses for compilation:</para>
diff --git a/chapter06/net-tools.xml b/chapter06/net-tools.xml
index 98864daa5..6a55a1dcc 100644
--- a/chapter06/net-tools.xml
+++ b/chapter06/net-tools.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-net-tools" xreflabel="Net-tools">
+<sect1 id="ch-system-net-tools" xreflabel="Net-tools" role="wrap">
 <title>Net-tools-&net-tools-version;</title>
 <?dbhtml filename="net-tools.html"?>
 
 <indexterm zone="ch-system-net-tools"><primary sortas="a-Net-tools">Net-tools</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Net-tools package contains programs for basic networking.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 9.4 MB</screen>
-
-<para>Net-tools installation depends on: Bash, Binutils, Coreutils, GCC,
-Glibc, Make.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>9.4 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Net-tools installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, GCC,
+Glibc, Make</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Net-tools</title>
 
 <para>If you don't know what to answer to all the questions asked during the
diff --git a/chapter06/patch.xml b/chapter06/patch.xml
index 081d36278..052af9315 100644
--- a/chapter06/patch.xml
+++ b/chapter06/patch.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-patch" xreflabel="Patch">
+<sect1 id="ch-system-patch" xreflabel="Patch" role="wrap">
 <title>Patch-&patch-version;</title>
 <?dbhtml filename="patch.html"?>
 
 <indexterm zone="ch-system-patch"><primary sortas="a-Patch">Patch</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Patch package contains a program for modifying files.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 1.9 MB</screen>
-
-<para>Patch installation 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>1.9 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Patch 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 Patch</title>
 
 <para>Prepare Patch for compilation (the preprocessor flag
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 62aa4d9bf..b0ab6cbbb 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-perl" xreflabel="Perl">
+<sect1 id="ch-system-perl" xreflabel="Perl" role="wrap">
 <title>Perl-&perl-version;</title>
 <?dbhtml filename="perl.html"?>
 
 <indexterm zone="ch-system-perl"><primary sortas="a-Perl">Perl</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Perl package contains the Practical Extraction and Report Language.</para>
 
-<screen>&buildtime; 2.9 SBU
-&diskspace; 143 MB</screen>
-
-<para>Perl installation depends on: Bash, Binutils, Coreutils, Diffutils,
-Gawk, GCC, Glibc, Grep, Make, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>2.9 SBU</seg><seg>143 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Perl installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+Gawk, GCC, Glibc, Grep, Make, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Perl</title>
 
 <para>If you want full control over the way Perl is set up, you can run the
diff --git a/chapter06/procps.xml b/chapter06/procps.xml
index 8ab64a1e4..be44ace51 100644
--- a/chapter06/procps.xml
+++ b/chapter06/procps.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-procps" xreflabel="Procps">
+<sect1 id="ch-system-procps" xreflabel="Procps" role="wrap">
 <title>Procps-&procps-version;</title>
 <?dbhtml filename="procps.html"?>
 
 <indexterm zone="ch-system-procps"><primary sortas="a-Procps">Procps</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Procps package contains programs for monitoring processes.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 6.2 MB</screen>
-
-<para>Procps installation depends on: Bash, Binutils, Coreutils, GCC, Glibc,
-Make, Ncurses.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>6.2 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Procps installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, GCC, Glibc,
+Make, Ncurses</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Procps</title>
 
 <para>Compile Procps:</para>
diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index b69f91ea1..dff3897cd 100644
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@@ -3,24 +3,30 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-psmisc" xreflabel="Psmisc">
+<sect1 id="ch-system-psmisc" xreflabel="Psmisc" role="wrap">
 <title>Psmisc-&psmisc-version;</title>
 <?dbhtml filename="psmisc.html"?>
 
 <indexterm zone="ch-system-psmisc"><primary sortas="a-Psmisc">Psmisc</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Psmisc package contains programs for displaying information on
 processes.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 2.2 MB</screen>
-
-<para>Psmisc installation depends on: Bash, Binutils, Coreutils, Diffutils,
-GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>2.2 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Psmisc installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Psmisc</title>
 
 <para>Prepare Psmisc for compilation:</para>
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index 7105a4afa..f69af4fe0 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -3,22 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-readline" xreflabel="Readline">
+<sect1 id="ch-system-readline" xreflabel="Readline" role="wrap">
 <title>Readline-&readline-version;</title>
 <?dbhtml filename="readline.html"?>
 
 <indexterm zone="ch-system-readline"><primary sortas="a-Readline">Readline</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Readline package contains the Readline command-line library.</para>
 
-<screen>&buildtime; XXX SBU
-&diskspace; 3.8 MB</screen>
-
-<para>Readline installation depends on: Binutils, Coreutils, Diffutils, Gawk,
-GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>XXX SBU</seg><seg>3.8 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Readline installation depends on</segtitle>
+<seglistitem><seg>Binutils, Coreutils, Diffutils, Gawk,
+GCC, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Readline</title>
 
 <para>Readline has a number of bugs in it that cause it to not behave the 
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index 2b32b6f42..a37aea312 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-sed" xreflabel="Sed">
+<sect1 id="ch-system-sed" xreflabel="Sed" role="wrap">
 <title>Sed-&sed-version;</title>
 <?dbhtml filename="sed.html"?>
 
 <indexterm zone="ch-system-sed"><primary sortas="a-Sed">Sed</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Sed package contains a stream editor.</para>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 5.2 MB</screen>
-
-<para>Sed installation depends on: Bash, Binutils, Coreutils,
-Diffutils, GCC, Gettext, Glibc, Grep, Make, Texinfo.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>5.2 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Sed installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils,
+Diffutils, GCC, Gettext, Glibc, Grep, Make, Texinfo</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Sed</title>
 
 <para>Prepare Sed for compilation:</para>
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 2bae866ce..d8ba3bb25 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -3,24 +3,30 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-shadow" xreflabel="Shadow">
+<sect1 id="ch-system-shadow" xreflabel="Shadow" role="wrap">
 <title>Shadow-&shadow-version;</title>
 <?dbhtml filename="shadow.html"?>
 
 <indexterm zone="ch-system-shadow"><primary sortas="a-Shadow">Shadow</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Shadow package contains programs for handling passwords in a secure
 way.</para>
 
-<screen>&buildtime; 0.4 SBU
-&diskspace; 11 MB</screen>
-
-<para>Shadow installation depends on: Bash, Binutils, Bison, Coreutils,
-Diffutils, GCC, Gettext, Glibc, Grep, Make, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.4 SBU</seg><seg>11 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Shadow installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Bison, Coreutils,
+Diffutils, GCC, Gettext, Glibc, Grep, Make, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Shadow</title>
 
 <para>Prepare Shadow for compilation:</para>
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index 409021b75..7ef354519 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -3,22 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-sysklogd" xreflabel="Sysklogd">
+<sect1 id="ch-system-sysklogd" xreflabel="Sysklogd" role="wrap">
 <title>Sysklogd-&sysklogd-version;</title>
 <?dbhtml filename="sysklogd.html"?>
 
 <indexterm zone="ch-system-sysklogd"><primary sortas="a-Sysklogd">Sysklogd</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Sysklogd package contains programs for logging system messages, such
 as those given by the kernel when unusual things happen.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 0.5 MB</screen>
-
-<para>Sysklogd installation depends on: Binutils, Coreutils, GCC, Glibc, Make.</para>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>0.5 MB</seg></seglistitem>
+</segmentedlist>
 
+<segmentedlist>
+<segtitle>Sysklogd installation depends on</segtitle>
+<seglistitem><seg>Binutils, Coreutils, GCC, Glibc, Make</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Sysklogd</title>
 
 <para>Sysklogd has issues with the Linux 2.6 kernel series - fix these isues
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 4494a269a..8c3cb6c8e 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-sysvinit" xreflabel="Sysvinit">
+<sect1 id="ch-system-sysvinit" xreflabel="Sysvinit" role="wrap">
 <title>Sysvinit-&sysvinit-version;</title>
 <?dbhtml filename="sysvinit.html"?>
 
 <indexterm zone="ch-system-sysvinit"><primary sortas="a-Sysvinit">Sysvinit</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Sysvinit package contains programs for controlling the startup,
 running, and shutdown of your system.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 0.9 MB</screen>
-
-<para>Sysvinit installation depends on: Binutils, Coreutils, GCC, Glibc, Make.</para>
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg> 0.9 MB</seg></seglistitem>
+</segmentedlist>
 
+<segmentedlist>
+<segtitle>Sysvinit installation depends on</segtitle>
+<seglistitem><seg>Binutils, Coreutils, GCC, Glibc, Make</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Sysvinit</title>
 
 <para>When run-levels are changed (for example, when halting the system),
diff --git a/chapter06/tar.xml b/chapter06/tar.xml
index 089ab91e6..f8a8a856e 100644
--- a/chapter06/tar.xml
+++ b/chapter06/tar.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-tar" xreflabel="Tar">
+<sect1 id="ch-system-tar" xreflabel="Tar" role="wrap">
 <title>Tar-&tar-version;</title>
 <?dbhtml filename="tar.html"?>
 
 <indexterm zone="ch-system-tar"><primary sortas="a-Tar">Tar</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Tar package contains an archiving program.</para>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 10 MB</screen>
-
-<para>Tar installation depends on: Bash, Binutils, Coreutils,
-Diffutils, GCC, Gettext, Glibc, Grep, Make, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>10 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Tar installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils,
+Diffutils, GCC, Gettext, Glibc, Grep, Make, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Tar</title>
 
 <para>Prepare Tar for compilation:</para>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index a2a672d84..ea985184e 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -3,24 +3,30 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-texinfo" xreflabel="Texinfo">
+<sect1 id="ch-system-texinfo" xreflabel="Texinfo" role="wrap">
 <title>Texinfo-&texinfo-version;</title>
 <?dbhtml filename="texinfo.html"?>
 
 <indexterm zone="ch-system-texinfo"><primary sortas="a-Texinfo">Texinfo</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Texinfo package contains programs for reading, writing, and
 converting Info documents.</para>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 17 MB</screen>
-
-<para>Texinfo installation depends on: Bash, Binutils, Coreutils,
-Diffutils, GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>17 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Texinfo installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils,
+Diffutils, GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Texinfo</title>
 
 <para>Prepare Texinfo for compilation:</para>
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index aba37b85f..13ea69a28 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -3,19 +3,23 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-udev">
+<sect1 id="ch-system-udev" role="wrap">
 <title>Udev-&udev-version;</title>
 <?dbhtml filename="udev.html"?>
 
-<indexterm zone="ch-system-udev">
-<primary sortas="a-Udev">Udev</primary>
-<secondary>system</secondary></indexterm>
+<indexterm zone="ch-system-udev"><primary sortas="a-Udev">Udev</primary></indexterm>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 5.2 MB</screen>
+<sect2 role="package"><title/>
 
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>5.2 MB</seg></seglistitem>
+</segmentedlist>
 
-<sect2>
+</sect2>
+
+<sect2 role="installation">
 <title>Installation of Udev</title>
 
 <para>By default, the permissions udev assigns to nodes are all uniform,
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 8695e36ab..01c553d31 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -3,25 +3,31 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-util-linux" xreflabel="Util-linux">
+<sect1 id="ch-system-util-linux" xreflabel="Util-linux" role="wrap">
 <title>Util-linux-&util-linux-version;</title>
 <?dbhtml filename="util-linux.html"?>
 
 <indexterm zone="ch-system-util-linux"><primary sortas="a-Util-linux">Util-linux</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Util-linux package contains miscellaneous utility programs. Among
 them are utilities for handling file systems, consoles, partitions, and
 messages.</para>
 
-<screen>&buildtime; 0.2 SBU
-&diskspace; 16 MB</screen>
-
-<para>Util-linux installation depends on: Bash, Binutils, Coreutils,
-Diffutils, GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed, Zlib.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.2 SBU</seg><seg>16 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Util-linux installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils,
+Diffutils, GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed, Zlib</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>FHS compliance notes</title>
 
 <para>The FHS recommends that we use <filename>/var/lib/hwclock</filename>,
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 288fdd99d..4a74b90b8 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -3,21 +3,27 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-vim" xreflabel="Vim">
+<sect1 id="ch-system-vim" xreflabel="Vim" role="wrap">
 <title>Vim-&vim-version;</title>
 <?dbhtml filename="vim.html"?>
 
 <indexterm zone="ch-system-vim"><primary sortas="a-Vim">Vim</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Vim package contains a powerful text editor.</para>
 
-<screen>&buildtime; 0.4 SBU
-&diskspace; 34 MB</screen>
-
-<para>Vim installation depends on: Bash, Binutils, Coreutils, Diffutils,
-GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
-
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.4 SBU</seg><seg>34 MB</seg></seglistitem>
+</segmentedlist>
+
+<segmentedlist>
+<segtitle>Vim installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+GCC, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
 <sect2>
 <title>Alternatives to Vim</title>
@@ -26,8 +32,7 @@ have a look at <ulink url="&blfs-root;view/stable/postlfs/editors.html"/> for
 suggested installation instructions.</para>
 </sect2>
 
-
-<sect2>
+<sect2 role="installation">
 <title>Installation of Vim</title>
 
 <para>First change the default locations of the <filename>vimrc</filename> and
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index 9059de651..f7c585a33 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -3,23 +3,29 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-zlib" xreflabel="Zlib">
+<sect1 id="ch-system-zlib" xreflabel="Zlib" role="wrap">
 <title>Zlib-&zlib-version;</title>
 <?dbhtml filename="zlib.html"?>
 
 <indexterm zone="ch-system-zlib"><primary sortas="a-Zlib">Zlib</primary></indexterm>
 
+<sect2 role="package"><title/>
 <para>The Zlib package contains compression and un-compression routines used by
 some programs.</para>
 
-<screen>&buildtime; 0.1 SBU
-&diskspace; 1.5 MB</screen>
-
-<para>Zlib installation depends on: Binutils, Coreutils, GCC, Glibc, Make, Sed.</para>
-
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>0.1 SBU</seg><seg>1.5 MB</seg></seglistitem>
+</segmentedlist>
 
+<segmentedlist>
+<segtitle>Zlib installation depends on</segtitle>
+<seglistitem><seg>Binutils, Coreutils, GCC, Glibc, Make, Sed</seg></seglistitem>
+</segmentedlist>
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Zlib</title>
 
 <note><para>Zlib is known to build its shared library incorrectly if CFLAGS is