Sync with m4.common macro usage.

8 files changed, 26 insertions, 21 deletions

diff --git a/distrib/notes/amiga/contents b/distrib/notes/amiga/contents
index de523e276c7..fe759adcbce 100644
--- a/distrib/notes/amiga/contents
+++ b/distrib/notes/amiga/contents
@@ -30,9 +30,9 @@ Installation/upgrade miniroot file system:
 
 DistributionDescription(ten)
 
-OpenBSDbase(19.3M,61.4M)
+OpenBSDbase(shared,19.3M,61.4M)
 
-OpenBSDcomp(13.1M,30.6M)
+OpenBSDcomp(shared,13.1M,30.6M)
 
 OpenBSDetc(982.6K,3.3M)
 
diff --git a/distrib/notes/hp300/contents b/distrib/notes/hp300/contents
index bcd6105d584..c4417194b4c 100644
--- a/distrib/notes/hp300/contents
+++ b/distrib/notes/hp300/contents
@@ -17,9 +17,9 @@ OpenBSDrd
 
 DistributionDescription(ten)
 
-OpenBSDbase(16.5M,49.6M)
+OpenBSDbase(shared,16.5M,49.6M)
 
-OpenBSDcomp(10.6M,33.5M)
+OpenBSDcomp(shared,10.6M,33.5M)
 
 OpenBSDetc(162.4K,730.0K)
 
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index e0b2628374d..e01109edb32 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -2,9 +2,14 @@ TopPart
 
 OpenBSDfloppy
 
-OpenBSDfloppyB
+		floppyB{:--:}OSrev.fs	The 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.
 
-OpenBSDfloppyC
+		floppyC{:--:}OSrev.fs	The MACHINE boot and installation floppy;
+				this one features most of the cardbus and
+				pcmcia drivers; see below.
 
 OpenBSDcdrom
 
@@ -20,15 +25,15 @@ As well you may be interested in
 		see installation section, below.
 
 
-OpenBSDfloppydesc({:-In addition,
-the "tools/" directory contains some utilities that might be useful
-for the installation.-:})
+OpenBSDfloppydesc
+In addition, the "tools/" directory contains some utilities that might be
+useful for the installation.
 
 DistributionDescription(eleven)
 
-OpenBSDbase(17.4M,49.2M)
+OpenBSDbase(shared,17.4M,49.2M)
 
-OpenBSDcomp(11.2M,34.7M)
+OpenBSDcomp(shared,11.2M,34.7M)
 
 OpenBSDetc(161.5K,730.0K)
 
diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index 67d78c378f0..8ac4bbd03c5 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -21,9 +21,9 @@ OpenBSDdistsets
 
 DistributionDescription(ten)
 
-OpenBSDbase(16.0M,47.4M)
+OpenBSDbase(shared,16.0M,47.4M)
 
-OpenBSDcomp(10.6M,33.6M)
+OpenBSDcomp(shared,10.6M,33.6M)
 
 OpenBSDetc(160.1K,690.0K)
 
diff --git a/distrib/notes/macppc/contents b/distrib/notes/macppc/contents
index 37f125d6835..5480c45688f 100644
--- a/distrib/notes/macppc/contents
+++ b/distrib/notes/macppc/contents
@@ -100,9 +100,9 @@ NOTES:
 
 DistributionDescription(ten)
 
-OpenBSDbase(23.4M,70.8M)
+OpenBSDbase(shared,23.4M,70.8M)
 
-OpenBSDcomp(19.7M,68.0M)
+OpenBSDcomp(shared,19.7M,68.0M)
 
 OpenBSDetc(1.0M,3.5M)
 
diff --git a/distrib/notes/mvme68k/contents b/distrib/notes/mvme68k/contents
index 7b216965334..8e7da2b9bbb 100644
--- a/distrib/notes/mvme68k/contents
+++ b/distrib/notes/mvme68k/contents
@@ -24,9 +24,9 @@ Useful Media" for more information.
 
 DistributionDescription(nine)
 
-OpenBSDbase(11.2M,33.9M)
+OpenBSDbase(shared,11.2M,33.9M)
 
-OpenBSDcomp(7.0M,23.5M)
+OpenBSDcomp(shared,7.0M,23.5M)
 
 OpenBSDetc(92K,490K)
 
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index eb936622c02..bc3d3606fb3 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -56,9 +56,9 @@ Bootable installation images:
 
 DistributionDescription(ten)
 
-OpenBSDbase(18.4M,56.4M)
+OpenBSDbase(shared,18.4M,56.4M)
 
-OpenBSDcomp(12.1M,39.7M)
+OpenBSDcomp(shared,12.1M,39.7M)
 
 OpenBSDetc(165.2K,740.0K)
 
diff --git a/distrib/notes/sun3/contents b/distrib/notes/sun3/contents
index 27c53e288cf..1a9ee525548 100644
--- a/distrib/notes/sun3/contents
+++ b/distrib/notes/sun3/contents
@@ -20,9 +20,9 @@ the OpenBSD System onto Useful Media" for instructions on either method.
 
 DistributionDescription(nine)
 
-OpenBSDbase(21.1M,63.6M)
+OpenBSDbase(shared,21.1M,63.6M)
 
-OpenBSDcomp(14.2M,42.0M)
+OpenBSDcomp(shared,14.2M,42.0M)
 
 OpenBSDetc(1.0M,3.2M)