MacOS -> Mac OS;

ok drahn@ miod@

6 files changed, 36 insertions, 36 deletions

diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index 22fd882b15d..8a45553c5d4 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.39 2003/09/09 22:29:04 miod Exp $
+dnl	$OpenBSD: contents,v 1.40 2004/03/15 08:37:25 xsa Exp $
 TopPart
 
 OpenBSDdistsets
@@ -16,7 +16,7 @@ OpenBSDdistsets
 				function with OpenBSD/MACHINE.  You must
 				install either this or bsd.tgz.
 
-		utils/		The MACHINE installation utilities for MacOS.
+		utils/		The MACHINE installation utilities for Mac OS.
 
 DistributionDescription(ten)
 
@@ -41,23 +41,23 @@ OpenBSDxserv(0.5,1.1)
 OpenBSDxshare(1.7,8.6)
 
 The directory '../OSREV/MACHINE/utils' contains a number of utilities for the
-MacOS to aid the installation and configuration of OpenBSD.  The files are
+Mac OS to aid the installation and configuration of OpenBSD.  The files are
 distributed in Macintosh BinHex format, which is used to make SEA (Self-
 Extracting Archive) files, which are then used to make the executables.  The
 files in this directory are as follows:
 
 	Booter1.11.3.sea.hqx
-		 This MacOS program is used to load the OpenBSD kernel and
+		 This Mac OS program is used to load the OpenBSD kernel and
 		 start the operating system.  In all cases, you will need to
 		 download this file.
 
 	Installer_1.2.sea.hqx
-		 This is the MacOS program used to install downloaded sets
+		 This is the Mac OS program used to install downloaded sets
 		 (such as those from the bins directory) onto a BSD partition.
 		 It is necessary in either the case of a fresh install or an
 		 upgrade.
 
 	Mkfs_1.45.sea.hqx
-		 A MacOS program to build BSD filesystems on various
+		 A Mac OS program to build BSD filesystems on various
 		 partitions you have created (see below).  You will need this
 		 if you are performing a new installation.
diff --git a/distrib/notes/mac68k/hardware b/distrib/notes/mac68k/hardware
index fb8868ed3fc..70b0bad9e73 100644
--- a/distrib/notes/mac68k/hardware
+++ b/distrib/notes/mac68k/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.17 2003/05/05 20:18:02 miod Exp $
+dnl	$OpenBSD: hardware,v 1.18 2004/03/15 08:37:25 xsa Exp $
 OpenBSD/MACHINE OSREV runs on several of the older Macintosh computers.
 6MB of RAM should be sufficient to boot and a minimal system can probably
 be squeezed onto a 100MB partition by installing just the minimum sets.
@@ -7,7 +7,7 @@ booting, more RAM and disk space is highly recommended. About 250MB will be
 necessary to install all of the OpenBSD OSREV binary distribution (note that
 this does not count swap space!).  Much more disk space is required to
 install the source and objects as well (about another 600MB).
-A MacOS partition is also required to install OpenBSD/MACHINE OSREV and boot it,
+A Mac OS partition is also required to install OpenBSD/MACHINE OSREV and boot it,
 see below.
 
 OpenBSD/MACHINE OSREV now runs on most 680x0 MacIntosh's.  Specifically, it
diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install
index 25785b24bce..ef1cadf8d4f 100644
--- a/distrib/notes/mac68k/install
+++ b/distrib/notes/mac68k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.23 2004/03/11 08:53:54 xsa Exp $
+dnl	$OpenBSD: install,v 1.24 2004/03/15 08:37:25 xsa Exp $
 OpenBSDInstallPrelude
 
 The installation can be broken down into four basic steps:
@@ -22,7 +22,7 @@ button. A dialog will be presented at this point with two options: "Format"
 and "Cancel." If you choose "Cancel," nothing will be written to your drive.
 If you choose "Format," the program will proceed to make a filesystem.
 
-Mkfs is not a well-behaved MacOS application.  It will not allow
+Mkfs is not a well-behaved Mac OS application.  It will not allow
 any other tasks to run while it does (cooperative multitasking at its
 best).  When it's finished, the program will put up a dialog to ask if
 you have scanned the output for any error messages.  Usually there won't
