Update of original English documents

7 files changed, 188 insertions, 53 deletions

diff --git a/nl/administrivia/administrivia.xml b/nl/administrivia/administrivia.xml
index 69386f674..a6a268923 100644
--- a/nl/administrivia/administrivia.xml
+++ b/nl/administrivia/administrivia.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 untranslated -->
+<!-- original version: 43043 untranslated -->
 
 <appendix id="administrivia">
  <title>Administrivia</title>
@@ -53,12 +53,12 @@ Its condition is "about-langteam".
 
 If you have problems or suggestions regarding this document, you
 should probably submit them as a bug report against the package
-<classname>debian-installer-manual</classname>.  See the
+<classname>installation-guide</classname>.  See the
 <classname>reportbug</classname> package or read the online
 documentation of the <ulink url="&url-bts;">Debian Bug
 Tracking System</ulink>.  It would be nice if you could check the
-<ulink url="&url-bts;debian-installer-manual">open bugs against
-debian-installer-manual</ulink> to see whether your problem has
+<ulink url="&url-bts;installation-guide">open bugs against
+installation-guide</ulink> to see whether your problem has
 already been reported. If so, you can supply additional corroboration
 or helpful information to
 <email><replaceable>XXXX</replaceable>@bugs.debian.org</email>,
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index 396197822..39dea00c4 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 42377 untranslated -->
+<!-- original version: 42982 untranslated -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -292,14 +292,30 @@ Note that <filename>preseed/url</filename> can be shortened to just
   </sect2>
   
   <sect2 id="preseed-bootparms">
-  <title>Using boot parameters to supplement preseeding</title>
+  <title>Using boot parameters to preseed questions</title>
 <para>
 
 If a preconfiguration file cannot be used to preseed some steps, the
 install can still be fully automated, since you can pass preseed values on
-the command line when booting the installer. Just pass
-<userinput>path/to/var=value</userinput> for any of the preseed variables
-listed in the examples.
+the command line when booting the installer.
+
+</para><para>
+
+Boot parameters can also be used if you do not really want to use preseeding,
+but just want to provide an answer for a specific question. Some examples where
+this can be useful are documented elsewhere in this manual.
+
+</para><para>
+
+To set a value to be used inside &d-i;, just pass
+<userinput><replaceable>path/to/variable</replaceable>=<replaceable>value</replaceable></userinput>
+for any of the preseed variables listed in the examples in this appendix.
+If a value is to be used to configure packages for the target system, you
+will need to prepend the <firstterm>owner</firstterm> of the variable as in
+<userinput><replaceable>owner</replaceable>:<replaceable>path/to/variable</replaceable>=<replaceable>value</replaceable></userinput>.
+If you don't specify the owner, the value for the variable will not be
+copied to the debconf database in the target system and thus remain unused
+during the configuration of the relevant package.
 
 </para><para>
 
@@ -308,7 +324,8 @@ 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.
+shortened urls to be used. Another example is the <literal>tasks</literal>
+alias, which translates to <literal>tasksel:tasksel/first</literal>.
 
 </para><para>
 
@@ -1015,7 +1032,9 @@ earlier questions. You can optionally add other (local) repositories.
 #d-i apt-setup/local0/comment string local server
 # Enable deb-src lines
 #d-i apt-setup/local0/source boolean true
-# URL to the public key of the local repository
+# URL to the public key of the local repository; you must provide a key or
+# apt will complain about the unauthenticated repository and so the
+# sources.list line will be left commented out
 #d-i apt-setup/local0/key string http://local.server/key
 </screen></informalexample>
 
diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index caf304e2b..8d9e43cd6 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: 42367 untranslated -->
+<!-- original version: 42982 untranslated -->
 
  <sect1 id="boot-parms"><title>Boot Parameters</title>
 <para>
@@ -126,23 +126,16 @@ installer. The current possible parameter settings are:
 </listitem><listitem>
 <para><userinput>DEBIAN_FRONTEND=newt</userinput></para>
 </listitem><listitem>
