Index: BOOK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/appendices/dependencies/common.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -38,5 +38,5 @@
 
         <seglistitem>
-         <seg>Attr, Bash, Binutils, Coreutils, GLIBC, GCC, Gettext, Grep,
+         <seg>Attr, Bash, Binutils, Coreutils, Glibc, GCC, Gettext, Grep,
          Libtool, Make, and Sed</seg>
         </seglistitem>
@@ -66,5 +66,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Gettext, Grep,
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Gettext, Grep,
          Libtool, Make, and Sed</seg>
         </seglistitem>
@@ -151,5 +151,5 @@
 
         <seglistitem>
-          <seg>Bash, Bison, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep, Make,
+          <seg>Bash, Bison, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, Make,
           Ncurses, Patch, Readline, Sed, Texinfo</seg>
         </seglistitem>
@@ -179,5 +179,5 @@
 
         <seglistitem>
-          <seg>Bash, Binutils, Bison, Coreutils, GLIBC, GCC, Grep, Make,
+          <seg>Bash, Binutils, Bison, Coreutils, Glibc, GCC, Grep, Make,
           and Readline</seg>
         </seglistitem>
@@ -207,5 +207,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, File, Gawk, GCC,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, File, Gawk, GCC,
          Grep, Make, Perl, Sed, Texinfo and Zlib</seg>
         </seglistitem>
@@ -235,5 +235,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, Gawk, GCC,
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC,
          Grep, M4, Make, Sed</seg>
         </seglistitem>
@@ -263,5 +263,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Make</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -344,5 +344,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
          GMP, ISL, Make, MPC, MPFR, Sed and Texinfo</seg>
         </seglistitem>
@@ -372,5 +372,5 @@
 
         <seglistitem>
-         <seg>ACL, Attr, Bash, Binutils, Coreutils, GLIBC, Gawk, GCC, GMP,
+         <seg>ACL, Attr, Bash, Binutils, Coreutils, Glibc, Gawk, GCC, GMP,
          Grep, Libcap, Make, Patch, Perl, Sed and Texinfo</seg>
         </seglistitem>
@@ -482,5 +482,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
          Make, Patch, Sed and Texinfo</seg>
         </seglistitem>
@@ -503,6 +503,6 @@
       </segmentedlist>
 
-<!-- Begin GLIBC dependency info -->
-  <bridgehead renderas="sect2" id="glibc-dep">GLIBC</bridgehead>
+<!-- Begin Glibc dependency info -->
+  <bridgehead renderas="sect2" id="glibc-dep">Glibc</bridgehead>
 
       <segmentedlist>
@@ -538,5 +538,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep,
+         <seg>Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -566,5 +566,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -594,5 +594,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, GCC, Grep, Make,
          Patch, Sed and Tcl</seg>
         </seglistitem>
@@ -622,5 +622,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, Gawk, GCC, Gettext, Grep, Gzip,
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Gettext, Grep, Gzip,
          Make, Pkg-config-lite, Sed, Texinfo and Util-linux</seg>
         </seglistitem>
@@ -650,5 +650,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
          Make, Sed and Zlib</seg>
         </seglistitem>
@@ -678,5 +678,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -706,5 +706,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep, M4, Make,
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, M4, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -734,5 +734,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep, Make, Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -761,5 +761,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, CLooG, Coreutils, Diffutils, GLIBC,
+         <seg>Bash, Binutils, CLooG, Coreutils, Diffutils, Glibc,
          Findutils, Gawk, GCC, GMP, Grep, ISL, Make, MPFR, Patch, Perl, Sed,
          Tar and Texinfo</seg>
@@ -790,5 +790,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Findutils, Gawk,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk,
          GCC, Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -845,5 +845,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep, M4, Make,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, M4, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -873,5 +873,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
          Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -901,5 +901,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
          Make, Patch, Sed and Texinfo</seg>
         </seglistitem>
@@ -929,5 +929,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, Gawk, GCC, Grep, Make, Perl
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep, Make, Perl
          Sed and Texinfo</seg>
         </seglistitem>
@@ -957,5 +957,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -1012,5 +1012,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, GLIBC, GCC, Make, Perl Sed and XML::Parser</seg>
+         <seg>Binutils, Coreutils, Glibc, GCC, Make, Perl Sed and XML::Parser</seg>
         </seglistitem>
       </segmentedlist>
@@ -1039,5 +1039,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, GLIBC, Findutils, Flex, GCC,
+         <seg>Bash, Binutils, Bison, Coreutils, Glibc, Findutils, Flex, GCC,
          Make, Linux-Headers and Sed</seg>
         </seglistitem>
