Mixed modifications.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2989 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

9 files changed, 33 insertions, 19 deletions

diff --git a/appendixa/bison-shortdesc.xml b/appendixa/bison-shortdesc.xml
index 7d3728b5d..8ccf65c00 100644
--- a/appendixa/bison-shortdesc.xml
+++ b/appendixa/bison-shortdesc.xml
@@ -7,7 +7,7 @@ generates a program that analyzes the structure of a text file.</para>
 
 <para><emphasis>Installed programs</emphasis>: bison and yacc</para>
 
-<para><emphasis>Installed libraries</emphasis>: liby.a</para>
+<para><emphasis>Installed library</emphasis>: liby.a</para>
 
 </sect2>
 
diff --git a/appendixb/appendixb.xml b/appendixb/appendixb.xml
index 242ab795a..6a92b44f8 100644
--- a/appendixb/appendixb.xml
+++ b/appendixb/appendixb.xml
@@ -60,7 +60,6 @@ to which it belongs.</para>
 <listitem><para>cc : <xref linkend="aa-gcc"/></para></listitem>
 <listitem><para>cc1 : <xref linkend="aa-gcc"/></para></listitem>
 <listitem><para>cc1plus : <xref linkend="aa-gcc"/></para></listitem>
-<listitem><para>cc1plus : <xref linkend="aa-gcc"/></para></listitem>
 <listitem><para>cfdisk : <xref linkend="aa-utillinux"/></para></listitem>
 <listitem><para>chage : <xref linkend="aa-shadow"/></para></listitem>
 <listitem><para>chattr : <xref linkend="aa-e2fsprogs"/></para></listitem>
@@ -322,7 +321,6 @@ to which it belongs.</para>
 <listitem><para>libz : <xref linkend="aa-zlib"/></para></listitem>
 <listitem><para>line : <xref linkend="aa-utillinux"/></para></listitem>
 <listitem><para>link : <xref linkend="aa-coreutils"/></para></listitem>
-<listitem><para>linux : <xref linkend="aa-kernel"/></para></listitem>
 <listitem><para>lkbib : <xref linkend="aa-groff"/></para></listitem>
 <listitem><para>ln : <xref linkend="aa-coreutils"/></para></listitem>
 <listitem><para>loadkeys : <xref linkend="aa-bootscripts"/></para></listitem>
@@ -352,7 +350,6 @@ to which it belongs.</para>
 <listitem><para>man : <xref linkend="aa-man"/></para></listitem>
 <listitem><para>man2dvi : <xref linkend="aa-man"/></para></listitem>
 <listitem><para>man2html : <xref linkend="aa-man"/></para></listitem>
-<listitem><para>manual pages : <xref linkend="aa-man-pages"/></para></listitem>
 <listitem><para>mapscrn : <xref linkend="aa-kbd"/></para></listitem>
 <listitem><para>mcookie : <xref linkend="aa-utillinux"/></para></listitem>
 <listitem><para>md5sum : <xref linkend="aa-coreutils"/></para></listitem>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d2be5b952..c29f9ed7d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -99,6 +99,12 @@
 <listitem><para>October 13th, 2003 [greg]: Chapter 8 - Making the LFS system
 bootable: Expand Grub details and add a warning.</para></listitem>
 
+<listitem><para>October 14th, 2003 [alex]: Appendix A - Updating the contents
+of Perl and Procps.</para></listitem>
+ 
+<listitem><para>October 14th, 2003 [alex]: Chapter 4 and 5 - Added suggestion
+to use $LFS/sources as the working and storage place.</para></listitem>
+ 
 <listitem><para>October 13th, 2003 [greg]: Chapter 9 - Rebooting the system:
 Reworked umount commands.</para></listitem>
 
@@ -113,7 +119,7 @@ lfs-bootscripts-1.12.</para></listitem>
 
 <listitem><para>October 9th, 2003 [greg]: Performed internal markup reworking to
 fix an extraneous whitespace problem in "tidy generated" web site pages.
-Essentially replace all ocurrences of &lt;para&gt;&lt;screen&gt; with
+Essentially replace all occurrences of &lt;para&gt;&lt;screen&gt; with
 &lt;screen&gt; (and the matching closing tags).</para></listitem>
 
 <listitem><para>October 9th, 2003 [alex]: Chapter 6 - Basic Networking: Moved
diff --git a/chapter05/binutils-pass1-inst.xml b/chapter05/binutils-pass1-inst.xml
index 8ceb64537..15465730b 100644
--- a/chapter05/binutils-pass1-inst.xml
+++ b/chapter05/binutils-pass1-inst.xml
@@ -24,7 +24,12 @@ source directory in a dedicated build directory:</para>
 <screen><userinput>mkdir ../binutils-build
 cd ../binutils-build</userinput></screen>
 
