* Merged newxml into HEAD

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

5 files changed, 148 insertions, 75 deletions

diff --git a/chapter01/contactinfo.xml b/chapter01/administrativa.xml
index 0d8351e43..9046c9217 100644
--- a/chapter01/contactinfo.xml
+++ b/chapter01/administrativa.xml
@@ -1,6 +1,11 @@
+<?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-scatter-administrativa">
 <title>Resources</title>
-<?dbhtml filename="resources.html" dir="chapter01"?>
+<?dbhtml filename="resources.html"?>
 
 
 <sect2 id="ch-scatter-faq">
@@ -27,7 +32,7 @@ support channel is named #LFS-support.</para>
 </sect2>
 
 
-<sect2 id="ch-scatter-maillists">
+<sect2 id="ch-scatter-maillists" xreflabel="Chapter 1 - Mailing lists">
 <title>Mailing lists</title>
 
 <para>The <emphasis>linuxfromscratch.org</emphasis> server is hosting a number
@@ -35,8 +40,7 @@ of mailing lists used for the development of the LFS project. These lists
 include, among others, the main development and support lists.</para>
 
 <para>For information on which lists are available, how to subscribe to them,
-their archive locations, and so on, visit <ulink
-url="&lfs-root;mail.html"/>.</para>
+their archive locations, and so on, visit <ulink url="&lfs-root;mail.html"/>.</para>
 
 </sect2>
 
@@ -46,7 +50,7 @@ url="&lfs-root;mail.html"/>.</para>
 
 <para>All the mailing lists hosted at <emphasis>linuxfromscratch.org</emphasis>
 are also accessible via the NNTP server. All messages posted to a mailing list
-are copied to the correspondent newsgroup, and vice versa.</para>
+are copied to the corresponding newsgroup, and vice versa.</para>
 
 <para>The news server can be reached at
 <emphasis>news.linuxfromscratch.org</emphasis>.</para>
@@ -95,4 +99,3 @@ lists (see above).</para>
 
 
 </sect1>
-
diff --git a/chapter01/askforhelp.xml b/chapter01/askforhelp.xml
index b04a8161b..747a74b92 100644
--- a/chapter01/askforhelp.xml
+++ b/chapter01/askforhelp.xml
@@ -1,9 +1,14 @@
+<?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="prepare-askforhelp">
 <title>How to ask for help</title>
-<?dbhtml filename="askforhelp.html" dir="chapter01"?>
+<?dbhtml filename="askforhelp.html"?>
 
 <para>If you run into a problem while working through this book, you should
-first check the FAQ at <ulink url="&faq-root;"/> -- most likely your question
+first check the FAQ at <ulink url="&faq-root;"/> -- often your question
 is already answered there. If it is not, you should try to find the source of
 the problem. The following hint might give you some ideas for your
 troubleshooting: <ulink url="&hints-root;errors.txt"/>.</para>
@@ -22,7 +27,7 @@ essential things to include in your request are:</para>
 <itemizedlist>
 <listitem><para>the version of the book you are using (being &version;),</para></listitem>
 <listitem><para>the host distribution and version you are using to create
-LFS from,</para></listitem>
+LFS,</para></listitem>
 <listitem><para>the package or section giving you problems,</para></listitem>
 <listitem><para>the exact error message or symptom you are receiving,</para></listitem>
 <listitem><para>whether you have deviated from the book at all.</para></listitem>
@@ -51,7 +56,7 @@ help.</para>
 <para>To help us find the cause of the problem, both screen output and
 the contents of various files are useful. The screen output from both
 the ./configure script and the make run can be useful. Don't blindly
-include the whole thing but on the other hand, don't include too little.
+include the whole thing but, on the other hand, don't include too little.
 As an example, here is some screen output from make:</para>
 
 <screen>gcc -DALIASPATH=\"/mnt/lfs/usr/share/locale:.\"
@@ -82,8 +87,8 @@ above, is what should be included to be helpful, because it includes the
 command that was executed and the command's error message(s).</para>
 
 <para>An excellent article on asking for help on the Internet in general
-has been written by Eric S. Raymond. It is available online at <ulink
-url="http://catb.org/~esr/faqs/smart-questions.html"/>.
+has been written by Eric S. Raymond. It is available online at 
+<ulink url="http://catb.org/~esr/faqs/smart-questions.html"/>.
 Read and follow the hints in that document and you are much more likely
 to get a response to start with and also to get the help you actually
 need.</para>
@@ -104,4 +109,3 @@ about them, then usually there is no need to be concerned.</para>
 
 
 </sect1>
-
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 744056af0..d152c2a3e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -1,12 +1,17 @@
+<?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-scatter-changelog">
 <title>Changelog</title>
