Update of original English docs

15 files changed, 580 insertions, 202 deletions

diff --git a/nl/appendix/chroot-install.xml b/nl/appendix/chroot-install.xml
index 798904902..884ebc92c 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: 43576 untranslated -->
+<!-- original version: 43724 untranslated -->
 
  <sect1 id="linux-upgrade">
  <title>Installing &debian; from a Unix/Linux System</title>
@@ -441,22 +441,58 @@ and a boot loader. Identify available pre-packaged kernels with:
 # apt-cache search linux-image
 </screen></informalexample>
 
-Then install your choice using its package name.
+</para><para>
+
+If you intend to use a pre-packaged kernel, you may want to create the
+configuration file <filename>/etc/kernel-img.conf</filename> before you
+do so. Here's an example file:
 
 <informalexample><screen>
-# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable>
+# Kernel image management overrides
+# See kernel-img.conf(5) for details
+do_symlinks = yes
+relative_links = yes
+do_bootloader = yes
+do_bootfloppy = no
+do_initrd = yes
+link_in_boot = no
 </screen></informalexample>
 
-</para>
-<note><para>
+</para><para>
 
-The configuration file <filename>/etc/kernel-img.conf</filename> influences
-the installation and upgrade of pre-packaged Debian kernels. A default file
-will be created when you first install a Debian kernel image. For additional
-information about this file, consult its man page which will be available
-after installing the <classname>kernel-package</classname> package.
+For detailed information about this file and the various options, consult
+its man page which will be available after installing the
+<classname>kernel-package</classname> package. We recommend that you check
+that the values are appropriate for your system.
 
-</para></note>
+</para><para arch="x86">
+
+If you intend to use <classname>grub</classname> as your bootloader, you
+can set the <literal>do_bootloader</literal> option to <quote>no</quote>.
+To automatically update your <filename>/boot/grub/menu.lst</filename> on
+installation or removal of Debian kernels, add the following lines:
+
+<informalexample><screen>
+postinst_hook = update-grub
+postrm_hook   = update-grub
+</screen></informalexample>
+
+For the <classname>lilo</classname> bootloader, the value of
+<literal>do_bootloader</literal> needs to be <quote>yes</quote>.
+
+</para><para>
+
+Then install the kernel package of your choice using its package name.
+
+<informalexample><screen>
+# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable>
+</screen></informalexample>
+
+If you did not create a <filename>/etc/kernel-img.conf</filename> before
+installing a pre-packaged kernel, you may be asked some questions during
+its installation that refer to it.
+
+</para>
   </sect2>
 
   <sect2>
@@ -543,9 +579,9 @@ instead of <userinput>hd:</userinput>.
 <title>Finishing touches</title>
 <para>
 
-As mentioned earlier, the installed system will be very basic. If you would
-like to make the system a bit more mature, there is an easy method to
-packages of <quote>standard</quote> priority:
+As mentioned earlier, the installed system will be very basic. If you
+would like to make the system a bit more mature, there is an easy method
+to install all packages with <quote>standard</quote> priority:
 
 <informalexample><screen>
 # tasksel install standard
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index 6fd019918..cbe756d94 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43583 untranslated -->
+<!-- original version: 43658 untranslated -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -508,9 +508,10 @@ The following aliases can be useful when using (auto mode) preseeding.
 <row><entry>priority</entry><entry>debconf/priority</entry></row>
 <row><entry>file</entry><entry>preseed/file</entry></row>
 <row><entry>url</entry><entry>preseed/url</entry></row>
+<row><entry>interface</entry><entry>netcfg/choose_interface</entry></row>
 <row><entry>hostname&nbsp;&nbsp;&nbsp;</entry><entry>netcfg/get_hostname</entry></row>
 <row><entry>domain</entry><entry>netcfg/get_domain</entry></row>
-<row><entry>interface</entry><entry>netcfg/choose_interface</entry></row>
+<row><entry>protocol</entry><entry>mirror/protocol</entry></row>
 <row><entry>suite</entry><entry>mirror/suite</entry></row>
 </tbody></tgroup>
 </informaltable>
diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index 7591d2bf7..0ff49ff2c 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: 43527 untranslated -->
+<!-- original version: 43675 untranslated -->
 
  <sect1 id="boot-parms"><title>Boot Parameters</title>
 <para>
@@ -81,15 +81,22 @@ With current kernels (2.6.9 or newer) you can use 32 command line options and
 
 </footnote> which may be useful.
 
+</para><para>
+
+A number of parameters have a <quote>short form</quote> that helps avoid
+the limitations of the kernel command line options and makes entering the
+parameters easier. If a parameter has a short form, it will be listed in
+brackets behind the (normal) long form. Examples in this manual will
+normally use the short form too.
+
 </para>
 
 <variablelist>
 <varlistentry>
-<term>debconf/priority</term>
+<term>debconf/priority (priority)</term>
 <listitem><para>
 
 This parameter sets the lowest priority of messages to be displayed.
-Short form: <userinput>priority</userinput>
 
 </para><para>
 
