Fix issues from the merge of the jh branch.

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

chapter01/changelog.xml

@@ -36,6 +36,15 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2012-04-26</para>
+      <itemizedlist>
+         <listitem>
+           <para>[ken] - tidy some minor issues from the merge.
+           </para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>2012-04-25</para>

chapter05/binutils-pass2.xml

@@ -67,7 +67,7 @@ RANLIB=$LFS_TGT-ranlib     \
       <title>The meaning of the new configure options:</title>
 
       <varlistentry>
-        <term><parameter>CC="$LFS_TGT-gcc" AR=$LFS_TGT-ar RANLIB=$LFS_TGT-ranlib</parameter></term>
+        <term><parameter>CC=$LFS_TGT-gcc AR=$LFS_TGT-ar RANLIB=$LFS_TGT-ranlib</parameter></term>
         <listitem>
           <para>Because this is really a native build of Binutils, setting these
           variables ensures that the build system uses the cross-compiler and

chapter05/gcc-pass2.xml

@@ -120,7 +120,7 @@ cd ../gcc-build</userinput></screen>
 
     <para>Now prepare GCC for compilation:</para>
 
-<screen><userinput remap="configure">CC="$LFS_TGT-gcc" \
+<screen><userinput remap="configure">CC=$LFS_TGT-gcc \
 AR=$LFS_TGT-ar                  \
 RANLIB=$LFS_TGT-ranlib          \
 ../gcc-&gcc-version;/configure          \

chapter06/adjusting.xml

@@ -5,22 +5,14 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-system-readjusting">
-  <?dbhtml filename="readjusting.html"?>
+<sect1 id="ch-system-adjusting">
+  <?dbhtml filename="adjusting.html"?>
 
-  <title>Re-adjusting the Toolchain</title>
+  <title>Adjusting the Toolchain</title>
 
   <para>Now that the final C libraries have been installed, it is time to adjust
-  the toolchain again. The toolchain will be adjusted so that it will link any
-  newly compiled program against these new libraries. This is a similar process
-  used in the <quote>Adjusting</quote> phase in the beginning of <xref
-  linkend="chapter-temporary-tools"/>, but with the adjustments reversed. In <xref
-  linkend="chapter-temporary-tools"/>, the chain was guided from the host's
-  <filename class="directory">/{,usr/}lib</filename> directories to the new
-  <filename class="directory">/tools/lib</filename> directory. Now, the chain will
-  be guided from that same <filename class="directory">/tools/lib</filename>
-  directory to the LFS <filename class="directory">/{,usr/}lib</filename>
-  directories.</para>
+  the toolchain so that it will link any
+  newly compiled program against these new libraries.</para>
 
   <para>First, backup the <filename class="directory">/tools</filename> linker,
   and replace it with the adjusted linker we made in chapter 5. We'll also create

general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120425">
-<!ENTITY releasedate "Apr 25, 2012">
+<!ENTITY version "SVN-20120426">
+<!ENTITY releasedate "Apr 26, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->