-<para><userinput>DEBIAN_FRONTEND=slang</userinput></para>
-</listitem><listitem>
-<para><userinput>DEBIAN_FRONTEND=ncurses</userinput></para>
-</listitem><listitem>
-<para><userinput>DEBIAN_FRONTEND=bogl</userinput></para>
-</listitem><listitem>
 <para><userinput>DEBIAN_FRONTEND=gtk</userinput></para>
-</listitem><listitem>
-<para><userinput>DEBIAN_FRONTEND=corba</userinput></para>
 </listitem>
 </itemizedlist>
 
-The default front end is <userinput>DEBIAN_FRONTEND=newt</userinput>.
+The default frontend is <userinput>DEBIAN_FRONTEND=newt</userinput>.
 <userinput>DEBIAN_FRONTEND=text</userinput> may be preferable for
 serial console installs. Generally only the
 <userinput>newt</userinput> frontend is available on default install
-media, so this is not very useful right now.
+media. On architectures which support it, the graphical installer uses
+the <userinput>gtk</userinput> frontend.
 
 </para></listitem>
 </varlistentry>
@@ -304,7 +297,7 @@ this misbehavior.
 
 Specify the url to a preconfiguration file to download and use in
 automating the install. See <xref linkend="automatic-install"/>.
-Short form: <userinput>url</userinput>
+Short form: <userinput>url</userinput>.
 
 </para></listitem>
 </varlistentry>
@@ -315,7 +308,7 @@ Short form: <userinput>url</userinput>
 
 Specify the path to a preconfiguration file to load to
 automating the install. See <xref linkend="automatic-install"/>.
-Short form: <userinput>file</userinput>
+Short form: <userinput>file</userinput>.
 
 </para></listitem>
 </varlistentry>
@@ -362,7 +355,17 @@ If you are using a 2.2.x kernel, you may need to set &ramdisksize;.
 </para></listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry condition="g-i">
+<term>mouse/left</term>
+<listitem><para>
+
+For the gtk frontend (graphical installer), users can switch the mouse to
+left-handed operation by setting this parameter to <userinput>true</userinput>.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry condition="g-i">
 <term>directfb/hw-accel</term>
 <listitem><para>
 
@@ -384,6 +387,97 @@ performing a normal installation. See <xref linkend="rescue"/>.
 </varlistentry>
 
 </variablelist>
+
+   <sect3 id="preseed-args">
+   <title>Using boot parameters to answer questions</title>
+<para>
+
+With some exceptions, a value can be set at the boot prompt for any question
+asked during the installation, though this is only really useful in specific
+cases. General instructions how to do this can be found in
+<xref linkend="preseed-bootparms"/>. Some specific examples are listed below.
+
+</para>
+
+<variablelist>
+
+<varlistentry>
+<term>debian-installer/locale</term>
+<listitem><para>
+
+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.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>netcfg/disable_dhcp</term>
+<listitem><para>
+
+Set to <userinput>true</userinput> if you want to disable DHCP and instead
+force static network configuration.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>tasksel:tasksel/first</term>
+<listitem><para>
+
+Can be used to select tasks that are not available from the interactive task
+list, such as the <literal>kde-desktop</literal> task.
+See <xref linkend="pkgsel"/> for additional information.
+Short form: <userinput>tasks</userinput>.
+
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+
+   </sect3>
+
+   <sect3 id="module-parms"><title>Passing parameters to kernel modules</title>
+<para>
+
+If drivers are compiled into the kernel, you can pass parameters to them
+as described in the kernel documentation. However, if drivers are compiled
+as modules and because kernel modules are loaded a bit differently during
+an installation than when booting an installed system, it is not possible
+to pass parameters to modules as you would normally do. Instead, you need
+to use a special syntax recognized by the installer which will then make
+sure that the parameters are saved in the proper configuration files and
+will thus be used when the modules are actually loaded. The parameters
+will also be propagated automatically to the configuration for the installed
+system.
+
+</para><para>
+
+Note that it is now quite rare that parameters need to be passed to modules.
+In most cases the kernel will be able to probe the hardware present in a
+system and set good defaults that way. However, in some situations it may
+still be needed to set parameters manually.
+
+</para><para>
+
+The syntax to use to set parameters for modules is:
+
+<informalexample><screen>
+<replaceable>module_name</replaceable>.<replaceable>parameter_name</replaceable>=<replaceable>value</replaceable>
+</screen></informalexample>
+
+If you need to pass multiple parameters to the same or different modules,
+just repeat this. For example, to set an old 3Com network interface card
+to use the BNC (coax) connector and IRQ 10, you would pass:
+
+<informalexample><screen>
+3c509.xcvr=3 3c509.irq=10
+</screen></informalexample>
+
+</para>
+   </sect3>
   </sect2>
  </sect1>
