s/cpp/m4/g

1 files changed, 17 insertions, 62 deletions

diff --git a/distrib/notes/pmax/contents b/distrib/notes/pmax/contents
index 645e185eb12..a4ec12a9f59 100644
--- a/distrib/notes/pmax/contents
+++ b/distrib/notes/pmax/contents
@@ -1,82 +1,37 @@
-The pmax-specific portion of the OpenBSD 2.3 release is found in the
-"pmax" subdirectory of the distribution.  That subdirectory is laid
-out as follows:
+TopPart
 
-.../2.3/pmax/
-		INSTALL.pmax	Installation notes; this file.
-
-		*.gz		pmax binary distribution sets;
-				see below.
+OpenBSDdistsets
 
 		simpleroot*	pmax boot and installation
 				simpleroot files; see below.
 
-There is a pmax simpleroot image named simpleroot23.fs (it is usually
-compressed using gzip - simpleroot23.fs.gz - so you need gunzip first
-to uncompress it) subdirectory of the OpenBSD 2.3 distribution.  This
+There is a pmax simpleroot image named simpleroot{:--:}OSrev.fs (it is usually
+compressed using gzip - simpleroot{:--:}OSrev.fs.gz - so you need gunzip first
+to uncompress it) subdirectory of the OpenBSD OSREV distribution.  This
 file you can dump onto a disk and boot from it to start the installation
-of OpenBSD/pmax. Also there is a simpleroot23.tar.gz file there.  It
+of OpenBSD/pmax. Also there is a simpleroot{:--:}OSrev.tar.gz file there.  It
 can be used as root area on the NFS server if you plan to install via
 network.
 
-The OpenBSD/pmax binary distribution sets contain the binaries which
-comprise the OpenBSD 2.3 release for the pmax.  There are seven binary
-distribution sets.  The binary distribution sets can be found in
-subdirectories of the "pmax/bins" subdirectory of the OpenBSD 2.3
-distribution tree, and are as follows:
+DistributionDescription
 
-	base23	The OpenBSD/pmax 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.
-		[ 13.9M gzipped, 47.2M uncompressed ]
+OpenBSDbase(13.9M,47.2M)
 
-	comp23	The OpenBSD/pmax 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.
-		[ 13.1M gzipped, 51.8M uncompressed ]
+OpenBSDcomp(13.1M,51.8M)
 
-	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.)
-		[ 94K gzipped, 500K uncompressed ]
+OpenBSDetc(94K,500K)
 
-	game23	This set includes the games and their manual pages.
-		[ 2.8M gzipped, 7.2M uncompressed ]
+OpenBSDgame(2.8M,7.2M)
 
-	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.4M gzipped, 9.1M uncompressed ]
+OpenBSDman(2.4M,9.1M)
 
-	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.9M uncompressed ]
+OpenBSDmisc(1.7M,5.9M)
 
-	text23	This set includes OpenBSD's text processing tools,
-		including groff, all related programs, and their
-		manual pages.
-		[ 957K gzipped, 4.0M uncompressed ]
+OpenBSDtext(957K,4.0M)
 
-	xbase23 This set includes the base X distribution.  This includes
-		programs, headers, libraries, configuration files.
+OpenBSDxbase
 
-	xfont23 This set includes all of the X fonts.
+OpenBSDxfont
 
-	xserv23 This set includes all of the X servers.
+OpenBSDxserv