Update of original English docs

3 files changed, 37 insertions, 16 deletions

diff --git a/nl/boot-installer/ia64.xml b/nl/boot-installer/ia64.xml
index 9afc8b61e..c42fee170 100644
--- a/nl/boot-installer/ia64.xml
+++ b/nl/boot-installer/ia64.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 43255 untranslated -->
 
   <sect2 arch="ia64"><title>Booting from a CD-ROM</title>
 
@@ -337,7 +337,7 @@ set up the language locale, network, and disk partitions.
   <sect2 arch="ia64" id="boot-tftp"><title>Booting with TFTP</title>
 
 <para>
-Booting an IA64 system from the network is similar to a CD boot.
+Booting an IA-64 system from the network is similar to a CD boot.
 The only difference is how the installation kernel is loaded.
 The EFI Boot Manager can load and start programs from a server on
 the network.
@@ -352,7 +352,7 @@ rather than the CD drive.
 
 <para>
 
-Network booting an ia64 system requires two architecture-specific actions.
+Network booting an IA-64 system requires two architecture-specific actions.
 On the boot server, DHCP and TFTP must be configured to deliver
 <command>elilo</command>.
 On the client a new boot option must be defined in the EFI boot manager
@@ -364,7 +364,7 @@ to enable loading over a network.
   <title>Configuring the Server</title>
 <para>
 
-A suitable TFTP entry for network booting an ia64 system looks something
+A suitable TFTP entry for network booting an IA-64 system looks something
 like this:
 
 <informalexample><screen>
@@ -457,7 +457,7 @@ Debian Installer.
 </para><para>
 
 Proceed to the next chapter to continue the installation where
-you will set up the language locale, network, and the disk partitions.
+you will set up the language locale, network, and disk partitions.
 
 </para>
   </sect3>
diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index 8d9e43cd6..7e355a7b5 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: 42982 untranslated -->
+<!-- original version: 43527 untranslated -->
 
  <sect1 id="boot-parms"><title>Boot Parameters</title>
 <para>
@@ -409,7 +409,21 @@ Can be used to set both the language and country for the installation.
 This will only work if the locale is supported in Debian.
 Short form: <userinput>locale</userinput>.
 For example, use <userinput>locale=de_CH</userinput> to select German as
-language and Switserland as country.
+language and Switzerland as country.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>anna/choose_modules</term>
+<listitem><para>
+
+Can be used to automatically load installer components that are not loaded
+by default. Short form: <userinput>modules</userinput>.
+Examples of optional components that may be useful are
+<classname>openssh-client-udeb</classname> (so you can use
+<command>scp</command> during the installation) and
+<classname>ppp-udeb</classname> (which supports PPPoE configuration).
 
 </para></listitem>
 </varlistentry>
diff --git a/nl/boot-installer/trouble.xml b/nl/boot-installer/trouble.xml
index 492632fbf..3a715fc89 100644
--- a/nl/boot-installer/trouble.xml
+++ b/nl/boot-installer/trouble.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43253 untranslated -->
+<!-- original version: 43514 untranslated -->
 
  <sect1 id="boot-troubleshooting">
  <title>Troubleshooting the Installation Process</title>
@@ -159,7 +159,7 @@ Uniform CD-ROM driver Revision: 3.20
 
 If you don't see something like that, chances are the controller your CD-ROM
 is connected to was not recognized or may be not supported at all. If you
-know what driver is needed for the drive, you can try loading it manually
+know what driver is needed for the controller, you can try loading it manually
 using <command>modprobe</command>.
 
   </para></listitem>
@@ -189,11 +189,12 @@ Check if DMA is currently enabled:
 
 <informalexample><screen>
 $ cd /proc/<replaceable>ide</replaceable>/<replaceable>hdc</replaceable>
-$ grep dma settings
+$ grep using_dma settings
 using_dma      1       0       1       rw
 </screen></informalexample>
 
-A <quote>1</quote> means it is enabled. If it is, try disabling it:
+A <quote>1</quote> in the first column after <literal>using_dma</literal>
+means it is enabled. If it is, try disabling it:
 
 <informalexample><screen>
 $ echo -n "using_dma:0" >settings
@@ -409,13 +410,13 @@ custom kernel later (see <xref linkend="kernel-baking"/>).
 
 
   <sect2 id="problem-report">
-  <title>Bug Reporter</title>
+  <title>Reporting Installation Problems</title>
 <para>
 
-If you get through the initial boot phase but cannot complete the
-install, the bug reporter menu choice may be helpful.
+If you get through the initial boot phase but cannot complete the install,
+the menu option <guimenuitem>Save debug logs</guimenuitem> may be helpful.
 It lets you store system error logs and configuration information from the
-installer to a floppy, or download them in a web browser.
+installer to a floppy, or download them using a web browser.
 
 This information may provide clues as to what went wrong and how to
 fix it.  If you are submitting a bug report you may want to attach
@@ -442,6 +443,12 @@ number of hardware configurations.
 
 </para><para>
 
+Note that your installation report will be published in the Debian Bug
+Tracking System (BTS) and forwarded to a public mailing list. Make sure that
+you use an E-Mail address that you do not mind being made public.
+
+</para><para>
+
 If you have a working Debian system, the easiest way to send an installation
 report is to install the installation-report and reportbug packages
 (<command>apt-get install installation-report reportbug</command>) and run
@@ -449,7 +456,7 @@ the command <command>reportbug installation-report</command>.
 
 </para><para>
 
-Please use this template when filling out
+Alternatively you can use this template when filling out
 installation reports, and file the report as a bug report against the
 <classname>installation-reports</classname> pseudo package, by sending it to
 <email>submit@bugs.debian.org</email>.