Index: introduction/common/changelog.xml
===================================================================
--- introduction/common/changelog.xml	(revision 193b7dd3407860fe7afc77107cd7a7b51a0ebb6b)
+++ introduction/common/changelog.xml	(revision e7732d7b03e6eb5f0a8d67ba290bd67e6d3a1ba3)
@@ -43,4 +43,7 @@
           <para>[jim] - Text updates to final-system.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Text updates to temp-tools.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: temp-tools/64/perl-64bit.xml
===================================================================
--- temp-tools/64/perl-64bit.xml	(revision 193b7dd3407860fe7afc77107cd7a7b51a0ebb6b)
+++ temp-tools/64/perl-64bit.xml	(revision e7732d7b03e6eb5f0a8d67ba290bd67e6d3a1ba3)
@@ -25,40 +25,40 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' \
+<screen os="d"><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' \
    -Dcc="gcc ${BUILD64}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
Index: temp-tools/64/tcl-64bit.xml
===================================================================
--- temp-tools/64/tcl-64bit.xml	(revision 193b7dd3407860fe7afc77107cd7a7b51a0ebb6b)
+++ temp-tools/64/tcl-64bit.xml	(revision e7732d7b03e6eb5f0a8d67ba290bd67e6d3a1ba3)
@@ -30,10 +30,6 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>cd unix
+<screen os="c"><userinput>cd unix
 CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -52,4 +48,8 @@
     href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: temp-tools/common/dejagnu.xml
===================================================================
--- temp-tools/common/dejagnu.xml	(revision 193b7dd3407860fe7afc77107cd7a7b51a0ebb6b)
+++ temp-tools/common/dejagnu.xml	(revision e7732d7b03e6eb5f0a8d67ba290bd67e6d3a1ba3)
@@ -35,11 +35,11 @@
     <title>Installation of DejaGNU</title>
 
-    <para>Prepare DejaGNU for compilation:</para>
+    <para os="a">Prepare DejaGNU for compilation:</para>
 
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/tools</userinput></screen>
 
-    <para>Build and install the package:</para>
+    <para os="c">Build and install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="d"><userinput>make install</userinput></screen>
 
   </sect2>
Index: temp-tools/common/expect.xml
===================================================================
--- temp-tools/common/expect.xml	(revision 193b7dd3407860fe7afc77107cd7a7b51a0ebb6b)
+++ temp-tools/common/expect.xml	(revision e7732d7b03e6eb5f0a8d67ba290bd67e6d3a1ba3)
@@ -42,8 +42,8 @@
     <para os="c">Now prepare Expect for compilation:</para>
 
-<screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
+<screen os="d"><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
    --with-tclinclude=/tools/include --with-x=no</userinput></screen>
 
-    <variablelist os="d">
+    <variablelist os="e">
       <title>The meaning of the configure options:</title>
 
@@ -78,9 +78,9 @@
     </variablelist>
 
-    <para os="e">Build the package:</para>
+    <para os="f">Build the package:</para>
 
-<screen os="f"><userinput>make</userinput></screen>
+<screen os="g"><userinput>make</userinput></screen>
 
-    <para os="g">To test the results, issue: <userinput>make test</userinput>.
+    <para os="h">To test the results, issue: <userinput>make test</userinput>.
     Note that the Expect test suite is known to experience failures under
     certain host conditions that are not within our control. Therefore,
@@ -88,9 +88,9 @@
     critical.</para>
 
-    <para os="h">Install the package:</para>
+    <para os="i">Install the package:</para>
 
-<screen os="i"><userinput>make SCRIPTS="" install</userinput></screen>
+<screen os="j"><userinput>make SCRIPTS="" install</userinput></screen>
 
-    <variablelist os="j">
+    <variablelist os="k">
       <title>The meaning of the make parameter:</title>
 
Index: temp-tools/common/perl.xml
===================================================================
--- temp-tools/common/perl.xml	(revision 193b7dd3407860fe7afc77107cd7a7b51a0ebb6b)
+++ temp-tools/common/perl.xml	(revision e7732d7b03e6eb5f0a8d67ba290bd67e6d3a1ba3)
@@ -23,15 +23,15 @@
     <title>Installation of Perl</title>
 
-    <para os="aa">First adapt some hard-wired paths to the C library by applying
+    <para os="a">First adapt some hard-wired paths to the C library by applying
     the following patch:</para>
 
-<screen os="ab"><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
+<screen os="b"><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
 
