Update of Dutch translation

18 files changed, 294 insertions, 200 deletions

diff --git a/nl/appendix/files.xml b/nl/appendix/files.xml
index 481a28aec..ea39f0903 100644
--- a/nl/appendix/files.xml
+++ b/nl/appendix/files.xml
@@ -1,18 +1,18 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39463 untranslated -->
+<!-- original version: 39551 untranslated -->
 
 
  <sect1 id="linuxdevices"><title>Linux Devices</title>
 <para>
 
-In Linux you have various special files in
-<filename>/dev</filename>. These files are called device files. In
-the Unix world accessing hardware is different.  There you have a
-special file which actually runs a driver which in turn accesses the
-hardware. The device file is an interface to the actual system
-component. Files under <filename>/dev</filename> also behave
-differently than ordinary files. Below are the most important device
-files listed.
+In Linux various special files can be found under the directory
+<filename>/dev</filename>. These files are called device files and
+behave unlike ordinary files. The most common types of device files
+are for block devices and character devices. These files are an
+interface to the actual driver (part of the Linux kernel) which in
+turn accesses the hardware. Another, less common, type of device file
+is the named <firstterm>pipe</firstterm>.
+The most important device files are listed in the tables below.
 
 </para><para>
 
@@ -106,7 +106,7 @@ files listed.
 <informaltable><tgroup cols="2"><tbody>
 <row>
   <entry><filename>null</filename></entry>
-  <entry>Everything pointed to this device will disappear</entry>
+  <entry>Anything written to this device will disappear</entry>
 </row><row>
   <entry><filename>zero</filename></entry>
   <entry>One can endlessly read zeros out of this device</entry>
diff --git a/nl/appendix/plip.xml b/nl/appendix/plip.xml
index 9c1532cba..a6b5361ba 100644
--- a/nl/appendix/plip.xml
+++ b/nl/appendix/plip.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 untranslated -->
+<!-- original version: 39644 untranslated -->
 
  <sect1 id="plip" arch="x86">
  <title>Installing &debian; over Parallel Line IP (PLIP)</title>
@@ -100,7 +100,7 @@ echo 1 > /proc/sys/net/ipv4/ip_forward
 
 Boot the installation media. The installation needs to be run in
 expert mode; enter <userinput>expert</userinput> at the boot prompt.
-If you need to set paramenters for kernel modules, you also need to
+If you need to set parameters for kernel modules, you also need to
 do this at the boot prompt. For example, to boot the installer and
 set values for the <quote>io</quote> and <quote>irq</quote> options
 for the parport_pc module, enter the following at the boot prompt:
@@ -117,7 +117,7 @@ the installation.
 <orderedlist>
 <listitem><para>
 
-<guimenuitem>Load installer components</guimenuitem>
+<guimenuitem>Load installer components from CD</guimenuitem>
 
 </para><para>
 
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index d24188876..85113571c 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39468 untranslated -->
+<!-- original version: 40460 untranslated -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -458,7 +458,7 @@ There are a few rules to keep in mind when writing a preconfiguration file.
 <listitem><para>
   Most questions need to be preseeded using the values valid in English and
   not the translated values. However, there are some questions (for example
-  in <classname>partman</classname> where the translated values need to be
+  in <classname>partman</classname>) where the translated values need to be
   used.
 </para></listitem>
 <listitem><para>
@@ -739,11 +739,18 @@ correct one will be selected before using preseeding.
 #      select Use the largest continuous free space
 
 # Alternatively, you can specify a disk to partition. The device name can
-# be given in either devfs or traditional non-devfs format.
-# For example, to use the first disk devfs knows of:
+# be given in either devfs or traditional non-devfs format. If the method
+# supports it, you can specify several disks separated by spaces.
+# For example, to use the first disk:
 d-i partman-auto/disk string /dev/discs/disc0/disc
-# Or, if you want to use LVM:
-#d-i partman-auto-lvm/disk string /dev/discs/disc0/disc
+# In addition, you'll need to specify the method to use.
+# The presently available methods are: "regular", "lvm" and "crypto"
+d-i partman-auto/method string lvm
+
+# If one of the disks that are going to be automatically partitioned
+# contains an old LVM configuration, the user will normally receive a
+# warning. This can be preseeded away...
+d-i partman-auto/purge_lvm_from_device boolean true
 
 # You can choose from any of the predefined partitioning recipes.
 # Note: this must be preseeded with a localized (translated) value.
