aboutsummaryrefslogtreecommitdiffstats
path: root/chapter04
diff options
context:
space:
mode:
authorArchaic <archaic@linuxfromscratch.org>2005-06-29 16:24:16 +0000
committerArchaic <archaic@linuxfromscratch.org>2005-06-29 16:24:16 +0000
commit663ecfcc5f04e7c2860b83ef89e49f5e8b68bbbe (patch)
tree7c789513e8b75ee906795c4a06600e2e4284638f /chapter04
parent2ec0d203c3af587beb98406888dca6f6f5283180 (diff)
Several minor wording changes (chapters 1 - 5).
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@6232 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter04')
-rw-r--r--chapter04/aboutsbus.xml9
-rw-r--r--chapter04/abouttestsuites.xml7
-rw-r--r--chapter04/addinguser.xml19
-rw-r--r--chapter04/creatingtoolsdir.xml6
-rw-r--r--chapter04/settingenviron.xml13
5 files changed, 27 insertions, 27 deletions
diff --git a/chapter04/aboutsbus.xml b/chapter04/aboutsbus.xml
index 10b61a881..28d83c01c 100644
--- a/chapter04/aboutsbus.xml
+++ b/chapter04/aboutsbus.xml
@@ -29,10 +29,11 @@ install the first pass of Binutils, it will take
Fortunately, most build times are shorter than the one for Binutils.</para>
<para>In general, SBUs are not entirely accurate because they depend on many
-factors, not just the GCC version. Note that on Symmetric Multi-Processor
-(SMP)-based machines, SBUs are even less accurate. They are provided here to
-give an estimate of how long it might take to install a package, but the numbers
-can vary by as much as dozens of minutes in some cases.</para>
+factors, including the host system's version of GCC. Note that on Symmetric
+Multi-Processor (SMP)-based machines, SBUs are even less accurate. They are
+provided here to give an estimate of how long it might take to install a
+package, but the numbers can vary by as much as dozens of minutes in some
+cases.</para>
<para>To view actual timings for a number of specific machines, we recommend
The LinuxFromScratch SBU Home Page at <ulink url="&lfs-root;~bdubbs/"/>.</para>
diff --git a/chapter04/abouttestsuites.xml b/chapter04/abouttestsuites.xml
index dbcbabfc9..19993637d 100644
--- a/chapter04/abouttestsuites.xml
+++ b/chapter04/abouttestsuites.xml
@@ -41,9 +41,10 @@ most likely cause is that the host system does not have the
correctly. This issue is discussed in greater detail in <xref
linkend="chapter-temporary-tools"/>.</para>
-<para>Sometimes package test suites will give false failures. Consult the logs
-located at <ulink url="&test-results;"/> to verify whether or not these failures
-are expected. This site is valid for all tests throughout this book.</para>
+<para>Sometimes package test suites will fail, but for reasons which the
+developers are aware of and have deemed non-critical. Consult the logs located
+at <ulink url="&test-results;"/> to verify whether or not these failures are
+expected. This site is valid for all tests throughout this book.</para>
</sect1>
diff --git a/chapter04/addinguser.xml b/chapter04/addinguser.xml
index d701566ba..d5ecc8336 100644
--- a/chapter04/addinguser.xml
+++ b/chapter04/addinguser.xml
@@ -7,13 +7,12 @@
<title>Adding the LFS User</title>
<?dbhtml filename="addinguser.html"?>
-<para>When logged in as user <emphasis>root</emphasis>, making a
-single mistake can damage or destroy a system. Therefore, we recommend
-building the packages in this chapter as an unprivileged user. You
-could use your own user name, but to make it easier to set up a clean
-work environment, create a new user called <emphasis>lfs</emphasis> as
-a member of a new group (also named <emphasis>lfs</emphasis>) and use
-this user during the installation process. As
+<para>When logged in as user <emphasis>root</emphasis>, making a single mistake
+can damage or destroy a system. Therefore, we recommend building the packages in
+this chapter as an unprivileged user. You could use your own user name, but to
+make it easier to set up a clean working environment, create a new user called
+<emphasis>lfs</emphasis> as a member of a new group (also named
+<emphasis>lfs</emphasis>) and use this user during the installation process. As
<emphasis>root</emphasis>, issue the following commands to add the new
user:</para>
@@ -83,9 +82,9 @@ following substitute user command:</para>
<screen><userinput>su - lfs</userinput></screen>
<para>The <quote><parameter>-</parameter></quote> instructs
-<command>su</command> to start a login shell as opposed to a non-login
-shell. The difference between these two types of shells can be found
-in detail in the Bash man and info pages.</para>
+<command>su</command> to start a login shell as opposed to a non-login shell.
+The difference between these two types of shells can be found in detail in the
+<command>man</command> and <command>info</command> pages for Bash.</para>
</sect1>
diff --git a/chapter04/creatingtoolsdir.xml b/chapter04/creatingtoolsdir.xml
index 8ab7fde3a..b6af96d15 100644
--- a/chapter04/creatingtoolsdir.xml
+++ b/chapter04/creatingtoolsdir.xml
@@ -30,9 +30,9 @@ well:</para>
<screen><userinput>ln -s $LFS/tools /</userinput></screen>
-<note><para>The above command is correct. The <command>ln</command>
-command has a few syntactic variations, so be sure to check the info
-and man pages before reporting what you may think is an
+<note><para>The above command is correct. The <command>ln</command> command has
+a few syntactic variations, so be sure to check the <command>info</command> and
+<command>man</command> pages before reporting what you may think is an
error.</para></note>
<para>The created symlink enables the toolchain to be compiled so that
diff --git a/chapter04/settingenviron.xml b/chapter04/settingenviron.xml
index 247b55e96..574526392 100644
--- a/chapter04/settingenviron.xml
+++ b/chapter04/settingenviron.xml
@@ -76,13 +76,12 @@ later. Setting <envar>LC_ALL</envar> to <quote>POSIX</quote>
or <quote>C</quote> (the two are equivalent) ensures that
everything will work as expected in the chroot environment.</para>
-<para>By putting <filename class="directory">/tools/bin</filename>
-ahead of the standard <envar>PATH</envar>, all the programs installed in <xref
-linkend="chapter-temporary-tools"/> are picked up by the shell
-immediately after their installation. This, combined with turning off
-hashing, limits the risk that old programs from
-the host are being used when they should not be used any
-longer.</para>
+<para>By putting <filename class="directory">/tools/bin</filename> ahead of the
+standard <envar>PATH</envar>, all the programs installed in <xref
+linkend="chapter-temporary-tools"/> are picked up by the shell immediately after
+their installation. This, combined with turning off hashing, limits the risk
+that old programs are used from the host when the same programs are available in
+the chapter 5 environment.</para>
<para>Finally, to have the environment fully prepared for building the
temporary tools, source the just-created user profile:</para>