@@ -1067,5 +1067,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Libcap and Make</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Libcap and Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -1094,5 +1094,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
          GMP, Make, MPC, MPFR, Sed and Texinfo</seg>
         </seglistitem>
@@ -1122,5 +1122,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, Gawk, GCC, Gzip, Make, and
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Gzip, Make, and
          Check</seg>
         </seglistitem>
@@ -1150,5 +1150,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, GLIBC, Flex, Gawk, GCC,
+         <seg>Bash, Binutils, Bison, Coreutils, Glibc, Flex, Gawk, GCC,
          Gettext, Gzip, Make, Pkg-config-lite, Sed, XZ Utils, and Zlib.
          </seg>
@@ -1179,5 +1179,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
          Ncurses and Sed</seg>
         </seglistitem>
@@ -1207,5 +1207,5 @@
 
         <seglistitem>
-         <seg>Attr, Bash, Binutils, Coreutils, GLIBC, GCC, Grep and Make</seg>
+         <seg>Attr, Bash, Binutils, Coreutils, Glibc, GCC, Grep and Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -1234,5 +1234,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Findutils, Gawk,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk,
          GCC, Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -1289,5 +1289,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Findutils, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, GCC, Grep,
          Gzip, Make, KMOD, Ncurses, Perl and Sed</seg>
         </seglistitem>
@@ -1317,5 +1317,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, Gawk, GCC, Grep, Make, Sed
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep, Make, Sed
          and Texinfo</seg>
         </seglistitem>
@@ -1345,5 +1345,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
          Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -1373,5 +1373,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bzip2, Coreutils, GLIBC, Gawk, GCC,
+         <seg>Bash, Binutils, Bzip2, Coreutils, Glibc, Gawk, GCC,
          Grep, Groff, Gzip, Less, XZ Utils, Make and Sed</seg>
         </seglistitem>
@@ -1428,5 +1428,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep, GMP,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, GMP,
          Make, MPFR, Sed and Texinfo</seg>
         </seglistitem>
@@ -1456,5 +1456,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep, GMP,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep, GMP,
          Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -1484,5 +1484,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -1513,5 +1513,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1540,5 +1540,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, Gawk, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -1568,5 +1568,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Gawk, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -1596,5 +1596,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Make and Ncurses</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make and Ncurses</seg>
         </seglistitem>
       </segmentedlist>
@@ -1623,5 +1623,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep, Make, Ncurses
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Ncurses
          and Sed</seg>
         </seglistitem>
@@ -1651,5 +1651,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep, Make, Ncurses,
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make, Ncurses,
          Patch, Sed and Texinfo</seg>
         </seglistitem>
@@ -1679,5 +1679,5 @@
 
         <seglistitem>
-         <seg>ACL, Attr, Bash, Binutils, Coreutils, GLIBC, GCC, Grep, Make,
+         <seg>ACL, Attr, Bash, Binutils, Coreutils, Glibc, GCC, Grep, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -1707,5 +1707,5 @@
 
         <seglistitem>
-         <seg>ACL, Attr, Bash, Binutils, Coreutils, Diffutils, GLIBC,
+         <seg>ACL, Attr, Bash, Binutils, Coreutils, Diffutils, Glibc,
          Findutils, Gawk, GCC, Gettext, Grep, Make and Sed</seg>
         </seglistitem>
@@ -1735,5 +1735,5 @@
 
         <seglistitem>
-         <seg>ACL, Attr, Bash, Binutils, Coreutils, D-Bus, E2fsprogs, GLIBC,
+         <seg>ACL, Attr, Bash, Binutils, Coreutils, D-Bus, E2fsprogs, Glibc,
          Findutils, Gawk, GCC, GPerf, Grep, Intltool, Libcap, Make, Perl,
          Pkg-config, Sed, Util-linux and XML::Parser</seg>
@@ -1764,5 +1764,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, GLIBC, GCC,
+         <seg>Bash, Binutils, Bison, Coreutils, Glibc, GCC,
          Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -1792,5 +1792,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -1820,5 +1820,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, Gawk, GCC, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep, Make,
          Ncurses and Sed</seg>
         </seglistitem>
@@ -1848,5 +1848,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Grep,
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Grep,
          Make, Ncurses, Pkg-config-lite, Sed, Texinfo and Zlib</seg>
         </seglistitem>
@@ -1876,5 +1876,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Findutils, Gawk, GCC,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk, GCC,
          Gettext, Grep, Make, Ncurses, Perl and Sed</seg>
         </seglistitem>
