Merge changes developed and tested in the jh branch

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

3 files changed, 23 insertions, 23 deletions

diff --git a/chapter06/readjusting.xml b/chapter06/adjusting.xml
index 695a6d684..695a6d684 100644
--- a/chapter06/readjusting.xml
+++ b/chapter06/adjusting.xml
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 0ea2347f4..71a37a182 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -20,7 +20,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-pages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="readjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="adjusting.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils.xml"/>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index c18eb1404..1bec4066d 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -156,27 +156,27 @@ cd ../gcc-build</userinput></screen>
     the same sanity checks as we did earlier in the chapter:</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
 <screen><computeroutput>/usr/lib/gcc/i686-pc-linux-gnu/&gcc-version;/../../../crt1.o succeeded
@@ -193,13 +193,13 @@ cd ../gcc-build</userinput></screen>
   <filename class="directory">/usr/lib</filename> directory.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
 <screen><userinput>grep -B4 '^ /usr/include' dummy.log</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
 <screen><computeroutput>#include &lt;...&gt; search starts here:
@@ -217,15 +217,15 @@ cd ../gcc-build</userinput></screen>
     directory is required to be in place.</para></note>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='k'])"/>
 
 <screen><computeroutput>SEARCH_DIR("/usr/i686-pc-linux-gnu/lib")
@@ -246,47 +246,47 @@ SEARCH_DIR("/lib")
 SEARCH_DIR("/usr/lib");</computeroutput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='m'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='n'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='o'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='p'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='q'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='r'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='s'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='t'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='u'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="readjusting.xml"
+    href="adjusting.xml"
     xpointer="xpointer(//*[@os='v'])"/>
 
     <para>Finally, move a misplaced file:</para>