correct layout; other maintainers please look at the i386 layout change

2 files changed, 38 insertions, 82 deletions

diff --git a/distrib/notes/INSTALL b/distrib/notes/INSTALL
index 14a4b130578..0c1f0785824 100644
--- a/distrib/notes/INSTALL
+++ b/distrib/notes/INSTALL
@@ -46,72 +46,10 @@ Sources of OpenBSD:
 OpenBSD 2.1 Release Contents:
 -----------------------------
 
-The OpenBSD 2.1 release is organized in the following way:
-
-.../2.1/
-		src/			Source distribution sets; see
-					below.
-
-In addition to the files and directories listed above, there is one
-directory per architecture, for each of the architectures that OpenBSD
-2.1 has a binary distribution for.  (That is described further along in
-this document).
-
-The source distribution sets can be found in subdirectories of the
-"source" subdirectory of the distribution tree.  They contain the 
-complete sources to the system.  The source distribution sets 
-are as follows:
-
-	gsrc21	This set contains the "gnu" sources, including
-		the source for the compiler, assembler, groff,
-		and the other GNU utilities in the binary distribution
-		sets.
-		[ 7.1M gzipped, 30.4M uncompressed ]
-
-	ksrc21	This set contains the sources to the OpenBSD 2.1
-		kernel, config(8), config.old(8) and dbsym(8).
-		[ 6.0M gzipped, 27.0M uncompressed ]
-
-	ssrc21	This set contains the "share" sources, which include
-		the sources for the man pages not associated with
-		any particular program, the sources for the
-		typesettable document set, the dictionaries, and more.
-		[ 2.4M gzipped, 8.9M uncompressed ]
-
-	src21	This set contains all of the OpenBSD 2.1 sources which
-		are not mentioned above.
-		[ 9.3M gzipped, 41.6M uncompressed ]
-
-It is worth noting that unless all of the source distribution sets
-are installed (except the domestic set), you can't rebuild and install
-the system from scratch, straight out of the box.  However, all that is
-required to rebuild the system in that case is a trivial modification 
-to one Makefile.
-
-The source distribution sets are distributed as groups of files named
-"set_name.xx" where "set_name" is the distribution set name, and "xx"
-is the sequence number of the file, starting with "aa" for the first
-file in the distribution set, then "ab" for the next, and so on.  All
-of these files except the last one of each set should be exactly
-240,640 bytes long.  (The last file is just long enough to contain the
-remainder of the data for that distribution set.)
-
-Catted together, the files belonging to a source distribution set 
-comprise a gzipped tar file.  If you want to look at list of the files
-contained in the set, you could use the command:
-
-	cd /usr/src; cat set_name.?? | tar tvfz -
-
-or to actually extract the files contained in the set:
-
-	cd /usr/src; cat set_name.?? | tar xfpz -
-
-In each of the source distribution set directories, there are two
-files named "CKSUMS" and "MD5" which contain the checksums of the
-files in that directory, as generated by the cksum(1) and md5(1)
-utilities respectively.  If you suspect that one of the files is
-corrupt and have access to a cksum or md5 binary, you can compare
-their output to the "CKSUMS" or "MD5" file.
+The OpenBSD 2.1 release is organized in the following way.  In the
+.../2.1 directory, there is one sub-directory per architecture, for
+each of the architectures that OpenBSD 2.1 has a binary distribution
+for.  That is described further along in this document).
 
 #include "contents"
 
@@ -140,6 +78,19 @@ Upgrading a previously-installed OpenBSD System:
 
 #include "upgrade"
 
+Getting source code for your OpenBSD System:
+--------------------------------------------
+
+Now that your OpenBSD system is up and running, you probably want to get
+access to source code so that you can recompile pieces of the system.
+
+A few methods are provided.  If you have an OpenBSD CD, the source code
+is provided.  Otherwise, you can get the pieces over the Internet using
+either ANONCVS or CTM. For more information, see
+
+	http://www.openbsd.org/anoncvs.html
+	http://www.openbsd.org/ctm.html
+
 Using online OpenBSD documentation:
 -----------------------------------
 
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index dc27bc876cf..6e32c08b38e 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -5,24 +5,29 @@ out as follows:
 .../2.1/i386/
 		INSTALL.i386	Installation notes; this file.
 
-		bins/		i386 binary distribution sets;
+		floppy.fs	The i386 boot and installation
+				floppy; see below.
+
+		*.gz/		i386 binary distribution sets;
 				see below.
 
-		floppies/	i386 boot and installation
-				floppies; see below.
-
-		inst/		i386 boot/installation floppy;
-				miscellaneous i386 installation
-				utilities; see installation
-				section, below.
-
-There is one i386 floppy image to be found in the "i386/inst" sub-
-directory of the OpenBSD 2.1 distribution.  This is a bootable install
-floppy which can be used both to install and to upgrade an OpenBSD to
-the current version, as well as for maintenance work.  In addition there
-are some utilities that might be useful for the installation.  There
-are gzipped versions of each available, for easier downloading.  (The
-gzipped versions have the ".gz" extension added to their names.)
+		bsd		A stock GENERIC i386 kernel which
+				will be installed on your system
+				during the install.
+
+As well you may be interested in
+
+.../2.1/tools/
+		miscellaneous i386 installation utilities like
+		rawwrite.exe, gzip.exe, and pfdisk.exe; see
+		installation section, below.
+
+
+In summary, there is one i386 floppy image called "floppy.fs". This is
+a bootable install floppy which can be used both to install and to
+upgrade an OpenBSD to the current version, as well as for maintenance
+work.  In addition, the "tools/" directory contains some utilities
+that might be useful for the installation.
 
 Bootable installation/upgrade floppy: