Index: BOOK/bootable/alpha/kernel.xml
===================================================================
--- BOOK/bootable/alpha/kernel.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ BOOK/bootable/alpha/kernel.xml	(revision 43daa018c2ff6d39f17112e794d8ef5c23bab608)
@@ -9,5 +9,5 @@
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-alpha-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-bootable-kernel">
@@ -110,5 +110,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-alpha-version;</userinput></screen>
+<screen><userinput>cp vmlinux /boot/lfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -116,5 +116,7 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-alpha-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -122,5 +124,7 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp .config /boot/config-&linux-alpha-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -128,9 +132,7 @@
     xpointer="xpointer(//*[@os='y'])"/>
 
-    <para>If the kernel source tree is going to retained, run
-    <command>chown -R 0:0</command> on the <filename
-    class="directory">linux-&linux-alpha-version;</filename> directory
-    to ensure all files are owned by user <systemitem
-    class="username">root</systemitem>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='y1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/mips/colo.xml
===================================================================
--- BOOK/bootable/mips/colo.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ BOOK/bootable/mips/colo.xml	(revision 43daa018c2ff6d39f17112e794d8ef5c23bab608)
@@ -41,6 +41,6 @@
 # load linux
 #
-lcd 'Booting &linux-mips-version;...'
-load vmlinux-&linux-mips-version;.gz
+lcd 'Booting &linux-version;...'
+load vmlinux-&linux-version;.gz
 execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe</literal>
 EOF</userinput></screen>
Index: BOOK/bootable/mips/kernel.xml
===================================================================
--- BOOK/bootable/mips/kernel.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ BOOK/bootable/mips/kernel.xml	(revision 43daa018c2ff6d39f17112e794d8ef5c23bab608)
@@ -9,5 +9,5 @@
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-mips-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-bootable-kernel">
@@ -116,6 +116,6 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/vmlinux-&linux-mips-version;
-gzip -9 /boot/vmlinux-&linux-mips-version;</userinput></screen>
+<screen><userinput>cp vmlinux /boot/vmlinux-&linux-version;
+gzip -9 /boot/vmlinux-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -123,5 +123,7 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-mips-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -129,5 +131,7 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp .config /boot/config-&linux-mips-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -135,9 +139,7 @@
     xpointer="xpointer(//*[@os='y'])"/>
 
-    <para>If the kernel source tree is going to retained, run
-    <command>chown -R 0:0</command> on the <filename
-    class="directory">linux-&linux-mips-version;</filename>
-    directory to ensure all files are owned by user <systemitem
-    class="username">root</systemitem>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='y1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/mips64-chapter.xml
===================================================================
--- BOOK/bootable/mips64-chapter.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the LFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the LFS System Bootable</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/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo.xml"/>
-
-</chapter>
Index: BOOK/bootable/mips64/colo.xml
===================================================================
--- BOOK/bootable/mips64/colo.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-colo">
-  <?dbhtml filename="colo.html"?>
-
-  <title>Making the LFS System Bootable</title>
-
-  <indexterm zone="ch-bootable-colo">
-    <primary sortas="a-Colo">Colo</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/colo.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/colo.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/colo.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/colo.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-<screen><userinput>cat &gt; /boot/default.colo &lt;&lt; "EOF"
-<literal>#:CoLo:#
-#
-# load linux
-#
-lcd 'Booting &linux-mips64-version;...'
-load vmlinux-&linux-mips64-version;.gz
-execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe</literal>
-EOF</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/colo.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/colo.xml"
-  xpointer="xpointer(//*[@os='v'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/colo.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: BOOK/bootable/mips64/kernel.xml
===================================================================
--- BOOK/bootable/mips64/kernel.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ 	(revision )
@@ -1,159 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-mips64-version;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/kernel.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/kernel.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/kernel.xml"
-    xpointer="xpointer(//*[@os='bc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/kernel.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp vmlinux /boot/vmlinux-&linux-mips64-version;
-gzip -9 /boot/vmlinux-&linux-mips64-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-<screen><userinput>cp System.map /boot/System.map-&linux-mips64-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-<screen><userinput>cp .config /boot/config-&linux-mips64-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <para>If the kernel source tree is going to retained, run
-    <command>chown -R 0:0</command> on the <filename
-    class="directory">linux-&linux-mips64-version;</filename>
-    directory to ensure all files are owned by user <systemitem
-    class="username">root</systemitem>.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('contents-kernel'))"/>
-
-</sect1>
Index: BOOK/bootable/ppc/kernel.xml
===================================================================
--- BOOK/bootable/ppc/kernel.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ BOOK/bootable/ppc/kernel.xml	(revision 43daa018c2ff6d39f17112e794d8ef5c23bab608)
@@ -9,5 +9,5 @@
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-ppc-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-bootable-kernel">
@@ -110,5 +110,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-ppc-version;</userinput></screen>
+<screen><userinput>cp vmlinux /boot/lfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -116,5 +116,7 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-ppc-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -122,5 +124,7 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp .config /boot/config-&linux-ppc-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -128,9 +132,7 @@
     xpointer="xpointer(//*[@os='y'])"/>
 
