aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--book/book.xml1
-rw-r--r--book/part2.xml6
-rw-r--r--book/part3.xml7
-rw-r--r--entities/parts.ent1
-rw-r--r--entities/preface.ent3
-rw-r--r--preface/organization.xml49
-rw-r--r--preface/organpart1.xml10
-rw-r--r--preface/organpart2.xml11
-rw-r--r--preface/organpart3.xml7
9 files changed, 51 insertions, 44 deletions
diff --git a/book/book.xml b/book/book.xml
index eca386feb..5549529bc 100644
--- a/book/book.xml
+++ b/book/book.xml
@@ -5,3 +5,4 @@
&part1;
&part2;
&part3;
+&part4;
diff --git a/book/part2.xml b/book/part2.xml
index d37fbec33..089251a4b 100644
--- a/book/part2.xml
+++ b/book/part2.xml
@@ -1,12 +1,8 @@
<part id="part2">
-<title>Part II - Installing the LFS system</title>
+<title>Part II - Preparing for the build</title>
&chapter03;
&chapter04;
&chapter05;
-&chapter06;
-&chapter07;
-&chapter08;
-&chapter09;
</part>
diff --git a/book/part3.xml b/book/part3.xml
index 3a42d29ca..86607c428 100644
--- a/book/part3.xml
+++ b/book/part3.xml
@@ -1,7 +1,10 @@
<part id="part3">
-<title>Part III - Appendixes</title>
+<title>Part III - Building the LFS system</title>
-&appendixa;
+&chapter06;
+&chapter07;
+&chapter08;
+&chapter09;
</part>
diff --git a/entities/parts.ent b/entities/parts.ent
index 6e3a675ee..03e09ce74 100644
--- a/entities/parts.ent
+++ b/entities/parts.ent
@@ -1,3 +1,4 @@
<!ENTITY part1 SYSTEM "../book/part1.xml">
<!ENTITY part2 SYSTEM "../book/part2.xml">
<!ENTITY part3 SYSTEM "../book/part3.xml">
+<!ENTITY part4 SYSTEM "../book/part4.xml">
diff --git a/entities/preface.ent b/entities/preface.ent
index 8b516559d..e5865dc70 100644
--- a/entities/preface.ent
+++ b/entities/preface.ent
@@ -4,6 +4,3 @@
<!ENTITY pf-whonotread SYSTEM "../preface/whonotread.xml">
<!ENTITY pf-prerequisites SYSTEM "../preface/prerequisites.xml">
<!ENTITY pf-organization SYSTEM "../preface/organization.xml">
-<!ENTITY pf-oz-organpart1 SYSTEM "../preface/organpart1.xml">
-<!ENTITY pf-oz-organpart2 SYSTEM "../preface/organpart2.xml">
-<!ENTITY pf-oz-organpart3 SYSTEM "../preface/organpart3.xml">
diff --git a/preface/organization.xml b/preface/organization.xml
index 0a41b453f..0241390b1 100644
--- a/preface/organization.xml
+++ b/preface/organization.xml
@@ -2,14 +2,45 @@
<title>Organization</title>
<?dbhtml filename="organization.html" dir="preface"?>
-<para>Much of the appendices are integrated into Part II (which enlarges the
-book somewhat). We believe this makes for easier reading. This way, you
-don't have to keep referencing an appendix while you read Part II. That's
-a real chore, especially if you're reading the txt version of this book.
-This book is divided into the following parts:</para>
-
-&pf-oz-organpart1;
-&pf-oz-organpart2;
-&pf-oz-organpart3;
+<para>This book is divided into the following four parts:</para>
+
+<sect2>
+<title>Part I - Introduction</title>
+
+<para>Part I explains a few important things on how to proceed with the
+installation, and gives meta information about the book (version, changelog,
+acknowledgments, associated mailing lists, and so on).</para>
+</sect2>
+
+<sect2>
+<title>Part II - Preparing for the build</title>
+
+<para>Part II describes how to prepare for the building process: making a
+partition, downloading the packages, and compiling temporary tools.</para>
+</sect2>
+
+<sect2>
+<title>Part III - Building the LFS system</title>
+
+<para>Part III guides you through the building of the LFS system: compiling
+and installing all the packages one by one, setting up the boot scripts, and
+installing the kernel. The resulting basic Linux system is the foundation
+upon which you can build other software, to extend your system in the way
+you like.</para>
+</sect2>
+
+<sect2>
+<title>Part IV - Appendix</title>
+
+<para>Part IV for the moment consists of just a single appendix: an alphabetical
+list of all the packages installed, for each package giving its official download
+location, its contents, and its installation dependencies.</para>
+
+<para>(Much of this Appendix A is integrated into Parts II and III. This
+enlarges the book somewhat, but we believe it makes for easier reading. Now
+you don't have to keep referencing the appendix while doing the installation.
+This going back and forth would be a real chore, especially if you're reading
+the txt version of the book.)</para>
+</sect2>
</sect1>
diff --git a/preface/organpart1.xml b/preface/organpart1.xml
index d8480cdcd..c3982ed41 100644
--- a/preface/organpart1.xml
+++ b/preface/organpart1.xml
@@ -1,10 +1,2 @@
-<sect2 id="pre-organ1">
-<title>Part I - Introduction</title>
-
-<para>Part I gives general information about the contents of the book
-(revisions, where to get it, changelog, mailing lists, and other contact
-information). It also contains suggested readings which discuss a few
-important considerations before beginning your LFS system.</para>
-
-</sect2>
+[delete me]
diff --git a/preface/organpart2.xml b/preface/organpart2.xml
index ee99b3236..c3982ed41 100644
--- a/preface/organpart2.xml
+++ b/preface/organpart2.xml
@@ -1,11 +1,2 @@
-<sect2 id="pre-organ2">
-<title>Part II - Installation of the base LFS system</title>
-
-<para>Part II guides you through the building and installation of an LFS
-system. The resulting LFS system will be the core foundation upon which
-the rest of your Linux system is built. Whatever your system becomes,
-it will be built and supported by the foundation that we build in Part
-II.</para>
-
-</sect2>
+[delete me]
diff --git a/preface/organpart3.xml b/preface/organpart3.xml
index ff63d5648..c3982ed41 100644
--- a/preface/organpart3.xml
+++ b/preface/organpart3.xml
@@ -1,7 +1,2 @@
-<sect2 id="pre-organ3">
-<title>Part III - Appendixes</title>
-
-<para>Part III contains various appendices.</para>
-
-</sect2>
+[delete me]