aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gronenwoud <alex@linuxfromscratch.org>2003-11-03 22:47:39 +0000
committerAlex Gronenwoud <alex@linuxfromscratch.org>2003-11-03 22:47:39 +0000
commit5763f6758eff4e014e353fca57c2064915c46544 (patch)
treee61156e65964d02bfffcbbe068f6e07c3c6bf966
parentd27a27bee96bda9893300fa12df48f5789d2c0c3 (diff)
Fixing some tiny typos, and rephrasing a few more lines.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3056 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml8
-rw-r--r--chapter05/binutils-pass1.xml4
-rw-r--r--chapter05/coreutils.xml2
-rw-r--r--chapter05/expect.xml2
-rw-r--r--chapter05/tcl.xml2
-rw-r--r--chapter06/adjustingtoolchain.xml2
-rw-r--r--chapter06/bzip2.xml4
-rw-r--r--chapter06/gcc-2953.xml2
-rw-r--r--chapter06/grub.xml4
-rw-r--r--chapter06/gzip.xml7
-rw-r--r--chapter06/kbd.xml2
-rw-r--r--chapter06/texinfo.xml2
12 files changed, 21 insertions, 20 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 60effcc45..85a9fc092 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -463,7 +463,7 @@ flags</para></listitem>
<listitem><para>August 31, 2003 [jeremy] - Added in Greg's new instructions
for GCC 3.3.1 with respect to the fixincludes process. Also added extra
-verbiage to the locking-in and GCC pass 2 pages on the fixincludes
+verbiage to the Locking in Glibc and GCC Pass 2 pages on the fixincludes
process.</para></listitem>
<listitem><para>August 31st, 2003 [alex]: Reworded some paragraphs, added
@@ -565,7 +565,7 @@ core, g++, and test suite tarballs for GCC.</para></listitem>
<listitem><para>August 11th, 2003 [alex]: Chapter 04 - Suppressed the
mention of a wget script.</para></listitem>
-<listitem><para>August 9th, 2003 [alex]: Chapter 05 - Binutils Pass2 and GCC
+<listitem><para>August 9th, 2003 [alex]: Chapter 05 - Binutils Pass 2 and GCC
Pass 2: integrated some text from the pure-lfs hint.</para></listitem>
<listitem><para>August 8th, 2003 [alex]: Chapter 05 - Tcl, Expect, and DejaGnu:
@@ -579,11 +579,11 @@ libraries plus references to the installation pages.</para></listitem>
the global <filename>vimrc</filename> and <filename>gvimrc</filename>
locations are defined.</para></listitem>
-<listitem><para>July 30th, 2003 [gerard]: Chapter 05 - Binutils Pass2:
+<listitem><para>July 30th, 2003 [gerard]: Chapter 05 - Binutils Pass 2:
removed the lib patch, it's no longer needed with the binutils-2.14
upgrade.</para></listitem>
-<listitem><para>July 30th, 2003 [gerard]: Chapter 05 Binutils Pass1: Added
+<listitem><para>July 30th, 2003 [gerard]: Chapter 05 Binutils Pass 1: Added
<userinput>make configure-host</userinput>.</para></listitem>
<listitem><para>July 30th, 2003 [gerard]: Upgraded to binutils-2.14,
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 6c7e62d98..2e2e46ba2 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -62,7 +62,7 @@ when linking statically.</para></listitem>
<screen><userinput>make configure-host
make LDFLAGS="-all-static"</userinput></screen>
-<para>The meaning of the make options:</para>
+<para>The meaning of the make parameters:</para>
<itemizedlist>
<listitem><para><userinput>configure-host</userinput>: This forces all the
@@ -86,7 +86,7 @@ strictly speaking, <userinput>"-all-static"</userinput> is first passed to the
<screen><userinput>make -C ld clean
make -C ld LDFLAGS="-all-static" LIB_PATH=/tools/lib</userinput></screen>
-<para>The meaning of the make options:</para>
+<para>The meaning of the make parameters:</para>
<itemizedlist>
<listitem><para><userinput>-C ld clean</userinput>: This tells the make program
diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml
index 09a010c19..f0a1eb7fb 100644
--- a/chapter05/coreutils.xml
+++ b/chapter05/coreutils.xml
@@ -27,7 +27,7 @@ following command will do so:</para>
<screen><userinput>make RUN_EXPENSIVE_TESTS=yes check</userinput></screen>
-<para>The meaning of the make option:</para>
+<para>The meaning of the make parameter:</para>
<itemizedlist>
<listitem><para><userinput>RUN_EXPENSIVE_TESTS=yes</userinput>: This tells the
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 8c7acc7f8..f2505d1ae 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -54,7 +54,7 @@ suite, the following command will do so:</para>
<screen><userinput>make SCRIPTS="" install</userinput></screen>
-<para>The meaning of the make option:</para>
+<para>The meaning of the make parameter:</para>
<itemizedlist>
<listitem><para><userinput>SCRIPTS=""</userinput>: This prevents installation of
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index 7f0972857..364be9ce9 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -36,7 +36,7 @@ following command will do so:</para>
<screen><userinput>TZ=UTC make test</userinput></screen>
-<para>The meaning of the make option:</para>
+<para>The meaning of the make parameter:</para>
<itemizedlist>
<listitem><para><userinput>TZ=UTC</userinput>: This sets the time zone to
diff --git a/chapter06/adjustingtoolchain.xml b/chapter06/adjustingtoolchain.xml
index 4c587ae68..a5606ad54 100644
--- a/chapter06/adjustingtoolchain.xml
+++ b/chapter06/adjustingtoolchain.xml
@@ -5,7 +5,7 @@
<para>Now that the new C libraries have been installed, it's time to re-adjust
our toolchain. We'll adjust it so that it will link any newly compiled program
against the new C libraries. Basically, this is the reverse of what we did
-in the "Locking in" stage in the beginning of the previous chapter.</para>
+in the "locking in" stage in the beginning of the previous chapter.</para>
<para>The first thing to do is to adjust the linker. For this we retained the
source and build directories from the second pass over Binutils. Install the
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index bc032f049..6b1c4f695 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -21,7 +21,7 @@ make clean</userinput></screen>
<para>The <emphasis>-f</emphasis> flag will cause Bzip2 to be built
using a different <filename>Makefile</filename> file, in this case the
<filename>Makefile-libbz2_so</filename> file, which creates a dynamic
-<filename>libbz2.so</filename> library and links the bzip2 utilities
+<filename>libbz2.so</filename> library and links the Bzip2 utilities
against it.</para>
<para>Compile the package:</para>
@@ -34,7 +34,7 @@ against it.</para>
<para>And install the shared <userinput>bzip2</userinput> binary into the
<filename class="directory">/bin</filename> directory, then make some
-necessary symbolic links, and clean up.</para>
+necessary symbolic links, and clean up:</para>
<screen><userinput>cp bzip2-shared /bin/bzip2
cp -a libbz2.so* /lib
diff --git a/chapter06/gcc-2953.xml b/chapter06/gcc-2953.xml
index f0f196ada..5071ad4ce 100644
--- a/chapter06/gcc-2953.xml
+++ b/chapter06/gcc-2953.xml
@@ -47,7 +47,7 @@ directory in a dedicated build directory:</para>
<screen><userinput>mkdir ../gcc-2-build
cd ../gcc-2-build</userinput></screen>
-<para>Compile and install gcc:</para>
+<para>Compile and install the compiler:</para>
<screen><userinput>../gcc-2.95.3/configure --prefix=/opt/gcc-2.95.3 \
&nbsp;&nbsp;&nbsp;&nbsp;--enable-shared --enable-languages=c \
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index 431715f8d..929e2310b 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -19,11 +19,11 @@ have defined any environment variables that override default optimizations,
such as CFLAGS and CXXFLAGS, we recommend unsetting them when building
Grub.</para>
-<para>Grub needs a patch to fix a compilation problem with GCC-&gcc-version;</para>
+<para>First fix a compilation problem with GCC-&gcc-version;:</para>
<screen><userinput>patch -Np1 -i ../&grub-patch;</userinput></screen>
-<para>Prepare Grub for compilation:</para>
+<para>Now prepare Grub for compilation:</para>
<screen><userinput>./configure --prefix=/usr</userinput></screen>
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index c5a65e9b0..a0ef7800b 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -17,9 +17,10 @@ Estimated required disk space: &gzip-compsize;</screen>
<screen><userinput>./configure --prefix=/usr</userinput></screen>
-<para>The gzexe program has the location of the gzip binary hard-wired into
-it. Because we later change the location of this binary, the following
-command will place the new location into the gzexe binary.</para>
+<para>The <userinput>gzexe</userinput> program has the location of the
+<userinput>gzip</userinput> binary hard-wired into it. Because we later change
+the location of this latter binary, the following command assures that the new
+location gets placed into the binary:</para>
<screen><userinput>cp gzexe.in{,.backup}
sed 's%"BINDIR"%/bin%' gzexe.in.backup &gt; gzexe.in</userinput></screen>
diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml
index 33eb1d71c..14b20f15a 100644
--- a/chapter06/kbd.xml
+++ b/chapter06/kbd.xml
@@ -15,7 +15,7 @@ Estimated required disk space: &kbd-compsize;</screen>
<para>By default some of Kbd's utilities (<userinput>setlogcons</userinput>,
<userinput>setvesablank</userinput> and <userinput>getunimap</userinput>) are
-not installed . The patch enables the compilation of these utilities:</para>
+not installed. First enable the compilation of these utilities:</para>
<screen><userinput>patch -Np1 -i ../&kbd-patch;</userinput></screen>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index a00d157eb..a3d5cadd2 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -35,7 +35,7 @@ following command will do so:</para>
<screen><userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen>
-<para>The meaning of the make option:</para>
+<para>The meaning of the make parameter:</para>
<itemizedlist>
<listitem><para><userinput>TEXMF=/usr/share/texmf</userinput>: The TEXMF