4 files changed, 54 insertions, 53 deletions
diff --git a/nl/appendix/chroot-install.xml b/nl/appendix/chroot-install.xml
index 9af7cdb2b..e8ba6bfb4 100644
--- a/nl/appendix/chroot-install.xml
+++ b/nl/appendix/chroot-install.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 49850 untranslated -->
+<!-- original version: 50736 untranslated -->
 
  <sect1 id="linux-upgrade">
  <title>Installing &debian; from a Unix/Linux System</title>
@@ -445,10 +445,10 @@ additional packages. However, you may want to add some additional sources,
 for example for source packages and security updates:
 
 <informalexample><screen>
-deb-src http://ftp.us.debian.org/debian etch main
+deb-src http://ftp.us.debian.org/debian &releasename; main
 
-deb http://security.debian.org/ etch/updates main
-deb-src http://security.debian.org/ etch/updates main
+deb http://security.debian.org/ &releasename;/updates main
+deb-src http://security.debian.org/ &releasename;/updates main
 </screen></informalexample>
 
 Make sure to run <userinput>aptitude update</userinput> after you have
diff --git a/nl/appendix/files.xml b/nl/appendix/files.xml
index fbf9fc7e8..8fd22c36a 100644
--- a/nl/appendix/files.xml
+++ b/nl/appendix/files.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 46461 untranslated -->
+<!-- original version: 51571 untranslated -->
 
 
  <sect1 id="linuxdevices"><title>Linux Devices</title>
@@ -256,7 +256,7 @@ is (temporarily) required in <filename>/var</filename>.
   <entry>Laptop<footnote>
   
   <para>
-  There is some overlap of the Laptop task with the Destop environment task.
+  There is some overlap of the Laptop task with the Desktop environment task.
   If you install both, the Laptop task will only require a few MB additional
   disk space.
   </para>
diff --git a/nl/appendix/graphical.xml b/nl/appendix/graphical.xml
index 54afa85ff..0a1747d33 100644
--- a/nl/appendix/graphical.xml
+++ b/nl/appendix/graphical.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 49849 untranslated -->
+<!-- original version: 51523 untranslated -->
 
  <sect1 condition="gtk" id="graphical">
  <title>The Graphical Installer</title>
@@ -97,8 +97,11 @@ enter will toggle a selection, not activate &BTN-CONT;.
 
 To switch to another console, you will also need to use the
 <keycap>Ctrl</keycap> key, just as with the X Window System. For example,
-to switch to VT1 you would use: <keycombo> <keycap>Ctrl</keycap>
-<keycap>Left Alt</keycap> <keycap>F1</keycap> </keycombo>.
+to switch to VT2 (the first debug shell) you would use: <keycombo>
+<keycap>Ctrl</keycap> <keycap>Left Alt</keycap> <keycap>F2</keycap>
+</keycombo>. The graphical installer itself runs on VT5, so you can use
+<keycombo> <keycap>Left Alt</keycap> <keycap>F5</keycap> </keycombo>
+to switch back.
 
 </para>
   </sect2>
@@ -136,15 +139,6 @@ Support for touchpads is not yet optimal.
 </para></listitem>
 <listitem><para>
 
-You should not switch to a different console while the installer is busy;
-this may cause the frontend to crash. The frontend will be restarted
-automatically, but this may still cause problems with the installation.
-Switching to another console while the installer is waiting for input
-should work without causing any problems.
-
-</para></listitem>
-<listitem><para>
-
 Support for creating encrypted partitions is limited as it is not possible
 to generate a random encryption key. It is possible to set up an encrypted
 partition using a passphrase as encryption key.
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index e98f417f7..4bf6ff816 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 50443 untranslated -->
+<!-- original version: 51573 untranslated -->
 
 <!--
 Be careful with the format of this file as it is parsed to generate
@@ -37,6 +37,13 @@ the installation is running. This makes it possible to fully automate most
 types of installation and even offers some features not available during
 normal installations.
 
+</para><para>
+
+Preseeding is not required. If you use an empty preseed file, the installer
+will behave just the same way as in a normal manual installation. Each
+question you preseed will (if you got it right!) modify the installation in
+some way from that baseline.
+
 </para>
 
   <sect2 id="preseed-methods">
@@ -858,6 +865,25 @@ d-i mirror/http/proxy string
 
   </sect2>
 
+  <sect2 id="preseed-time">
+  <title>Clock and time zone setup</title>
+
+<informalexample role="example"><screen>
+# Controls whether or not the hardware clock is set to UTC.
+d-i clock-setup/utc boolean true
+
+# You may set this to any valid setting for $TZ; see the contents of
+# /usr/share/zoneinfo/ for valid values.
+d-i time/zone string US/Eastern
+
+# Controls whether to use NTP to set the clock during the install
+d-i clock-setup/ntp boolean true
+# NTP server to use. The default is almost always fine here.
+#d-i clock-setup/ntp-server ntp.example.com
+</screen></informalexample>
+
+  </sect2>
+
   <sect2 id="preseed-partman">
   <title>Partitioning</title>
 <para>
@@ -1026,21 +1052,22 @@ d-i partman/confirm boolean true
 
   </sect2>
 
-  <sect2 id="preseed-time">
-  <title>Clock and time zone setup</title>
+  <sect2 id="preseed-base-installer">
+  <title>Base system installation</title>
+<para>
 
-<informalexample role="example"><screen>
-# Controls whether or not the hardware clock is set to UTC.
-d-i clock-setup/utc boolean true
+There is actually not very much that can be preseeded for this stage of the
+installation. The only questions asked concern the installation of the kernel.
 
-# You may set this to any valid setting for $TZ; see the contents of
-# /usr/share/zoneinfo/ for valid values.
-d-i time/zone string US/Eastern
+</para>
 
-# Controls whether to use NTP to set the clock during the install
-d-i clock-setup/ntp boolean true
-# NTP server to use. The default is almost always fine here.
-#d-i clock-setup/ntp-server ntp.example.com
+<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
+
+# 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
 </screen></informalexample>
 
   </sect2>
@@ -1114,26 +1141,6 @@ $ echo "r00tme" | mkpasswd -s -H MD5
 </para>
   </sect2>
 
-  <sect2 id="preseed-base-installer">
-  <title>Base system installation</title>
-<para>
-
-There is actually not very much that can be preseeded for this stage of the
-installation. The only questions asked concern the installation of the kernel.
-
-</para>
-
-<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
-
-# 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
-</screen></informalexample>
-
-  </sect2>
-
   <sect2 id="preseed-apt">
   <title>Apt setup</title>
 <para>
@@ -1152,7 +1159,7 @@ earlier questions. You can optionally add other (local) repositories.
 #d-i apt-setup/use_mirror boolean false
 # Select which update services to use; define the mirrors to be used.
 # Values shown below are the normal defaults.
-#d-i apt-setup/services-select multi-select security, volatile
+#d-i apt-setup/services-select multiselect security, volatile
 #d-i apt-setup/security_host string security.debian.org
 #d-i apt-setup/volatile_host string volatile.debian.org
 
@@ -1285,7 +1292,7 @@ d-i grub-installer/with_other_os boolean true
   </sect2>
 
   <sect2 id="preseed-finish">
-  <title>Finishing up the first stage install</title>
+  <title>Finishing up the installation</title>
 
 <informalexample role="example"><screen>
 # Avoid that last message about the install being complete.