-
diff --git a/nl/boot-installer/trouble.xml b/nl/boot-installer/trouble.xml
index d5cf3b1cc..312c6132b 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: 42461 untranslated -->
+<!-- original version: 42532 untranslated -->
 
  <sect1 id="boot-troubleshooting">
  <title>Troubleshooting the Installation Process</title>
@@ -35,8 +35,8 @@ it is not dirty.
 <listitem><para>
 
 If the installer fails to recognize a CD-ROM, try just running the option
-<guimenu> <guimenuitem>Detect and mount CD-ROM</guimenuitem></guimenu> a
-second time. Some DMA related isses with older CD-ROM drives are known to
+<menuchoice> <guimenuitem>Detect and mount CD-ROM</guimenuitem> </menuchoice>
+a second time. Some DMA related isses with older CD-ROM drives are known to
 be resolved in this way.
 
 </para></listitem>
@@ -231,32 +231,32 @@ The boot floppy is the floppy with the worst problems, because it
 is read by the hardware directly, before Linux boots.  Often, the
 hardware doesn't read as reliably as the Linux floppy disk driver, and
 may just stop without printing an error message if it reads incorrect
-data. There can also be failures in the Driver Floppies most of which
+data. There can also be failures in the driver floppies, most of which
 indicate themselves with a flood of messages about disk I/O errors.
 
 </para><para>
 
-If you are having the installation stall at a particular floppy, the
-first thing you should write it to a <emphasis>different</emphasis>
-floppy. Simply reformatting the old
+If you are having the installation stall at a particular floppy, the first
+thing you should do is write the image to a <emphasis>different</emphasis>
+floppy and see if that solves the problem. Simply reformatting the old
 floppy may not be sufficient, even if it appears that the floppy was
 reformatted and written with no errors. It is sometimes useful to try
 writing the floppy on a different system.
 
 </para><para>
 
-Normally you should not have download a floppy image again, but if you
-are experiencing problems it is always useful to verify that the images
-were downloaded correctly by verifying their md5sums.
-
-</para><para>
-
 One user reports he had to write the images to floppy
 <emphasis>three</emphasis> times before one worked, and then
 everything was fine with the third floppy.
 
 </para><para>
 
+Normally you should not have to download a floppy image again, but if you
+are experiencing problems it is always useful to verify that the images
+were downloaded correctly by verifying their md5sums.
+
+</para><para>
+
 Other users have reported that simply rebooting a few times with the
 same floppy in the floppy drive can lead to a successful boot. This is
 all due to buggy hardware or firmware floppy drivers.
diff --git a/nl/boot-installer/x86.xml b/nl/boot-installer/x86.xml
index 3caa968b2..8472097bb 100644
--- a/nl/boot-installer/x86.xml
+++ b/nl/boot-installer/x86.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 41808 untranslated -->
+<!-- original version: 42929 untranslated -->
 
   <sect2 arch="x86"><title>Booting from a CD-ROM</title>
 
@@ -118,8 +118,10 @@ and place the needed files as described in <xref linkend="boot-drive-files"/>.
 If you intend to use the hard drive only for booting and then
 download everything over the network, you should download the
 <filename>netboot/debian-installer/i386/initrd.gz</filename> file and its
