16 files changed, 89 insertions, 67 deletions
diff --git a/distrib/notes/amd64/install b/distrib/notes/amd64/install
index ec3efdfe331..634e23a9741 100644
--- a/distrib/notes/amd64/install
+++ b/distrib/notes/amd64/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.7 2007/03/01 19:24:45 miod Exp $
+dnl	$OpenBSD: install,v 1.8 2008/03/10 21:38:27 miod Exp $
 OpenBSDInstallPrelude
 
 If OpenBSD will be sharing the disk with another operating system,
@@ -47,8 +47,11 @@ OpenBSDInstallPart2
 
 OpenBSDBootMsgs
 
-	You will next be asked for your terminal type.  You should just
-	hit return to select the default (vt220).
+	You will next be asked for your terminal type.  If you are
+	installing from a non-serial console, the default of "vt220"
+	is correct.  If you are installing from a serial console
+	you should choose the terminal type from amongst those listed.
+	(If your terminal type is xterm, just use vt220.)
 
 OpenBSDInstallPart3
 
diff --git a/distrib/notes/armish/install b/distrib/notes/armish/install
index 444d2d0cccd..efde003b3fe 100644
--- a/distrib/notes/armish/install
+++ b/distrib/notes/armish/install
@@ -1,12 +1,15 @@
-dnl	$OpenBSD: install,v 1.3 2007/03/01 19:24:45 miod Exp $
+dnl	$OpenBSD: install,v 1.4 2008/03/10 21:38:27 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSDInstallPart2
 
 OpenBSDBootMsgs(,"wd0")
 
-	You will next be asked for your terminal type.  You should just
-	hit return to select the default (vt220).
+	You will next be asked for your terminal type.  If you are
+	installing from a non-serial console, the default of "vt220"
+	is correct.  If you are installing from a serial console
+	you should choose the terminal type from amongst those listed.
+	(If your terminal type is xterm, just use vt220.)
 
 OpenBSDInstallPart3
 
diff --git a/distrib/notes/hp300/install b/distrib/notes/hp300/install
index a31773c9be4..c9ddef0e82a 100644
--- a/distrib/notes/hp300/install
+++ b/distrib/notes/hp300/install
@@ -1,6 +1,5 @@
-dnl	$OpenBSD: install,v 1.32 2007/03/01 19:24:45 miod Exp $
+dnl	$OpenBSD: install,v 1.33 2008/03/10 21:38:27 miod Exp $
 OpenBSDInstallPrelude({:-HP-IB disks-:})
-dnl No extra line, this has to stick to the geometry notes paragraph.
 
 The ramdisk kernel may be loaded from the network, from CD-ROM, or other
 SCSI devices (such as Zip(tm) disk).  Note that loading from HP-IB or SCSI
@@ -93,12 +92,11 @@ OpenBSDInstallPart2
 OpenBSDBootMsgs(warn,{:-"sd0" for SCSI drives-:},{:-or "hd0" for HP-IB
 	drives-:})
 
-	You will next be asked for your terminal type.  There are only
-	a few specific terminal types supported.  If you are using a
-	graphics display, just hit return to select the default (vt220).
-	If you are using an ASCII terminal, it should either be an HP
-	or vt100 compatible terminal; nothing else is supported.  (If
-	your terminal type is xterm, just use vt100.)
+	You will next be asked for your terminal type.  If you are
+	installing from a non-serial console, the default of "vt220"
+	is correct.  If you are installing from a serial console
+	you should choose the terminal type from amongst those listed.
+	(If your terminal type is xterm, just use vt220.)
 	
 OpenBSDInstallPart3
 
diff --git a/distrib/notes/hppa/install b/distrib/notes/hppa/install
index 0de7c2b8656..22049f6131c 100644
--- a/distrib/notes/hppa/install
+++ b/distrib/notes/hppa/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.14 2007/03/01 19:24:45 miod Exp $
+dnl	$OpenBSD: install,v 1.15 2008/03/10 21:38:27 miod Exp $
 dnl lots of texts coming from {mac68k,mvme68k,vax}/install initially
 OpenBSDInstallPrelude
 