@@ -1931,5 +1931,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GLIBC, Findutils, Gawk, GCC,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Findutils, Gawk, GCC,
          Grep, Make and Sed</seg>
         </seglistitem>
@@ -1959,5 +1959,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GLIBC, GCC, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Glibc, GCC, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
Index: BOOK/appendices/dependencies/sparc.xml
===================================================================
--- BOOK/appendices/dependencies/sparc.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/appendices/dependencies/sparc.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -48,5 +48,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, GLIBC, Elftoaout, Gawk, GCC, Grep, Gzip,
+         <seg>Binutils, Coreutils, Glibc, Elftoaout, Gawk, GCC, Grep, Gzip,
          Make, Patch and Sed</seg>
         </seglistitem>
Index: BOOK/appendices/dependencies/x86.xml
===================================================================
--- BOOK/appendices/dependencies/x86.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/appendices/dependencies/x86.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -21,5 +21,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison Coreutils, Diffutils, GLIBC, Gawk, GCC, Gettext,
+         <seg>Bash, Binutils, Bison Coreutils, Diffutils, Glibc, Gawk, GCC, Gettext,
          Grep, Make, Ncurses, Sed and Texinfo</seg>
         </seglistitem>
Index: BOOK/appendices/rationale/common.xml
===================================================================
--- BOOK/appendices/rationale/common.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/appendices/rationale/common.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -129,5 +129,5 @@
 
     <listitem>
-      <para>GLIBC</para>
+      <para>Glibc</para>
       <para>Any dynamically-linked C program (which is nearly everything
       in CLFS) needs a C library to compile and run.</para>
Index: BOOK/cross-tools/64/glibc.xml
===================================================================
--- BOOK/cross-tools/64/glibc.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/cross-tools/64/glibc.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc.html"?>
 
-  <title>GLIBC-&glibc-version;</title>
+  <title>Glibc-&glibc-version;</title>
 
   <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
     <secondary>cross tools</secondary>
   </indexterm>
@@ -21,5 +21,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/common/glibc.xml
===================================================================
--- BOOK/cross-tools/common/glibc.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/cross-tools/common/glibc.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc.html"?>
 
-  <title>GLIBC-&glibc-version;</title>
+  <title>Glibc-&glibc-version;</title>
 
   <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
     <secondary>cross tools</secondary>
   </indexterm>
@@ -21,7 +21,7 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
-    <para os="da">It should be noted that compiling GLIBC in any way other than
+    <para os="da">It should be noted that compiling Glibc in any way other than
     the method suggested in this book puts the stability of the system at
     risk.</para>
@@ -43,5 +43,5 @@
 
     <para os="dd">Add the following to <filename>config.cache</filename>
-    to disable ssp when building GLIBC:</para>
+    to disable ssp when building Glibc:</para>
 
 <screen os="de"><userinput>echo "libc_cv_ssp=no" &gt; config.cache</userinput></screen>
@@ -66,6 +66,6 @@
         <term><parameter>BUILD_CC="gcc"</parameter></term>
         <listitem>
-          <para>This sets GLIBC to use the current compiler on our system. This is
-          used to create the tools GLIBC uses during its build.</para>
+          <para>This sets Glibc to use the current compiler on our system. This is
+          used to create the tools Glibc uses during its build.</para>
         </listitem>
       </varlistentry>
@@ -74,5 +74,5 @@
         <term><parameter>CC="${CLFS_TARGET}-gcc"</parameter></term>
         <listitem>
-          <para>This forces GLIBC to use the GCC compiler that we made for our target
+          <para>This forces Glibc to use the GCC compiler that we made for our target
           architecture.</para>
         </listitem>
@@ -82,5 +82,5 @@
         <term><parameter>AR="${CLFS_TARGET}-ar"</parameter></term>
         <listitem>
-          <para>This forces GLIBC to use the <command>ar</command> utility
+          <para>This forces Glibc to use the <command>ar</command> utility
           we made for our target architecture.</para>
         </listitem>
@@ -90,5 +90,5 @@
         <term><parameter>RANLIB="${CLFS_TARGET}-ranlib"</parameter></term>
         <listitem>
-          <para>This forces GLIBC to use the <command>ranlib</command> utility
+          <para>This forces Glibc to use the <command>ranlib</command> utility
           we made for our target architecture.</para>
         </listitem>
@@ -106,5 +106,5 @@
         <term><parameter>--with-tls</parameter></term>
         <listitem>
-          <para>This tells GLIBC to use Thread Local Storage.</para>
+          <para>This tells Glibc to use Thread Local Storage.</para>
         </listitem>
       </varlistentry>