-    <para os="ac">Prepare Perl for compilation (make sure to get the 'Data/Dumper
+    <para os="c">Prepare Perl for compilation (make sure to get the 'Data/Dumper
     IO Fcntl POSIX' part of the command correct&mdash;they are all letters):</para>
 
-<screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX'</userinput></screen>
+<screen os="d"><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX'</userinput></screen>
 
-    <variablelist os="ad">
+    <variablelist os="e">
       <title>The meaning of the configure option:</title>
 
@@ -47,10 +47,10 @@
     </variablelist>
 
-    <para os="ae">Only a few of the utilities contained in this package need to be
+    <para os="f">Only a few of the utilities contained in this package need to be
     built:</para>
 
-<screen os="af"><userinput>make perl utilities</userinput></screen>
+<screen os="g"><userinput>make perl utilities</userinput></screen>
 
-    <para os="ag">Although Perl comes with a test suite, it is not recommended to
+    <para os="h">Although Perl comes with a test suite, it is not recommended to
     run it at this point. Only part of Perl was built and running
     <userinput>make test</userinput> now will cause the rest of Perl to be
@@ -58,7 +58,7 @@
     be run in the next chapter if desired.</para>
 
-    <para os="ah">Install these tools and their libraries:</para>
+    <para os="i">Install these tools and their libraries:</para>
 
-<screen os="ai"><userinput>cp perl pod/pod2man /tools/bin
+<screen os="j"><userinput>cp perl pod/pod2man /tools/bin
 install -d /tools/lib/perl5/&perl-version;
 cp -R lib/* /tools/lib/perl5/&perl-version;</userinput></screen>
Index: temp-tools/common/tcl.xml
===================================================================
--- temp-tools/common/tcl.xml	(revision 193b7dd3407860fe7afc77107cd7a7b51a0ebb6b)
+++ temp-tools/common/tcl.xml	(revision e7732d7b03e6eb5f0a8d67ba290bd67e6d3a1ba3)
@@ -44,12 +44,12 @@
     <para os="b">Prepare Tcl for compilation:</para>
 
-<screen><userinput>cd unix
+<screen os="c"><userinput>cd unix
 ./configure --prefix=/tools</userinput></screen>
 
-    <para os="c">Build the package:</para>
+    <para os="d">Build the package:</para>
 
-<screen os="d"><userinput>make</userinput></screen>
+<screen os="e"><userinput>make</userinput></screen>
 
-    <para os="e">To test the results, issue: <userinput>TZ=UTC make
+    <para os="f">To test the results, issue: <userinput>TZ=UTC make
     test</userinput>. The Tcl test suite is known to experience failures
     under certain host conditions that are not fully understood.
@@ -62,7 +62,7 @@
     <xref linkend="chapter-bootscripts"/>.</para>
 
-    <para os="f">Install the package:</para>
+    <para os="g">Install the package:</para>
 
-<screen os="g"><userinput>make install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
 
     <para os="i">Now we will install the TCL headers into /tools.</para>
Index: temp-tools/common/texinfo.xml
===================================================================
--- temp-tools/common/texinfo.xml	(revision 193b7dd3407860fe7afc77107cd7a7b51a0ebb6b)
+++ temp-tools/common/texinfo.xml	(revision e7732d7b03e6eb5f0a8d67ba290bd67e6d3a1ba3)
@@ -27,13 +27,13 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>./configure --prefix=/tools</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+<screen os="b"><userinput>./configure --prefix=/tools</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/texinfo.xml"
     xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/texinfo.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: temp-tools/multilib/perl.xml
===================================================================
--- temp-tools/multilib/perl.xml	(revision 193b7dd3407860fe7afc77107cd7a7b51a0ebb6b)
+++ temp-tools/multilib/perl.xml	(revision e7732d7b03e6eb5f0a8d67ba290bd67e6d3a1ba3)
@@ -23,5 +23,5 @@
     <title>Installation of Perl</title>
 
-    <para os="a0a">We need a working Perl to build glibc and test coreutils, it
+    <para os="m1">We need a working Perl to build glibc and test coreutils, it
     doesn't matter whether this is a 32-bit or a 64-bit program. But, the perl
     configure process knows nothing about multilib and assumes it will be installed
@@ -29,5 +29,5 @@
     easily install into <filename class="directory">/tools/lib</filename>.</para>
 
-    <para os="a0b">Installing successfully into a different directory such as
+    <para os="m2">Installing successfully into a different directory such as
     <filename class="directory">/tools/lib64</filename> would require more effort
    (compare how we install Perl in the final system) for no real gain. On this
@@ -38,40 +38,40 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' \
+<screen os="d"><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' \
    -Dcc="gcc ${BUILD32}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
Index: temp-tools/multilib/tcl-64bit.xml
===================================================================
--- temp-tools/multilib/tcl-64bit.xml	(revision 193b7dd3407860fe7afc77107cd7a7b51a0ebb6b)
+++ temp-tools/multilib/tcl-64bit.xml	(revision e7732d7b03e6eb5f0a8d67ba290bd67e6d3a1ba3)
@@ -26,15 +26,14 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
+    <para os="m1">We need to change the default lib path to lib64:</para>
+
+<screen os="m2"><userinput>cd unix
+sed -i 's@\$(prefix)/lib@\$(prefix)/lib64@g' Makefile.in</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>cd unix
-sed -i 's@\$(prefix)/lib@\$(prefix)/lib64@g' Makefile.in
-CC="gcc ${BUILD64}" ./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -53,4 +52,8 @@
     href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: temp-tools/multilib/texinfo.xml
===================================================================
--- temp-tools/multilib/texinfo.xml	(revision 193b7dd3407860fe7afc77107cd7a7b51a0ebb6b)
+++ temp-tools/multilib/texinfo.xml	(revision e7732d7b03e6eb5f0a8d67ba290bd67e6d3a1ba3)
@@ -27,13 +27,13 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/texinfo.xml"
     xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
