Text changes in several places in Chapters 5 and 6.

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

10 files changed, 42 insertions, 22 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 73a138530..4da0b7653 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,9 +40,18 @@
       <para>2008-10-30</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Added explanation for --disable-libssp to GCC
+          in Chapter 5.  Also expanded/added explanation on language selection 
+					for GCC in Chapters 5 and 6.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Wording changes to several text sections of Chapter 5. 
+          Thanks to Chris Staub for the patch.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Added a consolidated patch to perl to address security 
-					and othe rissues.  Canged the configure options for perl to define
-					a venor library location.</para>
+          and other issues.  Changed the configure options for perl to define
+          a vendor library location.</para>
         </listitem>
       </itemizedlist>
     </listitem>
diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml
index d36c0145f..61bf658cb 100644
--- a/chapter05/coreutils.xml
+++ b/chapter05/coreutils.xml
@@ -84,11 +84,11 @@
 <screen><userinput remap="install">make install</userinput></screen>
 
     <para>The above command refuses to install <filename>su</filename>
-    because it cannot install it setuid root as a non-privileged user. By
-    manually installing it with a different name, we can use it for running
-    tests in the final system as a non-privileged user and we keep a possibly
-    useful <command>su</command> from our host first place in our PATH. Install
-    it with:</para>
+    because the program cannot be installed setuid root as a non-privileged
+    user. By manually installing it with a different name, we can use it for
+    running tests in the final system as a non-privileged user and we keep a
+    possibly useful <command>su</command> from our host first in our PATH.
+    Install it with:</para>
 
 <screen><userinput remap="install">cp -v src/su /tools/bin/su-tools</userinput></screen>
 
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index bae0ed7d9..f9bd2843d 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -49,9 +49,8 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
 
-    <para>To test the results, issue:</para>
-
-<screen><userinput remap="test">make check</userinput></screen>
+    <para>This package does come with a test suite, however, it cannot be
+    run at this time because we do not have a C++ compiler yet.</para>
 
   </sect2>
 
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index aa9140192..c862d3f73 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -99,9 +99,18 @@ cd ../gcc-build</userinput></screen>
       </varlistentry>
 
       <varlistentry>
+        <term><parameter>--disable-libssp</parameter></term>
+        <listitem>
+          <para>This switch prevents a conflict with older versions of 
+          glibc which can cause the build to fail.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><parameter>--enable-languages=c</parameter></term>
         <listitem>
-          <para>This option ensures that only the C compiler is built.</para>
+          <para>This option ensures that only the C compiler is built.
+          This is the only language needed now.</para>
         </listitem>
       </varlistentry>
 
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 0bbab725b..98fd8b9ad 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -216,10 +216,6 @@ cd ../gcc-build</userinput></screen>
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>There is no need to use the <parameter>bootstrap</parameter> target
-    now because the compiler being used to compile this GCC was built from
-    the exact same version of the GCC sources used earlier.</para>
-
     <para>Compilation is now complete. As previously mentioned, running the test
     suites for the temporary tools compiled in this chapter is not mandatory.
     To run the GCC test suite anyway, use the following command:</para>
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index cb4cc2049..0b175073b 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -77,7 +77,11 @@
 
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>This package has a test suite, but it can only be run after the
+    package has been installed.  The tests reside in the
+    <filename class="directory">test/</filename> directory.  See the
+    <filename>README</filename> file in that directory for further details.
+    </para>
 
     <para>Install the package:</para>
 
diff --git a/chapter05/stripping.xml b/chapter05/stripping.xml
index 79b023fb4..3491237ac 100644
--- a/chapter05/stripping.xml
+++ b/chapter05/stripping.xml
@@ -18,9 +18,8 @@
 <screen><userinput>strip --strip-debug /tools/lib/*
 strip --strip-unneeded /tools/{,s}bin/*</userinput></screen>
 
-  <para>The last of the above commands will skip some twenty files,
-  reporting that it does not recognize their file format. Most of these
-  are scripts instead of binaries.</para>
+  <para>These commands will skip a number of files, reporting that it does not
+  recognize their file format. Most of these are scripts instead of binaries.</para>
 
   <para>Take care <emphasis>not</emphasis> to use
   <parameter>--strip-unneeded</parameter> on the libraries. The static
diff --git a/chapter05/toolchaintechnotes.xml b/chapter05/toolchaintechnotes.xml
index fc4d5d355..cc1f7242e 100644
--- a/chapter05/toolchaintechnotes.xml
+++ b/chapter05/toolchaintechnotes.xml
@@ -145,8 +145,8 @@ checking what linker to use... /tools/i686-pc-linux-gnu/bin/ld</computeroutput><
   through the end of this chapter will use the new dynamic linker in
   <filename class="directory">/tools/lib</filename>.</para>
 
-  <para>The need to use the new dynamic linker is also the reason why
-  the Specs patch is applied for the second pass of GCC. Failure to do
+  <para>For the second pass of GCC, its sources also need to be modified
+  to tell GCC to use the new dynamic linker. Failure to do
   so will result in the GCC programs themselves having the name of the
   dynamic linker from the host system's <filename
   class="directory">/lib</filename> directory embedded into them, which
diff --git a/chapter05/util-linux-ng.xml b/chapter05/util-linux-ng.xml
index e0badac56..80eafac5c 100644
--- a/chapter05/util-linux-ng.xml
+++ b/chapter05/util-linux-ng.xml
@@ -60,7 +60,7 @@ make -C text-utils more</userinput></screen>
         <term><parameter>BLKID_LIBS="-lblkid -luuid"</parameter></term>
         <listitem>
           <para>When building only a subset of the package, the
-          <filename class="libraryfile">libuuid.so</filename> library is not
+          <filename class="libraryfile">libuuid.a</filename> library is not
           pulled into the build as it is supposed to. This command overrides
           the default from the <filename>Makefile</filename>.</para>
         </listitem>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index c0c36dc3e..a01262a31 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -78,6 +78,10 @@ cd ../gcc-build</userinput></screen>
     --enable-clocale=gnu --enable-languages=c,c++ \
     --disable-bootstrap</userinput></screen>
 
+    <para>Note that for other languages, there are some prerequsites that
+    are not available.  See the BLFS Book for instructions on how to
+    build all the GCC supported languages.</para>
+
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>