@@ -113,5 +113,5 @@
         <term><parameter>--enable-kernel=2.6.32</parameter></term>
         <listitem>
-          <para>This tells GLIBC to compile the library with support
+          <para>This tells Glibc to compile the library with support
           for 2.6.32 and later Linux kernels.</para>
         </listitem>
@@ -121,5 +121,5 @@
         <term><parameter>--with-__thread</parameter></term>
         <listitem>
-          <para>This tells GLIBC to use use the __thread for libc and
+          <para>This tells Glibc to use use the __thread for libc and
           libpthread builds.</para>
         </listitem>
@@ -129,5 +129,5 @@
         <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
         <listitem>
-          <para>This tells GLIBC to use the Binutils that are specific to
+          <para>This tells Glibc to use the Binutils that are specific to
           our target architecture.</para>
         </listitem>
@@ -137,5 +137,5 @@
         <term><parameter>--with-headers=/tools/include</parameter></term>
         <listitem>
-          <para>This tells GLIBC to compile itself against the headers
+          <para>This tells Glibc to compile itself against the headers
           recently installed to the <filename class="directory">/tools</filename>
           directory, so that it knows exactly what features the kernel has
@@ -147,5 +147,5 @@
         <term><parameter>--enable-obsolete-rpc</parameter></term>
         <listitem>
-          <para>This tells GLIBC to install rpc headers that are not installed
+          <para>This tells Glibc to install rpc headers that are not installed
           by default but may be needed by other packages.</para>
         </listitem>
@@ -155,5 +155,5 @@
         <term><parameter>--cache-file=config.cache</parameter></term>
         <listitem>
-          <para>This tells GLIBC to utilize a premade cache file.</para>
+          <para>This tells Glibc to utilize a premade cache file.</para>
         </listitem>
       </varlistentry>
Index: BOOK/cross-tools/mips64/glibc-n32.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc-n32.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/cross-tools/mips64/glibc-n32.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc-n32.html"?>
 
-  <title>GLIBC-&glibc-version; N32</title>
+  <title>Glibc-&glibc-version; N32</title>
 
   <indexterm zone="ch-cross-tools-glibc-n32">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
     <secondary>cross tools, N32</secondary>
   </indexterm>
@@ -21,5 +21,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -51,5 +51,5 @@
     xpointer="xpointer(//*[@os='de'])"/>
 
-    <para os="n1">Tell GLIBC to install its 32-bit libraries into <filename
+    <para os="n1">Tell Glibc to install its 32-bit libraries into <filename
     class="directory">/tools/lib32</filename>:</para>
 
@@ -74,5 +74,5 @@
         <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILDN32}"</parameter></term>
         <listitem>
-          <para>Forces GLIBC to utilize our target architecture GCC utilizing
+          <para>Forces Glibc to utilize our target architecture GCC utilizing
           the N32 flags.</para>
         </listitem>
@@ -82,5 +82,5 @@
         <term><parameter>--libdir=/tools/lib32</parameter></term>
         <listitem>
-          <para>Installs GLIBC into /tools/lib32 instead of /tools/lib.</para>
+          <para>Installs Glibc into /tools/lib32 instead of /tools/lib.</para>
         </listitem>
       </varlistentry>
Index: BOOK/cross-tools/multilib/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc-64bit.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/cross-tools/multilib/glibc-64bit.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc-64.html"?>
 
-  <title>GLIBC-&glibc-version; 64-Bit</title>
+  <title>Glibc-&glibc-version; 64-Bit</title>
 
   <indexterm zone="ch-cross-tools-glibc-64">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
     <secondary>cross tools, 64 Bit</secondary>
   </indexterm>
@@ -21,5 +21,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -51,5 +51,5 @@
     xpointer="xpointer(//*[@os='de'])"/>
 
-    <para os="n1">Tell GLIBC to install its 64-bit libraries into <filename
+    <para os="n1">Tell Glibc to install its 64-bit libraries into <filename
     class="directory">/tools/lib64</filename>:</para>
 
@@ -74,5 +74,5 @@
         <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD64}"</parameter></term>
         <listitem>
-          <para>Forces GLIBC to build using our target architecture GCC
+          <para>Forces Glibc to build using our target architecture GCC
           utilizing the 64 Bit flags.</para>
         </listitem>
@@ -82,5 +82,5 @@
         <term><parameter>--libdir=/tools/lib64</parameter></term>
         <listitem>
-          <para>Puts GLIBC into /tools/lib64 instead of /tools/lib.</para>
+          <para>Puts Glibc into /tools/lib64 instead of /tools/lib.</para>
         </listitem>
       </varlistentry>