@@ -89,7 +89,7 @@ Installation of base files:
 	take quite some time to install everything.
 
 	As is the case with Mkfs, this is not a particularly well-behaved
-	MacOS application and the machine will be completely tied up
+	Mac OS application and the machine will be completely tied up
 	while the installation takes place.
 
 	At some point after installing the base package, select the "Build
diff --git a/distrib/notes/mac68k/prep b/distrib/notes/mac68k/prep
index cc1aef14bbe..a66298ab69f 100644
--- a/distrib/notes/mac68k/prep
+++ b/distrib/notes/mac68k/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.11 2002/06/09 05:53:54 todd Exp $
+dnl	$OpenBSD: prep,v 1.12 2004/03/15 08:37:25 xsa Exp $
 Find your favorite disk partitioning utility.  Some
 of the ones that have been tried and seem to work are:
 	APS Powertools 2.7.3
@@ -38,14 +38,14 @@ server, you may also want a separate /var.  Create these
 partitions as the BSD "usr" or "User slice X" type.
 
 It is also possible to use the Mkfs utility to "convert" partitions from
-MacOS partitions to BSD partitions.  Mkfs will be discussed in more detail
+Mac OS partitions to BSD partitions.  Mkfs will be discussed in more detail
 later, but it is also very possible to simply prepare your hard drive by
-partitioning it with MacOS partitions of the correct size.  If you do this,
+partitioning it with Mac OS partitions of the correct size.  If you do this,
 simply select the "Convert" button when choosing partitions to build a
 filesystem on in Mkfs (see below).
 
 Before moving on, you should assure that your machine is running the correct
-software on the MacOS side.  In the Memory control panel, you should turn
+software on the Mac OS side.  In the Memory control panel, you should turn
 Virtual Memory off whenever you are planning to use the BSD/Mac68k Booter.
 You should also assure that your machine is using 32-bit addressing.  If
 there is no "Addressing:" option in your Memory control panel and your
diff --git a/distrib/notes/macppc/install b/distrib/notes/macppc/install
index 5d7dba743bf..2a44747ffb5 100644
--- a/distrib/notes/macppc/install
+++ b/distrib/notes/macppc/install
@@ -1,18 +1,18 @@
-dnl	$OpenBSD: install,v 1.18 2004/01/20 17:33:18 miod Exp $
+dnl	$OpenBSD: install,v 1.19 2004/03/15 08:37:25 xsa Exp $
 OpenBSDInstallShortPrelude
 
 Before you begin, you should decide if OpenBSD is to be installed
-on the whole disk or share the disk with MacOS.
+on the whole disk or share the disk with Mac OS.
 
-For stand-alone (No MacOS installed) or dedicated disks, the MBR
+For stand-alone (No Mac OS installed) or dedicated disks, the MBR
 installation method should be chosen and no additional prep is necessary.
 
-If the disk is to be shared with MacOS, a partition must be preallocated
-by the MacOS partition editor and MacOS installed to the proper partition.
+If the disk is to be shared with Mac OS, a partition must be preallocated
+by the Mac OS partition editor and Mac OS installed to the proper partition.
 This expects that the HFS partition will be the first partition on
 the disk, and then the OpenBSD partition will follow.
 This may require the disk be reformatted using the "Drive Setup" application
-and reinstalled under MacOS.
+and reinstalled under Mac OS.
 
 OpenBSDInstallPart2
 
@@ -21,14 +21,14 @@ OpenBSDInstallPart2
 	the bootloader and kernel from a HFS partition.
 
 	Once the bootloader is installed on the local hard drive, the
-	system can boot from it. OpenBSD may share a drive with MacOS
+	system can boot from it. OpenBSD may share a drive with Mac OS
 	if the process is followed carefully. Currently it is
 	necessary to use OpenFirmware commands to dual boot between
 	OS's, or multiple drives may be used with each OS owning drive(s).
 	It is also possible on some newer models to set up the system
-	to auto boot OpenBSD and if MacOS is desired, choose it using
+	to auto boot OpenBSD and if Mac OS is desired, choose it using
 	the firmware boot selector by holding down the <option> key
