Update of original English docs

3 files changed, 20 insertions, 14 deletions

diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index b64c281f2..943664da5 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36758 untranslated -->
+<!-- original version: 37253 untranslated -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -196,7 +196,7 @@ runtime.
 Another readable file <filename>/var/cache/debconf/questions.dat</filename>
 is used to store the values for variables and the answers given to questions.
 A question always refers to the template used to ask it. For obvious
-security reasons the values for templates of type <quote>password</quote>
+security reasons the values for questions of type <quote>password</quote>
 are stored in a separate, non-readable file in the same directory.
 
 </para>
@@ -234,7 +234,7 @@ installation. See <xref linkend="preseed-shell"/> for details.
 It is possible to use preseeding to change the default answer for a
 question, but still have the question asked. To do this the
 <firstterm>seen</firstterm> flag must be reset to <quote>false</quote> after
-setting the value for a template.
+setting the value for a question.
 
 </para>
 
@@ -423,7 +423,7 @@ The preconfiguration file is in the format used by the
 a line in a preconfiguration file is:
 
 <informalexample><screen>
-&lt;owner&gt; &lt;template name&gt; &lt;template type&gt; &lt;value&gt;
+&lt;owner&gt; &lt;queston name&gt; &lt;question type&gt; &lt;value&gt;
 </screen></informalexample>
 
 </para><para>
@@ -440,17 +440,17 @@ There are a few rules to keep in mind when writing a preconfiguration file.
 <listitem><para>
   A line can be split into multiple lines by appending a backslash
   (<quote><literal>\</literal></quote>) as the line continuation character.
-  A good place to split a line is after the template name; a bad place is
+  A good place to split a line is after the question name; a bad place is
   between type and value.
 </para></listitem>
 <listitem><para>
-  Most templates need to be preseeded using the values valid in English and
-  not the translated values. However, there are some templates (for example
+  Most questions need to be preseeded using the values valid in English and
+  not the translated values. However, there are some questions (for example
   in <classname>partman</classname> where the translated values need to be
   used.
 </para></listitem>
 <listitem><para>
-  Some templates take a code as value instead of the English text that is
+  Some questions take a code as value instead of the English text that is
   shown during installation.
 </para></listitem>
 </itemizedlist>
@@ -498,7 +498,7 @@ will be deleted from your system if you purge the package
 
 <para>
 
-To check possible values for templates, you can use <command>nano</command>
+To check possible values for questions, you can use <command>nano</command>
 to examine the files in <filename>/var/lib/cdebconf</filename> while an
 installation is in progress. View <filename>templates.dat</filename> for
 the raw templates and <filename>questions.dat</filename> for the current
@@ -707,7 +707,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: this template must be preseeded with a localized (translated) value.
+# Note: this must be preseeded with a localized (translated) value.
 #d-i partman-auto/init_automatically_partition \
 #      select Use the largest continuous free space
 
@@ -717,7 +717,7 @@ correct one will be selected before using preseeding.
 d-i partman-auto/disk string /dev/discs/disc0/disc
 
 # You can choose from any of the predefined partitioning recipes.
-# Note: this template must be preseeded with a localized (translated) value.
+# Note: this must be preseeded with a localized (translated) value.
 d-i partman-auto/choose_recipe \
        select All files in one partition (recommended for new users)
 #d-i partman-auto/choose_recipe \
@@ -978,7 +978,7 @@ tasksel tasksel/first multiselect standard, desktop
 
 <informalexample role="example"><screen>
 # Avoid that last message about the install being complete.
-d-i prebaseconfig/reboot_in_progress note
+d-i finish-install/reboot_in_progress note
 
 # This will prevent the installer from ejecting the CD during the reboot,
 # which is useful in some situations.
@@ -1112,6 +1112,12 @@ settings for certain configurations in other files.
 # preconfiguration files, includes those files. 
 #d-i preseed/include_command \
 #      string echo if [ "`hostname`" = bob ]; then echo bob.cfg; fi
+
+# Most flexibly of all, this downloads a program and runs it. The program
+# can use commands such as debconf-set to manupulate the debconf database.
+# Note that if the filenames are relative, they are taken from the same
+# directory as the preconfiguration file that runs them.
+d-i preseed/run string foo.sh
 </screen></informalexample>
 
   </sect2>
diff --git a/nl/using-d-i/components.xml b/nl/using-d-i/components.xml
index 41567b9a5..3399fcf6c 100644
--- a/nl/using-d-i/components.xml
+++ b/nl/using-d-i/components.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- original version: 35395 -->
+<!-- original version: 37253 -->
 
  <sect1 id="module-details">
  <title>Individuele modules gebruiken</title>
diff --git a/nl/using-d-i/modules/finish-install.xml b/nl/using-d-i/modules/finish-install.xml
index f8cd96f88..ad77261d1 100644
--- a/nl/using-d-i/modules/finish-install.xml
+++ b/nl/using-d-i/modules/finish-install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- original version: 21672 -->
+<!-- original version: 37253 -->
 
    <sect3 id="finish-install">
    <title>De installatie afronden en opnieuw opstarten</title>