Various textual corrections. Thanks Chris Staub.

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

11 files changed, 33 insertions, 25 deletions

diff --git a/appendixa/acronymlist.xml b/appendixa/acronymlist.xml
index fff2327f5..ccb1d453e 100644
--- a/appendixa/acronymlist.xml
+++ b/appendixa/acronymlist.xml
@@ -326,7 +326,7 @@
     <varlistentry>
       <term><emphasis role="bold">LSB</emphasis></term>
       <listitem>
-        <para>Linux Standards Base</para>
+        <para>Linux Standard Base</para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d9f12bb3a..185dec3ba 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,9 @@
           <para>[jhuntwork] - Adjust binutils-pass1 so we don't need to hang on to its
 	  source directories. Also use 'gcc -dumpmachine' instead of the MACHTYPE var.</para>
         </listitem>
+        <listitem>
+          <para>[jhuntwork] - Various textual corrections. Thanks Chris Staub.
+	</listitem>
       </itemizedlist>
     </listitem>
 
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index e71640991..025789793 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -46,12 +46,12 @@
 <screen><userinput>./configure --prefix=/tools --without-bash-malloc</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the configure options:</title>
+      <title>The meaning of the configure option:</title>
 
       <varlistentry>
         <term><parameter>--without-bash-malloc</parameter></term>
         <listitem>
-          <para>This options turns off the use of Bash's memory allocation
+          <para>This option turns off the use of Bash's memory allocation
           (<function>malloc</function>) function which is known to cause
           segmentation faults. By turning this option off, Bash will use
           the <function>malloc</function> functions from Glibc which are
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index aa2ea3623..28fe4385d 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -93,7 +93,7 @@ cd ../gcc-build</userinput></screen>
 <screen><userinput>make bootstrap</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the make parameters:</title>
+      <title>The meaning of the make parameter:</title>
 
       <varlistentry>
         <term><parameter>bootstrap</parameter></term>
diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index 58063a815..cb7a2ea4f 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -50,7 +50,7 @@
 ./configure --prefix=/tools --disable-shared</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the configure options:</title>
+      <title>The meaning of the configure option:</title>
 
       <varlistentry>
         <term><parameter>--disable-shared</parameter></term>
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index 49012584a..fbcafbf87 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -47,7 +47,7 @@
     --disable-perl-regexp</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the configure options:</title>
+      <title>The meaning of the configure option:</title>
 
       <varlistentry>
         <term><parameter>--disable-perl-regexp</parameter></term>
diff --git a/chapter05/introduction.xml b/chapter05/introduction.xml
index fd1a3692e..1704086ef 100644
--- a/chapter05/introduction.xml
+++ b/chapter05/introduction.xml
@@ -52,10 +52,7 @@
   <important>
     <para>After installing each package, delete its source and build directories,
     unless specifically instructed otherwise. Deleting the sources prevents
-    mis-configuration when the same package is reinstalled later. Only three
-    of the packages need to retain the source and build directories in order
-    for their contents to be used by later commands. Pay special attention to
-    these reminders.</para>
+    mis-configuration when the same package is reinstalled later.</para>
   </important>
 
   <para>Check one last time that the <envar>LFS</envar> environment
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 7c25fe1f9..c5f7926b7 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -59,16 +59,25 @@ cd ../binutils-build</userinput></screen>
 
 <screen><userinput>make tooldir=/usr</userinput></screen>
 
-<para>Normally, the tooldir (the directory where the executables will ultimately
-be located) is set to <filename
-class="directory">$(exec_prefix)/$(target_alias)</filename>. For example, i686
-machines would expand that to <filename
-class="directory">/usr/i686-pc-linux-gnu</filename>. Because this is a custom
-system, this target-specific directory in <filename
-class="directory">/usr</filename> is not required. <filename
-class="directory">$(exec_prefix)/$(target_alias)</filename> would be used if the
-system was used to cross-compile (for example, compiling a package on an Intel
-machine that generates code that can be executed on PowerPC machines).</para>
+  <variablelist>
+    <title>The meaning of the make parameter:</title>
+     <varlistentry>
+      <term><parameter>tooldir=/usr</parameter></term>
+      <listitem>
+        <para>Normally, the tooldir (the directory where the executables will
+        ultimately be located) is set to <filename
+        class="directory">$(exec_prefix)/$(target_alias)</filename>. For
+        example, i686 machines would expand that to <filename
+        class="directory">/usr/i686-pc-linux-gnu</filename>. Because this is
+        a custom system, this target-specific directory in <filename
+        class="directory">/usr</filename> is not required. <filename
+        class="directory">$(exec_prefix)/$(target_alias)</filename> would be
+        used if the system was used to cross-compile (for example, compiling a
+        package on an Intel machine that generates code that can be executed
+        on PowerPC machines).</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
 
 <important><para>The test suite for Binutils in this section is
 considered critical. Do not skip it under any
diff --git a/chapter06/changingowner.xml b/chapter06/changingowner.xml
index a22e199c5..618fa40d8 100644
--- a/chapter06/changingowner.xml
+++ b/chapter06/changingowner.xml
@@ -32,9 +32,8 @@ command:</para>
 
 <para>The command uses <parameter>0:0</parameter> instead of
 <parameter>root:root</parameter>, because <command>chown</command>
-is unable to resolve the name <quote>root</quote> until the password
-file has been created. This book assumes you ran this
-<command>chown</command> command.</para>
+is unable to resolve the name <quote>root</quote> until the
+<filename>passwd</filename> file has been created.</para>
 
 </sect1>
 
diff --git a/chapter06/strippingagain.xml b/chapter06/strippingagain.xml
index 7a4090fd3..af1352e04 100644
--- a/chapter06/strippingagain.xml
+++ b/chapter06/strippingagain.xml
@@ -17,7 +17,7 @@ debug the software fully anymore.</para>
 experience any difficulties. However, it is easy to make a typo and
 render the new system unusable, so before running the 
 <command>strip</command> command, it is a good idea to make a
-backup of the current situation.</para>
+backup of the LFS system in its current state.</para>
 
 <para>Before performing the stripping, take special care to ensure that
 none of the binaries that are about to be stripped are running. If
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index bd21f2f32..d58dbb6b7 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -113,7 +113,7 @@ url="&blfs-root;view/svn/postlfs/editors.html#postlfs-editors-vim"/>.</para>
 </sect2>
 
 <sect2 id="conf-vim" role="configuration"><title>Configuring Vim</title>
-<indexterm zone="conf-vim"><primary sortas="e-/etc/vim">/etc/vim</primary></indexterm>
+<indexterm zone="conf-vim"><primary sortas="e-/etc/vimrc">/etc/vimrc</primary></indexterm>
 
 <para>By default, <command>vim</command> runs in vi-incompatible mode. This may
 be new to users who have used other editors in the past. The