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, 32 insertions, 6 deletions

diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 62feb7904..930bd964a 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -7,8 +7,12 @@
 <title>Bash-&bash-version;</title>
 <?dbhtml filename="bash.html"?>
 
+<indexterm zone="ch-tools-bash">
+<primary sortas="a-Bash">Bash</primary>
+<secondary>tools</secondary></indexterm>
 
 <sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bash.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -16,12 +20,16 @@
 <seglistitem><seg>1.2 SBU</seg><seg>27 MB</seg></seglistitem>
 </segmentedlist>
 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/bash.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
+
 </sect2>
 
 <sect2 role="installation">
 <title>Installation of Bash</title>
 
-<para>Apply a patch:</para>
+<!-- Edit Me -->
+<para>Bash has a problem when compiled against newer versions of Glibc, causing
+it to hang inappropriately.  This patch fixes the problem:</para>
 
 <screen><userinput>patch -Np1 -i ../bash-&bash-version;-avoid_WCONTINUED-1.patch</userinput></screen>
 
@@ -29,21 +37,39 @@
 
 <screen><userinput>./configure --prefix=/tools --without-bash-malloc</userinput></screen>
 
-<para>Compile the program:</para>
+<para>The meaning of the configure option:</para>
+
+<variablelist>
+<varlistentry>
+<term><parameter>--without-bash-malloc</parameter></term>
+<listitem><para>This options turns off the use of Bash's memory
+allocation (malloc) function which is known to cause segmentation
+faults. By turning this option off, Bash will use the malloc functions
+from Glibc which are more stable.</para></listitem>
+</varlistentry>
+</variablelist>
+
+<para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue:
-<userinput>make test</userinput>.</para>
+<para>To test the results, issue: <userinput>make
+tests</userinput>.</para>
 
-<para>Then install it :</para>
+<para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>Create a symlink:</para>
+<para>Make a link for the programs that use <command>sh</command> for
+a shell:</para>
 
 <screen><userinput>ln -s bash /tools/bin/sh</userinput></screen>
 
 </sect2>
 
+<sect2 role="content"><title/>
+<para>Details on this package are located in <xref linkend="contents-bash" role="."/></para>
+</sect2>
+
 </sect1>
+