2.1

6 files changed, 44 insertions, 66 deletions

diff --git a/distrib/notes/amiga/contents b/distrib/notes/amiga/contents
index ec3f13fac2f..436563cebb6 100644
--- a/distrib/notes/amiga/contents
+++ b/distrib/notes/amiga/contents
@@ -1,8 +1,8 @@
-The amiga-specific portion of the OpenBSD 2.0 release is found in the
+The amiga-specific portion of the OpenBSD 2.1 release is found in the
 "amiga" subdirectory of the distribution.  That subdirectory is layed
 out as follows:
 
-.../2.0/amiga/
+.../2.1/amiga/
 		INSTALL.amiga	This file.
 
 		kernels/	A generic OpenBSD kernel is found here.
@@ -21,7 +21,7 @@ out as follows:
 				installation section, below.
 
 There are two amiga file system images to be found in the "amiga/miniroots"
-subdirectory of the OpenBSD 2.0 distribution.  One of them is a upgrade
+subdirectory of the OpenBSD 2.1 distribution.  One of them is a upgrade
 image and one is an installation image. They are described in more
 detail below.  There are gzipped versions of each available, for easier
 downloading.  (The gzipped version have the ".gz" extension added to
@@ -38,7 +38,7 @@ Installation file system:
 	NFS file system or ftp.  You can also load distribution sets from
 	a SCSI tape or from one of your existing AmigaDOS partitions.
 
-	This file is named "inst-20.fs".
+	This file is named "inst-21.fs".
 
 
 Upgrade file system:
@@ -54,16 +54,16 @@ Upgrade file system:
 	one of your existing AmigaDOS partitions, or from an existing
 	OpenBSD partition.
 
-	This file is named "upgr-20.fs".
+	This file is named "upgr-21.fs".
 
 The OpenBSD/amiga binary distribution sets contain the binaries which
-comprise the OpenBSD 2.0 release for the amiga.  There are seven binary
+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.0
+subdirectories of the "amiga/tars" 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):
 
-	base20	The OpenBSD/amiga 2.0 base binary distribution.  You
+	base21	The OpenBSD/amiga 2.1 base binary distribution.  You
 		MUST install this distribution set.  It contains the
 		base OpenBSD utilities that are necessary for the
 		system to run and be minimally functional.  It
@@ -71,7 +71,7 @@ the name given in the table below):
 		everything described below.
 		[ 11M gzipped, 35M uncompressed ]
 
-	comp20	The OpenBSD/amiga Compiler tools.  All of the tools
+	comp21	The OpenBSD/amiga Compiler tools.  All of the tools
 		relating to C, C++, and FORTRAN (yes, there are two!).
 		This set includes the system include files
 		(/usr/include), the linker, the compiler tool chain,
@@ -82,7 +82,7 @@ the name given in the table below):
 		call and library manual pages.
 		[ 7M gzipped, 23M uncompressed ]
 
-	etc20	This distribution set contains the system
+	etc21	This distribution set contains the system
 		configuration files that reside in /etc and in several
 		other places.  This set MUST be installed if you are
 		installing the system from scratch, but should NOT be
@@ -91,22 +91,22 @@ the name given in the table below):
 		CAREFULLY upgrade your configuration files by hand.)
 		[ 70K gzipped, 380K uncompressed ]
 
-	game20	This set includes the games and their manual pages.
+	game21	This set includes the games and their manual pages.
 		[ 3M gzipped, 7M uncompressed ]
 
-	man20	This set includes all of the manual pages for the
+	man21	This set includes all of the manual pages for the
 		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 ]
 
-	misc20	This set includes the system dictionaries (which are
+	misc21	This set includes the system dictionaries (which are
 		rather large), the typesettable document set, and
 		man pages for other architectures which happen to be
 		installed from the source tree by default.
 		[ 2M gzipped, 6M uncompressed ]
 
-	text20	This set includes OpenBSD's text processing tools,
+	text21	This set includes OpenBSD's text processing tools,
 		including groff, all related programs, and their
 		manual pages.
 		[ 1M gzipped, 4M uncompressed ]
diff --git a/distrib/notes/amiga/hardware b/distrib/notes/amiga/hardware
index a51e046dd7d..994227e3a83 100644
--- a/distrib/notes/amiga/hardware
+++ b/distrib/notes/amiga/hardware
@@ -1,7 +1,7 @@
-OpenBSD/amiga 2.0 runs on any amiga that has a 68020, 68030 or 68040 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,
+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.)
@@ -24,7 +24,7 @@ larger, as your system will be doing much more swapping.
 
 Supported devices include:
 	A4000/A1200 IDE controller.
