Index: appendices/acronymlist.xml
===================================================================
--- appendices/acronymlist.xml	(revision 4b41f4cd261a927a1c6e14369ebd77088152d2a1)
+++ appendices/acronymlist.xml	(revision 3d23af3e2cb91e797146b277f293fcaaba282ed1)
@@ -388,4 +388,11 @@
 
     <varlistentry>
+      <term><emphasis role="bold">OF</emphasis></term>
+      <listitem>
+        <para>Open Firmware</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term><emphasis role="bold">OSS</emphasis></term>
       <listitem>
Index: bootable/ppc/yaboot.xml
===================================================================
--- bootable/ppc/yaboot.xml	(revision 4b41f4cd261a927a1c6e14369ebd77088152d2a1)
+++ bootable/ppc/yaboot.xml	(revision 3d23af3e2cb91e797146b277f293fcaaba282ed1)
@@ -17,6 +17,5 @@
   <para os="a">Your shiny new LFS system is almost complete. One of the last
   things to do is to ensure that the system can be properly booted. The
-  instructions below apply only to NewWorld Macintoshes and (probably)
-  PegasosPPC.</para>
+  instructions below apply only to NewWorld Macintoshes.</para>
 
   <para os="b">Boot loading can be a complex area, so a few cautionary words
@@ -24,10 +23,11 @@
   operating systems present on the hard drive(s) that need to be bootable.
   Make sure that an emergency CD is ready to <quote>rescue</quote> the
-  computer if it becomes un-bootable.</para>
+  computer if it becomes un-bootable.  It is also a good idea to enable booting
+  from Open Firmware in case things go really wrong.</para>
 
   <para os="c">Earlier, we compiled and installed the yaboot boot loader software
   in preparation for this step. The procedure involves writing the bootloader
-  to a bootstrap partition and blessing it so that OpenFirmware will boot from
-  it.  This is all handled by <command>ybin</command> the yaboot installer.</para> 
+  to a bootstrap partition and blessing it so that Open Firmware will boot from
+  it.  This is all handled by <command>ybin</command> the yaboot installer.</para>
 
   <para os="d">Ybin assembles all the information it needs by reading yaboot.conf,
@@ -42,5 +42,6 @@
   details.  Most people will be able to specify device=hd: (for a single hard disk),
   but if you have multiple disks, or if you wish to be pedantic, you can specify the
-  full OF path to the device, obtained by running <command>ofpath</command>.</para>
+  full OF path to the device, obtained by running <command>ofpath /dev/hdX</command>
+  .</para>
 
   <para os="f">Note that the man page mentions which filesystems yaboot can
@@ -57,4 +58,13 @@
   <filename class="partition">hda4</filename>.  Change these items as necessary
   for your machine.</para>
+
+  <para os="i">If your machine has a SATA disk, specify the partitions using
+  <filename class="devicefile">/dev/sda7</filename> and so forth in the usual
+  way.  At least some of the distros specify a full OF path to the 'device' and
+  to the image(s), such as
+  <filename class="devicefile">device=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:
+  </filename> for the disk, and
+  <filename class="partition">image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/lfskernel-&linux-version;
+  </filename> which definitely works.</para>
 
   <para os="k">Create a <quote>yaboot.conf</quote> file defining yaboot's boot
@@ -90,10 +100,19 @@
 enablecdboot
 
+# allow the initial menu to offer booting from Open Firmware
+enableofboot
+
 # allow the initial menu to boot from mac osx
 macosx=/dev/hda4
 
+# white on black is boring!
+# note  the spellings : 'fgcolor' but 'light'
+# in this context, light means 'without high intensity'
+fgcolor=light-green
+
 # The first entry is for LFS.
 # For all images, the pathname is relative to the filesystem
-# on which they are mounted.
+# on which they are situated and can include at most one
+# directory
 image=/boot/lfskernel-&linux-version;
     label=&version;
Index: final-system/ppc/yaboot.xml
===================================================================
--- final-system/ppc/yaboot.xml	(revision 4b41f4cd261a927a1c6e14369ebd77088152d2a1)
+++ final-system/ppc/yaboot.xml	(revision 3d23af3e2cb91e797146b277f293fcaaba282ed1)
@@ -19,5 +19,5 @@
 
     <para>The Yaboot package contains a PowerPC Boot Loader for machines using
-    OpenFirmware such as NewWorld Macintoshes.</para>
+    Open Firmware such as NewWorld Macintoshes.</para>
 
   </sect2>
@@ -97,5 +97,5 @@
         <listitem>
           <para>Script to format the boot menu using yaboot.conf and
-    write the resulting OpenFirmware code to the bootstrap.</para>
+    write the resulting Open Firmware code to the bootstrap.</para>
           <indexterm zone="ch-system-yaboot ofboot">
             <primary sortas="b-ofboot">ofboot</primary>
@@ -107,5 +107,5 @@
         <term><command>ofpath</command></term>
         <listitem>
-          <para>Determine OpenFirmware path corresponding to a device
+          <para>Determine Open Firmware path corresponding to a device
     node.</para>
           <indexterm zone="ch-system-yaboot ofpath">
@@ -118,5 +118,5 @@
         <term><command>yaboot</command></term>
         <listitem>
-          <para>OpenFirmware boot loader.</para>
+          <para>Open Firmware boot loader.</para>
           <indexterm zone="ch-system-yaboot yaboot">
             <primary sortas="b-yaboot">yaboot</primary>
Index: introduction/ppc/changelog.xml
===================================================================
--- introduction/ppc/changelog.xml	(revision 4b41f4cd261a927a1c6e14369ebd77088152d2a1)
+++ introduction/ppc/changelog.xml	(revision 3d23af3e2cb91e797146b277f293fcaaba282ed1)
@@ -39,4 +39,9 @@
         <listitem>
           <para>[ken] - Include the SATA patch for yaboot.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - Tidy up yaboot.conf, and drop references to pegasos ppc
+	  - it seems to need other patch(es) for yaboot, and perhaps different
+	  parameters in yaboot.conf.  Also spell Open Firmware as two words.</para>
         </listitem>
       </itemizedlist>
