3 files changed, 47 insertions, 14 deletions
diff --git a/nl/appendix/graphical.xml b/nl/appendix/graphical.xml
index 8dcc46dd6..a6d704ad9 100644
--- a/nl/appendix/graphical.xml
+++ b/nl/appendix/graphical.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 46722 untranslated -->
+<!-- original version: 48015 untranslated -->
 
  <sect1 condition="gtk" id="graphical">
  <title>The Graphical Installer</title>
@@ -37,7 +37,9 @@ image<footnote id="gtk-miniiso">
 
 <para>
 The mini ISO image can be downloaded from a Debian mirror as described
-in <xref linkend="downloading-files"/>. Look for <quote>gtk-miniiso</quote>.
+in <xref linkend="downloading-files"/>. Look for
+<phrase condition="etch"><filename>gtk-miniiso</filename></phrase>
+<phrase condition="lenny"><filename>netboot/gtk/mini.iso</filename></phrase>.
 </para>
 
 </footnote>, which is mainly useful for testing; in this case the image is
@@ -51,7 +53,9 @@ image is available<footnote id="gtk-miniiso">
 
 <para>
 The mini ISO image can be downloaded from a Debian mirror as described
-in <xref linkend="downloading-files"/>. Look for <quote>gtk-miniiso</quote>.
+in <xref linkend="downloading-files"/>. Look for
+<phrase condition="etch"><filename>gtk-miniiso</filename></phrase>
+<phrase condition="lenny"><filename>netboot/gtk/mini.iso</filename></phrase>.
 </para>
 
 </footnote>. It should work on almost all PowerPC systems that have
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index 27d1e5749..9469bdcca 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 47624 untranslated -->
+<!-- original version: 48487 untranslated -->
 
 <!--
 Be careful with the format of this file as it is parsed to generate
@@ -330,12 +330,18 @@ during the configuration of the relevant package.
 
 </para><para>
 
+Normally, preseeding a question in this way will mean that the question will
+not be asked. To set a specific default value for a question, but still have
+the question asked, use <quote>?=</quote> instead of <quote>=</quote> as
+operator. See also <xref linkend="preseed-seenflag"/>.
+
+</para><para>
+
 Note that some variables that are frequently set at the boot prompt
 have a shorter alias. If an alias is available, it is used in the
-examples in this appendix instead of the full variable.  In
-particular, the <literal>preseed/url</literal> variable has been
-aliased as <literal>url</literal> and has some extra magic to allow
-shortened urls to be used. Another example is the <literal>tasks</literal>
+examples in this appendix instead of the full variable. The
+<literal>preseed/url</literal> variable for example has been aliased as
+<literal>url</literal>. Another example is the <literal>tasks</literal>
 alias, which translates to <literal>tasksel:tasksel/first</literal>.
 
 </para><para>
@@ -1071,6 +1077,12 @@ MD5 hash allows for brute force attacks.
 #d-i passwd/user-password-again password insecure
 # or encrypted using an MD5 hash.
 #d-i passwd/user-password-crypted password [MD5 hash]
+# Create the first user with the specified UID instead of the default.
+#d-i passwd/user-uid string 1010<phrase condition="lenny">
+
+# The user account will be added to some standard initial groups. To
+# override that, use this.
+#d-i passwd/user-default-groups string audio cdrom video</phrase>
 </screen></informalexample>
 
 <para>
@@ -1105,7 +1117,11 @@ installation. The only questions asked concern the installation of the kernel.
 
 <informalexample role="example"><screen>
 # Select the initramfs generator used to generate the initrd for 2.6 kernels.
-#d-i base-installer/kernel/linux/initramfs-generators string yaird
+#d-i base-installer/kernel/linux/initramfs-generators string yaird<phrase condition="lenny">
+
+# The kernel image (meta) package to be installed; "none" can be used if no
+# kernel is to be installed.
+#d-i base-installer/kernel/image linux-image-2.6-486</phrase>
 </screen></informalexample>
 
   </sect2>
@@ -1378,10 +1394,11 @@ setting the parameter <classname>preseed/interactive=true</classname> at
 the boot prompt. This can also be useful for testing or debugging your
 preconfiguration file.
 
+</para><para>
+
 If you are preseeding using boot parameters, you can make the installer ask
 the corresponding question by using the <quote>?=</quote> operator, i.e.
 <userinput><replaceable>foo</replaceable>/<replaceable>bar</replaceable>?=<replaceable>value</replaceable></userinput>.
-
 This will of course only have effect for parameters that correspond to
 questions that are actually displayed during an installation and not for
 <quote>internal</quote> parameters.
@@ -1418,7 +1435,7 @@ settings for certain configurations in other files.
 # More flexibly, this runs a shell command and if it outputs the names of
 # preconfiguration files, includes those files. 
 #d-i preseed/include_command \
-#      string echo if [ "`hostname`" = bob ]; then echo bob.cfg; fi
+#      string 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 manipulate the debconf database.
diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index 7bb456d62..40d7d04b8 100644
--- a/nl/boot-installer/parameters.xml
+++ b/nl/boot-installer/parameters.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 47209 untranslated -->
+<!-- original version: 48421 untranslated -->
 
  <sect1 id="boot-parms"><title>Boot Parameters</title>
 <para>
@@ -297,6 +297,18 @@ this misbehavior.
 </para></listitem>
 </varlistentry>
 
+<varlistentry condition="lenny">
+<term>disk-detect/dmraid/enable (dmraid)</term>
+<listitem><para>
+
+Set to <userinput>true</userinput> to enable support for Serial ATA RAID
+(also called ATA RAID, BIOS RAID or fake RAID) disks in the installer.
+Note that this support is currently experimental. Additional information
+can be found on the <ulink url="&url-d-i-wiki;">Debian Installer Wiki</ulink>.
+
+</para></listitem>
+</varlistentry>
+
 <varlistentry>
 <term>preseed/url (url)</term>
 <listitem><para>
@@ -401,8 +413,8 @@ left-handed operation by setting this parameter to <userinput>true</userinput>.
 <listitem><para>
 
 For the gtk frontend (graphical installer), hardware acceleration in directfb
-is disabled by default. To enable it, set this parameter to
-<userinput>true</userinput> when booting the installer.
+is disabled by default. Set this parameter to <userinput>true</userinput> to
+enable it.
 
 </para></listitem>
 </varlistentry>