[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.1.0-1319-g7f8996d
git
git at cross-lfs.org
Wed Jul 2 17:13:51 PDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via 7f8996debe3e62770996514962653c9886835674 (commit)
from c5afbba1b8fff034fde3cc88db0b2466d6ceef31 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7f8996debe3e62770996514962653c9886835674
Author: William Harrington <kb0iic at cross-lfs.org>
Date: Wed Jul 2 19:12:18 2014 -0500
Correction to previous commit, we want &linux-version2; entity where it is required. Do not use &linux-version; and &linux-version2; entities together. We just want Linux-3.14.10 where required, rather than LInux-3.14. And surely we do not want LInux-3.14-3.14.10.
diff --git a/BOOK/boot/mips/colo.xml b/BOOK/boot/mips/colo.xml
index 2144848..1ebaca7 100644
--- a/BOOK/boot/mips/colo.xml
+++ b/BOOK/boot/mips/colo.xml
@@ -32,8 +32,8 @@
#
# 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>
diff --git a/BOOK/boot/mips/kernel.xml b/BOOK/boot/mips/kernel.xml
index 1d6f156..2532321 100644
--- a/BOOK/boot/mips/kernel.xml
+++ b/BOOK/boot/mips/kernel.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-boot-kernel" role="wrap">
<?dbhtml filename="kernel.html"?>
- <title>Linux-&linux-version;-&linux-version2;</title>
+ <title>Linux-&linux-version2;</title>
<indexterm zone="ch-boot-kernel">
<primary sortas="a-Linux">Linux</primary>
@@ -89,8 +89,8 @@
xpointer="xpointer(//*[@os='v'])"/>
<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"
href="../x86/kernel.xml"
diff --git a/BOOK/boot/mips64/kernel.xml b/BOOK/boot/mips64/kernel.xml
index ac5850a..6f816aa 100644
--- a/BOOK/boot/mips64/kernel.xml
+++ b/BOOK/boot/mips64/kernel.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-boot-kernel" role="wrap">
<?dbhtml filename="kernel.html"?>
- <title>Linux-&linux-version;-&linux-version2;</title>
+ <title>Linux-&linux-version2;</title>
<indexterm zone="ch-boot-kernel">
<primary sortas="a-Linux">Linux</primary>
@@ -93,8 +93,8 @@
xpointer="xpointer(//*[@os='v'])"/>
<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"
href="../x86/kernel.xml"
diff --git a/BOOK/boot/ppc/kernel.xml b/BOOK/boot/ppc/kernel.xml
index 6ab6f35..c5a015b 100644
--- a/BOOK/boot/ppc/kernel.xml
+++ b/BOOK/boot/ppc/kernel.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-boot-kernel" role="wrap">
<?dbhtml filename="kernel.html"?>
- <title>Linux-&linux-version;-&linux-version2;</title>
+ <title>Linux-&linux-version2;</title>
<indexterm zone="ch-boot-kernel">
<primary sortas="a-Linux">Linux</primary>
@@ -94,7 +94,7 @@
xpointer="xpointer(//*[@os='v'])"/>
<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"
href="../x86/kernel.xml"
diff --git a/BOOK/boot/ppc64/kernel.xml b/BOOK/boot/ppc64/kernel.xml
index 752b712..6573ee3 100644
--- a/BOOK/boot/ppc64/kernel.xml
+++ b/BOOK/boot/ppc64/kernel.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-boot-kernel" role="wrap">
<?dbhtml filename="kernel.html"?>
- <title>Linux-&linux-version;-&linux-version2;</title>
+ <title>Linux-&linux-version2;</title>
<indexterm zone="ch-boot-kernel">
<primary sortas="a-Linux">Linux</primary>
@@ -93,7 +93,7 @@
xpointer="xpointer(//*[@os='v'])"/>
<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"
href="../x86/kernel.xml"
diff --git a/BOOK/boot/sparc/kernel.xml b/BOOK/boot/sparc/kernel.xml
index bbef6d1..bf86aae 100644
--- a/BOOK/boot/sparc/kernel.xml
+++ b/BOOK/boot/sparc/kernel.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-boot-kernel" role="wrap">
<?dbhtml filename="kernel.html"?>
- <title>Linux-&linux-version;-&linux-version2;</title>
+ <title>Linux-&linux-version2;</title>
<indexterm zone="ch-boot-kernel">
<primary sortas="a-Linux">Linux</primary>
@@ -89,7 +89,7 @@
xpointer="xpointer(//*[@os='v'])"/>
<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"
href="../x86/kernel.xml"
diff --git a/BOOK/boot/sparc/silo.xml b/BOOK/boot/sparc/silo.xml
index 00cc988..3796781 100644
--- a/BOOK/boot/sparc/silo.xml
+++ b/BOOK/boot/sparc/silo.xml
@@ -24,7 +24,7 @@ partition = 1 # Boot partition (= root partition)
root = /dev/sda1 # Root partition
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>
EOF</userinput></screen>
diff --git a/BOOK/boot/sparc64/kernel.xml b/BOOK/boot/sparc64/kernel.xml
index f984da7..bc5c2da 100644
--- a/BOOK/boot/sparc64/kernel.xml
+++ b/BOOK/boot/sparc64/kernel.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-boot-kernel" role="wrap">
<?dbhtml filename="kernel.html"?>
- <title>Linux-&linux-version;-&linux-version2;</title>
+ <title>Linux-&linux-version2;</title>
<indexterm zone="ch-boot-kernel">
<primary sortas="a-Linux">Linux</primary>
@@ -91,7 +91,7 @@
xpointer="xpointer(//*[@os='v'])"/>
<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"
href="../x86/kernel.xml"
diff --git a/BOOK/boot/x86/kernel.xml b/BOOK/boot/x86/kernel.xml
index ea36c20..dd838e6 100644
--- a/BOOK/boot/x86/kernel.xml
+++ b/BOOK/boot/x86/kernel.xml
@@ -108,19 +108,19 @@
<para os="v">Issue the following commands to install the kernel:</para>
<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"
href="../../bootable/x86/kernel.xml"
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"
href="../../bootable/x86/kernel.xml"
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>
diff --git a/BOOK/boot/x86_64/kernel.xml b/BOOK/boot/x86_64/kernel.xml
index 5fe187f..6bfab5c 100644
--- a/BOOK/boot/x86_64/kernel.xml
+++ b/BOOK/boot/x86_64/kernel.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-boot-kernel" role="wrap">
<?dbhtml filename="kernel.html"?>
- <title>Linux-&linux-version;-&linux-version2;</title>
+ <title>Linux-&linux-version2;</title>
<indexterm zone="ch-boot-kernel">
<primary sortas="a-Linux">Linux</primary>
@@ -93,7 +93,7 @@
xpointer="xpointer(//*[@os='v'])"/>
<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"
href="../x86/kernel.xml"
diff --git a/BOOK/bootable/mips/arcload.xml b/BOOK/bootable/mips/arcload.xml
index 98c62d8..d1d3b77 100644
--- a/BOOK/bootable/mips/arcload.xml
+++ b/BOOK/bootable/mips/arcload.xml
@@ -30,9 +30,9 @@
append "console=ttyS0,9600";
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;";
}
debug {
@@ -47,6 +47,6 @@ EOF</userinput></screen>
<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>
diff --git a/BOOK/bootable/mips/colo.xml b/BOOK/bootable/mips/colo.xml
index bde41df..4b8638f 100644
--- a/BOOK/bootable/mips/colo.xml
+++ b/BOOK/bootable/mips/colo.xml
@@ -40,8 +40,8 @@
#
# 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>
diff --git a/BOOK/bootable/mips/kernel.xml b/BOOK/bootable/mips/kernel.xml
index ff941db..b93412a 100644
--- a/BOOK/bootable/mips/kernel.xml
+++ b/BOOK/bootable/mips/kernel.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-bootable-kernel" role="wrap">
<?dbhtml filename="kernel.html"?>
- <title>Linux-&linux-version;-&linux-version2;</title>
+ <title>Linux-&linux-version2;</title>
<indexterm zone="ch-bootable-kernel">
<primary sortas="a-Linux">Linux</primary>
@@ -101,8 +101,8 @@
href="../x86/kernel.xml"
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"
href="../x86/kernel.xml"
diff --git a/BOOK/bootable/mips64/arcload.xml b/BOOK/bootable/mips64/arcload.xml
index 6c21747..f39e6ec 100644
--- a/BOOK/bootable/mips64/arcload.xml
+++ b/BOOK/bootable/mips64/arcload.xml
@@ -30,9 +30,9 @@
append "console=ttyS0,9600";
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;";
}
debug {
@@ -47,6 +47,6 @@ EOF</userinput></screen>
<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>
diff --git a/BOOK/bootable/ppc/kernel.xml b/BOOK/bootable/ppc/kernel.xml
index b75b2d8..64b0995 100644
--- a/BOOK/bootable/ppc/kernel.xml
+++ b/BOOK/bootable/ppc/kernel.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-bootable-kernel" role="wrap">
<?dbhtml filename="kernel.html"?>
- <title>Linux-&linux-version;-&linux-version2;</title>
+ <title>Linux-&linux-version2;</title>
<indexterm zone="ch-bootable-kernel">
<primary sortas="a-Linux">Linux</primary>
@@ -113,7 +113,7 @@
href="../x86/kernel.xml"
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"
href="../x86/kernel.xml"
diff --git a/BOOK/bootable/ppc/yaboot.xml b/BOOK/bootable/ppc/yaboot.xml
index e2fc08d..e6df5c1 100644
--- a/BOOK/bootable/ppc/yaboot.xml
+++ b/BOOK/bootable/ppc/yaboot.xml
@@ -62,7 +62,7 @@
to the image(s), such as
<parameter>device=/ht at 0,f2000000/pci at 3/k2-sata-root at c/k2-sata at 0/disk at 0:</parameter>
for the disk, and
- <parameter>image=/ht at 0,f2000000/pci at 3/k2-sata-root at c/k2-sata at 0/disk at 0:9,/boot/clfskernel-&linux-version;-&linux-version2;</parameter>
+ <parameter>image=/ht at 0,f2000000/pci at 3/k2-sata-root at c/k2-sata at 0/disk at 0:9,/boot/clfskernel-&linux-version2;</parameter>
which definitely works.</para>
<para os="k">Create a <quote>yaboot.conf</quote> file defining yaboot's boot
@@ -112,7 +112,7 @@ fgcolor=light-green
# For all images, the pathname is relative to the filesystem
# 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>
EOF</userinput></screen>
diff --git a/BOOK/bootable/sparc/kernel.xml b/BOOK/bootable/sparc/kernel.xml
index 1c8a647..8f1bb63 100644
--- a/BOOK/bootable/sparc/kernel.xml
+++ b/BOOK/bootable/sparc/kernel.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-bootable-kernel" role="wrap">
<?dbhtml filename="kernel.html"?>
- <title>Linux-&linux-version;-&linux-version2;</title>
+ <title>Linux-&linux-version2;</title>
<indexterm zone="ch-bootable-kernel">
<primary sortas="a-Linux">Linux</primary>
@@ -105,7 +105,7 @@
href="../x86/kernel.xml"
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"
href="../x86/kernel.xml"
diff --git a/BOOK/bootable/sparc/silo.xml b/BOOK/bootable/sparc/silo.xml
index a08268d..450ddb3 100644
--- a/BOOK/bootable/sparc/silo.xml
+++ b/BOOK/bootable/sparc/silo.xml
@@ -24,7 +24,7 @@ partition = 1 # Boot partition (= root partition)
root = /dev/sda1 # Root partition
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>
EOF</userinput></screen>
diff --git a/BOOK/bootable/x86/kernel.xml b/BOOK/bootable/x86/kernel.xml
index 602bfc1..8646a13 100644
--- a/BOOK/bootable/x86/kernel.xml
+++ b/BOOK/bootable/x86/kernel.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-bootable-kernel" role="wrap">
<?dbhtml filename="kernel.html"?>
- <title>Linux-&linux-version;-&linux-version2;</title>
+ <title>Linux-&linux-version2;</title>
<indexterm zone="ch-bootable-kernel">
<primary sortas="a-Linux">Linux</primary>
@@ -131,21 +131,21 @@ Kernel Hacking --->
<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.
It maps the function entry points of every function in the kernel API,
as well as the addresses of the kernel data structures for the running
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>
produced by the <command>make menuconfig</command> step above contains
all the configuration selections for the kernel that was just compiled.
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
directory are not owned by <systemitem class="username">root</systemitem>.
diff --git a/BOOK/bootable/x86_64/kernel.xml b/BOOK/bootable/x86_64/kernel.xml
index ff105ef..86d3b06 100644
--- a/BOOK/bootable/x86_64/kernel.xml
+++ b/BOOK/bootable/x86_64/kernel.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-bootable-kernel" role="wrap">
<?dbhtml filename="kernel.html"?>
- <title>Linux-&linux-version;-&linux-version2;</title>
+ <title>Linux-&linux-version2;</title>
<indexterm zone="ch-bootable-kernel">
<primary sortas="a-Linux">Linux</primary>
@@ -105,7 +105,7 @@
href="../x86/kernel.xml"
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"
href="../x86/kernel.xml"
diff --git a/BOOK/cross-tools/mips/linux-headers.xml b/BOOK/cross-tools/mips/linux-headers.xml
index 0b5b66c..31b933d 100644
--- a/BOOK/cross-tools/mips/linux-headers.xml
+++ b/BOOK/cross-tools/mips/linux-headers.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-cross-tools-linux-headers" role="wrap">
<?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">
<primary sortas="a-Linux-Headers">Linux-Headers</primary>
diff --git a/BOOK/cross-tools/ppc/linux-headers.xml b/BOOK/cross-tools/ppc/linux-headers.xml
index 7eb7acf..9132f99 100644
--- a/BOOK/cross-tools/ppc/linux-headers.xml
+++ b/BOOK/cross-tools/ppc/linux-headers.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-cross-tools-linux-headers" role="wrap">
<?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">
<primary sortas="a-Linux-Headers">Linux-Headers</primary>
diff --git a/BOOK/cross-tools/sparc/linux-headers.xml b/BOOK/cross-tools/sparc/linux-headers.xml
index ff0b5d6..c09f2ac 100644
--- a/BOOK/cross-tools/sparc/linux-headers.xml
+++ b/BOOK/cross-tools/sparc/linux-headers.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-cross-tools-linux-headers" role="wrap">
<?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">
<primary sortas="a-Linux-Headers">Linux-Headers</primary>
diff --git a/BOOK/cross-tools/sparc64/linux-headers.xml b/BOOK/cross-tools/sparc64/linux-headers.xml
index a9d950c..b66f4b3 100644
--- a/BOOK/cross-tools/sparc64/linux-headers.xml
+++ b/BOOK/cross-tools/sparc64/linux-headers.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-cross-tools-linux-headers" role="wrap">
<?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">
<primary sortas="a-Linux-Headers">Linux-Headers</primary>
diff --git a/BOOK/cross-tools/x86/linux-headers.xml b/BOOK/cross-tools/x86/linux-headers.xml
index 7a5ac5a..2d21c38 100644
--- a/BOOK/cross-tools/x86/linux-headers.xml
+++ b/BOOK/cross-tools/x86/linux-headers.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-cross-tools-linux-headers" role="wrap">
<?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">
<primary sortas="a-Linux-Headers">Linux-Headers</primary>
diff --git a/BOOK/cross-tools/x86_64/linux-headers.xml b/BOOK/cross-tools/x86_64/linux-headers.xml
index 038d2c4..61614cf 100644
--- a/BOOK/cross-tools/x86_64/linux-headers.xml
+++ b/BOOK/cross-tools/x86_64/linux-headers.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-cross-tools-linux-headers" role="wrap">
<?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">
<primary sortas="a-Linux-Headers">Linux-Headers</primary>
diff --git a/BOOK/final-system/common/linux-headers.xml b/BOOK/final-system/common/linux-headers.xml
index 92f05c3..08041ce 100644
--- a/BOOK/final-system/common/linux-headers.xml
+++ b/BOOK/final-system/common/linux-headers.xml
@@ -8,7 +8,7 @@
<sect1 id="ch-system-linux-headers" role="wrap">
<?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">
<primary sortas="a-Linux-Headers">Linux-Headers</primary>
diff --git a/BOOK/system-config/common/udev.xml b/BOOK/system-config/common/udev.xml
index 516cf72..e88bd38 100644
--- a/BOOK/system-config/common/udev.xml
+++ b/BOOK/system-config/common/udev.xml
@@ -201,9 +201,8 @@
<para>Udev will only load a module if it has a bus-specific alias and the
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>
<para>To determine if the device driver you require has the necessary
@@ -221,7 +220,7 @@
<para>If there is no <filename>modalias</filename> file in the relevant
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>
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/mips/colo.xml | 4 ++--
BOOK/boot/mips/kernel.xml | 6 +++---
BOOK/boot/mips64/kernel.xml | 6 +++---
BOOK/boot/ppc/kernel.xml | 4 ++--
BOOK/boot/ppc64/kernel.xml | 4 ++--
BOOK/boot/sparc/kernel.xml | 4 ++--
BOOK/boot/sparc/silo.xml | 2 +-
BOOK/boot/sparc64/kernel.xml | 4 ++--
BOOK/boot/x86/kernel.xml | 6 +++---
BOOK/boot/x86_64/kernel.xml | 4 ++--
BOOK/bootable/mips/arcload.xml | 8 ++++----
BOOK/bootable/mips/colo.xml | 4 ++--
BOOK/bootable/mips/kernel.xml | 6 +++---
BOOK/bootable/mips64/arcload.xml | 8 ++++----
BOOK/bootable/ppc/kernel.xml | 4 ++--
BOOK/bootable/ppc/yaboot.xml | 4 ++--
BOOK/bootable/sparc/kernel.xml | 4 ++--
BOOK/bootable/sparc/silo.xml | 2 +-
BOOK/bootable/x86/kernel.xml | 8 ++++----
BOOK/bootable/x86_64/kernel.xml | 4 ++--
BOOK/cross-tools/mips/linux-headers.xml | 2 +-
BOOK/cross-tools/ppc/linux-headers.xml | 2 +-
BOOK/cross-tools/sparc/linux-headers.xml | 2 +-
BOOK/cross-tools/sparc64/linux-headers.xml | 2 +-
BOOK/cross-tools/x86/linux-headers.xml | 2 +-
BOOK/cross-tools/x86_64/linux-headers.xml | 2 +-
BOOK/final-system/common/linux-headers.xml | 2 +-
BOOK/system-config/common/udev.xml | 7 +++----
28 files changed, 58 insertions(+), 59 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list