Index: BOOK/boot/mips/colo.xml
===================================================================
--- BOOK/boot/mips/colo.xml	(revision 559f774f6ec0d782f0cf8f888da5eee22a4c1a68)
+++ BOOK/boot/mips/colo.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -33,6 +33,6 @@
 # load linux
 #
-lcd 'Booting &linux-version;-&linux-version2;...'
-load vmlinux-&linux-version;-&linux-version2;.gz
+lcd 'Booting &linux-version2;...'
+load vmlinux-&linux-version2;.gz
 execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe
 EOF</userinput></screen>
Index: BOOK/boot/mips/kernel.xml
===================================================================
--- BOOK/boot/mips/kernel.xml	(revision 559f774f6ec0d782f0cf8f888da5eee22a4c1a68)
+++ BOOK/boot/mips/kernel.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-version;-&linux-version2;</title>
+  <title>Linux-&linux-version2;</title>
 
   <indexterm zone="ch-boot-kernel">
@@ -90,6 +90,6 @@
 
 <screen><userinput>mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/vmlinux-&linux-version;-&linux-version2;
-gzip -9 /tools/boot/vmlinux-&linux-version;-&linux-version2;</userinput></screen>
+cp -v vmlinux /tools/boot/vmlinux-&linux-version2;
+gzip -9 /tools/boot/vmlinux-&linux-version2;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/mips64/kernel.xml
===================================================================
--- BOOK/boot/mips64/kernel.xml	(revision 559f774f6ec0d782f0cf8f888da5eee22a4c1a68)
+++ BOOK/boot/mips64/kernel.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-version;-&linux-version2;</title>
+  <title>Linux-&linux-version2;</title>
 
   <indexterm zone="ch-boot-kernel">
@@ -94,6 +94,6 @@
 
 <screen><userinput>mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/vmlinux-&linux-version;-&linux-version2;
-gzip -9 /tools/boot/vmlinux-&linux-version;-&linux-version2;</userinput></screen>
+cp -v vmlinux /tools/boot/vmlinux-&linux-version2;
+gzip -9 /tools/boot/vmlinux-&linux-version2;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/ppc/kernel.xml
===================================================================
--- BOOK/boot/ppc/kernel.xml	(revision 559f774f6ec0d782f0cf8f888da5eee22a4c1a68)
+++ BOOK/boot/ppc/kernel.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-version;-&linux-version2;</title>
+  <title>Linux-&linux-version2;</title>
 
   <indexterm zone="ch-boot-kernel">
@@ -95,5 +95,5 @@
 
 <screen><userinput>mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/clfskernel-&linux-version;-&linux-version2;</userinput></screen>
+cp -v vmlinux /tools/boot/clfskernel-&linux-version2;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/ppc64/kernel.xml
===================================================================
--- BOOK/boot/ppc64/kernel.xml	(revision 559f774f6ec0d782f0cf8f888da5eee22a4c1a68)
+++ BOOK/boot/ppc64/kernel.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-version;-&linux-version2;</title>
+  <title>Linux-&linux-version2;</title>
 
   <indexterm zone="ch-boot-kernel">
@@ -94,5 +94,5 @@
 
 <screen><userinput>mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/clfskernel-&linux-version;-&linux-version2;</userinput></screen>
+cp -v vmlinux /tools/boot/clfskernel-&linux-version2;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/sparc/kernel.xml
===================================================================
--- BOOK/boot/sparc/kernel.xml	(revision 559f774f6ec0d782f0cf8f888da5eee22a4c1a68)
+++ BOOK/boot/sparc/kernel.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-version;-&linux-version2;</title>
+  <title>Linux-&linux-version2;</title>
 
   <indexterm zone="ch-boot-kernel">
@@ -90,5 +90,5 @@
 
 <screen><userinput>mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/clfskernel-&linux-version;-&linux-version2;</userinput></screen>
+cp -v vmlinux /tools/boot/clfskernel-&linux-version2;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/sparc/silo.xml
===================================================================
--- BOOK/boot/sparc/silo.xml	(revision 559f774f6ec0d782f0cf8f888da5eee22a4c1a68)
+++ BOOK/boot/sparc/silo.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -25,5 +25,5 @@
 timeout = 150         # Wait 15 seconds before booting the default section
 
-image = /tools/boot/vmlinuz-clfs-&linux-version;-&linux-version2;
+image = /tools/boot/vmlinuz-clfs-&linux-version2;
   label = linux
 # End /etc/silo.conf</literal>
Index: BOOK/boot/sparc64/kernel.xml
===================================================================
--- BOOK/boot/sparc64/kernel.xml	(revision 559f774f6ec0d782f0cf8f888da5eee22a4c1a68)
+++ BOOK/boot/sparc64/kernel.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-version;-&linux-version2;</title>
+  <title>Linux-&linux-version2;</title>
 
   <indexterm zone="ch-boot-kernel">
@@ -92,5 +92,5 @@
 
 <screen><userinput>mkdir -pv /tools/boot
-cp -v vmlinux /tools/boot/clfskernel-&linux-version;-&linux-version2;</userinput></screen>
+cp -v vmlinux /tools/boot/clfskernel-&linux-version2;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/boot/x86/kernel.xml
===================================================================
--- BOOK/boot/x86/kernel.xml	(revision 559f774f6ec0d782f0cf8f888da5eee22a4c1a68)
+++ BOOK/boot/x86/kernel.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -109,5 +109,5 @@
 
 <screen><userinput>mkdir -pv /tools/boot
-cp -v arch/i386/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version;-&linux-version2;</userinput></screen>
+cp -v arch/i386/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version2;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -115,5 +115,5 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen os="w1"><userinput>cp -v System.map /tools/boot/System.map-&linux-version;-&linux-version2;</userinput></screen>
+<screen os="w1"><userinput>cp -v System.map /tools/boot/System.map-&linux-version2;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -121,5 +121,5 @@
     xpointer="xpointer(//*[@os='x'])"/>
 
-<screen os="x1"><userinput>cp -v .config /tools/boot/config-&linux-version;-&linux-version2;</userinput></screen>
+<screen os="x1"><userinput>cp -v .config /tools/boot/config-&linux-version2;</userinput></screen>
 
   </sect2>
Index: BOOK/boot/x86_64/kernel.xml
===================================================================
--- BOOK/boot/x86_64/kernel.xml	(revision 559f774f6ec0d782f0cf8f888da5eee22a4c1a68)
+++ BOOK/boot/x86_64/kernel.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
   <?dbhtml filename="kernel.html"?>
 
-  <title>Linux-&linux-version;-&linux-version2;</title>
+  <title>Linux-&linux-version2;</title>
 
   <indexterm zone="ch-boot-kernel">
@@ -94,5 +94,5 @@
 
 <screen><userinput>mkdir -pv /tools/boot
-cp -v arch/x86_64/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version;-&linux-version2;</userinput></screen>
+cp -v arch/x86_64/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version2;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
