Update of untranslated documents

15 files changed, 299 insertions, 179 deletions

diff --git a/build/entities/urls.ent b/build/entities/urls.ent
index e07ae3718..3923d1f55 100644
--- a/build/entities/urls.ent
+++ b/build/entities/urls.ent
@@ -75,6 +75,11 @@
 <!-- release area off the Debian web site -->
 <!ENTITY url-release-area "http://&www-debian-org;/releases/&releasename;/">
 
+<!-- location of tarballs with firmware packages -->
+<!ENTITY url-firmware-tarballs "http://cdimage.debian.org/cdimage/unofficial/non-free/firmware/">
+<!-- rough list of firmware packages -->
+<!ENTITY url-firmware-packages "http://packages.debian.org/search?keywords=firmware">
+
 <!-- WNPP -->
 <!ENTITY url-wnpp "http://&www-debian-org;/devel/wnpp/">
 
diff --git a/build/templates/docstruct.ent b/build/templates/docstruct.ent
index 1ffeec923..4606e823f 100644
--- a/build/templates/docstruct.ent
+++ b/build/templates/docstruct.ent
@@ -130,6 +130,7 @@
   <!ENTITY module-user-setup.xml         SYSTEM "##SRCPATH##/using-d-i/modules/user-setup.xml">
   <!ENTITY module-apt-setup.xml          SYSTEM "##SRCPATH##/using-d-i/modules/apt-setup.xml">
   <!ENTITY module-pkgsel.xml             SYSTEM "##SRCPATH##/using-d-i/modules/pkgsel.xml">
+  <!ENTITY loading-firmware.xml          SYSTEM "##SRCPATH##/using-d-i/loading-firmware.xml">
 
   <!ENTITY module-mips-arcboot-installer.xml  SYSTEM "##SRCPATH##/using-d-i/modules/mips/arcboot-installer.xml">
   <!ENTITY module-mipsel-colo-installer.xml  SYSTEM "##SRCPATH##/using-d-i/modules/mipsel/colo-installer.xml">
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 19f5e1328..954639c6d 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -936,9 +936,7 @@ correct one will be selected before using preseeding.
 
 <informalexample role="example"><screen>
 # If the system has free space you can choose to only partition that space.
-# Note: this must be preseeded with a localized (translated) value.
-#d-i partman-auto/init_automatically_partition \
-#      select Guided - use the largest continuous free space
+#d-i partman-auto/init_automatically_partition select biggest_free
 
 # Alternatively, you can specify a disk to partition. The device name must
 # be given in traditional non-devfs format.
@@ -959,13 +957,8 @@ d-i parman-md/device_remove_md boolean true
 d-i partman-lvm/confirm boolean true
 
 # You can choose from any of the predefined partitioning recipes.
-# Note: this must be preseeded with a localized (translated) value.
-d-i partman-auto/choose_recipe \
-       select All files in one partition (recommended for new users)
-#d-i partman-auto/choose_recipe \
-#       select Separate /home partition
-#d-i partman-auto/choose_recipe \
-#       select Separate /home, /usr, /var, and /tmp partitions
+# The standard recipes are: atomic, home and multi
+d-i partman-auto/choose_recipe select atomic
 
 # Or provide a recipe of your own...
 # The recipe format is documented in the file devel/partman-auto-recipe.txt.
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index 027c6bb79..3be2ee004 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -401,3 +401,34 @@ system.
 &supported-peripherals.xml;
 
  </sect1>
