20 files changed, 357 insertions, 647 deletions
diff --git a/chapter01/acknowledgements.xml b/chapter01/acknowledgements.xml
index 0b4777a39..03d67cbdd 100644
--- a/chapter01/acknowledgements.xml
+++ b/chapter01/acknowledgements.xml
@@ -1,92 +1,60 @@
 <sect1 id="ch01-acknowledgments">
 <title>Acknowledgments</title>
 
-<para>
-We would like to thank the following people and organizations for their
-contributions toward the Linux From Scratch project:
-</para>
+<para>We would like to thank the following people and organizations for their
+contributions toward the Linux From Scratch project:</para>
 
 <itemizedlist>
 
-<listitem><para>
-<ulink url="mailto:mstone@linux.com">Mark Stone</ulink> for
-donating the linuxfromscratch.org server.
-</para></listitem>
+<listitem><para><ulink url="mailto:mstone@linux.com">Mark Stone</ulink> for
+donating the linuxfromscratch.org server.</para></listitem>
 
-<listitem><para>
-<ulink url="http://www.valinux.com">VA Linux Systems</ulink> for
-providing rackspace and bandwidth for the linuxfromscratch.org server.
-</para></listitem>
+<listitem><para><ulink url="http://www.valinux.com">VA Linux Systems</ulink> for
+providing rackspace and bandwidth for the linuxfromscratch.org server.</para></listitem>
 
-<listitem><para>
-<ulink url="http://www.dreamwvr.com/services">DREAMWVR.COM</ulink> for
+<listitem><para><ulink url="http://www.dreamwvr.com/services">DREAMWVR.COM</ulink> for
 their ongoing sponsorship by donating various resources to the LFS and
-related sub-projects .
-</para></listitem>
-
-<listitem><para>
-<ulink url="mailto:jan.niemann@tu-bs.de">Jan Niemann</ulink> for providing
-<ulink url="http://helga.lk.etc.tu-bs.de">
-http://helga.lk.etc.tu-bs.de</ulink> as the 134.169.139.209 mirror.
-</para></listitem>
-
-<listitem><para>
-<ulink url="mailto:johanlenglet@linuxfromscratch.org">Johan Lenglet</ulink> for
-leading the French translation project at <ulink
-url="http://www.fr.linuxfromscratch.org">
-http://www.fr.linuxfromscratch.org</ulink>.
-</para></listitem>
-
-<listitem><para>
-<ulink url="mailto:mpeters@mac.com">Michael Peters</ulink> for
-contributing the Apple PowerPC modifications.
-</para></listitem>
-
-<listitem><para>
-<ulink url="http://www.valinux.com">VA Linux Systems</ulink> who, on
-behalf of <ulink url="http://www.linux.com">Linux.com</ulink>, donated a
-VA Linux 420 (formerly StartX SP2) workstation toward this project.
-</para></listitem>
-
-<listitem><para>
-<ulink url="mailto:highos@highos.com">Jesse Tie Ten Quee</ulink> who
-donated a Yamaha CDRW 8824E CD-RW.
-</para></listitem>
-
-<listitem><para>
-<ulink url="mailto:highos@highos.com">Jesse Tie Ten Quee</ulink> for
-providing highos.com as the www.ca.linuxfromscratch.org
-mirror.
-</para></listitem>
-
-<listitem><para>
-<ulink url="http://www.oreilly.com">O'Reilly</ulink> for donating books
-on SQL and PHP.
-</para></listitem>
-
-<listitem><para>
-Robert Briggs for donating the linuxfromscratch.org and
-linuxfromscratch.com domain names.
-</para></listitem>
-
-<listitem><para>
-<ulink url="mailto:westermann@linux-provider.net">Torsten
+related sub-projects.</para></listitem>
+
+<listitem><para><ulink url="mailto:jan.niemann@tu-bs.de">Jan Niemann</ulink> 
+for providing 
+<ulink url="http://helga.lk.etc.tu-bs.de">http://helga.lk.etc.tu-bs.de</ulink> 
+as the 134.169.139.209 mirror.</para></listitem>
+
+<listitem><para><ulink url="mailto:johanlenglet@linuxfromscratch.org">Johan Lenglet</ulink> 
+for leading the French translation project at <ulink
+url="http://www.fr.linuxfromscratch.org">http://www.fr.linuxfromscratch.org</ulink>.</para></listitem>
+
+<listitem><para><ulink url="mailto:mpeters@mac.com">Michael Peters</ulink> for
+contributing the Apple PowerPC modifications.</para></listitem>
+
+<listitem><para><ulink url="http://www.valinux.com">VA Linux Systems</ulink> 
+who, on behalf of <ulink url="http://www.linux.com">Linux.com</ulink>, donated a
+VA Linux 420 (formerly StartX SP2) workstation toward this project.</para></listitem>
+
+<listitem><para><ulink url="mailto:highos@highos.com">Jesse Tie Ten Quee</ulink>
+ who donated a Yamaha CDRW 8824E CD-RW.</para></listitem>
+
+<listitem><para><ulink url="mailto:highos@highos.com">Jesse Tie Ten Quee</ulink> for providing highos.com as the www.ca.linuxfromscratch.org mirror.</para></listitem>
+
+<listitem><para><ulink url="http://www.oreilly.com">O'Reilly</ulink> for 
+donating books on SQL and PHP.</para></listitem>
+
+<listitem><para>Robert Briggs for donating the linuxfromscratch.org and
+linuxfromscratch.com domain names.</para></listitem>
+
+<listitem><para><ulink url="mailto:westermann@linux-provider.net">Torsten
 Westermann</ulink> for running the lfs.linux-provider.net HTTP and FTP
-mirror sites.
-</para></listitem>
+mirror sites.</para></listitem>
 
-<listitem><para>
-<ulink url="mailto:dag@stenstad.net">Dag Stenstad</ulink> for providing 
-the hardware and bandwidth to run the Norwegian mirror and 
+<listitem><para><ulink url="mailto:dag@stenstad.net">Dag Stenstad</ulink>
+ for providing the hardware and bandwidth to run the Norwegian mirror and 
 <ulink url="mailto:ian@ichilton.co.uk">Ian Chilton</ulink> for maintaining 
-this mirror.
-</para></listitem>
-
-<listitem><para>
-Countless other people from the various LFS mailing lists who are making
-this book happen by making suggestions, testing, and submitting bug
-reports.
-</para></listitem>
+this mirror.</para></listitem>
+
+<listitem><para>Countless other people from the various LFS mailing lists 
+who are making this book happen by making suggestions, testing, and submitting 
+bug reports.</para></listitem>
 
 </itemizedlist>
 
diff --git a/chapter01/alfsbackend.xml b/chapter01/alfsbackend.xml
index f94e9d8a5..8877cfe16 100644
--- a/chapter01/alfsbackend.xml
+++ b/chapter01/alfsbackend.xml
@@ -1,10 +1,8 @@
 <sect2>
 <title>alfs-backend</title>
 
-<para>
-The alfs-backend mailinglist discusses matters regarding the ALFS
-backend.
-</para>
+<para>The alfs-backend mailinglist discusses matters regarding the ALFS
+backend.</para>
 
 </sect2>
 
diff --git a/chapter01/alfsdiscuss.xml b/chapter01/alfsdiscuss.xml
index a8a637b9d..b7f2fd49c 100644
--- a/chapter01/alfsdiscuss.xml
+++ b/chapter01/alfsdiscuss.xml
@@ -1,13 +1,11 @@
 <sect2>
 <title>alfs-discuss</title>
 
