Update of untranslated documents

3 files changed, 146 insertions, 99 deletions

diff --git a/nl/install-methods/boot-usb-files.xml b/nl/install-methods/boot-usb-files.xml
index 8d707cb62..557fff121 100644
--- a/nl/install-methods/boot-usb-files.xml
+++ b/nl/install-methods/boot-usb-files.xml
@@ -1,21 +1,68 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 45616 untranslated -->
+<!-- original version: 56442 untranslated -->
 
  <sect1 condition="bootable-usb" id="boot-usb-files">
  <title>Preparing Files for USB Memory Stick Booting</title>
 
 <para>
 
-To prepare the USB stick, you will need a system where GNU/Linux is
-already running and where USB is supported. You should ensure that the
-usb-storage kernel module is loaded (<userinput>modprobe
-usb-storage</userinput>) and try to find out which SCSI device the USB
-stick has been mapped to (in this example
-<filename>/dev/sda</filename> is used). To write to your stick, you
-may have to turn off its write protection switch.
+There are two installation methods possible when booting from USB stick.
+The first is to install completely from the network. The second is to
+also copy a CD image onto the USB stick and use that as a source for
+packages, possibly in combination with a mirror. This second method is
+the more common.
+
+</para><para>
+
+For the first installation method you'll need to download an installer
+image from the <filename>netboot</filename> directory (at the location
+mentioned in <xref linkend="where-files"/>) and use the
+<quote>flexible way</quote> explained below to copy the files to the USB
+stick.
+
+</para><para>
+
+Installation images for the second installation method can be found in
+the <filename>hd-media</filename> directory and either the <quote>easy
+way</quote> or the <quote>flexible way</quote> can be used to copy the
+image to the USB stick. For this installation method you will also need
+to download a CD image. The installation image and the CD image must be
+based on the same release of &d-i;. If they do not match you are likely
+to get errors<footnote>
+
+<para>
+The error message that is most likely to be displayed is that no kernel
+modules can be found. This means that the version of the kernel module
+udebs included on the CD image is different from the version of the
+running kernel.
+</para>
+
+</footnote> during the installation.
 
 </para><para>
 
+To prepare the USB stick, you will need a system where GNU/Linux is
+already running and where USB is supported. With current GNU/Linux systems
+the USB stick should be automatically recognized when you insert it. If
+it is not you should check that the usb-storage kernel module is loaded.
+When the USB stick is inserted, it will be mapped to a device named
+<filename>/dev/sdX</filename>, where the <quote>X</quote> is a letter
+in the range a-z. You should be able to see to which device the USB
+stick was mapped by running the command <command>dmesg</command> after
+inserting it. To write to your stick, you may have to turn off its write
+protection switch.
+
+</para>
+<warning><para>
+
+The procedures described in this section will destroy anything already
+on the device! Make very sure that you use the correct device name for
+your USB stick. If you use the wrong device the result could be that all
+information on for example a hard disk could be lost.
+
+</para></warning>
+<para>
+
 Note that the USB stick should be at least 256 MB in size (smaller
 setups are possible if you follow <xref linkend="usb-copy-flexible"/>).
 
@@ -23,47 +70,54 @@ setups are possible if you follow <xref linkend="usb-copy-flexible"/>).
 
   <sect2 id="usb-copy-easy">
   <title>Copying the files &mdash; the easy way</title>
-<para arch="x86">
+<para>
 
 There is an all-in-one file <filename>hd-media/boot.img.gz</filename>
-which contains all the installer files (including the kernel) as well
-as <command>SYSLINUX</command> and its configuration file. You only
-have to extract it directly to your USB stick:
+which contains all the installer files (including the kernel)
+<phrase arch="x86">as well as <classname>syslinux</classname> and its
+configuration file.</phrase>
+<phrase arch="powerpc">as well as <classname>yaboot</classname> and its
+configuration file.</phrase>
+
+</para><para>
+
+Note that, although convenient, this method does have one major
+disadvantage: the logical size of the device will be limited to 256 MB,
+even if the capacity of the USB stick is larger. You will need to
+repartition the USB stick and create new file systems to get its full
+capacity back if you ever want to use it for some different purpose.
+A second disadvantage is that you cannot copy a full CD image onto
+the USB stick, but only the smaller businesscard or netinst CD images.
+
+</para><para arch="x86">
+
+To use this image you only have to extract it directly to your USB stick:
 
 <informalexample><screen>
-# zcat boot.img.gz &gt; /dev/<replaceable>sda</replaceable>
+# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>
 </screen></informalexample>
 
 </para><para arch="powerpc">
 
-There is an all-in-one file <filename>hd-media/boot.img.gz</filename>
-which contains all the installer files (including the kernel) as well
-as <command>yaboot</command> and its configuration file. Create a
-partition of type "Apple_Bootstrap" on your USB stick using
+Create a partition of type "Apple_Bootstrap" on your USB stick using
 <command>mac-fdisk</command>'s <userinput>C</userinput> command and
 extract the image directly to that:
 
 <informalexample><screen>
-# zcat boot.img.gz &gt; /dev/<replaceable>sda2</replaceable>
+# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>
 </screen></informalexample>
 
