Remove source sets references and some s/2.0/2.1/

10 files changed, 67 insertions, 173 deletions

diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index a3281f65f57..3d5774abf3a 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -82,10 +82,3 @@ distribution tree, and are as follows:
 		including groff, all related programs, and their
 		manual pages.
 		[ 2.3M gzipped, 8.4M uncompressed ]
-
-The alpha binary distribution sets are distributed in the same form
-as the source distribution sets; that is, the members of a set form
-a gzipped tar file which is assumed to be relative to the root of a
-system's directory tree.  In other words, all sets files should be
-extracted from '/'.  The instructions given for extracting the source
-sets work equally well for the binary sets.
diff --git a/distrib/notes/atari/contents b/distrib/notes/atari/contents
index 0482a75d4f8..b18f948f7bc 100644
--- a/distrib/notes/atari/contents
+++ b/distrib/notes/atari/contents
@@ -1,8 +1,8 @@
-The Atari-specific portion of the OpenBSD 2.0 release is found in the
+The Atari-specific portion of the OpenBSD 2.1 release is found in the
 "atari" subdirectory of the distribution.  That subdirectory is layed
 out as follows:
 
-.../2.0/atari/
+.../2.1/atari/
 		INSTALL.atari	This file.
 
 		bins/		atari binary distribution sets;
@@ -17,7 +17,7 @@ out as follows:
 				installation section, below.
 
 There are three atari floppy images to be found in the "atari/floppies"
