aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Huntwork <jhuntwork@linuxfromscratch.org>2007-03-02 23:23:14 +0000
committerJeremy Huntwork <jhuntwork@linuxfromscratch.org>2007-03-02 23:23:14 +0000
commit19f8a620a823825993a4e910a580cd8d1ed552f6 (patch)
tree9a2c54f82b54fd375f3675cdf3c445d72a4f08db
parent40ffa161a92942ab11cdbaabd3a4cf511c5e02de (diff)
Warnings and important notices about a command that appear after instructions to run it are evil.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7953 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter05/adjusting.xml20
2 files changed, 20 insertions, 10 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 36f2ad6ef..647e5f6e3 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>2007-03-1</para>
+ <itemizedlist>
+ <listitem>
+ <para>[jhuntwork] - Minor grammatical changes. Move some warnings and
+ notices to appear before affected commands.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2007-02-25</para>
<itemizedlist>
<listitem>
diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml
index 144719698..bca6d56fb 100644
--- a/chapter05/adjusting.xml
+++ b/chapter05/adjusting.xml
@@ -32,25 +32,25 @@ ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
<para>The next task is to point GCC to the new dynamic linker. This is done by
dumping GCC's <quote>specs</quote> file to a location where GCC will look for it
by default. A simple <command>sed</command> substitution then alters the
- dynamic linker that GCC will use:</para>
+ dynamic linker that GCC will use.</para>
-<!-- Ampersands are needed to allow copy and paste -->
-<screen><userinput>gcc -dumpspecs | sed 's@^/lib/ld-linux.so.2@/tools&amp;@g' \
- > `dirname $(gcc -print-libgcc-file-name)`/specs</userinput></screen>
-
- <para>It is recommended that the above command be copy-and-pasted in order to
- ensure accuracy. Be sure to visually inspect the specs file in order to
- verify that all occurrences of <quote>/lib/ld-linux.so.2</quote> have been
- replaced with <quote>/tools/lib/ld-linux.so.2</quote>.</para>
+ <para>For the sake of accuracy, it is recommended to use a copy-and-paste
+ method when issuing the following command. Be sure to visually inspect the
+ specs file and verify that all occurrences of <quote>/lib/ld-linux.so.2</quote>
+ have been replaced with <quote>/tools/lib/ld-linux.so.2</quote>.</para>
<important>
<para>If working on a platform where the name of the dynamic linker is
something other than <filename class="libraryfile">ld-linux.so.2</filename>,
replace <quote>ld-linux.so.2</quote> with the name of the platform's
- dynamic linker in the above commands. Refer back to <xref
+ dynamic linker in the following commands. Refer back to <xref
linkend="ch-tools-toolchaintechnotes" role=","/> if necessary.</para>
</important>
+<!-- Ampersands are needed to allow copy and paste -->
+<screen><userinput>gcc -dumpspecs | sed 's@^/lib/ld-linux.so.2@/tools&amp;@g' \
+ > `dirname $(gcc -print-libgcc-file-name)`/specs</userinput></screen>
+
<para>During the build process, GCC runs a script
(<command>fixincludes</command>) that scans the system for header files
that may need to be fixed (they might contain syntax errors, for example),