Index: BOOK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/appendices/dependencies/common.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -95,5 +95,5 @@
 
         <seglistitem>
-          <seg>Bash, Bison, Coreutils, Diffutils, Gawk, EGlibc, GCC, Grep, Make,
+          <seg>Bash, Bison, Coreutils, Diffutils, Gawk, EGLIBC, GCC, Grep, Make,
           Ncurses, Patch, Readline, Sed and Texinfo</seg>
         </seglistitem>
@@ -123,5 +123,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, File, Gawk, EGlibc, GCC,
+         <seg>Bash, Binutils, Coreutils, Diffutils, File, Gawk, EGLIBC, GCC,
          Grep, Make, Perl, Sed, Texinfo and Zlib</seg>
         </seglistitem>
@@ -151,5 +151,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, EGlibc, GCC,
+         <seg>Bash, Binutils, Coreutils, Gawk, EGLIBC, GCC,
          Grep, M4, Make and Sed</seg>
         </seglistitem>
@@ -179,5 +179,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Make</seg>
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -233,5 +233,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, EGlibc, GCC, GMP, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Gawk, EGLIBC, GCC, GMP, Grep, Make,
          Patch, Perl, Sed and Texinfo</seg>
         </seglistitem>
@@ -315,5 +315,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
          Make, Patch, Sed and Texinfo</seg>
         </seglistitem>
@@ -343,5 +343,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGlibc, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC, Grep, Make,
          Patch, Sed and Tcl</seg>
         </seglistitem>
@@ -371,5 +371,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, Gawk, GCC, Gettext, Grep, Gzip,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Gettext, Grep, Gzip,
          Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -399,5 +399,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, EGlibc, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, EGLIBC, GCC, Grep,
          Make, Sed and Zlib</seg>
         </seglistitem>
@@ -427,5 +427,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -455,5 +455,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, M4, Make,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, M4, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -483,5 +483,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, Make, Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -510,5 +510,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGlibc, Findutils, Gawk,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
          GCC, GMP, Grep, Make, MPFR, Patch, Perl, Sed, Tar and Texinfo</seg>
         </seglistitem>
@@ -538,5 +538,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGlibc, Findutils, Gawk,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
          GCC, Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -559,6 +559,6 @@
       </segmentedlist>
 
-<!-- Begin EGlibc dependency info -->
-  <bridgehead renderas="sect2" id="eglibc-dep">EGlibc</bridgehead>
+<!-- Begin EGLIBC dependency info -->
+  <bridgehead renderas="sect2" id="eglibc-dep">EGLIBC</bridgehead>
 
       <segmentedlist>
@@ -594,5 +594,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, EGlibc, GCC, Grep, M4, Make,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, EGLIBC, GCC, Grep, M4, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -622,5 +622,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
          Make, Patch, Sed and Texinfo</seg>
         </seglistitem>
@@ -650,5 +650,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, EGlibc, GCC, Grep, Make, Perl
+         <seg>Bash, Binutils, Coreutils, Gawk, EGLIBC, GCC, Grep, Make, Perl
          Sed and Texinfo</seg>
         </seglistitem>
@@ -678,5 +678,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -733,5 +733,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, Findutils, Flex, EGlibc, GCC,
+         <seg>Bash, Binutils, Bison, Coreutils, Findutils, Flex, EGLIBC, GCC,
          Make, Linux-Headers and Sed</seg>
         </seglistitem>
@@ -761,5 +761,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, GCC and Make</seg>
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC and Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -788,5 +788,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, EGlibc, GCC, Gzip, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Gawk, EGLIBC, GCC, Gzip, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -815,5 +815,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
          Ncurses and Sed</seg>
         </seglistitem>
@@ -843,5 +843,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, EGlibc, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, EGLIBC, GCC, Grep,
          Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -898,5 +898,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, EGlibc, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, EGLIBC, GCC, Grep,
          Gzip, Make, Module-Init-Tools, Ncurses, Perl and Sed</seg>
         </seglistitem>
@@ -926,5 +926,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, EGlibc, GCC, Grep, Make, Sed
+         <seg>Bash, Binutils, Coreutils, Gawk, EGLIBC, GCC, Grep, Make, Sed
          and Texinfo</seg>
         </seglistitem>
