- try to bo more explicit about disk naming conventions

- update the description of the ramdisk behaviour
- fix a few typos or style issues
- remove 1st-person "methinks" blabla from original author
- shortens the upgrade description, remove completely obsolete stuff
- don't tell the user thrice the differences between the ramdisk and
  the miniroot

niklas@ and jj@ had no objections.

4 files changed, 17 insertions, 93 deletions

diff --git a/distrib/notes/amiga/install b/distrib/notes/amiga/install
index 608d7a1c1b5..3e70ab71b45 100644
--- a/distrib/notes/amiga/install
+++ b/distrib/notes/amiga/install
@@ -32,10 +32,12 @@ OpenBSDInstallPart2
 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
+	root device.  The name of your root disk is typically "sd0" for
+	SCSI drives or the A4000 IDE drives or "wd0" for ISA-connected IDE
+	drives.  Reply with the name of your disk, such as "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
 
@@ -104,7 +106,7 @@ OpenBSDBootMsgs
 
 		-link0 -link1	Use BNC (coaxial) port [default]
 		link0 -link1	Use AUI port
-		link0 link1		Use UTP (twisted pair) port
+		link0 link1	Use UTP (twisted pair) port
 
 	After all network interfaces have been configured the install pro-
 	gram will ask for a default route and IP address of the primary
@@ -116,7 +118,7 @@ OpenBSDBootMsgs
 	will be used by the finished system, following which the new file
 	systems will be mounted to complete the installation.
 
-	After these preparatory steps has been completed, you will be
+	After these preparatory steps have been completed, you will be
 	able to extract the distribution sets onto your system.  There
 	are several install methods supported; FTP, HTTP, tape, CD-ROM, NFS
 	or a local disk partition.  To install from a tape, the distrib-
diff --git a/distrib/notes/amiga/prep b/distrib/notes/amiga/prep
index 8a16e64f4e7..c698975fada 100644
--- a/distrib/notes/amiga/prep
+++ b/distrib/notes/amiga/prep
@@ -31,12 +31,7 @@ Preparing your hard disk with HDToolBox:
 	installation. You can use other configurations after building a
 	customized kernel once your system is running.)  Partitioning is
 	traditionally an area of great confusion and disagreement, and
-	religion plays a large role in most advice you'll get.  The
-	author of this paragraph is a fan of large and few partitions,
-	normally one per disk, unless it's the root disk, where I tend
-	to have /, swap, /tmp, /var & /usr.  I must admit that I step
-	aside from my normal rules of thumb very often due to the context
-	the machine will work in.
+	religion plays a large role in most advice you'll get.
 
 	This should be done as the HDToolBox manual describes.  One thing
 	to note is that if you are not using a Commodore controller you
diff --git a/distrib/notes/amiga/upgrade b/distrib/notes/amiga/upgrade
index 49481850af9..9a0b13c7c45 100644
--- a/distrib/notes/amiga/upgrade
+++ b/distrib/notes/amiga/upgrade
@@ -53,78 +53,14 @@ To upgrade your system, follow the following instructions:
 
 	Common instructions for both miniroot/ramdisk installations:
 
-	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).
 
-	At the question whether to (I)nstall or (U)pgrade choose "U".
-
-	You will be presented with some information about the upgrade
-	process and a warning message, and will be asked if you wish
-	to proceed with the upgrade process.  If you answer
-	negatively, the upgrade process will stop, and your disk will
-	not be modified.  If you answer affirmatively, the upgrade
-	process will begin, and your disk will be modified.  You may
-	hit Control-C to stop the upgrade process at any time.
-	However, if you hit it at an inopportune moment, your system
-	may be left in an inconsistent (and possibly unusable) state.
-
-	The upgrade program will then check & mount your root filesystem
-	under /mnt and grab some configuration info from it for the
-	continued upgrade process.  You'll be asked if the network
-	should be enabled at this point.  After that is done the rest
-	of the filesystems will be checked and mounted.
-
-	If you don't already have the OpenBSD distribution sets on your
-	disk, look in the installation section for information on how
-	to transfer them to your disk.
-
-	Once the distribution sets are transferred to your disk,
-	continue here.  (Obviously, if the OpenBSD distribution sets
-	are already on your disk, because you've transferred them
-	before starting the upgrade process, you don't need to
-	transfer them again now!)
-
-	After the software has been transferred to the machine (or
-	mounted, in the case of upgrading via NFS).
-
-Your system has now been upgraded to OpenBSD OSREV.
-
-	After all this, your machine is a complete OpenBSD OSREV system.
-	However, that doesn't mean that you're finished with the upgrade
-	process.  There are several things that you should do, or might
-	have to do, to insure that the system works properly.
-
-	First, you will probably want to get the etc{:--:}OSrev.tgz distribution,
-	extract it, and compare its contents with those in your /etc/
-	directory.  You will probably want to replace some of your
-	system configuration files, or incorporate some of the changes
-	in the new versions into yours.
-
-	Second, you might want to check your /dev against the new MAKEDEV
-	script found there, if you have changed the nodes locally.  The
-	upgrade process runs "sh MAKEDEV all" but that may not be enough
-	for your personal setup.
-
-	Third, you must deal with certain changes in the formats of
-	some of the configuration files.  The most notable change is
-	that the "options" given to many of the file systems in
-	/etc/fstab or by hand have changed, and some of the file
-	systems have changed names.  To find out what the new options
-	are, it's suggested that you read the manual page for the
-	file systems' mount commands, for example mount_nfs(8) for
-	NFS.  (Note that the information for mounts of type "ufs",
-	i.e. Fast File Systems, are contained in the mount(8) man
-	page.)
-
-	Finally, you will want to delete old binaries that were part
-	of the version of OpenBSD that you upgraded from and have since
-	been removed from the OpenBSD distribution.  You might also
-	want to recompile any locally-built binaries, to take
-	advantage of the shared libraries.  (Note that any new
-	binaries that you build will be dynamically linked, and
-	therefore take advantage of the shared libraries, by default.
-	For information on how to make statically linked binaries,
-	see the cc(1) and ld(1) manual pages.)
+	When prompted, select the (U)pgrade option rather than the
+	(I)install option.
+
+	The upgrade script will ask you for the existing root partition,
+	and will use the existing filesystems defined in /etc/fstab to
+	installe the new system in, and also preserve files en `/etc'
+	which you are likely to have customized since a previous
+	installation.
diff --git a/distrib/notes/amiga/xfer b/distrib/notes/amiga/xfer
index 434a1b407cd..3311f7a2ac9 100644
--- a/distrib/notes/amiga/xfer
+++ b/distrib/notes/amiga/xfer
@@ -7,15 +7,6 @@ Installation is supported from several media types, including:
 	FTP
 	HTTP
 
-The installation program is run under a minimal OpenBSD environment
-provided by one of two means: a ramdisk or a miniroot filesystem.
-We recommend using the ramdisk if your machine is big enough (at
-least 6MB of fastmem is required), otherwise a miniroot filesystem
-needs to be transferred to the OpenBSD swap partition.  This can be
-done from AmigaDOS in the case of a new install or upgrade, or from
-OpenBSD when doing an upgrade.  See the "Preparing your System for
-OpenBSD Installation" section for details.
-
 The steps necessary to prepare the distribution sets for
 installation depend on which method of installation you choose.
 The various methods are explained below.  However, for all methods