-<?dbhtml filename="changelog.html" dir="chapter01"?>
+<?dbhtml filename="changelog.html"?>
 
 <para>This is version &version; of the Linux From Scratch book, dated
 &releasedate;. If this book is more than two months old, a newer and better
 version is probably already available. To find out, please check one of the
 mirrors via <ulink url="&lfs-root;"/>.</para>
- 
+
 <para>Below is a list of changes made since the previous release of the book,
 first a summary, then a detailed log.</para>
 
@@ -14,37 +19,78 @@ first a summary, then a detailed log.</para>
 
 <listitem><para>Upgraded to:</para>
 <itemizedlist>
+<listitem><para>autoconf-2.59</para></listitem>
+<listitem><para>automake-1.8.4</para></listitem>
+<listitem><para>coreutils-5.2.1</para></listitem>
+<listitem><para>e2fsprogs-1.35</para></listitem>
+<listitem><para>expect-5.41.0</para></listitem>
+<listitem><para>file-4.09</para></listitem>
+<listitem><para>gcc-3.3.3</para></listitem>
+<listitem><para>gettext-0.14.1</para></listitem>
+<listitem><para>grub-0.94</para></listitem>
+<listitem><para>kbd-1.12</para></listitem>
 <listitem><para>less-382</para></listitem>
-<listitem><para>lfs-utils-0.5</para></listitem>
-<listitem><para>linux-2.4.25</para></listitem>
+<listitem><para>lfs-bootscripts-2.0.4</para></listitem>
+<listitem><para>libtool-2.5.6</para></listitem>
+<listitem><para>linux-2.4.26</para></listitem>
 <listitem><para>man-pages-1.66</para></listitem>
+<listitem><para>modutils-2.4.27</para></listitem>
 <listitem><para>ncurses-5.4</para></listitem>
-<listitem><para>procps-3.2.0</para></listitem>
+<listitem><para>perl-5.8.4</para></listitem>
+<listitem><para>procps-3.2.1</para></listitem>
+<listitem><para>psmisc-21.4</para></listitem>
+<listitem><para>sed-4.0.9</para></listitem>
+<listitem><para>shadow-4.0.4.1</para></listitem>
+<listitem><para>tar-1.13.94</para></listitem>
+<listitem><para>tcl-8.4.6</para></listitem>
+<listitem><para>texinfo-4.7</para></listitem>
+<listitem><para>util-linux-2.12a</para></listitem>
 </itemizedlist>
 </listitem>
 
 <listitem><para>Added:</para>
 <itemizedlist>
+<listitem><para>iana-etc-1.00</para></listitem>
+<listitem><para>inetutils-1.4.2-no_server_man_pages-1.patch</para></listitem>
 <listitem><para>make_devices-1.2</para></listitem>
+<listitem><para>mktemp-1.5 + mktemp-1.5-add-tempfile.patch</para></listitem>
 </itemizedlist>
 </listitem>
  
 <listitem><para>Removed:</para>
 <itemizedlist>
+<listitem><para>gcc-3.3.1-suppress-libiberty.patch</para></listitem>
+<listitem><para>lfs-utils-0.5</para></listitem>
 <listitem><para>MAKEDEV-1.7</para></listitem>
+<listitem><para>man-1.5m2-manpath.patch</para></listitem>
+<listitem><para>man-1.5m2-pager.patch</para></listitem>
 <listitem><para>ncurses-5.3-etip-2.patch</para></listitem>
+<listitem><para>ncurses-5.3-vsscanf.patch</para></listitem>
+<listitem><para>perl-5.8.0-libc-3.patch</para></listitem>
+<listitem><para>procps-3.1.11-locale-fix.patch</para></listitem>
+<listitem><para>shadow-4.0.3-newgrp-fix.patch</para></listitem>
+<listitem><para>zlib-1.1.4-vsnprintf.patch</para></listitem>
 </itemizedlist>
 </listitem>
 