@@ -954,5 +954,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
          Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -982,5 +982,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bzip2, Coreutils, EGlibc, Gawk, GCC,
+         <seg>Bash, Binutils, Bzip2, Coreutils, EGLIBC, Gawk, GCC,
          Grep, Groff, Gzip, Less, XZ-Utils, Make and Sed</seg>
         </seglistitem>
@@ -1037,5 +1037,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, EGlibc, GCC, Grep, GMP,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, EGLIBC, GCC, Grep, GMP,
          Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -1065,5 +1065,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Findutils, EGlibc, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Findutils, EGLIBC, GCC, Grep, Make,
          Sed and Zlib</seg>
         </seglistitem>
@@ -1093,5 +1093,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, EGlibc, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, EGLIBC, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -1122,5 +1122,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1149,5 +1149,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, EGlibc, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Gawk, EGLIBC, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -1177,5 +1177,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Make and Ncurses</seg>
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make and Ncurses</seg>
         </seglistitem>
       </segmentedlist>
@@ -1204,5 +1204,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, Make, Ncurses
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make, Ncurses
          and Sed</seg>
         </seglistitem>
@@ -1232,5 +1232,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, Make, Ncurses,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make, Ncurses,
          Patch, Sed and Texinfo</seg>
         </seglistitem>
@@ -1260,5 +1260,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, Gawk, EGlibc, GCC, Grep, Make
+         <seg>Binutils, Coreutils, Diffutils, Gawk, EGLIBC, GCC, Grep, Make
          and Sed</seg>
         </seglistitem>
@@ -1288,5 +1288,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -1316,5 +1316,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGlibc, Findutils, Gawk,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
          GCC, Gettext, Grep, Make and Sed</seg>
         </seglistitem>
@@ -1344,5 +1344,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, EGlibc, GCC, Make and Sed</seg>
+         <seg>Binutils, Coreutils, EGLIBC, GCC, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1371,5 +1371,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, EGlibc, GCC,
+         <seg>Bash, Binutils, Bison, Coreutils, EGLIBC, GCC,
          Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -1399,5 +1399,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGlibc, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -1427,5 +1427,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, EGlibc, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Gawk, EGLIBC, GCC, Grep, Make,
          Ncurses and Sed</seg>
         </seglistitem>
@@ -1455,5 +1455,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, Gawk, EGlibc, GCC, Grep,
+         <seg>Binutils, Coreutils, Diffutils, Gawk, EGLIBC, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -1483,5 +1483,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, E2fprogs, EGlibc, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, E2fprogs, EGLIBC, GCC, Grep,
          Make, Ncurses, Sed, Texinfo and Zlib</seg>
         </seglistitem>
@@ -1511,5 +1511,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGlibc, Findutils, Gawk,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
          GCC, Gettext, Grep, Make, Ncurses, Perl and Sed</seg>
         </seglistitem>
@@ -1539,5 +1539,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGlibc, Findutils, Gawk,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
          GCC, Grep, Make and Sed</seg>
         </seglistitem>
@@ -1567,5 +1567,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
Index: BOOK/bootable/arm/kernel.xml
===================================================================
--- BOOK/bootable/arm/kernel.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/bootable/arm/kernel.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -124,5 +124,5 @@
       <para>Also, the headers in the system's <filename
       class="directory">include</filename> directory should
-      <emphasis>always</emphasis> be the ones against which EGlibc was
+      <emphasis>always</emphasis> be the ones against which EGLIBC was
       compiled (from the Linux-Headers package) and should
       <emphasis>never</emphasis> be replaced by the kernel headers.</para>
Index: BOOK/bootscripts/common/locale.xml
===================================================================
--- BOOK/bootscripts/common/locale.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/bootscripts/common/locale.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -50,5 +50,5 @@
   canonical charmap for your chosen locale.</para>
 
-  <para>The list of all locales supported by EGlibc can be obtained by running
+  <para>The list of all locales supported by EGLIBC can be obtained by running
   the following command:</para>
 
@@ -85,5 +85,5 @@
   commands above fail with a message similar to the one shown below, this means
   that your locale was either not installed in Chapter 10 or is not supported by
-  the default installation of EGlibc.</para>
+  the default installation of EGLIBC.</para>
 
 <screen><computeroutput>locale: Cannot set LC_* to default locale: No such file or directory</computeroutput></screen>
