1 files changed, 35 insertions, 2 deletions
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index 7af37c4b6..6cc9ce553 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -7,7 +7,12 @@
 <title>Grep-&grep-version;</title>
 <?dbhtml filename="grep.html"?>
 
+<indexterm zone="ch-tools-grep">
+<primary sortas="a-Grep">Grep</primary>
+<secondary>tools</secondary></indexterm>
+
 <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])"/>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -15,6 +20,8 @@
 <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/sect2[1]/segmentedlist[2])"/>
+
 </sect2>
 
 <sect2 role="installation">
@@ -25,12 +32,32 @@
 <screen><userinput>./configure --prefix=/tools \
     --disable-perl-regexp --with-included-regex</userinput></screen>
 
+<para>The meaning of the configure options:</para>
+
+<variablelist>
+<varlistentry>
+<term><parameter>--disable-perl-regexp</parameter></term>
+<listitem><para>This makes sure that the <command>grep</command>
+program does not get linked against a Perl Compatible Regular
+Expression (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><parameter>--with-included-regex</parameter></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 buggy.</para></listitem>
+</varlistentry>
+</variablelist>
+
 <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue:
-<userinput>make check</userinput></para>
+<para>To test the results, issue: <userinput>make
+check</userinput>.</para>
 
 <para>Install the package:</para>
 
@@ -38,4 +65,10 @@
 
 </sect2>
 
+<sect2 role="content"><title/>
+<para>Details on this package are located in <xref
+linkend="contents-grep" role="."/></para>
+</sect2>
+
 </sect1>
+