@@ -121,10 +121,10 @@ OpenBSDInstallPart2
 OpenBSDBootMsgs(,"sd0")
 
 	You will next be asked for your terminal type.  If you are
-	installing from a non-serial console, the default of "vt100"
+	installing from a non-serial console, the default of "vt220"
 	is correct.  If you are installing from a serial console
 	you should choose the terminal type from amongst those listed.
-	(If your terminal type is xterm, just use vt100).
+	(If your terminal type is xterm, just use vt220.)
 
 OpenBSDInstallPart3
 
diff --git a/distrib/notes/i386/install b/distrib/notes/i386/install
index 90087857ce6..81427dc1817 100644
--- a/distrib/notes/i386/install
+++ b/distrib/notes/i386/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.39 2007/03/01 19:24:45 miod Exp $
+dnl	$OpenBSD: install,v 1.40 2008/03/10 21:38:27 miod Exp $
 OpenBSDInstallPrelude
 
 If OpenBSD will be sharing the disk with DOS or another operating
@@ -47,8 +47,11 @@ OpenBSDInstallPart2
 
 OpenBSDBootMsgs
 
-	You will next be asked for your terminal type.  You should just
-	hit return to select the default (vt220).
+	You will next be asked for your terminal type.  If you are
+	installing from a non-serial console, the default of "vt220"
+	is correct.  If you are installing from a serial console
+	you should choose the terminal type from amongst those listed.
+	(If your terminal type is xterm, just use vt220.)
 
 OpenBSDInstallPart3
 
diff --git a/distrib/notes/landisk/install b/distrib/notes/landisk/install
index 91f9a97d33c..25d6b18ca45 100644
--- a/distrib/notes/landisk/install
+++ b/distrib/notes/landisk/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.3 2007/03/01 19:24:10 miod Exp $
+dnl	$OpenBSD: install,v 1.4 2008/03/10 21:38:28 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSDInstallPart2
@@ -8,8 +8,11 @@ OpenBSDInstallPart2
 
 OpenBSDBootMsgs(,"wd0")
 
-	You will next be asked for your terminal type.  You should just
-	hit return to select the default (vt220).
+	You will next be asked for your terminal type.  If you are
+	installing from a non-serial console, the default of "vt220"
+	is correct.  If you are installing from a serial console
+	you should choose the terminal type from amongst those listed.
+	(If your terminal type is xterm, just use vt220.)
 
 OpenBSDInstallPart3({:-"wd0" for IDE drives-:})
 
diff --git a/distrib/notes/luna88k/install b/distrib/notes/luna88k/install
index a07ea1af375..d40f4c725ec 100644
--- a/distrib/notes/luna88k/install
+++ b/distrib/notes/luna88k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.4 2007/03/01 19:24:45 miod Exp $
+dnl	$OpenBSD: install,v 1.5 2008/03/10 21:38:28 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -77,9 +77,11 @@ OpenBSDInstallPart2
 
 OpenBSDBootMsgs(,"sd0")
 
-	You will next be asked for your terminal type.  You should choose
-	the terminal type from amongst those listed.
-	(If your terminal type is xterm, just use vt100).
+	You will next be asked for your terminal type.  If you are
+	installing from a non-serial console, the default of "vt220"
+	is correct.  If you are installing from a serial console
+	you should choose the terminal type from amongst those listed.
+	(If your terminal type is xterm, just use vt220.)
 
 OpenBSDInstallPart3
 
diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install
index f3a72043c85..08c57cbafe6 100644
--- a/distrib/notes/mac68k/install
+++ b/distrib/notes/mac68k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.34 2007/03/01 19:24:45 miod Exp $
+dnl	$OpenBSD: install,v 1.35 2008/03/10 21:38:28 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSDInstallPart2
@@ -12,9 +12,11 @@ OpenBSDInstallPart2
 
 OpenBSDBootMsgs(,"sd0")
 
-	You will next be asked for your terminal type.  You should choose
-	the terminal type from amongst those listed.
-	(If your terminal type is xterm, just use vt100).
+	You will next be asked for your terminal type.  If you are
+	installing from a non-serial console, the default of "vt220"
+	is correct.  If you are installing from a serial console
+	you should choose the terminal type from amongst those listed.
+	(If your terminal type is xterm, just use vt220.)
 
 OpenBSDInstallPart3
 
