aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml52
-rw-r--r--chapter01/conventions.xml4
-rw-r--r--chapter01/how.xml9
-rw-r--r--chapter03/mounting.xml4
-rw-r--r--chapter05/lockingglibc.xml2
-rw-r--r--chapter06/bison-inst.xml2
-rw-r--r--chapter06/groff-inst.xml10
-rw-r--r--chapter06/man-inst.xml6
-rw-r--r--chapter06/pwdgroup.xml2
-rw-r--r--chapter08/grub.xml7
-rw-r--r--entities/bash.ent2
11 files changed, 56 insertions, 44 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 0cef9f786..b374bef09 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -90,6 +90,13 @@
<listitem><para>September 14th, 2003 [greg]: Chapter 6 - Revised chroot
command: Removed no longer needed set +h.</para></listitem>
+<listitem><para>September 15th, 2003 [alex]: Corrected several typos and
+some inconsistencies.</para></listitem>
+
+<listitem><para>September 14th, 2003 [alex]: Fixed some typos, and added some
+markup. Dropped the removal of program files from the Stripping section in
+Chapter 5.</para></listitem>
+
<listitem><para>September 14th, 2003 [greg]: Chapter 6 - Create essential
symlinks: Add symlink /usr/lib/libgcc_s.so.1 to allow gcc abi_check to run.
Future NPTL needs this as well.</para></listitem>
@@ -101,8 +108,8 @@ page in Chapter 6 for creating passwd and group: bug 596.</para></listitem>
going to be done" page to include more of the PLFS hint's
text.</para></listitem>
-<listitem><para>September 13th, 2003 [jwrober]: Merged whoread and whonotread
-into a since audience page.</para></listitem>
+<listitem><para>September 13th, 2003 [jwrober]: Preface - Merged whoread and
+whonotread into a single audience page.</para></listitem>
<listitem><para>September 13th, 2003 [greg]: Chapter 2 - Added new section
about the test suites.</para></listitem>
@@ -120,15 +127,16 @@ descriptions of configure switches courtesy of Anderson Lizardo</para></listitem
directory creation - it's created during Chapter 6 - Glibc where it's more
relevant.</para></listitem>
-<listitem><para>September 11th, 2003 [jwrober]: Fixed Ch5 GCC Pass 2 specs
-patch text to be more vague, but in actuality more accurate - provided by
+<listitem><para>September 11th, 2003 [jwrober]: Chapter 5 - Fixed GCC Pass 2
+specs patch text to be more vague, but in actuality more accurate - provided by
Anderson Lizardo.</para></listitem>
-<listitem><para>September 11th, 2003 [jwrober]: Grammar fix in Ch5 Tcl install
-directions provided by Anderson Lizardo.</para></listitem>
+<listitem><para>September 11th, 2003 [jwrober]: Chapter 5 - Grammar fix in
+Tcl install directions provided by Anderson Lizardo.</para></listitem>
-<listitem><para>September 11th, 2003 [jwrober]: Small textual change in the Ch5
-lockin Glibc page for /lib/ld.so.1 provided by Anderson Lizardo.</para></listitem>
+<listitem><para>September 11th, 2003 [jwrober]: Chapter 5 - Small textual
+change in the locking in Glibc page for /lib/ld.so.1 provided by Anderson
+Lizardo.</para></listitem>
<listitem><para>September 11th, 2003 [jeremy]: Added bootloader setup to
Chapter 8, after the addition of Grub to the book.</para></listitem>
@@ -137,7 +145,7 @@ Chapter 8, after the addition of Grub to the book.</para></listitem>
replaced it with Grub.</para></listitem>
<listitem><para>September 11th, 2003 [jeremy]: Dropped non-toolchain tests
-to optional actions. Added a note to use the wiki for failed tests.</para></listitem>
+to optional actions. Added a note to use the Wiki for failed tests.</para></listitem>
<listitem><para>September 11th, 2003 [jeremy]: Added Bison patch, backported
from CVS, to fix pwlib compilation problems</para></listitem>
@@ -147,13 +155,13 @@ suppress the installation of libiberty, and changed Binutils to allow its
libiberty to stay.</para></listitem>
<listitem><para>September 11th, 2003 [jeremy]: Added caution tags around the
-reminder to not delete the binutils source and build directories in Chap 5.
+reminder to not delete the Binutils source and build directories in Chapter 5.
</para></listitem>
<listitem><para>September 11th, 2003 [jeremy]: Added new perl-libc-3 patch
from Anderson Lizardo</para></listitem>
-<listitem><para>September 9th, 2003 [jwrober]: Fixed the findutils packge
+<listitem><para>September 9th, 2003 [jwrober]: Fixed the Findutils package
download link on the packages page closing bug 578.</para></listitem>
<listitem><para>September 9th, 2003 [jeremy]: Chapter 6 - GCC 2.95.3:
@@ -222,7 +230,7 @@ utilising headers and libraries installed in /stage1.</para></listitem>
<listitem><para>September 3rd, 2003 [matt]: Removed "rm /bin/pwd" instruction
from chapter06 kernel-headers installation as the link is still required by
-glibc's installation.</para></listitem>
+Glibc's installation.</para></listitem>
<listitem><para>September 2nd, 2003 [alex]: Adjusted all the SBUs from the
values posted by Jeremy.</para></listitem>
@@ -250,9 +258,9 @@ newgrp patch from Greg Schafer</para></listitem>
Inetutils - added the --disable-whois and --disable-servers
flags</para></listitem>
-<listitem><para>August 31, 2003 [jeremy] - Added in Greg's new
-instructions for GCC 3.3.1 wrt the fixincludes process. Also added
-extra verbiage to the lockin and GCC pass 2 pages on the fixincludes
+<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
process.</para></listitem>
<listitem><para>August 31, 2003 [jeremy] - Added user nobody to
@@ -351,8 +359,8 @@ put text in between commands.</para></listitem>
Findutils: several small textual adjustments. For the second passes not giving
the contents and dependencies.</para></listitem>
-<listitem><para>August 11th, 2003 [alex]: Chapter 04 - Listing for GCC separate
-core, g++, and testsuite tarballs.</para></listitem>
+<listitem><para>August 11th, 2003 [alex]: Chapter 04 - Listed separate
+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>
@@ -492,7 +500,7 @@ first place.</para></listitem>
gzip-1.3.5, and tar-1.13.25.</para></listitem>
<listitem><para>May 12th, 2003 [winkie]: Chapter 05 - Installing Perl:
-Added extra commands to build certain modules into Perl. This is to accomodate
+Added extra commands to build certain modules into Perl. This is to accommodate
the Coreutils "make check". Partially fixes bug #528.</para></listitem>
<listitem><para>May 12th, 2003 [winkie]: Chapter 05 - Installing Gzip:
@@ -511,7 +519,7 @@ installed is GCC, and that's only for gccbug.</para></listitem>
--enable-threads=posix as well to complete the C++ addition.</para></listitem>
<listitem><para>May 11th, 2003 [gerard]: Chapter 06 - GCC-2.95.3: Added
---enable-languages=c,c++ to fix that gcc's version bug with regards to
+--enable-languages=c,c++ to fix that GCC's version bug with regards to
-Wreturn-type. Fixes bug #525</para></listitem>
<listitem><para>May 11th, 2003 [gerard]: Chapter 05 - Bash: Removed the
@@ -602,11 +610,11 @@ handles this for us.</para></listitem>
<listitem><para>May 10th, 2003 [gerard]: Removed all CFLAGS and LDFLAGS
variables where they are not essential (so, not including static binutils,
-gcc and compiling zlib with -fPIC).</para></listitem>
+GCC and compiling Zlib with -fPIC).</para></listitem>
<listitem><para>May 10th, 2003 [gerard]: Chapter 05 - Binutils (pass1,
-pass2, locking glibc and adjusting toolchain): Change tooldir to /stage1
-(likewise we use tooldir=/usr in chapter 6).</para></listitem>
+pass2), locking in Glibc and adjusting toolchain: Changed tooldir to /stage1
+(likewise we use tooldir=/usr in Chapter 6).</para></listitem>
<listitem><para>May 10th, 2003 [gerard]: Chapter 05 - Kernel headers:
Removed the usage of <userinput>cp -H</userinput> because there are
diff --git a/chapter01/conventions.xml b/chapter01/conventions.xml
index b236639e7..1cd0df06e 100644
--- a/chapter01/conventions.xml
+++ b/chapter01/conventions.xml
@@ -28,8 +28,8 @@ what to type.</para></blockquote>
<para><ulink url="http://www.linuxfromscratch.org/"/></para>
<blockquote><para>This form of text is used for hyperlinks, both within the
-book and to external pages such as HowTo's, download locations,
-websites, etc.</para></blockquote>
+book and to external pages such as HOWTOs, download locations and
+websites.</para></blockquote>
<para><screen><userinput>cat &gt; $LFS/etc/group &lt;&lt; "EOF"</userinput>
root:x:0:
diff --git a/chapter01/how.xml b/chapter01/how.xml
index c6f0d3e1f..79d1bc869 100644
--- a/chapter01/how.xml
+++ b/chapter01/how.xml
@@ -16,7 +16,7 @@ partition and filesystem is where your new LFS system will be compiled and
installed onto.</para>
<para>Chapter 5 will then discuss the installation of a number of packages that
-will form the basic development suite (or toolset) which is used to build the
+will form the basic development suite (or tool-set) which is used to build the
actual system in Chapter 6. Some of these packages are needed to resolve
circular dependencies. For example, to compile a compiler you need a
compiler.</para>
@@ -31,7 +31,7 @@ pass.</para>
<para>The third thing to do is build a second pass of the toolchain. This time
the toolchain will be dynamically linked against the newly built Glibc. The
remaining Chapter 5 packages are all built using this second pass toolchain and
-dynamically linked against the new host independant Glibc. When this is done,
+dynamically linked against the new host-independent Glibc. When this is done,
the LFS installation process will no longer depend on the host distribution,
with the exception of the running kernel. This is known as <quote>self
contained</quote> and <quote>self hosted</quote>. There is a discussion of the
@@ -50,9 +50,10 @@ the road (they have been well documented). The host's Glibc is usually an
unknown quantity and can contain bugs or anything else we don't know about
until it is too late. A well known issue is that statically linked binaries
compiled on a Glibc-2.2.x based system that then contain calls to the
-getpwuid() function crash when run on a glibc-2.3.x based system. You are
+<emphasis>getpwuid()</emphasis> function crash when run on a Glibc-2.3.x based
+system. You are
about to build a Glibc-2.3.x based system. You do not want to build something
-that is going to crash do you? Finally, the Glibc Autoconf tests produce
+that is going to crash do you? Finally, the Glibc autoconf tests produce
different results depending on whether an existing Glibc is found on the host
distribution. This can lead to inconsistencies and encourages hacks and
workarounds. With all these things in mind, you can see that the extra effort
diff --git a/chapter03/mounting.xml b/chapter03/mounting.xml
index 4d8c8254b..14685e045 100644
--- a/chapter03/mounting.xml
+++ b/chapter03/mounting.xml
@@ -34,10 +34,10 @@ mount /dev/yyy $LFS/usr</userinput></screen></para>
with the appropriate partition names.</para>
<para>You should also ensure that this new partition is not mounted with
-permissions that are too restrictive (such as the nosuid. nodev and noatime
+permissions that are too restrictive (such as the nosuid, nodev or noatime
options). You can run the <userinput>mount</userinput> command without any
parameters to see with what options the LFS partition is mounted. If
-you see nosuid, nodev and/or noatime, you will need to remount it.</para>
+you see nosuid, nodev or noatime, you will need to remount it.</para>
<para>Now that we've made ourselves a place to work in, we're ready to download
the packages.</para>
diff --git a/chapter05/lockingglibc.xml b/chapter05/lockingglibc.xml
index 7938df879..bd15b4a7f 100644
--- a/chapter05/lockingglibc.xml
+++ b/chapter05/lockingglibc.xml
@@ -38,7 +38,7 @@ all in. Or you can edit the specs file by hand if you want to: just replace
"/tools/lib/ld.so.1".</para>
<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
+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
following commands to eliminate this possibility.</para>
diff --git a/chapter06/bison-inst.xml b/chapter06/bison-inst.xml
index 8e745ffcf..6e422bcba 100644
--- a/chapter06/bison-inst.xml
+++ b/chapter06/bison-inst.xml
@@ -4,7 +4,7 @@
<title>Installation of Bison</title>
<para>First we use a patch to bison, backported from CVS, which fixes a minor
-compliation problem with some packages:</para>
+compilation problem with some packages:</para>
<para><screen><userinput>patch -Np1 -i ../bison-1.875-attribute.patch</userinput></screen></para>
diff --git a/chapter06/groff-inst.xml b/chapter06/groff-inst.xml
index b8be708bd..eb65a8cf4 100644
--- a/chapter06/groff-inst.xml
+++ b/chapter06/groff-inst.xml
@@ -3,10 +3,12 @@
<sect2>
<title>Installation of Groff</title>
-<para>Groff expects an enviornment variable PAGE to contain the default paper size.
-For those in the United States, the text below is appropriate. For those who's default
-paper size is the larger "A4", you may safely change the value used when we configure
-the Groff package:</para>
+<para>Groff expects the environment variable PAGE to contain the default paper
+size. For those in the United States, the command below is appropriate. If you
+live elsewhere, you may want to change <emphasis>PAGE=letter</emphasis> to
+<emphasis>PAGE=A4</emphasis>.</para>
+
+<para>Prepare Groff for compilation:</para>
<para><screen><userinput>PAGE=letter ./configure --prefix=/usr</userinput></screen></para>
diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml
index d57b1924b..4e3b3b6b6 100644
--- a/chapter06/man-inst.xml
+++ b/chapter06/man-inst.xml
@@ -3,10 +3,10 @@
<sect2>
<title>Installation of Man</title>
-<para>We'l make three adjustments to the sources of Man.</para>
+<para>We'll make three adjustments to the sources of Man.</para>
- <para>The first patch comments out the "MANPATH /usr/man" line in the
- <filename>man.conf</filename> file to prevent redundant results when using
+<para>The first patch comments out the "MANPATH /usr/man" line in the
+<filename>man.conf</filename> file to prevent redundant results when using
programs such as <userinput>whatis</userinput>:</para>
<para><screen><userinput>patch -Np1 -i ../man-&man-manpath-patch-version;-manpath.patch</userinput></screen></para>
diff --git a/chapter06/pwdgroup.xml b/chapter06/pwdgroup.xml
index 6cf407a98..15d00e6b7 100644
--- a/chapter06/pwdgroup.xml
+++ b/chapter06/pwdgroup.xml
@@ -45,7 +45,7 @@ with a GID of 1, be present. All other group names and GIDs can be chosen
freely by the user, as well-written packages don't depend on GID numbers but
use the group's name.</para>
-<para>Lastly, we re-login to the chroot envrionment. User name and group name
+<para>Lastly, we re-login to the chroot environment. User name and group name
resolution will start working immediately after the
<filename>/etc/passwd</filename> and <filename>/etc/group</filename> files are
created, because we installed a full glibc in Chapter 5. This will get rid of
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index d140ca8dd..ee3e66339 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -2,15 +2,16 @@
<title>Making the LFS system bootable</title>
<?dbhtml filename="grub.html" dir="chapter08"?>
-<para>Now that we have our shiny new LinuxFromScratch system completed,
-we need to ensure we can boot it. To do this, we will run the grub program.</para>
+<para>Now that we have our shiny new Linux-From-Scratch system completed,
+we need to ensure we can boot it. To do this, we will run the
+<userinput>grub</userinput> program.</para>
<para><screen><userinput>grub</userinput></screen></para>
<para>Grub uses its own naming structure for drives, in the form of (hdn,m),
where n is the hard drive number, and m is the partition number, both of which
start from zero. So, partition hda1 would be (hd0,0) to Grub, and hdb2 would
-be (hd1,1). Also, Grub doesn't pay attention to CDROM drives at all, so if,
+be (hd1,1). Also, Grub doesn't pay attention to CD-ROM drives at all, so if,
for example, you have a CD on hdb, and a second hard drive on hdc, partitions
on that second hard drive would still be (hd1,m).</para>
diff --git a/entities/bash.ent b/entities/bash.ent
index adc44121f..05571a608 100644
--- a/entities/bash.ent
+++ b/entities/bash.ent
@@ -23,7 +23,7 @@
<!ENTITY bash-patch-size "7.6 KB">
<!ENTITY bash-compsize-static "24 MB">
-<!ENTITY bash-time-static "0.8 BU">
+<!ENTITY bash-time-static "0.8 SBU">
<!ENTITY bash-compsize "14 MB">
<!ENTITY bash-time "0.8 SBU">