* Remove now obsolete distinction between classic and common kpkg.

* Update all arches to kernel version 2.6.17.

1 files changed, 4 insertions, 19 deletions

diff --git a/en/post-install/kernel-baking.xml b/en/post-install/kernel-baking.xml
index 28086fd18..9a2d65832 100644
--- a/en/post-install/kernel-baking.xml
+++ b/en/post-install/kernel-baking.xml
@@ -57,9 +57,7 @@ Don't be afraid to try compiling the kernel.  It's fun and profitable.
 
 To compile a kernel the Debian way, you need some packages:
 <classname>fakeroot</classname>, <classname>kernel-package</classname>,
-<phrase condition="classic-kpkg"><classname>kernel-source-&kernelversion;</classname>
-(the most recent version at the time of this writing)</phrase>
-<phrase condition="common-kpkg"><classname>linux-source-2.6</classname></phrase>
+<classname>linux-source-2.6</classname>
 and a few others which are probably already installed (see
 <filename>/usr/share/doc/kernel-package/README.gz</filename> for the
 complete list).
@@ -78,8 +76,7 @@ Note that you don't <emphasis>have</emphasis> to compile your kernel
 the <quote>Debian way</quote>; but we find that using the packaging system
 to manage your kernel is actually safer and easier.  In fact, you can get
 your kernel sources right from Linus instead of
-<phrase condition="classic-kpkg"><classname>kernel-source-&kernelversion;</classname>,</phrase>
-<phrase condition="common-kpkg"><classname>linux-source-2.6</classname>,</phrase>
+<classname>linux-source-2.6</classname>,
 yet still use the <classname>kernel-package</classname> compilation method.
 
 </para><para>
@@ -105,13 +102,8 @@ permissions.
 </footnote>. We'll also assume that your kernel version is
 &kernelversion;. Make sure you are in the directory to where you want to
 unpack the kernel sources, extract them using
-<phrase condition="classic-kpkg"><userinput>tar xjf
-/usr/src/kernel-source-&kernelversion;.tar.bz2</userinput></phrase>
-<phrase condition="common-kpkg"><userinput>tar xjf
-/usr/src/linux-source-&kernelversion;.tar.bz2</userinput></phrase>
-and change to the directory
-<phrase condition="classic-kpkg"><filename>kernel-source-&kernelversion;</filename></phrase>
-<phrase condition="common-kpkg"><filename>linux-source-&kernelversion;</filename></phrase>
+<userinput>tar xjf /usr/src/linux-source-&kernelversion;.tar.bz2</userinput>
+and change to the directory <filename>linux-source-&kernelversion;</filename>
 that will have been created.
 
 </para><para>
@@ -148,14 +140,8 @@ the power of your machine.
 
 Once the compilation is complete, you can install your custom kernel
 like any package.  As root, do 
-<phrase condition="classic-kpkg">
-<userinput>dpkg -i
-../kernel-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>.
-</phrase>
-<phrase condition="common-kpkg">
 <userinput>dpkg -i
 ../linux-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>.
-</phrase>
 The <replaceable>subarchitecture</replaceable> part is an optional
 sub-architecture,
 <phrase arch="i386"> such as <quote>686</quote>, </phrase>
@@ -168,7 +154,6 @@ the <filename>System.map</filename> will be properly installed
 containing your current configuration set.  Your new
 kernel package is also clever enough to automatically update your boot
 loader to use the new kernel. If you have created a modules package,
-<phrase condition="classic-kpkg">e.g., if you have PCMCIA,</phrase>
 you'll need to install that package as well.
 
 </para><para>