Index: BOOK/cross-tools/multilib/glibc.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/cross-tools/multilib/glibc.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc.html"?>
 
-  <title>GLIBC-&glibc-version; 32 Bit</title>
+  <title>Glibc-&glibc-version; 32 Bit</title>
 
   <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
     <secondary>cross tools, 32 Bit</secondary>
   </indexterm>
@@ -21,5 +21,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -73,5 +73,5 @@
         <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD32}"</parameter></term>
         <listitem>
-          <para>Forces GLIBC to utilize our target architecture GCC utilizing
+          <para>Forces Glibc to utilize our target architecture GCC utilizing
           the 32 Bit flags.</para>
         </listitem>
Index: BOOK/cross-tools/sparc64-64/glibc.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/glibc.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/cross-tools/sparc64-64/glibc.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc.html"?>
 
-  <title>GLIBC-&glibc-version;</title>
+  <title>Glibc-&glibc-version;</title>
 
   <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
     <secondary>cross tools</secondary>
   </indexterm>
@@ -21,5 +21,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/sparc64/glibc-64bit.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/cross-tools/sparc64/glibc-64bit.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc-64.html"?>
 
-  <title>GLIBC-&glibc-version; 64-Bit</title>
+  <title>Glibc-&glibc-version; 64-Bit</title>
 
   <indexterm zone="ch-cross-tools-glibc-64">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
     <secondary>cross tools, 64 Bit</secondary>
   </indexterm>
@@ -21,5 +21,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/common/glibc.xml
===================================================================
--- BOOK/final-system/common/glibc.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/final-system/common/glibc.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc.html"?>
 
-  <title>GLIBC-&glibc-version;</title>
+  <title>Glibc-&glibc-version;</title>
 
   <indexterm zone="ch-system-glibc">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
   </indexterm>
 
@@ -18,5 +18,5 @@
     <title/>
 
-    <para>The GLIBC package contains the main C library. This library provides
+    <para>The Glibc 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,
@@ -26,5 +26,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <note os="z">
@@ -34,5 +34,5 @@
       <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> GLIBC provides
+      implementation cannot convert from/to Unicode.</quote> Glibc provides
       an <function>iconv()</function> implementation and can convert from/to
       Unicode, therefore libiconv is not required on a CLFS system.</para>
@@ -58,9 +58,9 @@
 unset LINKER</userinput></screen>
 
-    <para os="b">The GLIBC build system is self-contained and will install
+    <para os="b">The Glibc build system is self-contained and will install
     perfectly, even though the compiler specs file and linker are still
     pointing at <filename class="directory">/tools</filename>. The specs
-    and linker cannot be adjusted before the GLIBC install because the
-    GLIBC Autoconf tests would give false results and defeat the goal
+    and linker cannot be adjusted before the Glibc install because the
+    Glibc Autoconf tests would give false results and defeat the goal
     of achieving a clean build.</para>
 
@@ -69,10 +69,10 @@
 <screen os="s2"><userinput>sed -i 's/\\$$(pwd)/`pwd`/' timezone/Makefile</userinput></screen>
 
-    <para os="e">The GLIBC documentation recommends building GLIBC outside of     the source directory in a dedicated build directory:</para>
+    <para os="e">The Glibc documentation recommends building Glibc outside of     the source directory in a dedicated build directory:</para>
 
 <screen os="f"><userinput>mkdir -v ../glibc-build
 cd ../glibc-build</userinput></screen>
 
-    <para os="g">Prepare GLIBC for compilation:</para>
+    <para os="g">Prepare Glibc for compilation:</para>
 
 <screen os="h"><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
@@ -99,5 +99,5 @@
 
     <important os="l">
-      <para>The test suite for GLIBC is considered critical.
+      <para>The test suite for Glibc is considered critical.
       Do not skip it under any circumstance.</para>
     </important>
@@ -111,9 +111,9 @@
 make -k check 2&gt;&amp;1 | tee glibc-check-log; grep Error glibc-check-log</userinput></screen>
 
-    <para os="o">The GLIBC test suite is highly dependent on certain functions of
+    <para os="o">The Glibc test suite is highly dependent on certain functions of
     the host system, in particular the kernel. The <emphasis>posix/annexc</emphasis> and
     <emphasis>conform/run-conformtest</emphasis> tests normally fail
     and you should see <literal>Error 1 (ignored)</literal> in the output. Apart
