4 files changed, 55 insertions, 41 deletions
diff --git a/nl/install-methods/download/arm.xml b/nl/install-methods/download/arm.xml
index 687b6deb9..1a9dd5664 100644
--- a/nl/install-methods/download/arm.xml
+++ b/nl/install-methods/download/arm.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 58440 untranslated -->
+<!-- original version: 61346 untranslated -->
 
 
    <sect3 arch="arm" id="nslu2-install-files">
@@ -66,9 +66,22 @@ obtained from &mv2120-firmware-img;.
    <title>QNAP Turbo Station Installation Files</title>
 <para>
 
-The QNAP Turbo Station (TS-109, TS-209 and TS-409) requires a kernel and
-ramdisk which can be obtained from &qnap-orion-firmware-img;.  A script is
-provided to write these images to flash.
+The installation files for the QNAP Turbo Station consist of a kernel and
+ramdisk as well as a script to write these images to flash.  You can obtain
+the installation files for QNAP TS-109 and TS-209 from
+&qnap-orion-firmware-img; and for QNAP TS-110, TS-119, TS-210, TS-219,
+TS-219P from &qnap-kirkwood-firmware-img;.
+
+</para>
+   </sect3>
+
+   <sect3 arch="arm" id="marvell-install-files">
+   <title>SheevaPlug and OpenRD Installation Files</title>
+<para>
+
+The installation files for the Marvell SheevaPlug and OpenRD devices
+consist of a kernel and initrd for U-Boot.  You can obtain these files
+from &kirkwood-marvell-firmware-img;.
 
 </para>
    </sect3>
diff --git a/nl/install-methods/install-tftp.xml b/nl/install-methods/install-tftp.xml
index 5988ed085..999b3469e 100644
--- a/nl/install-methods/install-tftp.xml
+++ b/nl/install-methods/install-tftp.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 61147 untranslated -->
+<!-- original version: 62454 untranslated -->
 
  <sect1 condition="supports-tftp" id="install-tftp">
  <title>Preparing Files for TFTP Net Booting</title>
@@ -53,34 +53,33 @@ this section, we shall provide commands for SunOS 4.x, SunOS 5.x
 
 <note arch="x86"><para>
 
-To use the Pre-boot Execution Environment (PXE) method of TFTP
-booting, you will need a TFTP server with <userinput>tsize</userinput>
-support.  On a &debian; server, the <classname>atftpd</classname> and
-<classname>tftpd-hpa</classname> packages qualify; we recommend
-<classname>tftpd-hpa</classname>.
+For a &debian; server we recommend <classname>tftpd-hpa</classname>.
+It's written by the same author as the <classname>syslinux</classname>
+bootloader and is therefore least likely to cause issues.
+A good alternative is <classname>atftpd</classname>.
 
 </para></note>
 
 </para>
 
 &tftp-rarp.xml;
-&tftp-bootp.xml;
 &tftp-dhcp.xml;
+&tftp-bootp.xml;
 
   <sect2 id="tftpd">
   <title>Enabling the TFTP Server</title>
 <para>
 
 To get the TFTP server ready to go, you should first make sure that
-<command>tftpd</command> is enabled.  This is usually enabled by having
-something like the following line in <filename>/etc/inetd.conf</filename>:
+<command>tftpd</command> is enabled.
 
-<informalexample><screen>
-tftp dgram udp wait nobody /usr/sbin/tcpd in.tftpd /tftpboot
-</screen></informalexample>
+</para><para>
 
-Debian packages will in general set this up correctly by default when they
-are installed.
+In the case of <classname>tftpd-hpa</classname> there are two ways the
+service can be run. It can be started on demand by the system's
+<classname>inetd</classname> daemon, or it can be set up to run as an
+independent daemon. Which of these methods is used is selected when the
+package is installed and can be changed by reconfiguring the package.
 
 </para>
 <note><para>
@@ -95,23 +94,11 @@ configuration examples in this section accordingly.
 </para></note>
 <para>
 
-Look in <filename>/etc/inetd.conf</filename> and remember the directory which
-is used as the argument of <command>in.tftpd</command><footnote>
-
-<para>
 All <command>in.tftpd</command> alternatives available in Debian should
 log TFTP requests to the system logs by default. Some of them support a
 <userinput>-v</userinput> argument to increase verbosity.
 It is recommended to check these log messages in case of boot problems
 as they are a good starting point for diagnosing the cause of errors.
