s,\("[^"]"\)/bins,\1,

.. and related.

12 files changed, 31 insertions, 28 deletions

diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index aaf5c1a2c52..12ad4d0c413 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -42,8 +42,8 @@ Bootable installation/upgrade floppy:
 The OpenBSD/alpha binary distribution sets contain the binaries which
 comprise the OpenBSD 2.2 release for the alpha.  There are seven binary
 distribution sets.  The binary distribution sets can be found in
-subdirectories of the "alpha/bins" subdirectory of the OpenBSD 2.2
-distribution tree, and are as follows:
+the "alpha" subdirectory of the OpenBSD 2.2 distribution tree,
+and are as follows:
 
 	base22	The OpenBSD/alpha 2.2 base binary distribution.  You
 		MUST install this distribution set.  It contains the
diff --git a/distrib/notes/amiga/contents b/distrib/notes/amiga/contents
index 284082681a7..a988c210e82 100644
--- a/distrib/notes/amiga/contents
+++ b/distrib/notes/amiga/contents
@@ -1,5 +1,5 @@
 The amiga-specific portion of the OpenBSD 2.2 release is found in the
-"amiga" subdirectory of the distribution.  That subdirectory is layed
+"amiga" subdirectory of the distribution.  That subdirectory is laid
 out as follows:
 
 .../2.2/amiga/
@@ -50,9 +50,8 @@ Installation/upgrade miniroot file system:
 The OpenBSD/amiga binary distribution sets contain the binaries which
 comprise the OpenBSD 2.2 release for the amiga.  There are seven binary
 distribution sets.  The binary distribution sets can be found in
-subdirectories of the "amiga/" subdirectory of the OpenBSD 2.2
-distribution tree, and are as follows (all have ".tar.gz" appended to
-the name given in the table below):
+the "amiga" subdirectory of the OpenBSD 2.2 distribution tree,
+and are as follows:
 
 	base22	The OpenBSD/amiga 2.2 base binary distribution.  You
 		MUST install this distribution set.  It contains the
diff --git a/distrib/notes/arc/contents b/distrib/notes/arc/contents
index c6dafade08f..10ad57ace45 100644
--- a/distrib/notes/arc/contents
+++ b/distrib/notes/arc/contents
@@ -32,8 +32,8 @@ when a system is installed for the first time. The file is in ECOFF format.
 The OpenBSD/arc binary distribution sets contain the binaries which
 comprise the OpenBSD 2.2 release for ARC systems. There are seven binary
 distribution sets.  The binary distribution sets can be found in
-subdirectories of the "arc/bins" subdirectory of the OpenBSD 2.2
-distribution tree, and are as follows:
+the "arc" subdirectory of the OpenBSD 2.2 distribution tree,
+and are as follows:
 
 	base22	The OpenBSD/arc 2.2 base binary distribution.  You
 		MUST install this distribution set.  It contains the
diff --git a/distrib/notes/atari/contents b/distrib/notes/atari/contents
index 5aff1a00634..3c6790b6169 100644
--- a/distrib/notes/atari/contents
+++ b/distrib/notes/atari/contents
@@ -1,5 +1,5 @@
 The Atari-specific portion of the OpenBSD 2.2 release is found in the
-"atari" subdirectory of the distribution.  That subdirectory is layed
+"atari" subdirectory of the distribution.  That subdirectory is laid
 out as follows:
 
 .../2.2/atari/
diff --git a/distrib/notes/atari/hardware b/distrib/notes/atari/hardware
index 4c9a01b5d0e..86c5d6968df 100644
--- a/distrib/notes/atari/hardware
+++ b/distrib/notes/atari/hardware
@@ -1,4 +1,4 @@
-OpenBSD/atari 2.0 runs on a TT030 and a Falcon. Currently an FPU is
+OpenBSD/atari 2.2 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/i386/contents b/distrib/notes/i386/contents
index 1a385c0a9b9..7929278c366 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -49,8 +49,8 @@ Bootable installation/upgrade floppy:
 The OpenBSD/i386 binary distribution sets contain the binaries which
 comprise the OpenBSD 2.2 release for the i386.  There are seven binary
 distribution sets.  The binary distribution sets can be found in
-subdirectories of the "i386" subdirectory of the OpenBSD 2.2
-distribution tree, and are as follows:
+the "i386" subdirectory of the OpenBSD 2.2 distribution tree,
+and are as follows:
 
 	base22	The OpenBSD/i386 2.2 base binary distribution.  You
 		MUST install this distribution set.  It contains the
diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index b19a24bdcd7..cd804820f98 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -17,10 +17,10 @@ out as follows:
 		utils/		The mac68k installation utilities for MacOS.
 
 The OpenBSD/mac68k binary distribution sets contain all the binaries which
