Update of original English docs

11 files changed, 174 insertions, 161 deletions

diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index 39dea00c4..cfd607830 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 42982 untranslated -->
+<!-- original version: 43525 untranslated -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -311,7 +311,18 @@ 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
+will need to prepend the <firstterm>owner</firstterm><footnote>
+
+<para>
+The owner of a debconf variable (or template) is normally the name of the
+package that contains the corresponding debconf template. For variables
+used in the installer itself the owner is <quote>d-i</quote>.
+Templates and variables can have more than one owner which helps to
+determine whether they can be removed from the debconf database if the
+package is purged.
+</para>
+
+</footnote> 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
@@ -382,12 +393,12 @@ setup, it would result in the preseed file being retrieved from
 
 </para><para>
 
-The path segment of that comes from
-<literal>auto-install/defaultroot</literal>, which includes the
-directory <literal>etch</literal> by default to allow future versions
-to specify their own codename to let people migrate forwards in a
+The last part of that url (<literal>d-i/etch/./preseed.cfg</literal>)
+is taken from <literal>auto-install/defaultroot</literal>. By default
+this includes the directory <literal>etch</literal> to allow future versions
+to specify their own codename and let people migrate forwards in a
 controlled manner.  The <literal>/./</literal> bit is used to indicate
-a root relative to which subsequent paths can be anchored (for use in
+a root, relative to which subsequent paths can be anchored (for use in
 preseed/include and preseed/run).  This allows files to be specified
 either as full URLs, paths starting with / that are thus anchored, or
 even paths relative to the location where the last preseed file was
@@ -402,12 +413,12 @@ fetched from
 
 </para><para>
 
-If there is no local DHCP or DNS infrastructure, or if you
-do not want to use the default path to the preseed.cfg, you can still
+If there is no local DHCP or DNS infrastructure, or if you do not want to
+use the default path to <filename>preseed.cfg</filename>, you can still
 use an explicit url, and if you don't use the <literal>/./</literal>
-element it will be anchored to the start of the path (i.e. the third /
-in the URL).  Here is an example that requires minimal support from
-the local network infrastructure:
+element it will be anchored to the start of the path (i.e. the third
+<literal>/</literal> in the URL).  Here is an example that requires minimal
+support from the local network infrastructure:
 
 <informalexample><screen>
 auto url=<replaceable>http://192.168.1.2/path/to/mypreseed.file</replaceable>
@@ -432,8 +443,8 @@ path is added.
 
 In addition to specifying the url, you can also specify settings that
 do not directly affect the behavior of &d-i; itself, but can be passed
-through to any scripts that might be specified <literal>preseed/run</literal>
-settings in the loaded preseed file.  At present, the only example of
+through to scripts specified using <literal>preseed/run</literal>
+in the loaded preseed file.  At present, the only example of
 this is <literal>auto-install/classes</literal>, which has an alias
 <literal>classes</literal>.  This can be used thus:
 
@@ -1392,9 +1403,10 @@ settings for certain configurations in other files.
 
 # Most flexibly of all, this downloads a program and runs it. The program
 # can use commands such as debconf-set to manipulate the debconf database.
+# More than one script can be listed, separated by spaces.
 # Note that if the filenames are relative, they are taken from the same
 # directory as the preconfiguration file that runs them.
-d-i preseed/run string foo.sh
+#d-i preseed/run string foo.sh
 </screen></informalexample>
 
 <para>
diff --git a/nl/boot-installer/ia64.xml b/nl/boot-installer/ia64.xml
index 9afc8b61e..c42fee170 100644
--- a/nl/boot-installer/ia64.xml
+++ b/nl/boot-installer/ia64.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 43255 untranslated -->
 
   <sect2 arch="ia64"><title>Booting from a CD-ROM</title>
 
@@ -337,7 +337,7 @@ set up the language locale, network, and disk partitions.
   <sect2 arch="ia64" id="boot-tftp"><title>Booting with TFTP</title>
 
 <para>
-Booting an IA64 system from the network is similar to a CD boot.
+Booting an IA-64 system from the network is similar to a CD boot.
 The only difference is how the installation kernel is loaded.
 The EFI Boot Manager can load and start programs from a server on
 the network.
@@ -352,7 +352,7 @@ rather than the CD drive.
 
 <para>
 
-Network booting an ia64 system requires two architecture-specific actions.
+Network booting an IA-64 system requires two architecture-specific actions.
 On the boot server, DHCP and TFTP must be configured to deliver
 <command>elilo</command>.
 On the client a new boot option must be defined in the EFI boot manager
@@ -364,7 +364,7 @@ to enable loading over a network.
   <title>Configuring the Server</title>
 <para>
 
-A suitable TFTP entry for network booting an ia64 system looks something
+A suitable TFTP entry for network booting an IA-64 system looks something
 like this:
 
 <informalexample><screen>
@@ -457,7 +457,7 @@ Debian Installer.
 </para><para>
 
 Proceed to the next chapter to continue the installation where
-you will set up the language locale, network, and the disk partitions.
+you will set up the language locale, network, and disk partitions.
 
 </para>
   </sect3>
diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index 8d9e43cd6..7e355a7b5 100644
--- a/nl/boot-installer/parameters.xml
+++ b/nl/boot-installer/parameters.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 42982 untranslated -->
+<!-- original version: 43527 untranslated -->
 
  <sect1 id="boot-parms"><title>Boot Parameters</title>
 <para>
@@ -409,7 +409,21 @@ Can be used to set both the language and country for the installation.
 This will only work if the locale is supported in Debian.
 Short form: <userinput>locale</userinput>.
 For example, use <userinput>locale=de_CH</userinput> to select German as
-language and Switserland as country.
+language and Switzerland as country.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term>anna/choose_modules</term>
+<listitem><para>
+
+Can be used to automatically load installer components that are not loaded
+by default. Short form: <userinput>modules</userinput>.
+Examples of optional components that may be useful are
+<classname>openssh-client-udeb</classname> (so you can use
+<command>scp</command> during the installation) and
+<classname>ppp-udeb</classname> (which supports PPPoE configuration).
 
 </para></listitem>
 </varlistentry>
diff --git a/nl/boot-installer/trouble.xml b/nl/boot-installer/trouble.xml
index 492632fbf..3a715fc89 100644
--- a/nl/boot-installer/trouble.xml
+++ b/nl/boot-installer/trouble.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43253 untranslated -->
+<!-- original version: 43514 untranslated -->
 
  <sect1 id="boot-troubleshooting">
  <title>Troubleshooting the Installation Process</title>
@@ -159,7 +159,7 @@ Uniform CD-ROM driver Revision: 3.20
 
 If you don't see something like that, chances are the controller your CD-ROM
 is connected to was not recognized or may be not supported at all. If you
-know what driver is needed for the drive, you can try loading it manually
+know what driver is needed for the controller, you can try loading it manually
 using <command>modprobe</command>.
 
   </para></listitem>
@@ -189,11 +189,12 @@ Check if DMA is currently enabled:
 
 <informalexample><screen>
 $ cd /proc/<replaceable>ide</replaceable>/<replaceable>hdc</replaceable>
-$ grep dma settings
+$ grep using_dma settings
 using_dma      1       0       1       rw
 </screen></informalexample>
 
-A <quote>1</quote> means it is enabled. If it is, try disabling it:
+A <quote>1</quote> in the first column after <literal>using_dma</literal>
+means it is enabled. If it is, try disabling it:
 
 <informalexample><screen>
 $ echo -n "using_dma:0" >settings
@@ -409,13 +410,13 @@ custom kernel later (see <xref linkend="kernel-baking"/>).
 
 
   <sect2 id="problem-report">
-  <title>Bug Reporter</title>
+  <title>Reporting Installation Problems</title>
 <para>
 
-If you get through the initial boot phase but cannot complete the
-install, the bug reporter menu choice may be helpful.
+If you get through the initial boot phase but cannot complete the install,
+the menu option <guimenuitem>Save debug logs</guimenuitem> may be helpful.
 It lets you store system error logs and configuration information from the
-installer to a floppy, or download them in a web browser.
+installer to a floppy, or download them using a web browser.
 
 This information may provide clues as to what went wrong and how to
 fix it.  If you are submitting a bug report you may want to attach
@@ -442,6 +443,12 @@ number of hardware configurations.
 
 </para><para>
 
+Note that your installation report will be published in the Debian Bug
+Tracking System (BTS) and forwarded to a public mailing list. Make sure that
+you use an E-Mail address that you do not mind being made public.
+
+</para><para>
+
 If you have a working Debian system, the easiest way to send an installation
 report is to install the installation-report and reportbug packages
 (<command>apt-get install installation-report reportbug</command>) and run
@@ -449,7 +456,7 @@ the command <command>reportbug installation-report</command>.
 
 </para><para>
 
-Please use this template when filling out
+Alternatively you can use this template when filling out
 installation reports, and file the report as a bug report against the
 <classname>installation-reports</classname> pseudo package, by sending it to
 <email>submit@bugs.debian.org</email>.
diff --git a/nl/hardware/hardware-supported.xml b/nl/hardware/hardware-supported.xml
index 9910dc1a7..73366d3b7 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: 43032 untranslated -->
+<!-- original version: 43529 untranslated -->
 
  <sect1 id="hardware-supported">
  <title>Supported Hardware</title>
@@ -49,7 +49,7 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry>AMD64 &amp; Intel EM64t</entry>
+  <entry>AMD64 &amp; Intel EM64T</entry>
   <entry>amd64</entry>
   <entry></entry>
   <entry></entry>
@@ -89,7 +89,7 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry>Intel ia64-based</entry>
+  <entry>Intel IA-64</entry>
   <entry>ia64</entry>
   <entry></entry>
   <entry></entry>
@@ -150,8 +150,8 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry morerows="3">IBM/Motorola PowerPC</entry>
-  <entry morerows="3">powerpc</entry>
+  <entry morerows="2">IBM/Motorola PowerPC</entry>
+  <entry morerows="2">powerpc</entry>
   <entry>CHRP</entry>
   <entry>chrp</entry>
 </row><row>
@@ -160,9 +160,6 @@ variations of each architecture known as <quote>flavors</quote>.
 </row><row>
   <entry>PReP</entry>
   <entry>prep</entry>
-</row><row>
-  <entry>APUS</entry>
-  <entry>apus</entry>
 </row>
 
 <row>
@@ -224,7 +221,7 @@ as well.
 &supported-s390.xml;
 &supported-sparc.xml;
 
-  <sect2 id="gfx" arch="not-s390"><title>Graphics Card</title>
+  <sect2 id="gfx" arch="not-s390"><title>Graphics Card Support</title>
 <para arch="x86">
 
 You should be using a VGA-compatible display interface for the console
@@ -259,6 +256,30 @@ slots and support VGA emulation or Linux framebuffer on a selected range
 of graphics cards.  A <ulink url="&url-bcm91250a-hardware;">compatibility
 listing</ulink> for Broadcom evaluation boards is available.
 
+</para><para arch="sparc">
+
+Most graphics options commonly found on Sparc-based machines are supported.
+X.org graphics drivers are available for sunbw2, suncg14, suncg3, suncg6,
+sunleo and suntcx framebuffers, Creator3D and Elite3D cards (sunffb driver),
+PGX24/PGX64 ATI-based video cards (ati driver), and PermediaII-based cards
+(glint driver). To use an Elite3D card with X.org you additionally need to
+install the <classname>afbinit</classname> package, and read the documentation
+included with it on how to activate the card.
+
+</para><para arch="sparc">
+
+It is not uncommon for a Sparc machine to have two graphics cards in a
+default configuration. In such a case there is a possibility that the
+Linux kernel will not direct its output to the card initially used by the
+firmware. The lack of output on the graphical console may then be mistaken
+for a hang (usually the last message seen on console is 'Booting Linux...').
+One possible solution is to physically remove one of the video cards;
+another option is to disable one of the cards using a kernel boot parameter.
+Also, if graphical output is not required or desired, serial console may be
+used as an alternative. On some systems use of serial console can be
+activated automatically by disconnecting the keyboard before booting the
+system.
+
 </para>
   </sect2>
 
@@ -277,7 +298,7 @@ with GNU/Linux, see the
   <title>Multiple Processors</title>
 <para>
 
-Multi-processor support &mdash; also called <quote>symmetric multi-processing</quote>
+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;
@@ -300,8 +321,8 @@ section of the kernel config.
 
 <para>
 
-Multi-processor support &mdash; also called <quote>symmetric
-multi-processing</quote> or SMP &mdash; is available for this architecture.
+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
 <firstterm>SMP-alternatives</firstterm> support. This means that the kernel
 will detect the number of processors (or processor cores) and will
@@ -319,8 +340,8 @@ is not compiled with SMP support.
   <title>Multiple Processors</title>
 <para>
 
-Multi-processor support &mdash; also called <quote>symmetric
-multi-processing</quote> or SMP &mdash; is available for this architecture.
+Multiprocessor support &mdash; also called <quote>symmetric
+multiprocessing</quote> or SMP &mdash; is available for this architecture.
 However, the standard Debian &release; kernel image does not support
 SMP.  This should not prevent installation, since the standard,
 non-SMP kernel should boot on SMP systems; the kernel will simply use
@@ -342,8 +363,8 @@ section of the kernel config.
   <title>Multiple Processors</title>
 <para>
 
-Multi-processor support &mdash; also called <quote>symmetric
-multi-processing</quote> or SMP &mdash; is available for this architecture,
+Multiprocessor support &mdash; also called <quote>symmetric
+multiprocessing</quote> or SMP &mdash; is available for this architecture,
 and is supported by a precompiled Debian kernel image. Depending on your
 install media, this SMP-capable kernel may or may not be installed by
 default. This should not prevent installation, since the standard,
@@ -356,6 +377,8 @@ In order to take advantage of multiple processors, you should check to see
 if a kernel package that supports SMP is installed, and if not, choose an
 appropriate kernel package.
 
+</para><para>
+
 You can also build your own customized kernel to support SMP. You can find
 a discussion of how to do this in <xref linkend="kernel-baking"/>.  At this
 time (kernel version &kernelversion;) the way you enable SMP is to select
diff --git a/nl/hardware/supported-peripherals.xml b/nl/hardware/supported-peripherals.xml
index a3c33bea6..c7af3ee08 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: 39614 untranslated -->
+<!-- original version: 43499 untranslated -->
 
  <sect1 id="supported-peripherals">
  <title>Peripherals and Other Hardware</title>
@@ -153,37 +153,4 @@ sort of hardware until it is listed as working in the
 
 </para>
 </sect2>
-
-
-  <sect2 id="Parity-RAM">
-  <title>Fake or <quote>Virtual</quote> Parity RAM</title>
-<para>
-
-If you ask for Parity RAM in a computer store, you'll probably get
-<emphasis>virtual parity</emphasis> memory modules instead of
-<emphasis>true parity</emphasis> ones. Virtual parity SIMMs can often
-(but not always) be distinguished because they only have one more chip
-than an equivalent non-parity SIMM, and that one extra chip is smaller
-than all the others. Virtual-parity SIMMs work exactly like non-parity
-memory.  They can't tell you when you have a single-bit RAM error the
-way true-parity SIMMs do in a motherboard that implements
-parity. Don't ever pay more for a virtual-parity SIMM than a
-non-parity one. Do expect to pay a little more for true-parity SIMMs,
-because you are actually buying one extra bit of memory for every 8
-bits.
-
-</para><para>
-
-If you want complete information on &arch-title; RAM issues, and what
-is the best RAM to buy, see the
-<ulink url="&url-pc-hw-faq;">PC Hardware FAQ</ulink>.
-
-</para><para arch="alpha">
-
-Most, if not all, Alpha systems require true-parity RAM.
-
-</para>
-
-  </sect2>
-
  </sect1>
diff --git a/nl/hardware/supported/i386.xml b/nl/hardware/supported/i386.xml
index 975514a48..b21c7d1ba 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: 42036 untranslated -->
+<!-- original version: 43254 untranslated -->
 
 
   <sect2 arch="i386"><title>CPU, Main Boards, and Video Support</title>
@@ -22,7 +22,7 @@ processors like the Athlon XP and Intel P4 Xeon.
 </para>
 <note><para>
 
-If your system has a 64-bit AMD64, Intel EM64t or Intel Core 2 Duo processor,
+If your system has a 64-bit AMD64, Intel EM64T or Intel Core 2 Duo processor,
 you will probably want to use the installer for the amd64 architecture instead
 of the installer for the (32-bit) i386 architecture.
 
diff --git a/nl/hardware/supported/sparc.xml b/nl/hardware/supported/sparc.xml
index d00c6b252..754a221a4 100644
--- a/nl/hardware/supported/sparc.xml
+++ b/nl/hardware/supported/sparc.xml
@@ -1,82 +1,84 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 43528 untranslated -->
 
-
-  <sect2 arch="sparc" id="sparc-cpus"><title>CPU, Main Boards, and Video Support</title>
+  <sect2 arch="sparc" id="sparc-cpus">
+  <title>CPU and Main Boards Support</title>
 <para>
 
-Currently the <emphasis>&architecture;</emphasis> port supports
-several types of Sparc systems. The most common identifiers for Sparc
-systems are sun4, sun4c, sun4m, sun4d and sun4u. Currently we do not
-support very old sun4 hardware. However, the other systems are
-supported. Sun4d has been tested the least of these, so expect
-possible problems with regard to the kernel stability. Sun4c and
-Sun4m, the most common of the older Sparc hardware, includes such
-systems as SparcStation 1, 1+, IPC, IPX and the SparcStation LX, 5,
-10, and 20, respectively. The UltraSPARC class systems fall under the
-sun4u identifier, and are supported using the sun4u set of install
-images. Some systems that fall under these supported identifiers are
-known to not be supported. Known unsupported systems are the AP1000
-multicomputer and the Tadpole Sparcbook 1. See the
-<ulink url="&url-sparc-linux-faq;">Linux for SPARCProcessors FAQ</ulink>
-for complete information.
+Sparc-based hardware is divided into a number of different subarchitectures,
+identified by one of the following names: sun4, sun4c, sun4d, sun4m, sun4u
+or sun4v. The following list describes what machines they include and what
+level of support may be expected for each of them.
 
 </para>
 
-   <sect3><title>Memory Configuration</title>
-<para>
+<variablelist>
+<varlistentry>
+<term>sun4, sun4c, sun4d</term>
 
-Some older Sun workstations, notably the Sun IPX and Sun IPC have
-memory banks located at fixed locations in physical memory.  Thus if
-the banks are not filled gaps will exist in the physical memory space.
-The Linux installation requires a contiguous memory block into which
-to load the kernel and the initial RAMdisk.  If this is not available a
-<quote>Data Access Exception</quote> will result.
+<listitem><para>
 
-</para><para>
+These subarchitectures include some very old 32-bit machines, which are
+no longer supported. For a complete list please consult the
+<ulink url="http://en.wikipedia.org/wiki/SPARCstation">Wikipedia
+SPARCstation page</ulink>.
+
+</para></listitem>
+</varlistentry>
 
-Thus you must configure the memory so that the lowest memory block is
-contiguous for at least 8Mb.  In the IPX and IPC cited above, memory banks
-are mapped in at 16Mb boundaries.  In effect this means that you must have
-a sufficiently large SIMM in bank zero to hold the kernel and RAMdisk.
-In this case 4Mb is <emphasis>not</emphasis> sufficient.
+<varlistentry>
+<term>sun4m</term>
+
+<listitem><para>
+
+sun4m is the only 32-bit subarchitecture (sparc32) that is currently
+supported. The most popular machines belonging to this class are
+Sparcstation 4, 5, 10 and 20.
 
 </para><para>
 
-Example:
-In a Sun IPX you have a 16Mb SIMM and a 4Mb SIMM.  There are four
-SIMM banks (0,1,2,3). [Bank zero is that furthest away from the SBUS
-connectors]. You must therefore install the 16Mb SIMM in bank 0; it is
-then recommended to install the 4Mb SIMM in bank 2.
+Note that symmetric multiprocessing (SMP) &mdash; the ability to run
+processes on multiple processors &mdash; is not supported on this hardware,
+due to stability problems with such configurations. The available
+uniprocessor (UP) sparc32 kernel will boot fine on multiprocessor
+machines, although it will activate and use only the first CPU.
 
-</para>
-   </sect3>
+</para></listitem>
+</varlistentry>
 
-   <sect3><title>Graphics Configuration</title>
-<para>
+<varlistentry>
+<term>sun4u</term>
 
-Especially in the case of older Sun workstations, it is very common
-for there to be an onboard framebuffer which has been superseded (for
-example the bwtwo on a sun IPC), and an SBUS card containing a later
-probably accelerated buffer is then plugged in to an SBUS slot.
-Under Solaris/SunOS this causes no problems because both cards are
-initialized.
+<listitem><para>
 
-</para><para>
+This subarchitecture includes all 64-bit machines (sparc64) based on
+the UltraSparc processor and its clones. Most of the machines are well
+supported, even though for some you may experience problems booting from
+CD due to firmware or bootloader bugs (this problem may be worked around
+by using netbooting). Use the sparc64 or sparc64-smp kernel in UP and SMP
+configurations respectively.
 
-However with Linux this can cause a problem, in that the boot PROM
-monitor may display its output on this additional card; however the
-linux kernel boot messages may then be directed to the original on
-board framebuffer, leaving <emphasis>no</emphasis> error messages on
-the screen, with the machine apparently stuck loading the RAMdisk.
+</para></listitem>
+</varlistentry>
 
-</para><para>
+<varlistentry>
+<term>sun4v</term>
+
+<listitem><para>
+
+This is the newest addition to the Sparc family, which includes machines
+based on the Niagara multi-core CPUs. At the moment such CPUs are only
+available in T1000 and T2000 servers by Sun, and are well supported. Use
+the sparc64-smp kernel.
+
+</para></listitem>
+</varlistentry>
+</variablelist>
+
+<para>
 
-To avoid this problem, connect the monitor (if required) to the video
-card in the lowest numbered SBUS slot (on motherboard card counts
-as below external slots).  Alternatively it is possible to use a serial
-console.
+Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are not
+supported due to lack of support in the Linux kernel.
 
 </para>
-   </sect3>
   </sect2>
diff --git a/nl/partitioning/partition/ia64.xml b/nl/partitioning/partition/ia64.xml
index 4193c7aeb..ecb7b66b3 100644
--- a/nl/partitioning/partition/ia64.xml
+++ b/nl/partitioning/partition/ia64.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39465 untranslated -->
+<!-- original version: 43254 untranslated -->
 
 
   <sect2 arch="ia64"><title>Partitioning for &arch-title;</title>
@@ -18,9 +18,9 @@ on-disk partitioning.
    <title>EFI Recognized Formats</title>
 <para>
 
-The IA64 EFI firmware supports two partition table (or disk label)
+The IA-64 EFI firmware supports two partition table (or disk label)
 formats, GPT and MS-DOS.  MS-DOS, the format typically used on i386
-PCs, is no longer recommended for IA64 systems.  Although
+PCs, is no longer recommended for IA-64 systems.  Although
 the installer also provides <command>cfdisk</command>,
 you should only use <ulink url="parted.txt">
 <command>parted</command></ulink> because only it can manage both GPT
@@ -72,7 +72,7 @@ complete, as it scans the partition for bad blocks.
   <sect2 arch="ia64"><title>Boot Loader Partition Requirements</title>
 <para>
 
-ELILO, the ia64 boot loader, requires a partition containing a FAT
+ELILO, the IA-64 boot loader, requires a partition containing a FAT
 file system with the <userinput>boot</userinput> flag set.
 The partition must be big enough to hold the boot loader and any
 kernels or RAMdisks you may wish to boot.  A minimum size would be
diff --git a/nl/preparing/pre-install-bios-setup.xml b/nl/preparing/pre-install-bios-setup.xml
index cbd70c0db..371ecf5bd 100644
--- a/nl/preparing/pre-install-bios-setup.xml
+++ b/nl/preparing/pre-install-bios-setup.xml
@@ -1,4 +1,4 @@
-<!-- original version: 39614 -->
+<!-- original version: 43514 -->
 
  <sect1 id="pre-install-bios-setup">
  <title>Configuratie van apparatuur en besturingssysteem voor de installatie</title>
@@ -59,17 +59,6 @@ FIXME: more description of this needed.
 
 </para><para arch="x86">
 
-De betere moederborden ondersteunen RAM met pariteitscontrole en kunnen u
-melden als uw systeem een fout van één bit in het geheugen heeft. Helaas
-kunnen ze deze fout niet herstellen en zullen ze over het algemeen stuklopen
-direct na de melding van de geheugenfout. Het is echter nog altijd beter
-om verteld te worden dat er geheugenproblemen zijn dan dat er ongemerkt
-fouten in uw gegevens ontstaan. Daarom beschikken de betere systemen over
-moederborden die geheugenmodules met 'parity' en 'true-parity' ondersteunen;
-zie ook <xref linkend="Parity-RAM"/>.
-
-</para><para arch="x86">
-
 Als u 'true-parity' RAM heeft en als dit door uw moederbord wordt ondersteund,
 activeer dan eventuele BIOS-instellingen die ervoor zorgen dat het moederbord
 een interrupt genereert bij pariteitsfouten in het geheugen.
diff --git a/nl/using-d-i/modules/x86/lilo-installer.xml b/nl/using-d-i/modules/x86/lilo-installer.xml
index ef5ebf805..42e93af59 100644
--- a/nl/using-d-i/modules/x86/lilo-installer.xml
+++ b/nl/using-d-i/modules/x86/lilo-installer.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39622 untranslated -->
+<!-- original version: 43514 untranslated -->
 
   <sect3 arch="x86">
   <title>Install the <command>LILO</command> Boot Loader
@@ -63,8 +63,7 @@ If you can no longer boot into Windows 9x (or DOS) after this step,
 you'll need to use a Windows 9x (MS-DOS) boot disk and use the
 <userinput>fdisk /mbr</userinput> command to reinstall the MS-DOS
 master boot record &mdash; however, this means that you'll need to use
-some other way to get back into Debian! For more information on this
-please read <xref linkend="reactivating-win"/>.
+some other way to get back into Debian!
 
 </para>
   </sect3>