Improve

3 files changed, 65 insertions, 65 deletions

diff --git a/distrib/notes/amiga/contents b/distrib/notes/amiga/contents
index fc1bb90c370..79853379cee 100644
--- a/distrib/notes/amiga/contents
+++ b/distrib/notes/amiga/contents
@@ -5,28 +5,30 @@ out as follows:
 .../2.1/amiga/
 		INSTALL.amiga	This file.
 
-		kernels/	A generic OpenBSD kernel, bsd, is found here
-				as well as a ramdisk OpenBSD kernel, called:
-				bsd.rd.
+		CKSUM		Output of the cksum(1) and md5(1) programs
+		MD5		usable for verification of the correctness
+				of downloaded files.
 
-		miniroots/	An amiga installation and upgrade
-				file system image; see below.
+		X11/		The X window system for OpenBSD/amiga 2.1
 
-		tars/		amiga binary distribution sets;
-				see below.
+		bsd		A generic OpenBSD kernel used both for
+				miniroot installation and as the first
+				"real" kernel your OpenBSD installation
+				will use.
 
-		tars.split/	amiga binary distribution sets
-				splitted in 80k parts.
+		bsd.rd		A ramdisk OpenBSD kernel used for simple
+				installation.
 
-		utils/	Miscellaneous amiga installation
-				utilities; see installation section, below.
+		miniroot21.fs	A miniroot filesystem image to be used
+				if you for some reason can't or don't
+				want to use the ramdisk installation
+				method.
+
+		*.tar.gz	amiga binary distribution sets;
+				see below.
 
-There is one amiga file system image to be found in the "amiga/miniroots"
-subdirectory of the OpenBSD 2.1 distribution.  It's a combined upgrade
-and installation image and should only be used if you cannot use the
-ramdisk installation method.  It's described in more detail below.
-There is a gzipped version available, for easier downloading.  (The
-gzipped version has the ".gz" extension added to its name.)
+		utils/		Miscellaneous amiga installation
+				utilities; see installation section, below.
 
 Installation/upgrade miniroot file system:
 
@@ -48,7 +50,7 @@ Installation/upgrade miniroot file system:
 The OpenBSD/amiga binary distribution sets contain the binaries which
 comprise the OpenBSD 2.1 release for the amiga.  There are seven binary
 distribution sets.  The binary distribution sets can be found in
-subdirectories of the "amiga/tars" subdirectory of the OpenBSD 2.1
+subdirectories of the "amiga/" subdirectory of the OpenBSD 2.1
 distribution tree, and are as follows (all have ".tar.gz" appended to
 the name given in the table below):
 
@@ -58,7 +60,7 @@ the name given in the table below):
 		system to run and be minimally functional.  It
 		includes shared library support, and excludes
 		everything described below.
-		[ 11M gzipped, 35M uncompressed ]
+		[ 12M gzipped, 36M uncompressed ]
 
 	comp21	The OpenBSD/amiga Compiler tools.  The C, C++, and
 		FORTRAN language environments are supported.  This set
@@ -69,7 +71,7 @@ the name given in the table below):
 		includes the manual pages for all of the utilities it
 		contains, as well as the system call and library manual
 		pages.
-		[ 7M gzipped, 23M uncompressed ]
+		[ 7M gzipped, 24M uncompressed ]
 
 	etc21	This distribution set contains the system configuration
 		files that reside in /etc and in several other places.
@@ -78,7 +80,7 @@ the name given in the table below):
 		upgrading.  (If you are upgrading, it's recommended that
 		you get a copy of this set and CAREFULLY upgrade your
 		configuration files by hand.)
-		[ 70K gzipped, 380K uncompressed ]
+		[ 90K gzipped, 450K uncompressed ]
 
 	game21	This set includes the games and their manual pages.
 		[ 3M gzipped, 7M uncompressed ]
@@ -87,7 +89,7 @@ the name given in the table below):
 		binaries and other software contained in the base set.
 		Note that it does not include any of the manual pages
 		that are included in the other sets.
-		[ 2M gzipped, 8M uncompressed ]
+		[ 2M gzipped, 9M uncompressed ]
 
 	misc21	This set includes the system dictionaries (which are
 		rather large), the typesettable document set, and
@@ -99,15 +101,3 @@ the name given in the table below):
 		including groff, all related programs, and their
 		manual pages.
 		[ 1M gzipped, 4M uncompressed ]
-
-The amiga binary distribution sets are distributed in the same form as
-the source distribution sets; catted together, the members of a set
-form a gzipped tar file.  Each amiga binary distribution set also has
-its own "CKSUMS" & "MD5" file, just as the source distribution sets do.
-
-The instructions given for extracting the source sets work equally
-well for the binary sets, but it is worth noting that if you use that
-method, the files are extracted "below" the current directory.  That
-is, if you want to extract the binaries "into" your system, i.e.
-replace the system binaries with them, you have to run the "tar xvfp"
-from /.
diff --git a/distrib/notes/amiga/hardware b/distrib/notes/amiga/hardware
index 994227e3a83..5cc16588290 100644
--- a/distrib/notes/amiga/hardware
+++ b/distrib/notes/amiga/hardware
@@ -1,10 +1,10 @@
 OpenBSD/amiga 2.1 runs on any amiga that has a 68020, 68030, 68040 or