-</para>
-<warning><para>
-
-Using this method will destroy anything already on the device. Make sure
-that you use the correct device name for your USB stick.
-
-</para></warning>
-<para>
+</para><para>
 
-After that, mount the USB memory stick (<userinput>mount
-<replaceable arch="x86">/dev/sda</replaceable>
-<replaceable arch="powerpc">/dev/sda2</replaceable>
-/mnt</userinput>), which will now have
+After that, mount the USB memory stick
+<phrase arch="x86">(<userinput>mount
+/dev/<replaceable>sdX</replaceable> /mnt</userinput>),</phrase>
+<phrase arch="powerpc">(<userinput>mount
+/dev/<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase>
+which will now have
 <phrase arch="x86">a FAT filesystem</phrase>
 <phrase arch="powerpc">an HFS filesystem</phrase>
-on it, and copy a Debian netinst or businesscard ISO image to it
-(see <xref linkend="usb-add-iso"/>).
+on it, and copy a Debian netinst or businesscard ISO image to it.
 Unmount the stick (<userinput>umount /mnt</userinput>) and you are done.
 
 </para>
@@ -74,40 +128,16 @@ Unmount the stick (<userinput>umount /mnt</userinput>) and you are done.
 <para>
 
 If you like more flexibility or just want to know what's going on, you
-should use the following method to put the files on your stick.
+should use the following method to put the files on your stick. One
+advantage of using this method is that &mdash; if the capacity of your
+USB stick is large enough &mdash; you have the option of copying a
+full CD ISO image to it.
 
 </para>
 
 &usb-setup-x86.xml;
 &usb-setup-powerpc.xml;
 
-   </sect2>
-
-   <sect2 id="usb-add-iso">
-   <title>Adding an ISO image</title>
-<para>
-
-The installer will look for a Debian ISO image on the stick as its source
-for additional data needed for the installation. So your next step is to
-copy a Debian ISO image (businesscard, netinst or even a full CD image)
-onto your stick (be sure to select one that fits). The file name of the
-image must end in <filename>.iso</filename>.
-
-</para><para>
-
-If you want to install over the network, without using an ISO image,
-you will of course skip the previous step. Moreover you will have to
-use the initial ramdisk from the <filename>netboot</filename>
-directory instead of the one from <filename>hd-media</filename>,
-because <filename>hd-media/initrd.gz</filename> does not have network
-support.
-
-</para><para>
-
-When you are done, unmount the USB memory stick (<userinput>umount
-/mnt</userinput>) and activate its write protection switch.
-
-</para>
   </sect2>
 
   <!-- TODO: doesn't this section belong later? -->
@@ -121,7 +151,7 @@ contain an invalid master boot record (MBR). To fix this, use the
 <classname>mbr</classname>:
 
 <informalexample><screen>
-# install-mbr /dev/<replaceable>sda</replaceable>
+# install-mbr /dev/<replaceable>sdX</replaceable>
 </screen></informalexample>
 
 </para></warning>
diff --git a/nl/install-methods/usb-setup/powerpc.xml b/nl/install-methods/usb-setup/powerpc.xml
index fc64d7eb6..2ed205351 100644
--- a/nl/install-methods/usb-setup/powerpc.xml
+++ b/nl/install-methods/usb-setup/powerpc.xml
@@ -1,20 +1,21 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33725 untranslated -->
+<!-- original version: 56442 untranslated -->
 
    <sect3 arch="powerpc">
-   <title>USB stick partitioning on &arch-title;</title>
+   <title>Partitioning the USB stick</title>
 <para>
 
 Most USB sticks do not come pre-configured in such a way that Open
 Firmware can boot from them, so you will need to repartition the stick.
-On Mac systems, run <userinput>mac-fdisk /dev/sda</userinput>,
+On Mac systems, run
+<userinput>mac-fdisk /dev/<replaceable>sdX</replaceable></userinput>,
 initialise a new partition map using the <userinput>i</userinput>
 command, and create a new partition of type Apple_Bootstrap using the
 <userinput>C</userinput> command. (Note that the first "partition" will
 always be the partition map itself.) Then type
 
 <informalexample><screen>
-$ hformat /dev/<replaceable>sda2</replaceable>
+$ hformat /dev/<replaceable>sdX2</replaceable>
 </screen></informalexample>
 
 Take care that you use the correct device name for your USB stick. The
@@ -38,7 +39,7 @@ so you will have to install <command>yaboot</command> by hand using the
 <classname>hfsutils</classname> tools. Type
 
 <informalexample><screen>
-$ hmount /dev/sda2
+$ hmount /dev/<replaceable>sdX2</replaceable>
 $ hcopy -r /usr/lib/yaboot/yaboot :
 $ hattrib -c UNIX -t tbxi :yaboot
 $ hattrib -b :
@@ -52,10 +53,16 @@ mark it in such a way that Open Firmware will boot it. Having done this,
 the rest of the USB stick may be prepared using the normal Unix
 utilities.
 
-</para><para>
+</para>
+   </sect3>
 
-Mount the partition (<userinput>mount /dev/sda2 /mnt</userinput>) and
-copy the following files from the Debian archives to the stick:
+   <sect3 arch="powerpc">
+   <title>Adding the installer image</title>
+<para>
+
+Mount the partition
+(<userinput>mount /dev/<replaceable>sdX2</replaceable> /mnt</userinput>)
+and copy the following installer image files to the stick:
 
 <itemizedlist>
 <listitem><para>
@@ -78,11 +85,6 @@ copy the following files from the Debian archives to the stick:
 <filename>boot.msg</filename> (optional boot message)
 
 </para></listitem>
-<listitem><para>
-
-Optional kernel modules
-
-</para></listitem>
 </itemizedlist>
 
 </para><para>
@@ -106,5 +108,12 @@ image=/vmlinux
 Please note that the <userinput>initrd-size</userinput> parameter
 may need to be increased, depending on the image you are booting.
 
+</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>).
+
 </para>
    </sect3>
