* Debian-installer partition table editing tool not compatible with

    MacOS 9. Closes: #604134.

2 files changed, 18 insertions, 22 deletions

diff --git a/en/preparing/non-debian-partitioning.xml b/en/preparing/non-debian-partitioning.xml
index e29057491..c634c17d5 100644
--- a/en/preparing/non-debian-partitioning.xml
+++ b/en/preparing/non-debian-partitioning.xml
@@ -30,7 +30,7 @@ If you already have an operating system on your system
 
 which uses the whole disk and you want to stick &debian; on the same disk, you will need to repartition
 it. &debian; requires its own hard disk partitions. It cannot be
-installed on Windows or MacOS partitions. It may be able to share some
+installed on Windows or Mac OS X partitions. It may be able to share some
 partitions with other Unix systems, but that's not covered here. At
 the very least you will need a dedicated partition for the &debian;
 root filesystem.
@@ -41,7 +41,7 @@ You can find information about your current partition setup by using
 a partitioning tool for your current operating system<phrase
 arch="any-x86">, such as the integrated Disk Manager in Windows or fdisk in
 DOS</phrase><phrase
-arch="powerpc">, such as Drive Setup, HD Toolkit, or MacTools</phrase><phrase
+arch="powerpc">, such as Disk Utility, Drive Setup, HD Toolkit, or MacTools</phrase><phrase
 arch="s390">, such as the VM diskmap</phrase>. Partitioning tools always
 provide a way to show existing partitions without making changes.
 
@@ -108,7 +108,7 @@ the native system first saves you trouble.
 
 In order for OpenFirmware to automatically boot &debian-gnu; the &arch-parttype;
 partitions should appear before all other partitions on the disk,
-especially MacOS boot partitions. This should be kept in mind when
+especially Mac OS X boot partitions. This should be kept in mind when
 pre-partitioning; you should create a &arch-parttype; placeholder partition to
 come <emphasis>before</emphasis> the other bootable partitions on the
 disk. (The small partitions dedicated to Apple disk drivers are not
diff --git a/en/preparing/nondeb-part/powerpc.xml b/en/preparing/nondeb-part/powerpc.xml
index f9baf3bbc..6681589f4 100644
--- a/en/preparing/nondeb-part/powerpc.xml
+++ b/en/preparing/nondeb-part/powerpc.xml
@@ -2,14 +2,13 @@
 <!-- $Id$ -->
 
 
-  <sect2 arch="powerpc"><title>MacOS/OSX Partitioning</title>
+  <sect2 arch="powerpc"><title>Mac OS X Partitioning</title>
 
 <para>
 
-The <application>Apple Drive Setup</application> application can be found in the
-<filename>Utilities</filename> folder on the MacOS CD. It will not adjust existing
-partitions; it is limited to partitioning the entire disk at once. The
-disk driver partitions don't show up in <application>Drive Setup</application>.
+The <application>Disk Utility</application> application can be found under the
+<filename>Utilities</filename> menu in Mac OS X Installer. It will not adjust 
+existing partitions; it is limited to partitioning the entire disk at once.
 
 </para><para>
 
@@ -19,25 +18,22 @@ is, it will be deleted and replaced later inside the &debian-gnu; installer.
 
 </para><para>
 
-If you are planning to install both MacOS 9 and OS X, it is best to
-create separate partitions for OS 9 and OS X. If they are installed on
-the same partition, <application>Startup Disk</application> (and reboot) must be used to select
-between the two; the choice between the two systems can't be made at
-boot time. With separate partitions, separate options for OS 9 and OS
-X will appear when holding the <keycap>option</keycap> key at boot time, and separate
-options can be installed in the <application>yaboot</application> boot menu as well. Also,
-Startup Disk will de-bless all other mountable partitions, which can
-affect GNU/Linux booting. Both OS 9 and OS X partitions will be
-accessible from either OS 9 or OS X.
+&debian; installer partition table editing tools are compatible with OS X, 
+but not with MacOS 9. If you are planning to use both MacOS 9 and OS X, it 
+is best to install OS X and &debian; on one hard drive, and put MacOS 9 
+on a separate hard drive.  Separate options for OS 9 and OS X will appear when 
+holding the <keycap>option</keycap> key at boot time, and separate
+options can be installed in the <application>yaboot</application> boot menu as 
+well. 
 
 </para><para>
 
-GNU/Linux is unable to access information on UFS partitions, but does
-support HFS+ (aka MacOS Extended) partitions. OS X requires one of these
+GNU/Linux is unable to access information on UFS partitions, but can access 
+HFS+ (aka MacOS Extended) partitions. OS X requires one of these
 two types for its boot partition. MacOS 9 can be installed on either HFS
-(aka MacOS Standard) or HFS+. To share information between the MacOS and
+(aka MacOS Standard) or HFS+. To share information between the Mac OS X and
 GNU/Linux systems, an exchange partition is handy. HFS, HFS+ and MS-DOS FAT
-partitions are supported by both MacOS and Linux.
+file systems are supported by MacOS 9, Mac OS X and GNU/Linux.
 
 </para>
   </sect2>