- 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

2 files changed, 23 insertions, 32 deletions

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>