Minor textual tweaks.

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

12 files changed, 35 insertions, 40 deletions

diff --git a/appendixa/file-down.xml b/appendixa/file-down.xml
index 1b4b2425e..3f95fdec8 100644
--- a/appendixa/file-down.xml
+++ b/appendixa/file-down.xml
@@ -1,4 +1,5 @@
 <literallayout>Official download location for File (&file-version;): 
 <ulink url="ftp://ftp.astron.com/pub/file/"/>
+
 Alternative download location:
 <ulink url="ftp://gaosu.rave.org/pub/linux/lfs/"/></literallayout>
diff --git a/appendixa/glibc-down.xml b/appendixa/glibc-down.xml
index 2fb9b4acc..27a99e8a6 100644
--- a/appendixa/glibc-down.xml
+++ b/appendixa/glibc-down.xml
@@ -1,5 +1,6 @@
 <literallayout>Official download location for Glibc (&glibc-version;): 
 <ulink url="ftp://ftp.gnu.org/gnu/glibc/"/>
+
 Alternative download locations (courtesy of the generous LFS Mirrors):
 <ulink url="ftp://gaosu.rave.org/pub/linux/lfs/packages/conglomeration/&glibc-package;"/>
 <ulink url="http://lfs.mirror.intermedia.com.sg/packages/glibc/&glibc-package;"/>
diff --git a/appendixa/tcl-down.xml b/appendixa/tcl-down.xml
index b03c4f65d..67bbadf8a 100644
--- a/appendixa/tcl-down.xml
+++ b/appendixa/tcl-down.xml
@@ -1,3 +1,2 @@
 <literallayout>Official download location for Tcl (&tcl-version;):
-<ulink url="http://download.sourceforge.net/tcl/"/>
-<ulink url="ftp://download.sourceforge.net/pub/sourceforge/tcl/"/></literallayout>
+<ulink url="http://download.sourceforge.net/tcl/"/></literallayout>
diff --git a/chapter03/chapter03.xml b/chapter03/chapter03.xml
index 2b1fe79ba..9f59c60e1 100644
--- a/chapter03/chapter03.xml
+++ b/chapter03/chapter03.xml
@@ -75,7 +75,7 @@ file system, but build instructions for other file systems can be found at
 
 <para>If you created a (new) swap partition you need to initialize it as a
 swap partition too (also known as formatting, like you did above with
-<userinput>mke2fs</userinput>) by running:</para>
+<command>mke2fs</command>) by running:</para>
 
 <screen><userinput>mkswap /dev/yyy</userinput></screen>
 
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 0d2f9cb81..f5b848ea4 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -16,7 +16,7 @@ basic system characteristics.</para>
 <sect2>
 <title>Installation of Coreutils</title>
 
-<para>Apply the same "Posixver" patch we used previously:</para>
+<para>Apply the same Posixver patch we used previously:</para>
 
 <screen><userinput>patch -Np1 -i ../&coreutils-posixver-patch;</userinput></screen>
 
diff --git a/chapter06/ed.xml b/chapter06/ed.xml
index 8f72ca64c..20dae3bb7 100644
--- a/chapter06/ed.xml
+++ b/chapter06/ed.xml
@@ -20,12 +20,12 @@ because it can be used by the patch program if you encounter an ed-based patch
 file. This happens rarely because diff-based patches are preferred these
 days.</para></note>
 
