Trunk is now identical to Testing

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

1 files changed, 41 insertions, 3 deletions

diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index 2753ceca4..2a526d400 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -3,13 +3,14 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-grep" xreflabel="Grep" role="wrap">
+<sect1 id="ch-system-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>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -17,6 +18,11 @@
 <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, and Texinfo</seg></seglistitem>
+</segmentedlist>
 </sect2>
 
 <sect2 role="installation">
@@ -33,7 +39,7 @@
 <para>To test the results, issue:
 <userinput>make check</userinput>.</para>
 
-<para>Now install the package:</para>
+<para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
@@ -42,8 +48,40 @@
 
 <sect2 id="contents-grep" role="content"><title>Contents of Grep</title>
 
-<para>See testing</para>
+<segmentedlist>
+<segtitle>Installed programs</segtitle>
+<seglistitem><seg>egrep (link to grep), fgrep (link to grep), and grep</seg></seglistitem>
+</segmentedlist>
+
+<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="egrep">
+<term><command>egrep</command></term>
+<listitem>
+<para>Prints lines matching an extended regular expression</para>
+<indexterm zone="ch-system-grep egrep"><primary sortas="b-egrep">egrep</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="fgrep">
+<term><command>fgrep</command></term>
+<listitem>
+<para>Prints lines matching a list of fixed strings</para>
+<indexterm zone="ch-system-grep fgrep"><primary sortas="b-fgrep">fgrep</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="grep">
+<term><command>grep</command></term>
+<listitem>
+<para>Prints lines matching a basic regular expression</para>
+<indexterm zone="ch-system-grep grep"><primary sortas="b-grep">grep</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
 
 </sect1>
+