Index: BOOK/arm-index.xml
===================================================================
--- BOOK/arm-index.xml	(revision 1cfc0edb4e7af1789c7ad7c5d1ad5a005ba1a8a7)
+++ BOOK/arm-index.xml	(revision b42c0945810812339cea63a1c075f82efa7fd932)
@@ -43,5 +43,5 @@
     <title>Building the CLFS System</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/arm-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/arm-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/chapter.xml"/>
Index: BOOK/final-system/arm-chapter.xml
===================================================================
--- BOOK/final-system/arm-chapter.xml	(revision 1cfc0edb4e7af1789c7ad7c5d1ad5a005ba1a8a7)
+++ 	(revision )
@@ -1,22 +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-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</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/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/toolchain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/busybox.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-
-</chapter>
Index: BOOK/final-system/chapter.xml
===================================================================
--- BOOK/final-system/chapter.xml	(revision b42c0945810812339cea63a1c075f82efa7fd932)
+++ BOOK/final-system/chapter.xml	(revision b42c0945810812339cea63a1c075f82efa7fd932)
@@ -0,0 +1,22 @@
+<?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-building-system" xreflabel="Installing Basic System Software">
+  <?dbhtml dir="final-system"?>
+  <?dbhtml filename="chapter.html"?>
+
+  <title>Installing Basic System Software</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/pkgmgt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingfiles.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/toolchain.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/busybox.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
+
+</chapter>
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision 1cfc0edb4e7af1789c7ad7c5d1ad5a005ba1a8a7)
+++ 	(revision )
@@ -1,22 +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-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</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/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/toolchain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/busybox.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-
-</chapter>
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision 1cfc0edb4e7af1789c7ad7c5d1ad5a005ba1a8a7)
+++ 	(revision )
@@ -1,22 +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-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</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/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/toolchain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/busybox.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-
-</chapter>
Index: BOOK/mips-index.xml
===================================================================
--- BOOK/mips-index.xml	(revision 1cfc0edb4e7af1789c7ad7c5d1ad5a005ba1a8a7)
+++ BOOK/mips-index.xml	(revision b42c0945810812339cea63a1c075f82efa7fd932)
@@ -43,5 +43,5 @@
     <title>Building the CLFS System</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/mips-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/mips-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/chapter.xml"/>
Index: BOOK/x86-index.xml
===================================================================
--- BOOK/x86-index.xml	(revision 1cfc0edb4e7af1789c7ad7c5d1ad5a005ba1a8a7)
+++ BOOK/x86-index.xml	(revision b42c0945810812339cea63a1c075f82efa7fd932)
@@ -44,5 +44,5 @@
     <title>Building the CLFS System</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/x86-chapter.xml"/>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/x86-chapter.xml"/>
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/chapter.xml"/>