-are need to run the OpenBSD 2.2 release for the mac68k.  There are eight binary
-distribution sets.  The binary distribution sets can be found in the
-"mac68k/" of the OpenBSD 2.2 distribution tree, and
-are as follows:
+comprise the OpenBSD 2.2 release for the mac68k.  There are seven binary
+distribution sets.  The binary distribution sets can be found in
+the "mac68k" subdirectory of the OpenBSD 2.2 distribution tree,
+and are as follows:
 
 	bsd-generic.tar.gz	The OpenBSD/mac68k 2.2 kernel binary.  You MUST
 		install this file.  It is the kernel that you need
@@ -28,7 +28,7 @@ are as follows:
 		[ 1.4M uncompressed ]
 
 	bsd-genericsbc.tar.gz The OpenBSD/mac68k kernel binary.  This is
-		identical in every way to bsd22.tar.gz accept that
+		identical in every way to bsd-generic.tar.gz accept that
 		it enables a different SCSI driver which may allow
 		some otherwise incompatible SCSI disks to function
 		with OpenBSD/mac68k.  You must install either this
diff --git a/distrib/notes/mvme68k/contents b/distrib/notes/mvme68k/contents
index 35aa72f93dd..68ce29a1697 100644
--- a/distrib/notes/mvme68k/contents
+++ b/distrib/notes/mvme68k/contents
@@ -21,9 +21,9 @@ out as follows:
 
 The OpenBSD/mvme68k binary distribution sets contain the binaries which
 comprise the OpenBSD 2.2 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.2 distribution tree, and are as follows:
+distribution sets.  The binary distribution sets can be found in
+the "mvme68k" subdirectory of the OpenBSD 2.2 distribution tree,
+and are as follows:
 
 	base22	The OpenBSD/mvme68k 2.2 base binary distribution.  You
 		MUST install this distribution set.  It contains the
diff --git a/distrib/notes/pc532/contents b/distrib/notes/pc532/contents
index 147a02fa2a6..c4895abeb94 100644
--- a/distrib/notes/pc532/contents
+++ b/distrib/notes/pc532/contents
@@ -23,7 +23,11 @@ the files as follows:
 	bsd.default.gz		Upgrade kernel
 
 
-The binary distribution consists of the following files:
+The OpenBSD/pc532 binary distribution sets contain the binaries which
+comprise the OpenBSD 2.2 release for the pc532.  There are seven binary
+distribution sets.  The binary distribution sets can be found in
+the "pc532" subdirectory of the OpenBSD 2.2 distribution tree,
+and are as follows:
 
 	base22
 		The OpenBSD/pc532 2.2 base binary distribution.  You
diff --git a/distrib/notes/powerpc/contents b/distrib/notes/powerpc/contents
index 0a411e90941..4ac2eca8f7f 100644
--- a/distrib/notes/powerpc/contents
+++ b/distrib/notes/powerpc/contents
@@ -45,8 +45,8 @@ Bootable installation/upgrade floppy:
 The OpenBSD/powerpc binary distribution sets contain the binaries which
 comprise the OpenBSD 2.2 release for the powerpc.  There are seven binary
 distribution sets.  The binary distribution sets can be found in
-subdirectories of the "powerpc/bins" subdirectory of the OpenBSD 2.2
-distribution tree, and are as follows:
+the "powerpc" subdirectory of the OpenBSD 2.2 distribution tree,
+and are as follows:
 
 	base22	The OpenBSD/powerpc 2.2 base binary distribution.  You
 		MUST install this distribution set.  It contains the
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index 019ff148bce..fd4f87458ec 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -89,8 +89,8 @@ Bootable installation/upgrade floppies:
 The OpenBSD/sparc binary distribution sets contain the binaries which
 comprise the OpenBSD 2.2 release for the sparc.  There are seven binary
 distribution sets.  These binary distribution sets can be found in
-"sparc" subdirectory of the OpenBSD 2.2 distribution tree, and are as
-follows:
+the "sparc" subdirectory of the OpenBSD 2.2 distribution tree,
+and are as follows:
 
 	base22	The OpenBSD/sparc 2.2 base binary distribution.  You
 		MUST install this distribution set.  It contains the
diff --git a/distrib/notes/sun3/contents b/distrib/notes/sun3/contents
index 91ede34a891..a1afbb8ed86 100644
--- a/distrib/notes/sun3/contents
+++ b/distrib/notes/sun3/contents
@@ -41,9 +41,9 @@ 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.2 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.2 distribution tree, and are as follows:
+distribution sets.  The binary distribution sets can be found in
+the "sun3" subdirectory of the OpenBSD 2.2 distribution tree,
+and are as follows:
 
 	base22	The OpenBSD/sun3 2.2 base binary distribution.  You
 		MUST install this distribution set.  It contains the