aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2009-07-18 12:42:44 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2009-07-18 12:42:44 +0000
commitfe6ca49e2b1ba60895c1e33ffdf2d5e119eb21d3 (patch)
tree5dd2b78db7c12de3f4cfac5db534340a99bcd570
parent1891a2ca1611863e9d3182ea1ee54beb34a51f69 (diff)
Apply a few text updates from Chris Staub. Fixes #2442.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8965 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/how.xml2
-rw-r--r--chapter04/abouttestsuites.xml4
-rw-r--r--chapter05/gcc-pass2.xml6
-rw-r--r--chapter05/perl.xml4
-rw-r--r--chapter06/bison.xml4
-rw-r--r--chapter06/sysvinit.xml6
-rw-r--r--chapter06/vim.xml4
7 files changed, 15 insertions, 15 deletions
diff --git a/chapter01/how.xml b/chapter01/how.xml
index cd3874823..ceabddf71 100644
--- a/chapter01/how.xml
+++ b/chapter01/how.xml
@@ -20,7 +20,7 @@
<para>As an alternative to installing a separate distribution onto your
machine, you may wish to use the Linux From Scratch LiveCD or a LiveCD from a
- commercial distribution. The LFS LiveCD works well as a host system,
+ commercial distribution. The LFS LiveCD works well as a host system,
providing all the tools you need to successfully follow the instructions in
this book. Unfortunately, development of the LiveCD has not progressed
recently and it only contains older versions of the source packages and
diff --git a/chapter04/abouttestsuites.xml b/chapter04/abouttestsuites.xml
index fe229ab55..848ea59e8 100644
--- a/chapter04/abouttestsuites.xml
+++ b/chapter04/abouttestsuites.xml
@@ -41,8 +41,8 @@
number of failing tests. This may happen for several reasons, but the
most likely cause is that the host system does not have the
<systemitem class="filesystem">devpts</systemitem> file system set up
- correctly. This issue is discussed in greater detail in <xref
- linkend="chapter-temporary-tools"/>.</para>
+ correctly. This issue is discussed in greater detail at
+ <ulink url="&lfs-root;/lfs/faq.html#no-ptys"/>.</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
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index 8d8608c63..cd2d53195 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -210,9 +210,9 @@ cd ../gcc-build</userinput></screen>
<varlistentry>
<term><parameter>--disable-bootstrap</parameter></term>
<listitem>
- <para>For native builds of GCC, the default is to a "bootstrap" build.
- This does not just compile GCC, but compiles it several times. It
- uses the programs compiled in a first round to compile itself a
+ <para>For native builds of GCC, the default is to do a "bootstrap"
+ build. This does not just compile GCC, but compiles it several times.
+ It uses the programs compiled in a first round to compile itself a
second time, and then again a third time. The second and third
iterations are compared to make sure it can reproduce itself
flawlessly. This also implies that it was compiled correctly.
diff --git a/chapter05/perl.xml b/chapter05/perl.xml
index 7483b65ef..2a3d6fda6 100644
--- a/chapter05/perl.xml
+++ b/chapter05/perl.xml
@@ -43,8 +43,8 @@
<sect2 role="installation">
<title>Installation of Perl</title>
- <para>First apply a series of patches to address security issues and adapt some
- hard-wired paths to the C library by applying the following patch:</para>
+ <para>First apply the following patch to address security issues and adapt
+ some hard-wired paths to the C library:</para>
<screen><userinput remap="pre">patch -Np1 -i ../&perl-consolidated-patch;</userinput></screen>
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index 0d8a5ac30..9721be123 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -44,9 +44,9 @@
<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
- <para>The configure system causes bison to be built without support for
+ <para>The configure system causes Bison to be built without support for
internationalization of error messages if a <command>bison</command>
- program is not already in $PATH. The following addition will correct
+ program is not already in $PATH. The following addition will correct
this:</para>
<screen><userinput remap="configure">echo '#define YYENABLE_NLS 1' &gt;&gt; config.h</userinput></screen>
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index aee6a6861..4fae9b6be 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -55,9 +55,9 @@
<screen><userinput remap="pre">sed -i 's@Sending processes@&amp; configured via /etc/inittab@g' \
src/init.c</userinput></screen>
- <para>A maintained version of the <command>wall</command> program is
- installed later on during the Util-linux-ng installation. Suppress the
- installation of this program and its man page:</para>
+ <para>A maintained version of the <command>wall</command> program was
+ installed earlier by Util-linux-ng. Suppress the installation of Sysvinit's
+ version of this program and its man page:</para>
<screen><userinput remap="make">sed -i -e 's/utmpdump wall/utmpdump/' \
-e 's/mountpoint.1 wall.1/mountpoint.1/' src/Makefile</userinput></screen>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 67d873a1a..2132424bb 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -85,10 +85,10 @@
<term><parameter>--enable-multibyte</parameter></term>
<listitem>
<para>This switch enables support for editing files in multibyte
- character encodings. This is needed if using a locale with a
+ character encodings. This is needed if using a locale with a
multibyte character set. This switch is also helpful to be able
to edit text files initially created in Linux distributions like
- Fedora Core that use UTF-8 as a default character set.</para>
+ Fedora that use UTF-8 as a default character set.</para>
</listitem>
</varlistentry>