Since the installation procedure will list all the supported media flags

via ifconfig -m, there is no need to suggest canonical media flags on
some arches, especially since the end user might have a different
interface with different flags; instead, be more cosy and mention that
looking at the manual page for the interface might be helpful for
desperate cases.

Thus, merge the OpenBSDInstallNet and OpenBSDInstallNet2 macros, and
remove thde in-between text for the arches that had such a paragraph.

11 files changed, 30 insertions, 75 deletions

diff --git a/distrib/notes/alpha/install b/distrib/notes/alpha/install
index 6b4da58f568..408b42da9bc 100644
--- a/distrib/notes/alpha/install
+++ b/distrib/notes/alpha/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.19 2002/04/07 22:13:01 miod Exp $
+dnl	$OpenBSD: install,v 1.20 2002/04/09 01:22:22 miod Exp $
 OpenBSDInstallPrelude
 
 dnl XXX document mopbooting from the SRM console.
@@ -64,9 +64,7 @@ OpenBSDInstallPart4
 
 OpenBSDInstallPart5(sd0)
 
-OpenBSDInstallNet
-
-OpenBSDInstallNet2({:-CD-ROM, -:},nofloppy)
+OpenBSDInstallNet({:-CD-ROM, -:},nofloppy)
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/amiga/install b/distrib/notes/amiga/install
index 5c4fd491059..8fdd95496f9 100644
--- a/distrib/notes/amiga/install
+++ b/distrib/notes/amiga/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.22 2002/03/30 22:52:57 miod Exp $
+dnl	$OpenBSD: install,v 1.23 2002/04/09 01:22:22 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSDInstallPart2
@@ -84,15 +84,7 @@ OpenBSDBootMsgs
 	does not write disklabels currently.  You should expect
 	this error whenever using newfs.
 
-OpenBSDInstallNet(linkflags)dnl
- The flags usually carry the following
-	meaning:
-
-		-link0 -link1	Use BNC (coaxial) port [default]
-		link0 -link1	Use AUI port
-		link0 link1	Use UTP (twisted pair) port
-
-OpenBSDInstallNet2({:-CD-ROM, NFS, -:},nofloppy)
+OpenBSDInstallNet({:-CD-ROM, NFS, -:},nofloppy)
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/hp300/install b/distrib/notes/hp300/install
index 2b2253a87f1..385fe0f3ed6 100644
--- a/distrib/notes/hp300/install
+++ b/distrib/notes/hp300/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.20 2002/04/08 23:46:46 miod Exp $
+dnl	$OpenBSD: install,v 1.21 2002/04/09 01:22:22 miod Exp $
 OpenBSDInstallPrelude
 dnl No extra line, this has to stick to the geometry notes paragraph.
 The file `HP-IB.geometry' has geometry information for several HP-IB
@@ -123,9 +123,7 @@ OpenBSDInstallPart4
 
 OpenBSDDInstallPart5(sd0)
 
-OpenBSDInstallNet
-
-OpenBSDInstallNet2({:-CD-ROM, NFS, -:})
+OpenBSDInstallNet({:-CD-ROM, NFS, -:})
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/i386/install b/distrib/notes/i386/install
index 728309c1d3b..dd1c9753f4e 100644
--- a/distrib/notes/i386/install
+++ b/distrib/notes/i386/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.33 2002/03/30 22:52:57 miod Exp $
+dnl	$OpenBSD: install,v 1.34 2002/04/09 01:22:22 miod Exp $
 OpenBSDInstallPrelude
 
 If OpenBSD will be sharing the disk with DOS or another operating
@@ -69,15 +69,7 @@ OpenBSDInstallPart4({:- If you have DOS or Linux partitions
 
 OpenBSDInstallPart5(wd0)
 
-OpenBSDInstallNet(linkflags)dnl
- The flags usually carry the following
-	meaning:
-
-		-link0 -link1	Use BNC (coaxial) port [default]
-		link0 -link1	Use AUI port
-		link0 link1	Use UTP (twisted pair) port
-
-OpenBSDInstallNet2({:-CD-ROM, -:},nofloppy)
+OpenBSDInstallNet({:-CD-ROM, -:},nofloppy)
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index 9d9eb8ae29e..33473c8c32e 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.32 2002/03/30 22:52:55 miod Exp $
+dnl	$OpenBSD: m4.common,v 1.33 2002/04/09 01:22:19 miod Exp $
 dnl
 dnl simulate an include path with a macro 'includeit'.
 define(`includeit',`sinclude('INCLUDE/`$1)sinclude('INCLUDE/../`$1)')dnl
@@ -328,8 +328,8 @@ define({:-OpenBSDInstallPart5-:},
 	systems as specified, OVERWRITING ANY EXISTING DATA.  This is the
 	point of no return.-:})dnl
 dnl