@@ -928,9 +935,11 @@ d-i grub-installer/with_other_os boolean true
 
 # Alternatively, if you want to install to a location other than the mbr,
 # uncomment and edit these lines:
-#d-i grub-installer/bootdev  string (hd0,0)
 #d-i grub-installer/only_debian boolean false
 #d-i grub-installer/with_other_os boolean false
+#d-i grub-installer/bootdev  string (hd0,0)
+# To install grub to multiple disks:
+#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)
 </screen></informalexample>
 
   </sect2>
diff --git a/nl/boot-installer/alpha.xml b/nl/boot-installer/alpha.xml
index d43770c8b..bbb13e269 100644
--- a/nl/boot-installer/alpha.xml
+++ b/nl/boot-installer/alpha.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 29334 untranslated -->
+<!-- original version: 40542 untranslated -->
 
  <sect2 arch="alpha" id="alpha-firmware">
  <title>Alpha Console Firmware</title>
@@ -286,7 +286,7 @@ ewc0.0.0.2002.0            EWC0              00-06-2B-01-32-B0
 You first need to set the boot protocol:
 
 <informalexample><screen>
-&gt;&gt;&gt; set ewa0_protocol bootp
+&gt;&gt;&gt; set ewa0_protocols bootp
 </screen></informalexample>
 
 Then check the medium type is correct:
diff --git a/nl/hardware/hardware-supported.xml b/nl/hardware/hardware-supported.xml
index a9699dcfb..c06bd1eff 100644
--- a/nl/hardware/hardware-supported.xml
+++ b/nl/hardware/hardware-supported.xml
@@ -1,9 +1,8 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 untranslated -->
+<!-- original version: 40543 untranslated -->
 
  <sect1 id="hardware-supported">
  <title>Supported Hardware</title>
-
 <para>
 
 Debian does not impose hardware requirements beyond the requirements
@@ -25,10 +24,9 @@ information can be found.
 </para>
 
   <sect2><title>Supported Architectures</title>
-
 <para>
 
-Debian &release; supports eleven major architectures and several
+Debian &release; supports twelve major architectures and several
 variations of each architecture known as <quote>flavors</quote>.
 
 </para><para>
@@ -44,34 +42,17 @@ variations of each architecture known as <quote>flavors</quote>.
 
 <tbody>
 <row>
-  <entry morerows="2">Intel x86-based</entry>
-  <entry morerows="2">i386</entry>
-  <entry morerows="2"></entry>
-  <entry>vanilla</entry>
-</row><row>
-  <entry>speakup</entry>
-</row><row>
-  <entry>linux26</entry>
+  <entry>Intel x86-based</entry>
+  <entry>i386</entry>
+  <entry></entry>
+  <entry></entry>
 </row>
 
 <row>
-  <entry morerows="5">Motorola 680x0</entry>
-  <entry morerows="5">m68k</entry>
-  <entry>Atari</entry>
-  <entry>atari</entry>
-</row><row>
-  <entry>Amiga</entry>
-  <entry>amiga</entry>
-</row><row>
-  <entry>68k Macintosh</entry>
-  <entry>mac</entry>
-</row><row>
-  <entry morerows="2">VME</entry>
-  <entry>bvme6000</entry>
-</row><row>
-  <entry>mvme147</entry>
-</row><row>
-  <entry>mvme16x</entry>
+  <entry>AMD64 &amp; Intel EM64t</entry>
+  <entry>amd64</entry>
+  <entry></entry>
+  <entry></entry>
 </row>
 
 <row>
@@ -82,15 +63,6 @@ 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>
-</row><row>
-  <entry>sun4u</entry>
-</row>
-
-<row>
   <entry morerows="2">ARM and StrongARM</entry>
   <entry morerows="2">arm</entry>
   <entry>Netwinder and CATS</entry>
@@ -104,22 +76,6 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry morerows="3">IBM/Motorola PowerPC</entry>
-  <entry morerows="3">powerpc</entry>
-  <entry>CHRP</entry>
-  <entry>chrp</entry>
-</row><row>
-  <entry>PowerMac</entry>
-  <entry>pmac</entry>
-</row><row>
-  <entry>PReP</entry>
-  <entry>prep</entry>
-</row><row>
-  <entry>APUS</entry>
-  <entry>apus</entry>
-</row>
-
-<row>
   <entry morerows="1">HP PA-RISC</entry>
   <entry morerows="1">hppa</entry>
   <entry>PA-RISC 1.1</entry>
