Update of original English docs

2 files changed, 54 insertions, 42 deletions

diff --git a/nl/appendix/files.xml b/nl/appendix/files.xml
index ea39f0903..a1fd7227d 100644
--- a/nl/appendix/files.xml
+++ b/nl/appendix/files.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39551 untranslated -->
+<!-- original version: 42302 untranslated -->
 
 
  <sect1 id="linuxdevices"><title>Linux Devices</title>
@@ -186,19 +186,21 @@ 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" 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.
 -->
 
 <para>
 
-The base installation for i386 using the default 2.4 kernel,
-including all standard packages, requires 573MB of disk space.
+The base installation for i386 using the default 2.6 kernel,
+including all standard packages, requires 585MB of disk space.
+A minimal base installation, without the standard task selected,
+will take 365MB.
 
 </para><para>
 
@@ -230,23 +232,30 @@ is (temporarily) required in <filename>/var</filename>.
 <tbody>
 <row>
   <entry>Desktop</entry>
-  <entry>1392</entry>
-  <entry>460</entry>
-  <entry>1852</entry>
+  <entry>1258</entry>
+  <entry>418</entry>
+  <entry>1676</entry>
+</row>
+
+<row>
+  <entry>Laptop</entry>
+  <entry>46</entry>
+  <entry>16</entry>
+  <entry>62</entry>
 </row>
 
 <row>
   <entry>Web server</entry>
-  <entry>36</entry>
-  <entry>12</entry>
-  <entry>48</entry>
+  <entry>35</entry>
+  <entry>11</entry>
+  <entry>46</entry>
 </row>
 
 <row>
   <entry>Print server</entry>
-  <entry>168</entry>
-  <entry>58</entry>
-  <entry>226</entry>
+  <entry>326</entry>
+  <entry>95</entry>
+  <entry>421</entry>
 </row>
 
 <row>
@@ -258,23 +267,23 @@ is (temporarily) required in <filename>/var</filename>.
 
 <row>
   <entry>File server</entry>
-  <entry>47</entry>
-  <entry>24</entry>
+  <entry>50</entry>
+  <entry>21</entry>
   <entry>71</entry>
 </row>
 
 <row>
   <entry>Mail server</entry>
-  <entry>10</entry>
-  <entry>3</entry>
   <entry>13</entry>
+  <entry>5</entry>
+  <entry>18</entry>
 </row>
 
 <row>
   <entry>SQL database</entry>
-  <entry>66</entry>
-  <entry>21</entry>
-  <entry>87</entry>
+  <entry>24</entry>
+  <entry>8</entry>
+  <entry>32</entry>
 </row>
 
 </tbody>
@@ -282,8 +291,8 @@ is (temporarily) required in <filename>/var</filename>.
 
 <note><para>
 
-The <emphasis>Desktop</emphasis> task will install both the GNOME and KDE
-desktop environments.
+The <emphasis>Desktop</emphasis> task will install the GNOME desktop
+environment.
 
 </para></note>
 
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                         \