Update untranslated documents

5 files changed, 38 insertions, 28 deletions

diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index 34e53adea..55de60a2b 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 45355 untranslated -->
+<!-- original version: 45612 untranslated -->
 
 <!--
 Be careful with the format of this file as it is parsed to generate
@@ -837,6 +837,8 @@ same as <classname>mirror/suite</classname>.
 </para>
 
 <informalexample role="example"><screen>
+# If you select ftp, the mirror/country string does not need to be set.
+#d-i mirror/protocol string ftp
 d-i mirror/country string enter information manually
 d-i mirror/http/hostname string &archive-mirror;
 d-i mirror/http/directory string /debian
@@ -1042,6 +1044,8 @@ earlier questions. You can optionally add other (local) repositories.
 # You can choose to install non-free and contrib software.
 #d-i apt-setup/non-free boolean true
 #d-i apt-setup/contrib boolean true
+# Uncomment this if you don't want to use a network mirror.
+#d-i apt-setup/use_mirror boolean false
 # Uncomment this to avoid adding security sources, or
 # add a hostname to use a different server than security.debian.org.
 #d-i apt-setup/security_host string
diff --git a/nl/boot-installer/m68k.xml b/nl/boot-installer/m68k.xml
index 47b539087..329486450 100644
--- a/nl/boot-installer/m68k.xml
+++ b/nl/boot-installer/m68k.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 38231 untranslated -->
+<!-- original version: 45435 untranslated -->
 
   <sect2 arch="m68k"><title>Choosing an Installation Method</title>
 
@@ -220,12 +220,14 @@ running and cause random problems with the running linux kernel.
 
 </para><para>
 
-Macs require the <command>Penguin</command>
-bootloader. If you do not have the tools to handle
-a <command>Stuffit</command> archive, &penguin19.hfs; is an
-hfs disk image with <command>Penguin</command> unpacked.
-<xref linkend="create-floppy"/> describes how to copy this
-image to a floppy.
+Macs require the <command>Penguin</command> bootloader, which can be
+downloaded from <ulink url="&url-m68k-mac;">the Linux/mac68k
+sourceforge.net project</ulink>. If you do not have the tools to handle
+a <command>Stuffit</command> archive, you can put it on a
+MacOS-formatted floppy using a second GNU/Linux machine of any
+architecture and the <command>hmount</command>,
+<command>hcopy</command>, and <command>humount</command> tools from the
+<classname>hfsutils</classname> suite.
 
 </para><para>
 
diff --git a/nl/install-methods/boot-usb-files.xml b/nl/install-methods/boot-usb-files.xml
index 8acfebbbd..8d707cb62 100644
--- a/nl/install-methods/boot-usb-files.xml
+++ b/nl/install-methods/boot-usb-files.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39622 untranslated -->
+<!-- original version: 45616 untranslated -->
 
  <sect1 condition="bootable-usb" id="boot-usb-files">
  <title>Preparing Files for USB Memory Stick Booting</title>
@@ -62,8 +62,8 @@ After that, mount the USB memory stick (<userinput>mount
 /mnt</userinput>), 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.
-Please note that the file name must end in <filename>.iso</filename>.
+on it, and copy a Debian netinst or businesscard ISO image to it
+(see <xref linkend="usb-add-iso"/>).
 Unmount the stick (<userinput>umount /mnt</userinput>) and you are done.
 
 </para>
@@ -82,7 +82,8 @@ should use the following method to put the files on your stick.
 &usb-setup-powerpc.xml;
 
    </sect2>
-   <sect2>
+
+   <sect2 id="usb-add-iso">
    <title>Adding an ISO image</title>
 <para>
 
diff --git a/nl/install-methods/create-floppy.xml b/nl/install-methods/create-floppy.xml
index 3ce8ca65a..a14602dac 100644
--- a/nl/install-methods/create-floppy.xml
+++ b/nl/install-methods/create-floppy.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36841 untranslated -->
+<!-- original version: 45453 untranslated -->
 
  <sect1 condition="supports-floppy-boot" id="create-floppy">
  <title>Creating Floppies from Disk Images</title>
@@ -37,6 +37,14 @@ different platforms.
 
 </para><para>
 
+Before you can create the floppies, you will first need to download them
+from one of the Debian mirrors, as explained in
+<xref linkend="downloading-files"/>. <phrase arch="i386">If you already
+have an installation CD-ROM or DVD, the floppy images may also be included
+on the CD/DVD.</phrase>
+
+</para><para>
+
 No matter which method you use to create your floppies, you should
 remember to flip the write-protect tab on the floppies once you have
 written them, to ensure they are not damaged unintentionally.
@@ -55,20 +63,17 @@ $ dd if=<replaceable>filename</replaceable> of=/dev/fd0 bs=1024 conv=sync ; sync
 </screen></informalexample>
 
 where <replaceable>filename</replaceable> is one of the floppy disk image
-files (see <xref linkend="downloading-files"/> for what
-<replaceable>filename</replaceable> should be).
+files.
 <filename>/dev/fd0</filename> is a commonly used name of the floppy
-disk device, it may be different on your workstation
-<phrase arch="sparc">(on Solaris, it is
-<filename>/dev/fd/0</filename>)</phrase>.
+disk device, it may be different on your workstation<phrase arch="sparc">
+(on Solaris, it is <filename>/dev/fd/0</filename>)</phrase>.
 The command may return to the
 prompt before Unix has finished writing the floppy disk, so look for
 the disk-in-use light on the floppy drive and be sure that the light
 is out and the disk has stopped revolving before you remove it from
 the drive. On some systems, you'll have to run a command to eject the
-floppy from the drive
-<phrase arch="sparc">(on Solaris, use <command>eject</command>, see
-the manual page)</phrase>.
+floppy from the drive <phrase arch="sparc"> (on Solaris, use
+<command>eject</command>, see the manual page)</phrase>.
 
 </para><para>
 
diff --git a/nl/install-methods/floppy/m68k.xml b/nl/install-methods/floppy/m68k.xml
index 839eefcea..749f39956 100644
--- a/nl/install-methods/floppy/m68k.xml
+++ b/nl/install-methods/floppy/m68k.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 18672 untranslated -->
+<!-- original version: 45433 untranslated -->
 
 
   <sect2 arch="m68k"><title>Writing Disk Images on Atari Systems</title>
@@ -17,12 +17,10 @@ written to the floppy at the TOS program command line dialog box.
   <sect2 arch="m68k"><title>Writing Disk Images on Macintosh Systems</title>
 <para>
 
-There is no MacOS application to write images to floppy disks
-(and there would be no point in doing this as you can't use these
-floppies to boot the installation system or install kernel and modules
-from on Macintosh).  However, these files are needed for the
-installation of the operating system and modules, later in the
-process.
+Since the current release does not yet support booting from floppies to
+start the installation, there would be no point in doing this on
+Macintosh Systems.  However, these files are needed for the installation
+of the operating system and modules, later in the process.
 
 </para>