@@ -171,6 +127,51 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
+  <entry morerows="5">Motorola 680x0</entry>
+  <entry morerows="5">m68k</entry>
+  <entry>Atari</entry>
+  <entry>atari</entry>
+</row><row>
+  <entry>Amiga</entry>
+  <entry>amiga</entry>
+</row><row>
+  <entry>68k Macintosh</entry>
+  <entry>mac</entry>
+</row><row>
+  <entry morerows="2">VME</entry>
+  <entry>bvme6000</entry>
+</row><row>
+  <entry>mvme147</entry>
+</row><row>
+  <entry>mvme16x</entry>
+</row>
+
+<row>
+  <entry morerows="3">IBM/Motorola PowerPC</entry>
+  <entry morerows="3">powerpc</entry>
+  <entry>CHRP</entry>
+  <entry>chrp</entry>
+</row><row>
+  <entry>PowerMac</entry>
+  <entry>pmac</entry>
+</row><row>
+  <entry>PReP</entry>
+  <entry>prep</entry>
+</row><row>
+  <entry>APUS</entry>
+  <entry>apus</entry>
+</row>
+
+<row>
+  <entry morerows="1">Sun SPARC</entry>
+  <entry morerows="1">sparc</entry>
+  <entry morerows="1"></entry>
+  <entry>sun4cdm</entry>
+</row><row>
+  <entry>sun4u</entry>
+</row>
+
+<row>
   <entry morerows="1">IBM S/390</entry>
   <entry morerows="1">s390</entry>
   <entry>IPL from VM-reader and DASD</entry>
@@ -204,11 +205,11 @@ problems; make sure to mention the fact that the bug is on the
 as well.
 
 </para>
-
   </sect2>
 
 <!-- supported cpu docs -->
 &supported-alpha.xml;
+&supported-amd64.xml;
 &supported-arm.xml;
 &supported-hppa.xml;
 &supported-i386.xml;
@@ -221,7 +222,6 @@ as well.
 &supported-sparc.xml;
 
   <sect2 id="gfx" arch="not-s390"><title>Graphics Card</title>
-
 <para arch="x86">
 
 You should be using a VGA-compatible display interface for the console
@@ -257,7 +257,6 @@ of graphics cards.  A <ulink url="&url-bcm91250a-hardware;">compatibility
 listing</ulink> for Broadcom evaluation boards is available.
 
 </para>
-
   </sect2>
 
   <sect2 arch="x86" id="laptops"><title>Laptops</title>
@@ -271,10 +270,8 @@ with GNU/Linux, see the
 </para>
    </sect2>
 
-
   <sect2 condition="defaults-smp">
-<title>Multiple Processors</title>
-
+  <title>Multiple Processors</title>
 <para>
 
 Multi-processor support &mdash; also called <quote>symmetric multi-processing</quote>
@@ -293,12 +290,30 @@ to do this in <xref linkend="kernel-baking"/>.  At this time
 section of the kernel config.
 
 </para>
-
   </sect2>
 
+  <sect2 condition="smp-alternatives">
+<title>Multiple Processors</title>
+
+<para>
+
+Multi-processor support &mdash; also called <quote>symmetric
+multi-processing</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
+automatically deactivate SMP on uniprocessor systems.
+
+</para><para arch="i386">
+
+The 486 flavour of the Debian kernel image packages for &arch-title;
+is not compiled with SMP support.
+
+</para>
+  </sect2>
 
   <sect2 condition="supports-smp">
- <title>Multiple Processors</title>
+  <title>Multiple Processors</title>
 <para>
 
 Multi-processor support &mdash; also called <quote>symmetric
@@ -321,7 +336,7 @@ section of the kernel config.
   </sect2>
 
   <sect2 condition="supports-smp-sometimes">
- <title>Multiple Processors</title>
+  <title>Multiple Processors</title>
 <para>
 
 Multi-processor support &mdash; also called <quote>symmetric
diff --git a/nl/hardware/installation-media.xml b/nl/hardware/installation-media.xml
index 5251ad417..3f9a9725f 100644
--- a/nl/hardware/installation-media.xml
+++ b/nl/hardware/installation-media.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 untranslated -->
+<!-- original version: 39887 untranslated -->
 
  <sect1 id="installation-media">
  <title>Installation Media</title>
@@ -221,7 +221,7 @@ IDE drives, IDE floppies, parallel port IDE devices, SCSI controllers and
 drives, USB, and FireWire.  The supported file systems include FAT,
 Win-32 FAT extensions (VFAT) and NTFS.
 
