* Merged newxml into HEAD

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

5 files changed, 58 insertions, 32 deletions

diff --git a/chapter09/chapter09.xml b/chapter09/chapter09.xml
index 10af4f606..0469ef29e 100644
--- a/chapter09/chapter09.xml
+++ b/chapter09/chapter09.xml
@@ -1,11 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
 <chapter id="chapter-finalizing" xreflabel="Chapter 9">
+<?dbhtml dir="chapter09"?>
 <title>The End</title>
-<?dbhtml filename="chapter09.html" dir="chapter09"?>
+<?dbhtml filename="chapter09.html"?>
 
-&c9-theend;
-&c9-getcounted;
-&c9-reboot;
-&c9-whatnow;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="theend.xml"/>
 
-</chapter>
 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="getcounted.xml"/>
+
+
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="reboot.xml"/>
+
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="whatnow.xml"/>
+
+
+</chapter>
diff --git a/chapter09/getcounted.xml b/chapter09/getcounted.xml
index 8b053b1d0..4eeaa7b74 100644
--- a/chapter09/getcounted.xml
+++ b/chapter09/getcounted.xml
@@ -1,14 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
 <sect1 id="ch-finish-getcounted">
 <title>Get Counted</title>
-<?dbhtml filename="getcounted.html" dir="chapter09"?>
+<?dbhtml filename="getcounted.html"?>
 
 <para>Want to be counted as an LFS user now that you have finished the
 book? Head over 
-to <ulink url="http://linuxfromscratch.org/cgi-bin/lfscounter.cgi"/> and 
+to <ulink url="&lfs-root;cgi-bin/lfscounter.cgi"/> and 
 register as an LFS user by entering your name and the first LFS version 
 you have used.</para>
 
 <para>Let's reboot into LFS now...</para>
 
 </sect1>
-
diff --git a/chapter09/reboot.xml b/chapter09/reboot.xml
index 99bca049e..6607a71e3 100644
--- a/chapter09/reboot.xml
+++ b/chapter09/reboot.xml
@@ -1,6 +1,11 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
 <sect1 id="ch-finish-reboot">
 <title>Rebooting the system</title>
-<?dbhtml filename="reboot.html" dir="chapter09"?>
+<?dbhtml filename="reboot.html"?>
 
 <para>Now that all of the software has been installed, it is time to reboot
 your computer. First exit from the chroot environment:</para>
diff --git a/chapter09/theend.xml b/chapter09/theend.xml
index e154f0513..c29cc6f8a 100644
--- a/chapter09/theend.xml
+++ b/chapter09/theend.xml
@@ -1,6 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
 <sect1 id="ch-finish-theend">
 <title>The End</title>
-<?dbhtml filename="theend.html" dir="chapter09"?>
+<?dbhtml filename="theend.html"?>
+
+<indexterm zone="ch-finish-theend"><primary sortas="e-/etc/lfs-release">/etc/lfs-release</primary></indexterm>
 
 <para>Well done! You have finished installing your LFS system. It may have
 been a long process, but we hope it was worth it. We wish you a lot of fun
@@ -14,4 +21,3 @@ you have installed on your system. Create this file by running:</para>
 <screen><userinput>echo &version; &gt; /etc/lfs-release</userinput></screen>
 
 </sect1>
-
diff --git a/chapter09/whatnow.xml b/chapter09/whatnow.xml
index 4fdae39cc..4bc76c04a 100644
--- a/chapter09/whatnow.xml
+++ b/chapter09/whatnow.xml
@@ -1,44 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
 <sect1 id="ch-finish-whatnow">
 <title>What now?</title>
-<?dbhtml filename="whatnow.html" dir="chapter09"?>
+<?dbhtml filename="whatnow.html"?>
 
-<para>Thank you for reading the LFS Book. We hope that you've found this book
-useful and worth your time.</para>
+<para>We thank you for reading the LFS Book and hope that you've found this
+book useful and worth your time.</para>
 
 <para>Now that you have finished installing your LFS system, you may be
-wondering what to do next. As an answer to that question we have composed a
-short list of resources:</para>
+wondering <quote>What now?</quote>. To answer that question, we have
+composed a list of resources for you.</para>
 
 <itemizedlist>
 <listitem><para>Beyond Linux From Scratch</para>
 
-<para>If you want extra utilities for your LFS system, there is the Beyond
-Linux From Scratch book for you. It covers the installation procedures of many
-different packages beyond the scope of the LFS book. Among them are
-general libraries, programming languages, graphical desktops, multimedia,
-networking and printing. The BLFS project can be found at
-<ulink url="&blfs-root;"/>.</para></listitem>
+<para>The Beyond Linux From Scratch book covers installation procedures
+for a wide range of software beyond the scope of the LFS Book. The BLFS
+project can be found at <ulink url="&blfs-root;"/>.</para></listitem>
 
 <listitem><para>LFS Hints</para>
 
-<para>The LFS Hints are a collection of educational documents, often small,
-submitted by volunteers in the LFS community. They cover subjects ranging from
-dependencies to UTF-8 locales, from optimization to uGlibc, and from cloning to
-TZ. The Hints are available at <ulink url="&hints-index;"/>.</para></listitem>
+<para>The LFS Hints are a collection of small, educational documents
+submitted by volunteers in the LFS community. The Hints are available at
+<ulink url="&hints-index;"/>.</para></listitem>
 
 <listitem><para>Mailing lists</para>
 
-<para>There are several LFS mailing lists you may subscribe to if you want to
-help develop the book further, assist others to build their systems, or are in
-need of help yourself. See <ulink url="&lfs-root;mail.html"/> for more
+<para>There are several LFS mailing lists you may subscribe to if you are
+in need of help. See <xref linkend="ch-scatter-maillists"/> for more
 information.</para></listitem>
 
 <listitem><para>The Linux Documentation Project</para>
 
 <para>The goal of the Linux Documentation Project is to collaborate in
 all of the issues of Linux documentation. The LDP features a large collection
-of HOWTOs, Guides and man pages, and can be found at
-<ulink url="&tldp-root;"/>.</para></listitem>
+of HOWTOs, Guides and man pages; it may be found at
+<ulink url="http://www.tldp.org/"/>.</para></listitem>
 
 </itemizedlist>