Index: BOOK/boot/mips/colo.xml
===================================================================
--- BOOK/boot/mips/colo.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ 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 c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ 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 c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ 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 c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ 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 c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ 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 c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ 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 c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ 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 c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ 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 c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ 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 c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ 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"
Index: BOOK/bootable/mips/arcload.xml
===================================================================
--- BOOK/bootable/mips/arcload.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/bootable/mips/arcload.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -31,7 +31,7 @@
 
 CLFS {
-  &linux-version;-&linux-version2; {
-    description  "&linux-version;-&linux-version2;";
-    image system "/&linux-version;-&linux-version2;";
+  &linux-version2; {
+    description  "&linux-version2;";
+    image system "/&linux-version2;";
   }
 
@@ -48,5 +48,5 @@
 <screen os="d"><userinput>dvhtool --unix-to-vh /usr/lib/arcload/sash sash
 dvhtool --unix-to-vh /boot/arc.cf arc.cf
-dvhtool --unix-to-vh /boot/&linux-version;-&linux-version2; &linux-version;-&linux-version2;</userinput></screen>
+dvhtool --unix-to-vh /boot/&linux-version2; &linux-version2;</userinput></screen>
 
 </sect1>
Index: BOOK/bootable/mips/colo.xml
===================================================================
--- BOOK/bootable/mips/colo.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/bootable/mips/colo.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -41,6 +41,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</literal>
 EOF</userinput></screen>
Index: BOOK/bootable/mips/kernel.xml
===================================================================
--- BOOK/bootable/mips/kernel.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/bootable/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-bootable-kernel">
@@ -102,6 +102,6 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux /boot/vmlinux-&linux-version;-&linux-version2;
-gzip -9 /boot/vmlinux-&linux-version;-&linux-version2;</userinput></screen>
+<screen><userinput>cp -v vmlinux /boot/vmlinux-&linux-version2;
+gzip -9 /boot/vmlinux-&linux-version2;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/bootable/mips64/arcload.xml
===================================================================
--- BOOK/bootable/mips64/arcload.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/bootable/mips64/arcload.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -31,7 +31,7 @@
 
 CLFS {
-  &linux-version;-&linux-version2; {
-    description  "&linux-version;-&linux-version2;";
-    image system "/&linux-version;-&linux-version2;";
+  &linux-version2; {
+    description  "&linux-version2;";
+    image system "/&linux-version2;";
   }
 
@@ -48,5 +48,5 @@
 <screen os="d"><userinput>dvhtool --unix-to-vh /usr/lib/arcload/sash64 sash64
 dvhtool --unix-to-vh /boot/arc.cf arc.cf
-dvhtool --unix-to-vh /boot/&linux-version;-&linux-version2; &linux-version;-&linux-version2;</userinput></screen>
+dvhtool --unix-to-vh /boot/&linux-version2; &linux-version2;</userinput></screen>
 
 </sect1>
Index: BOOK/bootable/ppc/kernel.xml
===================================================================
--- BOOK/bootable/ppc/kernel.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/bootable/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-bootable-kernel">
@@ -114,5 +114,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version;-&linux-version2;</userinput></screen>
+<screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version2;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/bootable/ppc/yaboot.xml
===================================================================
--- BOOK/bootable/ppc/yaboot.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/bootable/ppc/yaboot.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -63,5 +63,5 @@
   <parameter>device=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:</parameter>
   for the disk, and
-  <parameter>image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/clfskernel-&linux-version;-&linux-version2;</parameter>
+  <parameter>image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/clfskernel-&linux-version2;</parameter>
   which definitely works.</para>
 
@@ -113,5 +113,5 @@
 # on which they are situated and can include at most one
 # directory
-image=/boot/clfskernel-&linux-version;-&linux-version2;
+image=/boot/clfskernel-&linux-version2;
     label=&version;
     read-only</literal>
Index: BOOK/bootable/sparc/kernel.xml
===================================================================
--- BOOK/bootable/sparc/kernel.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/bootable/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-bootable-kernel">
@@ -106,5 +106,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version;-&linux-version2;</userinput></screen>
+<screen><userinput>cp -v vmlinux /boot/clfskernel-&linux-version2;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/bootable/sparc/silo.xml
===================================================================
--- BOOK/bootable/sparc/silo.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/bootable/sparc/silo.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -25,5 +25,5 @@
 timeout = 150         # Wait 15 seconds before booting the default section
 
-image = /boot/clfskernel-&linux-version;-&linux-version2;
+image = /boot/clfskernel-&linux-version2;
   label = linux
 # End /etc/silo.conf</literal>
Index: BOOK/bootable/x86/kernel.xml
===================================================================
--- BOOK/bootable/x86/kernel.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/bootable/x86/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-bootable-kernel">
@@ -132,5 +132,5 @@
     <para os="v">Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp -v arch/i386/boot/bzImage /boot/vmlinuz-clfs-&linux-version;-&linux-version2;</userinput></screen>
+<screen><userinput>cp -v arch/i386/boot/bzImage /boot/vmlinuz-clfs-&linux-version2;</userinput></screen>
 
     <para os="w"><filename>System.map</filename> is a symbol file for the kernel.
@@ -139,5 +139,5 @@
     kernel. Issue the following command to install the map file:</para>
 
-<screen os="w1"><userinput>cp -v System.map /boot/System.map-&linux-version;-&linux-version2;</userinput></screen>
+<screen os="w1"><userinput>cp -v System.map /boot/System.map-&linux-version2;</userinput></screen>
 
     <para os="x">The kernel configuration file <filename>.config</filename>
@@ -146,5 +146,5 @@
     It is a good idea to keep this file for future reference:</para>
 
-<screen os="x1"><userinput>cp -v .config /boot/config-&linux-version;-&linux-version2;</userinput></screen>
+<screen os="x1"><userinput>cp -v .config /boot/config-&linux-version2;</userinput></screen>
 
     <para os="y">It is important to note that the files in the kernel source
Index: BOOK/bootable/x86_64/kernel.xml
===================================================================
--- BOOK/bootable/x86_64/kernel.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/bootable/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-bootable-kernel">
@@ -106,5 +106,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp -v arch/x86_64/boot/bzImage /boot/vmlinuz-clfs-&linux-version;-&linux-version2;</userinput></screen>
+<screen><userinput>cp -v arch/x86_64/boot/bzImage /boot/vmlinuz-clfs-&linux-version2;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/mips/linux-headers.xml
===================================================================
--- BOOK/cross-tools/mips/linux-headers.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/cross-tools/mips/linux-headers.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
   <?dbhtml filename="linux-headers.html"?>
 
-  <title>Linux-Headers-&linux-version;-&linux-version2;</title>
+  <title>Linux-Headers-&linux-version2;</title>
 
   <indexterm zone="ch-cross-tools-linux-headers">
Index: BOOK/cross-tools/ppc/linux-headers.xml
===================================================================
--- BOOK/cross-tools/ppc/linux-headers.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/cross-tools/ppc/linux-headers.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
   <?dbhtml filename="linux-headers.html"?>
 
-  <title>Linux-Headers-&linux-version;-&linux-version2;</title>
+  <title>Linux-Headers-&linux-version2;</title>
 
   <indexterm zone="ch-cross-tools-linux-headers">
Index: BOOK/cross-tools/sparc/linux-headers.xml
===================================================================
--- BOOK/cross-tools/sparc/linux-headers.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/cross-tools/sparc/linux-headers.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
   <?dbhtml filename="linux-headers.html"?>
 
-  <title>Linux-Headers-&linux-version;-&linux-version2;</title>
+  <title>Linux-Headers-&linux-version2;</title>
 
   <indexterm zone="ch-cross-tools-linux-headers">
Index: BOOK/cross-tools/sparc64/linux-headers.xml
===================================================================
--- BOOK/cross-tools/sparc64/linux-headers.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/cross-tools/sparc64/linux-headers.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
   <?dbhtml filename="linux-headers.html"?>
 
-  <title>Linux-Headers-&linux-version;-&linux-version2;</title>
+  <title>Linux-Headers-&linux-version2;</title>
 
   <indexterm zone="ch-cross-tools-linux-headers">
Index: BOOK/cross-tools/x86/linux-headers.xml
===================================================================
--- BOOK/cross-tools/x86/linux-headers.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/cross-tools/x86/linux-headers.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
   <?dbhtml filename="linux-headers.html"?>
 
-  <title>Linux-Headers-&linux-version;-&linux-version2;</title>
+  <title>Linux-Headers-&linux-version2;</title>
 
   <indexterm zone="ch-cross-tools-linux-headers">
Index: BOOK/cross-tools/x86_64/linux-headers.xml
===================================================================
--- BOOK/cross-tools/x86_64/linux-headers.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/cross-tools/x86_64/linux-headers.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
   <?dbhtml filename="linux-headers.html"?>
 
-  <title>Linux-Headers-&linux-version;-&linux-version2;</title>
+  <title>Linux-Headers-&linux-version2;</title>
 
   <indexterm zone="ch-cross-tools-linux-headers">
Index: BOOK/final-system/common/linux-headers.xml
===================================================================
--- BOOK/final-system/common/linux-headers.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/final-system/common/linux-headers.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -9,5 +9,5 @@
   <?dbhtml filename="linux-headers.html"?>
 
-  <title>Linux-Headers-&linux-version;-&linux-version2;</title>
+  <title>Linux-Headers-&linux-version2;</title>
 
   <indexterm zone="ch-system-linux-headers">
Index: BOOK/system-config/common/udev.xml
===================================================================
--- BOOK/system-config/common/udev.xml	(revision c5afbba1b8fff034fde3cc88db0b2466d6ceef31)
+++ BOOK/system-config/common/udev.xml	(revision 7f8996debe3e62770996514962653c9886835674)
@@ -202,7 +202,6 @@
       bus driver properly exports the necessary aliases to <systemitem
       class="filesystem">sysfs</systemitem>. In other cases, one should
-      arrange module loading by other means. With
-      Linux-&linux-version;-&linux-version2;, Udev is known to load
-      properly-written drivers for INPUT, IDE, PCI, USB, SCSI,
+      arrange module loading by other means. With Linux-&linux-version2;, Udev
+      is known to load properly-written drivers for INPUT, IDE, PCI, USB, SCSI,
       SERIO and FireWire devices.</para>
 
@@ -222,5 +221,5 @@
       directory under <filename class="directory">/sys/bus</filename>, this
       means that the kernel developers have not yet added modalias support to
-      this bus type. With Linux-&linux-version;-&linux-version2;, this is the
+      this bus type. With Linux-&linux-version2;, this is the
       case with ISA busses. Expect this issue to be fixed in later kernel
       versions.</para>