-</para><para arch="x86">
+</para><para arch="i386">
 
 Disk interfaces that emulate the <quote>AT</quote> hard disk interface
 &mdash; often called MFM, RLL, IDE, or ATA &mdash; are supported.  Very old
diff --git a/nl/hardware/supported/i386.xml b/nl/hardware/supported/i386.xml
index 4b1e4a2ca..ab356c23d 100644
--- a/nl/hardware/supported/i386.xml
+++ b/nl/hardware/supported/i386.xml
@@ -1,8 +1,8 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 untranslated -->
+<!-- original version: 39898 untranslated -->
 
 
-  <sect2 arch="x86"><title>CPU, Main Boards, and Video Support</title>
+  <sect2 arch="i386"><title>CPU, Main Boards, and Video Support</title>
 <para>
 
 Complete information concerning supported peripherals can be found at
@@ -14,10 +14,52 @@ This section merely outlines the basics.
    <sect3><title>CPU</title>
 <para>
 
-Nearly all x86-based processors are supported; this includes AMD and
-VIA (former Cyrix) processors as well.  Also the new processors like
-Athlon XP and Intel P4 Xeon are supported.  However, Linux will
-<emphasis>not</emphasis> run on 286 or earlier processors.
+Nearly all x86-based (IA-32) processors still in use in personal computers
+are supported, including all varieties of Intel's "Pentium" series.
+This also includes 32-bits AMD and VIA (former Cyrix) processors, and new
+processors like the Athlon XP and Intel P4 Xeon.
+
+</para>
+<note><para>
+
+If your system has a 64-bits 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-bits) i386 architecture.
+
+</para></note>
+<para>
+
+However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run
+on 386 or earlier processors.  Despite the architecture name "i386", Debian
+Sarge has <emphasis>dropped support</emphasis> for actual 80386 processors
+(and their clones), which were supported by earlier releases<footnote>
+
+<para>
+We have long tried to avoid this, but in the end it was necessary due a
+unfortunate series of issues with the compiler and the kernel, starting
+with an bug in the C++ ABI provided by GCC.  You should still be able to
+run Debian GNU/Linux on actual 80386 processors if you compile your own
+kernel and compile all packages from source, but that is beyond the
+scope of this manual.
+</para>
+
+</footnote>. (No version of Linux has ever supported the 286 or earlier
+chips in the series.)  All i486 and later processors are still
+supported<footnote>
+
+<para>
+
+Many Debian packages will actually run slightly faster on modern computers
+as a positive side effect of dropping support for these old chips.  The
+i486, introduced in 1989, has three opcodes (bswap, cmpxchg, and xadd)
+which the i386, introduced in 1986, did not have. Previously, these could not
+be easily used by most Debian packages; now they can.
+
+</para>
+
+</footnote>.
+
+</para><para>
 
 </para>
    </sect3>
@@ -29,7 +71,8 @@ The system bus is the part of the motherboard which allows the CPU to
 communicate with peripherals such as storage devices.  Your computer
 must use the ISA, EISA, PCI, the Microchannel Architecture (MCA, used
 in IBM's PS/2 line), or VESA Local Bus (VLB, sometimes called the VL
-bus).
+bus).  Essentially all personal computers sold in recent years use one
+of these.
 
 </para>
    </sect3>
diff --git a/nl/hardware/supported/s390.xml b/nl/hardware/supported/s390.xml
index edda7217d..237674566 100644
--- a/nl/hardware/supported/s390.xml
+++ b/nl/hardware/supported/s390.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 39895 untranslated -->
 
 
   <sect2 arch="s390"><title>S/390 and zSeries machine types</title>
@@ -10,8 +10,8 @@ be found in IBM's Redbook
 <ulink url="http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf">
 Linux for IBM eServer zSeries and S/390: Distributions</ulink> in
 chapter 2.1 or at the
-<ulink url="http://oss.software.ibm.com/developerworks/opensource/linux390/documentation-2.4.shtml">technical details web page</ulink> at
-<ulink url="http://oss.software.ibm.com/developerworks/opensource/linux390/index.shtml">developerWorks</ulink>.
+<ulink url="http://www-128.ibm.com/developerworks/linux/linux390/index.html">zSeries
+page at the developerWorks</ulink>.
 In short, G5, Multiprise 3000, G6 and all zSeries are fully supported;
 Multiprise 2000, G3 and G4 machines are supported with IEEE floating
 point emulation and thus degraded performance.