diff --git a/distrib/notes/macppc/install b/distrib/notes/macppc/install
index c635823914e..b9bcbb5af84 100644
--- a/distrib/notes/macppc/install
+++ b/distrib/notes/macppc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.24 2007/03/01 19:24:45 miod Exp $
+dnl	$OpenBSD: install,v 1.25 2008/03/10 21:38:28 miod Exp $
 OpenBSDInstallPrelude
 
 Before you begin, you should decide if OpenBSD is to be installed
@@ -35,8 +35,11 @@ OpenBSDInstallPart2
 
 OpenBSDBootMsgs(,"wd0")
 
-	You will next be asked for your terminal type.  You should just
-	hit return to select the default (vt220).
+	You will next be asked for your terminal type.  If you are
+	installing from a non-serial console, the default of "vt220"
+	is correct.  If you are installing from a serial console
+	you should choose the terminal type from amongst those listed.
+	(If your terminal type is xterm, just use vt220.)
 
 OpenBSDInstallPart3
 
diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install
index b3ee934a3d7..95119101613 100644
--- a/distrib/notes/mvme68k/install
+++ b/distrib/notes/mvme68k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.29 2007/03/01 19:24:45 miod Exp $
+dnl	$OpenBSD: install,v 1.30 2008/03/10 21:38:28 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -242,9 +242,11 @@ OpenBSDInstallPart2
 
 OpenBSDBootMsgs(,"sd0")
 
-	You will next be asked for your terminal type.  You should choose
-	the terminal type from amongst those listed.
-	(If your terminal type is xterm, just use vt100).
+	You will next be asked for your terminal type.  If you are
+	installing from a non-serial console, the default of "vt220"
+	is correct.  If you are installing from a serial console
+	you should choose the terminal type from amongst those listed.
+	(If your terminal type is xterm, just use vt220.)
 
 OpenBSDInstallPart3
 
diff --git a/distrib/notes/mvme88k/install b/distrib/notes/mvme88k/install
index 53ce1e11937..cab102f7ac1 100644
--- a/distrib/notes/mvme88k/install
+++ b/distrib/notes/mvme88k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.21 2007/12/15 21:28:07 miod Exp $
+dnl	$OpenBSD: install,v 1.22 2008/03/10 21:38:28 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -216,9 +216,11 @@ OpenBSDInstallPart2
 
 OpenBSDBootMsgs(,"sd0")
 
-	You will next be asked for your terminal type.  You should choose
-	the terminal type from amongst those listed.
-	(If your terminal type is xterm, just use vt100).
+	You will next be asked for your terminal type.  If you are
+	installing from a non-serial console, the default of "vt220"
+	is correct.  If you are installing from a serial console
+	you should choose the terminal type from amongst those listed.
+	(If your terminal type is xterm, just use vt220.)
 
 OpenBSDInstallPart3
 
diff --git a/distrib/notes/sgi/install b/distrib/notes/sgi/install
index 380c36247b5..3e63631d118 100644
--- a/distrib/notes/sgi/install
+++ b/distrib/notes/sgi/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.10 2008/03/07 17:58:23 jsing Exp $
+dnl	$OpenBSD: install,v 1.11 2008/03/10 21:38:28 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -55,9 +55,11 @@ OpenBSDInstallPart2
 
 OpenBSDBootMsgs(,"sd0")
 
-	You will next be asked for your terminal type.
-dnl XXX needs extra text here once graphics console is available
-	Just hit return to select the default (vt100).
+	You will next be asked for your terminal type.  If you are
+	installing from a non-serial console, the default of "vt220"
+	is correct.  If you are installing from a serial console
+	you should choose the terminal type from amongst those listed.
+	(If your terminal type is xterm, just use vt220.)
 
 OpenBSDInstallPart3
 
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index 7687598522a..c3b05b7f1a4 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.65 2007/03/01 19:24:45 miod Exp $
+dnl	$OpenBSD: install,v 1.66 2008/03/10 21:38:28 miod Exp $
 OpenBSDInstallPrelude({:-SMD disks-:})
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -177,10 +177,10 @@ OpenBSDBootMsgs(SMD drives are noisy and weight a ton per kilobyte and scare
 	for SMD drives-:})
 
 	You will next be asked for your terminal type.  If you are
