- Remove some references to 2.4 based installs

- Remove obsolete text about creating extra device nodes
- Add extra comments about automatic encrypted LVM installs
- Some other minor fixes

7 files changed, 36 insertions, 79 deletions

diff --git a/en/appendix/files.xml b/en/appendix/files.xml
index a92a16526..c6600ca72 100644
--- a/en/appendix/files.xml
+++ b/en/appendix/files.xml
@@ -186,11 +186,11 @@ when your mouse only has one button. Just add the following lines to
  <title>Disk Space Needed for Tasks</title>
 
 <!-- Note for d-i and manual maintainers
- Sizes of tasks should be determined by running "tasksel --new-install" on
- a system that been fully installed without selecting any tasks. By selecting
- a task together with the "manual selection" option, aptitude will be started
- and show the sizes for the task. After deselecting the packages to be
- installed, quit aptitude and repeat for other tasks.
+ Sizes of tasks should be determined by running tasksel with the "new-install"
+ option on a system that been fully installed without selecting any tasks. By
+ selecting a task together with the "manual selection" option, aptitude will
+ be started and show the sizes for the task. Use "cancel panding actions" to
+ clear the slate, quit aptitude and repeat for other tasks.
  Space requirements need to be determined from tasksel as tasksel will not
  install recommended packages while selecting a task from aptitude will.
 -->
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 1fa47dd17..b72f69391 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -408,11 +408,10 @@ to ensure that only the latter are copied onto the target system.
 </para>
 <note><para>
 
-The 2.4 kernel accepts a maximum of 8 command line options and
-8 environment options (including any options added by default for the
-installer). If these numbers are exceeded, 2.4 kernels will drop any
-excess options and 2.6 kernels will panic. For kernel 2.6.9 and later,
-you can use 32 command line options and 32 environment options.
+Current linux kernels (2.6.9 and later) accept a maximum of 32 command line
+options and 32 environment options, including any options added by default
+for the installer. If these numbers are exceeded, the kernel will panic
+(crash). (For earlier kernels, these numbers were lower.)
 
 </para></note>
 <para>
diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml
index 2dcfa706b..700631353 100644
--- a/en/boot-installer/parameters.xml
+++ b/en/boot-installer/parameters.xml
@@ -74,11 +74,8 @@ The installation system recognizes a few additional boot parameters<footnote>
 
 <para>
 
-Note that the 2.4 kernel accepts a maximum of 8 command line options and
-8 environment options (including any options added by default for the
-installer). If these numbers are exceeded, 2.4 kernels will drop any
-excess options. With kernel 2.6.9 or newer,
-you can use 32 command line options and 32 environment options.
+With current kernels (2.6.9 or newer) you can use 32 command line options and
+32 environment options. If these numbers are exceeded, the kernel will panic.
 
 </para>
 
diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml
index f3e3675be..9cee2afdb 100644
--- a/en/howto/installation-howto.xml
+++ b/en/howto/installation-howto.xml
@@ -214,10 +214,6 @@ it's just a matter of booting linux with the initrd.
 Once the installer starts, you will be greeted with an initial screen. Press
 &enterkey; to boot, or read the instructions for other boot
 methods and parameters (see <xref linkend="boot-parms" />).
-<phrase arch="i386">
-If you want a 2.4 kernel, type <userinput>install24</userinput> at the
-<prompt>boot:</prompt> prompt. The 2.6 kernel is the default.
-</phrase>
 
 </para><para>
 
diff --git a/en/partitioning/partition-programs.xml b/en/partitioning/partition-programs.xml
index c44fe79d0..778e00a48 100644
--- a/en/partitioning/partition-programs.xml
+++ b/en/partitioning/partition-programs.xml
@@ -114,34 +114,8 @@ One of these programs will be run by default when you select
 to use a different partitioning tool from the command line on VT2, but this
 is not recommended.
 