-    <para>If the kernel source tree is going to retained, run
-    <command>chown -R 0:0</command> on the <filename
-    class="directory">linux-&linux-ppc-version;</filename> directory to
-    ensure all files are owned by user <systemitem
-    class="username">root</systemitem>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='y1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/ppc/yaboot.xml
===================================================================
--- BOOK/bootable/ppc/yaboot.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ BOOK/bootable/ppc/yaboot.xml	(revision 43daa018c2ff6d39f17112e794d8ef5c23bab608)
@@ -96,5 +96,5 @@
 # For all images, the pathname is relative to the filesystem
 # on which they are mounted.
-image=/boot/lfskernel-&linux-ppc-version;
+image=/boot/lfskernel-&linux-version;
     label=&version;
     read-only</literal>
Index: BOOK/bootable/sparc/kernel.xml
===================================================================
--- BOOK/bootable/sparc/kernel.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ BOOK/bootable/sparc/kernel.xml	(revision 43daa018c2ff6d39f17112e794d8ef5c23bab608)
@@ -9,5 +9,5 @@
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-sparc-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-bootable-kernel">
@@ -110,5 +110,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-sparc-version;</userinput></screen>
+<screen><userinput>cp vmlinux /boot/lfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -116,5 +116,7 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-sparc-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -122,5 +124,7 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp .config /boot/config-&linux-sparc-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -128,9 +132,7 @@
     xpointer="xpointer(//*[@os='y'])"/>
 
-    <para>If the kernel source tree is going to retained, run
-    <command>chown -R 0:0</command> on the <filename
-    class="directory">linux-&linux-sparc-version;</filename> directory
-    to ensure all files are owned by user <systemitem
-    class="username">root</systemitem>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='y1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/sparc/silo.xml
===================================================================
--- BOOK/bootable/sparc/silo.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ BOOK/bootable/sparc/silo.xml	(revision 43daa018c2ff6d39f17112e794d8ef5c23bab608)
@@ -25,5 +25,5 @@
 timeout = 150         # Wait 15 seconds before booting the default section
 
-image = /boot/lfskernel-&linux-sparc-version;
+image = /boot/lfskernel-&linux-version;
   label = linux
 # End /etc/silo.conf</literal>
Index: BOOK/bootable/sparc64-chapter.xml
===================================================================
--- BOOK/bootable/sparc64-chapter.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the LFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the LFS System Bootable</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="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/silo.xml"/>
-
-</chapter>
Index: BOOK/bootable/sparc64/kernel.xml
===================================================================
--- BOOK/bootable/sparc64/kernel.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ 	(revision )
@@ -1,146 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-sparc64-version;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp vmlinux /boot/lfskernel-&linux-sparc64-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-<screen><userinput>cp System.map /boot/System.map-&linux-sparc64-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-<screen><userinput>cp .config /boot/config-&linux-sparc64-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <para>If the kernel source tree is going to retained, run
-    <command>chown -R 0:0</command> on the <filename
-    class="directory">linux-&linux-sparc64-version;</filename> directory
-    to ensure all files are owned by user <systemitem
-    class="username">root</systemitem>.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('contents-kernel'))"/>
-
-</sect1>
Index: BOOK/bootable/sparc64/silo.xml
===================================================================
--- BOOK/bootable/sparc64/silo.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-silo">
-  <?dbhtml filename="silo.html"?>
-
-  <title>Making the LFS System Bootable</title>
-
-  <indexterm zone="ch-bootable-silo">
-    <primary sortas="a-silo">Silo</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
-  <para>Create a <filename>silo.conf</filename> file defining silo's boot
-  menu:</para>
-
-<screen><userinput>cat &gt; /etc/silo.conf &lt;&lt; "EOF"
-<literal># Begin /etc/silo.conf
-partition = 1         # Boot partition (= root partition)
-root = /dev/sda1      # Root partition
-timeout = 150         # Wait 15 seconds before booting the default section
-
-image = /boot/lfskernel-&linux-sparc64-version;
-  label = linux
-# End /etc/silo.conf</literal>
-EOF</userinput></screen>
-
-  <para>Now to make Silo bootable:</para>
-
-<screen><userinput>silo -f</userinput></screen>
-
-</sect1>
Index: BOOK/bootable/x86/grub.xml
===================================================================
--- BOOK/bootable/x86/grub.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ BOOK/bootable/x86/grub.xml	(revision 43daa018c2ff6d39f17112e794d8ef5c23bab608)
@@ -104,5 +104,5 @@
 title LFS &version;
 root (hd0,3)
