Various text corrections from Chris Staub. Fixes #2470.

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

10 files changed, 27 insertions, 22 deletions

diff --git a/appendices/acronymlist.xml b/appendices/acronymlist.xml
index e9a8fe0b8..4c814f554 100644
--- a/appendices/acronymlist.xml
+++ b/appendices/acronymlist.xml
@@ -177,6 +177,13 @@
     </varlistentry>
 
     <varlistentry>
+      <term><emphasis role="bold">ext4</emphasis></term>
+      <listitem>
+        <para>fourth extended file system</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term><emphasis role="bold">FAQ</emphasis></term>
       <listitem>
         <para>Frequently Asked Questions</para>
@@ -214,7 +221,7 @@
     <varlistentry>
       <term><emphasis role="bold">GB</emphasis></term>
       <listitem>
-        <para>Gibabytes</para>
+        <para>Gigabytes</para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 68b6dfde4..a99074458 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -127,7 +127,7 @@ cd ../gcc-build</userinput></screen>
     <parameter>-lgcc_eh</parameter> within its build system. This dependency
     can be satisfied by creating a symlink to <filename>libgcc.a</filename>,
     since that file will end up containing the objects normally contained in
-    <filename>libgcc_eh.a</filename>.</para>
+    <filename>libgcc_eh.a</filename>:</para>
 
 <screen><userinput remap="install">ln -vs libgcc.a `$LFS_TGT-gcc -print-libgcc-file-name | \
     sed 's/libgcc/&amp;_eh/'`</userinput></screen>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index cd2d53195..76107dddb 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -100,7 +100,8 @@ do
 done</userinput></screen>
 
     <para>In case the above seems hard to follow, let's break it down a bit.
-    First we find all the files under the gcc/config directory that are named
+    First we find all the files under the
+    <filename class="directory">gcc/config</filename> directory that are named
     either <filename>linux.h</filename>, <filename>linux64.h</filename> or
     <filename>sysv4.h</filename>.
     For each file found, we copy it to a file of the same name but with an added
@@ -112,7 +113,7 @@ done</userinput></screen>
     to the end of the file.
     Finally, we use <command>touch</command> to update the timestamp on the copied files.
     When used in conjunction with <command>cp -u</command>, this prevents unexpected
-    changes to the original files in case the command is inadvertently run twice.
+    changes to the original files in case the commands are inadvertently run twice.
     </para>
 
     <para>On x86_64, unsetting the multilib spec for GCC ensures that it
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index fd0285a69..d83498b98 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -157,12 +157,8 @@ esac</userinput></screen>
     </blockquote>
 
     <para>The missing or incompatible <command>msgfmt</command> program is
-    generally harmless, but it can sometimes cause issues when running the
-    test suite. This <command>msgfmt</command> program is part of the
-    Gettext package which the host distribution should provide. If
-    <command>msgfmt</command> is present but deemed incompatible, upgrade
-    the host system's Gettext package or continue without it and see if
-    the test suite runs without problems regardless.</para>
+    generally harmless. This <command>msgfmt</command> program is part of the
+    Gettext package which the host distribution should provide.</para>
 
     <para>Compile the package:</para>
 
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 7167c9df9..d61a1f8de 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -167,8 +167,9 @@ cd ../gcc-build</userinput></screen>
   after <filename class="directory">/usr/lib/gcc</filename>. If your machine is
   a 64-bit system, you may also see a directory named <filename class="directory">lib64</filename>
   towards the end of the string. The important thing to
-  look for here is that gcc has found all three <filename>crt*.o</filename> files under
-  the <filename class="directory">/usr/lib</filename> directory.</para>
+  look for here is that <command>gcc</command> has found all three
+  <filename>crt*.o</filename> files under the
+  <filename class="directory">/usr/lib</filename> directory.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="readjusting.xml"
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 70dec0a2e..726b2a167 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -719,8 +719,8 @@ EOF</userinput></screen>
         <listitem>
           <para>Used internally by Glibc for handling internationalized domain
           names in the <function>getaddrinfo()</function> function</para>
-          <indexterm zone="ch-system-glibc libcrypt">
-            <primary sortas="c-libcrypt">libcrypt</primary>
+          <indexterm zone="ch-system-glibc libcidn">
+            <primary sortas="c-libcidn">libcidn</primary>
           </indexterm>
         </listitem>
       </varlistentry>
diff --git a/chapter06/gmp.xml b/chapter06/gmp.xml
index 9eb52a9c2..c1852e284 100644
--- a/chapter06/gmp.xml
+++ b/chapter06/gmp.xml
@@ -120,7 +120,7 @@ cp    -v doc/{isa_abi_headache,configuration} doc/*.html \
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libgmp">
-        <term><command>libgmp</command></term>
+        <term><filename class="libraryfile">libgmp</filename></term>
         <listitem>
           <para>Contains precision math functions.</para>
           <indexterm zone="ch-system-gmp libgmp">
@@ -130,7 +130,7 @@ cp    -v doc/{isa_abi_headache,configuration} doc/*.html \
       </varlistentry>
 
       <varlistentry id="libgmpxx">
-        <term><command>libgmpxx</command></term>
+        <term><filename class="libraryfile">libgmpxx</filename></term>
         <listitem>
           <para>Contains C++ precision math functions.</para>
           <indexterm zone="ch-system-gmp libgmpxx">
@@ -140,7 +140,7 @@ cp    -v doc/{isa_abi_headache,configuration} doc/*.html \
       </varlistentry>
 
       <varlistentry id="libmp">
-        <term><command>libmp</command></term>
+        <term><filename class="libraryfile">libmp</filename></term>
         <listitem>
           <para>Contains the Berkeley MP math functions.</para>
           <indexterm zone="ch-system-gmp libmp">
diff --git a/chapter06/mpfr.xml b/chapter06/mpfr.xml
index 78f9b5b29..900999257 100644
--- a/chapter06/mpfr.xml
+++ b/chapter06/mpfr.xml
@@ -88,7 +88,7 @@ find . -name \*.html -type f -exec cp -v \{} /usr/share/doc/mpfr-&mpfr-version;
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libmpfr">
-        <term><command>libmpfr</command></term>
+        <term><filename class="libraryfile">libmpfr</filename></term>
         <listitem>
           <para>Contains multiple-precision math functions.</para>
           <indexterm zone="ch-system-mpfr libmpfr">
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index 366819dc7..4f2314f79 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -182,7 +182,7 @@ install -m644 -v -D docs/writing_udev_rules/index.html \
         <seg>ata_id, cdrom_id, collect, create_floppy_devices, edd_id,
         firmware.sh, fstab_import, path_id, scsi_id, udevadm, udevd,
         usb_id, write_cd_rules, and write_net_rules</seg>
-        <seg>libudev</seg>
+        <seg>libudev.{a,so}</seg>
         <seg>/etc/udev</seg>
       </seglistitem>
     </segmentedlist>
@@ -351,7 +351,7 @@ install -m644 -v -D docs/writing_udev_rules/index.html \
       </varlistentry>
 
       <varlistentry id="libudev">
-        <term><command>libudev</command></term>
+        <term><filename class="libraryfile">libudev</filename></term>
         <listitem>
           <para>A library interface to udev device information</para>
           <indexterm zone="ch-system-udev libudev">
diff --git a/general.ent b/general.ent
index c1548eea6..8a50ed7e8 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20090801">
-<!ENTITY releasedate "August 1, 2009">
+<!ENTITY version "SVN-20090812">
+<!ENTITY releasedate "August 12, 2009">
 <!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.5">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->