-	installing from a keyboard/monitor console, the default of
-	"sun" is correct.  If you are installing from a serial console
+	installing from a non-serial console, the default of "vt220"
+	is correct.  If you are installing from a serial console
 	you should choose the terminal type from amongst those listed.
-	(If your terminal type is xterm, just use vt100.)
+	(If your terminal type is xterm, just use vt220.)
 
 OpenBSDInstallPart3
 
diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install
index ce0cd27448a..aa54e653f26 100644
--- a/distrib/notes/sparc64/install
+++ b/distrib/notes/sparc64/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.39 2007/03/01 19:24:45 miod Exp $
+dnl	$OpenBSD: install,v 1.40 2008/03/10 21:38:28 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
@@ -109,16 +109,11 @@ OpenBSDInstallPart2
 
 OpenBSDBootMsgs
 
-	While booting, you might get this kind of warning:
-	"No counter-timer -- using %tick at 179MHz as system clock."
-	Unless the frequency displayed does not match your CPU speed,
-	this is nothing to worry about.
-
 	You will next be asked for your terminal type.  If you are
-	installing from a keyboard/monitor console, the default of
-	"sun" is correct.  If you are installing from a serial console
+	installing from a non-serial console, the default of "vt220"
+	is correct.  If you are installing from a serial console
 	you should choose the terminal type from amongst those listed.
-	(If your terminal type is xterm, just use vt100.)
+	(If your terminal type is xterm, just use vt220.)
 
 OpenBSDInstallPart3
 
diff --git a/distrib/notes/vax/install b/distrib/notes/vax/install
index 808af9897e0..394dd7922b8 100644
--- a/distrib/notes/vax/install
+++ b/distrib/notes/vax/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.19 2007/03/01 19:24:45 miod Exp $
+dnl	$OpenBSD: install,v 1.20 2008/03/10 21:38:28 miod Exp $
 OpenBSDInstallPrelude({:-MSCP or other non-SCSI disks-:})
 
 For most systems, the easiest way to install OpenBSD/MACHINE OSREV is via
@@ -93,10 +93,11 @@ OpenBSDInstallPart2
 OpenBSDBootMsgs(the quick brown vax jumped over the lazy pdp,"sd0" for SCSI drives,{:-"ra0" for MSCP
 	drives-:}, or "hd0" for MFM drives)
 
-	You will next be asked for your terminal type.
-	If you are installing from a serial console you should choose
-	the terminal type from amongst those listed.
-	(If your terminal type is xterm, just use vt100.)
+	You will next be asked for your terminal type.  If you are
+	installing from a non-serial console, the default of "vt220"
+	is correct.  If you are installing from a serial console
+	you should choose the terminal type from amongst those listed.
+	(If your terminal type is xterm, just use vt220.)
 
 OpenBSDInstallPart3
 
diff --git a/distrib/notes/zaurus/install b/distrib/notes/zaurus/install
index 1b6b6369396..047704dfef7 100644
--- a/distrib/notes/zaurus/install
+++ b/distrib/notes/zaurus/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.19 2007/03/01 19:24:45 miod Exp $
+dnl	$OpenBSD: install,v 1.20 2008/03/10 21:38:28 miod Exp $
 OpenBSDInstallPrelude
 
 OpenBSD is installed on the Zaurus by effectively converting
@@ -82,8 +82,11 @@ OpenBSDInstallPart2
 
 OpenBSDBootMsgs(,"wd0")
 
-	You will next be asked for your terminal type.  You should just
-	hit return to select the default (vt220).
+	You will next be asked for your terminal type.  If you are
+	installing from a non-serial console, the default of "vt220"
+	is correct.  If you are installing from a serial console
+	you should choose the terminal type from amongst those listed.
+	(If your terminal type is xterm, just use vt220.)
 
 OpenBSDInstallPart3