Document changes in guided partitioning and added encrypted LVM support

2 files changed, 47 insertions, 20 deletions

diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml
index 61164d0b0..1b1ab0935 100644
--- a/en/howto/installation-howto.xml
+++ b/en/howto/installation-howto.xml
@@ -251,9 +251,10 @@ will be given the opportunity to configure the network manually.
 </para><para>
 
 Now it is time to partition your disks. First you will be given the
-opportunity to automatically partition either an entire drive, or free
-space on a drive. This is recommended for new users or anyone in a hurry,
-but if you do not want to autopartition, choose manual from the menu.
+opportunity to automatically partition either an entire drive, or available
+free space on a drive (guided partitioning).
+This is recommended for new users or anyone in a hurry. If you do not want
+to autopartition, choose <guimenuitem>Manual</guimenuitem> from the menu.
 
 </para><para arch="x86">
 
diff --git a/en/using-d-i/modules/partman.xml b/en/using-d-i/modules/partman.xml
index efd121ce4..cd2864643 100644
--- a/en/using-d-i/modules/partman.xml
+++ b/en/using-d-i/modules/partman.xml
@@ -13,32 +13,58 @@ linkend="partitioning"/>.
 </para><para>
 
 First you will be given the opportunity to automatically partition
-either an entire drive, or free space on a drive. This is also called
-<quote>guided</quote> partitioning. If you do not want to
-autopartition, choose <guimenuitem>Manually edit partition
-table</guimenuitem> from the menu.
+either an entire drive, or available free space on a drive. This is
+also called <quote>guided</quote> partitioning. If you do not want to
+autopartition, choose <guimenuitem>Manual</guimenuitem> from the menu.
 
 </para><para>
 
-If you choose guided partitioning, you may have two options: to create
-partitions directly on the hard disk (classic method) or to use Logical
-Volume Management (LVM). In the second case, the installer will create most
+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 options to use (encrypted) LVM may not be available on all
+architectures.
+
+</para><para>
+
+When using LVM or encrypted LVM, the installer will create most
 partitions inside one big partition; the advantage of this method is that
 partitions inside this big partition can be resized relatively easily later.
-Note: the option to use LVM may not be available on all architectures.
+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>
-<warning><para>
+<note><para>
 
-If you choose guided partitioning using LVM, it will not be possible to
-undo changes made in the partition table. This effectively erases all
-data that is currently on the selected hard disk.
+If you choose guided partitioning using LVM or encrypted LVM, some changes
+in the partition table will need to be written to the selected disk while
+LVM is being set up. These changes effectively erase all data that is
+currently on the selected hard disk and you will not be able to undo them
+later. However, the installer will ask you to confirm these changes before
+they are written to disk.
 
-</para></warning>
+</para></note>
 <para>
 
-After you choose guided partitioning (either classic or using LVM), you
-will be able to choose from the schemes listed in the table below.
+If you choose guided partitioning (either classic or using (encrypted)
+LVM) for a whole disk, you will first be asked to select the disk you want
+to use. Check that all your disks are listed and, if you have several disks,
+make sure you select the correct one. The order they are listed in may
+differ from what you are used too. The size of the disks may help to identify
+them.
+
+</para><para>
+
+Any data on the disk you select will eventually be lost, but you will always
+be asked to confirm any changes before they are written to the disk.
+If you have selected the classic method of partitioning, you will be able to
+undo any changes right until the end; when using (encrypted) LVM this is not
+possible.
+
+</para><para>
+
+Next, you will be able to choose from the schemes listed in the table below.
 All schemes have their pros and cons,
 some of which are discussed in <xref linkend="partitioning"/>. If you are
 unsure, choose the first one. Bear in mind that guided partitioning
@@ -83,7 +109,7 @@ partitioning will fail.
 
 <para>
 
-If you choose guided partitioning using LVM, the installer will also create
+If you choose guided partitioning using (encrypted) LVM, the installer will also create
 a separate <filename>/boot</filename> partition. The other partitions, except
 for the swap partition, will be created inside the LVM partition.
 
@@ -156,7 +182,7 @@ in the remainder of this section.
 
 </para><para>
 
-If you select a pristine disk which doesn't have neither partitions
+If you select a pristine disk which has neither partitions
 nor free space on it, you will be offered to create a new partition
 table (this is needed so you can create new partitions). After this
 a new line entitled <quote>FREE SPACE</quote> should appear under the