Update of original English docs

4 files changed, 131 insertions, 137 deletions

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>