-kernel /boot/lfskernel-&linux-x86-version; root=/dev/hda4</literal>
+kernel /boot/lfskernel-&linux-version; root=/dev/hda4</literal>
 EOF</userinput></screen>
 
Index: BOOK/bootable/x86/kernel.xml
===================================================================
--- BOOK/bootable/x86/kernel.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ BOOK/bootable/x86/kernel.xml	(revision 43daa018c2ff6d39f17112e794d8ef5c23bab608)
@@ -9,5 +9,5 @@
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-x86-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-bootable-kernel">
@@ -121,5 +121,5 @@
     <para os="v">Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp arch/i386/boot/bzImage /boot/lfskernel-&linux-x86-version;</userinput></screen>
+<screen><userinput>cp arch/i386/boot/bzImage /boot/lfskernel-&linux-version;</userinput></screen>
 
     <para os="w"><filename>System.map</filename> is a symbol file for the kernel.
@@ -128,5 +128,5 @@
     kernel. Issue the following command to install the map file:</para>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-x86-version;</userinput></screen>
+<screen os="w1"><userinput>cp System.map /boot/System.map-&linux-version;</userinput></screen>
 
     <para os="x">The kernel configuration file <filename>.config</filename>
@@ -135,5 +135,5 @@
     It is a good idea to keep this file for future reference:</para>
 
-<screen><userinput>cp .config /boot/config-&linux-x86-version;</userinput></screen>
+<screen os="x1"><userinput>cp .config /boot/config-&linux-version;</userinput></screen>
 
     <para os="y">It is important to note that the files in the kernel source
@@ -150,7 +150,7 @@
     source.</para>
 
-    <para>If the kernel source tree is going to retained, run
+    <para os="y1">If the kernel source tree is going to retained, run
     <command>chown -R 0:0</command> on the <filename
-    class="directory">linux-&linux-x86-version;</filename> directory to
+    class="directory">linux-&linux-version;</filename> directory to
     ensure all files are owned by user <systemitem
     class="username">root</systemitem>.</para>
Index: BOOK/bootable/x86_64-chapter.xml
===================================================================
--- BOOK/bootable/x86_64-chapter.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ BOOK/bootable/x86_64-chapter.xml	(revision 43daa018c2ff6d39f17112e794d8ef5c23bab608)
@@ -15,5 +15,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
 
 </chapter>
Index: BOOK/bootable/x86_64/grub.xml
===================================================================
--- BOOK/bootable/x86_64/grub.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-bootable-grub">
-  <?dbhtml filename="grub.html"?>
-
-  <title>Making the LFS System Bootable</title>
-
-  <indexterm zone="ch-bootable-grub">
-    <primary sortas="a-GRUB">GRUB</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='k'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='l'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='m'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='n'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='o'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='p'])"/>
-
-<screen><userinput>cat &gt; /boot/grub/menu.lst &lt;&lt; "EOF"
-<literal># Begin /boot/grub/menu.lst
-
-# By default boot the first menu entry.
-default 0
-
-# Allow 30 seconds before booting the default.
-timeout 30
-
-# Use prettier colors.
-color green/black light-green/black
-
-# The first entry is for LFS.
-title LFS &version;
-root (hd0,3)
-kernel /boot/lfskernel-&linux-x86_64-version; root=/dev/hda4</literal>
-EOF</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='q'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='r'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='s'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='t'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='u'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='v'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='w'])"/>
-
-</sect1>
Index: BOOK/bootable/x86_64/kernel.xml
===================================================================
--- BOOK/bootable/x86_64/kernel.xml	(revision 71a36dc271e4feaf17a2b37964e4d3a13d4828e6)
+++ BOOK/bootable/x86_64/kernel.xml	(revision 43daa018c2ff6d39f17112e794d8ef5c23bab608)
@@ -9,5 +9,5 @@
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-x86_64-version;</title>
+  <title>Linux-&linux-version;</title>
 
   <indexterm zone="ch-bootable-kernel">
@@ -110,5 +110,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp arch/x86_64/boot/bzImage /boot/lfskernel-&linux-x86_64-version;</userinput></screen>
+<screen><userinput>cp arch/x86_64/boot/bzImage /boot/lfskernel-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -116,5 +116,7 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>cp System.map /boot/System.map-&linux-x86_64-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='w1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -122,5 +124,7 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen><userinput>cp .config /boot/config-&linux-x86_64-version;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='x1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -128,9 +132,7 @@
     xpointer="xpointer(//*[@os='y'])"/>
 
-    <para>If the kernel source tree is going to retained, run
-    <command>chown -R 0:0</command> on the <filename
-    class="directory">linux-&linux-x86_64-version;</filename> directory
-    to ensure all files are owned by user <systemitem
-    class="username">root</systemitem>.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/kernel.xml"
+    xpointer="xpointer(//*[@os='y1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