-<listitem><para>March 21st, 2004 [jeremy]: Chapter 6 - Grub - Removed the sed
-used with grub-0.93 for gcc 3.3 compliance, as it's not necessary with
-0.94</para></listitem>
+<listitem><para>May 2nd, 2004 [matt]: Quoted chroot commands in chapter 6 (bug
+#818).</para></listitem>
+<listitem><para>May 2nd, 2004 [matt]: Removed description of the now
+non-existent part IV from the structure section in the prologue.</para>
+</listitem>
+<listitem><para>May 1st, 2004 [jeremy]: Added creation of the /media and /srv
+directories, as well as 2 directories under /media for floppy and cdrom, as per
+FHS - fixes bugzilla bug #785 and #819.</para></listitem>
+
+<listitem><para>April 14th, 2004 [jeremy]: Updated to lfs-bootscripts-2.0.3, no
+textual changes needed</para></listitem>
 
-<listitem><para>March 9th, 2004 [alex]: Chapter 6 - Removed --login from the
-chroot commands.</para></listitem>
+<listitem><para>March 24th, 2004 [jeremy]: Chapter 7 - Updated to the new
+lfs-bootscripts-2.0.2, and all necessary changes to the bootscript
+configuration</para></listitem>
 
-<listitem><para>March 6th, 2004 [alex]: Rotated the contents of chapters 2, 3
-and 4.</para></listitem>
+<listitem><para>March 21st, 2004 [winkie]: Chapter 6 - Replaced Lfs-Utils
+with Iana-Etc and Mktemp.</para></listitem>
 
 <listitem><para>February 27th, 2004 [jeremy]: Upgraded to
 Procps-3.2.0.</para></listitem>
@@ -71,7 +117,7 @@ system from chapter 9 to the end of chapter 6.</para></listitem>
 E2fsprogs: Clarified the prerequisites for running the tests.</para></listitem>
 
 <listitem><para>February 19th, 2004 [alex]: Chapter 5 - Stripping: Removed
-an unnecessary "{,share/}" from the documentation's <command>rm</command>
+an unnecessary <quote>{,share/}</quote> from the documentation's <command>rm</command>
 command.</para></listitem>
 
 <listitem><para>February 14th, 2004 [jeremy]: Chapter 6 - Upgraded to
@@ -91,7 +137,7 @@ installation section to chapter 7.</para></listitem>
 Man-pages-1.66.</para></listitem>
 
 <listitem><para>February 7th, 2004 [alex]: Chapter 1 - Moved the Conventions
-and Acknowledgements sections to the Preface.</para></listitem>
+and Acknowledgments sections to the Preface.</para></listitem>
 
 <listitem><para>February 7th, 2004 [alex]: Chapter 6 - Creating devices:
 replaced the MAKEDEV script with the make_devices script. Contributed by
@@ -110,4 +156,3 @@ added a little arch script for Perl.</para></listitem>
 <para>Release of version 5.1-pre1 on February 1st, 2004.</para>
 
 </sect1>
-
diff --git a/chapter01/chapter01.xml b/chapter01/chapter01.xml
index 0782d3e5c..0698615df 100644
--- a/chapter01/chapter01.xml
+++ b/chapter01/chapter01.xml
@@ -1,10 +1,21 @@
-<chapter id="chapter01" xreflabel="Chapter 1">
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter 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;
+]>
+<chapter id="chapter-intro" xreflabel="Chapter 1">
+<?dbhtml dir="chapter01"?>
 <title>Introduction</title>
-<?dbhtml filename="chapter01.html" dir="chapter01"?>
+<?dbhtml filename="chapter01.html"?>
 
-&c1-how;
-&c1-changelog;
-&c1-resources;
-&c1-askforhelp;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="how.xml"/>
+
+
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="changelog.xml"/>
+
+
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="administrativa.xml"/>
+
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="askforhelp.xml"/>
 
 </chapter>
diff --git a/chapter01/how.xml b/chapter01/how.xml
index 18bbfc3fc..1181abb3e 100644
--- a/chapter01/how.xml
+++ b/chapter01/how.xml
@@ -1,6 +1,11 @@
+<?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-scatter-how">
 <title>How things are going to be done</title>
-<?dbhtml filename="how.html" dir="chapter01"?>
+<?dbhtml filename="how.html"?>
 
 <para>You are going to build your LFS system by using a previously installed
 Linux distribution (such as Debian, Mandrake, Red Hat, or SuSE). This existing
@@ -9,57 +14,62 @@ programs like a compiler, linker and shell to build the new system. Normally
 all the required tools are available if you selected <quote>development</quote>
 as one of the options when you installed your distribution.</para>
 
-<para>In <xref linkend="chapter-making-space"/> you will first create a new
+<para>In <xref linkend="chapter-partitioning"/> you will first create a new Linux native
 partition and file system, the place where your new LFS system will be compiled
-and installed. Then in <xref linkend="chapter-getting-materials"/> you download
-all the packages and patches needed to build an LFS system, and store them on
-the new file system. In <xref linkend="chapter-preparation"/> you set up a good
+and installed. Then in <xref linkend="chapter-getting-materials"/> you download all the
+packages and patches needed to build an LFS system, and store them on the new
+file system. In <xref linkend="chapter-final-preps"/> you set up a good
 environment to work in.</para>
 
-<para><xref linkend="chapter-temporary-tools"/> then discusses the installation
-of a number of packages that form the basic development suite used to build the
-actual system in <xref linkend="chapter-building-system"/>.</para>
+<para><xref linkend="chapter-temporary-tools"/> then discusses the installation of a number
+of packages that will form the basic development suite (or <emphasis>toolchain</emphasis>) which is
+used to build the actual system in <xref linkend="chapter-building-system"/>. Some of these
+packages are needed to resolve circular dependencies -- for example, to compile
+a compiler you need a compiler.</para>
 