-<para>
-The alfs-discuss list discusses the development of ALFS, which stands for
+<para>The alfs-discuss list discusses the development of ALFS, which stands for
 Automated Linux From Scratch. The goal of this project is to develop an
 installation tool that can install an LFS system automatically.
 It's main goal is to speed up compilation by taking away the need to
-manually enter the commands to configure, compile, and install packages.
-</para>
+manually enter the commands to configure, compile, and install packages.</para>
 
 </sect2>
 
diff --git a/chapter01/alfsdocs.xml b/chapter01/alfsdocs.xml
index 8128ac309..3c0bd9d58 100644
--- a/chapter01/alfsdocs.xml
+++ b/chapter01/alfsdocs.xml
@@ -1,10 +1,8 @@
 <sect2>
 <title>alfs-docs</title>
 
-<para>
-ALFS-docs is the ALFS documentation project which creates and maintains
-all of the ALFS documentation.
-</para>
+<para>ALFS-docs is the ALFS documentation project which creates and maintains
+all of the ALFS documentation.</para>
 
 </sect2>
 
diff --git a/chapter01/alfsipc.xml b/chapter01/alfsipc.xml
index 493163830..3d995b215 100644
--- a/chapter01/alfsipc.xml
+++ b/chapter01/alfsipc.xml
@@ -1,9 +1,7 @@
 <sect2>
 <title>alfs-ipc</title>
 
-<para>
-The alfs-ipc list discusses the ALFS InterProcess Communication issues.
-</para>
+<para>The alfs-ipc list discusses the ALFS InterProcess Communication issues.</para>
 
 </sect2>
 
diff --git a/chapter01/alfsprofile.xml b/chapter01/alfsprofile.xml
index 96efae918..3f81fe0db 100644
--- a/chapter01/alfsprofile.xml
+++ b/chapter01/alfsprofile.xml
@@ -1,10 +1,8 @@
 <sect2>
 <title>alfs-profile</title>
 
-<para>
-The alfs-profile list discusses the development of the ALFS XML profile
-and DTD.
-</para>
+<para>The alfs-profile list discusses the development of the ALFS XML profile
+and DTD.</para>
 
 </sect2>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9fa95f14d..0fc685608 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -1,14 +1,11 @@
-sect1 id="ch01-changelog">
+<sect1 id="ch01-changelog">
 <title>Changelog</title>
 
-<para>
-&version; - &releasedate;
-</para>
+<para>&version; - &releasedate;</para>
 
 <itemizedlist>
 
-<listitem><para>
-Updated to:
+<listitem><para>Updated to:
 
 <itemizedlist>
 
@@ -25,302 +22,217 @@ Updated to:
 
 </para></listitem>
 
-<listitem><para>
-Chapter 5: Removed kernel patch for gcc-3.0 compilation
-</para></listitem>
+<listitem><para>Chapter 5: Removed kernel patch for gcc-3.0 
+compilation</para></listitem>
 
-<listitem><para>
-Chapter 5: Added gcc-patch to fix re_max_failure compile problems
-</para></listitem>
+<listitem><para>Chapter 5: Added gcc-patch to fix re_max_failure 
+compile problems</para></listitem>
 
-<listitem><para>
-Chapter 5: Added missing chown root.root $LFS/usr/include/linux to
-kernel installation
-</para></listitem>
+<listitem><para>Chapter 5: Added missing chown root.root 
+$LFS/usr/include/linux to kernel installation </para></listitem>
 
-<listitem><para>
-Chapter 6: Removed the Groff command explanation regarding CXXFLAGS
-which has been made obsolete with the update to groff-1.17.1
-</para></listitem>
+<listitem><para> Chapter 6: Removed the Groff command explanation 
+regarding CXXFLAGS which has been made obsolete with the update 
+to groff-1.17.1</para></listitem>
 
-<listitem><para>
-Chapter 7: Changed $* into "$@" in the functions script. "$@" allows 
-usage of quoted arguments with blanks.
-</para></listitem>
+<listitem><para>Chapter 7: Changed $* into "$@" in the functions script. 
+"$@" allows usage of quoted arguments with blanks.</para></listitem>
 
 </itemizedlist>
 
-<para>
-3.0-pre4 - June 22nd, 2001
-</para>
+<para>3.0-pre4 - June 22nd, 2001</para>
 
 <itemizedlist>
 
-<listitem><para>
-Chapter 5: Reordered the installations alphabetically.
-</para></listitem>
+<listitem><para>Chapter 5: Reordered the installations 
+alphabetically.</para></listitem>
 
-<listitem><para>
-Chapter 6: Moved the installations of ed and patch into their
-alphabetical positions.
-</para></listitem>
+<listitem><para>Chapter 6: Moved the installations of ed and 
+patch into their alphabetical positions.</para></listitem>
 
-<listitem><para>
-Chapter 7: Added [ ATTN ] warning message to the functions script. When
-you attemp to start a service that's arleady running or stop a service
-that's not running, it'll not print FAILED anymore but [ ATTN ] along
-with "Already running" or "Not running".
-</para></listitem>
+<listitem><para>Chapter 7: Added [ ATTN ] warning message to 
+the functions script. When you attemp to start a service that's 
+already running or stop a service that's not running, it'll not
+print FAILED anymore but [ ATTN ] along with "Already running" 
+or "Not running".</para></listitem>
 
-<listitem><para>
-Chapter 9: Renamed the network-scripts directory in nic-config.
-</para></listitem>
+<listitem><para>Chapter 9: Renamed the network-scripts 
+directory in nic-config.</para></listitem>
 
 </itemizedlist>
 
-<para>
-3.0-pre3 - May 12th, 2001
-</para>
+<para>3.0-pre3 - May 12th, 2001</para>
 
 <itemizedlist>
 
-<listitem><para>
-Added numerous FHS compliance notes. These instructions can be followed 
-if one wishes to build a fully FHS-compliant system.
-</para></listitem>
+<listitem><para>Added numerous FHS compliance notes. These 
+instructions can be followed if one wishes to build a fully 
+FHS-compliant system.</para></listitem>
 
-<listitem><para>
-Chapter 4: Updated the directory list to be more FHS compliant. Mainly
-this meant adding the opt directories and removing /usr/tmp and
-/usr/local/tmp
-</para></listitem>
+<listitem><para>Chapter 4: Updated the directory list to be more 
+FHS compliant. Mainly this meant adding the opt directories and 
+removing /usr/tmp and /usr/local/tmp</para></listitem>
 
-<listitem><para>
-Chapter 5: We now copy the kernel include directories instead of linking
-to them. This is theoretically safer if we plan on upgrading the kernel.
-</para></listitem>
+<listitem><para>Chapter 5: We now copy the kernel include directories 
+instead of linking to them. This is theoretically safer if we plan on 
+upgrading the kernel.</para></listitem>
 
-<listitem><para>
-Chapter 5+6: Removed fileutils-patch. After upgrading to fileutils-4.1
-the patch isn't needed anymore.
-</para></listitem>
+<listitem><para>Chapter 5+6: Removed fileutils-patch. After upgrading 
+to fileutils-4.1 the patch isn't needed anymore.</para></listitem>
 
-<listitem><para>
-Chapter 5+6: Put back the instructions on how to copy/remove the old NSS
-library files, in case the original distribution uses glibc-2.0.x.
-</para></listitem>
+<listitem><para>Chapter 5+6: Put back the instructions on how to 
+copy/remove the old NSS library files, in case the original distribution 
+uses glibc-2.0.x.</para></listitem>
 
