Stop using the name `miniroot' when `bsd.rd' is implied. A few platforms

have a real miniroot to be dd'ed to the disk, and that's fine; but when
we are talking about booting bsd.rd (either from an existing setup, or the
network, or the cd-rom images), then refer to it as `installation kernel'.

10 files changed, 28 insertions, 27 deletions

diff --git a/distrib/notes/alpha/install b/distrib/notes/alpha/install
index 6608dddebe9..2cbc8cf7400 100644
--- a/distrib/notes/alpha/install
+++ b/distrib/notes/alpha/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.36 2011/08/08 20:03:03 miod Exp $
+dnl	$OpenBSD: install,v 1.37 2013/02/09 19:48:37 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk.  The easiest way is
@@ -98,9 +98,9 @@ OpenBSDInstallPart2
 
 	Boot your machine from the installation media as described above.
 
-	It will take a while to load the miniroot image, especially from
-	a slow network connection or a CD-ROM, most likely more than a
-	minute.
+	It will take a while to load the installation kernel, especially
+	from a slow network connection or a CD-ROM, most likely more than
+	a minute.
 	If some action doesn't eventually happen, or the spinning cursor
 	has stopped and nothing further has happened, either your boot
 	media is bad, your diskless setup is incorrect, or you may have
diff --git a/distrib/notes/aviion/upgrade b/distrib/notes/aviion/upgrade
index f35e01faa76..2add0fc0bc8 100644
--- a/distrib/notes/aviion/upgrade
+++ b/distrib/notes/aviion/upgrade
@@ -1,5 +1,5 @@
-dnl	$OpenBSD: upgrade,v 1.2 2009/05/17 00:31:51 sthen Exp $
-dnl OpenBSDUpgrade({:-an installation tape, or the miniroot over the network-:})
+dnl	$OpenBSD: upgrade,v 1.3 2013/02/09 19:48:37 miod Exp $
+dnl OpenBSDUpgrade({:-an installation tape, or bsd.rd over the network-:})
 To upgrade your OpenBSD installation, simply extract the new sets on
 the diskless server.
 
diff --git a/distrib/notes/hppa/contents b/distrib/notes/hppa/contents
index 4ce66e59f74..58cf4c18bd6 100644
--- a/distrib/notes/hppa/contents
+++ b/distrib/notes/hppa/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.26 2011/08/08 20:03:03 miod Exp $
+dnl	$OpenBSD: contents,v 1.27 2013/02/09 19:48:37 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -13,8 +13,8 @@ OpenBSDinstalliso
 
 OpenBSDcd
 
-	lif{:--:}OSrev.fs	A LIF bootable miniroot image, suitable for network
-			boot.
+	lif{:--:}OSrev.fs	A LIF bootable bsd.rd image, suitable for
+			network boot.
 
 	xxboot		The OpenBSD/MACHINE LIF boot block.
 
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index b35e1bb6bba..05e76f11ba7 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.95 2011/08/08 20:03:03 miod Exp $
+dnl	$OpenBSD: m4.common,v 1.96 2013/02/09 19:48:37 miod Exp $
 dnl
 dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -198,10 +198,10 @@ define({:-OpenBSDinstalliso-:},
 			which contains the base and X sets, so that install
 			or upgrade can be done without network connectivity.-:})dnl
 define({:-OpenBSDcd-:},
-{:-	cd{:--:}OSrev.iso	A miniroot filesystem image suitable to be used
+{:-	cd{:--:}OSrev.iso	A simple bootable filesystem image consisting of the
+			bsd.rd installation kernel, suitable to be used
 			as a bootable CD-ROM image, but will require the base
-			and X sets be found via another media or network;
-			otherwise similar to the bsd.rd image above.-:})dnl
+			and X sets be found via another media or network.-:})dnl
 dnl
 dnl OpenBSDfloppydesc(number of floppies, Article, plural)
 dnl
diff --git a/distrib/notes/mvme88k/install b/distrib/notes/mvme88k/install
index ea45b935bd2..87374b6b793 100644
--- a/distrib/notes/mvme88k/install
+++ b/distrib/notes/mvme88k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.28 2010/03/16 17:23:09 miod Exp $
+dnl	$OpenBSD: install,v 1.29 2013/02/09 19:48:37 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -169,7 +169,7 @@ the default value of 001F0000). The "Boot File Name" must match the name
 of the netboot file on the server (copying it as "netboot.mvme88k" or
 "tftpboot.mvme88k" is usually a wise choice). Finally, "Argument File Name"
 needs to be set to the kernel name: "bsd.rd" in order to boot the
-installation miniroot, or "bsd" for the regular kernel.
+installation kernel, or "bsd" for the regular kernel.
 
 Here are acceptable values for a 187 card using the built-in controller:
 
diff --git a/distrib/notes/mvme88k/upgrade b/distrib/notes/mvme88k/upgrade
index 1c6898d2252..088149055d1 100644
--- a/distrib/notes/mvme88k/upgrade
+++ b/distrib/notes/mvme88k/upgrade
@@ -1,2 +1,2 @@
-dnl	$OpenBSD: upgrade,v 1.2 2003/08/10 21:04:06 miod Exp $
-OpenBSDUpgrade({:-an installation tape, or the miniroot over the network-:})
+dnl	$OpenBSD: upgrade,v 1.3 2013/02/09 19:48:37 miod Exp $
+OpenBSDUpgrade({:-an installation tape, or bsd.rd over the network-:})
diff --git a/distrib/notes/sgi/contents b/distrib/notes/sgi/contents
index c2dfd58610d..cb7f8311dad 100644
--- a/distrib/notes/sgi/contents
+++ b/distrib/notes/sgi/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.19 2012/05/25 17:40:35 miod Exp $
+dnl	$OpenBSD: contents,v 1.20 2013/02/09 19:48:37 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -52,10 +52,11 @@ dnl five flavours of OpenBSDrd
 			Used for installation and upgrades.
 
 dnl can't use OpenBSDcd because of the multiple bsd.rd
-	cd{:--:}OSrev.iso	A miniroot filesystem image suitable to be used
-			as a bootable CD-ROM image, but will require the base
-			and X sets be found via another media or network;
-			otherwise similar to the bsd.rd* images above.
+	cd{:--:}OSrev.iso	A simple bootable filesystem image consisting of
+			all the bsd.rd.* installation kernels above, suitable
+			to be used as a bootable CD-ROM image, but will require
+			the base and X sets be found via another media or
+			network.
 
 	boot32		A 32-bit ELF boot block for IP32 systems; will be
 			installed into the ``volume header'' of the boot
diff --git a/distrib/notes/sparc/upgrade b/distrib/notes/sparc/upgrade
index b5efd9148a3..11da08e83de 100644
--- a/distrib/notes/sparc/upgrade
+++ b/distrib/notes/sparc/upgrade
@@ -1,2 +1,2 @@
-dnl	$OpenBSD: upgrade,v 1.16 2003/02/15 21:22:08 miod Exp $
-OpenBSDUpgrade({:-the CD-ROM, the miniroot, or the installation floppy-:})
+dnl	$OpenBSD: upgrade,v 1.17 2013/02/09 19:48:37 miod Exp $
+OpenBSDUpgrade({:-the CD-ROM, bsd.rd, the miniroot, or the installation floppy-:})
diff --git a/distrib/notes/sparc64/upgrade b/distrib/notes/sparc64/upgrade
index 151ef2db36b..bedbe20d7bc 100644
--- a/distrib/notes/sparc64/upgrade
+++ b/distrib/notes/sparc64/upgrade
@@ -1,2 +1,2 @@
-dnl	$OpenBSD: upgrade,v 1.12 2005/08/09 16:48:11 deraadt Exp $
-OpenBSDUpgrade({:-CD-ROM, the miniroot, or an installation floppy-:})
+dnl	$OpenBSD: upgrade,v 1.13 2013/02/09 19:48:37 miod Exp $
+OpenBSDUpgrade({:-CD-ROM, bsd.rd, the miniroot, or an installation floppy-:})
diff --git a/distrib/notes/vax/upgrade b/distrib/notes/vax/upgrade
index 4c803e531ed..491b7ede259 100644
--- a/distrib/notes/vax/upgrade
+++ b/distrib/notes/vax/upgrade
@@ -1 +1 @@
-OpenBSDUpgrade({:-the miniroot-:})
+OpenBSDUpgrade({:-bsd.rd-:})