-<para>The first thing to be done in <xref linkend="chapter-temporary-tools"/>
-is build a first pass of the <emphasis>toolchain</emphasis>, consisting of
-Binutils and GCC. The programs from these packages will be linked statically in
-order for them to be usable independently of the host system (thus making it
-in theory possible to skip the second passes). The second thing to do is build
-Glibc, the C library. Glibc will be compiled by the just-built toolchain
-programs. The third thing to do is build a second pass of the toolchain, this
-time linking it dynamically against the newly built Glibc. The remaining <xref
-linkend="chapter-temporary-tools"/> packages are all built using this second
-pass toolchain and are dynamically linked against the new host-independent
-Glibc. When this is done, the LFS installation process will no longer depend on
-the host distribution, with the exception of the running kernel.</para>
+<para>The first thing to be done in <xref linkend="chapter-temporary-tools"/> is build a
+first pass of the toolchain, made up of Binutils and GCC. The programs from
+these packages will be linked statically in order for them to be usable
+independently of the host system. The second thing to do is build Glibc, the
+C library. Glibc will be compiled by the toolchain programs just built in
+the first pass. The third thing to do is build a second pass of the toolchain.
+This time the toolchain will be dynamically linked against the newly built
+Glibc. The remaining <xref linkend="chapter-temporary-tools"/> packages are all built using
+this second pass toolchain and dynamically linked against the new
+host-independent Glibc. When this is done, the LFS installation process will no
+longer depend on the host distribution, with the exception of the running
+kernel.</para>
 
 <para>You may be thinking that <quote>this seems like a lot of work, just to
 get away from my host distribution</quote>. Well, a full technical explanation
-is provided at the start of <xref linkend="chapter-temporary-tools"/>,
-including some notes on the differences between statically and dynamically
-linked programs.</para>
+is provided at the start of <xref linkend="chapter-temporary-tools"/>, including some notes
+on the differences between statically and dynamically linked programs.</para>
 
-<para>In <xref linkend="chapter-building-system"/> your real LFS system will be
-built. The <command>chroot</command> (change root) program is used to enter a
-virtual environment and start a new shell whose root directory will be set to
-the LFS partition. This is very similar to rebooting and instructing the kernel
-to mount the LFS partition as the root partition. The reason that you don't
-actually reboot, but instead chroot, is that creating a bootable system
-requires additional work which isn't necessary just yet. But the major
-advantage is that chrooting allows you to continue using the host while LFS is
-being built. While waiting for package compilation to complete, you can simply
-switch to a different VC (Virtual Console) or X desktop and continue using the
-computer as you normally would.</para>
+<para>In <xref linkend="chapter-building-system"/> your real LFS system will be built. The
+chroot (change root) program is used to enter a virtual environment and start
+a new shell whose root directory will be set to the LFS partition. This is very
+similar to rebooting and instructing the kernel to mount the LFS partition as
+the root partition. The reason that you don't actually reboot, but instead
+chroot, is that creating a bootable system requires additional work which isn't
+necessary just yet. But the major advantage is that <quote>chrooting</quote> allows you to
+continue using the host while LFS is being built. While waiting for package
+compilation to complete, you can simply switch to a different VC (Virtual
+Console) or X desktop and continue using the computer as you normally
+would.</para>
 
 <para>To finish the installation, the bootscripts are set up in
 <xref linkend="chapter-bootscripts"/>, the kernel and bootloader are set up in
-<xref linkend="chapter-mixture"/>, and <xref linkend="chapter-finalizing"/>
-contains some pointers to help you after you finish the book. Then, finally,
-you're ready to reboot your computer into your new LFS system.</para>
+<xref linkend="chapter-bootable"/>, and <xref linkend="chapter-finalizing"/> contains some
+pointers to help you after you finish the book. Then, finally, you're ready to
+reboot your computer into your new LFS system.</para>
 
-<para>This is the process in a nutshell. Detailed information on all the steps
-taken is given in the chapters and sections as you progress through them. If
-something isn't completely clear now, don't worry, everything will fall into
-place soon.</para>
+<para>This is the process in a nutshell. Detailed information on the steps you 
+will take are discussed in the chapters and package descriptions as you 
+progress through them. If something isn't completely clear now, don't worry, 
+everything will fall into place soon.</para>
+
+<para>Please read <xref linkend="chapter-final-preps"/> carefully as it explains
+ a few important things you should be aware of before you begin to work through
+<xref linkend="chapter-temporary-tools"/> and beyond.</para>
 
 </sect1>