Rework the floppy and miniroot description:

- try to keep description information together, with no duplicate
  circumlocutions
- arches which have several floppies shouldn't say there is THE floppy,
  then THE floppy, and once more THE floppy. Change plural accordingly for
  the general description of earch floppy image possibilities, if more
  than one.

5 files changed, 37 insertions, 57 deletions

diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index d6bca2ea419..39a9b9ef7b5 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -10,7 +10,7 @@ OpenBSDfloppy
 				- EB164 based machines, including
 				  PC164, 164SX and 164LX
 
-		floppyB{:--:}OSrev.fs	The MACHINE boot and installation floppy;
+		floppyB{:--:}OSrev.fs	Another MACHINE boot and installation floppy;
 				see below.
 				This floppy image will boot on the following
 				MACHINE models:
@@ -24,7 +24,7 @@ OpenBSDbsd
 
 OpenBSDrd
 
-OpenBSDfloppydesc
+OpenBSDfloppydesc(two,Each,s)
 
 DistributionDescription(ten)
 
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index 17d8f320bc3..ece3dd490e7 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -2,12 +2,12 @@ TopPart
 
 OpenBSDfloppy
 
-		floppyB{:--:}OSrev.fs	The MACHINE boot and installation floppy;
+		floppyB{:--:}OSrev.fs	Another MACHINE boot and installation floppy;
 				this one features all the drivers not available
 				in floppy{:--:}OSrev.fs, such as SCSI, RAID, gigabit
 				ethernet, and such; see below.
 
-		floppyC{:--:}OSrev.fs	The MACHINE boot and installation floppy;
+		floppyC{:--:}OSrev.fs	Another MACHINE boot and installation floppy;
 				this one features most of the cardbus and
 				pcmcia drivers; see below.
 
@@ -25,7 +25,8 @@ As well you may be interested in
 		see installation section, below.
 
 
-OpenBSDfloppydesc
+OpenBSDfloppydesc(three,Each,s)
+
 In addition, the "tools/" directory contains some utilities that might be
 useful for the installation.
 
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index 803aef555cf..d9f33d656ca 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,21 +1,10 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.17 2001/09/24 20:13:22 miod Exp $
+dnl	$OpenBSD: m4.common,v 1.18 2001/10/02 00:36:39 miod Exp $
 dnl
 dnl simulate an include path with a macro 'includeit'.
 define(`includeit',`sinclude('INCLUDE/`$1)sinclude('INCLUDE/../`$1)')dnl
 dnl
 dnl
-dnl If both the 1st and the 2nd argument exist, show the sizes.
-dnl Otherwise, evaluate to NULL.
-dnl
-dnl XXX fix to allow - empty 1st arg, for files uncompressed
-dnl                  - empty 2nd arg, for files where only compressed size is
-dnl                    known
-dnl
-define(`showsize',`ifelse(X$1,X,,X$2,X,,X,X,{:-
-		 [ $1 gzipped, $2 uncompressed ]-:})')dnl
-dnl
-dnl
 dnl  Everybody looks the same on these (or should if they don't)
 dnl
 define(`TopPart',
@@ -44,8 +33,20 @@ dnl   MACHINE_ARCH and OSREV, assigned as cmd line parameters to m4 in the
 dnl   Makefile.
 dnl o `include' and `define' is required as include and define are both m4
 dnl   reserved words that evaluate to NULL if not quoted.
-dnl o showsize() must not be on a new line.  It creates its own new line if
-dnl   there are sizes to display, otherwise, evaluates to NULL
+dnl
+dnl showsize(gzipped size, uncompressed size)
+dnl
+dnl If both the 1st and the 2nd argument exist, show the sizes.
+dnl Otherwise, evaluate to NULL.
+dnl showsize() must not be on a new line.  It creates its own new line if
+dnl there are sizes to display, otherwise, evaluates to NULL
+dnl
+dnl XXX fix to allow - empty 1st arg, for files uncompressed
+dnl                  - empty 2nd arg, for files where only compressed size is
+dnl                    known
+dnl
+define({:-showsize-:},{:-ifelse(X$1,X,,X$2,X,,X,X,{:-
+		 [ $1 gzipped, $2 uncompressed ]-:})-:})dnl
 dnl
 dnl
 dnl 
@@ -162,21 +163,17 @@ define({:-OpenBSDcdrom-:},
 				2.88mb floppy image that contains almost all
 				OpenBSD drivers; see below.-:})dnl
 dnl
+dnl OpenBSDfloppydesc(number of floppies, Article, optional plural 's')
+dnl
+dnl Use as: OpenBSDfloppydesc(single, The) or OpenBSDfloppydesc(three, Each, s)
 define({:-OpenBSDfloppydesc-:},
-{:-In summary, there is one MACHINE floppy image called "floppy{:--:}OSrev.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.
-
-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.
+{:-Bootable installation/upgrade floppy image$3:
 
-	It also holds the utilities needed in order to upgrade a
-	system to the current version of OpenBSD.-:})dnl
+	The $1 floppy image$3 can be copied to a floppy using rawrite.exe
+	or `dd', as described later in this document.
+	$2 floppy image 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.-:})dnl
 dnl
 dnl
 dnl misc
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index 2db315e03d1..56c7f6f9477 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -1,6 +1,10 @@
 TopPart
 
 OpenBSDminiroot
+				It can be copied to the swap partition of
+				an existing OpenBSD, NetBSD, Linux, SunOS, 
+				or Solaris installation to allow installing
+				or upgrading to OpenBSD OSREV
 
 OpenBSDfloppy
 
@@ -24,35 +28,11 @@ Please note that there are multiple bootable images and kernels, intended
 to allow installing OpenBSD/MACHINE in a variety of situations without
 requiring a pre-existing working operating system.
 
-The "miniroot{:--:}OSrev.fs" is a small bootable root filesystem that can be used
-for installation or upgrade where there is some means to copy the miniroot
-image into a swap or unused partition on the system, and also for diskless
-or net booting.  This can be convenient if you have a existing installation
-of OpenBSD, NetBSD, SunOS, or Solaris and wish to test or upgrade the
-existing system to OpenBSD.
-
-The "floppy{:--:}OSrev.fs" is a bootable floppy image, with contents similar
-to a miniroot stored in a compressed kernel with pre-loaded ramdisk.
-
-These bootable images are also useful as "failsafe" boots for system
-maintenance and disaster recovery.
-
 The kernel and boot images are provided for net booting installations.
 While the OpenBSD bootblocks will work with the provided miniroot images,
 Sun bootblocks require a separate kernel image and root filesystem.
 
-
-Bootable installation images:
-  
-  floppy{:--:}OSrev.fs
-	This disk contains a compressed ramdisk filesystem, and holds
-        all utilities needed to install OpenBSD OSREV
-  
-  miniroot{:--:}OSrev.fs
-	This is a miniroot filesystem image which can be copied to the
-	swap partition of an existing OpenBSD, NetBSD, Linux, SunOS, 
-	or Solaris installation to allow upgrading to OpenBSD OSREV
-
+OpenBSDfloppydesc(single,The)
 
 DistributionDescription(ten)
 
diff --git a/distrib/notes/vax/contents b/distrib/notes/vax/contents
index f1ee8c2f6f1..f845027dcb1 100644
--- a/distrib/notes/vax/contents
+++ b/distrib/notes/vax/contents
@@ -11,6 +11,8 @@ OpenBSDfloppy
 		boot.mop	MOP-bootable image (for network installs); 
 				see below.
 
+OpenBSDfloppydesc(single,The)
+
 DistributionDescription(six)
 
 OpenBSDbase(44.4M,84.5M)