-</para>
-
-</footnote>; you'll need that below.
-If you've had to change <filename>/etc/inetd.conf</filename>, you'll have to
-notify the running <command>inetd</command> process that the file has changed.
-On a Debian machine, run <userinput>/etc/init.d/inetd reload</userinput>; on
-other machines, find out the process ID for <command>inetd</command>, and run
-<userinput>kill -HUP <replaceable>inetd-pid</replaceable></userinput>.
 
 </para><para arch="mips">
 
diff --git a/nl/install-methods/tftp/rarp.xml b/nl/install-methods/tftp/rarp.xml
index e449b79ac..47715f8db 100644
--- a/nl/install-methods/tftp/rarp.xml
+++ b/nl/install-methods/tftp/rarp.xml
@@ -1,6 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39897 untranslated -->
-
+<!-- original version: 62401 untranslated -->
 
   <sect2 condition="supports-rarp" id="tftp-rarp">
   <title>Setting up RARP server</title>
@@ -14,7 +13,7 @@ If you don't know this information, you can
 OpenBoot <userinput>.enet-addr</userinput> command, or </phrase>
 
 boot into <quote>Rescue</quote> mode (e.g., from the rescue floppy) and use the
-command <userinput>/sbin/ifconfig eth0</userinput>.
+command <userinput>ip addr show dev eth0</userinput>.
 
 </para><para>
 
diff --git a/nl/install-methods/usb-setup/x86.xml b/nl/install-methods/usb-setup/x86.xml
index b34dbac4a..5694b170b 100644
--- a/nl/install-methods/usb-setup/x86.xml
+++ b/nl/install-methods/usb-setup/x86.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 56442 untranslated -->
+<!-- original version: 61286 untranslated -->
 
    <sect3 arch="x86">
    <title>Partitioning the USB stick</title>
@@ -13,8 +13,13 @@ instead of the entire device.
 Since most USB sticks come pre-configured with a single FAT16
 partition, you probably won't have to repartition or reformat the
 stick.  If you have to do that anyway, use <command>cfdisk</command>
-or any other partitioning tool to create a FAT16 partition, and then
-create the filesystem using:
+or any other partitioning tool to create a FAT16 partition<footnote>
+
+<para>
+Don't forget to set the <quote>bootable</quote> bootable flag.
+</para>
+
+</footnote>, and then create the filesystem using:
 
 <informalexample><screen>
 # mkdosfs /dev/<replaceable>sdX1</replaceable>
@@ -63,7 +68,7 @@ and copy the following installer image files to the stick:
 <itemizedlist>
 <listitem><para>
 
-<filename>vmlinuz</filename> (kernel binary)
+<filename>vmlinuz</filename> or <filename>linux</filename> (kernel binary)
 
 </para></listitem>
 <listitem><para>
@@ -81,7 +86,9 @@ subdirectory. If you want to rename the files, please note that
 </para><para>
 
 Next you should create a <filename>syslinux.cfg</filename> configuration
-file, which at a bare minimum should contain the following two lines:
+file, which at a bare minimum should contain the following two lines (change
+the name of the kernel binary to <quote><filename>linux</filename></quote>
+if you used a <filename>netboot</filename> image):
 
 <informalexample><screen>
 default vmlinuz
@@ -94,9 +101,17 @@ For the graphical installer you should add
 </para><para>
 
 If you used an <filename>hd-media</filename> image, you should now copy a
-Debian ISO image (businesscard, netinst or full CD image; be sure to select
-one that fits) onto the stick. When you are done, unmount the USB memory
-stick (<userinput>umount /mnt</userinput>).
+Debian ISO image<footnote>
+
+<para>
+You can use either a businesscard, a netinst or a full CD image (see
+<xref linkend="official-cdrom"/>). Be sure to select one that fits.
+Note that the <quote>netboot <filename>mini.iso</filename></quote> image is
+not usable for this purpose.
+</para>
+
+</footnote> onto the stick. When you are done, unmount the USB memory stick
+(<userinput>umount /mnt</userinput>).
 
 </para>
    </sect3>