Remove redundant wording when checking toolchain values.

Reword bootscripts README file.
Remove reference to mudflap


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

6 files changed, 53 insertions, 42 deletions

diff --git a/bootscripts/README b/bootscripts/README
index 72e1eb5f3..b71b10a64 100644
--- a/bootscripts/README
+++ b/bootscripts/README
@@ -45,28 +45,30 @@ CleanFS configuration:
       /etc/rc.d/init.d/cleanfs
 
    Configuration Files:
-      /etc/sysconfig/createfiles or /etc/sysconfig/rc.site
-      Each line is parsed, using space as a deliminator.
-      [NAME] [TYPE] [PERMISSIONS] [USER] [GROUP]
-      The below fields are currently only used on dev type.
-      ([DEV TYPE] [MAJOR#] [MINOR#])
-      Name:
-         File/Directory/Device name
-      Type:
-         dir: creates a directory
-         file: creates a file
-         dev: creates a device
-      Permissions:
-         chmod the created file
-      User/Group:
-         chown the created file/dir to this user/group
-      Dev Type:
-         char:  character [needs MAJOR#, MINOR#]
-         block: block [needs MAJOR#, MINOR#]
-         pipe:  pipe
-      Major#:
-         Used by character and block devices.
-      Minor#:
-         Used by character and block devices.
+      /etc/sysconfig/rc.site
       - SKIPTMPCLEAN: skips cleaning of /tmp directory
 
+      /etc/sysconfig/createfiles 
+         Each line is parsed, using space as a deliminator.
+         [NAME] [TYPE] [PERMISSIONS] [USER] [GROUP]
+         The below fields are currently only used on dev type.
+         ([DEV TYPE] [MAJOR#] [MINOR#])
+         Name:
+            File/Directory/Device name
+         Type:
+            dir:  creates a directory
+            file: creates a file
+            dev:  creates a device
+         Permissions:
+            chmod the created file
+         User/Group:
+            chown the created file/dir to this user/group
+         Dev Type:
+            char:  character [needs MAJOR#, MINOR#]
+            block: block     [needs MAJOR#, MINOR#]
+            pipe:  pipe
+         Major#:
+            Used by character and block devices.
+         Minor#:
+            Used by character and block devices.
+
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 15f7b2396..c5802b020 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,20 @@
     </listitem>
 -->
     <listitem>
+      <para>2014-08-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Remove redundant wording in checking 
+          toolchain values.  Fixes 
+          <ulink url="&lfs-ticket-root;3654">#3654</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Reword bootscripts README file.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2014-08-14</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 49612eba7..f035784c9 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -196,12 +196,12 @@ cd ../gcc-build</userinput></screen>
       <varlistentry>
         <term><parameter>--disable-decimal-float, --disable-threads,
         --disable-libatomic, --disable-libgomp, --disable-libitm,
-        --disable-libmudflap, --disable-libquadmath, --disable-libsanitizer,
+        --disable-libquadmath, --disable-libsanitizer,
         --disable-libssp, --disable-libvtv, --disable-libcilkrts,
         --disable-libstdc++-v3</parameter></term>
         <listitem>
           <para>These switches disable support for the decimal floating point
-          extension, threading, libatomic, libgomp, libitm, libmudflap,
+          extension, threading, libatomic, libgomp, libitm, 
           libquadmath, libsanitizer, libssp, libvtv, libcilkrts
           and the C++ standard library respectively. These features will fail
           to compile when building a cross-compiler and are not necessary for
diff --git a/chapter06/adjusting.xml b/chapter06/adjusting.xml
index 933bebb44..f6b00971d 100644
--- a/chapter06/adjusting.xml
+++ b/chapter06/adjusting.xml
@@ -46,7 +46,7 @@ ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
 cc dummy.c -v -Wl,--verbose &amp;&gt; dummy.log
 readelf -l a.out | grep ': /lib'</userinput></screen>
 
-  <para os="b">If everything is working correctly, there should be no errors,
+  <para os="b">There should be no errors,
   and the output of the last command will be (allowing for
   platform-specific differences in dynamic linker name):</para>
 
@@ -59,8 +59,7 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
 
 <screen os="e"><userinput>grep -o '/usr/lib.*/crt[1in].*succeeded' dummy.log</userinput></screen>
 
-  <para os="f">If everything is working correctly, there should be no errors,
-    and the output of the last command will be:</para>
+  <para os="f">The output of the last command should be:</para>
 
 <screen><computeroutput>/usr/lib/crt1.o succeeded
 /usr/lib/crti.o succeeded
@@ -71,7 +70,7 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
 
 <screen><userinput>grep -B1 '^ /usr/include' dummy.log</userinput></screen>
 
-  <para os="h">This command should return successfully with the following output:</para>
+  <para os="h">This command should return the following output:</para>
 
 <screen><computeroutput>#include &lt;...&gt; search starts here:
  /usr/include</computeroutput></screen>
@@ -80,9 +79,7 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
 
 <screen os="j"><userinput>grep 'SEARCH.*/usr/lib' dummy.log |sed 's|; |\n|g'</userinput></screen>
 
-  <para os="k">If everything is working correctly, there should be no errors,
-  and the output of the last command
-  will be:</para>
+  <para os="k">The output of the last command should be:</para>
 
 <screen><computeroutput>SEARCH_DIR("/usr/lib")
 SEARCH_DIR("/lib");</computeroutput></screen>
@@ -91,9 +88,8 @@ SEARCH_DIR("/lib");</computeroutput></screen>
 
 <screen os="m"><userinput>grep "/lib.*/libc.so.6 " dummy.log</userinput></screen>
 
-  <para os="n">If everything is working correctly, there should be no errors,
-  and the output of the last command (allowing for a lib64 directory on 64-bit hosts)
-  will be:</para>
+  <para os="n">The output of the last command (allowing for a lib64 directory 
+  on 64-bit hosts) should be:</para>
 
 <screen os="o"><computeroutput>attempt to open /lib/libc.so.6 succeeded</computeroutput></screen>
 
@@ -101,10 +97,9 @@ SEARCH_DIR("/lib");</computeroutput></screen>
 
 <screen os="q"><userinput>grep found dummy.log</userinput></screen>
 
-  <para os="r">If everything is working correctly, there should be no errors,
-  and the output of the last command will be (allowing for
-  platform-specific differences in dynamic linker name and a lib64 directory
-  on 64-bit hosts):</para>
+  <para os="r"> The output of the last command should be (allowing for
+  platform-specific differences in dynamic linker name and a lib64 directory on
+  64-bit hosts):</para>
 
 <screen os="s"><computeroutput>found ld-linux.so.2 at /lib/ld-linux.so.2</computeroutput></screen>
 
diff --git a/general.ent b/general.ent
index 7e8983fa1..6a442a8a0 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "SVN-20140814">
+<!ENTITY version         "SVN-20140815">
 <!ENTITY short-version   "svn">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "August 14, 2014">
+<!ENTITY releasedate     "August 15, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.6">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 0c8d697f3..f36d0c6c1 100644
--- a/packages.ent
+++ b/packages.ent
@@ -370,7 +370,7 @@
 <!ENTITY less-ch6-du "3.6 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20140806">              <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20140815">              <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->