Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 443cace8ce11238d6509c09ba9f3d7f7901d2d4b)
+++ chapter01/changelog.xml	(revision 51fe2150ea982ef1b9f20f4387a2c77313727b13)
@@ -51,4 +51,8 @@
 </listitem>
 
+<listitem><para>January 16th, 2004 [greg]: Expanded the Locking in Glibc and
+Re-adjusting the toolchain sections to also catch missing cc->gcc symlink and
+provide more help for when things go wrong.</para></listitem>
+
 <listitem><para>January 16th, 2004 [greg]: Implemented changes to make the
 running of the Chapter 5 test suites strictly optional i.e. the default action
Index: chapter05/chapter05.xml
===================================================================
--- chapter05/chapter05.xml	(revision 443cace8ce11238d6509c09ba9f3d7f7901d2d4b)
+++ chapter05/chapter05.xml	(revision 51fe2150ea982ef1b9f20f4387a2c77313727b13)
@@ -463,6 +463,8 @@
 
 <para>We recommend that you cut-and-paste the above rather than try and type it
-all in. Or you can edit the specs file by hand if you want to: just replace any
-occurrence of "/lib/ld-linux.so.2" with "/tools/lib/ld-linux.so.2".</para>
+all in. Or you can edit the specs file by hand if you want to: just replace the
+occurrence of "/lib/ld-linux.so.2" with "/tools/lib/ld-linux.so.2". Be sure to
+visually inspect the specs file to verify the intended change was actually
+made.</para>
 
 <important><para>If you are working on a platform where the name of the dynamic
@@ -488,5 +490,5 @@
 
 <screen><userinput>echo 'main(){}' &gt; dummy.c
-gcc dummy.c
+cc dummy.c
 readelf -l a.out | grep ': /tools'</userinput></screen>
 
@@ -496,13 +498,21 @@
 <blockquote><screen>[Requesting program interpreter: /tools/lib/ld-linux.so.2]</screen></blockquote>
 
-<para>If you did not receive the output as shown above, or received no output at
-all, then something is seriously wrong. You will need to investigate and retrace
-your steps to find out where the problem is and correct it. There is no point in
-continuing until this is done. Most likely something went wrong with the specs
-file amendment above. Note especially that <filename>/tools/lib</filename>
-appears as the prefix of our dynamic linker. Of course, if you are working on a
-platform where the name of the dynamic linker is something other than
-<filename>ld-linux.so.2</filename>, then the output will be slightly
-different.</para>
+<para>(Of course allowing for platform specific differences in dynamic linker
+name). Note especially that <filename class="directory">/tools/lib</filename>
+appears as the prefix of our dynamic linker. If you did not receive the output
+as shown above, or received no output at all, then something is seriously wrong.
+You will need to investigate and retrace your steps to find out where the
+problem is and correct it. There is no point in continuing until this is done.
+First, redo the sanity check using <userinput>gcc</userinput> instead of
+<userinput>cc</userinput>. If this works it means the
+<filename class="symlink">/tools/bin/cc</filename> symlink is missing. Revisit
+<xref linkend="ch05-gcc-pass1"/> and fix the symlink. Second, ensure your $PATH
+is correct. You can check this by running <userinput>echo $PATH</userinput> and
+verifying that <filename class="directory">/tools/bin</filename> is at the head
+of the list. If the $PATH is wrong it could mean you're not logged in as user
+<emphasis>lfs</emphasis> or something went wrong back in
+<xref linkend="ch05-settingenviron"/>. Third, something may have gone wrong with
+the specs file amendment above. In this case redo the specs file amendment
+ensuring to cut-and-paste the commands as was recommended.</para>
 
 <para>Once you are satisfied that all is well, clean up the test files:</para>
Index: chapter05/gcc-pass1.xml
===================================================================
--- chapter05/gcc-pass1.xml	(revision 443cace8ce11238d6509c09ba9f3d7f7901d2d4b)
+++ chapter05/gcc-pass1.xml	(revision 51fe2150ea982ef1b9f20f4387a2c77313727b13)
@@ -99,5 +99,5 @@
 C compiler to install, as long as there's a symlink pointing to it:</para>
 
-<screen><userinput>ln -sf gcc /tools/bin/cc</userinput></screen>
+<screen><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
 
 </sect2>
Index: chapter06/chapter06.xml
===================================================================
--- chapter06/chapter06.xml	(revision 443cace8ce11238d6509c09ba9f3d7f7901d2d4b)
+++ chapter06/chapter06.xml	(revision 51fe2150ea982ef1b9f20f4387a2c77313727b13)
@@ -364,6 +364,6 @@
 
 <para>Again, cutting and pasting the above is recommended. And just like
-before, it is a good idea to check the specs file to ensure the intended
-changes were actually made.</para>
+before, it is a good idea to visually inspect the specs file to verify the
+intended change was actually made.</para>
 
 <important><para>If you are working on a platform where the name of the dynamic
@@ -381,5 +381,5 @@
 
 <screen><userinput>echo 'main(){}' &gt; dummy.c
-gcc dummy.c
+cc dummy.c
 readelf -l a.out | grep ': /lib'</userinput></screen>
 
@@ -389,13 +389,11 @@
 <blockquote><screen>[Requesting program interpreter: /lib/ld-linux.so.2]</screen></blockquote>
 
-<para>If you did not receive the output as shown above, or received no output at
-all, then something is seriously wrong. You will need to investigate and retrace
-your steps to find out where the problem is and correct it. There is no point in
-continuing until this is done. Most likely something went wrong with the specs
-file amendment above. Note especially that <filename>/lib</filename> now appears
-as the prefix of our dynamic linker. Of course, if you are working on a platform
-where the name of the dynamic linker is something other than
-<filename>ld-linux.so.2</filename>, then the output will be slightly
-different.</para>
+<para>(Of course allowing for platform specific differences in dynamic linker
+name). Note especially that <filename class="directory">/lib</filename> now
+appears as the prefix of our dynamic linker. If you did not receive the output
+as shown above, or received no output at all, then something is seriously wrong.
+You will need to investigate and retrace your steps to find out where the
+problem is and correct it. There is no point in continuing until this is done.
+Most likely something went wrong with the specs file amendment above.</para>
 
 <para>Once you are satisfied that all is well, clean up the test files:</para>