-	ISA IDE & ATAPI (but with limitations) with a supported ISA bridge.
+	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.
diff --git a/distrib/notes/amiga/install b/distrib/notes/amiga/install
index d8de5ecac5a..1ff44d1c69d 100644
--- a/distrib/notes/amiga/install
+++ b/distrib/notes/amiga/install
@@ -129,11 +129,11 @@ begin again from scratch.
 		to extract.  For example, to extract the base
 		distribution, use the command:
 
-			Extract base20
+			Extract base21
 
 		and to extract the games distribution:
 
-			Extract game20
+			Extract game21
 
 		If the distribution sets are in different directories,
 		you will need to cd to each directory in turn, runing
@@ -176,11 +176,11 @@ begin again from scratch.
 		wish to extract.  For example, to extract the base
 		distribution, use the command:
 
-			Extract base20
+			Extract base21
 
 		and to extract the games distribution:
 
-			Extract game20
+			Extract game21
 
 		After the extraction is complete, go to the location
 		of the next set you want to extract, "Set_tmp_dir"
@@ -196,10 +196,10 @@ begin again from scratch.
 			rm set_name.??
 
 		For example, if you wish to remove the distribution
-		files for the game09 set, after the "Extract game09"
+		files for the game21 set, after the "Extract game21"
 		command has completed, issue the command:
 
-			rm game20.??
+			rm game21.??
 
 		Once you have extracted all sets and are at the "#" prompt
 		again, proceed to the section "Configuring Your System,"
diff --git a/distrib/notes/amiga/prep b/distrib/notes/amiga/prep
index 101ef5bb08a..23fbdc81ec4 100644
--- a/distrib/notes/amiga/prep
+++ b/distrib/notes/amiga/prep
@@ -90,7 +90,7 @@ Transferring the miniroot filesystem:
 	disk.
 
 	Once the hard disk has been prepared for OpenBSD, the appropriate
