5 files changed, 17 insertions, 12 deletions

diff --git a/documentation/poky-ref-manual/extendpoky.xml b/documentation/poky-ref-manual/extendpoky.xml
index efbc52f7cb..ebd9804431 100644
--- a/documentation/poky-ref-manual/extendpoky.xml
+++ b/documentation/poky-ref-manual/extendpoky.xml
@@ -357,7 +357,7 @@
                 It is important to use the correct names of packages in the 
                 <filename><link linkend='var-IMAGE_INSTALL'>IMAGE_INSTALL</link></filename> variable. 
                 You must use the OpenEmbedded notation and not the Debian notation for the names 
-                (e.g. <filename>glibc-dev</filename> instead of <filename>libc6-dev</filename>).
+                (e.g. <filename>eglibc-dev</filename> instead of <filename>libc6-dev</filename>).
             </para>
 
             <para>
@@ -524,7 +524,7 @@
             The information covers adding machines similar to those the Yocto Project already supports. 
             Although well within the capabilities of the Yocto Project, adding a totally new architecture 
             might require 
-            changes to <filename>gcc/glibc</filename> and to the site information, which is 
+            changes to <filename>gcc/eglibc</filename> and to the site information, which is 
             beyond the scope of this manual.
         </para>
 
diff --git a/documentation/poky-ref-manual/ref-bitbake.xml b/documentation/poky-ref-manual/ref-bitbake.xml
index b11bd5a2fd..6851fbf603 100644
--- a/documentation/poky-ref-manual/ref-bitbake.xml
+++ b/documentation/poky-ref-manual/ref-bitbake.xml
@@ -122,7 +122,7 @@
             <filename>task-base.bb</filename>,  
             which in turn leads to packages like <filename>Contacts</filename>, 
             <filename>Dates</filename> and <filename>BusyBox</filename>.
-            These packages in turn depend on glibc and the toolchain.
+            These packages in turn depend on <filename>eglibc</filename> and the toolchain.
         </para>
 
         <para>
diff --git a/documentation/poky-ref-manual/ref-classes.xml b/documentation/poky-ref-manual/ref-classes.xml
index e4b2fc57a4..1532ccc917 100644
--- a/documentation/poky-ref-manual/ref-classes.xml
+++ b/documentation/poky-ref-manual/ref-classes.xml
@@ -152,8 +152,8 @@
 
     <para>
         This class renames packages so that they follow the Debian naming
-        policy (i.e. <filename>glibc</filename> becomes <filename>libc6</filename>
-        and <filename>glibc-devel</filename> becomes <filename>libc6-dev</filename>.
+        policy (i.e. <filename>eglibc</filename> becomes <filename>libc6</filename>
+        and <filename>eglibc-devel</filename> becomes <filename>libc6-dev</filename>.
     </para>
 </section>
 
@@ -403,7 +403,7 @@
         still make the correct values available.
         The <filename><link linkend='structure-meta-site'>meta/site directory</link></filename>
         contains test results sorted into different categories such as architecture, endianness, and
-        the libc used. 
+        the <filename>libc</filename> used. 
         Site information provides a list of files containing data relevant to 
         the current build in the 
         <filename><link linkend='var-CONFIG_SITE'>CONFIG_SITE</link></filename> variable 
diff --git a/documentation/poky-ref-manual/ref-variables.xml b/documentation/poky-ref-manual/ref-variables.xml
index 0105222010..da1c079777 100644
--- a/documentation/poky-ref-manual/ref-variables.xml
+++ b/documentation/poky-ref-manual/ref-variables.xml
@@ -328,7 +328,7 @@
 
         <glossentry id='var-ENABLE_BINARY_LOCALE_GENERATION'><glossterm>ENABLE_BINARY_LOCALE_GENERATION</glossterm>
             <glossdef>
-                <para>Variable that controls which locales for <filename>glibc</filename> are
+                <para>Variable that controls which locales for <filename>eglibc</filename> are
                     to be generated during the build (useful if the target device has 64Mbytes
                     of RAM or less).</para>
             </glossdef>
@@ -847,8 +847,10 @@
         <glossentry id='var-POKYLIBC'><glossterm>POKYLIBC</glossterm>
             <glossdef>
                 <para>The <filename>libc</filename> implementation selector. 
-                    You can select <filename>glibc</filename>, <filename>eglibc</filename>, 
-                    or <filename>uclibc</filename>.</para>
+                    You can select <filename>eglibc</filename> or <filename>uclibc</filename>.
+                    <note>This release of the Yocto Project does not support the 
+                    <filename>glibc</filename> implementation of <filename>libc</filename>.</note>
+                </para>
             </glossdef>
         </glossentry>
 
@@ -1094,8 +1096,8 @@
         <glossentry id='var-TARGET_OS'><glossterm>TARGET_OS</glossterm>
             <glossdef>
                 <para>Specifies the target's operating system. 
-                    The variable can be set to "linux" for <filename>glibc</filename>-based systems and
-                    "linux-uclibc" for <filename>uClibc</filename>. 
+                    The variable can be set to "linux" for <filename>eglibc</filename>-based systems and
+                    to "linux-uclibc" for <filename>uclibc</filename>. 
                     For ARM/EABI targets, there are also "linux-gnueabi" and
                     "linux-uclibc-gnueabi" values possible.</para>
             </glossdef>
diff --git a/documentation/poky-ref-manual/usingpoky.xml b/documentation/poky-ref-manual/usingpoky.xml
index fa94b1d604..9da2e326b9 100644
--- a/documentation/poky-ref-manual/usingpoky.xml
+++ b/documentation/poky-ref-manual/usingpoky.xml
@@ -83,8 +83,11 @@
         <para>
             BitBake also tries to execute any dependent tasks first.
             So for example, before building <filename>matchbox-desktop</filename>, BitBake
-            would build a cross compiler and <filename>glibc</filename> if they had not already 
+            would build a cross compiler and <filename>eglibc</filename> if they had not already 
             been built.
+            <note>This release of the Yocto Project does not support the <filename>glibc</filename>
+                GNU version of the Unix standard C library.  By default, the Yocto Project builds with
+                <filename>eglibc</filename>.</note>
         </para>
 
         <para>