Cleaning up some entity stuff.

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

8 files changed, 2 insertions, 49 deletions

diff --git a/entities/adjustingtoolchain.ent b/entities/adjustingtoolchain.ent
deleted file mode 100644
index fcaf19536..000000000
--- a/entities/adjustingtoolchain.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ENTITY c6-adjustingtoolchain SYSTEM "../chapter06/adjustingtoolchain.xml">
diff --git a/entities/basic-net.ent b/entities/basic-net.ent
deleted file mode 100644
index e47c44950..000000000
--- a/entities/basic-net.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ENTITY c6-basic-net SYSTEM "../chapter06/basic-net.xml">
diff --git a/entities/bookinfo.ent b/entities/bookinfo.ent
deleted file mode 100644
index 7f7c42e42..000000000
--- a/entities/bookinfo.ent
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ENTITY bookinfo SYSTEM "../bookinfo/bookinfo.xml">
-<!ENTITY bi-authorgroup SYSTEM "../bookinfo/authorgroup.xml">
-<!ENTITY bi-copyright SYSTEM "../bookinfo/copyright.xml">
-<!ENTITY bi-legalnotice SYSTEM "../bookinfo/legalnotice.xml">
-<!ENTITY bi-abstract SYSTEM "../bookinfo/abstract.xml">
diff --git a/entities/dedication.ent b/entities/dedication.ent
deleted file mode 100644
index 9d374950f..000000000
--- a/entities/dedication.ent
+++ /dev/null
@@ -1,2 +0,0 @@
-<!ENTITY dedication SYSTEM "../dedication/dedication.xml">
-<!ENTITY dc-dedicated SYSTEM "../dedication/dedicated.xml">
diff --git a/entities/lockingglibc.ent b/entities/lockingglibc.ent
deleted file mode 100644
index 84c8bcbff..000000000
--- a/entities/lockingglibc.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ENTITY c5-lockingglibc SYSTEM "../chapter05/lockingglibc.xml">
diff --git a/entities/parts.ent b/entities/parts.ent
deleted file mode 100644
index 03e09ce74..000000000
--- a/entities/parts.ent
+++ /dev/null
@@ -1,4 +0,0 @@
-<!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
deleted file mode 100644
index d60a0622a..000000000
--- a/entities/preface.ent
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ENTITY preface SYSTEM "../preface/preface.xml">
-<!ENTITY pf-foreword SYSTEM "../preface/foreword.xml">
-<!ENTITY pf-audience SYSTEM "../preface/audience.xml">
-<!ENTITY pf-prerequisites SYSTEM "../preface/prerequisites.xml">
-<!ENTITY pf-organization SYSTEM "../preface/organization.xml">
diff --git a/index.xml b/index.xml
index 73f431686..6a5892ca7 100644
--- a/index.xml
+++ b/index.xml
@@ -23,24 +23,11 @@
 <!ENTITY book SYSTEM "book.xml">
 <!ENTITY bookinfo SYSTEM "bookinfo.xml">
 
-<!ENTITY % preface SYSTEM "entities/preface.ent">
-<!ENTITY % chapter01 SYSTEM "entities/chapter01.ent">
-<!ENTITY % chapter02 SYSTEM "entities/chapter02.ent">
-<!ENTITY % chapter03 SYSTEM "entities/chapter03.ent">
-<!ENTITY % chapter04 SYSTEM "entities/chapter04.ent">
-<!ENTITY % chapter05 SYSTEM "entities/chapter05.ent">
-<!ENTITY % chapter06 SYSTEM "entities/chapter06.ent">
-<!ENTITY % chapter07 SYSTEM "entities/chapter07.ent">
-<!ENTITY % chapter08 SYSTEM "entities/chapter08.ent">
-<!ENTITY % chapter09 SYSTEM "entities/chapter09.ent">
-<!ENTITY % appendixa SYSTEM "entities/appendixa.ent">
-<!ENTITY % appendixb SYSTEM "entities/appendixb.ent">
+<!ENTITY % bookstructure SYSTEM "entities/book-structure.xml">
 
-<!ENTITY % adjustingtoolchain-entities SYSTEM "entities/adjustingtoolchain.ent">
 <!ENTITY % autoconf-entities SYSTEM "entities/autoconf.ent">
 <!ENTITY % automake-entities SYSTEM "entities/automake.ent">
 <!ENTITY % bash-entities SYSTEM "entities/bash.ent">
-<!ENTITY % basic-net-entities SYSTEM "entities/basic-net.ent">
 <!ENTITY % binutils-entities SYSTEM "entities/binutils.ent">
 <!ENTITY % bison-entities SYSTEM "entities/bison.ent">
 <!ENTITY % bootscripts-entities SYSTEM "entities/bootscripts.ent">
@@ -69,7 +56,6 @@
 <!ENTITY % less-entities SYSTEM "entities/less.ent">
 <!ENTITY % lfs-utils-entities SYSTEM "entities/lfs-utils.ent">
 <!ENTITY % libtool-entities SYSTEM "entities/libtool.ent">
-<!ENTITY % lockingglibc-entities SYSTEM "entities/lockingglibc.ent">
 <!ENTITY % m4-entities SYSTEM "entities/m4.ent">
 <!ENTITY % make-entities SYSTEM "entities/make.ent">
 <!ENTITY % makedev-entities SYSTEM "entities/makedev.ent">
@@ -94,24 +80,11 @@
 <!ENTITY % vim-entities SYSTEM "entities/vim.ent">
 <!ENTITY % zlib-entities SYSTEM "entities/zlib.ent">
 
-%preface;
-%chapter01;
-%chapter02;
-%chapter03;
-%chapter04;
-%chapter05;
-%chapter06;
-%chapter07;
-%chapter08;
-%chapter09;
-%appendixa;
-%appendixb;
+%bookstructure;
 
-%adjustingtoolchain-entities;
 %autoconf-entities;
 %automake-entities;
 %bash-entities;
-%basic-net-entities;
 %binutils-entities;
 %bison-entities;
 %bootscripts-entities;
@@ -140,7 +113,6 @@
 %less-entities;
 %lfs-utils-entities;
 %libtool-entities;
-%lockingglibc-entities;
 %m4-entities;
 %make-entities;
 %makedev-entities;