-68060 CPU with some form of FPU and MMU.  The minimal configuration
-requires 4M of RAM and about 75M of disk space.  To install the entire
-system requires much more disk space, and to run X or compile the system,
-more RAM is recommended.  (4M of RAM will actually allow you to
-compile, however it won't be speedy.  X really isn't usable on a
-4M system.)
+68060 CPU with some form of FPU and MMU.  It should also run on
+MacroSystem's DraCo computer.  The minimal configuration requires 4M of
+RAM and about 55M of disk space.  To install the entire system requires
+much more disk space, and to run X or compile the system, more RAM is
+recommended.  (4M of RAM will actually allow you to compile, however it
+won't be speedy.  X really isn't usable on a 4M system.)
 
 Here is a table of recommended HD partition sizes for a full install:
 	partition:	advise,	with X,	needed,	with X
@@ -16,8 +16,8 @@ Here is a table of recommended HD partition sizes for a full install:
 
 As you may note the recommended size of /usr is 20M greater than
 needed. This is to leave room for a kernel source and compile tree
-as you will probably want to compile your own kernel. (GENERIC and
-INSTALL are large and bulky to accommodate all people).
+as you will probably want to compile your own kernel. (GENERIC is
+large and bulky to accommodate all people).
 
 If you only have 4M of fast memory, you should make your swap partition
 larger, as your system will be doing much more swapping.
@@ -27,45 +27,50 @@ Supported devices include:
 	ISA IDE & ATAPI with a supported ISA bridge.
 	SCSI host adapters:
 		33c93 based boards: A2091, A3000 and GVP series II.
-		53c80 based boards: 12 Gauge, IVS and Wordsync/Bytesync.
-		53c710 based boards: A4091, Magnum, Warp Engine and Zeus.
+		53c80 based boards: 12 Gauge, IVS, Emplant and
+				    Wordsync/Bytesync.
+		53c710 based boards: A4091, Magnum, Warp Engine, Zeus
+				     and DraCo.
 		FAS216 based boards: FastLane Z3, Blizzard.
 	Video controllers:
-		ECS, AGA and A2024 built in on various amigas.
+		ECS, AGA and A2024 built in on various amigas
 		Retina Z2 and Retina Z3.
 		Picasso II.
 		GVP Spectrum.
-              Piccolo.
+		Piccolo.
 		A2410.
 		Cybervision 64.
+		oMnibus.
+		Domino.
+		Merlin.
 	Ethernet controllers:
-		A2065 Ethernet
-		Hydra Ethernet
-		ASDG Ethernet
-		A4066 Ethernet
-		Ariadne Ethernet
-		Quicknet Ethernet
+		A2065.
+		Hydra.
+		ASDG.
+		A4066.
+		Ariadne.
+		Quicknet.
 		Via a supported ISA bridge:
-			NE[12]000, SMC/WD 8003/8013/8216, 3COM 3c503 Ethernet
+			NE[12]000, SMC/WD 8003/8013/8216 and 3COM 3c503.
 		
 	Arcnet controllers:
-		A2060 Arcnet
+		A2060.
 	Tape drives:
-		Most SCSI tape drives, including
-			Archive Viper, Cipher SCSI-2 ST150.
+		Most SCSI tape drives.
 	CD-ROM drives:
-		Most SCSI CD-ROM drives
+		Most SCSI CD-ROM drives.
 	Serial ports:
 		Amiga serial port.
-		MultiFaceCard II and III
-		A2232
-		PC COM ports attached to a supported ISA bridge
+		DraCo serial port.
+		MultiFaceCard II and III.
+		A2232.
+		PC COM ports attached to a supported ISA bridge.
 	Parallel ports:
 		Amiga parallel port.
-		PC LPT ports attached to a supported ISA bridge
+		PC LPT ports attached to a supported ISA bridge.
 	ISA bridges:
-		The GoldenGate Bus+ (aka GG2)
-		The CrossLink
+		The GoldenGate Bus+ (aka GG2).
+		The CrossLink.
 	Amiga floppy drives.
 	Amiga mouse.
 
diff --git a/distrib/notes/amiga/xfer b/distrib/notes/amiga/xfer
index ed494cf8dfb..ecb37436fa7 100644
--- a/distrib/notes/amiga/xfer
+++ b/distrib/notes/amiga/xfer
@@ -22,7 +22,7 @@ The various methods are explained below.  However, for all methods
 you need to transfer a OpenBSD kernel binary to your AmigaDOS
 partition, optionally you must also get the miniroot image there
 for later transfer to your swap partition as explained elsewhere.
-For ramdisk installs you nedd to get both the bsd and bsd.rd
+For ramdisk installs you need to get both the bsd and bsd.rd
 kernel images, and for miniroot installs you need bsd and the
 miniroot21.fs image.
 
@@ -35,7 +35,12 @@ To prepare for installing via an AmigaDOS partition:
 	instead of separate ones for each distribution set.  This
 	will also simplify the installation work later on.
 
-	Note where you place the files you will need this later.
+	Note where you place the files, you will need this later.
+	Also, it might be a good idea to type down the AmigaDOS
+	partition structure of the disk you put these files on.  In
+	the context of the install program you will only be able to
+	identify the partition by starting sector (block) number
+	and/or size.  The partition names are *not* available.
 
 	Once you have done this, you can proceed to the next
 	step in the installation process, preparing your hard disk.