sync pass 2

3 files changed, 22 insertions, 34 deletions

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: