Automatic merge of trunk into multilib

appendices/dependencies.xml

@@ -244,7 +244,7 @@
       <segmentedlist id="bc-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, and Make</seg>
+          <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, and Readline</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2615,7 +2615,7 @@
       <segmentedlist id="readline-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Bash and Gawk</seg>
+          <seg>Bash, Bc, and Gawk</seg>
         </seglistitem>
       </segmentedlist>
 

bootscripts/lfs/init.d/cleanfs

@@ -105,7 +105,7 @@ case "${1}" in
       (exit ${failed})
       evaluate_retval
 
-      if egrep -qv '^(#|$)' /etc/sysconfig/createfiles 2>/dev/null; then
+      if grep -E -qv '^(#|$)' /etc/sysconfig/createfiles 2>/dev/null; then
          log_info_msg "Creating files and directories... "
          create_files      # Always returns 0
          evaluate_retval

bootscripts/lfs/init.d/modules

@@ -35,7 +35,7 @@ case "${1}" in
       # Exit if there's no modules file or there are no
       # valid entries
       [ -r /etc/sysconfig/modules ]             || exit 0
-      egrep -qv '^($|#)' /etc/sysconfig/modules || exit 0
+      grep -E -qv '^($|#)' /etc/sysconfig/modules || exit 0
 
       log_info_msg "Loading modules:"
 

chapter08/bc.xml

@@ -43,7 +43,7 @@
 
     <para>Prepare Bc for compilation:</para>
 
-<screen><userinput remap="configure">CC=gcc ./configure --prefix=/usr -G -O3</userinput></screen>
+<screen><userinput remap="configure">CC=gcc ./configure --prefix=/usr -G -O3 -r</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -55,6 +55,14 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>-G</parameter></term>
+        <listitem>
+          <para>Omit parts of the test suite that won't work
+          without a GNU bc present.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><parameter>-O3</parameter></term>
         <listitem>
@@ -63,10 +71,10 @@
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>-G</parameter></term>
+        <term><parameter>-r</parameter></term>
         <listitem>
-          <para>Omit  parts of the test suite that won't work
+          <para>Enable the use of <application>Readline</application> to
-          without a GNU bc present.</para>
+          improve the line editing feature of bc.</para>
         </listitem>
       </varlistentry>
     </variablelist>

chapter08/grep.xml

@@ -77,7 +77,8 @@
       <varlistentry id="egrep">
         <term><command>egrep</command></term>
         <listitem>
-          <para>Prints lines matching an extended regular expression</para>
+          <para>Prints lines matching an extended regular expression.
+          It is obsoleted, use <command>grep -E</command> instead</para>
           <indexterm zone="ch-system-grep egrep">
             <primary sortas="b-egrep">egrep</primary>
           </indexterm>
@@ -87,7 +88,8 @@
       <varlistentry id="fgrep">
         <term><command>fgrep</command></term>
         <listitem>
-          <para>Prints lines matching a list of fixed strings</para>
+          <para>Prints lines matching a list of fixed strings.
+          It is obsoleted, use <command>grep -F</command> instead</para>
           <indexterm zone="ch-system-grep fgrep">
             <primary sortas="b-fgrep">fgrep</primary>
           </indexterm>

chapter08/openssl.xml

@@ -201,8 +201,11 @@ rm -rf DESTDIR</userinput></screen>
         <term><command>c_rehash</command></term>
         <listitem>
           <para>
-            is a <application>Perl</application> script that scans all files in
+            is a <application>Perl</application> script that
-            a directory and adds symbolic links to their hash values
+            scans all files in a directory and adds symbolic links to their
+            hash values.  Use of <command>c_rehash</command> is considered
+            obsolete and should be replaced by
+            <command>openssl rehash</command> command
           </para>
           <indexterm zone="ch-system-openssl c_rehash">
             <primary sortas="b-c_rehash">c_rehash</primary>