Update of original English docs

1 files changed, 48 insertions, 10 deletions

diff --git a/fi/appendix/preseed.xml b/fi/appendix/preseed.xml
index 4b3bc8def..520dfe9bf 100644
--- a/fi/appendix/preseed.xml
+++ b/fi/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 34168 untranslated -->
+<!-- original version: 35051 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 and LVM.
+partitions. You currently cannot use preseeding to set up RAID.
 
 </para>
   </sect2>
@@ -278,11 +278,11 @@ load it.
 
 </para><para>
 
-For the other preseeding methods you need to tell the installer what file to
-use when you boot it. This is done by passing the kernel a boot parameter,
-either manually at boot time or by editing the bootloader configuration file
-(e.g. <filename>syslinux.cfg</filename>) and adding the parameter to the end
-of the append line(s) for the kernel.
+For the other preseeding methods you need to tell the installer what file
+to use when you boot it. This is normally done by passing the kernel a boot
+parameter, either manually at boot time or by editing the bootloader
+configuration file (e.g. <filename>syslinux.cfg</filename>) and adding the
+parameter to the end of the append line(s) for the kernel.
 
 </para><para>
 
@@ -323,6 +323,43 @@ questions even if the preseeding below misses some.
 
 </para>
   </sect2>
+  
+  <sect2 id="preseed-dhcp">
+  <title>Using a DHCP server to specify preseed files</title>
+<para>
+
+It's also possible to use DHCP to specify a preseed file to download from
+the network. DHCP allows specifying a filename. Normally this is a file to
+netboot, but if it appears to be an URL then installation media that
+support network preseeding will download the file from the URL and use it
+as a preseed file. Here is an example of how to set it up in the dhcpd.conf
+for version 3 of the ISC DHCP server (the dhcp3-server Debian package).
+
+</para>
+
+<informalexample><screen>
+if substring (option vendor-class-identifier, 0, 3) = "d-i" {
+	filename "http://host/preseed.cfg";
+}
+</screen></informalexample>
+
+<para>
+
+Note that the above example limits this filename to DHCP clients that identify
+themselves as "d-i", so it will not affect regular DHCP clients, but only
+the installer. You can also put the text in a stanza for only one particular
+host to avoid preseeding all installs on your network.
+
+</para><para>
+
+A good way to use the DHCP preseeding is to only preseed values specific to
+your network, such as the Debian mirror to use. This way installs on your
+network will automatically get a good mirror selected, but the rest of the
+installation can be performed interactively. Using DHCP preseeding to fully
+automate Debian installs should only be done with care.
+
+</para>
+  </sect2>
 
   <sect2 id="preseed-bootparms">
   <title>Using boot parameters to supplement preseeding</title>
@@ -589,8 +626,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 preseed file. It is currently not
-possible to partition multiple disks using preseeding nor to set up RAID or
-LVM.
+possible to partition multiple disks using preseeding nor to set up RAID.
 
 </para>
 
@@ -604,6 +640,7 @@ correct one will be selected before using preseeding.
 
 <informalexample role="example"><screen>
 # If the system has free space you can choose to only partition that space.
+# Note: the preseed value for this template needs to be localized (translated).
 #d-i partman-auto/init_automatically_partition \
 #      select Use the largest continuous free space
 
@@ -612,7 +649,8 @@ correct one will be selected before using preseeding.
 # For example, to use the first disk devfs knows of:
 d-i partman-auto/disk string /dev/discs/disc0/disc
 
-# You can choose from any of the predefined partitioning recipes:
+# You can choose from any of the predefined partitioning recipes.
+# Note: the preseed value for this template needs to be localized (translated).
 d-i partman-auto/choose_recipe \
        select All files in one partition (recommended for new users)
 #d-i partman-auto/choose_recipe \