-<para>Next, prepare Binutils to be compiled:</para>
+<note><para>If you want the SBU values listed in the rest of the book to be of
+any use, you will have to measure the time it takes to build this package. To
+achieve this easily, you could do something like:
+<userinput>time { ./configure ... &amp;&amp; ... &amp;&amp; ... &amp;&amp; make install; }</userinput>.</para></note>
+
+<para>Now prepare Binutils for compilation:</para>
 
 <screen><userinput>../binutils-&binutils-version;/configure \
 &nbsp;&nbsp;&nbsp;&nbsp;--prefix=/tools --disable-nls</userinput></screen>
diff --git a/chapter05/tcl-inst.xml b/chapter05/tcl-inst.xml
index b6deaa66f..d64f16992 100644
--- a/chapter05/tcl-inst.xml
+++ b/chapter05/tcl-inst.xml
@@ -45,16 +45,16 @@ throughout the book.</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>Make a necessary symbolic link:</para>
-
-<screen><userinput>ln -s tclsh8.4 /tools/bin/tclsh</userinput></screen>
-
 <!-- HACK - Force some whitespace to appease tidy -->
 <literallayout></literallayout>
 
-<caution><para>Do not remove the
+<important><para><emphasis>Do not remove</emphasis> the
 <filename>tcl&tcl-version;</filename> source directory yet, as the next package
-will need its internal headers.</para></caution>
+will need its internal headers.</para></important>
+
+<para>Make a necessary symbolic link:</para>
+
+<screen><userinput>ln -s tclsh8.4 /tools/bin/tclsh</userinput></screen>
 
 <!-- HACK - Force some whitespace to appease tidy -->
 <literallayout></literallayout>
diff --git a/chapter06/lfs-utils-inst.xml b/chapter06/lfs-utils-inst.xml
index 7ebc6744f..2961ec330 100644
--- a/chapter06/lfs-utils-inst.xml
+++ b/chapter06/lfs-utils-inst.xml
@@ -14,7 +14,7 @@
 <para>Now copy two supporting files included in the Lfs-Utils tarball to
 their destination:</para>
 
-<screen><userinput>cp -f etc/{services,protocols} /etc</userinput></screen>
+<screen><userinput>cp etc/{services,protocols} /etc</userinput></screen>
 
 <para>The <filename>/etc/services</filename> file is used to resolve service
 numbers to human-readable names, and the <filename>/etc/protocols</filename>
diff --git a/chapter06/nettools-inst.xml b/chapter06/nettools-inst.xml
index 28b6f98b5..fee875247 100644
--- a/chapter06/nettools-inst.xml
+++ b/chapter06/nettools-inst.xml
@@ -13,12 +13,12 @@ to actually enable these protocols in the kernel -- what you do here is merely
 telling the package to include support for those protocols in its programs,
 but it's up to the kernel to make the protocols available.</para>
 
-<para>The following patch will fix a small syntax problem with the source
-for the mii-tool binary:</para>
+<para>First fix a small syntax problem in the sources of the mii-tool
+program:</para>
 
 <screen><userinput>patch -Np1 -i ../&net-tools-mii-patch;</userinput></screen>
 
-<para>Prepare Net-tools for compilation with:</para>
+<para>Now prepare Net-tools for compilation with:</para>
 
 <screen><userinput>make config</userinput></screen>
 
diff --git a/chapter06/patch-inst.xml b/chapter06/patch-inst.xml
index 00eb64506..ead7ec11c 100644
--- a/chapter06/patch-inst.xml
+++ b/chapter06/patch-inst.xml
@@ -7,6 +7,9 @@
 
 <screen><userinput>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/usr</userinput></screen>
 
+<para>Again, the preprocessor flag <userinput>-D_GNU_SOURCE</userinput> is only
+needed on the PowerPC platform. On other architectures you can leave it out.</para>
+
 <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
diff --git a/chapter06/procinfo-inst.xml b/chapter06/procinfo-inst.xml
index 35f58509f..9ed40c34d 100644
--- a/chapter06/procinfo-inst.xml
+++ b/chapter06/procinfo-inst.xml
@@ -7,9 +7,12 @@
 
 <screen><userinput>make LDLIBS=-lncurses</userinput></screen>
 
-<para>The <emphasis>-lncurses</emphasis> switch overwrites the
-default switch, <emphasis>-ltermcap</emphasis>. This is done
-because libtermcap is declared obsolete in favor of libncurses.</para>
+<para>The meaning of the make parameter:</para>
+<itemizedlist>
+<listitem><para><userinput>LDLIBS=-lncurses</userinput>: This tells Procinfo
+to use the <filename>libncurses</filename> library instead of  the
+long-obsolete <filename>libtermcap</filename>.</para></listitem>
+</itemizedlist>
 
 <para>And install the package:</para>