1 files changed, 19 insertions, 16 deletions
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index ee228f28f..ff22394e5 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 41587 untranslated -->
+<!-- original version: 42302 untranslated -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -137,7 +137,7 @@ questions being asked.
 Although most questions used by &d-i; can be preseeded using this method,
 there are some notable exceptions. You must (re)partition an entire disk
 or use available free space on a disk; it is not possible to use existing
-partitions. You currently cannot use preseeding to set up RAID.
+partitions.
 
 </para>
   </sect2>
@@ -394,20 +394,24 @@ this appendix instead of the full variable.
 
 </para><para>
 
-A <quote>--</quote> in the boot options has special meaning.
-Kernel parameters that appear after it will be copied into the installed
-bootloader configuration (if supported by the installer for the
-bootloader). Note that the <quote>--</quote> may already be
-present in the default boot parameters.
+A <quote>--</quote> in the boot options has special meaning.  Kernel
+parameters that appear after the last <quote>--</quote> will be copied
+into the installed bootloader configuration (if supported by the
+installer for the bootloader). Note that the <quote>--</quote> may
+already be present in the default boot parameters, which will mean
+that unless you add another <quote>--</quote> all parameters specified
+at the boot prompt will be copied.  That being the case, you should
+specify any preseeding options before any options required by the
+hardware in order to boot, and separate them with a <quote>--</quote>
+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>
@@ -719,8 +723,7 @@ supported by <classname>partman-auto</classname>. You can choose to either
 partition existing free space on a disk or a whole disk. The layout of the
 disk can be determined by using a predefined recipe, a custom recipe from
 a recipe file or a recipe included in the preconfiguration file. It is
-currently not possible to partition multiple disks using preseeding nor to
-set up RAID.
+currently not possible to partition multiple disks using preseeding.
 
 </para>
 
@@ -736,7 +739,7 @@ correct one will be selected before using preseeding.
 # If the system has free space you can choose to only partition that space.
 # Note: this must be preseeded with a localized (translated) value.
 #d-i partman-auto/init_automatically_partition \
-#      select Use the largest continuous free space
+#      select Guided - use the largest continuous free space
 
 # Alternatively, you can specify a disk to partition. The device name
 # can be given in either devfs or traditional non-devfs format.
@@ -768,7 +771,7 @@ d-i partman-auto/choose_recipe \
 # just point at it.
 #d-i partman-auto/expert_recipe_file string /hd-media/recipe
 
-# If not, you can put an entire recipe the preconfiguration file in one
+# If not, you can put an entire recipe into the preconfiguration file in one
 # (logical) line. This example creates a small /boot partition, suitable
 # swap, and uses the rest of the space for the root partition:
 #d-i partman-auto/expert_recipe string                         \