summaryrefslogtreecommitdiff
path: root/nl
diff options
context:
space:
mode:
Diffstat (limited to 'nl')
-rw-r--r--nl/appendix/files.xml61
-rw-r--r--nl/appendix/preseed.xml35
-rw-r--r--nl/boot-installer/parameters.xml9
-rw-r--r--nl/boot-installer/trouble.xml214
-rw-r--r--nl/hardware/installation-media.xml4
-rw-r--r--nl/hardware/supported/i386.xml8
-rw-r--r--nl/howto/installation-howto.xml9
-rw-r--r--nl/partitioning/partition-programs.xml32
-rw-r--r--nl/partitioning/partition/x86.xml6
-rw-r--r--nl/preparing/nondeb-part/x86.xml8
-rw-r--r--nl/using-d-i/modules/kbd-chooser.xml33
-rw-r--r--nl/using-d-i/modules/mdcfg.xml2
12 files changed, 278 insertions, 143 deletions
diff --git a/nl/appendix/files.xml b/nl/appendix/files.xml
index ea39f0903..a1fd7227d 100644
--- a/nl/appendix/files.xml
+++ b/nl/appendix/files.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39551 untranslated -->
+<!-- original version: 42302 untranslated -->
<sect1 id="linuxdevices"><title>Linux Devices</title>
@@ -186,19 +186,21 @@ when your mouse only has one button. Just add the following lines to
<title>Disk Space Needed for Tasks</title>
<!-- Note for d-i and manual maintainers
- Sizes of tasks should be determined by running "tasksel new" on a system
- that been fully installed without selecting any tasks. By selecting a
- task together with the "manual selection" option, aptitude will be started
- and show the sizes for the task. After deselecting the packages to be
- installed, quit aptitude and repeat for other tasks.
+ Sizes of tasks should be determined by running tasksel with the "new-install"
+ option on a system that been fully installed without selecting any tasks. By
+ selecting a task together with the "manual selection" option, aptitude will
+ be started and show the sizes for the task. Use "cancel panding actions" to
+ clear the slate, quit aptitude and repeat for other tasks.
Space requirements need to be determined from tasksel as tasksel will not
install recommended packages while selecting a task from aptitude will.
-->
<para>
-The base installation for i386 using the default 2.4 kernel,
-including all standard packages, requires 573MB of disk space.
+The base installation for i386 using the default 2.6 kernel,
+including all standard packages, requires 585MB of disk space.
+A minimal base installation, without the standard task selected,
+will take 365MB.
</para><para>
@@ -230,23 +232,30 @@ is (temporarily) required in <filename>/var</filename>.
<tbody>
<row>
<entry>Desktop</entry>
- <entry>1392</entry>
- <entry>460</entry>
- <entry>1852</entry>
+ <entry>1258</entry>
+ <entry>418</entry>
+ <entry>1676</entry>
+</row>
+
+<row>
+ <entry>Laptop</entry>
+ <entry>46</entry>
+ <entry>16</entry>
+ <entry>62</entry>
</row>
<row>
<entry>Web server</entry>
- <entry>36</entry>
- <entry>12</entry>
- <entry>48</entry>
+ <entry>35</entry>
+ <entry>11</entry>
+ <entry>46</entry>
</row>
<row>
<entry>Print server</entry>
- <entry>168</entry>
- <entry>58</entry>
- <entry>226</entry>
+ <entry>326</entry>
+ <entry>95</entry>
+ <entry>421</entry>
</row>
<row>
@@ -258,23 +267,23 @@ is (temporarily) required in <filename>/var</filename>.
<row>
<entry>File server</entry>
- <entry>47</entry>
- <entry>24</entry>
+ <entry>50</entry>
+ <entry>21</entry>
<entry>71</entry>
</row>
<row>
<entry>Mail server</entry>
- <entry>10</entry>
- <entry>3</entry>
<entry>13</entry>
+ <entry>5</entry>
+ <entry>18</entry>
</row>
<row>
<entry>SQL database</entry>
- <entry>66</entry>
- <entry>21</entry>
- <entry>87</entry>
+ <entry>24</entry>
+ <entry>8</entry>
+ <entry>32</entry>
</row>
</tbody>
@@ -282,8 +291,8 @@ is (temporarily) required in <filename>/var</filename>.
<note><para>
-The <emphasis>Desktop</emphasis> task will install both the GNOME and KDE
-desktop environments.
+The <emphasis>Desktop</emphasis> task will install the GNOME desktop
+environment.
</para></note>
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index ee228f28f..ff22394e5 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 41587 untranslated -->
+<!-- original version: 42302 untranslated -->
<!--
Be carefull with the format of this file as it is parsed to generate
@@ -137,7 +137,7 @@ questions being asked.
Although most questions used by &d-i; can be preseeded using this method,
there are some notable exceptions. You must (re)partition an entire disk
or use available free space on a disk; it is not possible to use existing
-partitions. You currently cannot use preseeding to set up RAID.
+partitions.
</para>
</sect2>
@@ -394,20 +394,24 @@ this appendix instead of the full variable.
</para><para>
-A <quote>--</quote> in the boot options has special meaning.
-Kernel parameters that appear after it will be copied into the installed
-bootloader configuration (if supported by the installer for the
-bootloader). Note that the <quote>--</quote> may already be
-present in the default boot parameters.
+A <quote>--</quote> in the boot options has special meaning. Kernel
+parameters that appear after the last <quote>--</quote> will be copied
+into the installed bootloader configuration (if supported by the
+installer for the bootloader). Note that the <quote>--</quote> may
+already be present in the default boot parameters, which will mean
+that unless you add another <quote>--</quote> all parameters specified
+at the boot prompt will be copied. That being the case, you should
+specify any preseeding options before any options required by the
+hardware in order to boot, and separate them with a <quote>--</quote>
+to ensure that only the latter are copied onto the target system.
</para>
<note><para>
-The 2.4 kernel accepts a maximum of 8 command line options and
-8 environment options (including any options added by default for the
-installer). If these numbers are exceeded, 2.4 kernels will drop any
-excess options and 2.6 kernels will panic. For kernel 2.6.9 and later,
-you can use 32 command line options and 32 environment options.
+Current linux kernels (2.6.9 and later) accept a maximum of 32 command line
+options and 32 environment options, including any options added by default
+for the installer. If these numbers are exceeded, the kernel will panic
+(crash). (For earlier kernels, these numbers were lower.)
</para></note>
<para>
@@ -719,8 +723,7 @@ supported by <classname>partman-auto</classname>. You can choose to either
partition existing free space on a disk or a whole disk. The layout of the
disk can be determined by using a predefined recipe, a custom recipe from
a recipe file or a recipe included in the preconfiguration file. It is
-currently not possible to partition multiple disks using preseeding nor to
-set up RAID.
+currently not possible to partition multiple disks using preseeding.
</para>
@@ -736,7 +739,7 @@ correct one will be selected before using preseeding.
# 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 Use the largest continuous free space
+# select Guided - 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.
@@ -768,7 +771,7 @@ d-i partman-auto/choose_recipe \
# just point at it.
#d-i partman-auto/expert_recipe_file string /hd-media/recipe
-# If not, you can put an entire recipe the preconfiguration file in one
+# If not, you can put an entire recipe into the preconfiguration file in one
# (logical) line. This example creates a small /boot partition, suitable
# swap, and uses the rest of the space for the root partition:
#d-i partman-auto/expert_recipe string \
diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index 215b59d9b..b83ddca2c 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: 40875 untranslated -->
+<!-- original version: 42302 untranslated -->
<sect1 id="boot-parms"><title>Boot Parameters</title>
<para>
@@ -74,11 +74,8 @@ The installation system recognizes a few additional boot parameters<footnote>
<para>
-Note that the 2.4 kernel accepts a maximum of 8 command line options and
-8 environment options (including any options added by default for the
-installer). If these numbers are exceeded, 2.4 kernels will drop any
-excess options. With kernel 2.6.9 or newer,
-you can use 32 command line options and 32 environment options.
+With current kernels (2.6.9 or newer) you can use 32 command line options and
+32 environment options. If these numbers are exceeded, the kernel will panic.
</para>
diff --git a/nl/boot-installer/trouble.xml b/nl/boot-installer/trouble.xml
index 445a530c6..26e3dba09 100644
--- a/nl/boot-installer/trouble.xml
+++ b/nl/boot-installer/trouble.xml
@@ -1,11 +1,195 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 untranslated -->
+<!-- original version: 42301 untranslated -->
<sect1 id="boot-troubleshooting">
<title>Troubleshooting the Installation Process</title>
<para>
</para>
+ <sect2 arch="not-s390" id="unreliable-cd">
+ <title>CD-ROM Reliability</title>
+<para>
+
+Sometimes, especially with older CD-ROM drives, the installer may fail
+to boot from a CD-ROM. The installer may also &mdash; even after booting
+successfully from CD-ROM &mdash; fail to recognize the CD-ROM or return
+errors while reading from it during the installation.
+
+</para><para>
+
+There are a many different possible causes for these problems. We can
+only list some common issues and provide general suggestions on how to
+deal with them. The rest is up to you.
+
+</para><para>
+
+If you cannot get the installation working from CD-ROM, try one of the
+other installation methods that are available.
+
+</para>
+
+ <sect3>
+ <title>Common issues</title>
+
+<itemizedlist>
+ <listitem><para>
+
+Some older CD-ROM drives do not support reading from discs that were burned
+at high speeds using a modern CD writer.
+
+ </para></listitem>
+ <listitem><para>
+
+If your system boots correctly from the CD-ROM, it does not necessarily
+mean that Linux also supports the CD-ROM (or, more correctly, the controller
+that your CD-ROM drive is connected to).
+
+ </para></listitem>
+ <listitem><para>
+
+Some older CD-ROM drives do not work correctly if <quote>direct memory
+access</quote> (DMA) is enabled.
+
+ </para></listitem>
+</itemizedlist>
+
+ </sect3>
+
+ <sect3>
+ <title>How to investigate and maybe solve issues</title>
+<para>
+
+If the CD-ROM fails to boot, try the suggestions listed below.
+
+<itemizedlist>
+ <listitem><para>
+
+Check that your BIOS actually supports booting from CD-ROM (older systems
+possibly don't) and that your CD-ROM drive supports the media you are using.
+
+ </para></listitem>
+ <listitem><para>
+
+If you downloaded an iso image, check that the md5sum of that image matches
+the one listed for the image in the <filename>MD5SUMS</filename> file that
+should be present in the same location as where you downloaded the image
+from.
+
+<informalexample><screen>
+$ md5sum <replaceable>debian-testing-i386-netinst.iso</replaceable>
+a20391b12f7ff22ef705cee4059c6b92 <replaceable>debian-testing-i386-netinst.iso</replaceable>
+</screen></informalexample>
+
+Next, check that the md5sum of the burned CD-ROM matches as well. The
+following command should work. It uses the size of the image to read the
+correct number of bytes from the CD-ROM.
+
+<informalexample><screen>
+$ dd if=/dev/cdrom | \
+> head -c `stat --format=%s <replaceable>debian-testing-i386-netinst.iso</replaceable>` | \
+> md5sum
+a20391b12f7ff22ef705cee4059c6b92 -
+262668+0 records in
+262668+0 records out
+134486016 bytes (134 MB) copied, 97.474 seconds, 1.4 MB/s
+</screen></informalexample>
+
+ </para></listitem>
+</itemizedlist>
+
+</para><para>
+
+If, after the installer has been booted successfully, the CD-ROM is not
+detected, sometimes simply trying again may solve the problem. If you have
+more than one CD-ROM drive, try changing the CD-ROM to the other drive.
+If that does not work or if the CD-ROM is recognized but there are errors
+when reading from it, try the suggestions listed below. Some basic knowledge
+of Linux is required for this.
+To execute any of the commands, you should first switch to the second
+virtual console (VT2) and activate the shell there.
+
+<itemizedlist>
+ <listitem><para>
+
+Switch to VT4 or view the contents of <filename>/var/log/syslog</filename>
+(use <command>nano</command> as editor) to check for any specific error
+messages. After that, also check the output of <command>dmesg</command>.
+
+ </para></listitem>
+ <listitem><para>
+
+Check in the output of <command>dmesg</command> if your CD-ROM drive was
+recognized. You should see something like (the lines do not necessarily
+have to be consecutive):
+
+<informalexample><screen>
+Probing IDE interface ide1...
+hdc: TOSHIBA DVD-ROM SD-R6112, ATAPI CD/DVD-ROM drive
+ide1 at 0x170-0x177,0x376 on irq 15
+hdc: ATAPI 24X DVD-ROM DVD-R CD-R/RW drive, 2048kB Cache, UDMA(33)
+Uniform CD-ROM driver Revision: 3.20
+</screen></informalexample>
+
+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
+using <command>modprobe</command>.
+
+ </para></listitem>
+ <listitem><para>
+
+Check that there is a device node for your CD-ROM drive under
+<filename>/dev/</filename>. In the example above, this would be
+<filename>/dev/hdc</filename>.
+There should also be a <filename>/dev/cdroms/cdrom0</filename>.
+
+ </para></listitem>
+ <listitem><para>
+
+Use the <command>mount</command> command to check if the CD-ROM is already
+mounted; if not, try mounting it manually:
+
+<informalexample><screen>
+$ mount /dev/<replaceable>hdc</replaceable> /cdrom
+</screen></informalexample>
+
+Check if there are any error messages after that command.
+
+ </para></listitem>
+ <listitem><para>
+
+Check if DMA is currently enabled:
+
+<informalexample><screen>
+$ cd /proc/<replaceable>ide</replaceable>/<replaceable>hdc</replaceable>
+$ grep dma settings
+using_dma 1 0 1 rw
+</screen></informalexample>
+
+A <quote>1</quote> means it is enabled. If it is, try disabling it:
+
+<informalexample><screen>
+$ echo -n "using_dma:0" >settings
+</screen></informalexample>
+
+Make sure that you are in the directory for the device that corresponds
+to your CD-ROM drive.
+
+ </para></listitem>
+ <listitem><para>
+
+If there are any problems during the installation, try checking the integrity
+of the CD-ROM using the option near the bottom of the installer's main menu.
+This option can also be used as a general test if the CD-ROM can be read
+reliably.
+
+ </para></listitem>
+</itemizedlist>
+
+</para>
+ </sect3>
+ </sect2>
+
<sect2 condition="supports-floppy-boot" id="unreliable-floppies">
<title>Floppy Disk Reliability</title>
@@ -26,15 +210,20 @@ indicate themselves with a flood of messages about disk I/O errors.
</para><para>
If you are having the installation stall at a particular floppy, the
-first thing you should do is re-download the floppy disk image and
-write it to a <emphasis>different</emphasis> floppy. Simply
-reformatting the old
+first thing you should write it to a <emphasis>different</emphasis>
+floppy. Simply reformatting the old
floppy may not be sufficient, even if it appears that the floppy was
reformatted and written with no errors. It is sometimes useful to try
writing the floppy on a different system.
</para><para>
+Normally you should not have download a floppy image again, but if you
+are experiencing problems it is always useful to verify that the images
+were downloaded correctly by verifying their md5sums.
+
+</para><para>
+
One user reports he had to write the images to floppy
<emphasis>three</emphasis> times before one worked, and then
everything was fine with the third floppy.
@@ -242,7 +431,7 @@ installation reports, and file the report as a bug report against the
Package: installation-reports
Boot method: &lt;How did you boot the installer? CD? floppy? network?&gt;
-Image version: &lt;Fill in date and from where you got the image&gt;
+Image version: &lt;Full URL to image you downloaded is best&gt;
Date: &lt;Date and time of the install&gt;
Machine: &lt;Description of machine (eg, IBM Thinkpad R32)&gt;
@@ -250,23 +439,24 @@ Processor:
Memory:
Partitions: &lt;df -Tl will do; the raw partition table is preferred&gt;
-Output of lspci and lspci -n:
+Output of lspci -nn and lspci -vnn:
Base System Installation Checklist:
[O] = OK, [E] = Error (please elaborate below), [ ] = didn't try it
-Initial boot worked: [ ]
-Configure network HW: [ ]
-Config network: [ ]
+Initial boot: [ ]
+Detect network card: [ ]
+Configure network: [ ]
Detect CD: [ ]
Load installer modules: [ ]
Detect hard drives: [ ]
Partition hard drives: [ ]
-Create file systems: [ ]
-Mount partitions: [ ]
Install base system: [ ]
+Clock/timezone setup: [ ]
+User/password setup: [ ]
+Install tasks: [ ]
Install boot loader: [ ]
-Reboot: [ ]
+Overall install: [ ]
Comments/Problems:
diff --git a/nl/hardware/installation-media.xml b/nl/hardware/installation-media.xml
index 3f9a9725f..4fe874b25 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: 39887 untranslated -->
+<!-- original version: 41881 untranslated -->
<sect1 id="installation-media">
<title>Installation Media</title>
@@ -8,7 +8,7 @@
This section will help you determine which different media types you can use to
install Debian. For example, if you have a floppy disk drive on your machine,
-it can be used to install Debian. There is a whole chapter devoted media,
+it can be used to install Debian. There is a whole chapter devoted to media,
<xref linkend="install-methods"/>, which lists the advantages and
disadvantages of each media type. You may want to refer back to this page once
you reach that section.
diff --git a/nl/hardware/supported/i386.xml b/nl/hardware/supported/i386.xml
index ab356c23d..975514a48 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: 39898 untranslated -->
+<!-- original version: 42036 untranslated -->
<sect2 arch="i386"><title>CPU, Main Boards, and Video Support</title>
@@ -16,15 +16,15 @@ This section merely outlines the basics.
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
+This also includes 32-bit 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,
+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-bits) i386 architecture.
+of the installer for the (32-bit) i386 architecture.
</para></note>
<para>
diff --git a/nl/howto/installation-howto.xml b/nl/howto/installation-howto.xml
index 88aebc125..fee462767 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: 41808 untranslated -->
+<!-- original version: 42302 untranslated -->
<appendix id="installation-howto">
<title>Installation Howto</title>
@@ -214,13 +214,6 @@ 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="i386">
-If you want a 2.4 kernel, type <userinput>install24</userinput> at the
-<prompt>boot:</prompt> prompt. The 2.6 kernel is the default.
-<footnote><para>
-
-</para></footnote>
-</phrase>
</para><para>
diff --git a/nl/partitioning/partition-programs.xml b/nl/partitioning/partition-programs.xml
index 089b2d15c..cb3574ec2 100644
--- a/nl/partitioning/partition-programs.xml
+++ b/nl/partitioning/partition-programs.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39622 untranslated -->
+<!-- original version: 42302 untranslated -->
<sect1 id="partition-programs">
<title>Debian Partitioning Programs</title>
@@ -114,34 +114,8 @@ One of these programs will be run by default when you select
to use a different partitioning tool from the command line on VT2, but this
is not recommended.
-</para><para>
-
-If you will be working with more than 20 partitions on your ide disk,
-you will need to create devices for partitions 21 and beyond. The next
-step of initializing the partition will fail unless a proper device is
-present. As an example, here are commands you can use in
-<userinput>tty2</userinput> or under <guimenuitem>Execute a shell</guimenuitem>
-to add a device so the 21st partition can be initialized:
-
-<informalexample><screen>
-# cd /dev
-# mknod hda21 b 3 21
-# chgrp disk hda21
-# chmod 660 hda21
-</screen></informalexample>
-
-Booting into the new system will fail unless proper devices are present
-on the target system. After installing the kernel and modules, execute:
-
-<informalexample><screen>
-# cd /target/dev
-# mknod hda21 b 3 21
-# chgrp disk hda21
-# chmod 660 hda21
-</screen></informalexample>
-
-<phrase arch="x86">Remember to mark your boot partition as
-<quote>Bootable</quote>.</phrase>
+</para><para arch="x86">Remember to mark your boot partition as
+<quote>Bootable</quote>.
</para><para condition="mac-fdisk.txt">
diff --git a/nl/partitioning/partition/x86.xml b/nl/partitioning/partition/x86.xml
index d3ec8f247..4f1751b5c 100644
--- a/nl/partitioning/partition/x86.xml
+++ b/nl/partitioning/partition/x86.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39622 untranslated -->
+<!-- original version: 42250 untranslated -->
<sect2 arch="x86"><title>Partitioning for &arch-title;</title>
@@ -10,8 +10,8 @@ you want to preserve that operating system while installing Debian, you may
need to resize its partition to free up space for the Debian installation.
The installer supports resizing of both FAT and NTFS filesystems; when you
get to the installer's partitioning step, select the option
-<guimenuitem>Manually edit partition table</guimenuitem> and then simply
-select an existing partition and change its size.
+<guimenuitem>Manual</guimenuitem> and then simply select an existing
+partition and change its size.
</para><para>
diff --git a/nl/preparing/nondeb-part/x86.xml b/nl/preparing/nondeb-part/x86.xml
index d7f3ed80d..719630d47 100644
--- a/nl/preparing/nondeb-part/x86.xml
+++ b/nl/preparing/nondeb-part/x86.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39622 untranslated -->
+<!-- original version: 42250 untranslated -->
<sect2 arch="x86"><title>Partitioning From DOS or Windows</title>
@@ -35,9 +35,9 @@ contains DOS (including Windows 3.1), Win32 (such as Windows 95, 98, Me,
NT, 2000, XP), or OS/2, and it is desired to put Debian onto the same disk
without destroying the previous system. Note that the installer supports
resizing of FAT and NTFS filesystems as used by DOS and Windows. Simply
-start the installer, select the option to <menuchoice> <guimenuitem>Manually
-edit partition table</guimenuitem> </menuchoice>, select the partition to
-resize, and specify its new size.
+start the installer and when you get to the partitioning step, select the
+option for <menuchoice> <guimenuitem>Manual</guimenuitem> </menuchoice>
+partitioning, select the partition to resize, and specify its new size.
So in most cases you should not need to use the method described below.
</para><para>
diff --git a/nl/using-d-i/modules/kbd-chooser.xml b/nl/using-d-i/modules/kbd-chooser.xml
index b32ae07bc..ea55aed87 100644
--- a/nl/using-d-i/modules/kbd-chooser.xml
+++ b/nl/using-d-i/modules/kbd-chooser.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- original version: 38231 -->
+<!-- original version: 42302 -->
<sect3 id="kbd-chooser">
<title>Een toetsenbord selecteren</title>
@@ -44,35 +44,4 @@ toetsenborden is op deze toets 'alt' gegraveerd). Verder zijn deze twee
indelingen gelijk.
</para>
-
-<note arch="sparc"><para>
-
-Als u een installatie uitvoert op een systeem met een USB toetsenbord van Sun
-en het installatiesysteem is gestart met de standaard 2.4 kernel, dan zal het
-toetsenbord niet correct worden gedetecteerd. Het installatiesysteem zal een
-keuzelijst met Sun-toetsenbordindelingen tonen. Als u er daaruit echter één
-selecteert, zal dit resulteren in een niet werkend toetsenbord. Als u met de
-2.6 kernel installeert, is er geen probleem.
-
-</para><para>
-
-Om een werkend toetsenbord te krijgen, kunt u het installatiesysteem het beste
-starten met parameter <userinput>priority=medium</userinput>. Op het
-moment dat u bij de toetsenbordselectie komt<footnote>
-
-<para>
-Als u de installatie uitvoert met de default prioriteit kunt u de optie
-<userinput>Terug</userinput> gebruiken om naar het hoofdmenu van het
-installatiesysteem te gaan als de keuzelijst met Sun-toetsenbordindelingen
-wordt getoond.
-</para>
-
-</footnote>, selecteert u <quote>Geen toetsenbord configureren</quote> als u
-een toetsenbord met een Amerikaanse (US) indeling heeft, of
-<quote>USB-toetsenbord</quote> voor een toetsenbord met een gelokaliseerde
-indeling. Het selecteren van <quote>Geen toetsenbord configureren</quote>
-heeft tot gevolg dat het systeem de standaard toetsenbordindeling van de kernel
-blijft gebruiken, wat correct is voor US toetsenborden.
-
-</para></note>
</sect3>
diff --git a/nl/using-d-i/modules/mdcfg.xml b/nl/using-d-i/modules/mdcfg.xml
index 80316b63f..6c4659b9f 100644
--- a/nl/using-d-i/modules/mdcfg.xml
+++ b/nl/using-d-i/modules/mdcfg.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- original version: 38703 -->
+<!-- original version: 42251 -->
<sect3 id="mdcfg">
<title>Meervoudige schijfapparaten configureren (Software-RAID)</title>