-    from this, the GLIBC test suite is always expected to pass. However, in certain
+    from this, the Glibc test suite is always expected to pass. However, in certain
     circumstances, some failures are unavoidable. If a test fails because of a missing
     program (or missing symbolic link), or a segfault, you will see an error code
@@ -158,5 +158,5 @@
     </itemizedlist>
 
-    <para os="q">Though it is a harmless message, the install stage of GLIBC will
+    <para os="q">Though it is a harmless message, the install stage of Glibc will
     complain about the absence of <filename>/etc/ld.so.conf</filename>.
     Prevent this warning with:</para>
@@ -198,5 +198,5 @@
     achieved by using the <command>localedef</command> command. Information on
     this command is located in the <filename>INSTALL</filename> file in the
-    GLIBC source. However, there are a number of locales that are essential in
+    Glibc source. However, there are a number of locales that are essential in
     order for the tests of future packages to pass, in particular, the
     <emphasis>libstdc++</emphasis> tests from GCC. The following instructions,
@@ -237,5 +237,5 @@
 
   <sect2 id="conf-glibc" role="configuration">
-    <title>Configuring GLIBC</title>
+    <title>Configuring Glibc</title>
 
     <indexterm zone="conf-glibc">
@@ -248,6 +248,6 @@
 
     <para>The <filename>/etc/nsswitch.conf</filename> file needs to be created
-    because, although GLIBC provides defaults when this file is missing or
-    corrupt, the GLIBC defaults do not work well in a networked environment.
+    because, although Glibc provides defaults when this file is missing or
+    corrupt, the Glibc defaults do not work well in a networked environment.
     The time zone also needs to be configured.</para>
 
@@ -383,5 +383,5 @@
 
   <sect2 id="contents-glibc" role="content">
-    <title>Contents of GLIBC</title>
+    <title>Contents of Glibc</title>
 
     <segmentedlist>
@@ -723,5 +723,5 @@
         <term><filename class="libraryfile">libcidn</filename></term>
         <listitem>
-          <para>Used internally by GLIBC for handling internationalized domain
+          <para>Used internally by Glibc for handling internationalized domain
           names in the <function>getaddrinfo()</function> function</para>
           <indexterm zone="ch-system-glibc libcidn">
@@ -795,5 +795,5 @@
         <term><filename class="libraryfile">libmemusage</filename></term>
         <listitem>
