s/cpp/m4/g

1 files changed, 32 insertions, 96 deletions

diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index 8022ef97437..5d9c0634d31 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -1,108 +1,44 @@
-The i386-specific portion of the OpenBSD 2.3 release is found in the
-"i386" subdirectory of the distribution.  That subdirectory is laid
-out as follows:
+TopPart
 
-.../2.3/i386/
-		INSTALL.i386	Installation notes; this file.
+OpenBSDfloppy
 
-		CKSUM		Output of the cksum(1) and md5(1) programs
-		MD5		usable for verification of the correctness
-				of downloaded files.
+OpenBSDdistsets
 
-		floppy23.fs	The i386 boot and installation
-				floppy; see below.
-
-		*.tar.gz	i386 binary distribution sets;
-				see below.
-
-		bsd		A stock GENERIC i386 kernel which
-				will be installed on your system
-				during the install.
+OpenBSDbsd
 
 As well you may be interested in
 
-.../2.3/tools/
+.../OSREV/tools/
 		miscellaneous i386 installation utilities like
 		rawrite.exe, gzip.exe, and pfdisk.exe; see
 		installation section, below.
 
 
-In summary, there is one i386 floppy image called "floppy23.fs" (which
-you can copy to a floppy using rawrite.exe or `dd'; as described later
-in this document).  This is a bootable install floppy which can be
-used both to install and to upgrade OpenBSD to the current version.
-It is also useful for maintenance and disaster recovery.  In addition,
+OpenBSDfloppydesc({:-In addition,
 the "tools/" directory contains some utilities that might be useful
-for the installation.
-
-Bootable installation/upgrade floppy:
-
-	This disk contains a file system, is bootable, and has
-	enough utilities on board to prepare your hard disk drive
-	for OpenBSD and to install the OpenBSD distribution.
-
-	It also holds the utilities needed in order to upgrade a
-	system to the current version of OpenBSD.
-
-The OpenBSD/i386 binary distribution sets contain the binaries which
-comprise the OpenBSD 2.3 release for the i386.  There are seven binary
-distribution sets.  The binary distribution sets can be found in
-the "i386" subdirectory of the OpenBSD 2.3 distribution tree,
-and are as follows:
-
-	base23	The OpenBSD/i386 2.3 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
-		includes shared library support, and excludes
-		everything described below.
-		[ 11.9M gzipped, 33.3M uncompressed ]
-
-	comp23	The OpenBSD/i386 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,
-		and the various system libraries (except the shared
-		libraries, which are included as part of the base
-		set).  This set also includes the manual pages for all
-		of the utilities it contains, as well as the system
-		call and library manual pages.
-		[ 7.3M gzipped, 23.0M uncompressed ]
-
-	etc23	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 upgrading.  (If you are upgrading,
-		it's recommended that you get a copy of this set and
-		CAREFULLY upgrade your configuration files by hand.)
-		[ 93K gzipped, 490K uncompressed ]
-
-	game23	This set includes the games and their manual pages.
-		[ 2.7M gzipped, 6.4M uncompressed ]
-
-	man23	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 ]
-
-	misc23	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.7M gzipped, 5.8M uncompressed ]
-
-	text23	This set includes OpenBSD's text processing tools,
-		including groff, all related programs, and their
-		manual pages.
-		[ 944K gzipped, 3.3M uncompressed ]
-
-	xbase23 This set includes the base X distribution.  This includes
-		programs, headers, libraries, configuration files.
-
-	xfont23 This set includes all of the X fonts.
-
-	xserv23 This set includes all of the X servers.
-
-	xlink23 This set includes the X server link kit.
+for the installation.-:})
+
+DistributionDescription
+
+OpenBSDbase(11.9M,33.3M)
+
+OpenBSDcomp(7.3M,23.0M)
+
+OpenBSDetc(93K,490K)
+
+OpenBSDgame(2.7M,6.4M)
+
+OpenBSDman(2.5M,9.4M)
+
+OpenBSDmisc(1.7M,5.8M)
+
+OpenBSDtext(944K,3.3M)
+
+OpenBSDxbase
+
+OpenBSDxfont
+
+OpenBSDxserv
+
+OpenBSDxlink
+