-subdirectory of the OpenBSD 2.0 distribution.  One of them is a
+subdirectory of the OpenBSD 2.1 distribution.  One of them is a
 bootable TOS kernel floppy and the other two are installation floppy's.
 They are described in more detail below.  There are gzipped versions
 of each available, for easier downloading.  (The gzipped version
@@ -29,7 +29,7 @@ Bootable Kernel floppy:
 	and the GENERIC kernel.  It is setup so that you can insert it
 	int your floppy drive, and start the programs from GEM.
 
-	This floppy is named boot-20.fs
+	This floppy is named boot-21.fs
 
 Installation floppy:
 
@@ -42,15 +42,15 @@ Installation floppy:
 	file system or ftp.  You can also load distribution sets from
 	a SCSI tape or from one of your existing TOS partitions.
 
-	This floppy's are named "inst-20.fs.1" and "inst-20.fs.2".
+	This floppy's are named "inst-21.fs.1" and "inst-21.fs.2".
 
 The OpenBSD/atari binary distribution sets contain the binaries which
-comprise the OpenBSD 2.0 release for the atari.  There are seven binary
+comprise the OpenBSD 2.1 release for the atari.  There are seven binary
 distribution sets, and the "security" distribution set.  The binary
 distribution sets can be found in subdirectories of the "atari/bins"
-subdirectory of the OpenBSD 2.0 distribution tree, and are as follows:
+subdirectory of the OpenBSD 2.1 distribution tree, and are as follows:
 
-	base20	The OpenBSD/atari 2.0 base binary distribution.  You
+	base21	The OpenBSD/atari 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
@@ -58,7 +58,7 @@ subdirectory of the OpenBSD 2.0 distribution tree, and are as follows:
 		everything described below.
 		[ 7M gzipped, 19M uncompressed ]
 
-	comp20	The OpenBSD/atari Compiler tools.  All of the tools
+	comp21	The OpenBSD/atari 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,
@@ -69,7 +69,7 @@ subdirectory of the OpenBSD 2.0 distribution tree, and are as follows:
 		call and library manual pages.
 		[ 4M gzipped, 12M 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
@@ -78,37 +78,22 @@ subdirectory of the OpenBSD 2.0 distribution tree, and are as follows:
 		CAREFULLY upgrade your configuration files by hand.)
 		[ 50K gzipped, 280K uncompressed ]
 
-	games20	This set includes the games and their manual pages.
+	games21	This set includes the games and their manual pages.
 		[ 1M gzipped, 3M 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.
 		[ 730K gzipped, 3M 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.
 		[ 784K gzipped, 3M uncompressed ]
-
-The atari 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 atari binary distribution set also has
-its own "CKSUMS" 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 /.  Also note that if you upgrade or install this way, those
-programs that you are using at the time will NOT be replaced.  If you
-follow the normal installation or upgrade procedures, this will be
-taken care of for you.
diff --git a/distrib/notes/hp300/contents b/distrib/notes/hp300/contents
index 1dcf5ffdfa5..31028bd7188 100644
--- a/distrib/notes/hp300/contents
+++ b/distrib/notes/hp300/contents
@@ -1,8 +1,8 @@
-The hp300-specific portion of the OpenBSD 2.0 release is found in the
+The hp300-specific portion of the OpenBSD 2.1 release is found in the
 "hp300" subdirectory of the distribution.  That subdirectory is laid
 out as follows:
 
-.../2.0/hp300/
+.../2.1/hp300/
 		INSTALL.hp300	This file
 
 		bins/		hp300 binary distribution sets;
@@ -13,12 +13,12 @@ out as follows:
 				see below.
 
 The OpenBSD/hp300 binary distribution sets contain the binaries which
-comprise the OpenBSD 2.0 release for the hp300.  There are seven binary
+comprise the OpenBSD 2.1 release for the hp300.  There are seven binary
 distribution sets, and the "security" distribution set.  The binary
 distribution sets can be found in the "hp300/bins" subdirectory of
-the OpenBSD 2.0 distribution tree, and are as follows:
+the OpenBSD 2.1 distribution tree, and are as follows:
 
-	base20	The OpenBSD/hp300 2.0 base binary distribution.  You
+	base21	The OpenBSD/hp300 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
@@ -26,7 +26,7 @@ the OpenBSD 2.0 distribution tree, and are as follows:
 		everything described below.
 		[ 7.2M gzipped, 19M uncompressed ]
 
-	comp20	The OpenBSD/hp300 Compiler tools.  All of the tools
+	comp21	The OpenBSD/hp300 Compiler tools.  All of the tools
 		relating to C and C++.  This set includes the system
 		include files (/usr/include), the linker, the compiler
 		tool chain, and the various system libraries (except
@@ -36,7 +36,7 @@ the OpenBSD 2.0 distribution tree, and are as follows:
 		call and library manual pages.
 		[ 4.6M gzipped, 14.7M uncompressed ]
 
-	etc20	This distribution set contains the system configuration
+	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 used if you are
@@ -45,29 +45,28 @@ the OpenBSD 2.0 distribution tree, and are as follows:
 		configuration files by hand.)
 		[ 64K gzipped, 348K uncompressed ]
 
-	games20	This set includes the games and their manual pages.
+	games21	This set includes the games and their manual pages.
 		[ 2.8M gzipped, 6.8M 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.
 		[ 850K gzipped, 3.3M 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.
 		[ 1.8M gzipped, 6.5M 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.
 		[ 770K gzipped, 2.8M uncompressed ]
 
 The hp300 binary distribution sets are distributed as gzipped tar files.
-Each hp300 binary distribution set also has its own "CKSUMS" file, just
-as the source distribution sets do.
+Each hp300 binary distribution set also has its own "CKSUMS" file.
 
 The following are included in the `.../install' directory:
 
@@ -78,7 +77,7 @@ The following are included in the `.../install' directory:
 			This is useful if you are installing
 			a diskless OpenBSD/hp300 system.
 
-	inst-20.fs.gz	A gzipped copy of the miniroot filesystem.
+	inst-21.fs.gz	A gzipped copy of the miniroot filesystem.
 
 	bsd.gz		A gzipped GENERIC kernel.
 
@@ -87,13 +86,3 @@ The following are included in the `.../install' directory:
 
 	HP-IB.geometry	A file containing geometry for some HP-IB
 			disk drives.
-
-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 /.  Also note that if you upgrade or install this way, those
-programs that you are using at the time will NOT be replaced.  If you
-follow the normal installation or upgrade procedures, this will be
-taken care of for you.
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index 8d03482924d..c0e5f8bd708 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -91,18 +91,3 @@ distribution tree, and are as follows:
 		including groff, all related programs, and their
 		manual pages.
 		[ 1.0M gzipped, 3.5M uncompressed ]
-
-The i386 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 i386 binary distribution set also has
-its own "CKSUMS" 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 xfp"
-from /.  Also note that if you upgrade or install this way, those
-programs that you are using at the time will NOT be replaced.  If you
-follow the normal installation or upgrade procedures, this will be
-taken care of for you.
diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index 53aedbc897d..be4e1796a58 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -82,13 +82,6 @@ are as follows:
 		system functions as reading manual pages.
 		[ 0.9MB gzipped, 3.6MB uncompressed ]
 
-The mac68k binary distribution sets are distributed in the same form as
-the source distribution sets; that is, the members of a set
-form a gzipped tar file which is assumed to be relative to the root
-of a system's directory tree.  In other words, all sets files should be
-extracted from '/'.  The instructions given for extracting the source sets
-work equally well for the binary sets.
-
 The directory '../2.1/mac68k/utils' contains a number of utilities for the
 MacOS to aid the installation and configuration of OpenBSD.  The files in
 this directory are as follows:
diff --git a/distrib/notes/mvme68k/contents b/distrib/notes/mvme68k/contents
index 03dd123eb48..acf95d796e5 100644
--- a/distrib/notes/mvme68k/contents
+++ b/distrib/notes/mvme68k/contents
@@ -1,8 +1,8 @@
-The mvme68k-specific portion of the OpenBSD 2.0 release is found in the
+The mvme68k-specific portion of the OpenBSD 2.1 release is found in the
 "mvme68k" subdirectory of the distribution.  That subdirectory is laid
 out as follows:
 
-.../2.0/mvme68k/
+.../2.1/mvme68k/
 		INSTALL.mvme68k	this document
 		tars/		mvme68k binary distribution sets;
 				see below.
@@ -10,12 +10,12 @@ out as follows:
 				and an installation script.
 
 The OpenBSD/mvme68k binary distribution sets contain the binaries which
-comprise the OpenBSD 2.0 release for the mvme68k.  There are seven binary
+comprise the OpenBSD 2.1 release for the mvme68k.  There are seven binary
 distribution sets, and the "security" distribution set.  The binary
 distribution sets can be found in subdirectories of the "mvme68k/tars"
-subdirectory of the OpenBSD 2.0 distribution tree, and are as follows:
+subdirectory of the OpenBSD 2.1 distribution tree, and are as follows:
 
-	base20	The OpenBSD/mvme68k 2.0 base binary distribution.  You
+	base21	The OpenBSD/mvme68k 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
@@ -23,7 +23,7 @@ subdirectory of the OpenBSD 2.0 distribution tree, and are as follows:
 		everything described below.
 		[ 11.7M gzipped, 36.0M uncompressed ]
 
-	comp20	The OpenBSD/mvme68k Compiler tools.  All of the tools
+	comp21	The OpenBSD/mvme68k Compiler tools.  All of the tools
 		relating to C, C++, and FORTRAN.
 		This set includes the system include files
 		(/usr/include), the linker, the compiler tool chain,
@@ -34,7 +34,7 @@ subdirectory of the OpenBSD 2.0 distribution tree, and are as follows:
 		call and library manual pages.
 		[ 7.4M gzipped, 23.8M 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
@@ -43,36 +43,25 @@ subdirectory of the OpenBSD 2.0 distribution tree, and are as follows:
 		CAREFULLY upgrade your configuration files by hand.)
 		[ 91K gzipped, 450K uncompressed ]
 
-	games20	This set includes the games and their manual pages.
+	games21	This set includes the games and their manual pages.
 		[ 2.8M gzipped, 7.0M 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.
 		[ 1.8M gzipped, 9.3M 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.
 		[ 1.1M gzipped, 6.2M 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.
 		[ 1.0M gzipped, 3.7M uncompressed ]
 
-The mvme68k 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 mvme68k binary distribution set also has
-its own "CKSUMS" file, just as the source distribution sets do.  The
-binary sets are "rooted" at /, 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 xfp" from /.  Also note that if you
-upgrade or install this way, those programs that you are using at the
-time will NOT be replaced.  If you follow the normal installation or
-upgrade procedures, this will be taken care of for you.
-
 The "mvme68k/install" directory contains an install script, and a
 GENERIC kernel.
diff --git a/distrib/notes/pc532/contents b/distrib/notes/pc532/contents
index ed17e765a28..2a99b4f9a72 100644
--- a/distrib/notes/pc532/contents
+++ b/distrib/notes/pc532/contents
@@ -1,11 +1,11 @@
-The pc532-specific portion of the OpenBSD 2.0 release is found in the
+The pc532-specific portion of the OpenBSD 2.1 release is found in the
 "pc532" subdirectory of the distribution.  That subdirectory contains
 the files as follows:
 
-.../2.0/pc532/
+.../2.1/pc532/
 
 	INSTALL.pc532		Installation notes; this file.
-	inst-20.fs.gz		Installation file system.
+	inst-21.fs.gz		Installation file system.
 	download.c.gz		Source for a pc532 ROM compat download pgm
 	bsd.default.gz		Upgrade kernel
 	base.tar.gz		base distribution
@@ -20,7 +20,7 @@ the files as follows:
 The binary distribution consists of the following files:
 
 	base.tar.gz
-		The OpenBSD/pc532 2.0 base binary distribution.  You
+		The OpenBSD/pc532 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
@@ -78,16 +78,16 @@ is supported by the following files:
 	Initial file system used via SCSI floppy or downloaded into 
 	memory:
 
-	inst-20.fs	-- file system containing boot loader 
+	inst-21.fs	-- file system containing boot loader 
 			   and install kernel with 2MB
 			   ram root file system.
 
 	download.c	-- source for the program to download
-			   inst-20.fs into memory via the
+			   inst-21.fs into memory via the
 			   pc532 ROM monitor.
 
 
-The upgrade process is supported by having a copy of a 2.0 kernel
+The upgrade process is supported by having a copy of a 2. kernel
 available.  This file is:
 
 	bsd.default.gz		-- a kernel produced from the DEFAULT
diff --git a/distrib/notes/pmax/contents b/distrib/notes/pmax/contents
index 6af97ac0950..9a34e369cf4 100644
--- a/distrib/notes/pmax/contents
+++ b/distrib/notes/pmax/contents
@@ -72,18 +72,3 @@ distribution tree, and are as follows:
 		including groff, all related programs, and their
 		manual pages.
 		[ 1.0M gzipped, 4.2M uncompressed ]
-
-The pmax 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 pmax binary distribution set also has
-its own "CKSUMS" 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 xfp"
-from /.  Also note that if you upgrade or install this way, those
-programs that you are using at the time will NOT be replaced.  If you
-follow the normal installation or upgrade procedures, this will be
-taken care of for you.
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index 15fe98d534b..422505ebdea 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -1,8 +1,8 @@
-The sparc-specific portion of the OpenBSD 2.0 release is found in the
+The sparc-specific portion of the OpenBSD 2.1 release is found in the
 "sparc" subdirectory of the distribution.  That subdirectory is laid
 out as follows:
 
-.../2.0/sparc/
+.../2.1/sparc/
 		INSTALL.sparc	this document
 		bins/		sparc binary distribution sets;
 				see below.
@@ -10,12 +10,12 @@ out as follows:
 				and installation script.
 
 The OpenBSD/sparc binary distribution sets contain the binaries which
-comprise the OpenBSD 2.0 release for the sparc.  There are seven binary
+comprise the OpenBSD 2.1 release for the sparc.  There are seven binary
 distribution sets, and the "security" distribution set.  The binary
 distribution sets can be found in subdirectories of the "sparc/bins"
-subdirectory of the OpenBSD 2.0 distribution tree, and are as follows:
+subdirectory of the OpenBSD 2.1 distribution tree, and are as follows:
 
-	base20	The OpenBSD/sparc 2.0 base binary distribution.  You
+	base21	The OpenBSD/sparc 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
@@ -23,7 +23,7 @@ subdirectory of the OpenBSD 2.0 distribution tree, and are as follows:
 		everything described below.
 		[ 13.1M gzipped, 41.7M uncompressed ]
 
-	comp20	The OpenBSD/sparc Compiler tools.  All of the tools
+	comp21	The OpenBSD/sparc Compiler tools.  All of the tools
 		relating to C, C++, and FORTRAN.
 		This set includes the system include files
 		(/usr/include), the linker, the compiler tool chain,
@@ -34,7 +34,7 @@ subdirectory of the OpenBSD 2.0 distribution tree, and are as follows:
 		call and library manual pages.
 		[ 8.7M gzipped, 28.8M 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
@@ -43,37 +43,26 @@ subdirectory of the OpenBSD 2.0 distribution tree, and are as follows:
 		CAREFULLY upgrade your configuration files by hand.)
 		[ 95K gzipped, 460K uncompressed ]
 
-	game20	This set includes the games and their manual pages.
+	game21	This set includes the games and their manual pages.
 		[ 2.9M gzipped, 7.3M 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.
 		[ 2.5M gzipped, 9.4M 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.
 		[ 1.8M gzipped, 6.2M 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.
 		[ 1.0M gzipped, 3.9M uncompressed ]
 
-The sparc 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 sparc binary distribution set also has
-its own "CKSUMS" file, just as the source distribution sets do.  The
-binary sets are "rooted" at /, 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 xfp" from /.  Also note that if you
-upgrade or install this way, those programs that you are using at the
-time will NOT be replaced.  If you follow the normal installation or
-upgrade procedures, this will be taken care of for you.
-
 The "sparc/install" directory contains an install script, and two
 GENERIC kernels.  As well, the distribution cannot be extracted using
 the SunOS "tar" program so SunOS statically-linked versions of gzip
diff --git a/distrib/notes/sun3/contents b/distrib/notes/sun3/contents
index a6d5c453578..78c3c53738d 100644
--- a/distrib/notes/sun3/contents
+++ b/distrib/notes/sun3/contents
@@ -1,8 +1,8 @@
-The sun3-specific portion of the OpenBSD 2.0 release is found in the
+The sun3-specific portion of the OpenBSD 2.1 release is found in the
 "sun3" subdirectory of the distribution.  That subdirectory is laid
 out as follows:
 
-.../2.0/sun3/
+.../2.1/sun3/
 		INSTALL.sun3	Installation notes; this file.
 
 		install/	Boot programs, a GENERIC kernel,
@@ -40,12 +40,12 @@ to support installation "over the network".  See the section "Getting
 the OpenBSD System onto Useful Media" for instructions on either method.
 
 The OpenBSD/sun3 binary distribution sets contain the binaries which
-comprise the OpenBSD 2.0 release for the sun3.  There are seven binary
+comprise the OpenBSD 2.1 release for the sun3.  There are seven binary
 distribution sets, and the "security" distribution set.  The binary
 distribution sets can be found in the "sun3/binary" subdirectory of
-the OpenBSD 2.0 distribution tree, and are as follows:
+the OpenBSD 2.1 distribution tree, and are as follows:
 
-	base20	The OpenBSD/sun3 2.0 base binary distribution.  You
+	base21	The OpenBSD/sun3 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
@@ -53,7 +53,7 @@ the OpenBSD 2.0 distribution tree, and are as follows:
 		everything described below.
 		[ 7.2M gzipped, 19M uncompressed ]
 
-	comp20	The OpenBSD/sun3 Compiler tools.  All of the tools
+	comp21	The OpenBSD/sun3 Compiler tools.  All of the tools
 		relating to C and C++.  This set includes the system
 		include files (/usr/include), the linker, the compiler
 		tool chain, and the various system libraries (except
@@ -63,7 +63,7 @@ the OpenBSD 2.0 distribution tree, and are as follows:
 		call and library manual pages.
 		[ 4.6M gzipped, 14.7M uncompressed ]
 
-	etc20	This distribution set contains the system configuration
+	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 used if you are
@@ -72,36 +72,22 @@ the OpenBSD 2.0 distribution tree, and are as follows:
 		configuration files by hand.)
 		[ 64K gzipped, 348K uncompressed ]
 
-	games20	This set includes the games and their manual pages.
+	games21	This set includes the games and their manual pages.
 		[ 2.8M gzipped, 6.8M 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.
 		[ 850K gzipped, 3.3M 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.
 		[ 1.8M gzipped, 6.5M 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.
 		[ 770K gzipped, 2.8M uncompressed ]
-
-The sun3 binary distribution sets are distributed as gzipped tar files.
-Each sun3 binary distribution set also has its own "CKSUMS" 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 /.  Also note that if you upgrade or install this way, those
-programs that you are using at the time will NOT be replaced.  If you
-follow the normal installation or upgrade procedures, this will be
-taken care of for you.