+
+ <sect1 arch="not-s390" id="hardware-firmware">
+ <title>Devices Requiring Firmware</title>
+<para>
+
+Besides the availability of a device driver some hardware also requires
+so-called <firstterm>firmware</firstterm> or <firstterm>microcode</firstterm>
+to be loaded into the device before it can become operational. This is most
+common for network interface cards (especially wireless NICs), but for example
+some USB devices and even some hard disk controllers also require firmware.
+
+</para><para>
+
+In most cases firmware is non-free according to the criteria used by the
+&debian; project and thus cannot be included in the main distribution
+or in the installation system. If the device driver itself is included in
+the distribution and if &debian; legally can distribute the firmware,
+it will often be available as a separate package from the non-free section
+of the archive.
+
+</para><para>
+
+However, this does not mean that such hardware cannot be used during an
+installation. Starting with &debian; 5.0 the &d-i; supports loading
+firmware files or packages containing firmware from a removable medium,
+such as a floppy disk or USB stick.
+See <xref linkend="loading-firmware"/> for detailed information on how to
+load firmware files or packages during the installation.
+
+</para>
+ </sect1>
diff --git a/en/hardware/network-cards.xml b/en/hardware/network-cards.xml
index 5e9b1d741..de0968c6a 100644
--- a/en/hardware/network-cards.xml
+++ b/en/hardware/network-cards.xml
@@ -88,43 +88,14 @@ ISDN is supported, but not during the installation.
 
 </para>
 
-  <sect3 arch="not-s390" id="nics-firmware">
-  <title>Drivers Requiring Firmware</title>
-<para>
-
-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><para>
-
-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.
-
-</para><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.
-
-</para>
-  </sect3>
-
   <sect3 condition="supports-wireless" id="nics-wireless">
   <title>Wireless Network Cards</title>
 <para>
 
-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
+Wireless networking is in general supported as well and a growing number of
+wireless adapters is supported by the official Linux kernel, although many
+of them do require firmware to be loaded.
+Wireless NICs that are not supported by the official Linux kernel can generally
 be made to work under &debian;, but are not supported during the installation.
 
 </para><para>
diff --git a/en/using-d-i/components.xml b/en/using-d-i/components.xml
index 58bd8331b..05e99b4ee 100644
--- a/en/using-d-i/components.xml
+++ b/en/using-d-i/components.xml
@@ -37,6 +37,14 @@ at the hardware needed to load installer components (e.g. your CD-ROM or
 network card). As not all drivers may be available during this first run,
 hardware detection needs to be repeated later in the process.
 
+</para><para arch="not-s390">
+
+During hardware detection &d-i; checks if any of the drivers for the hardware
+devices in your system requires firmware to be loaded. If any firmware is
+requested but unavailable, a dialog will be displayed that allows to load the
+missing firmware from a removable medium.
+See <xref linkend="loading-firmware"/> for further details.
+
 </para>
 
 &module-lowmem.xml;
diff --git a/en/using-d-i/loading-firmware.xml b/en/using-d-i/loading-firmware.xml
new file mode 100644
index 000000000..fcced447a
--- /dev/null
+++ b/en/using-d-i/loading-firmware.xml
@@ -0,0 +1,131 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- $Id$ -->
+
+ <sect1 id="loading-firmware" arch="not-s390">
+ <title>Loading Missing Firmware</title>
+<para>
+
+As described in <xref linkend="hardware-firmware"/> some devices require
+firmware to be loaded. In most cases the device will not work at all
+if the firmware is not available; sometimes basic functionality is not
+impaired if it is missing and the firmware is only needed to enable
+additional features.
+
+</para><para>
+
+If a device driver requests firmware that is not available, &d-i; will
+display a dialog offering to load the missing firmware. If that question
+is confirmed, &d-i; will scan available devices for either loose firmware
+files or packages containing firmware. If found, the firmware will be
+copied to the correct location (<filename>/lib/firmware</filename>) and
+the driver module will be reloaded.
+
+</para>
+<note><para>
+
+Which devices are scanned and which file systems are supported depends on
+the architecture, the installation method and the stage of the installation.
+Especially during the early stages of the installation, loading the firmware
+is most likely to succeed from a FAT-formatted floppy disk or USB stick.
+<phrase arch="x86">On i386 and amd64 firmware can also be loaded from an
+MMC or SD card.</phrase>
+
+</para></note>
+<para>
+
+Note that it is possible to skip loading the firmware if you know the
+device will also function without it or if the device is not needed during
+the installation.
+
+</para>
+<warning><para>
+
+Support for loading firmware is still relatively basic and is likely to
+be improved in future releases of the installer. Please report any issues
+you encounter.
+
+</para></warning>
+
+  <sect2><title>Preparing a medium</title>
+<para>
+
+Although in some cases the firmware can also be loaded from a partition on
+a hard disk, the most common method to load firmware will be from some
+removable medium such as a floppy disk or a USB stick.
+The firmware files or packages must be placed in either the root directory
+or a directory named <filename>/firmware</filename> of the file system on
+the medium. The recommended file system to use is FAT as that is most
+certain to be supported during the early stages of the installation.
+
+</para><para>
+
+Tarballs containing current packages for the most common firmware are
+available from:
+
+<itemizedlist>
+<listitem><para>
+<ulink url="&url-firmware-tarballs;"/>
+</para></listitem>
+</itemizedlist>
+
+Just download the tarball for the correct release and unpack it to the file
+system on the medium.
+
+</para><para>
+
+If the firmware you need is not included in the tarball, you can also
+download specific firmware packages from the (non-free section of the)
+archive. The following overview should list most available firmware
+packages but is not guaranteed to be complete and may also contain
+non-firmware packages:
+
+<itemizedlist>
+<listitem><para>
+<ulink url="&url-firmware-packages;"/>
+</para></listitem>
+</itemizedlist>
+
+</para><para>
+
+It is also possible to copy individual firmware files to the medium. Loose
+firmware could be obtained for example from an already installed system or
+from a hardware vendor.
+
+</para>
+  </sect2>
+
+  <sect2><title>Firmware and the Installed System</title>
+<para>
+
+Any firmware loaded during the installation will be copied automatically
+to the installed system. In most cases this will ensure that the device
+that requires the firmware will also work correctly after the system is
+rebooted into the installed system. However, if the installed system runs
+a different kernel version from the installer there is a slight chance that
+the firmware cannot be loaded due to version skew.
+
+</para><para>
+
+If the firmware was loaded from a firmware package, &d-i; will also install
+this package for the installed system and will automatically add the non-free
+section of the package archive in APT's <filename>sources.list</filename>.
+This has the advantage that the firmware should be updated automatically if
+new a version becomes available.
+
+</para><para>
+
+If loading the firmware was skipped during the installation, the relevant
+device will probably not work with the installed system until the firmware
+(package) is installed manually.
+
+</para>
+<note><para>
+
+If the firmware was loaded from loose firmware files, the firmware copied to
+the installed system will <emphasis>not</emphasis> be automatically updated
+unless the corresponding firmware package (if available) is installed after
+the installation is completed.
+
+</para></note>
+  </sect2>
+ </sect1>
diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml
index 83db3f03c..03ac89cfe 100644
--- a/en/using-d-i/using-d-i.xml
+++ b/en/using-d-i/using-d-i.xml
@@ -387,6 +387,7 @@ report installer software problems to Debian developers later.
  </sect1>
 
 &using-d-i-components.xml;
+&loading-firmware.xml;
 
 </chapter>
 
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index 9287190ed..96c2ec24a 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 56148 untranslated -->
+<!-- original version: 56250 untranslated -->
 
 <!--
 Be careful with the format of this file as it is parsed to generate
@@ -936,9 +936,7 @@ correct one will be selected before using preseeding.
 
 <informalexample role="example"><screen>
 # If the system has free space you can choose to only partition that space.
-# Note: this must be preseeded with a localized (translated) value.
-#d-i partman-auto/init_automatically_partition \
-#      select Guided - use the largest continuous free space
+#d-i partman-auto/init_automatically_partition select biggest_free
 
 # Alternatively, you can specify a disk to partition. The device name must
 # be given in traditional non-devfs format.
@@ -959,13 +957,8 @@ d-i parman-md/device_remove_md boolean true
 d-i partman-lvm/confirm boolean true
 
 # You can choose from any of the predefined partitioning recipes.
-# Note: this must be preseeded with a localized (translated) value.
-d-i partman-auto/choose_recipe \
-       select All files in one partition (recommended for new users)
-#d-i partman-auto/choose_recipe \
-#       select Separate /home partition
-#d-i partman-auto/choose_recipe \
-#       select Separate /home, /usr, /var, and /tmp partitions
+# The standard recipes are: atomic, home and multi
+d-i partman-auto/choose_recipe select atomic
 
 # Or provide a recipe of your own...
 # The recipe format is documented in the file devel/partman-auto-recipe.txt.