diff --git a/nl/howto/installation-howto.xml b/nl/howto/installation-howto.xml
index 38db1c33f..2f8b570f4 100644
--- a/nl/howto/installation-howto.xml
+++ b/nl/howto/installation-howto.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 untranslated -->
+<!-- original version: 39887 untranslated -->
 
 <appendix id="installation-howto">
 <title>Installation Howto</title>
@@ -213,7 +213,7 @@ it's just a matter of booting linux with the initrd.
 Once the installer starts, you will be greeted with an initial screen. Press
 &enterkey; to boot, or read the instructions for other boot
 methods and parameters (see <xref linkend="boot-parms" />).
-<phrase arch="x86">
+<phrase arch="i386">
 If you want a 2.4 kernel, type <userinput>install24</userinput> at the
 <prompt>boot:</prompt> prompt.
 <footnote><para>
diff --git a/nl/install-methods/floppy/i386.xml b/nl/install-methods/floppy/i386.xml
index 00a80a4df..3cd6b77bb 100644
--- a/nl/install-methods/floppy/i386.xml
+++ b/nl/install-methods/floppy/i386.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 39870 untranslated -->
 
 
 <!--  This is not set off for i386 only, because many people will have -->
@@ -9,7 +9,7 @@
 
 <para>
 
-If you have access to an i386 machine, you can use one of the
+If you have access to an i386 or amd64 machine, you can use one of the
 following programs to copy images to floppies.
 
 </para><para>
diff --git a/nl/install-methods/tftp/rarp.xml b/nl/install-methods/tftp/rarp.xml
index c6fd184d4..e449b79ac 100644
--- a/nl/install-methods/tftp/rarp.xml
+++ b/nl/install-methods/tftp/rarp.xml
@@ -1,12 +1,12 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 39897 untranslated -->
 
 
   <sect2 condition="supports-rarp" id="tftp-rarp">
-   <title>Setting up RARP server</title>
+  <title>Setting up RARP server</title>
 <para>
 
-To setup RARP, you need to know the Ethernet address (a.k.a. the MAC address)
+To set up RARP, you need to know the Ethernet address (a.k.a. the MAC address)
 of the client computers to be installed.
 If you don't know this information, you can
 
@@ -18,47 +18,16 @@ command <userinput>/sbin/ifconfig eth0</userinput>.
 
 </para><para>
 
-On a RARP server system using a Linux 2.2.x kernel,
-you need to populate the kernel's RARP table.
-To do this, run the following commands:
-
-<informalexample><screen>
-# <userinput>/sbin/rarp -s
-<replaceable>client-hostname</replaceable>
-<replaceable>client-enet-addr</replaceable></userinput>
-
-# <userinput>/usr/sbin/arp -s
-<replaceable>client-ip</replaceable>
-<replaceable>client-enet-addr</replaceable></userinput>
-</screen></informalexample>
-
-If you get
-
-<informalexample><screen>
-SIOCSRARP: Invalid argument
-</screen></informalexample>
-
-you probably need to load the RARP kernel module or else recompile the
-kernel to support RARP.  Try <userinput>modprobe rarp</userinput> and
-then try the <command>rarp</command> command again.
-
-</para><para>
-
-On a RARP server system using a Linux 2.4.x kernel,
-there is no RARP module, and
-you should instead use the <command>rarpd</command> program.  The
-procedure is similar to that used under SunOS in the following
-paragraph.
-
-</para><para>
-
-Under SunOS, you need to ensure that the Ethernet hardware address for
-the client is listed in the <quote>ethers</quote> database (either in the
+On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/SunOS,
+you use the <command>rarpd</command> program.
+You need to ensure that the Ethernet hardware address for the client is
+listed in the <quote>ethers</quote> database (either in the
 <filename>/etc/ethers</filename> file, or via NIS/NIS+) and in the
 <quote>hosts</quote> database. Then you need to start the RARP daemon.
-In SunOS 4, issue the command (as root):
-<userinput>/usr/etc/rarpd -a</userinput>; in SunOS 5, use
-<userinput>/usr/sbin/rarpd -a</userinput>.
+Issue the command (as root): <userinput>/usr/sbin/rarpd -a</userinput>
+on most Linux systems and SunOS 5 (Solaris 2),
+<userinput>/usr/sbin/in.rarpd -a</userinput> on some other Linux systems,
+or <userinput>/usr/etc/rarpd -a</userinput> in SunOS 4 (Solaris 1).
 
 </para>
   </sect2>
diff --git a/nl/partitioning/partition/alpha.xml b/nl/partitioning/partition/alpha.xml
index 21ea31ff0..965ee8602 100644
--- a/nl/partitioning/partition/alpha.xml
+++ b/nl/partitioning/partition/alpha.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39465 untranslated -->
+<!-- original version: 39920 untranslated -->
 
 
   <sect2 arch="alpha"><title>Partitioning for &arch-title;</title>
@@ -25,12 +25,13 @@ command to enter disk label mode.
 
 Unless you wish to use the disk you are partitioning from Tru64 Unix
 or one of the free 4.4BSD-Lite derived operating systems (FreeBSD,
-OpenBSD, or NetBSD), it is suggested that you do
-<emphasis>not</emphasis> make the third partition contain the whole
-disk.  This is not required by <command>aboot</command>, and in fact,
-it may lead to confusion since the <command>swriteboot</command>
-utility used to install <command>aboot</command> in the boot sector
-will complain about a partition overlapping with the boot block.
+OpenBSD, or NetBSD), you should <emphasis>not</emphasis> create the
+third partition as a <quote>whole disk</quote> partition (i.e. with
+start and end sectors to span the whole disk), as this renders the
+disk incompatible with the tools used to make it bootable with aboot.
+This means that the disk configured by the installer for use as the
+Debian boot disk will be inaccessible to the operating systems mentioned
+earlier.
 
 </para><para>
 