-	during reboot and selecting the MacOS Disk icon.
+	during reboot and selecting the Mac OS Disk icon.
 
 	(Refer to "Preparing your System for OpenBSD Installation" above
 	 for information on how to access and boot from Open Firmware)
@@ -110,14 +110,14 @@ OpenBSDInstallPart4({:-If you have DOS or Linux
 	partitions defined on the disk, these will usually show up as
 	partition 'h', 'i' and so on.
 
-	OpenBSD/MACHINE can share a disk with MacOS or MacOS X by using
+	OpenBSD/MACHINE can share a disk with Mac OS or Mac OS X by using
 	an HFS partitioned disk. For proper layout, the disk should be
-	partitioned with MacOS or MacOS X first with unused space or a
+	partitioned with Mac OS or Mac OS X first with unused space or a
 	spare partition where OpenBSD can be installed.  No low disk
 	boundaries exist on MACHINE. MACHINE is unable to install the
 	bootloader into the HFS(+) partition to boot OpenBSD so it is
 	necessary copy 'ofwboot' from the installation media into
-	the first HFS(+) partition using MacOS or MacOS X.
+	the first HFS(+) partition using Mac OS or Mac OS X.
 
 	If the disk is partitioned using MBR, the bootloader is
 	automatically installed. However because fdisk is not LBA
diff --git a/distrib/notes/macppc/prep b/distrib/notes/macppc/prep
index b950f1778e3..82e3c107db0 100644
--- a/distrib/notes/macppc/prep
+++ b/distrib/notes/macppc/prep
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: prep,v 1.8 2003/03/24 11:33:56 miod Exp $
+dnl	$OpenBSD: prep,v 1.9 2004/03/15 08:37:25 xsa Exp $
 To be able to boot the OpenBSD/MACHINE installation program, you will
 need to acquire some limited knowledge of OpenFirmware, the low-level
 process that controls the microprocessor after hardware initialization
@@ -37,7 +37,7 @@ boot ide1:,ofwboot /bsd
 		(After installation, boot /bsd from the slave
 		 device on the second ATA bus)
 
-mac-boot	(boot into MacOS)
+mac-boot	(boot into Mac OS)
 reset-all	(reboot the machine)
 shut-down	(halt the machine; shutdown)
 printenv	(print current machine variables)
@@ -84,7 +84,7 @@ available.
 
 Autobooting OpenBSD/MACHINE
 
-It is possible to automatically boot into OpenBSD (selectably into MacOS)
+It is possible to automatically boot into OpenBSD (selectably into Mac OS)
 by setting up the following:
 
 setenv auto-boot? true
@@ -99,9 +99,9 @@ copied into the first HFS(+) partition. It is not necessary to specify
 '/bsd' on the boot line or in the boot-device variable, since it is the
 default.
 
-To boot in MacOS with this setup (works on most supported machines)
+To boot in Mac OS with this setup (works on most supported machines)
 press and hold down the Alt/Option key during reboot, and select which
-(MacOS/MacOS X) partition to boot in the graphical boot selector
+(Mac OS/Mac OS X) partition to boot in the graphical boot selector
 presented. Note that OpenBSD does not currently show up in this boot
 selector except for the installation CD-ROM. This works on most machines
 this has been tested with, but does not work on a Rev C (333MHz) iMac,
@@ -109,13 +109,13 @@ perhaps this feature was added to the Openfirmware ROM after that
 machine.
 
 
-Sharing a disk with MacOS:
+Sharing a disk with Mac OS:
 
 OpenBSD/MACHINE is capable of booting either from a dedicated disk using
-a MBR partitioned disk or sharing a disk with MacOS.
+a MBR partitioned disk or sharing a disk with Mac OS.
 
-If the disk is to be shared between MacOS and OpenBSD, it is necessary
-to reformat and install the MacOS partitions first, using "Drive Setup",
+If the disk is to be shared between Mac OS and OpenBSD, it is necessary
+to reformat and install the Mac OS partitions first, using "Drive Setup",
 leaving space on the disk as an "Unused" partition.
 If the disk was previously partitioned, it is possible to reuse a Partition
 for OpenBSD, as long as it is not the first Partition on the disk.