HEAD: Retaged the SBUs/disk-usage sections, the lists of options and the contents sections in chapter05.

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

1 files changed, 56 insertions, 33 deletions

diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index ac078f633..d32b00034 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-tools-glibc">
+<sect1 id="ch-tools-glibc" role="wrap">
 <title>Glibc-&glibc-version;</title>
 <?dbhtml filename="glibc.html"?>
 
@@ -11,15 +11,20 @@
 <primary sortas="a-Glibc">Glibc</primary>
 <secondary>tools</secondary></indexterm>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/glibc.xml" xpointer="xpointer(/sect1/para[1])"/>
+<sect2 role="package"><title/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/glibc.xml" xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
-<screen>&buildtime; 11.8 SBU
-&diskspace; 800 MB</screen>
+<segmentedlist>
+<segtitle>&buildtime;</segtitle>
+<segtitle>&diskspace;</segtitle>
+<seglistitem><seg>11.8 SBU</seg><seg>800 MB</seg></seglistitem>
+</segmentedlist>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/glibc.xml" xpointer="xpointer(/sect1/para[2])"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/glibc.xml" xpointer="xpointer(/sect1/sect2[1]/segmentedlist[2])"/>
 
+</sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Glibc</title>
 
 <para>This package is known to behave badly when you change its default
@@ -46,38 +51,56 @@ cd ../glibc-build</userinput></screen>
 
 <para>The meaning of the configure options:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--disable-profile</userinput>: This builds the
+<variablelist>
+<varlistentry>
+<term><userinput>--disable-profile</userinput></term>
+<listitem><para>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=nptl</userinput>: This
-tells Glibc to use the NPTL add-on as its threading library.</para></listitem>
-
-<listitem><para><userinput>--with-tls</userinput>: This tells Glibc to include
-support for TLS (thread-local storage).  This is required for NPTL to work.
-</para></listitem>
-
-<listitem><para><userinput>--with-binutils=/tools/bin</userinput>: Strictly
-speaking this switch is not required. But it does ensure nothing can go wrong
-with regard to what Binutils programs get used during the Glibc build.</para></listitem>
-
-<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>
-
-<listitem><para><userinput>--without-cvs</userinput>: This is meant to prevent
+profiling on the temporary tools.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><userinput>--enable-add-ons=nptl</userinput></term>
+<listitem><para>This tells Glibc to use the NPTL add-on as its threading 
+library.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><userinput>--with-tls</userinput></term>
+<listitem><para>This tells Glibc to include support for TLS (thread-local storage).
+This is required for NPTL to work. </para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><userinput>--with-binutils=/tools/bin</userinput></term>
+<listitem><para>Strictly speaking this switch is not required. But it does ensure 
+nothing can go wrong with regard to what Binutils programs get used during the 
+Glibc build.</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><userinput>--without-gd</userinput></term>
+<listitem><para>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>
+</varlistentry>
+
+<varlistentry>
+<term><userinput>--without-cvs</userinput></term>
+<listitem><para>This is meant to prevent
 the Makefiles from attempting automatic CVS checkouts when using a CVS
 snapshot. But it's not actually needed these days. We use it because it
 suppresses an annoying but harmless warning about a missing
 <command>autoconf</command> program.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--with-headers=/tools/glibc-kernheaders</userinput>:
-This tells Glibc to compile against the <quote>raw</quote> kernel headers, so
-that it knows exactly what features the kernel has, and can optimize itself
-accordingly.  Not strictly necessary, but nice to have.</para></listitem>
-</itemizedlist>
+<varlistentry>
+<term><userinput>--with-headers=/tools/glibc-kernheaders</userinput></term>
+<listitem><para>This tells Glibc to compile against the <quote>raw</quote> 
+kernel headers, so that it knows exactly what features the kernel has, and can 
+optimize itself accordingly.  Not strictly necessary, but nice to have.</para></listitem>
+</varlistentry>
+</variablelist>
 
 <para>During this stage you might see the following warning:</para>
 
@@ -193,7 +216,7 @@ localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
 
 </sect2>
 
-<sect2><title/>
+<sect2 role="content"><title/>
 <para>The details on this package are found in <xref linkend="contents-glibc"/>.</para>
 </sect2>