-corresponding kernel. This will allow you to repartition the hard disk
-from which you boot the installer, although you should do so with care.
+corresponding kernel
+<filename>netboot/debian-installer/i386/linux</filename>. This will allow you
+to repartition the hard disk from which you boot the installer, although you
+should do so with care.
 </para>
 
 <para>
diff --git a/nl/hardware/hardware-supported.xml b/nl/hardware/hardware-supported.xml
index c06bd1eff..9910dc1a7 100644
--- a/nl/hardware/hardware-supported.xml
+++ b/nl/hardware/hardware-supported.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 40543 untranslated -->
+<!-- original version: 43032 untranslated -->
 
  <sect1 id="hardware-supported">
  <title>Supported Hardware</title>
@@ -63,13 +63,16 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry morerows="2">ARM and StrongARM</entry>
-  <entry morerows="2">arm</entry>
+  <entry morerows="3">ARM and StrongARM</entry>
+  <entry morerows="3">arm</entry>
   <entry>Netwinder and CATS</entry>
   <entry>netwinder</entry>
 </row><row>
-  <entry>Linksys NSLU2</entry>
-  <entry>nslu2</entry>
+  <entry>Intel IOP32x</entry>
+  <entry>iop32x</entry>
+</row><row>
+  <entry>Intel IXP4xx</entry>
+  <entry>ixp4xx</entry>
 </row><row>
   <entry>RiscPC</entry>
   <entry>rpc</entry>
diff --git a/nl/hardware/supported/arm.xml b/nl/hardware/supported/arm.xml
index 7c412ed5b..f4293662f 100644
--- a/nl/hardware/supported/arm.xml
+++ b/nl/hardware/supported/arm.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36908 untranslated -->
+<!-- original version: 43031 untranslated -->
 
 
   <sect2 arch="arm"><title>CPU, Main Boards, and Video Support</title>
@@ -8,7 +8,8 @@
 
 Each distinct ARM architecture requires its own kernel. Because of
 this the standard Debian distribution only supports installation on
-a number of the most common systems. The Debian userland however may be used by <emphasis>any</emphasis> ARM CPU including xscale.
+a number of the most common platforms. The Debian userland however may be
+used by <emphasis>any</emphasis> ARM CPU.
 
 </para>
 
@@ -22,7 +23,7 @@ Debian currently only supports little-endian ARM systems.
 
 <para>
 
-The supported systems are:
+The supported platforms are:
 
 <variablelist>
 
@@ -41,9 +42,24 @@ personal server (cps, aka skiff).
 </varlistentry>
 
 <varlistentry>
-<term>NSLU2</term>
+<term>IOP32x</term>
 <listitem><para>
 
+Intel's I/O Processor (IOP) line is found in a number of products related
+to data storage and processing.  Debian currently supports the IOP32x
+platform, featuring the IOP 80219 and 32x chips commonly found in Network
+Attached Storage (NAS) devices.  Debian explicitly supports two such
+devices: the GLAN Tank from IO-Data and the Thecus N2100.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>IXP4xx</term>
+<listitem><para>
+
+The IXP4xx platform is based on Intel's XScale ARM core.  Currently, only
+one IXP4xx based system is supported, the Linksys NSLU2.
 The Linksys NSLU2 (Network Storage Link for USB 2.0 Disk Drives) is a small
 device which allows you to easily provide storage via the network.  It
 comes with an Ethernet connection and two USB ports to which hard drives
@@ -56,8 +72,9 @@ can be connected.
 <term>RiscPC</term>
 <listitem><para>
 
-This machine is the oldest supported hardware: it was released
-in 1994. It has RISC OS in ROM, Linux can be booted from that OS using
+This machine is the oldest supported hardware but support for it in
+our new installer is incomplete.
+It has RISC OS in ROM, Linux can be booted from that OS using
 linloader. The RiscPC has a modular CPU card and typically has a 30MHz
 610, 40MHz 710 or 233MHz Strongarm 110 CPU fitted. The mainboard has
 integrated IDE, SVGA video, parallel port, single serial port, PS/2