Merging files that make up the title page.

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

14 files changed, 62 insertions, 89 deletions

diff --git a/book.xml b/book.xml
new file mode 100644
index 000000000..c8e2c9af8
--- /dev/null
+++ b/book.xml
@@ -0,0 +1,36 @@
+&bookinfo;
+
+<dedication>
+<title>Dedication</title>
+<para>This book is dedicated to my loving and supportive wife
+<emphasis>Beverly Beekmans</emphasis>.</para>
+</dedication>
+
+&preface;
+
+<part id="part1">
+<title>Part I - Introduction</title>
+&chapter01;
+&chapter02;
+</part>
+
+<part id="part2">
+<title>Part II - Preparing for the build</title>
+&chapter03;
+&chapter04;
+&chapter05;
+</part>
+
+<part id="part3">
+<title>Part III - Building the LFS system</title>
+&chapter06;
+&chapter07;
+&chapter08;
+&chapter09;
+</part>
+
+<part id="part4">
+<title>Part IV - Appendices</title>
+&appendixa;
+&appendixb;
+</part>
diff --git a/book/book.xml b/book/book.xml
deleted file mode 100644
index 5549529bc..000000000
--- a/book/book.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-&bookinfo;
-&dedication;
-&preface;
-
-&part1;
-&part2;
-&part3;
-&part4;
diff --git a/book/part1.xml b/book/part1.xml
deleted file mode 100644
index e978daaea..000000000
--- a/book/part1.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<part id="part1">
-<title>Part I - Introduction</title>
-
-&chapter01;
-&chapter02;
-
-</part>
diff --git a/book/part2.xml b/book/part2.xml
deleted file mode 100644
index 089251a4b..000000000
--- a/book/part2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<part id="part2">
-<title>Part II - Preparing for the build</title>
-
-&chapter03;
-&chapter04;
-&chapter05;
-
-</part>
diff --git a/book/part3.xml b/book/part3.xml
deleted file mode 100644
index 86607c428..000000000
--- a/book/part3.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<part id="part3">
-<title>Part III - Building the LFS system</title>
-
-&chapter06;
-&chapter07;
-&chapter08;
-&chapter09;
-
-</part>
-
diff --git a/book/part4.xml b/book/part4.xml
deleted file mode 100644
index e993e770a..000000000
--- a/book/part4.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<part id="part4">
-<title>Part IV - Appendices</title>
-
-&appendixa;
-&appendixb;
-
-</part>
diff --git a/bookinfo/legalnotice.xml b/bookinfo.xml
index 0bc53b9d0..371b6c8aa 100644
--- a/bookinfo/legalnotice.xml
+++ b/bookinfo.xml
@@ -1,5 +1,26 @@
-<legalnotice>
+<bookinfo>
+<title>Linux From Scratch</title>
+<subtitle>Version &version;</subtitle>
+
+
+<authorgroup>
+<author><firstname>Gerard</firstname><surname>Beekmans</surname></author>
+</authorgroup>
+
+
+<copyright id="copyright">
+	<year>1999-2003</year>
+	<holder>Gerard Beekmans</holder>
+</copyright>
+
 
+<abstract>
+<para>This book describes the process of creating a Linux system from
+scratch, using nothing but the sources of the required software.</para>
+</abstract>
+
+
+<legalnotice>
 <para>Copyright (c) 1999-2002, Gerard Beekmans</para>
 
 <para>All rights reserved.</para>
@@ -33,6 +54,7 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</para>
-
 </legalnotice>
 
+
+</bookinfo>
diff --git a/bookinfo/abstract.xml b/bookinfo/abstract.xml
deleted file mode 100644
index 695977fec..000000000
--- a/bookinfo/abstract.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<abstract>
-
-<para>This book describes the process of creating a Linux system from
-scratch, using nothing but the sources of the required software.</para>
-</abstract>
-
diff --git a/bookinfo/authorgroup.xml b/bookinfo/authorgroup.xml
deleted file mode 100644
index 25b279c43..000000000
--- a/bookinfo/authorgroup.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<authorgroup>
-
-<author><firstname>Gerard</firstname><surname>Beekmans</surname></author>
-
-</authorgroup>
-
diff --git a/bookinfo/bookinfo.xml b/bookinfo/bookinfo.xml
deleted file mode 100644
index 411dd80fa..000000000
--- a/bookinfo/bookinfo.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<bookinfo>
-<title>Linux From Scratch</title>
-<subtitle>Version &version;</subtitle>
-
-&bi-authorgroup;
-&bi-copyright;
-&bi-legalnotice;
-&bi-abstract;
-
-</bookinfo>
diff --git a/bookinfo/copyright.xml b/bookinfo/copyright.xml
deleted file mode 100644
index e22714b3e..000000000
--- a/bookinfo/copyright.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<copyright id="copyright">
-
-	<year>1999-2003</year>
-	<holder>Gerard Beekmans</holder>
-
-</copyright>
-
diff --git a/dedication/dedicated.xml b/dedication/dedicated.xml
deleted file mode 100644
index 3658864d5..000000000
--- a/dedication/dedicated.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<para>This book is dedicated to my loving and supportive wife
-<emphasis>Beverly Beekmans</emphasis>.</para>
-
diff --git a/dedication/dedication.xml b/dedication/dedication.xml
deleted file mode 100644
index dae8f2e84..000000000
--- a/dedication/dedication.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<dedication>
-<title>Dedication</title>
-
-&dc-dedicated;
-
-</dedication>
diff --git a/index.xml b/index.xml
index e9f48544e..ef031c0f5 100644
--- a/index.xml
+++ b/index.xml
@@ -20,13 +20,9 @@
 <!ENTITY all-version "cvs-20030831-estimate">
 <!ENTITY all-size-mb "105 MB">
 
-<!-- preparing for surgery, please don't move -->
-<!-- if there's a double entry, please remove the other -->
-<!ENTITY book SYSTEM "book/book.xml">
+<!ENTITY book SYSTEM "book.xml">
+<!ENTITY bookinfo SYSTEM "bookinfo.xml">
 
-<!ENTITY % parts SYSTEM "entities/parts.ent">
-<!ENTITY % bookinfo SYSTEM "entities/bookinfo.ent">
-<!ENTITY % dedication SYSTEM "entities/dedication.ent">
 <!ENTITY % preface SYSTEM "entities/preface.ent">
 <!ENTITY % chapter01 SYSTEM "entities/chapter01.ent">
 <!ENTITY % chapter02 SYSTEM "entities/chapter02.ent">
@@ -99,9 +95,6 @@
 <!ENTITY % vim-entities SYSTEM "entities/vim.ent">
 <!ENTITY % zlib-entities SYSTEM "entities/zlib.ent">
 
-%parts;
-%bookinfo;
-%dedication;
 %preface;
 %chapter01;
 %chapter02;