-<listitem><para>
-Chapter 5: Added the notice about an old version of install-info.
-</para></listitem>
+<listitem><para>Chapter 5: Added the notice about an old version 
+of install-info.</para></listitem>
  
-<listitem><para>
-Chapter 5: Removed the installation of a static gettext.
-</para></listitem>
+<listitem><para>Chapter 5: Removed the installation of a static 
+gettext.</para></listitem>
 
-<listitem><para>
-Chapter 6: Changed bin86's installation from "make PREFIX=/usr install"
-to "make INSTALL_OPTS="-m 755" PREFIX=/usr install". This will prevent
-install from invoking strip -s on the files. This fails because a
-couple of the installed files are shell scripts rather than programs,
-so they can't be stripped.
-</para></listitem>
+<listitem><para>Chapter 6: Changed bin86's installation from 
+"make PREFIX=/usr install" to "make INSTALL_OPTS="-m 755" 
+PREFIX=/usr install". This will prevent install from invoking strip -s 
+on the files. This fails because a couple of the installed files are 
+shell scripts rather than programs, so they can't be stripped.</para></listitem>
 
-<listitem><para>
-Chapter 6: Removed the ld.so section since we only used the man pages
-and replaced it with a patch to man-pages.
-</para></listitem>
+<listitem><para>Chapter 6: Removed the ld.so section since we 
+only used the man pages and replaced it with a patch to man-pages.</para></listitem>
 
-<listitem><para>
-Chapter 7+8: Moved the creation of /etc/fstab to chapter 8.
-</para></listitem>
+<listitem><para>Chapter 7+8: Moved the creation of /etc/fstab 
+to chapter 8.</para></listitem>
 
-<listitem><para>
-Appendix A: Added missing descriptions of frcode, code and bigram in
-the findutils-4.1 package.
-</para></listitem>
+<listitem><para>Appendix A: Added missing descriptions of frcode, 
+code and bigram in the findutils-4.1 package.</para></listitem>
 
 </itemizedlist>
 
-<para>
-3.0-pre2 - April 14th, 2001
-</para>
+<para>3.0-pre2 - April 14th, 2001</para>
 
 <itemizedlist>
 
-<listitem><para>
-Chapter 5: Simplified ln commands.
-</para></listitem>
+<listitem><para>Chapter 5: Simplified ln commands.</para></listitem>
  
-<listitem><para>
-Chapter 5: Removed prefix=$LFS/usr from tar's make install.
-</para></listitem>
+<listitem><para>Chapter 5: Removed prefix=$LFS/usr from tar's 
+make install.</para></listitem>
 
-<listitem><para>
-Chapter 5+6: Removed --disable-nls from configuration of programs that
-don't need it (bash, diffutils, gzip, sed, m4).
-</para></listitem>
+<listitem><para>Chapter 5+6: Removed --disable-nls from configuration 
+of programs that don't need it (bash, diffutils, gzip, sed, 
+m4).</para></listitem>
 
-<listitem><para>
-Chapter 5+6: Changed from "cd dir &amp;&amp; make" to "make -C dir"
-(gettext-static, sysvinit).
-</para></listitem>
+<listitem><para>Chapter 5+6: Changed from "cd dir &amp;&amp; make" 
+to "make -C dir" (gettext-static, sysvinit).</para></listitem>
 
-<listitem><para>
-Chapter 5: Beautified the static link process for mawk.
-</para></listitem>
+<listitem><para>Chapter 5: Beautified the static link process 
+for mawk.</para></listitem>
 
-<listitem><para>
-Chapter 5: Changed the links we create during gcc-installation to
-$LFS/usr/bin/cpp.
-</para></listitem>
+<listitem><para>Chapter 5: Changed the links we create during 
+gcc-installation to $LFS/usr/bin/cpp.</para></listitem>
 
-<listitem><para>
-Chapter 6: Changed the procps installation from sed'ing to an easier
-way.
-</para></listitem>
+<listitem><para>Chapter 6: Changed the procps installation 
+from sed'ing to an easier way.</para></listitem>
 
-<listitem><para>
-Chapter 6: Changed all "rm file &amp;&amp; ln -s dest file" into
-"ln -sf file" (in glibc, bzip2 and gzip installations).
-</para></listitem>
+<listitem><para> Chapter 6: Changed all "rm file &amp;&amp; ln -s dest 
+file" into "ln -sf file" (in glibc, bzip2 and gzip 
+installations).</para></listitem>
 
-<listitem><para>
-Chapter 6: Added a sed to fix a problem during glibc-installation.
-pt_chown can not be installed setuid root, because "root" is not known
-by glibc yet (kind of hen and egg-problem).
-</para></listitem>
+<listitem><para>Chapter 6: Added a sed to fix a problem during 
+glibc-installation.  pt_chown can not be installed setuid root, 
+because "root" is not known by glibc yet (kind of hen and 
+egg-problem).</para></listitem>
  
-<listitem><para>
-Chapter 6: Changed consoledata/tools to kbd, which is more actively
-developed, and less of a pain to install.
-</para></listitem>
+<listitem><para>Chapter 6: Changed consoledata/tools to kbd, which 
+is more actively developed, and less of a pain to install.</para></listitem>
 
-<listitem><para>
-Appendix A: Added the description of the Netkit-base and Net-tools
-packages.
-</para></listitem>
+<listitem><para>Appendix A: Added the description of the Netkit-base 
+and Net-tools packages.</para></listitem>
 
 </itemizedlist>
 
-<para>
-3.0-pre1 - February 27th, 2001
-</para>
+<para>3.0-pre1 - February 27th, 2001</para>
 
 <itemizedlist>
 
-<listitem><para>
-Converted the SGML source to XML.
-</para></listitem>
+<listitem><para>Converted the SGML source to XML.</para></listitem>
  
-<listitem><para>
-Chapter 4: Tell the user to use cfdisk rather than fdisk. The fdisk man
-page recommends cfdisk over fdisk because it's more stable.
-</para></listitem>
+<listitem><para>Chapter 4: Tell the user to use cfdisk rather than 
+fdisk. The fdisk man page recommends cfdisk over fdisk because 
+it's more stable.</para></listitem>
  
-<listitem><para>
-Chapter 4: Changed the wording to make it more general as ext2 no
-longer is the only used file system. Reiser for example is often used
-too now.
-</para></listitem>
+<listitem><para>Chapter 4: Changed the wording to make it more general 
+as ext2 no longer is the only used file system. Reiser for example is 
+often used too now.</para></listitem>
  
-<listitem><para>
-Chapter 5: Added static mawk, texinfo and partially gettext to faciliate
-the move of Glibc from Chapter 5 to Chapter 6.
-</para></listitem>
+<listitem><para>Chapter 5: Added static mawk, texinfo and partially 
+gettext to faciliate the move of Glibc from Chapter 5 
+to Chapter 6.</para></listitem>
  