@@ -1017,18 +1010,12 @@ used in the array; see <xref linkend="preseed-bootloader"/>.
 
 <warning><para>
 
-This type of automated partitioning is easy to get wrong. It is also a
-very new component that may still have some bugs or missing error
-handling. The responsibility to get the various recipes right (so they
+This type of automated partitioning is easy to get wrong. It is also
+functionality that receives relatively little testing from the developers
+of &d-i;. The responsibility to get the various recipes right (so they
 make sense and don't conflict) lies with the user.
 Check <filename>/var/log/syslog</filename> if you run into problems.
 
-</para><para>
-
-Note that only RAID 0 and RAID 1 have been tested by the developers of the
-component. RAID 5 is untested. Advanced RAID setup with degraded arrays or
-spare devices has only been tested lightly.
-
 </para></warning>
 
 <informalexample><screen>
@@ -1361,41 +1348,6 @@ d-i finish-install/reboot_in_progress note
 
   </sect2>
 
-  <sect2 id="preseed-X">
-  <title>X configuration</title>
-<para>
-
-Preseeding Debian's X config is possible, but you probably need to know
-some details about the video hardware of the machine, since Debian's X
-configurator does not do fully automatic configuration of everything.
-
-</para>
-
-<informalexample role="example"><screen>
-# X can detect the right driver for some cards, but if you're preseeding,
-# you override whatever it chooses. Still, vesa will work most places.
-#xserver-xorg xserver-xorg/config/device/driver select vesa
-
-# A caveat with mouse autodetection is that if it fails, X will retry it
-# over and over. So if it's preseeded to be done, there is a possibility of
-# an infinite loop if the mouse is not autodetected.
-#xserver-xorg xserver-xorg/autodetect_mouse boolean true
-
-# Monitor autodetection is recommended.
-xserver-xorg xserver-xorg/autodetect_monitor boolean true
-# Uncomment if you have an LCD display.
-#xserver-xorg xserver-xorg/config/monitor/lcd boolean true
-# X has three configuration paths for the monitor. Here's how to preseed
-# the "medium" path, which is always available. The "simple" path may not
-# be available, and the "advanced" path asks too many questions.
-xserver-xorg xserver-xorg/config/monitor/selection-method \
-       select medium
-xserver-xorg xserver-xorg/config/monitor/mode-list \
-       select 1024x768 @ 60 Hz
-</screen></informalexample>
-
-  </sect2>
-
   <sect2 id="preseed-other">
   <title>Preseeding other packages</title>
 
diff --git a/nl/boot-installer/powerpc.xml b/nl/boot-installer/powerpc.xml
index f18e4b809..585ccb984 100644
--- a/nl/boot-installer/powerpc.xml
+++ b/nl/boot-installer/powerpc.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 54017 untranslated -->
+<!-- original version: 56248 untranslated -->
 
   <sect2 arch="powerpc" id="boot-cd"><title>Booting from a CD-ROM</title>
 
@@ -44,6 +44,7 @@ CD at the OF prompt, such as
 
 &boot-installer-intro-hd.xml;
 
+<!--
   <sect3><title>Booting CHRP from OpenFirmware</title>
 
 <para>
@@ -52,6 +53,7 @@ CD at the OF prompt, such as
 
 </para>
    </sect3>
+-->
 
    <sect3><title>Booting OldWorld PowerMacs from MacOS</title>
 <para>
diff --git a/nl/boot-installer/trouble.xml b/nl/boot-installer/trouble.xml
index 2688bf46f..239b4228a 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: 53732 untranslated -->
+<!-- original version: 56251 untranslated -->
 
  <sect1 id="boot-troubleshooting">
  <title>Troubleshooting the Installation Process</title>
@@ -321,11 +321,29 @@ disables this test.
 
 </para><para>
 
+Some systems (especially laptops) that have a native resolution that is not
+a 4:3 ratio (i.e. not for example 800x600 or 1024x768) may have a blank
+display after the installer has been booted. In that case adding the boot
+parameter <userinput>vga=788</userinput><footnote>
+
+<para>
+The parameter <userinput>vga=788</userinput> will activate the VESA
+framebuffer with a resolution of 800x600. This will probably work, but may
+not be the optimal resolution for your system. A list of supported
+resulutions can be obtained by using <userinput>vga=ask</userinput>, but
+you should be aware that list may not be complete.
+</para>
+
+</footnote> may help. If that does not work,
+try adding the boot parameter <userinput>fb=false</userinput>.
+
+</para><para>
+
 If your screen begins to show a weird picture while the kernel boots,
 eg. pure white, pure black or colored pixel garbage, your system may
 contain a problematic video card which does not switch to the
 framebuffer mode properly.  Then you can use the boot parameter
-<userinput>fb=false video=vga16:off</userinput> to disable the framebuffer
+<userinput>fb=false</userinput> to disable the framebuffer
 console. Only a reduced set of
 languages will be available during the installation due to limited
 console features. See <xref linkend="boot-parms"/> for details.
diff --git a/nl/hardware/hardware-supported.xml b/nl/hardware/hardware-supported.xml
index eebd7ec51..52a8e7d1a 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: 56244 untranslated -->
+<!-- original version: 56248 untranslated -->
 
  <sect1 id="hardware-supported">
  <title>Supported Hardware</title>
@@ -26,7 +26,7 @@ information can be found.
   <sect2><title>Supported Architectures</title>
 <para>
 
-Debian &release; supports twelve major architectures and several
+Debian &release; supports eleven major architectures and several
 variations of each architecture known as <quote>flavors</quote>.
 
 </para><para>
@@ -64,10 +64,14 @@ variations of each architecture known as <quote>flavors</quote>.
 
 <row>
   <entry morerows="4">ARM</entry>
-  <entry morerows="4">arm</entry>
+  <entry morerows="1">arm</entry>
   <entry>Netwinder and CATS</entry>
   <entry>netwinder</entry>
 </row><row>
+  <entry>Versatile</entry>
+  <entry>versatile</entry>
+</row><row>
+  <entry morerows="2">arm and armel</entry>
   <entry>Intel IOP32x</entry>
   <entry>iop32x</entry>
 </row><row>
@@ -76,9 +80,6 @@ variations of each architecture known as <quote>flavors</quote>.
 </row><row>
   <entry>Marvell Orion</entry>
   <entry>orion5x</entry>
-</row><row>
-  <entry>Versatile</entry>
-  <entry>versatile</entry>
 </row>
 
 <row>
@@ -139,32 +140,29 @@ variations of each architecture known as <quote>flavors</quote>.
   <entry>sb1a-bcm91480b</entry>
 </row>
 
-<row>
+<row arch="m68k">
   <entry morerows="5">Motorola 680x0</entry>
   <entry morerows="5">m68k</entry>
   <entry>Atari</entry>
   <entry>atari</entry>
-</row><row>
+</row><row arch="m68k">
   <entry>Amiga</entry>
   <entry>amiga</entry>
-</row><row>
+</row><row arch="m68k">
   <entry>68k Macintosh</entry>
   <entry>mac</entry>
-</row><row>
+</row><row arch="m68k">
   <entry morerows="2">VME</entry>
   <entry>bvme6000</entry>
-</row><row>
+</row><row arch="m68k">
   <entry>mvme147</entry>
-</row><row>
+</row><row arch="m68k">
   <entry>mvme16x</entry>
 </row>
 
 <row>
-  <entry morerows="2">IBM/Motorola PowerPC</entry>
-  <entry morerows="2">powerpc</entry>
-  <entry>CHRP</entry>
-  <entry>chrp</entry>
-</row><row>
+  <entry morerows="1">IBM/Motorola PowerPC</entry>
+  <entry morerows="1">powerpc</entry>
   <entry>PowerMac</entry>
   <entry>pmac</entry>
 </row><row>
@@ -234,10 +232,11 @@ as well.
   <sect2 arch="x86" id="laptops"><title>Laptops</title>
 <para>
 
-Laptops are also supported.  Laptops are often specialized or contain
-proprietary hardware.  To see if your particular laptop works well
-with GNU/Linux, see the
-<ulink url="&url-x86-laptop;">Linux Laptop pages</ulink>
+Laptops are also supported and nowadays most laptops work out of the box.
+In case a laptop contains specialized or proprietary hardware, some specific
+functions may not be supported.  To see if your particular laptop works well
+with GNU/Linux, see for example the
+<ulink url="&url-x86-laptop;">Linux Laptop pages</ulink>.
 
 </para>
    </sect2>
@@ -248,9 +247,10 @@ with GNU/Linux, see the
 
 Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</quote>
 or SMP &mdash; is available for this architecture.  The standard Debian
-&release; kernel image was compiled with SMP support.  This should not
-prevent installation, since the SMP kernel should boot on non-SMP systems;
-the kernel will simply cause a bit more overhead.
+&release; kernel image has been compiled with SMP support.  The standard
+kernel is also usable on non-SMP systems, but has a slight overhead which
+will cause a small reduction in performance. For normal system use this
+will hardly be noticable.
 
 </para><para>
 
@@ -271,7 +271,7 @@ section of the kernel config.
 
 Multiprocessor support &mdash; also called <quote>symmetric
 multiprocessing</quote> or SMP &mdash; is available for this architecture.
-The standard Debian &release; kernel image was compiled with
+The standard Debian &release; kernel image has been compiled with
 <firstterm>SMP-alternatives</firstterm> support. This means that the kernel
 will detect the number of processors (or processor cores) and will
 automatically deactivate SMP on uniprocessor systems.
@@ -401,3 +401,34 @@ system.
 &supported-peripherals.xml;
 
  </sect1>
+
+ <sect1 arch="not-s390" id="hardware-firmware">
+ <title>Devices Requiring Firmware</title>
+<para>
+
+Besides the availability of a device driver some hardware also requires
+so-called <firstterm>firmware</firstterm> or <firstterm>microcode</firstterm>
+to be loaded into the device before it can become operational. This is most
+common for network interface cards (especially wireless NICs), but for example
+some USB devices and even some hard disk controllers also require firmware.
+
+</para><para>
+
+In most cases firmware is non-free according to the criteria used by the
+&debian; project and thus cannot be included in the main distribution
+or in the installation system. If the device driver itself is included in
+the distribution and if &debian; legally can distribute the firmware,
+it will often be available as a separate package from the non-free section
+of the archive.
+
+</para><para>
+
+However, this does not mean that such hardware cannot be used during an
+installation. Starting with &debian; 5.0 the &d-i; supports loading
+firmware files or packages containing firmware from a removable medium,
+such as a floppy disk or USB stick.
+See <xref linkend="loading-firmware"/> for detailed information on how to
+load firmware files or packages during the installation.
+
+</para>
+ </sect1>
diff --git a/nl/hardware/network-cards.xml b/nl/hardware/network-cards.xml
index f394568b4..fc87ed772 100644
--- a/nl/hardware/network-cards.xml
+++ b/nl/hardware/network-cards.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 56244 untranslated -->
+<!-- original version: 56248 untranslated -->
 
  <sect2 id="network-cards">
  <title>Network Connectivity Hardware</title>
@@ -84,53 +84,25 @@ url="&url-slug-firmware;">Slug-Firmware site</ulink>.
 
 </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;. Using ISDN during the installation is not supported.
+ISDN is supported, but not during the installation.
 
 </para>
 
-  <sect3 arch="not-s390" id="nics-firmware">
-  <title>Drivers Requiring Firmware</title>
-<para>
-
-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><para>
-
-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.
-
-</para><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.
-
-</para>
-  </sect3>
-
   <sect3 condition="supports-wireless" id="nics-wireless">
   <title>Wireless Network Cards</title>
 <para>
 
-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
+Wireless networking is in general supported as well and a growing number of
+wireless adapters is supported by the official Linux kernel, although many
+of them do require firmware to be loaded.
+Wireless NICs that are not supported by the official Linux kernel can generally
 be made to work under &debian;, but are not supported during the installation.
 
 </para><para>
 
+The use of wireless networking during installation is still under development
+and whether it will work depends on the type of adaptor and the configuration
+of your wireless access point.
 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.
diff --git a/nl/hardware/supported/i386.xml b/nl/hardware/supported/i386.xml
index 69bfbe36b..29bc3ce20 100644
--- a/nl/hardware/supported/i386.xml
+++ b/nl/hardware/supported/i386.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 56149 untranslated -->
+<!-- original version: 56248 untranslated -->
 
 
   <sect2 arch="i386"><title>CPU, Main Boards, and Video Support</title>
@@ -19,15 +19,7 @@ are supported, including all varieties of Intel's "Pentium" series.
 This also includes 32-bit AMD and VIA (former Cyrix) processors, and
 processors like the Athlon XP and Intel P4 Xeon.
 
-</para>
-<note><para>
-
-If your system has a 64-bit processor from the AMD64 or Intel EM64T families,
-you will probably want to use the installer for the amd64 architecture instead
-of the installer for the (32-bit) i386 architecture.
-
-</para></note>
-<para>
+</para><para>
 
 However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run
 on 386 or earlier processors.  Despite the architecture name "i386", support
@@ -59,9 +51,14 @@ be easily used by most Debian packages; now they can.
 
 </footnote>.
 
-</para><para>
-
 </para>
+<note><para>
+
+If your system has a 64-bit processor from the AMD64 or Intel EM64T families,
+you will probably want to use the installer for the amd64 architecture instead
+of the installer for the (32-bit) i386 architecture.
+
+</para></note>
    </sect3>
 
    <sect3 id="bus"><title>I/O Bus</title>
diff --git a/nl/hardware/supported/powerpc.xml b/nl/hardware/supported/powerpc.xml
index 4074149d4..c8527ff45 100644
--- a/nl/hardware/supported/powerpc.xml
+++ b/nl/hardware/supported/powerpc.xml
@@ -1,10 +1,14 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 38791 untranslated -->
+<!-- original version: 56248 untranslated -->
 
 
   <sect2 arch="powerpc"><title>CPU, Main Boards, and Video Support</title>
 <para>
 
+For &debian; &release; only the PMac (Power-Macintosh or PowerMac) and PreP
+subarchitectures are supported.
+
+<!--
 There are four major supported <emphasis>&architecture;</emphasis>
 subarchitectures: PMac (Power-Macintosh or PowerMac), PReP, APUS (Amiga 
 Power-UP System), and CHRP machines. Each subarchitecture has its own boot
@@ -16,6 +20,7 @@ supporting different CPU variants.
 Ports to other <emphasis>&architecture;</emphasis> architectures, such
 as the Be-Box and MBX architecture, are underway but not yet supported
 by Debian. We may have a 64-bit port in the future.
+-->
 
 </para>
 
@@ -23,7 +28,7 @@ by Debian. We may have a 64-bit port in the future.
 
 <para>
 
-There are four flavours of the powerpc kernel in Debian, based on the
+There are two flavours of the powerpc kernel in Debian, based on the
 CPU type:
 
 <variablelist>
@@ -63,6 +68,7 @@ POWER4 architecture, and use this kernel flavour.
 </para></listitem>
 </varlistentry>
 
+<!--
 <varlistentry>
 <term>prep</term>
 <listitem><para>
@@ -81,6 +87,7 @@ currently disabled.
 
 </para></listitem>
 </varlistentry>
+-->
 </variablelist>
 
 </para>
@@ -297,7 +304,7 @@ and, for older hardware,
 
    </sect3>
 
-   <sect3><title>CHRP subarchitecture</title>
+   <sect3><title>CHRP subarchitecture (unsupported)</title>
 
 <para>
 
@@ -326,7 +333,7 @@ and, for older hardware,
 
    </sect3>
 
-   <sect3><title>APUS subarchitecture</title>
+   <sect3><title>APUS subarchitecture (unsupported)</title>
 
 <para>