Index: BOOK/partitioning/alpha-chapter.xml
===================================================================
--- BOOK/partitioning/alpha-chapter.xml	(revision 4fc026ef671b8cdd8c60814e135dc362072ac718)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mounting.xml"/>
-
-</chapter>
Index: BOOK/partitioning/arm-chapter.xml
===================================================================
--- BOOK/partitioning/arm-chapter.xml	(revision 4fc026ef671b8cdd8c60814e135dc362072ac718)
+++ BOOK/partitioning/arm-chapter.xml	(revision 02095ae2677b1a04865e7362509b6a5c1647e4e2)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
Index: BOOK/partitioning/common/creatingfilesystem.xml
===================================================================
--- BOOK/partitioning/common/creatingfilesystem.xml	(revision 4fc026ef671b8cdd8c60814e135dc362072ac718)
+++ BOOK/partitioning/common/creatingfilesystem.xml	(revision 02095ae2677b1a04865e7362509b6a5c1647e4e2)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
@@ -16,13 +16,13 @@
   journaling file systems are becoming increasingly popular. We will create
   an <systemitem class="filesystem">ext2</systemitem> file system.
-  Instructions for other file systems can be found at
-  <ulink url="&cblfs-root;index.php?section=6#File_System"/>.</para>
+  Build instructions for other file systems can be found at
+  <ulink url="&blfs-root;view/svn/postlfs/filesystems.html"/>.</para>
 
   <para os="b">To create an <systemitem class="filesystem">ext2</systemitem> file
-  system on the CLFS partition, run the following:</para>
+  system on the LFS partition, run the following:</para>
 
 <screen os="c"><userinput>mke2fs /dev/<replaceable>[xxx]</replaceable></userinput></screen>
 
-  <para os="d">Replace <replaceable>[xxx]</replaceable> with the name of the CLFS
+  <para os="d">Replace <replaceable>[xxx]</replaceable> with the name of the LFS
   partition (<filename class="devicefile">hda5</filename> in our previous
   example).</para>
@@ -31,9 +31,9 @@
     <para>Some host distributions use custom features in their filesystem
     creation tools (E2fsprogs). This can cause problems when booting into
-    your new CLFS system, as those features will not be supported by the
-    CLFS-installed E2fsprogs; you will get an error similar to
-    <computeroutput>unsupported filesystem features, upgrade your
-    e2fsprogs</computeroutput>. To check if your host system uses custom
-    enhancements, run the following command:</para>
+    your new LFS, as those features will not be supported by the LFS-installed
+    E2fsprogs; you will get an error similar to <computeroutput>unsupported
+    filesystem features, upgrade your e2fsprogs</computeroutput>. To check
+    if your host system uses custom enhancements, run the following
+    command:</para>
 
 <screen os="f"><userinput>debugfs -R feature /dev/<replaceable>[xxx]</replaceable></userinput></screen>
@@ -43,5 +43,5 @@
     enhancements.  In that case, to avoid later problems, you should compile the
     stock E2fsprogs package and use the resulting binaries to re-create the
-    filesystem on your CLFS partition:</para>
+    filesystem on your LFS partition:</para>
 
 <screen os="g"><userinput>cd /tmp
Index: BOOK/partitioning/common/creatingpartition.xml
===================================================================
--- BOOK/partitioning/common/creatingpartition.xml	(revision 4fc026ef671b8cdd8c60814e135dc362072ac718)
+++ BOOK/partitioning/common/creatingpartition.xml	(revision 02095ae2677b1a04865e7362509b6a5c1647e4e2)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
@@ -11,18 +11,23 @@
   <title>Creating a New Partition</title>
 
-  <para os="a">Like most other operating systems, CLFS is usually installed
-  on a dedicated partition. The recommended approach to building a CLFS
+  <para os="a">Like most other operating systems, CLFS is usually installed on
+  a dedicated partition. The recommended approach to building a CLFS
   system is to use an available empty partition or, if you have enough
-  unpartitioned space, to create one. However, if you're building for a different
-  architecture you can simply build everything in <quote>/mnt/clfs</quote>
-  and transfer it to your target machine.</para>
+  unpartitioned space, to create one. However, a CLFS system (in fact
+  even multiple CLFS systems) may also be installed on a partition already
+  occupied by another operating system and the different systems will
+  co-exist peacefully. The document <ulink
+  url="&hints-root;lfs_next_to_existing_systems.txt"/> explains how to
+  implement this, whereas this book discusses the method of using a fresh
+  partition for the installation.</para>
 