-<listitem><para>
-Chapter 5: Added Makedev to chapter 5. We don't create the device files
-here, only copy the MAKEDEV script and make a temp copy which will be
-used to create device files. This second file (MAKEDEV-temp) doesn't
-contain user names and group names but only user id's and group id's. We
-need a few device files to get Glibc installed, but before GLibc is
-installed user and group names are not recognized yet; only the numeric
-id's. This requires a slightly modified MAKEDEV script which will be
-generated by patching the original one. This patching is done here in
-chapter 5. Also, fixed the explanations on both makedev installations.
-</para></listitem>
+<listitem><para>Chapter 5: Added Makedev to chapter 5. We don't create 
+the device files here, only copy the MAKEDEV script and make a temp 
+copy which will be used to create device files. This second file 
+(MAKEDEV-temp) doesn't contain user names and group names but only user 
+id's and group id's. We need a few device files to get Glibc installed, 
+but before GLibc is installed user and group names are not recognized yet; 
+only the numeric id's. This requires a slightly modified MAKEDEV script 
+which will be generated by patching the original one. This patching is done 
+here in chapter 5. Also, fixed the explanations on both 
+makedev installations.</para></listitem>
  
-<listitem><para>
-Chapter 5: Recommended to install all the software while logged in (or
-su'ed to) user root.
-</para></listitem>
+<listitem><para>Chapter 5: Recommended to install all the software 
+while logged in (or su'ed to) user root.</para></listitem>
  
-<listitem><para>
-Chapter 5+6: Added the fileutils-4.0 patch which is needed to compile
-the fileutils package on Glibc-2.2 based systems (such as the upcoming
-LFS-3.0 system).
-</para></listitem>
+<listitem><para>Chapter 5+6: Added the fileutils-4.0 patch which is 
+needed to compile the fileutils package on Glibc-2.2 based systems 
+(such as the upcoming LFS-3.0 system).</para></listitem>
 
-<listitem><para>
-Chapter 5+6: Upgraded from gcc-2.95.2 to gcc-2.95.2.1
-</para></listitem>
+<listitem><para>Chapter 5+6: Upgraded from gcc-2.95.2 to 
+gcc-2.95.2.1</para></listitem>
  
-<listitem><para>
-Chapter 5+6: Moved Glibc from chapter 5 to chapter 6
-</para></listitem>
+<listitem><para>Chapter 5+6: Moved Glibc from chapter 5 to 
+chapter 6</para></listitem>
  
-<listitem><para>
-Chapter 6: Changed libexecdir=/usr/bin in fileutils to libexecdir=/bin
-</para></listitem>
+<listitem><para>Chapter 6: Changed libexecdir=/usr/bin in fileutils 
+to libexecdir=/bin</para></listitem>
  
-<listitem><para>
-Chapter 6: Updated Glibc installation instructions. 'configparms' file
-creation has been deleted. No need to pick a compiler (either distro's
-native or the /usr/local/gcc2952/bin/gcc one); we're in chroot
-now so we'll use the one we have
-</para></listitem>
+<listitem><para>Chapter 6: Updated Glibc installation instructions. 
+'configparms' file creation has been deleted. No need to pick a compiler 
+(either distro's native or the /usr/local/gcc2952/bin/gcc one); 
+we're in chroot now so we'll use the one we have</para></listitem>
  
-<listitem><para>
-Chapter 6: Only copy the man pages from the ld.so package. We don't need
-the ldconfig and ldd programs anymore; Glibc-2.2.1 comes with good
-working versions.
-</para></listitem>
+<listitem><para>Chapter 6: Only copy the man pages from the 
+ld.so package. We don't need the ldconfig and ldd programs anymore; 
+Glibc-2.2.1 comes with good working versions.</para></listitem>
  
-<listitem><para>
-Chapter 6: Added the creation of the lex symlink to the flex
-installation.
-</para></listitem>
+<listitem><para>Chapter 6: Added the creation of the lex symlink 
+to the flex installation.</para></listitem>
  
-<listitem><para>
-Chapter 6: Changed $* into "$@" in the yacc script during bison's
-installation. "$@" allows usage of quoted arguments with blanks.
-</para></listitem>
+<listitem><para>Chapter 6: Changed $* into "$@" in the yacc script 
+during bison's installation. "$@" allows usage of quoted arguments 
+with blanks. </para></listitem>
  
-<listitem><para>
-Chapter 6: Fixed the man page installation during console-tools'
-installation.
-</para></listitem>
+<listitem><para>Chapter 6: Fixed the man page installation during 
+console-tools' installation.</para></listitem>
 
-<listitem><para>
-Chapter 6: When entering chroot the $TERM variable inside chroot is set
-properly. This is accomplished by: chroot ... -i HOME=/root TERM=$TERM
-...
-</para></listitem>
+<listitem><para>Chapter 6: When entering chroot the $TERM variable 
+inside chroot is set properly. This is accomplished by: chroot ... 
+-i HOME=/root TERM=$TERM...</para></listitem>
  
-<listitem><para>
-Chapter 6: Merged the different sulogin lines from the inittab file
-into one line.
-</para></listitem>
+<listitem><para>Chapter 6: Merged the different sulogin lines from 
+the inittab file into one line.</para></listitem>
  
-<listitem><para>
-Chapter 7: Fixed the delays in the killproc function in the functions
-script. Now after kill, first check PIDs, then sleep 2 if needed. More
-details can be read in the comments in the script itself.
-</para></listitem>
+<listitem><para>Chapter 7: Fixed the delays in the killproc function 
+in the functions script. Now after kill, first check PIDs, then 
+sleep 2 if needed. More details can be read in the comments 
+in the script itself.</para></listitem>
  
-<listitem><para>
-Chapter 7: Added the explanation how the runlevels and boot process
-works when using the LFS scripts.
-</para></listitem>
+<listitem><para>Chapter 7: Added the explanation how the runlevels 
+and boot process works when using the LFS scripts.</para></listitem>
  
-<listitem><para>
-Chapter 10: Added this chapter. It contains "thanks and good luck"
-notes and suggest creating the /etc/lfs-&version; file
-</para></listitem>
+<listitem><para>Chapter 10: Added this chapter. It contains "thanks 
+and good luck"notes and suggest creating the /etc/lfs-&version; 
+file</para></listitem>
  
 </itemizedlist>
 
-
 </sect1>
 
diff --git a/chapter01/contactinfo.xml b/chapter01/contactinfo.xml
index 8dad8a3db..98132fcbe 100644
--- a/chapter01/contactinfo.xml
+++ b/chapter01/contactinfo.xml
@@ -1,18 +1,11 @@
 <sect1 id="ch01-contactinfo">
 <title>Contact information</title>
 
-<para>
-Direct all emails to the 
-lfs-discuss mailing list at
-<ulink url="mailto:lfs-discuss@linuxfromscratch.org">
-lfs-discuss@linuxfromscratch.org</ulink> preferably.
-</para>
+<para>Direct all emails to the lfs-discuss mailing list at
+<ulink url="mailto:lfs-discuss@linuxfromscratch.org">lfs-discuss@linuxfromscratch.org</ulink> preferably.</para>
 
-<para>
-If you need to reach Gerard Beekmans personally, send an email to
-<ulink url="mailto:gerard@linuxfromscratch.org">
-gerard@linuxfromscratch.org</ulink>
-</para>
+<para>If you need to reach Gerard Beekmans personally, send an email to
+<ulink url="mailto:gerard@linuxfromscratch.org">gerard@linuxfromscratch.org</ulink></para>
 
 </sect1>
 
diff --git a/chapter01/conventions.xml b/chapter01/conventions.xml
index 1533fc350..05f671034 100644
--- a/chapter01/conventions.xml
+++ b/chapter01/conventions.xml
@@ -1,55 +1,36 @@
 <sect1 id="ch01-conventions">
 <title>Conventions used in this book</title>
 
-<para>
-To make things easy to follow, there are a number of conventions used
-throughout the book.  Following are some examples:
-</para>
+<para>To make things easy to follow, there are a number of conventions used
+throughout the book.  Following are some examples:</para>
 
-<para>
-<userinput>./configure --prefix=/usr</userinput>
-</para>
+<para><userinput>./configure --prefix=/usr</userinput></para>
 
-<blockquote><para>
-This form of text is designed to be typed exactly as seen unless otherwise
-noted in the surrounding text.  It is also used in the explanation sections to
-identify which of the commands is being referred to.
-</para></blockquote>
+<blockquote><para>This form of text is designed to be typed exactly 
+as seen unless otherwise noted in the surrounding text.  It is also used 
+in the explanation sections to identify which of the commands is being 
+referred to.</para></blockquote>
 
-<para>
-<filename>
-install-info: unknown option `--dir-file=/mnt/lfs/usr/info/dir'
-</filename>
-</para>
+<para><filename>install-info: unknown option 
+`--dir-file=/mnt/lfs/usr/info/dir'</filename></para>
 
-<blockquote><para>
-This form of text (fixed width text) is showing screen output, probably as the
-result of commands issued and is also used to show filenames such as
-<filename>/etc/lilo.conf</filename>
-</para></blockquote>
+<blockquote><para>This form of text (fixed width text) is showing screen 
+output, probably as the result of commands issued and is also used to 
+show filenames such as <filename>/etc/lilo.conf</filename></para></blockquote>
 
-<para>
-<emphasis>Emphasis</emphasis>
-</para>
+<para><emphasis>Emphasis</emphasis></para>
 
-<blockquote><para>
-This form of text is used for several purposes in the book but mainly to
-emphasise important points or to give examples as to what to type.
-</para></blockquote>
+<blockquote><para>This form of text is used for several purposes in the 
+book but mainly to emphasise important points or to give examples as to 
+what to type.</para></blockquote>
 
-<para>
-<ulink url="http://www.linuxfromscratch.org/">
-http://www.linuxfromscratch.org/</ulink>
-</para>
+<para><ulink url="http://www.linuxfromscratch.org/">http://www.linuxfromscratch.org/</ulink></para>
 
-<blockquote><para>
-This form of text is used for hyperlinks, both within the book and to external
-pages such as HowTo's,download locations and websites etc. 
-</para></blockquote>
+<blockquote><para>This form of text is used for hyperlinks, both within the 
+book and to external pages such as HowTo's,download locations and 
+websites etc.</para></blockquote>
 
-<para>
-<screen>
-<userinput>cat &gt; $LFS/etc/group &lt;&lt; "EOF"</userinput>
+<para><screen><userinput>cat &gt; $LFS/etc/group &lt;&lt; "EOF"</userinput>
 	root:x:0:
 	bin:x:1:
 	......
@@ -57,12 +38,11 @@ pages such as HowTo's,download locations and websites etc.
 </screen>
 </para>
 
-<blockquote><para>
-This type of section is used mainly when creating configuration files.  The
-first command (in bold) tells the system to create the file $LFS/etc/group from
-whatever is typed on the following lines until the sequence EOF is encountered.
-Therefore, this whole section is generally typed as seen.
-</para></blockquote>
+<blockquote><para>This type of section is used mainly when creating 
+configuration files.  The first command (in bold) tells the system to create 
+the file $LFS/etc/group from whatever is typed on the following lines until 
+the sequence EOF is encountered. Therefore, this whole section is generally 
+typed as seen.</para></blockquote>
 
 </sect1>
 
diff --git a/chapter01/how.xml b/chapter01/how.xml
index 47ec186bd..0b02798c1 100644
--- a/chapter01/how.xml
+++ b/chapter01/how.xml
@@ -1,56 +1,42 @@
 <sect1 id="ch01-how">
 <title>How things are going to be done</title>
 
-<para>
-We are going to build the LFS system by using an already installed Linux
+<para>We are going to build the LFS system by using an already installed Linux
 distribution such as Debian, SuSe, Slackware, Mandrake, RedHat, etc. There
 is no need to have any kind of bootdisk. We will use an existing Linux
 system as the base (since we need a compiler, linker, text editor, and
-other tools).
-</para>
+other tools).</para>
 
-<para>
-After you have downloaded the necessary packages that make up an LFS
+<para>After you have downloaded the necessary packages that make up an LFS
 system you will create a new Linux native partition where the LFS system
-will be installed onto.
-</para>
+will be installed onto.</para>
 
-<para>
-The next step, chapter 5, will be the installation of a number of
+<para>The next step, chapter 5, will be the installation of a number of
 packages that are statically linked and installed on the LFS partition.
 These packages form a basic development suite which will be used to
-install the actual system.
-</para>
+install the actual system.</para>
 
-<para>
-Chapter 6 installs the actual base system. We use the chroot program to
+<para>Chapter 6 installs the actual base system. We use the chroot program to
 start a new shell who's root directory will be set to the LFS
 partition. This, in essence, is the same as rebooting and have the
 kernel mount the LFS partition as the root partition. The reason that
 we don't actually reboot, but instead chroot, is that this way you can
 still use your host system. While software is being installed you can
 simply switch to a different VC (Virtual Console) or X desktop and
-continue using your computer.
-</para>
+continue using your computer.</para>
 
-<para>
-When all the software is installed, chapter 7 will setup the boot
+<para>When all the software is installed, chapter 7 will setup the boot
 scripts. Chapter 8 will setup the Linux boot loader and you can finally
-reboot your system into your new LFS-system. 
-</para>
+reboot your system into your new LFS-system.</para>
 
-<para>
-This is the process in a nutshell. Detailed information on the steps
+<para>This is the process in a nutshell. Detailed information on the steps
 you are taking are provided in the chapters as you go through them. If
 something isn't completely clear yet, don't worry. It will become very
-clear shortly.
-</para>
+clear shortly.</para>
 
-<para>
-Please read chapter 2 carefully as it explains a few important things
+<para>Please read chapter 2 carefully as it explains a few important things
 you need to be aware of before you work your way through chapters 5 and
-above.
-</para>
+above.</para>
 
 </sect1>
 
diff --git a/chapter01/lfsannounce.xml b/chapter01/lfsannounce.xml
index 09889052b..960fdb757 100644
--- a/chapter01/lfsannounce.xml
+++ b/chapter01/lfsannounce.xml
@@ -1,16 +1,14 @@
 <sect2>
 <title>lfs-announce</title>
 
-<para>
-The lfs-announce list is a moderated list. It can be subscribed to, but
+<para>The lfs-announce list is a moderated list. It can be subscribed to, but
 you can't post any messages to this list. This list is used to announce
 new stable releases. The lfs-discuss list will carry information about
 development
 releases as well. If
 a user is already on the lfs-discuss list, there's little use subscribing to
 this list as well because everything that is posted to the lfs-announce
-list will be posted to the lfs-discuss list as well.
-</para>
+list will be posted to the lfs-discuss list as well.</para>
 
 </sect2>
 
diff --git a/chapter01/lfsapps.xml b/chapter01/lfsapps.xml
index be8da7f9f..d0ca3da28 100644
--- a/chapter01/lfsapps.xml
+++ b/chapter01/lfsapps.xml
@@ -1,10 +1,8 @@
 <sect2>
 <title>lfs-apps</title>
 
-<para>
-The lfs-apps list deals with everything that does not fit on the
-lfs-discuss list.
-</para>
+<para>The lfs-apps list deals with everything that does not fit on the
+lfs-discuss list.</para>
 
 </sect2>
 
diff --git a/chapter01/lfsdiscuss.xml b/chapter01/lfsdiscuss.xml
index 145c2bb83..e4a4b1bed 100644
--- a/chapter01/lfsdiscuss.xml
+++ b/chapter01/lfsdiscuss.xml
@@ -1,16 +1,12 @@
 <sect2>
 <title>lfs-discuss</title>
 
-<para>
-The lfs-discuss mailing list discusses matters strictly related to the
+<para>The lfs-discuss mailing list discusses matters strictly related to the
 LFS-BOOK. If problems with the book come up, a bug or two need to be
 reported, or suggestions to improve the book should be made, 
-this mailing list is the right one.
-</para>
+this mailing list is the right one.</para>
 
-<para>
-Any other mail is to be posted on the lfs-apps list.
-</para>
+<para>Any other mail is to be posted on the lfs-apps list.</para>
 
 </sect2>
 
diff --git a/chapter01/lfssecurity.xml b/chapter01/lfssecurity.xml
index 9ee8766b0..677f00fa7 100644
--- a/chapter01/lfssecurity.xml
+++ b/chapter01/lfssecurity.xml
@@ -1,11 +1,9 @@
 <sect2>
 <title>lfs-security</title>
 
-<para>
-The lfs-security mailing list discusses security-related matters. 
+<para>The lfs-security mailing list discusses security-related matters. 
 Security concerns or security problems with a package used by LFS,
-should be addressed on this list.
-</para>
+should be addressed on this list.</para>
 
 </sect2>
 
diff --git a/chapter01/mailarchive.xml b/chapter01/mailarchive.xml
index 690f38234..3ad0bfdf0 100644
--- a/chapter01/mailarchive.xml
+++ b/chapter01/mailarchive.xml
@@ -1,15 +1,11 @@
 <sect2>
 <title>Mail archives</title>
 
-<para>
-All these lists are archived and can be viewed online at 
-<ulink url="http://archive.linuxfromscratch.org/mail-archives">
-http://archive.linuxfromscratch.org/mail-archives</ulink> or downloaded
-from <ulink url="http://download.linuxfromscratch.org/mail-archives">
-http://download.linuxfromscratch.org/mail-archives</ulink> or <ulink
-url="ftp://download.linuxfromscratch.org/mail-archives">
-ftp://download.linuxfromscratch.org/mail-archives</ulink>.
-</para>
+<para>All these lists are archived and can be viewed online at 
+<ulink url="http://archive.linuxfromscratch.org/mail-archives">http://archive.linuxfromscratch.org/mail-archives</ulink> or downloaded
+from <ulink url="http://download.linuxfromscratch.org/mail-archives">http://download.linuxfromscratch.org/mail-archives</ulink> 
+or 
+<ulink url="ftp://download.linuxfromscratch.org/mail-archives">ftp://download.linuxfromscratch.org/mail-archives</ulink>.</para>
 
 </sect2>
 
diff --git a/chapter01/maillists.xml b/chapter01/maillists.xml
index a8f4f76e4..53fb4bffc 100644
--- a/chapter01/maillists.xml
+++ b/chapter01/maillists.xml
@@ -1,32 +1,20 @@
 <sect1 id="ch01-maillists">
 <title>Mailing lists and archives</title>
 
-<para>
-The linuxfromscratch.org server is hosting the following publicly accessible 
-mailing lists:
-</para>
+<para>The linuxfromscratch.org server is hosting the following publicly 
+accessible mailing lists:</para>
 
 <itemizedlist>
 
-<listitem><para>
-    lfs-discuss
-</para></listitem>
+<listitem><para>    lfs-discuss</para></listitem>
 
-<listitem><para>
-    lfs-apps
-</para></listitem>
+<listitem><para>    lfs-apps</para></listitem>
 
-<listitem><para>
-    lfs-announce
-</para></listitem>
+<listitem><para>    lfs-announce</para></listitem>
 
-<listitem><para>
-    lfs-security
-</para></listitem>
+<listitem><para>    lfs-security</para></listitem>
 
-<listitem><para>
-    alfs-discuss
-</para></listitem>
+<listitem><para>    alfs-discuss</para></listitem>
 
 </itemizedlist>
 
diff --git a/chapter01/othermodes.xml b/chapter01/othermodes.xml
index 36aa35efa..6e6a9449c 100644
--- a/chapter01/othermodes.xml
+++ b/chapter01/othermodes.xml
@@ -1,27 +1,21 @@
 <sect2>
 <title>Other list modes</title>
 
-<para>
-The modes that can be set by a user require to send an email to
-<ulink url="mailto:listar@linuxfromscratch.org">
-listar@linuxfromscratch.org</ulink>. The modes themselves are set by writing
-the appropriate commands in the subject headers of the message.
-</para>
+<para>The modes that can be set by a user require to send an email to
+<ulink url="mailto:listar@linuxfromscratch.org">listar@linuxfromscratch.org</ulink>. 
+The modes themselves are set by writing
+the appropriate commands in the subject headers of the message.</para>
 
-<para>
-As the name implies, the <emphasis>Set command</emphasis> tells what
+<para>As the name implies, the <emphasis>Set command</emphasis> tells what
 to write to set a mode. The <emphasis>Unset command</emphasis> tells
-what to write to unset a mode.
-</para>
+what to write to unset a mode.</para>
 
-<para>
-The listname in the example subject headers should be replaced with the 
+<para>The listname in the example subject headers should be replaced with the 
 listname to which 
 the mode is going to be applied to. If more than one mode is to be set (to
 the same list or multiple lists) with one email, this can be done by
 leaving the subject header blank and write all the commands in the body of 
-the message instead.
-</para>
+the message instead.</para>
 
 </sect2>
 
@@ -33,21 +27,17 @@ Set command: <emphasis>set listname digest</emphasis>
 Unset command: <emphasis>unset listname digest</emphasis>
 </literallayout>
 
-<para>
-All lists have the digest mode available which can be set after a user
+<para>All lists have the digest mode available which can be set after a user
 has subscribed to a list. Being in digest mode will
 cause to stop receiving individual messages as they are posted to
 the list and instead send one email daily containing all
-the messages posted to the list during that day.
-</para>
+the messages posted to the list during that day.</para>
 
-<para>
-There is a second digest mode called digest2. When a user is set to this
+<para>There is a second digest mode called digest2. When a user is set to this
 mode he will receive the daily digests but will also continue to
 receive the individual messages to the lists as they are posted. To
 set this mode <emphasis>digest2</emphasis> has to be written instead of
-<emphasis>digest</emphasis> in the subject header.
-</para>
+<emphasis>digest</emphasis> in the subject header.</para>
 
 </sect2>
 
@@ -59,13 +49,11 @@ Set command: <emphasis>set listname vacation</emphasis>
 Unset command: <emphasis>unset listname vacation</emphasis>
 </literallayout>
 
-<para>
-If a user is going to be away for a while or wishes to stop receiving
+<para>If a user is going to be away for a while or wishes to stop receiving
 messages from the lists but doesn't want to unsubscribe, he can set
 to vacation mode. This has the same effect as unsubscribing,
 but without having to go through the unsubscribe process and
-then later through the subscribe process again.
-</para>
+then later through the subscribe process again.</para>
 
 </sect2>
 
diff --git a/chapter01/subscribe.xml b/chapter01/subscribe.xml
index 4ba8f1fc9..d7cfd105b 100644
--- a/chapter01/subscribe.xml
+++ b/chapter01/subscribe.xml
@@ -1,35 +1,27 @@
 <sect2>
 <title>How to subscribe?</title>
 
-<para>
-Any of the above-mentioned mailinglists can be subscribed to by sending
-an email to <ulink url="mailto:listar@linuxfromscratch.org">
-listar@linuxfromscratch.org</ulink> and writing <emphasis>subscribe
-listname</emphasis> as the subject header of the message.
-</para>
+<para>Any of the above-mentioned mailinglists can be subscribed to by sending
+an email to <ulink url="mailto:listar@linuxfromscratch.org">listar@linuxfromscratch.org</ulink> 
+and writing <emphasis>subscribe listname</emphasis> as the subject 
+header of the message.</para>
 
-<para>
-Multiple lists at the same time can be subscribed to by using
+<para>Multiple lists at the same time can be subscribed to by using
 one email. This is done by leaving the subject blank and putting all the
-commands in the body of the email. The email will look like:
-</para>
+commands in the body of the email. The email will look like:</para>
 
-<blockquote><literallayout>
-To: listar@linuxfromscratch.org
+<blockquote><literallayout>To: listar@linuxfromscratch.org
 Subject:
 
 subscribe lfs-discuss
 subscribe lfs-apps
-subscribe alfs-discuss
-</literallayout></blockquote>
+subscribe alfs-discuss</literallayout></blockquote>
 
-<para>
-After the email is sent, the Listar program will reply with an
+<para>After the email is sent, the Listar program will reply with an
 email requesting a confirmation of the subscription request. After
 this confirmation email was sent back, Listar will send an
 email again with the message that the user has been subscribed to the
-list(s) along with an introduction message for that particular list.
-</para>
+list(s) along with an introduction message for that particular list.</para>
 
 </sect2>
 
diff --git a/chapter01/unsubscribe.xml b/chapter01/unsubscribe.xml
index 425071d95..d9916af21 100644
--- a/chapter01/unsubscribe.xml
+++ b/chapter01/unsubscribe.xml
@@ -1,36 +1,28 @@
 <sect2>
 <title>How to unsubscribe?</title>
 
-<para>
-To unsubscribe from a list, send an email to
-<ulink url="mailto:listar@linuxfromscratch.org">
-listar@linuxfromscratch.org</ulink> and write <emphasis>unsubscribe
-listname</emphasis> as the subject header of the message.
-</para>
+<para>To unsubscribe from a list, send an email to
+<ulink url="mailto:listar@linuxfromscratch.org">listar@linuxfromscratch.org</ulink> 
+and write <emphasis>unsubscribe
+listname</emphasis> as the subject header of the message.</para>
 
-<para>
-Multiple lists can be unsubscribed at the same time
+<para>Multiple lists can be unsubscribed at the same time
 using one email. This is done by leaving the subject header blank and
 putting all the commands in the body of the email. The email will look 
-like: 
-</para>
+like: </para>
 
-<blockquote><literallayout>
-To: listar@linuxfromscratch.org
+<blockquote><literallayout>To: listar@linuxfromscratch.org
 Subject:
 
 unsubscribe lfs-discuss
 unsubscribe lfs-apps
-unsubscribe alfs-discuss 
-</literallayout></blockquote>
+unsubscribe alfs-discuss</literallayout></blockquote>
 
-<para>
-After the email was sent, the Listar program will reply with an  
+<para>After the email was sent, the Listar program will reply with an  
 email requesting a confirmation of the unsubscription
 request. After this confirmation email is sent back, Listar will 
 send an email again with the message that the user has been unsubscribed 
-from the list(s). 
-</para>
+from the list(s).</para>
 
 </sect2>
 
diff --git a/chapter01/versions.xml b/chapter01/versions.xml
index a4e30b1a9..689382499 100644
--- a/chapter01/versions.xml
+++ b/chapter01/versions.xml
@@ -1,84 +1,49 @@
 <sect1 id="ch01-version">
 <title>Book version</title>
 
-<para>
-This is LFS-BOOK version &version; dated &releasedate;. If this 
+<para>This is LFS-BOOK version &version; dated &releasedate;. If this 
 version is older than a month a newer version might be available for download
-at the LFS homepage.
-</para>
+at the LFS homepage.</para>
 
-<para>
-Below is a list of our current HTTP and FTP mirror sites as
+<para>Below is a list of our current HTTP and FTP mirror sites as
 of June 24th, 2001. This list might not be accurate anymore. 
 The latest info can be found on our website at
-<ulink url="http://www.linuxfromscratch.org">
-http://www.linuxfromscratch.org</ulink>.
-</para>
+<ulink url="http://www.linuxfromscratch.org">http://www.linuxfromscratch.org</ulink>.</para>
 
 <sect2>
 <title>HTTP Mirrors</title>
 
 <itemizedlist>
 
-<listitem><para>
-Fremont, USA [100 Mbit] - <ulink
-url="http://www.linuxfromscratch.org/intro/">
-http://www.linuxfromscratch.org/intro/</ulink>
-</para></listitem>
-
-<listitem><para>
-Canmore, Alberta, Canada [2 Mbit] - <ulink
-url="http://www.ca.linuxfromscratch.org/intro/">
-http://www.ca.linuxfromscratch.org/intro/</ulink>
-</para></listitem>
-
-<listitem><para>
-Columbus, Ohio, United States [1 Mbit] - <ulink
-url="http://www.us.linuxfromscratch.org/intro/">
-http://www.us.linuxfromscratch.org/intro/</ulink>
-</para></listitem>
-
-<listitem><para>
-Braunschweig, Germany [10 Mbit] - <ulink
-url="http://www.de.linuxfromscratch.org/intro/">
-http://www.de.linuxfromscratch.org/intro/</ulink>
-</para></listitem>
-
-<listitem><para>
-Mainz, Germany [1.5 Mbit] - <ulink
-url="http://lfs.linux-provider.net/intro/">
-http://lfs.linux-provider.net/intro/</ulink>
-</para></listitem>
-
-<listitem><para>
-Vienna Univ. of Technology, Austria [16 Mbit] - <ulink
-url="http://www.at.linuxfromscratch.org/intro/">
-http://www.at.linuxfromscratch.org/intro/</ulink>
-</para></listitem>
-
-<listitem><para>
-Bistrita, Romania [2 Mbit] - <ulink
-url="http://www.ro.linuxfromscratch.org/intro/">
-http://www.ro.linuxfromscratch.org/intro/</ulink>
-</para></listitem>
-
-<listitem><para>
-Oslo, Norway [100 Mbit] - <ulink
-url="http://www.no.linuxfromscratch.org/intro/">
-http://www.no.linuxfromscratch.org/intro/</ulink>
-</para></listitem>
-
-<listitem><para>
-Teeside, United Kingdom [256 Kbit] - <ulink
-url="http://www.linuxfromscratch.co.uk/">
-http://www.linuxfromscratch.co.uk</ulink>
-</para></listitem>
-
-<listitem><para>
-Brisbane, Australia [155 Mbit] - <ulink
-url="http://www.au.linuxfromscratch.org/intro/">
-http://www.au.linuxfromscratch.org/intro/</ulink>
-</para></listitem>
+<listitem><para>Fremont, USA [100 Mbit] - <ulink
+url="http://www.linuxfromscratch.org/intro/">http://www.linuxfromscratch.org/intro/</ulink></para></listitem>
+
+<listitem><para>Canmore, Alberta, Canada [2 Mbit] - <ulink
+url="http://www.ca.linuxfromscratch.org/intro/">http://www.ca.linuxfromscratch.org/intro/</ulink></para></listitem>
+
+<listitem><para>Columbus, Ohio, United States [1 Mbit] - <ulink
+url="http://www.us.linuxfromscratch.org/intro/">http://www.us.linuxfromscratch.org/intro/</ulink></para></listitem>
+
+<listitem><para>Braunschweig, Germany [10 Mbit] - <ulink
+url="http://www.de.linuxfromscratch.org/intro/">http://www.de.linuxfromscratch.org/intro/</ulink></para></listitem>
+
+<listitem><para>Mainz, Germany [1.5 Mbit] - <ulink
+url="http://lfs.linux-provider.net/intro/">http://lfs.linux-provider.net/intro/</ulink></para></listitem>
+
+<listitem><para>Vienna Univ. of Technology, Austria [16 Mbit] - <ulink
+url="http://www.at.linuxfromscratch.org/intro/">http://www.at.linuxfromscratch.org/intro/</ulink></para></listitem>
+
+<listitem><para>Bistrita, Romania [2 Mbit] - <ulink
+url="http://www.ro.linuxfromscratch.org/intro/">http://www.ro.linuxfromscratch.org/intro/</ulink></para></listitem>
+
+<listitem><para>Oslo, Norway [100 Mbit] - <ulink
+url="http://www.no.linuxfromscratch.org/intro/">http://www.no.linuxfromscratch.org/intro/</ulink></para></listitem>
+
+<listitem><para>Teeside, United Kingdom [256 Kbit] - <ulink
+url="http://www.linuxfromscratch.co.uk/">http://www.linuxfromscratch.co.uk</ulink></para></listitem>
+
+<listitem><para>Brisbane, Australia [155 Mbit] - <ulink
+url="http://www.au.linuxfromscratch.org/intro/">http://www.au.linuxfromscratch.org/intro/</ulink></para></listitem>
 
 </itemizedlist>
 
@@ -89,65 +54,35 @@ http://www.au.linuxfromscratch.org/intro/</ulink>
 
 <itemizedlist>
 
-<listitem><para>
-Fremont, California, USA [FTP] [100 Mbit] - <ulink
-url="ftp://packages.linuxfromscratch.org">
-ftp://packages.linuxfromscratch.org</ulink>
-</para></listitem>
-
-<listitem><para>
-Fremont, California, USA [HTTP] [100 Mbit] - <ulink
-url="http://packages.linuxfromscratch.org">
-http://packages.linuxfromscratch.org</ulink>
-</para></listitem>
-
-<listitem><para>
-Canmore, Alberta, Canada [FTP] [2 Mbit] - <ulink
-url="ftp://ftp.ca.linuxfromscratch.org/pub/lfs/">
-ftp://ftp.ca.linuxfromscratch.org/pub/lfs/</ulink>
-</para></listitem>
-
-<listitem><para>
-Canmore, Alberta, Canada [HTTP] [2 Mbit] - <ulink
-url="http://ftp.ca.linuxfromscratch.org/pub/lfs/">
-http://ftp.ca.linuxfromscratch.org/pub/lfs/</ulink>
-</para></listitem>
-
-<listitem><para>
-Mainz, Germany, Europe [FTP] PPC packages only [1.5 Mbit] - <ulink
-url="ftp://ftp.linux-provider.net/pub/lfs/">
-ftp://ftp.linux-provider.net/pub/lfs/</ulink>
-</para></listitem>
-
-<listitem><para>
-Mainz, Germany, Europe [HTTP] PPC packages only [1.5 Mbit] - <ulink
-url="http://ftp.linux-provider.net/lfs/">
-http://ftp.linux-provider.net/lfs/</ulink>
-</para></listitem>
-
-<listitem><para>
-Vienna Univ. of Tech., Austria [FTP] [16 Mbit] - <ulink
-url="ftp://ftp.at.linuxfromscratch.org/lfs/packages">
-ftp://ftp.at.linuxfromscratch.org/lfs/packages</ulink>
-</para></listitem>
-
-<listitem><para>
-Vienna Univ. of Tech., Austria [HTTP] [16 Mbit] - <ulink
-url="http://ftp.at.linuxfromscratch.org/lfs/packages">
-http://ftp.at.linuxfromscratch.org/lfs/packages</ulink>
-</para></listitem>
-
-<listitem><para>
-Oslo, Norway [FTP] [100 Mbit] - <ulink
-url="ftp://ftp.no.linuxfromscratch.org/mirrors/lfs/">
-ftp://ftp.no.linuxfromscratch.org/mirrors/lfs/</ulink>
-</para></listitem>
-
-<listitem><para>
-Brisbane, Australia [FTP] [155 Mbit] - <ulink
-url="ftp://ftp.planetmirror.com/pub/lfs/">
-ftp://ftp.planetmirror.com/pub/lfs/</ulink>
-</para></listitem>
+<listitem><para>Fremont, California, USA [FTP] [100 Mbit] - <ulink
+url="ftp://packages.linuxfromscratch.org">ftp://packages.linuxfromscratch.org</ulink></para></listitem>
+
+<listitem><para>Fremont, California, USA [HTTP] [100 Mbit] - <ulink
+url="http://packages.linuxfromscratch.org">http://packages.linuxfromscratch.org</ulink></para></listitem>
+
+<listitem><para>Canmore, Alberta, Canada [FTP] [2 Mbit] - <ulink
+url="ftp://ftp.ca.linuxfromscratch.org/pub/lfs/">ftp://ftp.ca.linuxfromscratch.org/pub/lfs/</ulink></para></listitem>
+
+<listitem><para>Canmore, Alberta, Canada [HTTP] [2 Mbit] - <ulink
+url="http://ftp.ca.linuxfromscratch.org/pub/lfs/">http://ftp.ca.linuxfromscratch.org/pub/lfs/</ulink></para></listitem>
+
+<listitem><para>Mainz, Germany, Europe [FTP] [1.5 Mbit] - <ulink
+url="ftp://ftp.linux-provider.net/pub/lfs/">ftp://ftp.linux-provider.net/pub/lfs/</ulink></para></listitem>
+
+<listitem><para>Mainz, Germany, Europe [HTTP] [1.5 Mbit] - <ulink
+url="http://ftp.linux-provider.net/lfs/">http://ftp.linux-provider.net/lfs/</ulink></para></listitem>
+
+<listitem><para>Vienna Univ. of Tech., Austria [FTP] [16 Mbit] - <ulink
+url="ftp://ftp.at.linuxfromscratch.org/lfs/packages">ftp://ftp.at.linuxfromscratch.org/lfs/packages</ulink></para></listitem>
+
+<listitem><para>Vienna Univ. of Tech., Austria [HTTP] [16 Mbit] - <ulink
+url="http://ftp.at.linuxfromscratch.org/lfs/packages">http://ftp.at.linuxfromscratch.org/lfs/packages</ulink></para></listitem>
+
+<listitem><para>Oslo, Norway [FTP] [100 Mbit] - <ulink
+url="ftp://ftp.no.linuxfromscratch.org/mirrors/lfs/">ftp://ftp.no.linuxfromscratch.org/mirrors/lfs/</ulink></para></listitem>
+
+<listitem><para>Brisbane, Australia [FTP] [155 Mbit] - <ulink
+url="ftp://ftp.planetmirror.com/pub/lfs/">ftp://ftp.planetmirror.com/pub/lfs/</ulink></para></listitem>
 
 </itemizedlist>