-</para><para>
-
-If you will be working with more than 20 partitions on your ide disk,
-you will need to create devices for partitions 21 and beyond. The next
-step of initializing the partition will fail unless a proper device is
-present. As an example, here are commands you can use in
-<userinput>tty2</userinput> or under <guimenuitem>Execute a shell</guimenuitem>
-to add a device so the 21st partition can be initialized:
-
-<informalexample><screen>
-# cd /dev
-# mknod hda21 b 3 21
-# chgrp disk hda21
-# chmod 660 hda21
-</screen></informalexample>
-
-Booting into the new system will fail unless proper devices are present
-on the target system. After installing the kernel and modules, execute:
-
-<informalexample><screen>
-# cd /target/dev
-# mknod hda21 b 3 21
-# chgrp disk hda21
-# chmod 660 hda21
-</screen></informalexample>
-
-<phrase arch="x86">Remember to mark your boot partition as
-<quote>Bootable</quote>.</phrase>
+</para><para arch="x86">Remember to mark your boot partition as
+<quote>Bootable</quote>.
 
 </para><para condition="mac-fdisk.txt">
 
diff --git a/en/using-d-i/modules/kbd-chooser.xml b/en/using-d-i/modules/kbd-chooser.xml
index 24d655756..1f2542155 100644
--- a/en/using-d-i/modules/kbd-chooser.xml
+++ b/en/using-d-i/modules/kbd-chooser.xml
@@ -41,33 +41,4 @@ Alt function on the <keycap>Option</keycap> key (engraved with 'alt'
 on most Mac keyboards). In other respects the two layouts are similar.
 
 </para>
-
-<note arch="sparc"><para>
-
-If you are installing on a system that has a Sun USB keyboard and have
-booted the installer with the default 2.4 kernel, the keyboard will not
-be identified correctly by the installation system. The installer will show
-you a list of Sun type keymaps to choose from, but selecting one of these
-will result in a non-working keyboard. If you are installing with the 2.6
-kernel, there is no problem.
-
-</para><para>
-
-To get a working keyboard, you should boot the installer with parameter
-<userinput>priority=medium</userinput>. When you get to keyboard
-selection<footnote>
-
-<para>
-If you are installing at default priority you should use the <userinput>Go
-Back</userinput> button to return to the installer menu when you are shown
-the list of Sun type keymaps.
-</para>
-
-</footnote>, choose <quote>No keyboard to configure</quote> if you have a
-keyboard with an American (US) layout, or choose <quote>USB keyboard</quote>
-if you have a keyboard with a localized layout. Selecting <quote>No keyboard
-to configure</quote> will leave the kernel keymap in place, which is correct
-for US keyboards.
-
-</para></note>
    </sect3>
diff --git a/en/using-d-i/modules/partman.xml b/en/using-d-i/modules/partman.xml
index 713c1b679..54c253835 100644
--- a/en/using-d-i/modules/partman.xml
+++ b/en/using-d-i/modules/partman.xml
@@ -22,10 +22,22 @@ autopartition, choose <guimenuitem>Manual</guimenuitem> from the menu.
 If you choose guided partitioning, you may have three options: to create
 partitions directly on the hard disk (classic method), or to create them
 using Logical Volume Management (LVM), or to create them using encrypted
-LVM. Note: the option to use (encrypted) LVM may not be available on all
-architectures.
+LVM<footnote>.
 
-</para><para>
+<para>
+The installer will encrypt the LVM volume group using a 256 bit AES key and
+makes use of the kernel's <quote>dm-crypt</quote> support.
+</para>
+
+</footnote>.
+
+</para>
+<note><para>
+
+The option to use (encrypted) LVM may not be available on all architectures.
+
+</para></note>
+<para>
 
 When using LVM or encrypted LVM, the installer will create most
 partitions inside one big partition; the advantage of this method is that
@@ -34,6 +46,14 @@ In the case of encrypted LVM the big partition will not be readable without
 knowing a special key phrase, thus providing extra security of your
 (personal) data.
 
+</para><para>
+
+When using encrypted LVM, the installer will also automatically erase the
+disk by writing random data to it. This further improves security (as it
+makes it impossible to tell which parts of the disk are in use and also
+makes sure that any traces of previous installations are erased), but may
+take some time depending on the size of your disk.
+
 </para>
 <note><para>