sync pass 2

26 files changed, 101 insertions, 143 deletions

diff --git a/distrib/notes/INSTALL b/distrib/notes/INSTALL
index 273332ab3d4..370af1e01ad 100644
--- a/distrib/notes/INSTALL
+++ b/distrib/notes/INSTALL
@@ -51,7 +51,7 @@ The OpenBSD 2.0 release is organized in the following way:
 
 In addition to the files and directories listed above, there is one
 directory per architecture, for each of the architectures that OpenBSD
-1.1 has a binary distribution for.
+2.0 has a binary distribution for.
 
 The source distribution sets can be found in subdirectories of the
 "source" subdirectory of the distribution tree.  They contain the 
diff --git a/distrib/notes/amiga/hardware b/distrib/notes/amiga/hardware
index aca7554975b..34e3f96070e 100644
--- a/distrib/notes/amiga/hardware
+++ b/distrib/notes/amiga/hardware
@@ -1,4 +1,4 @@
-OpenBSD/amiga 1.1 runs on any amiga that has a 68020, 68030 or 68040 CPU
+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 65M of disk space.  To install the entire system
 requires much more disk space, and to run X or compile the system,
diff --git a/distrib/notes/amiga/upgrade b/distrib/notes/amiga/upgrade
index f5ff2f5301e..85f3eef42d4 100644
--- a/distrib/notes/amiga/upgrade
+++ b/distrib/notes/amiga/upgrade
@@ -1,5 +1,5 @@
-The upgrade to OpenBSD 1.1 is a binary upgrade; it would be prohibitive
-to make users upgrade by compiling and installing the 1.1 sources, and
+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
 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,
@@ -7,9 +7,9 @@ it is impractical to upgrade by recompiling from the sources and
 installing.
 
 To do the upgrade, you must have the OpenBSD kernel on AmigaDOS and
-you must transfer the upgrade filesystem upgr-11.fs onto the swap
+you must transfer the upgrade filesystem upgr-20.fs onto the swap
 partition of the OpenBSD hard disk.  You must also have at least the
-"base11" binary distribution set available, so that you can upgrade
+"base20" 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 +29,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 1.1 kernel using the loadbsd
+	Now boot up OpenBSD using the 2.0 kernel using the loadbsd
 	command:
 
 		loadbsd -b bsd
@@ -85,13 +85,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 "base11" distribution set.  Once you
+	directory containing the "base20" 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 base11" to upgrade the base
+	Run the command "Extract base20" to upgrade the base
 	distribution.
 
 	Repeat the above two steps for all of the sets you wish to
@@ -113,10 +113,10 @@ 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 1.1.
+Your system has now been upgraded to OpenBSD 2.0.
 
 After a new kernel has been copied to your hard disk, your
-	machine is a complete OpenBSD 1.1 system.  However, that
+	machine is a complete OpenBSD 2.0 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.
@@ -126,7 +126,7 @@ After a new kernel has been copied to your hard disk, your
 	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 etc11 distribution,
+	Second, 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
diff --git a/distrib/notes/atari/contents b/distrib/notes/atari/contents
index cf0722693ea..5fa4c0139fc 100644
--- a/distrib/notes/atari/contents
+++ b/distrib/notes/atari/contents
@@ -1,24 +1,21 @@
-The Atari-specific portion of the OpenBSD 1.1 release is found in the
+The Atari-specific portion of the OpenBSD 2.0 release is found in the
 "atari" subdirectory of the distribution.  That subdirectory is layed
 out as follows:
 
-.../OpenBSD-1.1/atari/
-			binary/		atari binary distribution sets;
-					see below.
+.../2.0/atari/
+		bins/		atari binary distribution sets;
+				see below.
 
-			floppies/	atari boot and installation
-					floppies; see below.
+		floppies/	atari boot and installation
+				floppies; see below.
 
-			security/	atari security distribution;
-					see below;
-
-			utils.openbsd/
-			utils.tos/	Miscellaneous atari
-					installation utilities; see
-					installation section, below.
+		utils.openbsd/
+		utils.tos/	Miscellaneous atari
+				installation utilities; see
+				installation section, below.
 
 There are three atari floppy images to be found in the "atari/floppies"