-<para>Ed normally uses the mktemp function to create temporary files in
-<filename class="directory">/tmp</filename>, but this function contains a
-vulnerability (see the section on Temporary Files in <ulink
+<para>Ed normally uses the <emphasis>mktemp</emphasis> function to create
+temporary files in <filename class="directory">/tmp</filename>, but this
+function contains a vulnerability (see the section on Temporary Files in <ulink
 url="http://en.tldp.org/HOWTO/Secure-Programs-HOWTO/avoid-race.html"/>). The
-following patch makes Ed use mkstemp instead, which is the recommended way to
-create temporary files.</para>
+following patch makes Ed use <emphasis>mkstemp</emphasis> instead, which is
+the recommended way to create temporary files.</para>
 
 <para>Apply the patch:</para>
 
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index 809f1ca31..11683221d 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -34,15 +34,16 @@ following command will do so:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>There are some packages that expect to find the Lex library in
-<filename>/usr/lib</filename>. Create a symlink to account for this:</para>
+<para>There are some packages that expect to find the <emphasis>lex</emphasis>
+library in <filename>/usr/lib</filename>. Create a symlink to account for
+this:</para>
 
 <screen><userinput>ln -s libfl.a /usr/lib/libl.a</userinput></screen>
 
 <para>A few programs don't know about <command>flex</command> yet and try
 to run its predecessor <command>lex</command>. To support those programs,
-create a shell script named <filename>lex</filename> that calls
-<command>flex</command> in Lex emulation mode:</para>
+create a wrapper script named <filename>lex</filename> that calls
+<command>flex</command> in <emphasis>lex</emphasis> emulation mode:</para>
 
 <screen><userinput>cat &gt; /usr/bin/lex &lt;&lt; "EOF"</userinput>
 #!/bin/sh
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 920ff6831..824307bd6 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -10,7 +10,7 @@ the C and C++ compilers.</para>
 
 <literallayout>Official download location for GCC (&gcc-version;): 
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/>
-And for the GCC No-Fixincludes Patch:
+And for the patch:
 <ulink url="&patches-root;&gcc-nofixincludes-patch;"/></literallayout>
 
 &aa-gcc-dep;
@@ -32,11 +32,8 @@ GCC-testsuite package. The full GCC package contains even more
 compilers. Instructions for building these can be found at
 <ulink url="&blfs-root;view/stable/general/gcc.html"/>.</para>
 
-<note><para>Be careful <emphasis role="strong">not</emphasis> to apply the GCC
-Specs patch from <xref linkend="chapter05"/> here.</para></note>
-
-<para>First apply the No-Fixincludes patch that we also used in the previous
-chapter:</para>
+<para>First apply only the No-Fixincludes patch (and <emphasis>not</emphasis>
+the Specs patch) also used in the previous chapter:</para>
 
 <screen><userinput>patch -Np1 -i ../&gcc-nofixincludes-patch;</userinput></screen>
 
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index c5a4fc880..43bb389fb 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -61,7 +61,8 @@ replacements are available for many of these servers.</para></listitem>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>And move the <command>ping</command> program to its proper place:</para>
+<para>And move the <command>ping</command> program to its FHS-compliant
+place:</para>
 
 <screen><userinput>mv /usr/bin/ping /bin</userinput></screen>
 
diff --git a/chapter06/nettools.xml b/chapter06/nettools.xml
index 70bcdd33a..2f149de11 100644
--- a/chapter06/nettools.xml
+++ b/chapter06/nettools.xml
@@ -25,19 +25,17 @@ 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>First fix a small syntax problem in the sources of the mii-tool
-program:</para>
+<para>First fix a small syntax problem in the sources of the
+<command>mii-tool</command> program:</para>
 
 <screen><userinput>patch -Np1 -i ../&net-tools-mii-patch;</userinput></screen>
 
-<para>Now prepare Net-tools for compilation with:</para>
+<para>Now prepare Net-tools for compilation (if you intend to accept the
+defaults, you can skip all the questions by running <userinput>yes "" |
+make config</userinput> instead):</para>
 
 <screen><userinput>make config</userinput></screen>
 
-<para>If you intend to accept the default settings, you may skip the
-questions generated by <command>make config</command> by running
-<userinput>yes "" | make config</userinput> instead.</para>
-
 <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 8e69cbcee..514b33d62 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -17,16 +17,13 @@
 <sect2>
 <title>Installation of Perl</title>
 
-<para>Prepare Perl for compilation:</para>
+<para>If you want full control over the way Perl is set up, you can run the
+interactive <command>Configure</command> script and hand-pick the way this
+package is built. If, however, you guess you can live with the (sensible)
+defaults it auto-detects, then prepare Perl for compilation with:</para>
 
 <screen><userinput>./configure.gnu --prefix=/usr -Dpager="/bin/less -isR"</userinput></screen>
 
-<para>If you want more control over the way Perl sets itself up to be
-built, you can run the interactive <command>Configure</command> script
-instead and modify the way Perl is built. If you think you can live with the
-(sensible) defaults Perl auto-detects, then just use the command listed
-above.</para>
-
 <para>The meaning of the configure option:</para>
 
 <itemizedlist>
diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml
index 5813c4284..8dc8e7817 100644
--- a/chapter06/zlib.xml
+++ b/chapter06/zlib.xml
@@ -16,16 +16,16 @@ some programs.</para>
 <sect2>
 <title>Installation of Zlib</title>
 
-<para>Prepare Zlib for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --shared</userinput></screen>
-
 <note><para>Zlib is known to build its shared library incorrectly if CFLAGS is
 specified in the environment. If you are using your own CFLAGS variable, be
-sure to add the <emphasis role="strong">-fPIC</emphasis> directive to your
-CFLAGS for the duration of the above command, then remove it
+sure to add the <emphasis>-fPIC</emphasis> directive to your CFLAGS for the
+duration of the below <command>configure</command> command, then remove it
 afterwards.</para></note>
 
+<para>Prepare Zlib for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr --shared</userinput></screen>
+
 <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>