-  <para os="b">A minimal system requires around 2.5 gigabytes (GB).
-  This is enough to store all the source tarballs and compile the packages. The CLFS
-  system itself will not take up this much room. A large portion of this requirement
-  is to provide sufficient free temporary storage. Compiling packages can require a
-  lot of disk space which will be reclaimed after the package is installed. If the
-  CLFS system is intended to be the primary Linux system,  additional software will
-  probably be installed which will require additional space (2-10 GB). </para>
+  <para os="b">A minimal system requires a partition of around 1.3 gigabytes (GB).
+  This is enough to store all the source tarballs and compile the packages.
+  However, if the CLFS system is intended to be the primary Linux system,
+  additional software will probably be installed which will require
+  additional space (2-3 GB). The LFS system itself will not take up this
+  much room. A large portion of this requirement is to provide sufficient
+  free temporary storage. Compiling packages can require a lot of disk space
+  which will be reclaimed after the package is installed.</para>
 
   <para os="c">Because there is not always enough Random Access Memory (RAM)
@@ -30,5 +35,5 @@
   partition as swap space. This is used by the kernel to store seldom-used
   data and leave more memory available for active processes. The swap
-  partition for an CLFS system can be the same as the one used by the host
+  partition for an LFS system can be the same as the one used by the host
   system, in which case it is not necessary to create another one.</para>
 
Index: BOOK/partitioning/common/introduction.xml
===================================================================
--- BOOK/partitioning/common/introduction.xml	(revision 4fc026ef671b8cdd8c60814e135dc362072ac718)
+++ BOOK/partitioning/common/introduction.xml	(revision 02095ae2677b1a04865e7362509b6a5c1647e4e2)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
Index: BOOK/partitioning/common/mounting.xml
===================================================================
--- BOOK/partitioning/common/mounting.xml	(revision 4fc026ef671b8cdd8c60814e135dc362072ac718)
+++ BOOK/partitioning/common/mounting.xml	(revision 02095ae2677b1a04865e7362509b6a5c1647e4e2)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
@@ -15,29 +15,29 @@
   mounted at a chosen mount point. For the purposes of this book, it is
   assumed that the file system is mounted under <filename
-  class="directory">/mnt/clfs</filename>, but the directory choice is up
+  class="directory">/mnt/lfs</filename>, but the directory choice is up
   to you.</para>
 
-  <para>Choose a mount point and assign it to the <envar>CLFS</envar>
+  <para>Choose a mount point and assign it to the <envar>LFS</envar>
   environment variable by running:</para>
 
-<screen><userinput>export CLFS=/mnt/clfs</userinput></screen>
+<screen><userinput>export LFS=/mnt/lfs</userinput></screen>
 
   <para>Next, create the mount point and mount the CLFS file system by
   running:</para>
 
-<screen><userinput>mkdir -pv ${CLFS}
-mount -v /dev/<replaceable>[xxx]</replaceable> ${CLFS}</userinput></screen>
+<screen><userinput>mkdir -pv $LFS
+mount -v /dev/<replaceable>[xxx]</replaceable> $LFS</userinput></screen>
 
   <para>Replace <replaceable>[xxx]</replaceable> with the designation of
   the CLFS partition.</para>
 
-  <para>If using multiple partitions for CLFS (e.g., one for <filename
+  <para>If using multiple partitions for LFS (e.g., one for <filename
   class="directory">/</filename> and another for <filename
   class="directory">/usr</filename>), mount them using:</para>
 
-<screen><userinput>mkdir -pv ${CLFS}
-mount -v /dev/<replaceable>[xxx]</replaceable> ${CLFS}
-mkdir -v ${CLFS}/usr
-mount -v /dev/<replaceable>[yyy]</replaceable> ${CLFS}/usr</userinput></screen>
+<screen><userinput>mkdir -pv $LFS
+mount -v /dev/<replaceable>[xxx]</replaceable> $LFS
+mkdir -v $LFS/usr
+mount -v /dev/<replaceable>[yyy]</replaceable> $LFS/usr</userinput></screen>
 
   <para>Replace <replaceable>[xxx]</replaceable> and
Index: BOOK/partitioning/hppa-chapter.xml
===================================================================
--- BOOK/partitioning/hppa-chapter.xml	(revision 4fc026ef671b8cdd8c60814e135dc362072ac718)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mounting.xml"/>
-
-</chapter>
Index: BOOK/partitioning/x86-chapter.xml
===================================================================
--- BOOK/partitioning/x86-chapter.xml	(revision 4fc026ef671b8cdd8c60814e135dc362072ac718)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mounting.xml"/>
-
-</chapter>