-subdirectory of the OpenBSD 1.1 distribution.  One of them is a
+subdirectory of the OpenBSD 2.0 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
@@ -30,7 +27,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-11.fs
+	This floppy is named boot-20.fs
 
 Installation floppy:
 
@@ -43,15 +40,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-11.fs.1" and "inst-11.fs.2".
+	This floppy's are named "inst-20.fs.1" and "inst-20.fs.2".
 
 The OpenBSD/atari binary distribution sets contain the binaries which
-comprise the OpenBSD 1.1 release for the atari.  There are seven binary
+comprise the OpenBSD 2.0 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/binary"
-subdirectory of the OpenBSD 1.1 distribution tree, and are as follows:
+distribution sets can be found in subdirectories of the "atari/bins"
+subdirectory of the OpenBSD 2.0 distribution tree, and are as follows:
 
-	base11	The OpenBSD/atari 1.1 base binary distribution.  You
+	base20	The OpenBSD/atari 2.0 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
@@ -59,7 +56,7 @@ subdirectory of the OpenBSD 1.1 distribution tree, and are as follows:
 		everything described below.
 		[ 7M gzipped, 19M uncompressed ]
 
-	comp11	The OpenBSD/atari Compiler tools.  All of the tools
+	comp20	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,
@@ -70,7 +67,7 @@ subdirectory of the OpenBSD 1.1 distribution tree, and are as follows:
 		call and library manual pages.
 		[ 4M gzipped, 12M uncompressed ]
 
-	etc11	This distribution set contains the system
+	etc20	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
@@ -79,35 +76,26 @@ subdirectory of the OpenBSD 1.1 distribution tree, and are as follows:
 		CAREFULLY upgrade your configuration files by hand.)
 		[ 50K gzipped, 280K uncompressed ]
 
-	games11	This set includes the games and their manual pages.
+	games20	This set includes the games and their manual pages.
 		[ 1M gzipped, 3M uncompressed ]
 
-	man11	This set includes all of the manual pages for the
+	man20	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 ]
 
-	misc11	This set includes the system dictionaries (which are
+	misc20	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 ]
 
-	text11	This set includes OpenBSD's text processing tools,
+	text20	This set includes OpenBSD's text processing tools,
 		including groff, all related programs, and their
 		manual pages.
 		[ 784K gzipped, 3M uncompressed ]
 
-The atari security distribution set is named "secr11" and can be found
-in the "atari/security" subdirectory of the OpenBSD 1.1 distribution
-tree.  It contains crypt.c (the source file for the DES encryption
-algorithm) and the binaries which depend on it.  It can only be found
-on those sites which carry the complete OpenBSD distribution and that
-can legally obtain it.  (Remember, because of United States law, this
-distribution set may not be exported to locations outside of the
-United States and Canada.)  [ 119K gzipped, 300K 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
diff --git a/distrib/notes/atari/hardware b/distrib/notes/atari/hardware
index 9cbb97a6abc..4c9a01b5d0e 100644
--- a/distrib/notes/atari/hardware
+++ b/distrib/notes/atari/hardware
@@ -1,4 +1,4 @@
-OpenBSD/atari 1.1 runs on a TT030 and a Falcon. Currently an FPU is
+OpenBSD/atari 2.0 runs on a TT030 and a Falcon. Currently an FPU is
 required, although this might change in the (near) future. The
 minimum amount of RAM required is 4Mb.
 
diff --git a/distrib/notes/atari/whatis b/distrib/notes/atari/whatis
index 5e38de6fe75..de50ed1cae5 100644
--- a/distrib/notes/atari/whatis
+++ b/distrib/notes/atari/whatis
@@ -1,2 +1,2 @@
-The Atari release stepped in in March 1995. This means the OpenBSD1.1
+The Atari release stepped in in March 1995. This means the OpenBSD 2.0
 is the first official release of OpenBSD/Atari.
diff --git a/distrib/notes/hp300/contents b/distrib/notes/hp300/contents
index 0c6438e2336..a7fca3bef50 100644
--- a/distrib/notes/hp300/contents
+++ b/distrib/notes/hp300/contents
@@ -1,25 +1,22 @@
-The hp300-specific portion of the OpenBSD 1.1 release is found in the
+The hp300-specific portion of the OpenBSD 2.0 release is found in the
 "hp300" subdirectory of the distribution.  That subdirectory is laid
 out as follows:
 
-.../OpenBSD-1.1/hp300/
-			binary/		hp300 binary distribution sets;
-					see below.
+.../2.0/hp300/
+		bins/		hp300 binary distribution sets;
+				see below.
 
-			install/	a GENERIC kernel, installation
-					utilities and a miniroot filesystem;
-					see below.
-
-			security/	hp300 security distribution;
-					see below.
+		install/	a GENERIC kernel, installation
+				utilities and a miniroot filesystem;
+				see below.
 
 The OpenBSD/hp300 binary distribution sets contain the binaries which
-comprise the OpenBSD 1.1 release for the hp300.  There are seven binary
+comprise the OpenBSD 2.0 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/binary" subdirectory of
-the OpenBSD 1.1 distribution tree, and are as follows:
+distribution sets can be found in the "hp300/bins" subdirectory of
+the OpenBSD 2.0 distribution tree, and are as follows:
 
-	base11	The OpenBSD/hp300 1.1 base binary distribution.  You
+	base20	The OpenBSD/hp300 2.0 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
@@ -27,7 +24,7 @@ the OpenBSD 1.1 distribution tree, and are as follows:
 		everything described below.
 		[ 7.2M gzipped, 19M uncompressed ]
 
-	comp11	The OpenBSD/hp300 Compiler tools.  All of the tools
+	comp20	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
@@ -37,7 +34,7 @@ the OpenBSD 1.1 distribution tree, and are as follows:
 		call and library manual pages.
 		[ 4.6M gzipped, 14.7M uncompressed ]
 
-	etc11	This distribution set contains the system configuration
+	etc20	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
@@ -46,35 +43,26 @@ the OpenBSD 1.1 distribution tree, and are as follows:
 		configuration files by hand.)
 		[ 64K gzipped, 348K uncompressed ]
 
