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, 25 insertions, 14 deletions

diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index 1ef32505a..0a357a6eb 100644
--- a/chapter05/grep.xml
+++ b/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>