Apply patch from Frank Lichtenheld to improve netboot instructions for PowerPC.

The update to install-tftp.xml has been modified slightly and no longer
mentions the '-l' option for in.tftpd.

3 files changed, 57 insertions, 18 deletions

diff --git a/en/boot-installer/powerpc.xml b/en/boot-installer/powerpc.xml
index 240f49ff2..8f38312a6 100644
--- a/en/boot-installer/powerpc.xml
+++ b/en/boot-installer/powerpc.xml
@@ -79,10 +79,7 @@ You will have already placed the <filename>vmlinux</filename>,
 <filename>initrd.gz</filename>, <filename>yaboot</filename>, and
 <filename>yaboot.conf</filename> files at the root level of your HFS
 partition in <xref linkend="files-newworld"/>.
-Restart the computer, and immediately (during the chime) hold down the
-<keycap>Option</keycap>, <keycap>Command (cloverleaf/Apple)</keycap>,
-<keycap>o</keycap>, and <keycap>f</keycap> keys all together. After
-a few seconds you will be presented with the Open Firmware prompt.
+You will now have to boot into OpenFirmware (see <xref linkend="invoking-openfirmware"/>).
 At the prompt, type
 
 <informalexample><screen>
@@ -126,10 +123,7 @@ linkend="boot-usb-files"/>. To boot a Macintosh system from a USB stick,
 you will need to use the Open Firmware prompt, since Open Firmware does
 not search USB storage devices by default.
 <!-- TODO: although it could be made to; watch this space -->
-To get to the prompt, hold down
-<keycombo><keycap>Command</keycap> <keycap>Option</keycap>
-<keycap>o</keycap> <keycap>f</keycap></keycombo> all together while
-booting (see <xref linkend="invoking-openfirmware"/>).
+See <xref linkend="invoking-openfirmware"/>.
 
 </para><para>
 
@@ -186,10 +180,26 @@ Currently, PReP and New World PowerMac systems support netbooting.
 
 On machines with Open Firmware, such as NewWorld Power Macs, enter the
 boot monitor (see <xref linkend="invoking-openfirmware"/>) and
-use the command <command>boot enet:0</command>.  PReP and CHRP boxes
+use the command
+
+<informalexample><screen>
+0 &gt; boot enet:0
+</screen></informalexample>
+
+If this doesn't work, you might have to add the filename like this:
+
+<informalexample><screen>
+0 &gt; boot enet:0,yaboot
+</screen></informalexample>
+
+PReP and CHRP boxes
 may have different ways of addressing the network.  On a PReP machine,
 you should try
-<userinput>boot net:<replaceable>server_ipaddr</replaceable>,<replaceable>file</replaceable>,<replaceable>client_ipaddr</replaceable></userinput>.
+
+<informalexample><screen>
+boot net:<replaceable>server_ipaddr</replaceable>,<replaceable>file</replaceable>,<replaceable>client_ipaddr</replaceable>
+</screen></informalexample>
+
 On some PReP systems (e.g. Motorola PowerStack machines) the command
 <userinput>help boot</userinput> may give a description of syntax and
 available options.
diff --git a/en/install-methods/install-tftp.xml b/en/install-methods/install-tftp.xml
index 6bbf86215..8e96d4837 100644
--- a/en/install-methods/install-tftp.xml
+++ b/en/install-methods/install-tftp.xml
@@ -119,9 +119,11 @@ Look in <filename>/etc/inetd.conf</filename> and remember the directory which
 is used as the argument of <command>in.tftpd</command><footnote>
 
 <para>
-The <userinput>-l</userinput> argument enables some versions of
-<command>in.tftpd</command> to log all requests to the system logs;
-this is useful for diagnosing boot errors.
+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.
@@ -172,9 +174,36 @@ TFTP client, and there are no strong standards.
 On NewWorld Power Macintosh machines, you will need to set up the
 <command>yaboot</command> boot loader as the TFTP boot image.
 <command>Yaboot</command> will then retrieve the kernel and RAMdisk
-images via TFTP itself.  For net booting, use the
-<filename>yaboot-netboot.conf</filename>.  Just rename this to
-<filename>yaboot.conf</filename> in the TFTP directory.
+images via TFTP itself. You will need to download the following files
+from the <filename>netboot/</filename> directory:
+
+<itemizedlist>
+<listitem><para>
+
+<filename>vmlinux</filename>
+
+</para></listitem>
+<listitem><para>
+
+<filename>initrd.gz</filename>
+
+</para></listitem>
+<listitem><para>
+
+<filename>yaboot</filename>
+
+</para></listitem>
+<listitem><para>
+
+<filename>yaboot.conf</filename>
+
+</para></listitem>
+<listitem><para>
+
+<filename>boot.msg</filename>
+
+</para></listitem>
+</itemizedlist>
 
 </para><para arch="x86">
 
diff --git a/en/preparing/bios-setup/powerpc.xml b/en/preparing/bios-setup/powerpc.xml
index 0d554f3a6..fda8e0950 100644
--- a/en/preparing/bios-setup/powerpc.xml
+++ b/en/preparing/bios-setup/powerpc.xml
@@ -15,8 +15,8 @@ documentation which came with your machine.
 </para><para>
 
 On &arch-title; Macintoshes, you invoke OpenFirmware with
-<keycombo><keycap>Command</keycap> <keycap>option</keycap>
-<keycap>O</keycap> <keycap>F</keycap></keycombo> while booting.  Generally it
+<keycombo><keycap>Command (cloverleaf/Apple)</keycap> <keycap>Option </keycap>
+<keycap>o</keycap> <keycap>f</keycap></keycombo> while booting.  Generally it
 will check for these keystrokes after the chime, but the exact timing
 varies from model to model.  See
 <ulink url="&url-netbsd-powerpc-faq;"></ulink> for more hints.