@@ -199,14 +206,13 @@ one device.
 </varlistentry>
 
 <varlistentry>
-<term>debian-installer/framebuffer</term>
+<term>debian-installer/framebuffer (fb)</term>
 <listitem><para>
 
 Some architectures use the kernel framebuffer to offer installation in
 a number of languages. If framebuffer causes a problem on your system
 you can disable the feature by the parameter
-<userinput>debian-installer/framebuffer=false</userinput>, or
-<userinput>fb=false</userinput> for short. Problem symptoms are error messages
+<userinput>fb=false</userinput>. Problem symptoms are error messages
 about bterm or bogl, a blank screen, or a freeze within a few minutes after
 starting the install.
 
@@ -237,16 +243,15 @@ parameter <userinput>debian-installer/framebuffer=true</userinput> or
 </para></note></listitem>
 </varlistentry>
 
-<varlistentry>
-<term>debian-installer/theme</term>
+<varlistentry arch="not-s390">
+<term>debian-installer/theme (theme)</term>
 <listitem><para>
 
 A theme determines how the user interface of the installer looks (colors,
 icons, etc.). What themes are available differs per frontend.  Currently
 both the newt and gtk frontends only have a <quote>dark</quote> theme that was
-designed for visually impaired users. Set the theme by booting with parameter
-<userinput>debian-installer/theme=<replaceable>dark</replaceable></userinput>
-or <userinput>theme=<replaceable>dark</replaceable></userinput>.
+designed for visually impaired users. Set the theme by booting with 
+<userinput>theme=<replaceable>dark</replaceable></userinput>.
 
 </para></listitem>
 </varlistentry>
@@ -292,33 +297,31 @@ this misbehavior.
 </varlistentry>
 
 <varlistentry>
-<term>preseed/url</term>
+<term>preseed/url (url)</term>
 <listitem><para>
 
 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>.
 
 </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term>preseed/file</term>
+<term>preseed/file (file)</term>
 <listitem><para>
 
 Specify the path to a preconfiguration file to load to
 automating the install. See <xref linkend="automatic-install"/>.
-Short form: <userinput>file</userinput>.
 
 </para></listitem>
 </varlistentry>
 
 <varlistentry>
-<term>auto-install/enabled</term>
+<term>auto-install/enabled (auto)</term>
 <listitem><para>
 
 Delay questions that are normally asked before preseeding is possible until
-after the network is configured. Short form: <userinput>auto=true</userinput>
+after the network is configured.
 See <xref linkend="preseed-auto"/> for details about using this to
 automate installs.
 
@@ -402,12 +405,11 @@ cases. General instructions how to do this can be found in
 <variablelist>
 
 <varlistentry>
