Index: BOOK/final-system/mips64-64/adjusting.xml
===================================================================
--- BOOK/final-system/mips64-64/adjusting.xml	(revision 1234de32e9a734f9518760ba049009632ecfefef)
+++ BOOK/final-system/mips64-64/adjusting.xml	(revision 0ed34f44784e66d1698530f47f9e0b6963b44744)
@@ -14,8 +14,4 @@
   href="../mips/adjusting.xml"
   xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/adjusting.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
 
 <screen os="c"><userinput>gcc -dumpspecs | \
Index: BOOK/final-system/multilib/adjusting.xml
===================================================================
--- BOOK/final-system/multilib/adjusting.xml	(revision 0ed34f44784e66d1698530f47f9e0b6963b44744)
+++ BOOK/final-system/multilib/adjusting.xml	(revision 0ed34f44784e66d1698530f47f9e0b6963b44744)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-adjusting">
+  <?dbhtml filename="adjusting.html"?>
+
+  <title>Adjusting the Toolchain</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/adjusting.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="c"><userinput>gcc -dumpspecs | \
+perl -p -e 's@/tools/lib/ld@/lib/ld@g;' \
+     -e 's@/tools/lib64/ld@/lib64/ld@g;' \
+     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' > \
+     `dirname $(gcc --print-libgcc-file-name)`/specs</userinput></screen>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/adjusting.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
+
+  <para os="m1">Note that <filename class="directory">/lib</filename> or
+  <filename class="directory">/lib64</filename> is now the prefix
+  of our dynamic linker.</para>
+
+  <caution>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <para os="m2">For 32 bit ABI:</para>
+
+<screen os="m3"><userinput>echo 'main(){}' &gt; dummy.c
+cc ${BUILD32} dummy.c
+readelf -l a.out | grep ': /lib'</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <para os="m4">For 64 bit ABI:</para>
+
+<screen os="m5"><userinput>echo 'main(){}' &gt; dummy.c
+cc ${BUILD64} dummy.c
+readelf -l a.out | grep ': /lib'</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <para os="m7">Note that <filename class="directory">/lib</filename> or
+    <filename class="directory">/lib64</filename> is now the prefix
+    of our dynamic linker.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/adjusting.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+  </caution>
+
+</sect1>
Index: BOOK/final-system/ppc/adjusting.xml
===================================================================
--- BOOK/final-system/ppc/adjusting.xml	(revision 1234de32e9a734f9518760ba049009632ecfefef)
+++ BOOK/final-system/ppc/adjusting.xml	(revision 0ed34f44784e66d1698530f47f9e0b6963b44744)
@@ -13,8 +13,4 @@
   href="../common/adjusting.xml"
   xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision 1234de32e9a734f9518760ba049009632ecfefef)
+++ BOOK/final-system/sparc64-64-chapter.xml	(revision 0ed34f44784e66d1698530f47f9e0b6963b44744)
@@ -17,5 +17,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="adjusting/adjusting.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/adjusting.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
Index: OK/final-system/sparc64/adjusting.xml
===================================================================
--- BOOK/final-system/sparc64/adjusting.xml	(revision 1234de32e9a734f9518760ba049009632ecfefef)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../multilib/adjusting.xml"
-  xpointer="xpointer(//*[@os='m1'])"/>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m7'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: BOOK/final-system/x86_64/adjusting.xml
===================================================================
--- BOOK/final-system/x86_64/adjusting.xml	(revision 1234de32e9a734f9518760ba049009632ecfefef)
+++ BOOK/final-system/x86_64/adjusting.xml	(revision 0ed34f44784e66d1698530f47f9e0b6963b44744)
@@ -15,9 +15,7 @@
   xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="c"><userinput>gcc -dumpspecs | \
-perl -p -e 's@/tools/lib/ld@/lib/ld@g;' \
-     -e 's@/tools/lib64/ld@/lib64/ld@g;' \
-     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' > \
-     `dirname $(gcc --print-libgcc-file-name)`/specs</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../multilib/adjusting.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -25,7 +23,7 @@
   xpointer="xpointer(//*[@os='d'])"/>
 
-  <para os="m1">Note that <filename class="directory">/lib</filename> or
-  <filename class="directory">/lib64</filename> is now the prefix
-  of our dynamic linker.</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../multilib/adjusting.xml"
+  xpointer="xpointer(//*[@os='m1'])"/>
 
   <caution>
@@ -35,9 +33,11 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para os="m2">For 32 bit ABI:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/adjusting.xml"
+    xpointer="xpointer(//*[@os='m2'])"/>
 
-<screen os="m3"><userinput>echo 'main(){}' &gt; dummy.c
-cc ${BUILD32} dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/adjusting.xml"
+    xpointer="xpointer(//*[@os='m3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -49,9 +49,11 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <para os="m4">For 64 bit ABI:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/adjusting.xml"
+    xpointer="xpointer(//*[@os='m4'])"/>
 
-<screen os="m5"><userinput>echo 'main(){}' &gt; dummy.c
-cc ${BUILD64} dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/adjusting.xml"
+    xpointer="xpointer(//*[@os='m5'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -59,9 +61,9 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="m6"><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
+<screen><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
 
-    <para os="m7">Note that <filename class="directory">/lib</filename> or
-    <filename class="directory">/lib64</filename> is now the prefix
-    of our dynamic linker.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/adjusting.xml"
+    xpointer="xpointer(//*[@os='m7'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