diff --git a/nl/post-install/kernel-baking.xml b/nl/post-install/kernel-baking.xml
index c2cfa53d3..05f13162a 100644
--- a/nl/post-install/kernel-baking.xml
+++ b/nl/post-install/kernel-baking.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 untranslated -->
+<!-- original version: 39887 untranslated -->
 
  <sect1 id="kernel-baking"><title>Compiling a New Kernel</title>
 <para>
@@ -158,7 +158,7 @@ like any package.  As root, do
 </phrase>
 The <replaceable>subarchitecture</replaceable> part is an optional
 sub-architecture,
-<phrase arch="x86"> such as <quote>i586</quote>, </phrase>
+<phrase arch="i386"> such as <quote>686</quote>, </phrase>
 depending on what kernel options you set.
 <userinput>dpkg -i</userinput> will install the
 kernel, along with some other nice supporting files.  For instance,
diff --git a/nl/post-install/post-install.xml b/nl/post-install/post-install.xml
index 59c327813..fa3d06167 100644
--- a/nl/post-install/post-install.xml
+++ b/nl/post-install/post-install.xml
@@ -1,9 +1,10 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28715 untranslated -->
+<!-- original version: 39894 untranslated -->
 
 <chapter id="post-install">
  <title>Next Steps and Where to Go From Here</title>
 
+&shutdown.xml;
 &new-to-unix.xml;
 &orientation.xml;
 &reactivating-win.xml;
diff --git a/nl/post-install/shutdown.xml b/nl/post-install/shutdown.xml
index e326be12d..27967df91 100644
--- a/nl/post-install/shutdown.xml
+++ b/nl/post-install/shutdown.xml
@@ -1,25 +1,31 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 21690 untranslated -->
+<!-- original version: 39942 untranslated -->
 
 
  <sect1 id="shutdown">
- <title>Shutting Down the System</title>
+ <title>Shutting down the system</title>
 
 <para>
 
 To shut down a running Linux system, you must not reboot with the
 reset switch on the front or back of your computer, or just turn off
-the computer.  Linux must be shut down in a controlled manner,
-otherwise files may be lost and disk damage incurred. You can press
-the key combination <keycombo> <keycap>Ctrl</keycap>
-<keycap>Alt</keycap> <keycap>Del</keycap> </keycombo>
+the computer.  Linux should be shut down in a controlled manner,
+otherwise files might get lost and/or disk damage might occur. If you run a
+desktop environment, there is usually an option to <quote>log out</quote>
+available from the application menu that allows you to shutdown (or reboot)
+the system.
+
+</para><para>
+
+Alternatively you can press the key combination <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo>
 <phrase arch="powerpc;m68k"> or <keycombo> <keycap>Control</keycap>
 <keycap>Shift</keycap> <keycap>Power</keycap> </keycombo> on Macintosh
-systems</phrase>. You may also log in as
-root and type <userinput>shutdown -h now</userinput>,
-<userinput>reboot</userinput>, or <userinput>halt</userinput> if
-either of the key combinations do not work or you prefer to type
-commands.
+systems</phrase>. A last option is to log in as root and type one of the
+commands <command>poweroff</command>, <command>halt</command> or
+<command>shutdown -h now</command> if either of the key combinations do not
+work or you prefer to type commands; use <command>reboot</command> to reboot
+the system.
 
 </para>
  </sect1>
