Update of original English docs

2 files changed, 34 insertions, 18 deletions

diff --git a/fi/appendix/chroot-install.xml b/fi/appendix/chroot-install.xml
index e5df2d236..cd72a3a88 100644
--- a/fi/appendix/chroot-install.xml
+++ b/fi/appendix/chroot-install.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 34713 untranslated -->
+<!-- original version: 36758 untranslated -->
 
  <sect1 id="linux-upgrade">
  <title>Installing &debian; from a Unix/Linux System</title>
@@ -284,8 +284,9 @@ configured for the next reboot.
 
 To configure networking, edit
 <filename>/etc/network/interfaces</filename>,
-<filename>/etc/resolv.conf</filename>, and
-<filename>/etc/hostname</filename>.
+<filename>/etc/resolv.conf</filename>,
+<filename>/etc/hostname</filename> and
+<filename>/etc/hosts</filename>.
 
 <informalexample><screen>
 # editor /etc/network/interfaces
@@ -380,13 +381,13 @@ If you intend to boot this system, you probably want a Linux kernel
 and a boot loader. Identify available pre-packaged kernels with
 
 <informalexample><screen>
-# apt-cache search kernel-image
+# apt-cache search <phrase condition="classic-kpkg">kernel</phrase><phrase condition="common-kpkg">linux</phrase>-image
 </screen></informalexample>
 
 Then install your choice using its package name.
 
 <informalexample><screen>
-# apt-get install kernel-image-<replaceable>2.X.X-arch-etc</replaceable>
+# apt-get install <phrase condition="classic-kpkg">kernel</phrase><phrase condition="common-kpkg">linux</phrase>-image-<replaceable>&kernelversion;-arch-etc</replaceable>
 </screen></informalexample>
 
 </para>
diff --git a/fi/appendix/preseed.xml b/fi/appendix/preseed.xml
index 17be3b04b..b64c281f2 100644
--- a/fi/appendix/preseed.xml
+++ b/fi/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36269 untranslated -->
+<!-- original version: 36758 untranslated -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -380,6 +380,14 @@ can still be fully automated, since you can pass preseed values to the kernel
 on the command line. Just pass <userinput>path/to/var=value</userinput>
 for any of the preseed variables listed in the examples.
 
+</para><para>
+
+A <quote>&ndash;&ndash;</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>&ndash;&ndash;</quote> may already be
+present in the default boot parameters.
+
 </para>
 <note><para>
 
@@ -909,31 +917,37 @@ Available tasks as of this writing include:
 
 <itemizedlist>
 <listitem><para>
-  <userinput>Standard system</userinput>
+  <userinput>standard</userinput>
+</para></listitem>
+<listitem><para>
+  <userinput>desktop</userinput>
+</para></listitem>
+<listitem><para>
+  <userinput>gnome-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Desktop environment</userinput>
+  <userinput>kde-desktop</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Web server</userinput>
+  <userinput>web-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Print server</userinput>
+  <userinput>print-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>DNS server</userinput>
+  <userinput>dns-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>File server</userinput>
+  <userinput>file-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Mail server</userinput>
+  <userinput>mail-server</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>SQL database</userinput>
+  <userinput>sql-database</userinput>
 </para></listitem>
 <listitem><para>
-  <userinput>Laptop</userinput>
+  <userinput>laptop</userinput>
 </para></listitem>
 </itemizedlist>
 
@@ -941,13 +955,14 @@ Available tasks as of this writing include:
 
 You can also choose to install no tasks, and force the installation of a
 set of packages in some other way. We recommend always including the
-<userinput>Standard system</userinput> task.
+<userinput>standard</userinput> task.
 
 </para>
 
 <informalexample role="example"><screen>
-tasksel tasksel/first multiselect Standard system, Desktop environment
-#tasksel tasksel/first multiselect Standard system, Web server
+tasksel tasksel/first multiselect standard, desktop
+#tasksel tasksel/first multiselect standard, web-server
+#tasksel tasksel/first multiselect standard, kde-desktop
 
 # Some versions of the installer can report back on what software you have
 # installed, and what software you use. The default is not to report back,