diff --git a/nl/install-methods/usb-setup/x86.xml b/nl/install-methods/usb-setup/x86.xml
index 016ad5806..b34dbac4a 100644
--- a/nl/install-methods/usb-setup/x86.xml
+++ b/nl/install-methods/usb-setup/x86.xml
@@ -1,8 +1,8 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 56425 untranslated -->
+<!-- original version: 56442 untranslated -->
 
    <sect3 arch="x86">
-   <title>USB stick partitioning on &arch-title;</title>
+   <title>Partitioning the USB stick</title>
 <para>
 
 We will show how to set up the memory stick to use the first partition,
@@ -17,7 +17,7 @@ or any other partitioning tool to create a FAT16 partition, and then
 create the filesystem using:
 
 <informalexample><screen>
-# mkdosfs /dev/<replaceable>sda1</replaceable>
+# mkdosfs /dev/<replaceable>sdX1</replaceable>
 </screen></informalexample>
 
 Take care that you use the correct device name for your USB stick. The
@@ -28,31 +28,37 @@ Take care that you use the correct device name for your USB stick. The
 
 In order to start the kernel after booting from the USB stick, we will
 put a boot loader on the stick. Although any boot loader
-(e.g. <command>LILO</command>) should work, it's convenient to use
-<command>SYSLINUX</command>, since it uses a FAT16 partition and can
+(e.g. <classname>lilo</classname>) should work, it's convenient to use
+<classname>syslinux</classname>, since it uses a FAT16 partition and can
 be reconfigured by just editing a text file. Any operating system
 which supports the FAT file system can be used to make changes to the
 configuration of the boot loader.
 
 </para><para>
 
-To put <command>SYSLINUX</command> on the FAT16 partition on your USB
+To put <classname>syslinux</classname> on the FAT16 partition on your USB
 stick, install the <classname>syslinux</classname> and
 <classname>mtools</classname> packages on your system, and do:
 
 <informalexample><screen>
-# syslinux /dev/<replaceable>sda1</replaceable>
+# syslinux /dev/<replaceable>sdX1</replaceable>
 </screen></informalexample>
 
 Again, take care that you use the correct device name. The partition
-must not be mounted when starting <command>SYSLINUX</command>. This
+must not be mounted when starting <command>syslinux</command>. This
 procedure writes a boot sector to the partition and creates the file
 <filename>ldlinux.sys</filename> which contains the boot loader code.
 
-</para><para>
+</para>
+   </sect3>
 
-Mount the partition (<userinput>mount /dev/sda1 /mnt</userinput>) and
-copy the following files from the Debian archives to the stick:
+   <sect3 arch="x86">
+   <title>Adding the installer image</title>
+<para>
+
+Mount the partition
+(<userinput>mount /dev/<replaceable>sdX1</replaceable> /mnt</userinput>)
+and copy the following installer image files to the stick:
 
 <itemizedlist>
 <listitem><para>
@@ -65,30 +71,32 @@ copy the following files from the Debian archives to the stick:
 <filename>initrd.gz</filename> (initial ramdisk image)
 
 </para></listitem>
-<listitem><para>
-
-<filename>syslinux.cfg</filename> (SYSLINUX configuration file)
-
-</para></listitem>
-<listitem><para>
-
-Optional kernel modules
-
-</para></listitem>
 </itemizedlist>
 
-If you want to rename the files, please note that
-<command>SYSLINUX</command> can only process DOS (8.3) file names.
+You can choose between either the regular version or the graphical version
+of the installer. The latter can be found in the <filename>gtk</filename>
+subdirectory. If you want to rename the files, please note that
+<classname>syslinux</classname> can only process DOS (8.3) file names.
 
 </para><para>
 
-The <filename>syslinux.cfg</filename> configuration file should
-contain the following two lines:
+Next you should create a <filename>syslinux.cfg</filename> configuration
+file, which at a bare minimum should contain the following two lines:
 
 <informalexample><screen>
 default vmlinuz
 append initrd=initrd.gz
 </screen></informalexample>
 
+For the graphical installer you should add
+<userinput>video=vesa:ywrap,mtrr vga=788</userinput> to the second line.
+
+</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>).
+
 </para>
    </sect3>