* Merged newxml into HEAD

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

1 files changed, 25 insertions, 19 deletions

diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 6cb01b4fa..68c429fb0 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -1,28 +1,35 @@
+<?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-gcc-pass1">
-<title>Installing GCC-&gcc-version; - Pass 1</title>
-<?dbhtml filename="gcc-pass1.html" dir="chapter05"?>
+<title>GCC-&gcc-version; - Pass 1</title>
+<?dbhtml filename="gcc-pass1.html"?>
 
-<screen>&buildtime; &gcc-time-tools-pass1;
-&diskspace; &gcc-compsize-tools-pass1;</screen>
+<indexterm zone="ch-tools-gcc-pass1">
+<primary sortas="a-GCC">GCC</primary>
+<secondary>tools, pass 1</secondary></indexterm>
 
-<literallayout>Official download location for GCC (&gcc-version;): 
-<ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/></literallayout>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gcc.xml" xpointer="xpointer(/sect1/para[1])"/>
 
-&aa-gcc-dep;
+<screen>&buildtime; 4.4 SBU
+&diskspace; 300 MB</screen>
+
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chapter06/gcc.xml" xpointer="xpointer(/sect1/para[2])"/>
 
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
 <sect2>
 <title>Installation of GCC</title>
 
 <para>Unpack only the GCC-core tarball, as we won't be needing the C++ compiler
-nor the test suite at the moment.</para>
+nor the test suite here.</para>
 
 <para>This package is known to behave badly when you change its default
 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 GCC.</para>
+CXXFLAGS, we recommend un-setting them when building GCC.</para>
 
 <para>The GCC documentation recommends building GCC outside of the source
 directory in a dedicated build directory:</para>
@@ -32,10 +39,10 @@ cd ../gcc-build</userinput></screen>
 
 <para>Prepare GCC for compilation:</para>
 
-<screen><userinput>../&gcc-dir;/configure --prefix=/tools \
-&nbsp;&nbsp;&nbsp;&nbsp;--with-local-prefix=/tools \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-nls --enable-shared \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-languages=c</userinput></screen>
+<screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
+    --with-local-prefix=/tools \
+    --disable-nls --enable-shared \
+    --enable-languages=c</userinput></screen>
 
 <para>The meaning of the configure options:</para>
 
@@ -44,7 +51,7 @@ cd ../gcc-build</userinput></screen>
 purpose of this switch is to remove <filename>/usr/local/include</filename>
 from <command>gcc</command>'s include search path. This is not absolutely
 essential; however, we want to try to minimize the influence of the host
-system, thus making this a sensible thing to do.</para></listitem>
+system, so this a sensible thing to do.</para></listitem>
 
 <listitem><para><userinput>--enable-shared</userinput>: This switch may
 seem counter-intuitive at first. But using it allows the building of
@@ -83,7 +90,7 @@ test suite. But, as mentioned before, the test suite framework is not in place
 yet. And there would be little point in running the tests anyhow, since the
 programs from this first pass will soon be replaced.</para>
 
-<para>And install the package:</para>
+<para>Now install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
 
@@ -98,9 +105,8 @@ C compiler to install, as long as there's a symlink pointing to it:</para>
 
 </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-gcc"/>.</para>
-<para>&nbsp;</para></sect2>
+<para> </para></sect2>
 
 </sect1>
-