-	miniroot filesystem (inst-20.fs for a new install or upgr-20.fs
+	miniroot filesystem (inst-21.fs for a new install or upgr-21.fs
 	for an upgrade) is transferred to the swap partition configured
 	during the hard disk prep (or the existing swap parition in
 	the case of an upgrade).  The xstreamtodev utility provided in
@@ -103,9 +103,9 @@ Transferring the miniroot filesystem:
 	single-user state processes are not using the swap partition.
 
 	On AmigaDOS, the command:
-		xstreamtodev --input=inst-20.fs --rdb-name=<swap partition>
+		xstreamtodev --input=inst-21.fs --rdb-name=<swap partition>
 	where <swap partition> is the name you gave to the OpenBSD
-	partition to be used for swapping.  Use upgr-20.fs if you
+	partition to be used for swapping.  Use upgr-21.fs if you
 	are going to do an upgrade of an existing OpenBSD system.  If
 	xstreamtodev is unable to determine the SCSI driver device
 	name or the unit number of the specified partition, you may
@@ -116,7 +116,7 @@ Transferring the miniroot filesystem:
 	in single user state on the current OpenBSD system, or use the
 	"shutdown now" command to shutdown to single-uyser state.  Then
 	copy the miniroot using dd:
-		dd if=upgr-20.fs of=/dev/rsd0b
+		dd if=upgr-21.fs of=/dev/rsd0b
 	where /dev/rsd0b should be the device path of the swap partition
 	your system is configured to use.  Once the file is copied,
 	reboot back to AmigaDOS to boot the upgrade kernel.  NOTE:  the
diff --git a/distrib/notes/amiga/upgrade b/distrib/notes/amiga/upgrade
index 85f3eef42d4..17841e376d8 100644
--- a/distrib/notes/amiga/upgrade
+++ b/distrib/notes/amiga/upgrade
@@ -1,15 +1,13 @@
-The upgrade to OpenBSD 2.0 is a binary upgrade; it would be prohibitive
-to make users upgrade by compiling and installing the 2.0 sources, and
+The upgrade to OpenBSD 2.1 is a binary upgrade; it would be prohibitive
+to make users upgrade by compiling and installing the 2.1 sources, and
 it would be very difficult to even compile a set of instructions that
-allowed them to do so.  Because of the various changes to the system,
-the largest being the 64-bit file size support and shared libraries,
-it is impractical to upgrade by recompiling from the sources and
+allowed them to do so.
 installing.
 
 To do the upgrade, you must have the OpenBSD kernel on AmigaDOS and
-you must transfer the upgrade filesystem upgr-20.fs onto the swap
+you must transfer the upgrade filesystem upgr-21.fs onto the swap
 partition of the OpenBSD hard disk.  You must also have at least the
-"base20" binary distribution set available, so that you can upgrade
+"base21" binary distribution set available, so that you can upgrade
 with it, using one of the upgrade methods described above.  Finally,
 you must have sufficient disk space available to install the new
 binaries.  Since the old binaries are being overwritten in place,
@@ -29,7 +27,7 @@ To upgrade your system, follow the following instructions:
 	partition used by OpenBSD for swapping, as described in the
 	"Preparing your System for OpenBSD Installation" section above.
 
-	Now boot up OpenBSD using the 2.0 kernel using the loadbsd
+	Now boot up OpenBSD using the 2.1 kernel using the loadbsd
 	command:
 
 		loadbsd -b bsd
@@ -54,21 +52,6 @@ To upgrade your system, follow the following instructions:
 	However, if you hit it at an inopportune moment, your system
 	may be left in an inconsistent (and possibly unusable) state.
 
-	You will be asked if you wish to upgrade your file systems to
-	the new file system format.  If you do, reply affirmatively.
-	If you don't have your file systems upgraded now, you should
-	probably do it manually after the install process is complete,
-	by using "fsck -c 2". Read the fsck(8) manual page for more
-	details.
-
-	The upgrade program will then check your root file system,
-	and, if you approved, will upgrade it to the new file system
-	format.  It will then mount your root file system on /mnt.
-
-	If your file systems are being upgraded, the upgrade script
-	will copy the new fsck(8) program to your hard disk and
-	upgrade your remaining file systems.
-
 	The upgrade program will then mount all of your file systems
 	under /mnt.  (In other words, your root partition will be
 	mounted on /mnt, your /usr partition on /mnt/usr, etc.)
@@ -85,13 +68,13 @@ To upgrade your system, follow the following instructions:
 
 	After the software has been transferred to the machine (or
 	mounted, in the case of upgrading via NFS), change into the
-	directory containing the "base20" distribution set.  Once you
+	directory containing the "base21" distribution set.  Once you
 	are there, run the "Set_tmp_dir" command, and hit return at
 	the prompt to select the default answer for the temporary
 	directory's path name.  (It should be the path name of the
 	directory that you're in.)
 
-	Run the command "Extract base20" to upgrade the base
+	Run the command "Extract base21" to upgrade the base
 	distribution.
 
 	Repeat the above two steps for all of the sets you wish to
@@ -113,32 +96,27 @@ To upgrade your system, follow the following instructions:
 	You will probably also want to copy the release "bsd" kernel
 	image to your root at some point.
 	
-Your system has now been upgraded to OpenBSD 2.0.
+Your system has now been upgraded to OpenBSD 2.1.
 
-After a new kernel has been copied to your hard disk, your
-	machine is a complete OpenBSD 2.0 system.  However, that
+	After a new kernel has been copied to your hard disk, your
+	machine is a complete OpenBSD 2.1 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, if you did not upgrade your file systems to the new
-	file system format during the upgrade process, you may want to
-	do so now, with "fsck -c 2".  If you are unsure about the
-	process, it's suggested that you read the fsck(8) manual page.
-
-	Second, you will probably want to get the etc20 distribution,
+	First, you will probably want to get the etc20 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.
 
-	Third, you will probably want to update the set of device
+	Second, you will probably want to update the set of device
 	nodes you have in /dev.  If you've changed the contents of
 	/dev by hand, you will need to be careful about this, but if
 	not, you can just cd into /dev, and run the command "sh
 	MAKEDEV all".
 
-	Fourth, you must deal with certain changes in the formats of
+	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
diff --git a/distrib/notes/amiga/whatis b/distrib/notes/amiga/whatis
index 6175e2d33f9..d556a34ce7b 100644
--- a/distrib/notes/amiga/whatis
+++ b/distrib/notes/amiga/whatis
@@ -1,3 +1,3 @@
 
-This is the first public release of OpenBSD for the Amiga line of
+This is the second public release of OpenBSD for the Amiga line of
 computers.  Several graphics, SCSI and network boards are supported.