aboutsummaryrefslogtreecommitdiffstats
path: root/chapter05
diff options
context:
space:
mode:
authorAlex Gronenwoud <alex@linuxfromscratch.org>2004-01-26 22:23:41 +0000
committerAlex Gronenwoud <alex@linuxfromscratch.org>2004-01-26 22:23:41 +0000
commit17476c5481ff8ebced096511eb66134c68f6f042 (patch)
tree289a04a19b82aaa5ea665ba31cc67842bdabfbf7 /chapter05
parentf2f5117750f8473c6d77fda7f205bfde31b5cdcc (diff)
Removing some excess white space.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3186 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
-rw-r--r--chapter05/binutils-pass2.xml2
-rw-r--r--chapter05/chapter05.xml10
-rw-r--r--chapter05/gcc-pass1.xml2
-rw-r--r--chapter05/gcc-pass2.xml10
-rw-r--r--chapter05/grep.xml6
-rw-r--r--chapter05/utillinux.xml2
6 files changed, 16 insertions, 16 deletions
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index 5b521f033..de0280e47 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -54,7 +54,7 @@ should be easy to spot. The output shown will contain something like:</para>
<blockquote><screen>make[1]: *** [check-binutils] Error 2</screen></blockquote>
-<para>And install the package:</para>
+<para>And install the package:</para>
<screen><userinput>make install</userinput></screen>
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index 235dddce6..b49c41468 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -308,7 +308,7 @@ the LFS partition).</para>
<para>When logged in as <emphasis>root</emphasis>, making a single mistake
can damage or even wreck your system. Therefore we recommend that you
build the packages in this chapter as an unprivileged user. You could
-of course use your own user name, but to make it easier to set up a clean
+of course use your own user name, but to make it easier to set up a clean
work environment we'll create a new user <emphasis>lfs</emphasis> and
use this one during the installation process. As <emphasis>root</emphasis>,
issue the following commands to add the new user:</para>
@@ -382,7 +382,7 @@ export LFS LC_ALL PATH
feature: <userinput>bash</userinput> uses a hash table to remember the
full pathnames of executable files to avoid searching the PATH time and time
again to find the same executable. However, we'd like the new tools to be
-used as soon as they are installed. By switching off the hash function, our
+used as soon as they are installed. By switching off the hash function, our
"interactive" commands (<userinput>make</userinput>,
<userinput>patch</userinput>, <userinput>sed</userinput>,
<userinput>cp</userinput> and so forth) will always use
@@ -400,7 +400,7 @@ making their messages follow the conventions of a specified country. If your
host system uses a version of Glibc older than 2.2.4,
having LC_ALL set to something other than "POSIX" or "C" during this chapter
may cause trouble if you exit the chroot environment and wish to return later.
-By setting LC_ALL to "POSIX" (or "C", the two are equivalent) we ensure that
+By setting LC_ALL to "POSIX" (or "C", the two are equivalent) we ensure that
everything will work as expected in the chroot environment.</para>
<para>We prepend <filename>/tools/bin</filename> to the standard PATH so
@@ -454,7 +454,7 @@ Binutils build and source directories.</para>
to the new dynamic linker. A simple sed will accomplish this:</para>
<!-- Ampersands are needed to allow cut and paste -->
-
+
<screen><userinput>SPECFILE=/tools/lib/gcc-lib/*/*/specs &amp;&amp;
sed -e 's@ /lib/ld-linux.so.2@ /tools/lib/ld-linux.so.2@g' \
&nbsp;&nbsp;&nbsp;&nbsp;$SPECFILE &gt; tempspecfile &amp;&amp;
@@ -476,7 +476,7 @@ name of your platform's dynamic linker in the above commands. Refer back to
<para>Lastly, there is a possibility that some include files from the host
system have found their way into GCC's private include dir. This can happen
because of GCC's "fixincludes" process which runs as part of the GCC build.
-We'll explain more about this further on in this chapter. For now, run the
+We'll explain more about this further on in this chapter. For now, run the
following commands to eliminate this possibility:</para>
<screen><userinput>rm -f /tools/lib/gcc-lib/*/*/include/{pthread.h,bits/sigthread.h}</userinput></screen>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index a0d4af5c7..525da689f 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -40,7 +40,7 @@ cd ../gcc-build</userinput></screen>
<para>The meaning of the configure options:</para>
<itemizedlist>
-<listitem><para><userinput>--with-local-prefix=/tools</userinput>: The
+<listitem><para><userinput>--with-local-prefix=/tools</userinput>: The
purpose of this switch is to remove <filename>/usr/local/include</filename>
from <userinput>gcc</userinput>'s include search path. This is not absolutely
essential; however, we want to try to minimize the influence of the host
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 762ce0d17..314f88019 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -44,12 +44,12 @@ same working directory. They will all unfold into a single
<screen><userinput>patch -Np1 -i ../&gcc-nofixincludes-patch;
patch -Np1 -i ../&gcc-specs-patch;</userinput></screen>
-<para>The first patch disables the GCC "fixincludes" script. We mentioned this
+<para>The first patch disables the GCC "fixincludes" script. We mentioned this
briefly earlier, but a slightly more in-depth explanation of the fixincludes
-process is warranted here. Under normal circumstances, the GCC fixincludes
-script scans your system for header files that need to be fixed. It might find
+process is warranted here. Under normal circumstances, the GCC fixincludes
+script scans your system for header files that need to be fixed. It might find
that some Glibc header files on your host system need to be fixed, fix them and
-put them in the GCC private include directory. Then, later on in
+put them in the GCC private include directory. Then, later on in
<xref linkend="chapter06"/>, after we've installed the newer Glibc, this
private include directory would be searched before the system include
directory, resulting in GCC finding the fixed headers from the host system,
@@ -159,7 +159,7 @@ usually aware of them but haven't yet gotten around to fixing them. In short,
unless your results are vastly different from those at the above URL, it is safe
to continue on.</para>
-<para>And finally install the package:</para>
+<para>And finally install the package:</para>
<screen><userinput>make install</userinput></screen>
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index 931d09671..cdeff1166 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -23,11 +23,11 @@ Estimated required disk space: &grep-compsize-tools;</screen>
<itemizedlist>
<listitem><para><userinput>--disable-perl-regexp</userinput>: This makes sure
that <userinput>grep</userinput> does not get linked against a PCRE library
-that may be present on the host, but would not be available once we enter the
+that may be present on the host and would not be available once we enter the
chroot environment.</para></listitem>
<listitem><para><userinput>--with-included-regex</userinput>: This ensures that
-Grep uses its internal regular expression code. Without it, it will use
-the code from Glibc, which is known to be slightly buggy.</para></listitem>
+Grep uses its internal regular expression code. Without this switch, Grep will
+use the code from Glibc, which is known to be slightly buggy.</para></listitem>
</itemizedlist>
<para>Compile the programs:</para>
diff --git a/chapter05/utillinux.xml b/chapter05/utillinux.xml
index 845bc53db..302255758 100644
--- a/chapter05/utillinux.xml
+++ b/chapter05/utillinux.xml
@@ -14,7 +14,7 @@ Estimated required disk space: &util-linux-compsize-tools;</screen>
<title>Installation of Util-linux</title>
<para>Util-linux doesn't use the freshly installed headers and libraries from
-the <filename>/tools</filename> directory. This is fixed by altering the
+the <filename>/tools</filename> directory. This is fixed by altering the
configure script:</para>
<screen><userinput>cp configure configure.backup