-	games11	This set includes the games and their manual pages.
+	games20	This set includes the games and their manual pages.
 		[ 2.8M gzipped, 6.8M uncompressed ]
 
-	man11	This set includes all of the manual pages for the
+	man20	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 ]
 
-	misc11	This set includes the system dictionaries (which are
+	misc20	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 ]
 
-	text11	This set includes OpenBSD's text processing tools,
+	text20	This set includes OpenBSD's text processing tools,
 		including groff, all related programs, and their
 		manual pages.
 		[ 770K gzipped, 2.8M uncompressed ]
 
-The hp300 security distribution set is named "secr11" and can be found
-in the "hp300/security" subdirectory of the OpenBSD 1.1 distribution
-tree.  It contains executables which are built in the "src/domestic" portion
-if the OpenBSD source tree.  It can only be found on those sites which carry
-the complete OpenBSD distribution and that can legally obtain it.  (Remember,
-because of United States law, this distribution set may not be exported to
-locations outside of the United States and Canada.)
-[ 128K gzipped, 275K 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.
@@ -88,7 +76,7 @@ The following are included in the `.../install' directory:
 			This is useful if you are installing
 			a diskless OpenBSD/hp300 system.
 
-	inst-11.fs.gz	A gzipped copy of the miniroot filesystem.
+	inst-20.fs.gz	A gzipped copy of the miniroot filesystem.
 
 	bsd.gz		A gzipped GENERIC kernel.
 
diff --git a/distrib/notes/hp300/hardware b/distrib/notes/hp300/hardware
index ceb157821b4..5297f71c9ec 100644
--- a/distrib/notes/hp300/hardware
+++ b/distrib/notes/hp300/hardware
@@ -1,4 +1,4 @@
-OpenBSD/hp300 1.1 will run on most HP 9000/300- and 400-series machines.
+OpenBSD/hp300 2.0 will run on most HP 9000/300- and 400-series machines.
 The lowest amount of RAM that has been tested is 7.5M, though it
 may run with less.  Certainly, if you wish to run X, more RAM is
 recommended.
diff --git a/distrib/notes/hp300/upgrade b/distrib/notes/hp300/upgrade
index e236af3951e..87555a76ee4 100644
--- a/distrib/notes/hp300/upgrade
+++ b/distrib/notes/hp300/upgrade
@@ -20,7 +20,7 @@ through the procedure.  The upgrade program will:
 	* Copy a new kernel onto your root partition.
 	  NOTE: the existing kernel WILL NOT be backed up; doing
 	  so would be pointless, since a OpenBSD 1.0 kernel will
-	  not run OpenBSD 1.1 executables.
+	  not run OpenBSD 2.0 executables.
 
 	* Install a new boot block.
 
@@ -33,13 +33,13 @@ manually.  To do this, follow the following procedure:
 	* Place _at least_ the `base' binary set in a filesystem
 	  accessible to the target machine.  A local filesystem
 	  is preferred, since there may be incompatibilities
-	  between the OpenBSD 1.1 kernel and older route(8)
+	  between the OpenBSD 2.0 kernel and older route(8)
 	  binaries.
 
 	* Back up your pre-existing kernel and copy the 1.1
 	  kernel into your root partition.
 
-	* Reboot with the 1.1 kernel into single-user mode.
+	* Reboot with the 2.0 kernel into single-user mode.
 
 	* Check all filesystems:
 
diff --git a/distrib/notes/mac68k/hardware b/distrib/notes/mac68k/hardware
index d28ac081e8d..f40d7df8efe 100644
--- a/distrib/notes/mac68k/hardware
+++ b/distrib/notes/mac68k/hardware
@@ -1,9 +1,9 @@
-OpenBSD/mac68k 1.1 runs on several of the older Macintosh computers.
+OpenBSD/mac68k 2.0 runs on several of the older Macintosh computers.
 4MB of RAM should be sufficient to boot and the system can probably
 be squeezed onto a 40MB hard disk by leaving off a package or two.
 To actually do much compiling or anything more interesting than
 booting, at least 8MB of RAM and more disk space is recommended.
-About 50MB will be necessary to install all of the OpenBSD 1.1 binary
+About 50MB will be necessary to install all of the OpenBSD 2.0 binary
 distribution (note that this does not count swap space!).  Much more
 disk space is required to install the source and objects as well (about
 another 105MB).
diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install
index cde3b1a7686..e6fcd960448 100644
--- a/distrib/notes/mac68k/install
+++ b/distrib/notes/mac68k/install
@@ -111,7 +111,7 @@ if you're using the machine in a networked environment, you should
 create yourself an account and protect it and the "root" account with
 good passwords.
 
-Some of the files in the OpenBSD 1.1 distribution might need to be
+Some of the files in the OpenBSD 2.0 distribution might need to be
 tailored for your site.  In particular, the /etc/sendmail.cf file will
 almost definitely need to be adjusted, and other files in /etc will
 probably need to be modified, as well.  If you are unfamiliar with
diff --git a/distrib/notes/mac68k/upgrade b/distrib/notes/mac68k/upgrade
index 946e4a4a9bb..2cf05812cf7 100644
--- a/distrib/notes/mac68k/upgrade
+++ b/distrib/notes/mac68k/upgrade
@@ -1,4 +1,4 @@
-There is no upgrade to release 1.1 for the OpenBSD/mac68k architecture.
+There is no upgrade to release 2.0 for the OpenBSD/mac68k architecture.
 It is hoped that there will be a good upgrade procedure for future
 releases.  Please feel free to volunteer to help replace these
 installation tools.
diff --git a/distrib/notes/mac68k/whatis b/distrib/notes/mac68k/whatis
index 8340c922b03..869cf86f56c 100644
--- a/distrib/notes/mac68k/whatis
+++ b/distrib/notes/mac68k/whatis
@@ -1,3 +1,3 @@
-OpenBSD 1.1 is the first release of OpenBSD for the mac68k.
+OpenBSD 2.0 is the first release of OpenBSD for the mac68k.
 There is still a lot of work to be done and help is welcomed, but
 this should be a usable system for a number of people.
diff --git a/distrib/notes/mac68k/xfer b/distrib/notes/mac68k/xfer
index 9b24475d841..bf1a6b61a89 100644
--- a/distrib/notes/mac68k/xfer
+++ b/distrib/notes/mac68k/xfer
@@ -1,7 +1,7 @@
 Installation is really only supported from the local Macintosh
 hard drive or from an AppleShare volume.  This means that you'll
 need at least enough room for the largest file that you will have
-to install.  This is the 6.2M base11 file.  There has been talk
+to install.  This is the 6.2M base20 file.  There has been talk
 of allowing an install from split files.  If you have the time,
 desire, and knowledge, please feel free to add that functionality.
 
@@ -9,7 +9,7 @@ If the install is being done from an AppleShare-mounted volume,
 the install utility must be in the same folder as the data files.
 
 There will be two images of each file.  One in "raw" Unix format
-and one in a binhex format.  Therefore, base11 and base11.hqx both
+and one in a binhex format.  Therefore, base20 and base11.hqx both
 contain the same information, but base11.hqx has been encoded in
 binhex format.  Download the files; if necessary, decode them so
 you have all of the files as base11, etc11, etc.  This can be
diff --git a/distrib/notes/pc532/contents b/distrib/notes/pc532/contents
index 4fd8b2cd617..c847dd7db3e 100644
--- a/distrib/notes/pc532/contents
+++ b/distrib/notes/pc532/contents
@@ -1,12 +1,12 @@
-The pc532-specific portion of the OpenBSD 1.1 release is found in the
+The pc532-specific portion of the OpenBSD 2.0 release is found in the
 "pc532" subdirectory of the distribution.  That subdirectory contains
 the files as follows:
 
-.../OpenBSD-1.1/pc532/
+.../2.0/pc532/
 
 	INSTALL			Installation notes; this file.
 	CKSUM			output of "cksum *.gz"
-	inst-11.fs.gz		Installation file system.
+	inst-20.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
@@ -21,7 +21,7 @@ the files as follows:
 The binary distribution consists of the following files:
 
 	base.tar.gz
-		The OpenBSD/pc532 1.1 base binary distribution.  You
+		The OpenBSD/pc532 2.0 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
@@ -72,13 +72,6 @@ The binary distribution consists of the following files:
 		manual pages.
 		[ 0.8M gzipped ]
 
-The pc532 distribution set does not include a security distribution.
-If you are in the US and want the security distribution you must
-get the security source distribution and recompile libcrypt.a and
-recompile the following programs:
-	ed, ftpd, makekey, rexecd, uucpd, init, lock, login, passwd,
-	skeyinit, su, tn3270, pppd
-
 
 The initial installation process on a pc532 without OpenBSD/pc532
 is supported by the following files:
@@ -86,16 +79,16 @@ is supported by the following files:
 	Initial file system used via SCSI floppy or downloaded into 
 	memory:
 
-		inst-11.fs	-- file system containing boot loader 
-				   and install kernel with 2MB
-				   ram root file system.
+	inst-20.fs	-- file system containing boot loader 
+			   and install kernel with 2MB
+			   ram root file system.
 
-	download.c		-- source for the program to download
-				   inst-11.fs into memory via the
-				   pc532 ROM monitor.
+	download.c	-- source for the program to download
+			   inst-20.fs into memory via the
+			   pc532 ROM monitor.
 
 
-The upgrade process is supported by having a copy of a 1.1 kernel
+The upgrade process is supported by having a copy of a 2.0 kernel
 available.  This file is:
 
 	bsd.default.gz		-- a kernel produced from the DEFAULT
diff --git a/distrib/notes/pc532/hardware b/distrib/notes/pc532/hardware
index 9deee660bed..b7bc6ca234e 100644
--- a/distrib/notes/pc532/hardware
+++ b/distrib/notes/pc532/hardware
@@ -1,4 +1,4 @@
-OpenBSD/pc532 1.1 runs on a PC532 computer.  It supports a subset of the
+OpenBSD/pc532 2.0 runs on a PC532 computer.  It supports a subset of the
 "standard" hardware to date.  This is defined as:
 
 	4 - 32 Megs of memory
diff --git a/distrib/notes/pc532/upgrade b/distrib/notes/pc532/upgrade
index 5ebc383497a..9be75f81fdb 100644
--- a/distrib/notes/pc532/upgrade
+++ b/distrib/notes/pc532/upgrade
@@ -1,5 +1,5 @@
-The upgrade to OpenBSD 1.1 is a binary upgrade; it would be prohibitive
-to make users upgrade by compiling and installing the 1.1 sources, and
+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
 it would be very difficult to even compile a set of instructions that
 allowed them to do so.  
 
@@ -30,7 +30,7 @@ To upgrade your system, follow the following instructions:
 	depending on what version of OpenBSD/pc532 you are running.
 
 	BE CAREFUL IF YOU ARE NOT RUNNING WITH SECURITY.  The 
-	1.1 distribution does contain support for password encription.
+	2.0 distribution does contain support for password encription.
 	It would be reasonable to save a copy of master.passwd and
 	remove all passwords until after you upgrade. 
 
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index 8bffed4befb..8488507aa09 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -11,7 +11,7 @@ out as follows:
 The OpenBSD/sparc binary distribution sets contain the binaries which
 comprise the OpenBSD RELEASE 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/binary"
+distribution sets can be found in subdirectories of the "sparc/bins"
 subdirectory of the OpenBSD RELEASE distribution tree, and are as follows:
 
 	base20	The OpenBSD/sparc RELEASE base binary distribution.  You
diff --git a/distrib/notes/sparc/hardware b/distrib/notes/sparc/hardware
index 3be3fcb73ca..1422216ab0e 100644
--- a/distrib/notes/sparc/hardware
+++ b/distrib/notes/sparc/hardware
@@ -10,7 +10,7 @@ OpenBSD/sparc RELEASE does *not* run on these machines (yet):
 	- sun4d (e.g. sparc center 2000)
 
 Work on porting OpenBSD/sparc to the sun4m platform is currently in 
-progress, but was not ready in time for the 1.1 release.
+progress, but was not ready in time for the 2.0 release.
 
 The minimal configuration requires 4M of RAM and ~60M of disk space.
 To install the entire system requires much more disk space, and to run
diff --git a/distrib/notes/sparc/upgrade b/distrib/notes/sparc/upgrade
index d5632bb7a63..cc43a36d291 100644
--- a/distrib/notes/sparc/upgrade
+++ b/distrib/notes/sparc/upgrade
@@ -1,4 +1,4 @@
-To upgrade to OpenBSD 1.1 from a previous version follow the instructions
+To upgrade to OpenBSD 2.0 from a previous version follow the instructions
 in the section "Installing OpenBSD", but run the script `upgrade.sh'
 in stead of `install.sh'.
 
diff --git a/distrib/notes/sun3/contents b/distrib/notes/sun3/contents
index 6a98311b774..540867f340e 100644
--- a/distrib/notes/sun3/contents
+++ b/distrib/notes/sun3/contents
@@ -1,5 +1,4 @@
-
-The sun3-specific portion of the OpenBSD 1.1 release is found in the
+The sun3-specific portion of the OpenBSD 2.0 release is found in the
 "sun3" subdirectory of the distribution.  That subdirectory is laid
 out as follows:
 
@@ -43,12 +42,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 1.1 release for the sun3.  There are seven binary
+comprise the OpenBSD 2.0 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 1.1 distribution tree, and are as follows:
+the OpenBSD 2.0 distribution tree, and are as follows:
 
-	base11	The OpenBSD/sun3 1.1 base binary distribution.  You
+	base20	The OpenBSD/sun3 2.0 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
@@ -56,7 +55,7 @@ the OpenBSD 1.1 distribution tree, and are as follows:
 		everything described below.
 		[ 7.2M gzipped, 19M uncompressed ]
 
-	comp11	The OpenBSD/sun3 Compiler tools.  All of the tools
+	comp20	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
@@ -66,7 +65,7 @@ the OpenBSD 1.1 distribution tree, and are as follows:
 		call and library manual pages.
 		[ 4.6M gzipped, 14.7M uncompressed ]
 
-	etc11	This distribution set contains the system configuration
+	etc20	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
@@ -75,35 +74,26 @@ the OpenBSD 1.1 distribution tree, and are as follows:
 		configuration files by hand.)
 		[ 64K gzipped, 348K uncompressed ]
 
