From 09aa8167fc10e656c751ece9116e521fb4ede2f9 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <sthibault@debian.org>
Date: Sat, 18 Sep 2010 13:36:55 +0000
Subject: Replace kernel package name and version with &kernelpackage; and
 &kernelversion;

---
 nl/appendix/chroot-install.xml    | 4 ++--
 nl/appendix/preseed.xml           | 2 +-
 nl/post-install/kernel-baking.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'nl')

diff --git a/nl/appendix/chroot-install.xml b/nl/appendix/chroot-install.xml
index a9e15f81e..2e85248ef 100644
--- a/nl/appendix/chroot-install.xml
+++ b/nl/appendix/chroot-install.xml
@@ -496,7 +496,7 @@ If you intend to boot this system, you probably want a &arch-kernel; kernel
 and a boot loader. Identify available pre-packaged kernels with:
 
 <informalexample><screen>
-# apt-cache search linux-image
+# apt-cache search &kernelpackage;
 </screen></informalexample>
 
 </para><para>
@@ -528,7 +528,7 @@ that the values are appropriate for your system.
 Then install the kernel package of your choice using its package name.
 
 <informalexample><screen>
-# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable>
+# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</replaceable>
 </screen></informalexample>
 
 If you did not create a <filename>/etc/kernel-img.conf</filename> before
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index 400785c7a..afa5227d3 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1210,7 +1210,7 @@ installation. The only questions asked concern the installation of the kernel.
 
 # The kernel image (meta) package to be installed; "none" can be used if no
 # kernel is to be installed.
-#d-i base-installer/kernel/image string linux-image-2.6-486
+#d-i base-installer/kernel/image string &kernelpackage;-2.6-486
 </screen></informalexample>
 
   </sect2>
diff --git a/nl/post-install/kernel-baking.xml b/nl/post-install/kernel-baking.xml
index 9377eca5d..23b1e7e71 100644
--- a/nl/post-install/kernel-baking.xml
+++ b/nl/post-install/kernel-baking.xml
@@ -141,7 +141,7 @@ the power of your machine.
 Once the compilation is complete, you can install your custom kernel
 like any package.  As root, do 
 <userinput>dpkg -i
-../linux-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>.
+../&kernelpackage;-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>.
 The <replaceable>subarchitecture</replaceable> part is an optional
 sub-architecture,
 <phrase arch="i386"> such as <quote>686</quote>, </phrase>
-- 
cgit v1.2.3