-<term>debian-installer/locale</term>
+<term>debian-installer/locale (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 Switzerland as country.
 
@@ -415,11 +417,11 @@ language and Switzerland as country.
 </varlistentry>
 
 <varlistentry>
-<term>anna/choose_modules</term>
+<term>anna/choose_modules (modules)</term>
 <listitem><para>
 
 Can be used to automatically load installer components that are not loaded
-by default. Short form: <userinput>modules</userinput>.
+by default.
 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
@@ -439,13 +441,26 @@ force static network configuration.
 </varlistentry>
 
 <varlistentry>
-<term>tasksel:tasksel/first</term>
+<term>mirror/protocol (protocol)</term>
+<listitem><para>
+
+By default the installer will use the http protocol to download files from
+Debian mirrors and changing that to ftp is not possible during installations
+at normal priority. By setting this parameter to <userinput>ftp</userinput>,
+you can force the installer to use that protocol instead. Note that you
+cannot select an ftp mirror from a list, you have to enter the hostname
+manually.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>tasksel:tasksel/first (tasks)</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>
diff --git a/nl/boot-installer/sparc.xml b/nl/boot-installer/sparc.xml
index 81cad25e7..f737c2fc7 100644
--- a/nl/boot-installer/sparc.xml
+++ b/nl/boot-installer/sparc.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 43724 untranslated -->
 
   <sect2 arch="sparc" id="boot-tftp"><title>Booting with TFTP</title>
 
@@ -13,9 +13,7 @@ machine which is being installed (see
 Use the command <userinput>boot net</userinput> to boot from a TFTP
 and RARP server, or try <userinput>boot net:bootp</userinput> or
 <userinput>boot net:dhcp</userinput> to boot from a TFTP and BOOTP
-or DHCP server. Some older OpenBoot revisions require using
-the device name, such as <userinput>boot le()</userinput>; these
-probably don't support BOOTP nor DHCP.
+or DHCP server.
 
 </para>
   </sect2>
@@ -29,10 +27,7 @@ probably don't support BOOTP nor DHCP.
 
 Most OpenBoot versions support the <userinput>boot cdrom</userinput>
 command which is simply an alias to boot from the SCSI device on ID 6
-(or the secondary master for IDE based systems). You may have to use
-the actual device name for older OpenBoot versions that don't support
-this special command. Note that some problems have been reported on Sun4m
-(e.g., Sparc 10s and Sparc 20s) systems booting from CD-ROM.
+(or the secondary master for IDE based systems).
 
 </para>
   </sect2>
@@ -42,6 +37,15 @@ this special command. Note that some problems have been reported on Sun4m
   <title>Booting from Floppies</title>
 <para>
 
+Floppy images are currently only available for sparc32, but, for techinical
+reasons, not for official releases. (The reason is that they can only be
+built as root, which is not supported by our build daemons.)
+Look under <quote>daily built images</quote> on the
+<ulink url="&url-d-i;">Debian Installer project website</ulink> for links
+to floppy images for sparc32.
+
+</para><para>
+
 To boot from floppy on a Sparc, use
 
 <informalexample><screen>
@@ -51,8 +55,6 @@ Stop-A -&gt; OpenBoot: "boot floppy"
 Be warned that the newer Sun4u (ultra) architecture does not support
 floppy booting. A typical error message is <computeroutput>Bad magic
 number in disk label - Can't open disk label package</computeroutput>.
-Furthermore, a number of Sun4c models (such as the IPX) do not support
-the compressed images found on the disks, so also are not supported.
 
 </para><para>
 
diff --git a/nl/boot-installer/trouble.xml b/nl/boot-installer/trouble.xml
index 3a715fc89..e4efda20d 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: 43514 untranslated -->
+<!-- original version: 43694 untranslated -->
 
  <sect1 id="boot-troubleshooting">
  <title>Troubleshooting the Installation Process</title>
@@ -368,7 +368,7 @@ installer.
    </sect3>
 
    <sect3>
-   <title>System Freeze while Loading the USB Modules</title>
+   <title>System Freeze while Loading USB Modules</title>
 <para>
 
 The kernel normally tries to install USB modules and the USB keyboard driver
@@ -382,6 +382,58 @@ at the boot prompt, which will prevent the modules from being loaded.
    </sect3>
   </sect2>
 
+  <sect2 arch="sparc" id="sparc-boot-problems">
+  <title>Common &arch-title; Installation Problems</title>
+<para>
+
+There are some common installation problems that are worth mentioning.
+
+</para>
+   <sect3>
+   <title>Misdirected video output</title>
+<para>
+
+It is fairly common for &arch-title; to have two video cards in one machine,
+for example an ATI card and a Sun Creator 3D. In some cases, this may result
+in the video output getting misdirected soon after the system boots. In
+typical cases, the display will only show:
+
+<informalexample><screen>
+Remapping the kernel... done
+Booting Linux...
+</screen></informalexample>
+
+To work around this, you can either pull out one of the video cards, or
+disable the one not used during the OpenProm boot phase using a kernel
+parameter. For example, to disable an ATI card, you should boot the
+installer with <userinput>video=atyfb:off</userinput>.
+
+</para><para>
+
+Note that you may also have to manually add this parameter to the silo
+configuration (edit <filename>/target/etc/silo.conf</filename> before
+rebooting) and, if you installed X11, modify the video driver in
+<filename>/etc/X11/xorg.conf</filename>.
+
+</para>
+   </sect3>
+
+   <sect3>
+   <title>Failure to Boot or Install from CD-ROM</title>
+<para>
+
+Some Sparc systems are notoriously difficult to boot from CD-ROM and
+even if they do boot, there may be inexplicable failures during the
+installation. Most problems have been reported with SunBlade systems.
+
+</para><para>
+
+We recommend to install such systems by netbooting the installer.
+
+</para>
+   </sect3>
+  </sect2>
+
   <sect2 id="kernel-msgs">
   <title>Interpreting the Kernel Startup Messages</title>
 
@@ -450,9 +502,12 @@ 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
-the command <command>reportbug installation-report</command>.
+report is to install the <classname>installation-report</classname> and
+<classname>reportbug</classname> packages
+(<command>aptitude install installation-report reportbug</command>),
+configure <classname>reportbug</classname> as explained in
+<xref linkend="mail-outgoing"/>, and run the command <command>reportbug
+installation-report</command>.
 
 </para><para>
 
diff --git a/nl/hardware/hardware-supported.xml b/nl/hardware/hardware-supported.xml
index 73366d3b7..6927bc67f 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: 43529 untranslated -->
+<!-- original version: 43640 untranslated -->
 
  <sect1 id="hardware-supported">
  <title>Supported Hardware</title>
@@ -163,12 +163,15 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry morerows="1">Sun SPARC</entry>
-  <entry morerows="1">sparc</entry>
-  <entry morerows="1"></entry>
-  <entry>sun4cdm</entry>
+  <entry morerows="2">Sun SPARC</entry>
+  <entry morerows="2">sparc</entry>
+  <entry>sun4m</entry>
+  <entry>sparc32</entry>
 </row><row>
   <entry>sun4u</entry>
+  <entry morerows="1">sparc64</entry>
+</row><row>
+  <entry>sun4v</entry>
 </row>
 
 <row>
diff --git a/nl/hardware/network-cards.xml b/nl/hardware/network-cards.xml
index cfd5714cd..87dff40bc 100644
--- a/nl/hardware/network-cards.xml
+++ b/nl/hardware/network-cards.xml
@@ -1,121 +1,53 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 untranslated -->
+<!-- original version: 43693 untranslated -->
 
  <sect1 id="network-cards">
  <title>Network Connectivity Hardware</title>
+<para>
 
-<para arch="x86">
+Almost any network interface card (NIC) supported by the Linux kernel
+should also be supported by the installation system; modular drivers
+should normally be loaded automatically.
 
-<!-- last updated for kernel-image_2.0.36-2 -->
+<phrase arch="x86">This includes most PCI and PCMCIA cards.</phrase>
+<phrase arch="i386">Many older ISA cards are supported as well.</phrase>
 
-Most PCI and many older ISA network cards are supported.
-Some network interface cards are not supported by most Debian
-installation disks, such as AX.25 cards and protocols;
-NI16510 EtherBlaster cards; Schneider &amp; Koch G16 cards;
-and the Zenith Z-Note built-in network card. Microchannel (MCA) network
-cards are not supported by the standard installation system, but see
-<ulink url="&url-linux-mca;">Linux on MCA</ulink> for some (old)
-instructions.
-FDDI networks are also not supported by the installation disks, both
-cards and protocols.
+<phrase arch="m68k">Again, see <ulink url="&url-m68k-faq;"></ulink>
+for complete details.</phrase>
 
-<!-- missing-doc FIXME You can create a custom kernel which supports an
-otherwise unsupported card and then substitute in the installer (see
-<xref linkend="rescue-replace-kernel"/>). -->
-
-</para><para arch="x86">
-
-As for ISDN, the D-channel protocol for the (old) German 1TR6 is not
-supported; Spellcaster BRI ISDN boards are also not supported by the
-&d-i;.
-
-</para>
-
-<para arch="m68k">
-
-Any network interface card (NIC) supported by the Linux kernel should
-also be supported by the boot disks.  You may need to load your
-network driver as a module.  Again, see
-<ulink url="&url-m68k-faq;"></ulink> for complete details.
-
-</para>
-
-<para arch="sparc">
+</para><para arch="sparc">
 
-The following network interface cards (NICs) are supported from the bootable
-kernel directly:
+This includes a lot of generic PCI cards (for systems that have PCI) and
+the following NICs from Sun:
 
 <itemizedlist>
- <listitem><para>
+<listitem><para>
 
 Sun LANCE
 
-
 </para></listitem>
- <listitem><para>
+<listitem><para>
 
 Sun Happy Meal
 
-
 </para></listitem>
-</itemizedlist>
-
-</para><para arch="sparc">
-
-The following network interface cards are supported as modules.  They
-can be enabled once the drivers are installed during the setup.
-However, due to the magic of OpenPROM, you still should be able to
-boot from these devices:
-
-<itemizedlist>
- <listitem><para>
+<listitem><para>
 
 Sun BigMAC
 
-
 </para></listitem>
- <listitem><para>
+<listitem><para>
 
 Sun QuadEthernet
 
 </para></listitem>
- <listitem><para>
+<listitem><para>
 
 MyriCOM Gigabit Ethernet
 
 </para></listitem>
 </itemizedlist>
 
-</para><para arch="alpha">
-
-Any network interface card (NIC) supported by the Linux kernel should
-also be supported by the boot disks.  You may need to load your
-network driver as a module.
-
-</para><para arch="powerpc">
-
-Any network interface card (NIC) supported by the Linux kernel should
-also be supported by the boot disks.  You may need to load your
-network driver as a module.
-
-</para><para arch="hppa">
-
-Any network interface card (NIC) supported by the Linux kernel should
-also be supported by the boot disks.  You may need to load your
-network driver as a module.
-
-</para><para arch="ia64">
-
-Any network interface card (NIC) supported by the Linux kernel should
-also be supported by the boot disks.  You may need to load your
-network driver as a module.
-
-</para><para arch="mips">
-
-Any network interface card (NIC) supported by the Linux kernel should
-also be supported by the boot disks.  You may need to load your
-network driver as a module.
-
 </para><para arch="mipsel">
 
 Due to kernel limitations only the onboard network interfaces on
@@ -124,10 +56,7 @@ do not work.
 
 </para><para arch="s390">
 
-Any network interface card (NIC) supported by the Linux kernel is
-also be supported by the boot disks.  All network drivers are compiled
-as modules so you need to load one first during the initial network
-setup. The list of supported network devices is:
+The list of supported network devices is:
 
 <itemizedlist>
  <listitem><para>
@@ -142,11 +71,6 @@ OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)
 </para></listitem>
 <listitem><para>
 
-Inter-User Communication Vehicle (IUCV) &mdash; available for VM guests only
-
-</para></listitem>
-<listitem><para>
-
 OSA-Express in QDIO mode, HiperSockets and Guest-LANs
 
 </para></listitem>
@@ -156,59 +80,124 @@ OSA-Express in QDIO mode, HiperSockets and Guest-LANs
 
 <para arch="arm">
 
-The following network interface cards are supported directly by the
-boot disks on Netwinder and CATS machines:
+On &arch-title;, most built-in Ethernet devices are supported and modules
+for additional PCI and USB devices are provided.  The major exception is
+the IXP4xx platform (featuring devices such as the Linksys NSLU2) which
+needs a proprietary microcode for the operation of its built-in Ethernet
+device.  Unofficial images for Linksys NSLU2 with this proprietary
+microcode can be obtained from the <ulink
+url="&url-slug-firmware;">Slug-Firmware site</ulink>.
 
-<itemizedlist>
- <listitem><para>
+</para><para arch="x86">
 
-    PCI-based NE2000
+As for ISDN, the D-channel protocol for the (old) German 1TR6 is not
+supported; Spellcaster BRI ISDN boards are also not supported by the
+&d-i;. Using ISDN during the installation is not supported.
 
+</para>
 
-</para></listitem>
- <listitem><para>
+  <sect2 arch="not-s390" id="nics-firmware">
+  <title>Drivers Requiring Firmware</title>
+<para>
 
-    DECchip Tulip
+The installation system currently does not support retrieving firmware.
+This means that any network cards that use a driver that requires firmware
+to be loaded, is not supported by default.
 
-</para></listitem>
-</itemizedlist>
+</para><para>
 
-</para><para arch="arm">
+If there is no other NIC you can use during the installation, it is still
+possible to install &debian; using a full CD-ROM or DVD image. Select the
+option to not configure a network and install using only the packages
+available from the CD/DVD. You can then install the driver and firmware you
+need after the installation is completed (after the reboot) and configure
+your network manually. Note that the firmware may be packaged separately
+from the driver and may not be available in the <quote>main</quote> section
+of the &debian; archive.
 
-The following network interface cards are supported directly by the
-boot disks on RiscPCs:
+</para><para>
 
-<itemizedlist>
- <listitem><para>
+If the driver itself <emphasis>is</emphasis> supported, you may also be
+able to use the NIC during installation by copying the firmware from some
+medium to <filename>/usr/lib/hotplug/firmware</filename>. Don't forget to
+also copy the firmware to that location for the installed system before
+the reboot at the end of the installation.
 
-    Ether1
+</para>
+  </sect2>
 
-</para></listitem>
- <listitem><para>
+  <sect2 condition="supports-wireless" id="nics-wireless">
+  <title>Wireless Network Cards</title>
+<para>
 
-    Ether3
+Wireless NICs are in general supported as well, with one big proviso.
+A lot of wireless adapters require drivers that are either non-free or have
+not been accepted into the official Linux kernel. These NICs can generally
+be made to work under &debian;, but are not supported during the installation.
 
-</para></listitem>
- <listitem><para>
+</para><para>
 
-    EtherH
+If there is no other NIC you can use during the installation, it is still
+possible to install &debian; using a full CD-ROM or DVD image. Use the same
+procedure as described above for NICs that require firmware.
 
-</para></listitem>
-</itemizedlist>
+</para><para>
 
-</para><para arch="arm">
+In some cases the driver you need may not be available as a Debian package.
+You will then have to look if there is source code available in the internet
+and compile the driver yourself. How to do this is outside the scope of this
+manual.
+<phrase arch="x86">If no Linux driver is available, your last resort is to
+use the <classname>ndiswrapper</classname> package, which allows you to use
+a Windows driver.</phrase>
 
-If your card is mentioned in the lists above, the complete installation
-can be carried out from the network with no need for CD-ROMs or floppy
-disks.
+</para>
+  </sect2>
 
-</para><para arch="arm">
+  <sect2 arch="sparc" id="nics-sparc-trouble">
+  <title>Known Issues for &arch-title;</title>
+<para>
 
-Any other network interface card (NIC) supported by the Linux kernel
-should also be supported by the boot disks.  You may need to load your
-network driver as a module; this means that you will have to install
-the operating system kernel and modules using some other media.
+There are a couple of issues with specific network cards that are worth
+mentioning here.
 
 </para>
 
+   <sect3><title>Conflict between tulip and dfme drivers</title>
+<!-- BTS: #334104; may also affect other arches, but most common on sparc -->
+<para>
+
+<!-- BTS: #334104; may also affect other arches, but most common on sparc -->
+There are various PCI network cards that have the same PCI identification,
+but are supported by related, but different drivers. Some cards work with
+the <literal>tulip</literal> driver, others with the <literal>dfme</literal>
+driver. Because they have the same identification, the kernel cannot
+distinguish between them and it is not certain which driver will be loaded.
+If this happens to be the wrong one, the NIC may not work, or work badly.
+
+</para><para>
+
+This is a common problem on Netra systems with a Davicom (DEC-Tulip
+compatible) NIC. In that case the <literal>tulip</literal> driver is
+probably the correct one.
+
+During the installation the solution is to switch to a shell and unload the
+wrong driver module using
+<userinput>modprobe -r <replaceable>module</replaceable></userinput> (or
+both, if they are both loaded). After that you can load the correct module
+using <userinput>modprobe <replaceable>module</replaceable></userinput>.
+
+</para>
+   </sect3>
+
+   <sect3><title>Sun B100 blade</title>
+<!-- BTS: #384549; should be checked for kernels >2.6.18 -->
+<para>
+
+The <literal>cassini</literal> network driver does not work with Sun B100
+blade systems.
+
+</para>
+   </sect3>
+  </sect2>
  </sect1>
diff --git a/nl/hardware/supported-peripherals.xml b/nl/hardware/supported-peripherals.xml
index c7af3ee08..1eb8625a4 100644
--- a/nl/hardware/supported-peripherals.xml
+++ b/nl/hardware/supported-peripherals.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43499 untranslated -->
+<!-- original version: 43696 untranslated -->
 
  <sect1 id="supported-peripherals">
  <title>Peripherals and Other Hardware</title>
@@ -13,7 +13,7 @@ devices are not required while installing the system.
 
 USB hardware generally works fine, only some
 USB keyboards may require additional configuration
-(see <xref linkend="usb-keyboard-config"/>).
+(see <xref linkend="hardware-issues"/>).
 
 </para><para arch="x86">
 
diff --git a/nl/hardware/supported/arm.xml b/nl/hardware/supported/arm.xml
index f4293662f..c2ecfa177 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: 43031 untranslated -->
+<!-- original version: 43693 untranslated -->
 
 
   <sect2 arch="arm"><title>CPU, Main Boards, and Video Support</title>
@@ -49,7 +49,8 @@ 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.
+devices: the <ulink url="&url-arm-cyrius-glantank;">GLAN Tank</ulink> from
+IO-Data and the <ulink url="&url-arm-cyrius-n2100;">Thecus N2100</ulink>.
 
 </para></listitem>
 </varlistentry>
@@ -63,7 +64,8 @@ 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
-can be connected.
+can be connected.  There is an external site with <ulink
+url="&url-arm-cyrius-nslu2;">installation instructions</ulink>.
 
 </para></listitem>
 </varlistentry>
diff --git a/nl/install-methods/install-tftp.xml b/nl/install-methods/install-tftp.xml
index ae6b07c48..679a92076 100644
--- a/nl/install-methods/install-tftp.xml
+++ b/nl/install-methods/install-tftp.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43558 untranslated -->
+<!-- original version: 43696 untranslated -->
 
  <sect1 condition="supports-tftp" id="install-tftp">
  <title>Preparing Files for TFTP Net Booting</title>
@@ -296,6 +296,13 @@ uppercase and if necessary append the subarchitecture name.
 
 </para><para>
 
+If you've done all this correctly, giving the command <userinput>boot
+net</userinput> from the OpenPROM should load the image. If the image
+cannot be found, try checking the logs on your tftp server to see which
+image name is being requested.
+
+</para><para>
+
 You can also force some sparc systems to look for a specific file name
 by adding it to the end of the OpenPROM boot command, such as
 <userinput>boot net my-sparc.image</userinput>. This must still reside
diff --git a/nl/post-install/mail-setup.xml b/nl/post-install/mail-setup.xml
new file mode 100644
index 000000000..692befaac
--- /dev/null
+++ b/nl/post-install/mail-setup.xml
@@ -0,0 +1,261 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- original version: 43623 untranslated -->
+
+ <sect1 id="mail-setup">
+ <title>Setting Up Your System To Use E-Mail</title>
+<para>
+
+Today, email is an important part of many people's life. As there are
+many options as to how to set it up, and as having it set up correctly is
+important for some Debian utilities, we will try to cover the basics in
+this section.
+
+</para><para>
+
+There are three main functions that make up an e-mail system. First there is
+the <firstterm>Mail User Agent</firstterm> (MUA) which is the program a user
+actually uses to compose and read mails. Then there is the <firstterm>Mail
+Transfer Agent</firstterm> (MTA) that takes care of transferring messages
+from one computer to another. And last there is the <firstterm>Mail
+Delivery Agent</firstterm> (MDA) that takes care of delivering incoming mail
+to the user's inbox.
+
+</para><para>
+
+These three functions can be performed by separate programs, but they can
+also be combined in one or two programs. It is also possible to have
+different programs handle these functions for different types of mail.
+
+</para><para>
+
+On Linux and Unix systems <command>mutt</command> is historically a very
+popular MUA. Like most traditional Linux programs it is text based. It is
+often used in combination with <command>exim</command> or
+<command>sendmail</command> as MTA and <command>procmail</command> as MDA.
+
+</para><para>
+
+With the increasing popularity of graphical desktop systems, the use of
+graphical e-mail programs like GNOME's <command>evolution</command>,
+KDE's <command>kmail</command> or Mozilla's <command>thunderbird</command>
+(in Debian available as <command>icedove</command><footnote>
+
+<para>
+The reason that <command>thunderbird</command> has been renamed to
+<command>icedove</command> in Debian has to do with licencing issues.
+Details are outside the scope of this manual.
+</para>
+
+</footnote>) is becoming more popular. These programs combine the function
+of a MUA, MTA and MDA, but can &mdash; and often are &mdash; also be used
+in combination with the traditional Linux tools.
+
+</para>
+
+  <sect2 id="mail-default">
+  <title>Default E-Mail Configuration</title>
+<para>
+
+Even if you are planning to use a graphical mail program, it is important
+that a traditional MTA/MDA is also installed and correctly set up on your
+Linux system. Reason is that various utilities running on the
+system<footnote>
+
+<para>
+Examples are: <command>cron</command>, <command>quota</command>,
+<command>logcheck</command>, <command>aide</command>, &hellip;
+</para>
+
+</footnote> can send important notices by e-mail to inform the system
+administrator of (potential) problems or changes.
+
+</para><para>
+
+For this reason the packages <classname>exim4</classname> and
+<classname>mutt</classname> will be installed by default (provided you
+did not unselect the <quote>standard</quote> task during the installation).
+<classname>exim4</classname> is a combination MTA/MDA that is relatively
+small but very flexible. By default it will be configured to only handle
+e-mail local to the system itself and e-mails addressed to the system
+administrator (root account) will be delivered to the regular user account
+created during the installation<footnote>
+
+<para>
+The forwarding of mail for root to the regular user account is configured
+in <filename>/etc/aliases</filename>. If no regular user account was created,
+the mail will of course be delivered to the root account itself.
+</para>
+
+</footnote>.
+
+</para><para>
+
+When system e-mails are delivered they are added to a file in
+<filename>/var/mail/<replaceable>account_name</replaceable></filename>.
+The e-mails can be read using <command>mutt</command>.
+
+</para>
+  </sect2>
+
+  <sect2 id="mail-outgoing">
+  <title>Sending E-Mails Outside The System</title>
+<para>
+
+As mentioned earlier, the installed Debian system is only set up to handle
+e-mail local to the system, not for sending mail to others nor for
+receiving mail from others.
+
+</para><para>
+
+If you would like <classname>exim4</classname> to handle external e-mail,
+please refer to the next subsection for the basic available configuration
+options. Make sure to test that mail can be sent and received correctly.
+
+</para><para>
+
+If you intend to use a graphical mail program and use a mail server of
+your Internet Service Provider (ISP) or your company, there is not really
+any need to configure <classname>exim4</classname> for handling external
+e-mail. Just configure your favorite graphical mail program to use the
+correct servers to send and receive e-mail (how is outside the scope of
+this manual).
+
+</para><para>
+
+However, in that case you may need to configure individual utilities to
+correctly send e-mails. One such utility is <command>reportbug</command>,
+a program that facilitates submitting bug reports against Debian packages.
+By default it expects to be able to use <classname>exim4</classname> to
+submit bug reports.
+
+</para><para>
+
+To correctly set up <command>reportbug</command> to use an external mail
+server, please run the command <command>reportbug --configure</command>
+and answer <quote>no</quote> to the question if an MTA is available. You
+will then be asked for the SMTP server to be used for submitting bug reports.
+
+</para>
+  </sect2>
+
+  <sect2 id="config-mta">
+  <title>Configuring the Exim4 Mail Transport Agent</title>
+<para>
+
+If you would like your system to also handle external e-mail, you will
+need to reconfigure the <classname>exim4</classname> package<footnote>
+
+<para>
+You can of course also remove <classname>exim4</classname> and replace
+it with an alternative MTA/MDA.
+</para>
+
+</footnote>:
+
+<informalexample><screen>
+# dpkg-reconfigure exim4-config
+</screen></informalexample>
+
+</para><para>
+
+After entering that command (as root), you will be asked if you want split
+the configuration into small files. If you are unsure, select the default
+option.
+
+</para><para>
+
+Next you will be presented with several common mail scenarios. Choose the
+one that most closely resembles your needs.
+
+</para>
+
+<variablelist>
+<varlistentry>
+<term>internet site</term>
+<listitem><para>
+
+Your system is connected to a network and your mail is sent and
+received directly using SMTP. On the following screens you will be
+asked a few basic questions, like your machine's mail name, or a list of
+domains for which you accept or relay mail.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>mail sent by smarthost</term>
+<listitem><para>
+
+In this scenario your outgoing mail is forwarded to another machine,
+called a <quote>smarthost</quote>, which does the actual job for
+you. The smarthost also usually stores incoming mail addressed to your
+computer, so you don't need to be permanently online. That also means
+you have to download your mail from the smarthost via programs like
+fetchmail.
+
+</para><para>
+
+In a lot of cases the smarthost will be your ISP's mail server, which
+makes this option very suitable for dial-up users. It can also be a
+company mail server, or even another system on your own network.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>mail sent by smarthost; no local mail</term>
+<listitem><para>
+
+This option is basically the same as the previous one except that the
+system will not be set up to handle mail for a local e-mail domain. Mail
+on the system itself (e.g. for the system administrator) will still be
+handled.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>local delivery only</term>
+<listitem><para>
+
+This is the option your system is configured for by default.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>no configuration at this time</term>
+<listitem><para>
+
+Choose this if you are absolutely convinced you know what you are
+doing. This will leave you with an unconfigured mail system &mdash;
+until you configure it, you won't be able to send or receive any mail
+and you may miss some important messages from your system utilities.
+
+</para></listitem>
+</varlistentry>
+</variablelist>
+
+<para>
+
+If none of these scenarios suits your needs, or if you need a finer
+grained setup, you will need to edit configuration files under the
+<filename>/etc/exim4</filename> directory after the installation is
+complete. More information about <classname>exim4</classname> may be
+found under <filename>/usr/share/doc/exim4</filename>; the file
+<filename>README.Debian.gz</filename> has additional details about
+configuring <classname>exim4</classname>.
+
+</para><para>
+
+Note that sending mail directly to the Internet when you don't have an
+official domain name, can result in your mail being rejected because of
+anti-spam measures on receiving servers. Using your ISP's mail server is
+preferred. If you still do want to send out mail directly, you may want to
+use a different e-mail address than is generated by default. If you use
+<classname>exim4</classname> as your MTA, this is possible by adding an
+entry in <filename>/etc/email-addresses</filename>.
+
+</para>
+  </sect2>
+ </sect1>
diff --git a/nl/post-install/post-install.xml b/nl/post-install/post-install.xml
index f5c27249c..95eca7933 100644
--- a/nl/post-install/post-install.xml
+++ b/nl/post-install/post-install.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43579 untranslated -->
+<!-- original version: 43623 untranslated -->
 
 <chapter id="post-install">
  <title>Next Steps and Where to Go From Here</title>
@@ -8,6 +8,7 @@
 &new-to-unix.xml;
 &orientation.xml;
 &further-reading.xml;
+&mail-setup.xml;
 &kernel-baking.xml;
 &rescue.xml;
 
diff --git a/nl/preparing/bios-setup/s390.xml b/nl/preparing/bios-setup/s390.xml
index 4ab07415f..b1f58eedf 100644
--- a/nl/preparing/bios-setup/s390.xml
+++ b/nl/preparing/bios-setup/s390.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43576 untranslated -->
+<!-- original version: 43655 untranslated -->
 
 
   <sect2 arch="s390"><title>BIOS Setup</title>
@@ -33,8 +33,8 @@ about the whole process, e.g. how to prepare an installation medium
 and how actually to boot from that medium.  Duplicating that information
 here is neither possible nor necessary.  However, we will describe
 here which kind of Debian-specific data is needed and where to find it.
-Using both sources of information you have to prepare your machine
-and the installation medium do you can perform a boot from it.
+Using both sources of information, you have to prepare your machine
+and the installation medium before you can perform a boot from it.
 When you see the welcome message in your client session, return to this
 document to go through the Debian-specific installation steps.
 
diff --git a/nl/preparing/bios-setup/sparc.xml b/nl/preparing/bios-setup/sparc.xml
index e10786eb6..22b4c13f6 100644
--- a/nl/preparing/bios-setup/sparc.xml
+++ b/nl/preparing/bios-setup/sparc.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36732 untranslated -->
+<!-- original version: 43641 untranslated -->
 
 
   <sect2 arch="sparc" id="invoking-openboot"><title>Invoking OpenBoot</title>
@@ -55,14 +55,14 @@ Typically, with newer revisions, you can use OpenBoot devices such as
 meanings; the <quote>net</quote> device is for booting from the network.
 Additionally, the device name can specify a particular partition of a disk,
 such as <quote>disk2:a</quote> to boot disk2, first partition.  Full
-OpenBoot device names have the form
+OpenBoot device names have the form:
 
 <informalexample>
 <screen>
 <replaceable>driver-name</replaceable>@
 <replaceable>unit-address</replaceable>:
 <replaceable>device-arguments</replaceable>
-</screen></informalexample>.
+</screen></informalexample>
 
 In older revisions of OpenBoot, device naming is a bit different: the
 floppy device is called <quote>/fd</quote>, and SCSI disk devices are of
diff --git a/nl/using-d-i/modules/choose-mirror.xml b/nl/using-d-i/modules/choose-mirror.xml
index 746804ecd..01a36f47c 100644
--- a/nl/using-d-i/modules/choose-mirror.xml
+++ b/nl/using-d-i/modules/choose-mirror.xml
@@ -1,17 +1,23 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 16990 untranslated -->
+<!-- original version: 43658 untranslated -->
 
 <!--
+Hmm. This really does need documenting :-/
+
 - Component is only selected and executed if the installer needs to load
   installer components or the base system from the network
   (either local or the internet).
 - This means you first have to configure a network interface.
+- Mirror selection is delayed until apt-setup for CD-based installs (except
+  businesscard)
 - A list of countries is displayed with the default based on the country you
   selected earlier.
-- Note that not all mirrors are equal (see http://www.nl.debian.org/mirror/list)
 - Selection of a local mirror (at top of the list: manual selection).
 - After selecting a country, a list of mirrors in the country will be shown.
+  (not for ftp)
+- Forcing to ftp can be done using "protocol=ftp"
+- Note that not all mirrors are equal (see http://www.nl.debian.org/mirror/list)
 
 - The selected mirror will be tested.
 - How to handle problems with mirrors.
--->
\ No newline at end of file
+-->