-	games11	This set includes the games and their manual pages.
+	games20	This set includes the games and their manual pages.
 		[ 2.8M gzipped, 6.8M uncompressed ]
 
-	man11	This set includes all of the manual pages for the
+	man20	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 ]
 
-	misc11	This set includes the system dictionaries (which are
+	misc20	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 ]
 
-	text11	This set includes OpenBSD's text processing tools,
+	text20	This set includes OpenBSD's text processing tools,
 		including groff, all related programs, and their
 		manual pages.
 		[ 770K gzipped, 2.8M uncompressed ]
 
-The sun3 security distribution set is named "secr11" and can be found
-in the "sun3/security" subdirectory of the OpenBSD 1.1 distribution
-tree.  It contains executables which are built in the "src/domestic" portion
-if the OpenBSD source tree.  It can only be found on those sites which carry
-the complete OpenBSD distribution and that can legally obtain it.  (Remember,
-because of United States law, this distribution set may not be exported to
-locations outside of the United States and Canada.)
-[ 128K gzipped, 275K 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.
@@ -117,4 +107,3 @@ 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/sun3/hardware b/distrib/notes/sun3/hardware
index d8216e4a82d..383ce2b5401 100644
--- a/distrib/notes/sun3/hardware
+++ b/distrib/notes/sun3/hardware
@@ -1,10 +1,10 @@
 
-OpenBSD/sun3 1.1 runs on most Sun3 machines, including:
+OpenBSD/sun3 2.0 runs on most Sun3 machines, including:
 		3/50, 3/60, 3/110
 		3/75, 3/150, 3/160
 		3/260, 3/280
 
-OpenBSD/sun3 1.1 does not run on the Sun3/80 (sun3x class)
+OpenBSD/sun3 2.0 does not run on the Sun3/80 (sun3x class)
 because the sun3x MMU and other devices are very different.
 
 The minimal configuration requires 4M of RAM and ~80MB of disk space.
diff --git a/distrib/notes/sun3/install b/distrib/notes/sun3/install
index ba3cf7f56d3..99e311833ca 100644
--- a/distrib/notes/sun3/install
+++ b/distrib/notes/sun3/install
@@ -13,7 +13,7 @@ initialize the disk on that machine and then move the disk.
 
 * Installing from tape:
 
-Create the OpenBSD/sun3 1.1 boot tape as described in the section
+Create the OpenBSD/sun3 2.0 boot tape as described in the section
 entitled "Preparing a boot tape" and boot the tape.  At the PROM
 monitor prompt, use one of the commands:
 	>b st()
diff --git a/distrib/notes/sun3/upgrade b/distrib/notes/sun3/upgrade
index bbc2f0317a1..4116b2da030 100644
--- a/distrib/notes/sun3/upgrade
+++ b/distrib/notes/sun3/upgrade
@@ -8,13 +8,13 @@ Manual upgrade procedure:
 	* Place _at least_ the `base' binary set in a filesystem
 	  accessible to the target machine.  A local filesystem
 	  is preferred, since there may be incompatibilities
-	  between the OpenBSD 1.1 kernel and older route(8)
+	  between the OpenBSD 2.0 kernel and older route(8)
 	  binaries.
 
 	* Back up your pre-existing kernel and copy the 1.1
 	  kernel into your root partition.
 
-	* Reboot with the 1.1 kernel into single-user mode.
+	* Reboot with the 2.0 kernel into single-user mode.
 
 	* Check all filesystems:
 
diff --git a/distrib/notes/sun3/whatis b/distrib/notes/sun3/whatis
index 7230a9498a0..057e8c40706 100644
--- a/distrib/notes/sun3/whatis
+++ b/distrib/notes/sun3/whatis
@@ -1,5 +1,5 @@
 
-OpenBSD 1.1 is the first "full" release of OpenBSD for the sun3,
+OpenBSD 2.0 is the first "full" release of OpenBSD for the sun3,
 including a full set of binaries.  This binary distribution is
 referred to elsewhere in this document by the name OpenBSD/sun3.
 This release offers improved stability and many new features.
diff --git a/distrib/notes/sun3/xfer b/distrib/notes/sun3/xfer
index 79b25b4d9a4..a7e58bbe86c 100644
--- a/distrib/notes/sun3/xfer
+++ b/distrib/notes/sun3/xfer
@@ -122,4 +122,4 @@ server, you may want to keep the following information handy:
 	IP Address: 128.6.190.2
 	Login: anonymous
 	Password: <your e-mail address>
-	Server path: /pub/OpenBSD/OpenBSD-1.1/sun3/binary
+	Server path: /pub/OpenBSD/2.0/sun3/bins