Index: BOOK/cross-tools/64/glibc.xml
===================================================================
--- BOOK/cross-tools/64/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/64/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -50,12 +50,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/alpha/glibc.xml
===================================================================
--- BOOK/cross-tools/alpha/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/alpha/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -58,12 +58,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/common/glibc.xml
===================================================================
--- BOOK/cross-tools/common/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/common/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -46,12 +46,4 @@
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips/glibc.xml
===================================================================
--- BOOK/cross-tools/mips/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/mips/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -69,12 +69,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
Index: BOOK/cross-tools/mips64-64/glibc.xml
===================================================================
--- BOOK/cross-tools/mips64-64/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/mips64-64/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -69,12 +69,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
Index: BOOK/cross-tools/mips64/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc-64bit.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/mips64/glibc-64bit.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -66,12 +66,4 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='mp2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64/glibc-n32.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc-n32.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/mips64/glibc-n32.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -66,12 +66,4 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='mp2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64/glibc.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/mips64/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -69,12 +69,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
Index: BOOK/cross-tools/multilib/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc-64bit.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/multilib/glibc-64bit.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -50,12 +50,4 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/multilib/glibc.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/multilib/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -50,12 +50,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/ppc/glibc.xml
===================================================================
--- BOOK/cross-tools/ppc/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/ppc/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -50,12 +50,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/ppc64/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/ppc64/glibc-64bit.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/ppc64/glibc-64bit.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -50,12 +50,4 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <para os="t1">Repeat the sed to fix <filename>procfs.h</filename>.</para>
Index: BOOK/cross-tools/ppc64/glibc.xml
===================================================================
--- BOOK/cross-tools/ppc64/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/ppc64/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -50,12 +50,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <para >The kernel's <filename class="directory">asm-ppc</filename> and
Index: BOOK/cross-tools/sparc/glibc.xml
===================================================================
--- BOOK/cross-tools/sparc/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/sparc/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -58,12 +58,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc64-64/glibc.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/sparc64-64/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -58,12 +58,4 @@
     href="../sparc/glibc.xml"
     xpointer="xpointer(//*[@os='ps2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/sparc64/glibc-64bit.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/sparc64/glibc-64bit.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -58,12 +58,4 @@
     href="../sparc/glibc.xml"
     xpointer="xpointer(//*[@os='ps2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc64/glibc.xml
===================================================================
--- BOOK/cross-tools/sparc64/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/cross-tools/sparc64/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -58,12 +58,4 @@
     href="../sparc/glibc.xml"
     xpointer="xpointer(//*[@os='ps2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/alpha/glibc.xml
===================================================================
--- BOOK/final-system/alpha/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/alpha/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -49,12 +49,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/common/glibc.xml
===================================================================
--- BOOK/final-system/common/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/common/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -55,12 +55,4 @@
 
 <screen os="p2"><userinput>patch -Np1 -i ../&glibc-minor-patch;</userinput></screen>
-
-    <para os="s1">The following <command>sed</command> fixes a build issue
-    with Glibc. This will prevent <command>nscd</command> from trying to
-    link to libraries that don't exist:</para>
-
-<screen os="s2"><userinput>cp -v nscd/Makefile{,.orig}
-sed -e "/nscd_stat.o: sysincludes = # nothing/d" nscd/Makefile.orig > \
-    nscd/Makefile</userinput></screen>
 
     <para os="e">The Glibc documentation recommends building Glibc outside of the
Index: BOOK/final-system/mips/glibc.xml
===================================================================
--- BOOK/final-system/mips/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/mips/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -57,12 +57,4 @@
 
 <screen os="mp2"><userinput>patch -Np1 -i ../&glibc-mips-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64-64/glibc.xml
===================================================================
--- BOOK/final-system/mips64-64/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/mips64-64/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -57,12 +57,4 @@
     href="../mips/glibc.xml"
     xpointer="xpointer(//*[@os='mp2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/mips64/glibc-64bit.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/mips64/glibc-64bit.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -57,12 +57,4 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='mp2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/glibc-n32.xml
===================================================================
--- BOOK/final-system/mips64/glibc-n32.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/mips64/glibc-n32.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -57,12 +57,4 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='mp2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/glibc.xml
===================================================================
--- BOOK/final-system/mips64/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/mips64/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -62,12 +62,4 @@
     href="../mips/glibc.xml"
     xpointer="xpointer(//*[@os='mp2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/glibc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/glibc-64bit.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/multilib/glibc-64bit.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -41,12 +41,4 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/glibc.xml
===================================================================
--- BOOK/final-system/multilib/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/multilib/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -46,12 +46,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/ppc64/glibc-64bit.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/ppc64/glibc-64bit.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -41,12 +41,4 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc64/glibc.xml
===================================================================
--- BOOK/final-system/ppc64/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/ppc64/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -46,12 +46,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc/glibc.xml
===================================================================
--- BOOK/final-system/sparc/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/sparc/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -49,12 +49,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64-64/glibc.xml
===================================================================
--- BOOK/final-system/sparc64-64/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/sparc64-64/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -32,9 +32,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
+    xpointer="xpointer(//*[@os='ps1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
+    xpointer="xpointer(//*[@os='ps2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -45,12 +45,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/glibc-64bit.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/sparc64/glibc-64bit.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -41,12 +41,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64/glibc.xml
===================================================================
--- BOOK/final-system/sparc64/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/sparc64/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -54,12 +54,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86/glibc.xml
===================================================================
--- BOOK/final-system/x86/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/x86/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -45,12 +45,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86_64-64/glibc.xml
===================================================================
--- BOOK/final-system/x86_64-64/glibc.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/final-system/x86_64-64/glibc.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -45,12 +45,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 5dd3ae356d34cc75bb1750212dc039d91ddaf77f)
+++ BOOK/introduction/common/changelog.xml	(revision e0b0856fde0de208371fa0126e3f596a57bbff3b)
@@ -46,4 +46,7 @@
           <para>[jim] - Updated to Gettext 0.16.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - The nscd sed is no longer needed to build Glibc 2.5.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