diff --git a/nl/preparing/bios-setup/i386.xml b/nl/preparing/bios-setup/i386.xml
index abac7a249..174e5a38a 100644
--- a/nl/preparing/bios-setup/i386.xml
+++ b/nl/preparing/bios-setup/i386.xml
@@ -1,6 +1,11 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 untranslated -->
+<!-- original version: 39887 untranslated -->
 
+<!-- This section is heavily outdated. It only really describes
+     older BIOSes and not the current situation. Most of it is not
+     really relevant for AMD64, but a general description would be.
+     File should be renamed to x86.xml if a more general text is
+     written. -->
 
   <sect2 arch="x86" id="bios-setup"><title>Invoking the BIOS Set-Up Menu</title>
 
diff --git a/nl/using-d-i/modules/partman-lvm.xml b/nl/using-d-i/modules/partman-lvm.xml
index 1de105994..17979057d 100644
--- a/nl/using-d-i/modules/partman-lvm.xml
+++ b/nl/using-d-i/modules/partman-lvm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- original version: 33725 -->
+<!-- original version: 39531 -->
 
    <sect3 id="partman-lvm">
    <title>Logisch volumebeheer (LVM) instellen</title>
@@ -37,26 +37,73 @@ aan om, voor zover u dat nog niet heeft gedaan, de
 
 </para><para>
 
-Het instellen van LVM in &d-i; is relatief eenvoudig. Allereerst dient u de
-partities te markeren die u wilt gebruiken als fysieke volumes voor LVM.
-Hiervoor selecteert u in <command>partman</command> vanuit het menu
-<guimenu>Partitie-instellingen</guimenu> de optie <menuchoice>
-<guimenu>Gebruiken als:</guimenu> <guimenuitem>Fysiek volume voor
-LVM</guimenuitem> </menuchoice>. Vervolgens start u de module
-<command>lvmcfg</command> (dit is mogelijk zowel direct vanuit
-<command>partman</command> als vanuit het hoofdmenu van &d-i;) en voegt u
-vanuit de menukeuze <guimenuitem>Volumegroepen (VG) aanpassen</guimenuitem>
-de fysieke volumes samen tot één of meerdere volumegroepen. Vervolgens
-dient u nog vanuit de menukeuze <guimenuitem>Logische volumes (LV)
-aanpassen</guimenuitem> de logische volumes te creëren bovenop de
-volumegroepen.
+Het instellen van LVM in &d-i; is relatief eenvoudig en volledig ondersteund
+in <command>partman</command>. Allereerst dient u de partitie(s) die u wilt
+gebruiken als fysieke volumes voor LVM, te markeren.
+Hiervoor selecteert u in <command>partman</command>
+vanuit het menu <guimenu>Partitie-instellingen</guimenu>
+de optie <menuchoice> <guimenu>Gebruiken als:</guimenu>
+<guimenuitem>Fysiek volume voor LVM</guimenuitem> </menuchoice>.
 
 </para><para>
 
-Nadat u vanuit <command>lvmcfg</command> terugkeert in
-<command>partman</command>, zult u de aangemaakte logische volumes als ware
-het gewone partities terugvinden in het menu (en u kunt ze verder ook als
-zodanig behandelen).
+Als u terugkeert op het hoofdscherm van <command>partman</command>, zult u
+een nieuwe optie <guimenuitem>Logisch volumebeheer (LVM) instellen</guimenuitem>.
+Als u deze selecteert, zal u eerst worden gevraagd om nog niet vastgelegde
+wijzigingen in de partitietabel te bevestigen (als die er zijn) en vervolgens
+zal het configuratiemenu voor LVM worden getoond. Het menu is contextgevoelig
+en toont alleen toegestane acties. De mogelijke acties zijn:
+
+<itemizedlist>
+  <listitem><para>
+    <guimenuitem>Toon configuratiedetails</guimenuitem>:
+    toont onder andere de structuur van LVM-elementen en de namen en groottes
+    van logische volumes
+  </para></listitem>
+  <listitem><para>
+    <guimenuitem>Volumegroep aanmaken</guimenuitem>
+  </para></listitem>
+  <listitem><para>
+    <guimenuitem>Logisch volume aanmaken</guimenuitem>
+  </para></listitem>
+  <listitem><para>
+    <guimenuitem>Volumegroep verwijderen</guimenuitem>
+  </para></listitem>
+  <listitem><para>
+    <guimenuitem>Logisch volume verwijderen/guimenuitem>
+  </para></listitem>
+  <listitem><para>
+    <guimenuitem>Volumegroep uitbreiden</guimenuitem>
+  </para></listitem>
+  <listitem><para>
+    <guimenuitem>Volumegroep verkleinen</guimenuitem>
+  </para></listitem>
+  <listitem><para>
+    <guimenuitem>Einde</guimenuitem>:
+    keer terug naar het hoofdscherm van <command>partman</command>
+  </para></listitem>
+</itemizedlist>
+
+</para><para>
+
+Gebruik de opties in dit menu om eerst een volume groep en vervolgens
+daaronder de gewenste logische volumes.
+
+ </para>
+<note><para>
+
+U kunt dit menu ook gebruiken om een bestaande LVM configuratie van uw
+harde schijf te verwijderen voordat U <quote>Begeleide schijfindeling met
+gebruik van LVM</quote> kiest. Begeleide schijfindeling met LVM is niet
+mogelijk als er al volumegroepen gedefinieerd zijn, maar door ze eerst te
+verwijderen kunt u een schone uitgangssituatie creëren.
+
+</para></note>
+<para>
+
+Als u wederom terugkeert op het hoofdscherm van <command>partman</command>,
+zult u de aangemaakte logische volumes als ware het gewone partities
+terugvinden in het menu (en u kunt ze verder ook als zodanig behandelen).
 
 </para>
    </sect3>