-          <para>Used by <command>memusage</command> (included in GLIBC, but
+          <para>Used by <command>memusage</command> (included in Glibc, 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/final-system/mips64-64/glibc.xml
===================================================================
--- BOOK/final-system/mips64-64/glibc.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/final-system/mips64-64/glibc.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc.html"?>
 
-  <title>GLIBC-&glibc-version;</title>
+  <title>Glibc-&glibc-version;</title>
 
   <indexterm zone="ch-system-glibc">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
   </indexterm>
 
@@ -20,5 +20,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -70,5 +70,5 @@
     xpointer="xpointer(//*[@os='l6'])"/>
 
-    <para>Now we will force GLIBC to build as 64-bit instead of the default
+    <para>Now we will force Glibc to build as 64-bit instead of the default
     n32 with the following sed:</para>
 
Index: BOOK/final-system/mips64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/mips64/glibc-64bit.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/final-system/mips64/glibc-64bit.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc-64bit.html"?>
 
-  <title>GLIBC-&glibc-version; 64-Bit</title>
+  <title>Glibc-&glibc-version; 64-Bit</title>
 
   <indexterm zone="ch-system-glibc">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
   </indexterm>
 
@@ -20,5 +20,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/mips64/glibc-n32.xml
===================================================================
--- BOOK/final-system/mips64/glibc-n32.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/final-system/mips64/glibc-n32.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc-n32.html"?>
 
-  <title>GLIBC-&glibc-version; N32</title>
+  <title>Glibc-&glibc-version; N32</title>
 
   <indexterm zone="ch-system-glibc-n32">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
   </indexterm>
 
@@ -20,5 +20,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -59,5 +59,5 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para os="m1">Tell GLIBC to install its 32-bit libraries into
+    <para os="m1">Tell Glibc to install its 32-bit libraries into
     <filename class="directory">/lib32</filename>:</para>
 
Index: BOOK/final-system/multilib/glibc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/glibc-64bit.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/final-system/multilib/glibc-64bit.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -12,5 +12,5 @@
 
   <indexterm zone="ch-system-glibc">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
   </indexterm>
 
@@ -20,5 +20,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -59,5 +59,5 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para os="m1">Tell GLIBC to install its 64-bit libraries into
+    <para os="m1">Tell Glibc to install its 64-bit libraries into
     <filename class="directory">/lib64</filename>:</para>
 
Index: BOOK/final-system/multilib/glibc.xml
===================================================================
--- BOOK/final-system/multilib/glibc.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/final-system/multilib/glibc.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc.html"?>
 
-  <title>GLIBC-&glibc-version; 32 Bit Libraries</title>
+  <title>Glibc-&glibc-version; 32 Bit Libraries</title>
 
   <indexterm zone="ch-system-glibc-32">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
     <secondary>32 Bit</secondary>
   </indexterm>
@@ -21,5 +21,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -91,5 +91,5 @@
     <para os="l1b">In multilib, we tend to think that compiling for
     <literal>${CLFS_TARGET32}</literal> is <emphasis>not</emphasis>
-    cross-compiling. GLIBC takes the traditional view that if you are building
+    cross-compiling. Glibc takes the traditional view that if you are building
     for a different host then you are cross-compiling, so you won't be running
     the tests and therefore you don't need the locale files. When we run
Index: BOOK/final-system/ppc/glibc.xml
===================================================================
--- BOOK/final-system/ppc/glibc.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/final-system/ppc/glibc.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc.html"?>
 
-  <title>GLIBC-&glibc-version;</title>
+  <title>Glibc-&glibc-version;</title>
 
   <indexterm zone="ch-system-glibc">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
   </indexterm>
 
@@ -20,5 +20,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/ppc64-64/glibc.xml
===================================================================
--- BOOK/final-system/ppc64-64/glibc.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/final-system/ppc64-64/glibc.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc.html"?>
 
-  <title>GLIBC-&glibc-version;</title>
+  <title>Glibc-&glibc-version;</title>
 
   <indexterm zone="ch-system-glibc">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
   </indexterm>
 
@@ -20,5 +20,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/ppc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/ppc64/glibc-64bit.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/final-system/ppc64/glibc-64bit.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc-64bit.html"?>
 
-  <title>GLIBC-&glibc-version; 64-Bit</title>
+  <title>Glibc-&glibc-version; 64-Bit</title>
 
   <indexterm zone="ch-system-glibc">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
   </indexterm>
 
@@ -20,5 +20,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -58,5 +58,5 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para os="m1">Tell GLIBC to install its 64-bit libraries into
+    <para os="m1">Tell Glibc to install its 64-bit libraries into
     <filename class="directory">/lib64</filename>:</para>
 
Index: BOOK/final-system/ppc64/glibc.xml
===================================================================
--- BOOK/final-system/ppc64/glibc.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/final-system/ppc64/glibc.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc.html"?>
 
-  <title>GLIBC-&glibc-version; 32 Bit Libraries</title>
+  <title>Glibc-&glibc-version; 32 Bit Libraries</title>
 
   <indexterm zone="ch-system-glibc-32">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
     <secondary>32 Bit</secondary>
   </indexterm>
@@ -21,5 +21,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/sparc64-64/glibc.xml
===================================================================
--- BOOK/final-system/sparc64-64/glibc.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/final-system/sparc64-64/glibc.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc.html"?>
 
-  <title>GLIBC-&glibc-version;</title>
+  <title>Glibc-&glibc-version;</title>
 
   <indexterm zone="ch-system-glibc">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
   </indexterm>
 
@@ -20,5 +20,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/glibc-64bit.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/final-system/sparc64/glibc-64bit.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc-64bit.html"?>
 
-  <title>GLIBC-&glibc-version; 64-Bit</title>
+  <title>Glibc-&glibc-version; 64-Bit</title>
 
   <indexterm zone="ch-system-glibc">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
   </indexterm>
 
@@ -20,5 +20,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/x86/glibc.xml
===================================================================
--- BOOK/final-system/x86/glibc.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/final-system/x86/glibc.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc.html"?>
 
-  <title>GLIBC-&glibc-version;</title>
+  <title>Glibc-&glibc-version;</title>
 
   <indexterm zone="ch-system-glibc">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
   </indexterm>
 
@@ -20,5 +20,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/x86/grub.xml
===================================================================
--- BOOK/final-system/x86/grub.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/final-system/x86/grub.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -39,5 +39,5 @@
     </note>
 
-    <para os="s1">GLIBC-&glibc-version; does not declare gets():</para>
+    <para os="s1">Glibc-&glibc-version; does not declare gets():</para>
 
 <screen os="s2"><userinput>sed -i -e '/gets is a/d' grub-core/gnulib/stdio.in.h</userinput></screen>
Index: BOOK/final-system/x86_64-64/glibc.xml
===================================================================
--- BOOK/final-system/x86_64-64/glibc.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/final-system/x86_64-64/glibc.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc.html"?>
 
-  <title>GLIBC-&glibc-version;</title>
+  <title>Glibc-&glibc-version;</title>
 
   <indexterm zone="ch-system-glibc">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
   </indexterm>
 
@@ -20,5 +20,5 @@
 
   <sect2 role="installation">
-    <title>Installation of GLIBC</title>
+    <title>Installation of Glibc</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -62,5 +62,5 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para os="l5">Tell GLIBC to install its libraries into
+    <para os="l5">Tell Glibc to install its libraries into
     <filename class="directory">/lib</filename>:</para>
 
Index: BOOK/final-system/x86_64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/x86_64/glibc-64bit.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/final-system/x86_64/glibc-64bit.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -9,8 +9,8 @@
   <?dbhtml filename="glibc-64bit.html"?>
 
-  <title>GLIBC-&glibc-version; 64-Bit</title>
+  <title>Glibc-&glibc-version; 64-Bit</title>
 
   <indexterm zone="ch-system-glibc">
-    <primary sortas="a-GLIBC">GLIBC</primary>
+    <primary sortas="a-Glibc">Glibc</primary>
   </indexterm>
 
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/materials/common/packages.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -277,5 +277,5 @@
 
     <varlistentry>
-      <term>GLIBC (&glibc-version;) - <token>&glibc-size;</token>:</term>
+      <term>Glibc (&glibc-version;) - <token>&glibc-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&glibc-home;"/></para>
Index: BOOK/temp-system/common/choose.xml
===================================================================
--- BOOK/temp-system/common/choose.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/temp-system/common/choose.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -36,5 +36,5 @@
   <para>To chroot, you will also need a Linux Kernel-2.6.32 or greater
   (having been compiled with GCC-4.1.2 or greater). The reason for the
-  kernel version requirement is that glibc is built to generate the library
+  kernel version requirement is that Glibc is built to generate the library
   for the smallest version of the Linux kernel expected to be supported.</para>
 
Index: BOOK/temp-system/common/grep.xml
===================================================================
--- BOOK/temp-system/common/grep.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/temp-system/common/grep.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -40,5 +40,5 @@
           assumes there is no usable <filename>regex.h</filename> installed and
           instead uses the one included with Grep. This switch forces the use of
-          the regex functions from GLIBC.</para>
+          the regex functions from Glibc.</para>
         </listitem>
       </varlistentry>
Index: BOOK/temp-system/mips64/choose.xml
===================================================================
--- BOOK/temp-system/mips64/choose.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/temp-system/mips64/choose.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -32,5 +32,5 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-  <para>To chroot, you will also need a Linux Kernel-2.6.32 or greater (having been compiled with GCC-4.1.2 or greater). The reason for the kernel version requirement is that glibc is built to generate the library for the smallest version of the Linux kernel expected to be supported.</para>
+  <para>To chroot, you will also need a Linux Kernel-2.6.32 or greater (having been compiled with GCC-4.1.2 or greater). The reason for the kernel version requirement is that Glibc is built to generate the library for the smallest version of the Linux kernel expected to be supported.</para>
 
   <para>To check your kernel version, run <command>cat /proc/version</command> - if it does not say that you are running a 2.6.32 or later Linux kernel, compiled with GCC 4.1.2 or later, you cannot chroot.</para>
Index: BOOK/temp-system/multilib/choose.xml
===================================================================
--- BOOK/temp-system/multilib/choose.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/temp-system/multilib/choose.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -32,5 +32,5 @@
   <para>To chroot, you will also need a Linux Kernel-2.6.32 or greater
   (having been compiled with GCC-4.1.2 or greater). The reason for the
-  kernel version requirement is that glibc is built to generate the library
+  kernel version requirement is that Glibc is built to generate the library
   for the smallest version of the Linux kernel expected to be supported.</para>
 
Index: BOOK/temp-system/ppc64/choose.xml
===================================================================
--- BOOK/temp-system/ppc64/choose.xml	(revision 5cd8d92aef79621b6d349c9d5ee56945195d7ed6)
+++ BOOK/temp-system/ppc64/choose.xml	(revision d785e9deb5fbca67a7d334b06305b3027cc1f010)
@@ -23,5 +23,5 @@
   successfully chroot and execute 64-bit programs.  However, if the
   kernel personality has been set to 32-bit by a utility such as
-  linux32, it will eventually fail when glibc thinks it is building
+  linux32, it will eventually fail when Glibc thinks it is building
   on a 32-bit system and tries to include incompatible assembler code
   in the 64-bit glibc.</para>