-dnl OpenBSDInstallNet(has media settings information following)
-dnl Setting up the network, part 1
+dnl OpenBSDInstallNet(other installation sources,hasfloppy)
+dnl Setting up the network
 define({:-OpenBSDInstallNet-:},
 {:-	After all your file systems have been created, the install program
 	will give you an opportunity to configure the network.  The network
@@ -347,13 +347,13 @@ define({:-OpenBSDInstallNet-:},
 	will ask for the IP address to use, the symbolic host name to use,
 	the netmask to use and any interface-specific flags to set. The
 	interface-specific flags are usually used to determine which media
-	the network card is to use.ifelse(X$1,X,{:- Typically no media flags are required as
-	autodetect normally works.-:})-:})dnl
-dnl
-dnl OpenBSDInstallNet2(other installation sources,hasfloppy)
-dnl Setting up the network, part 2 (after the media flags)
-define({:-OpenBSDInstallNet2-:},
-{:-	After all network interfaces has been configured the install pro-
+	the network card is to use.  Typically no media flags are required
+	as autodetection normally works, but you will be prompted with a
+	list of the acceptable media flags, and asked if you want to provide
+	any.  In doubt, do not enter any media flags; or you can refer to
+	the manual page for your interface for the appropriate flags.
+
+	After all network interfaces has been configured the install pro-
 	gram will ask for a default route and IP address of the primary
 	name server to use.  You will also be presented with an opportunity
 	to edit the host table.
diff --git a/distrib/notes/macppc/install b/distrib/notes/macppc/install
index 998081ebab1..b1c545af549 100644
--- a/distrib/notes/macppc/install
+++ b/distrib/notes/macppc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.10 2002/04/02 05:00:57 drahn Exp $
+dnl	$OpenBSD: install,v 1.11 2002/04/09 01:22:22 miod Exp $
 OpenBSDInstallShortPrelude
 
 Before you begin, you should decide if OpenBSD is to be installed
@@ -122,9 +122,7 @@ OpenBSDInstallPart4({:-If you have DOS or Linux
 
 OpenBSDInstallPart5(sd0)
 
-OpenBSDInstallNet
-
-OpenBSDInstallNet2({:-CD-ROM, -:})
+OpenBSDInstallNet({:-CD-ROM, -:})
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install
index 0a50dc13cfe..7bbb9dec437 100644
--- a/distrib/notes/mvme68k/install
+++ b/distrib/notes/mvme68k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.14 2002/03/30 22:52:58 miod Exp $
+dnl	$OpenBSD: install,v 1.15 2002/04/09 01:22:23 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -134,9 +134,7 @@ OpenBSDInstallPart4
 
 OpenBSDInstallPart5(sd0)
 
-OpenBSDInstallNet
-
-OpenBSDInstallNet2({:-CD-ROM, NFS, -:})
+OpenBSDInstallNet({:-CD-ROM, NFS, -:})
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index b178a6c49f4..a5f78fca2e3 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.50 2002/04/07 23:31:02 miod Exp $
+dnl	$OpenBSD: install,v 1.51 2002/04/09 01:22:23 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -192,16 +192,7 @@ OpenBSDInstallPart4
 
 OpenBSDInstallPart5(sd0)
 
-OpenBSDInstallNet(linkflags)dnl
- This is driver dependent, but for
-	the MACHINE le(4) driver, the flags usually carry the following
-	meaning:
-
-		autoselect	Use existing setting (default)
-		10baseT		Use UTP (twisted pair) port
-		10base5 	Use AUI port
-
-OpenBSDInstallNet2({:-CD-ROM, NFS, -:},nofloppy)
+OpenBSDInstallNet({:-CD-ROM, NFS, -:},nofloppy)
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install
index 02e72b4492f..73ee6935d6b 100644
--- a/distrib/notes/sparc64/install
+++ b/distrib/notes/sparc64/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.22 2002/04/07 23:31:04 miod Exp $
+dnl	$OpenBSD: install,v 1.23 2002/04/09 01:22:23 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -147,9 +147,7 @@ OpenBSDInstallPart4
 
 OpenBSDInstallPart5(sd0)
 
-OpenBSDInstallNet
-
-OpenBSDInstallNet2({:-CD-ROM, NFS, -:},nofloppy)
+OpenBSDInstallNet({:-CD-ROM, NFS, -:},nofloppy)
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/sun3/install b/distrib/notes/sun3/install
index 4c7ef7a51ff..fdaf3a679c0 100644
--- a/distrib/notes/sun3/install
+++ b/distrib/notes/sun3/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.17 2002/03/30 22:52:58 miod Exp $
+dnl	$OpenBSD: install,v 1.18 2002/04/09 01:22:23 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -120,15 +120,7 @@ OpenBSDInstallPart4
 
 OpenBSDInstallPart5(sd0)
 
-OpenBSDInstallNet(linkflags)dnl
- The flags usually carry the following
-	meaning:
-
-		-link0 -link1	Use existing setting (default)
-		link0 -link1	Use UTP (twisted pair) port
-		-link0 link1 	Use AUI port
-
-OpenBSDInstallNet2({:-CD-ROM, NFS, -:})
+OpenBSDInstallNet({:-CD-ROM, NFS, -:})
 
 OpenBSDFTPInstall
 
diff --git a/distrib/notes/vax/install b/distrib/notes/vax/install
index 42d8b8d1eaf..0d8be856c7b 100644
--- a/distrib/notes/vax/install
+++ b/distrib/notes/vax/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.10 2002/04/08 00:10:53 miod Exp $
+dnl	$OpenBSD: install,v 1.11 2002/04/09 01:22:23 miod Exp $
 OpenBSDInstallPrelude
 
 For most systems, the easiest way to install OpenBSD/MACHINE OSREV is via
@@ -97,9 +97,7 @@ OpenBSDInstallPart4
 
 OpenBSDInstallPart5(sd0)
 
-OpenBSDInstallNet
-
-OpenBSDInstallNet2({:-CD-ROM, NFS, -:})
+OpenBSDInstallNet({:-CD-ROM, NFS, -:})
 
 OpenBSDFTPInstall