@@ -92,5 +92,5 @@
   the <command>localedef</command> command, or consider choosing a different
   locale. Further instructions assume that there are no such error messages
-  from EGlibc.</para>
+  from EGLIBC.</para>
 
   <para>Some packages beyond CLFS may also lack support for your chosen locale.
@@ -102,5 +102,5 @@
   <para>Sometimes it is possible to fix this by removing the charmap part of
   the locale specification, as long as that does not change the character map
-  that EGlibc associates with the locale (this can be checked by running the
+  that EGLIBC associates with the locale (this can be checked by running the
   <command>locale charmap</command> command in both locales). For example,
   one would have to change &quot;de_DE.ISO-8859-15@euro&quot; to
Index: BOOK/cross-tools/alpha/eglibc.xml
===================================================================
--- BOOK/cross-tools/alpha/eglibc.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/cross-tools/alpha/eglibc.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -7,10 +7,10 @@
 
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
-  <title>EGlibc-&eglibc-version;</title>
+  <title>EGLIBC-&eglibc-version;</title>
 
   <?dbhtml filename="eglibc.html"?>
 
   <indexterm zone="ch-cross-tools-eglibc">
-    <primary sortas="a-EGlibc">EGlibc</primary>
+    <primary sortas="a-EGLIBC">EGLIBC</primary>
   </indexterm>
 
@@ -20,5 +20,5 @@
 
   <sect2 role="installation">
-    <title>Installation of EGlibc</title>
+    <title>Installation of EGLIBC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/arm/eglibc.xml
===================================================================
--- BOOK/cross-tools/arm/eglibc.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/cross-tools/arm/eglibc.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -7,10 +7,10 @@
 
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
-  <title>EGlibc-&eglibc-version;</title>
+  <title>EGLIBC-&eglibc-version;</title>
 
   <?dbhtml filename="eglibc.html"?>
 
   <indexterm zone="ch-cross-tools-eglibc">
-    <primary sortas="a-EGlibc">EGlibc</primary>
+    <primary sortas="a-EGLIBC">EGLIBC</primary>
   </indexterm>
 
@@ -20,5 +20,5 @@
 
   <sect2 role="installation">
-    <title>Installation of EGlibc</title>
+    <title>Installation of EGLIBC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/common/binutils.xml
===================================================================
--- BOOK/cross-tools/common/binutils.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/cross-tools/common/binutils.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -24,5 +24,5 @@
 
     <para os="da">It is important that Binutils be the first package compiled
-    because both EGlibc and GCC perform various tests on the available
+    because both EGLIBC and GCC perform various tests on the available
     linker and assembler to determine which of their own features to
     enable.</para>
Index: BOOK/cross-tools/common/eglibc.xml
===================================================================
--- BOOK/cross-tools/common/eglibc.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/cross-tools/common/eglibc.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -9,8 +9,8 @@
   <?dbhtml filename="eglibc.html"?>
 
-  <title>EGlibc-&eglibc-version;</title>
+  <title>EGLIBC-&eglibc-version;</title>
 
   <indexterm zone="ch-cross-tools-eglibc">
-    <primary sortas="a-EGlibc">EGlibc</primary>
+    <primary sortas="a-EGLIBC">EGLIBC</primary>
     <secondary>cross tools</secondary>
   </indexterm>
@@ -19,5 +19,5 @@
     <title/>
 
-    <para>The EGlibc package contains the main C library. This library provides
+    <para>The EGLIBC package contains the main C library. This library provides
     the basic routines for allocating memory, searching directories, opening and
     closing files, reading and writing files, string handling, pattern matching,
@@ -27,5 +27,5 @@
 
   <sect2 role="installation">
-    <title>Installation of EGlibc</title>
+    <title>Installation of EGLIBC</title>
 
     <note os="a">
@@ -35,10 +35,10 @@
       <quote>This library provides an <function>iconv()</function>
       implementation, for use on systems which don't have one, or whose
-      implementation cannot convert from/to Unicode.</quote> EGlibc provides
+      implementation cannot convert from/to Unicode.</quote> EGLIBC provides
       an <function>iconv()</function> implementation and can convert from/to
       Unicode, therefore libiconv is not required on an CLFS system.</para>
     </note>
 
-    <para os="p1">EGlibc has various issues addressed by the following patch:</para>
+    <para os="p1">EGLIBC has various issues addressed by the following patch:</para>
 
 <screen os="p2"><userinput>patch -Np1 -i ../&eglibc-fixes-patch;</userinput></screen>
@@ -49,5 +49,5 @@
 sed -e 's/-lgcc_eh//g' Makeconfig.orig > Makeconfig</userinput></screen>
 
-    <para os="b">The EGlibc documentation recommends building EGlibc outside of the
+    <para os="b">The EGLIBC documentation recommends building EGLIBC outside of the
     source directory in a dedicated build directory:</para>
 
@@ -56,5 +56,5 @@
 
     <para os="d">The following lines need to be added to
-    <filename>config.cache</filename> for EGlibc to support NPTL:</para>
+    <filename>config.cache</filename> for EGLIBC to support NPTL:</para>
 
 <screen os="e"><userinput>cat &gt; config.cache &lt;&lt; EOF
@@ -71,5 +71,5 @@
 EOF</userinput></screen>
 
-    <para os="h">Prepare EGlibc for compilation:</para>
+    <para os="h">Prepare EGLIBC for compilation:</para>
 
 <screen os="i"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
@@ -87,6 +87,6 @@
         <term><parameter>BUILD_CC="gcc"</parameter></term>
         <listitem>
-          <para>This tells EGlibc to use the compiler on the host system. This is
-          used to create the tools EGlibc uses during its build.</para>
+          <para>This tells EGLIBC to use the compiler on the host system. This is
+          used to create the tools EGLIBC uses during its build.</para>
         </listitem>
       </varlistentry>
@@ -95,5 +95,5 @@
         <term><parameter>CC="${CLFS_TARGET}-gcc"</parameter></term>
         <listitem>
-          <para>This forces EGlibc to use the GCC compiler that we made for our target
+          <para>This forces EGLIBC to use the GCC compiler that we made for our target
           architecture.</para>
         </listitem>
@@ -103,5 +103,5 @@
         <term><parameter>AR="${CLFS_TARGET}-ar"</parameter></term>
         <listitem>
-          <para>This forces EGlibc to use the <command>ar</command> utility
+          <para>This forces EGLIBC to use the <command>ar</command> utility
           we made for our target architecture.</para>
         </listitem>
@@ -111,5 +111,5 @@
         <term><parameter>RANLIB="${CLFS_TARGET}-ranlib"</parameter></term>
         <listitem>
-          <para>This forces EGlibc to use the <command>ranlib</command> utility
+          <para>This forces EGLIBC to use the <command>ranlib</command> utility
           we made for our target architecture.</para>
         </listitem>
@@ -127,5 +127,5 @@
         <term><parameter>--enable-add-ons</parameter></term>
         <listitem>
-          <para>This tells EGlibc to utilize all add-ons that are
+          <para>This tells EGLIBC to utilize all add-ons that are
           available.</para>
         </listitem>
@@ -135,5 +135,5 @@
         <term><parameter>--with-tls</parameter></term>
         <listitem>
-          <para>This tells EGlibc to use Thread Local Storage.</para>
+          <para>This tells EGLIBC to use Thread Local Storage.</para>
         </listitem>
       </varlistentry>
@@ -142,5 +142,5 @@
         <term><parameter>--with-__thread</parameter></term>
         <listitem>
-          <para>This tells EGlibc to use use the __thread for libc and
+          <para>This tells EGLIBC to use use the __thread for libc and
           libpthread builds.</para>
         </listitem>
@@ -150,5 +150,5 @@
         <term><parameter>--with-binutils=${CLFS}/cross-tools/bin</parameter></term>
         <listitem>
-          <para>This tells EGlibc to use the Binutils that are specific to
+          <para>This tells EGLIBC to use the Binutils that are specific to
           our target architecture.</para>
         </listitem>
@@ -158,5 +158,5 @@
         <term><parameter>--cache-file=config.cache</parameter></term>
         <listitem>
-          <para>This tells EGlibc to utilize a premade cache file.</para>
+          <para>This tells EGLIBC to utilize a premade cache file.</para>
         </listitem>
       </varlistentry>
@@ -200,5 +200,5 @@
     those locales that are wanted and needed. This can be achieved by using
     the <command>localedef</command> command. Information on this command is
-    located in the <filename>INSTALL</filename> file in the EGlibc source.
+    located in the <filename>INSTALL</filename> file in the EGLIBC source.
     However, there are a number of locales that are essential in order for the
     tests of future packages to pass, in particular, the
@@ -247,5 +247,5 @@
 
   <sect2 id="conf-eglibc" role="configuration">
-    <title>Configuring EGlibc</title>
+    <title>Configuring EGLIBC</title>
 
     <indexterm zone="conf-eglibc">
@@ -258,6 +258,6 @@
 
     <para>The <filename>/etc/nsswitch.conf</filename> file needs to be created
-    because, although EGlibc provides defaults when this file is missing or
-    corrupt, the EGlibc defaults do not work well in a networked environment.
+    because, although EGLIBC provides defaults when this file is missing or
+    corrupt, the EGLIBC defaults do not work well in a networked environment.
     The time zone also needs to be configured.</para>
 
@@ -351,5 +351,5 @@
 
   <sect2 id="contents-eglibc" role="content">
-    <title>Contents of EGlibc</title>
+    <title>Contents of EGLIBC</title>
 
     <segmentedlist>
@@ -744,5 +744,5 @@
         <term><filename class="libraryfile">libmemusage</filename></term>
         <listitem>
-          <para>Used by <command>memusage</command> (included in EGlibc, but
+          <para>Used by <command>memusage</command> (included in EGLIBC, but
           not built in a base CLFS system as it has additional dependencies)
           to help collect information about the memory usage of a program</para>
Index: BOOK/cross-tools/common/gcc-static.xml
===================================================================
--- BOOK/cross-tools/common/gcc-static.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/cross-tools/common/gcc-static.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -78,5 +78,5 @@
           include files, since they haven't been created for this architecture
           yet. GCC will be able to find the multi-thread information after
-          the EGlibc headers are created.</para>
+          the EGLIBC headers are created.</para>
         </listitem>
       </varlistentry>
Index: BOOK/cross-tools/common/shadow.xml
===================================================================
--- BOOK/cross-tools/common/shadow.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/cross-tools/common/shadow.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -33,5 +33,5 @@
 
     <para>The following value causes Shadow to use its internal lckpwdf
-    instead of the one provided by EGlibc. The one provided by EGlibc will
+    instead of the one provided by EGLIBC. The one provided by EGLIBC will
     attempt to modify the host system:</para>
 
Index: BOOK/cross-tools/hppa/eglibc.xml
===================================================================
--- BOOK/cross-tools/hppa/eglibc.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/cross-tools/hppa/eglibc.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -7,10 +7,10 @@
 
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
-  <title>EGlibc-&eglibc-version;</title>
+  <title>EGLIBC-&eglibc-version;</title>
 
   <?dbhtml filename="eglibc.html"?>
 
   <indexterm zone="ch-cross-tools-eglibc">
-    <primary sortas="a-EGlibc">EGlibc</primary>
+    <primary sortas="a-EGLIBC">EGLIBC</primary>
   </indexterm>
 
@@ -20,5 +20,5 @@
 
   <sect2 role="installation">
-    <title>Installation of EGlibc</title>
+    <title>Installation of EGLIBC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/x86/eglibc.xml
===================================================================
--- BOOK/cross-tools/x86/eglibc.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/cross-tools/x86/eglibc.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -7,10 +7,10 @@
 
 <sect1 id="ch-cross-tools-eglibc" role="wrap">
-  <title>EGlibc-&eglibc-version;</title>
+  <title>EGLIBC-&eglibc-version;</title>
 
   <?dbhtml filename="eglibc.html"?>
 
   <indexterm zone="ch-cross-tools-eglibc">
-    <primary sortas="a-EGlibc">EGlibc</primary>
+    <primary sortas="a-EGLIBC">EGLIBC</primary>
   </indexterm>
 
@@ -20,5 +20,5 @@
 
   <sect2 role="installation">
-    <title>Installation of EGlibc</title>
+    <title>Installation of EGLIBC</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-preps/settingenviron.xml
===================================================================
--- BOOK/final-preps/settingenviron.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/final-preps/settingenviron.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -71,5 +71,5 @@
   <para os="i">The <envar>LC_ALL</envar> variable controls the localization of
   certain programs, making their messages follow the conventions of a
-  specified country.  If the host system uses a version of EGlibc older
+  specified country.  If the host system uses a version of EGLIBC older
   than 2.2.4, having <envar>LC_ALL</envar> set to something other than
   <quote>POSIX</quote> or <quote>C</quote> (during this chapter) may cause
Index: BOOK/final-system/common/aboutdebug.xml
===================================================================
--- BOOK/final-system/common/aboutdebug.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/final-system/common/aboutdebug.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -29,10 +29,10 @@
     </listitem>
     <listitem os="c3">
-      <para>EGlibc and GCC files (<filename class="directory">/lib</filename>
+      <para>EGLIBC and GCC files (<filename class="directory">/lib</filename>
       and <filename class="directory">/usr/lib</filename>) with debugging
       symbols: 87 MB</para>
     </listitem>
     <listitem os="c4">
-      <para>EGlibc and GCC files without debugging symbols: 16 MB</para>
+      <para>EGLIBC and GCC files without debugging symbols: 16 MB</para>
     </listitem>
   </itemizedlist>
Index: BOOK/final-system/common/bash.xml
===================================================================
--- BOOK/final-system/common/bash.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/final-system/common/bash.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -32,11 +32,11 @@
 <screen os="p2"><userinput>patch -Np1 -i ../&bash-branch_update-patch;</userinput></screen>
 
-    <para os="c">When bash is cross-compiled, it cannot test for the presence
-    of named pipes, amoung other things. If you used <command>su</command> to
+    <para os="c">When bBsh is cross-compiled, it cannot test for the presence
+    of named pipes, among other things. If you used <command>su</command> to
     become an unprivileged user, this combination will cause Bash to build
     without <emphasis>process substitution</emphasis>, which will break one
-    of the c++ test scripts in <literal>eglibc</literal>. The following prevents
-    future problems by skipping tests that can not run while cross-compiling
-    or that do not run properly:</para>
+    of the C++ test scripts in <literal>eglibc</literal>. The following prevents
+    future problems by skipping the check for named pipes, as well as other
+    tests that can not run while cross-compiling or that do not run properly:</para>
 
 <screen os="d"><userinput>cat &gt; config.cache &lt;&lt; "EOF"
Index: BOOK/final-system/common/bzip2.xml
===================================================================
--- BOOK/final-system/common/bzip2.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/final-system/common/bzip2.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -30,7 +30,7 @@
     <title>Installation of Bzip2</title>
 
-    <para os="s1">Bzip2's default Makefile target automatically runs
-    the testsuite as well. Disable the tests since you can not run the
-    cross-compiled binaries causing all of the tests to fail:</para>
+    <para os="s1">Bzip2's default <filename>Makefile</filename> target
+    automatically runs the testsuite as well. Disable the tests since they
+    won't work on a multi-architecture build:</para>
 
 <screen os="s2"><userinput>cp Makefile{,.orig}
Index: BOOK/final-system/common/coreutils.xml
===================================================================
--- BOOK/final-system/common/coreutils.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/final-system/common/coreutils.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -43,6 +43,6 @@
     <para os="a">Configure can not properly determine how to get free space
     when cross-compiling - as a result, the <command>df</command> program will
-    not be built. Add the following entry to <filename>config.cache</filename>
-    to correct this:</para>
+    not be built. Add the following entries to <filename>config.cache</filename>
+    to correct this, and fix various cross-compiling issues:</para>
 
 <screen os="b"><userinput>cat &gt; config.cache &lt;&lt; EOF
Index: BOOK/final-system/common/gzip.xml
===================================================================
--- BOOK/final-system/common/gzip.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/final-system/common/gzip.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -29,5 +29,5 @@
 
     <para os="s1">The following command renames the internal implementation of
-    futimens to gl_futimens as newer versions of EGlibc provide an incompatible
+    futimens to gl_futimens as newer versions of EGLIBC provide an incompatible
     version:</para>
 
Index: BOOK/final-system/common/introduction.xml
===================================================================
--- BOOK/final-system/common/introduction.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/final-system/common/introduction.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -32,5 +32,5 @@
   the code and build tools.  Also note that the <option>-march</option>
   and <option>-mtune</option> options may cause problems with the toolchain
-  packages (Binutils, GCC and EGlibc). The small potential gains achieved in
+  packages (Binutils, GCC and EGLIBC). The small potential gains achieved in
   using compiler optimizations are often outweighed by the risks. First-time
   builders of CLFS are encouraged to build without custom optimizations.
Index: BOOK/final-system/common/pkgmgt.xml
===================================================================
--- BOOK/final-system/common/pkgmgt.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/final-system/common/pkgmgt.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -50,5 +50,5 @@
     <itemizedlist>
       <listitem>
-        <para>If one of the toolchain packages (EGlibc, GCC or Binutils) needs
+        <para>If one of the toolchain packages (EGLIBC, GCC or Binutils) needs
         to be upgraded to a newer minor version, it is safer to
         rebuild CLFS. Though you <emphasis>may</emphasis> be able to get by
Index: BOOK/final-system/common/vim.xml
===================================================================
--- BOOK/final-system/common/vim.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/final-system/common/vim.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -46,6 +46,7 @@
 
     <para os="cc1">The <command>configure</command> script is full of logic
-    that aborts at the first sign of cross compiling. Set the cached values
-    of those tests with the following command:</para>
+    that aborts at the first sign of cross compiling. Work around this by
+    setting the cached values of several tests with the following
+    command:</para>
 
 <screen os="cc2"><userinput>cat &gt; src/auto/config.cache &lt;&lt; EOF
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/introduction/common/changelog.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -53,5 +53,5 @@
         </listitem>
         <listitem>
-          <para>[jciccone] - Updated Glibc to EGlibc 2.10.1.</para>
+          <para>[jciccone] - Updated Glibc to EGLIBC 2.10.1.</para>
         </listitem>
         <listitem>
Index: BOOK/introduction/common/how.xml
===================================================================
--- BOOK/introduction/common/how.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/introduction/common/how.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -52,5 +52,5 @@
   binutils into ${CLFS}/cross-tools, so that we have an asembler and a linker
   for our target architecture. GCC is then compiled statically and installed
-  into ${CLFS}/cross-tools, this cross-compiler is used to build EGlibc for the
+  into ${CLFS}/cross-tools, this cross-compiler is used to build EGLIBC for the
   final-system. The GCC cross-compiler is then rebuilt dynamically - this final
   cross-compiler is what will be used to build the final-system.</para>
Index: BOOK/materials/arm/packages.xml
===================================================================
--- BOOK/materials/arm/packages.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/materials/arm/packages.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -14,5 +14,5 @@
 
     <varlistentry os="eglibcports">
-      <term>EGlibc Ports (&eglibc-ports-version;) - <token>&eglibc-ports-size;</token>:</term>
+      <term>EGLIBC Ports (&eglibc-ports-version;) - <token>&eglibc-ports-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&eglibc-ports-home;"/></para>
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/materials/common/packages.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -124,5 +124,5 @@
 
     <varlistentry>
-      <term>EGlibc (&eglibc-version;) - <token>&eglibc-size;</token>:</term>
+      <term>EGLIBC (&eglibc-version;) - <token>&eglibc-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&eglibc-home;"/></para>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/materials/common/patches.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -65,5 +65,5 @@
 
     <varlistentry>
-      <term>EGlibc Fixes Patch - <token>&eglibc-fixes-patch-size;</token>:</term>
+      <term>EGLIBC Fixes Patch - <token>&eglibc-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
Index: BOOK/prologue/common/hostreqs.xml
===================================================================
--- BOOK/prologue/common/hostreqs.xml	(revision 11462e6761a50d2c6dbcc79037150144b61e7247)
+++ BOOK/prologue/common/hostreqs.xml	(revision fef8487e66149c45326e39cb1dc4dc7da8feb670)
@@ -63,5 +63,5 @@
 
     <listitem>
-      <para><emphasis role="strong">EGlibc-2.2.5</emphasis> (Versions
+      <para><emphasis role="strong">EGLIBC-2.2.5</emphasis> (Versions
       greater than &eglibc-version; are not recommended as they have
       not been tested)</para>
