Update supported hardware list, fix typos, use m4.common macros

whenever possible, remove obsolete information, etc.

ok fries@

6 files changed, 17 insertions, 26 deletions

diff --git a/distrib/notes/amiga/contents b/distrib/notes/amiga/contents
index 07852d8566f..14e091b43e2 100644
--- a/distrib/notes/amiga/contents
+++ b/distrib/notes/amiga/contents
@@ -49,4 +49,3 @@ OpenBSDxshare(1.5M,8.5M)
 OpenBSDxfont(6.0M,7.3M)
 
 OpenBSDxserv(2.6M,6.3M)
-
diff --git a/distrib/notes/amiga/hardware b/distrib/notes/amiga/hardware
index 2aefdb20d17..f378c14fa0d 100644
--- a/distrib/notes/amiga/hardware
+++ b/distrib/notes/amiga/hardware
@@ -82,5 +82,6 @@ Supported devices {:-include-:}:
 		The CrossLink.
 	Amiga floppy drives.
 	Amiga mouse.
+	Amiga joystick.
 
 If its not on this list, there is no support for it in this release.
diff --git a/distrib/notes/amiga/install b/distrib/notes/amiga/install
index e1ecf2ab720..98e4a80278c 100644
--- a/distrib/notes/amiga/install
+++ b/distrib/notes/amiga/install
@@ -29,17 +29,13 @@ OpenBSDInstallPart2
 	the dblNTSC mode, you may also {:-include-:} the "-A" option to
 	enable the dblNTSC display mode.
 
-	You should see the screen clear and some information about
-	your system as the kernel configures the hardware.  Note which
-	hard disk device(s) are configured (sd0, sd1, etc).  You will
-	be asked for disknames later during the install.  If you cannot
-	read the messages as they scroll by, do not worry -- you can get
-	at this information later inside the install program.  If you
-	are doing the miniroot install you will be prompted for a root
-	device.  At this time type 'sd0*', where '0' is the device which
-	holds the miniroot-containing swap partition you created during
-	the hard disk preparation.  If the system should hang after
-	entering the root device, try again with
+OpenBSDBootMsgs
+
+	If you are doing the miniroot install you will be prompted for a
+	root device.  At this time type 'sd0*', where '0' is the device
+	which holds the miniroot-containing swap partition you created
+	during the hard disk preparation.  If the system should hang
+	after entering the root device, try again with
 
 		loadbsd -I ff -b bsd
 
@@ -51,10 +47,9 @@ OpenBSDInstallPart2
 		loadbsd -I ff bsd.rd
 
 	While booting, you will probably see several warnings.  You
-	should be warned that no swap space is present, and that
-	init(8) cannot find /etc/rc.  Do not be alarmed, these are
-	completely normal.  When you reach the prompt asking you for a
-	shell name, just hit return.
+	should be warned that no swap space is present.  Do not be
+	alarmed, these are completely normal.  When you reach the prompt
+	asking you for a shell name, just hit return.
 
 	You will be asked which terminal type to use, you should just
 	hit return to select the default (vt220).
@@ -88,7 +83,7 @@ OpenBSDInstallPart2
 		newfs: ioctl (WDINFO): Invalid argument
 		newfs: /dev/rsd0a: can't rewrite disk label
 
-	If there are any others, restart from the the beginning of
+	If there are any others, restart from the beginning of
 	the installation process.  This error is ok as the Amiga
 	does not write disklabels currently.  You should expect
 	this error whenever using newfs.
diff --git a/distrib/notes/amiga/upgrade b/distrib/notes/amiga/upgrade
index 201887e01c8..49481850af9 100644
--- a/distrib/notes/amiga/upgrade
+++ b/distrib/notes/amiga/upgrade
@@ -1,8 +1,3 @@
-The upgrade to OpenBSD OSREV is a binary upgrade; it would be prohibitive
-to make users upgrade by compiling and installing the OSREV sources, and
-it would be very difficult to even compile a set of instructions that
-allowed them to do so.
-
 To do the upgrade, and if you are using the miniroot installation, you
 must have the OpenBSD kernel on AmigaDOS and you must transfer the root
 filesystem miniroot{:--:}OSrev.fs onto the swap partition of the OpenBSD hard disk.
diff --git a/distrib/notes/amiga/whatis b/distrib/notes/amiga/whatis
index 7a16a3809e8..0c7fd788883 100644
--- a/distrib/notes/amiga/whatis
+++ b/distrib/notes/amiga/whatis
@@ -1,2 +1,3 @@
-
-Several graphics, SCSI and network boards are supported.
+OpenBSD/MACHINE is a port to the Amiga machines manufactured by
+Commodore.  The ports supports a wide range of hardware and peripherals,
+with all the stability and security you can expect from OpenBSD.
diff --git a/distrib/notes/amiga/xfer b/distrib/notes/amiga/xfer
index bf25e14b739..434a1b407cd 100644
--- a/distrib/notes/amiga/xfer
+++ b/distrib/notes/amiga/xfer
@@ -1,7 +1,7 @@
 Installation is supported from several media types, including:
 
 	AmigaDOS Fast file system partitions
-	Berkeley FFS partitions
+	FFS partitions
 	Tape
 	Remote NFS partition
 	FTP
@@ -76,7 +76,7 @@ To prepare for installing via NFS:
 	/etc/exports file of the NFS server and resetting
 	mountd, acts which will require superuser privileges.
 	Note the numeric IP address of the NFS server and of
-	the router closest to the the new OpenBSD machine,
+	the router closest to the new OpenBSD machine,
 	if the NFS server is not on a network which is
 	directly attached to the OpenBSD machine.