* Merged newxml into HEAD

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

1 files changed, 29 insertions, 21 deletions

diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 9eda176a6..22a338164 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -1,14 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
 <sect1 id="ch-tools-glibc">
-<title>Installing Glibc-&glibc-version;</title>
-<?dbhtml filename="glibc.html" dir="chapter05"?>
+<title>Glibc-&glibc-version;</title>
+<?dbhtml filename="glibc.html"?>
 
-<screen>&buildtime; &glibc-time-tools;
-&diskspace; &glibc-compsize-tools;</screen>
+<indexterm zone="ch-tools-glibc">
+<primary sortas="a-Glibc">Glibc</primary>
+<secondary>tools</secondary></indexterm>
 
-&aa-glibc-down;
-&aa-glibc-dep;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/glibc.xml" xpointer="xpointer(/sect1/para[1])"/>
+
+<screen>&buildtime; 11.8 SBU
+&diskspace; 800 MB</screen>
+
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/glibc.xml" xpointer="xpointer(/sect1/para[2])"/>
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of Glibc</title>
@@ -17,7 +26,7 @@
 optimization flags (including the <emphasis>-march</emphasis> and
 <emphasis>-mcpu</emphasis> options). Therefore, if you have defined any
 environment variables that override default optimizations, such as CFLAGS and
-CXXFLAGS, we recommend unsetting them when building Glibc.</para>
+CXXFLAGS, we recommend un-setting them when building Glibc.</para>
 
 <para>Basically, compiling Glibc in any other way than the book suggests
 is putting the stability of your system at risk.</para>
@@ -30,16 +39,16 @@ cd ../glibc-build</userinput></screen>
 
 <para>Next, prepare Glibc for compilation:</para>
 
-<screen><userinput>../&glibc-dir;/configure --prefix=/tools \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-profile --enable-add-ons=linuxthreads \
-&nbsp;&nbsp;&nbsp;&nbsp;--with-binutils=/tools/bin --with-headers=/tools/include \
-&nbsp;&nbsp;&nbsp;&nbsp;--without-gd --without-cvs</userinput></screen>
+<screen><userinput>../glibc-&glibc-version;-20031202/configure --prefix=/tools \
+    --disable-profile --enable-add-ons=linuxthreads \
+    --with-binutils=/tools/bin --with-headers=/tools/include \
+    --without-gd --without-cvs</userinput></screen>
 
 <para>The meaning of the configure options:</para>
 
 <itemizedlist>
-<listitem><para><userinput>--disable-profile</userinput>: This disables the
-building of the libraries with profiling information. Omit this option if you
+<listitem><para><userinput>--disable-profile</userinput>: This
+builds the libraries without profiling information. Omit this option if you
 plan to do profiling on the temporary tools.</para></listitem>
 
 <listitem><para><userinput>--enable-add-ons=linuxthreads</userinput>: This
@@ -52,8 +61,8 @@ these switches are not required. But they ensure nothing can go wrong with
 regard to what kernel headers and Binutils programs get used during the
 Glibc build.</para></listitem>
 
-<listitem><para><userinput>--without-gd</userinput>: This switch ensures
-that we don't build the <command>memusagestat</command> program, which
+<listitem><para><userinput>--without-gd</userinput>: This prevents
+the build of the <command>memusagestat</command> program, which
 strangely enough insists on linking against the host's libraries (libgd,
 libpng, libz, and so forth).</para></listitem>
 
@@ -141,8 +150,8 @@ touch /tools/etc/ld.so.conf</userinput></screen>
 <para>Different countries and cultures have varying conventions for how to
 communicate. These conventions range from very simple ones, such as the format
 for representing dates and times, to very complex ones, such as the language
-spoken. The "internationalization" of GNU programs works by means of
-<emphasis>locales</emphasis>.</para>
+spoken. The <quote>internationalization</quote> of GNU programs works by means
+of <emphasis>locales</emphasis>.</para>
 
 <note><para>If you are not running the test suites here in this chapter as per
 our recommendation, there is little point in installing the locales now. We'll
@@ -177,9 +186,8 @@ localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
 
 </sect2>
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para>
+<sect2><title> </title><para> </para>
 <para>The details on this package are found in <xref linkend="contents-glibc"/>.</para>
-<para>&nbsp;</para></sect2>
+<para> </para></sect2>
 
 </sect1>
-