oops; t.stritzky@teles.de noted that we had not yet documented the

install##.iso files; thanks

8 files changed, 31 insertions, 18 deletions

diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents
index d34a1cf0e26..8bf317546e4 100644
--- a/distrib/notes/alpha/contents
+++ b/distrib/notes/alpha/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.42 2006/02/28 20:42:33 miod Exp $
+dnl	$OpenBSD: contents,v 1.43 2007/08/30 04:21:15 deraadt Exp $
 TopPart
 
 OpenBSDfloppy
@@ -26,6 +26,8 @@ OpenBSDbsd
 
 OpenBSDrd
 
+OpenBSDinstalliso
+
 OpenBSDcd
 
 OpenBSDfloppydesc(two,Each,s)
diff --git a/distrib/notes/amd64/contents b/distrib/notes/amd64/contents
index c360f8a895c..75dc794d532 100644
--- a/distrib/notes/amd64/contents
+++ b/distrib/notes/amd64/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.19 2006/08/16 20:49:30 aanriot Exp $
+dnl	$OpenBSD: contents,v 1.20 2007/08/30 04:21:16 deraadt Exp $
 TopPart
 
 dnl uncomment as stuff becomes available
@@ -14,10 +14,6 @@ dnl	floppyC{:--:}OSrev.fs	Another MACHINE boot and installation floppy;
 dnl			this one features most of the cardbus and
 dnl			PCMCIA drivers; see below.
 
-	cdrom{:--:}OSrev.fs	The MACHINE boot and installation 2.88MB
-			floppy image that contains almost all OpenBSD
-			drivers; see below.
-
 	pxeboot		i386-specific second-stage PXE bootstrap (for
 			network installs); see below.
 
@@ -29,6 +25,8 @@ OpenBSDbsdmp
 
 OpenBSDrd
 
+OpenBSDinstalliso
+
 OpenBSDcd
 
 	cdbr		First-stage CD bootstrap (boot sector), which loads
diff --git a/distrib/notes/hppa/contents b/distrib/notes/hppa/contents
index 42ff80cc814..aa00c73f4df 100644
--- a/distrib/notes/hppa/contents
+++ b/distrib/notes/hppa/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.16 2006/02/28 20:42:35 miod Exp $
+dnl	$OpenBSD: contents,v 1.17 2007/08/30 04:21:16 deraadt Exp $
 TopPart
 
 OpenBSDdistsets
@@ -7,6 +7,10 @@ OpenBSDbsd
 
 OpenBSDrd
 
+OpenBSDinstalliso
+
+OpenBSDcd
+
 	lif{:--:}OSrev.fs	A LIF bootable miniroot image, suitable for network
 			boot.
 dnl
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index 2938087aa9f..dbc10dcb38e 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.58 2006/08/16 20:49:30 aanriot Exp $
+dnl	$OpenBSD: contents,v 1.59 2007/08/30 04:21:16 deraadt Exp $
 TopPart
 
 OpenBSDfloppy
@@ -12,10 +12,6 @@ OpenBSDfloppy
 			features most of the cardbus and PCMCIA drivers; see
 			below.
 
-	cdrom{:--:}OSrev.fs	The MACHINE boot and installation 2.88MB
-			floppy image that contains almost all OpenBSD
-			drivers; see below.
-
 	pxeboot		i386-specific second-stage PXE bootstrap (for
 			network installs); see below.
 
@@ -27,6 +23,8 @@ OpenBSDbsdmp
 
 OpenBSDrd
 
+OpenBSDinstalliso
+
 OpenBSDcd
 
 	cdbr		First-stage CD bootstrap (boot sector), which loads
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index 9fd30de2648..b05a2ca270c 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.74 2007/08/01 21:23:23 miod Exp $
+dnl	$OpenBSD: m4.common,v 1.75 2007/08/30 04:21:14 deraadt Exp $
 dnl
 dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -221,10 +221,15 @@ define({:-OpenBSDfloppy-:},
 {:-	floppy{:--:}OSrev.fs	The standard MACHINE boot and installation floppy;
 			see below.-:})dnl
 dnl
+define({:-OpenBSDinstalliso-:},
+{:-	install{:--:}OSrev.iso	The MACHINE boot and installation CD-ROM image,
+			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
-			as a bootable CD-ROM image; otherwise similar to
-			the bsd.rd image above.-:})dnl
+			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
 dnl
 dnl OpenBSDfloppydesc(number of floppies, Article, plural)
 dnl
diff --git a/distrib/notes/macppc/contents b/distrib/notes/macppc/contents
index ec06da07ed8..255c7243b75 100644
--- a/distrib/notes/macppc/contents
+++ b/distrib/notes/macppc/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.20 2006/08/16 20:49:30 aanriot Exp $
+dnl	$OpenBSD: contents,v 1.21 2007/08/30 04:21:16 deraadt Exp $
 TopPart
 
 OpenBSDdistsets
@@ -7,6 +7,8 @@ OpenBSDbsd
 
 OpenBSDrd
 
+OpenBSDinstalliso
+
 OpenBSDcd
 
 	ofwboot		The OpenBSD/MACHINE secondary boot loader.
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index 2163abf4f9e..9b27099bafc 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.55 2006/02/28 20:42:35 miod Exp $
+dnl	$OpenBSD: contents,v 1.56 2007/08/30 04:21:16 deraadt Exp $
 TopPart
 
 OpenBSDminiroot
@@ -17,6 +17,8 @@ OpenBSDbsd
 
 OpenBSDrd
 
+OpenBSDinstalliso
+
 OpenBSDcd
 
 	installboot	The OpenBSD/MACHINE boot loader installation program.
diff --git a/distrib/notes/sparc64/contents b/distrib/notes/sparc64/contents
index ed6aea1f470..d171ddf97c3 100644
--- a/distrib/notes/sparc64/contents
+++ b/distrib/notes/sparc64/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.37 2006/02/28 20:42:35 miod Exp $
+dnl	$OpenBSD: contents,v 1.38 2007/08/30 04:21:16 deraadt Exp $
 TopPart
 
 OpenBSDminiroot
@@ -26,6 +26,8 @@ OpenBSDbsd
 
 OpenBSDrd
 
+OpenBSDinstalliso
+
 OpenBSDcd
 
 	installboot	The OpenBSD/MACHINE boot loader installation program.