diff --git a/nl/using-d-i/modules/partman.xml b/nl/using-d-i/modules/partman.xml
index f51ad993e..d2a47fde5 100644
--- a/nl/using-d-i/modules/partman.xml
+++ b/nl/using-d-i/modules/partman.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- original version: 39346 -->
+<!-- original version: 39529 -->
 
    <sect3 id="partman">
    <title>Uw harde schijven indelen</title>
@@ -22,14 +22,23 @@ bepalen</guimenuitem> uit het menu.
 
 Als u kiest voor begeleide schijfindeling, heeft u mogelijk twee opties:
 de partities direct op de harde schijf aanmaken (de klassieke methode) of
-gebruik maken van logish volumebeheer (LVM). In het tweede geval zal het
+gebruik maken van logisch volumebeheer (LVM). In het tweede geval zal het
 installatiesysteem de meeste partities aanmaken binnen één grote overkoepelende
 partitie; het voordeel van deze methode is dat de grootte van de partities
 binnen die overkoepelende partitie relatief eenvoudig kan worden gewijzigd.
 Merk op dat de optie om gebruik te maken van LVM niet op alle platforms
 beschikbaar hoeft te zijn.
 
-</para><para>
+</para>
+<warning><para>
+
+Als u kiest voor begeleide schijfindeling met gebruik van LVM, zal het
+niet mogelijk zijn om wijzigingen in de partitietabel ongedaan te maken.
+Met deze keuze worden effectief alle gegevens verwijderd die zich nu op
+de harde schijf bevinden
+
+</para></warning>
+<para>
 
 Nadat u heeft gekozen voor begeleide schijfindeling (klassieke methode
 danwel met gebruik van LVM), kunt u een keuze maken uit de schema's
@@ -145,20 +154,9 @@ voorgestelde indeling, kunt u de menuoptie <guimenuitem>Schijfindeling
 afsluiten &amp; veranderingen naar schijf schrijven</guimenuitem> kiezen om
 de nieuwe partitie-indeling te implementeren (zoals beschreven aan het einde
 van deze paragraaf). Als u nog niet tevreden bent, kunt u kiezen voor
-<guimenuitem>Veranderingen aan partities ongedaan maken</guimenuitem><footnote>
-
-<para>
-
-Als u heeft gekozen voor begeleide schijfindeling met gebruik van LVM, dan zal
-u niet alle wijzigingen ongedaan kunnen maken aangezien sommige wijzigingen
-reeds naar de harde schijf weggeschreven zullen zijn. Het installatiesysteem
-zal echter waarchuwen voordat dit gebeurt.
-
-</para>
-
-</footnote> en de begeleide schijfindeling nogmaals uit te voeren of om de
-voorgestelde indeling te wijzigen zoals hieronder beschreven voor handmatige
-schijfindeling.
+<guimenuitem>Veranderingen aan partities ongedaan maken</guimenuitem> en de
+begeleide schijfindeling nogmaals uit te voeren of om de voorgestelde indeling
+te wijzigen zoals hieronder beschreven voor handmatige schijfindeling.
 
 </para><para>