Update more docs to match -current reality.

9 files changed, 55 insertions, 47 deletions

diff --git a/release/sysinstall/help/distributions.hlp b/release/sysinstall/help/distributions.hlp
index b614937..f77241c 100644
--- a/release/sysinstall/help/distributions.hlp
+++ b/release/sysinstall/help/distributions.hlp
@@ -1,11 +1,16 @@
+DISTRIBUTION INFORMATION
+------------------------
+
 An ``X-'' prefixed before a distribution set means that the XFree86
 3.1.2-S base distribution, libraries, manual pages, SVGA server and a
 set of default fonts will be selected in addition to the set itself.
-
 If you select such a set, you will also be presented with a set of
 menus for customizing the selections to your desired X Window System
 setup.
 
+Any distribution may be further customized by selecting the `Custom'
+item before leaving the menu.
+
 N.B. All references in this document to `complete source' mean the
 complete source tree minus any legally encumbered cryptography code.
 
@@ -30,7 +35,7 @@ Everything:     The base distribution, man pages, dictionary files,
                 in this collection.  You will need to select that by
                 hand if you're inside the United States.
 
-Custom:         Allows you to modify or create your distribution set on
+Custom:         Allows you to create or modify your distribution set on
                 a piece-by-piece basis.
 
 Reset:          Clear all currently selected distributions.
@@ -53,13 +58,14 @@ obvious, though two possible exceptions may be the "commerce" and
         you'll get the whole collection (between 10 and 30MB).
 
 
-        If you're installing from CDROM then all of the commercial and
-        "experimental" offerings are also easily available in their
-        individual subdirectories and can be copied to hard disk at
-        any time.
+        If you're installing from a 2 disc CDROM set then all of the
+        commercial and "experimental" offerings are also available already
+        installed on the 2nd "live filesystem" CD.
 
 
-You may also notice that certain distributions, like "des" and "krb",
+ENCRYPTION SOFTWARE:
+--------------------
+You may notice that certain distributions, like "des" and "krb",
 are marked "NOT FOR EXPORT!"  This is because it's illegal to export
 them from the United States (or any other country which considers
 encryption technology to be on its restricted export list).  Since
diff --git a/release/sysinstall/help/hardware.hlp b/release/sysinstall/help/hardware.hlp
index 7741c0d..51b0fd2 100644
--- a/release/sysinstall/help/hardware.hlp
+++ b/release/sysinstall/help/hardware.hlp
@@ -1,8 +1,9 @@
-Hardware Documentation Guide:  $Id: hardware.hlp,v 1.1.2.10 1995/11/04 08:48:00 jkh Exp $
+Hardware Documentation Guide:  $Id: hardware.hlp,v 1.2 1995/12/07 10:34:47 peter Exp $
+
+Contents last changed:  April 26th, 1996
 
 Table of Contents
 -----------------
-
 0.  Document Conventions
 1.  Default Configuration (GENERIC kernel)
 2.  Using UserConfig to change FreeBSD kernel settings
@@ -62,9 +63,9 @@ ncr0    n/a     n/a     n/a     n/a     NCR PCI SCSI controller
 ahc0    n/a     n/a     n/a     n/a     Adaptec 294x PCI SCSI controller
 bt0     330     dyn     dyn     dyn     Buslogic SCSI controller
 uha0    330     dyn     6       dyn     Ultrastore 14f
-ahc1    dyn     dyn     dyn     dyn     Adaptec 274x/284x SCSI controller
-ahb0    dyn     dyn     dyn     dyn     Adaptec 174x SCSI controller
 aha0    330     dyn     5       dyn     Adaptec 154x SCSI controller
+ahb0    dyn     dyn     dyn     dyn     Adaptec 174x SCSI controller
+ahc0    dyn     dyn     dyn     dyn     Adaptec 274x/284x/294x SCSI controller
 aic0    340     11      dyn     dyn     Adaptec 152x/AIC-6360 SCSI
                                         controller
 nca0    1f88    10      dyn     dyn     ProAudioSpectrum cards
@@ -73,17 +74,17 @@ sea0    dyn     5       dyn     c8000   Seagate ST01/02 8 bit controller
 
 wt0     300     5       1       dyn     Wangtek and Archive QIC-02/QIC-36
 
+mse0    23c     5       n/a     n/a     Microsoft Bus Mouse
+psm0    60      12      n/a     n/a     PS/2 Mouse (disabled by default)
+
 mcd0    300     10      n/a     n/a     Mitsumi CD-ROM
 mcd1    340     11      n/a     n/a     Mitsumi CD-ROM
-
 matcd0  230     n/a     n/a     n/a     Matsushita/Panasonic CD-ROM
-
 scd0    230     n/a     n/a     n/a     Sony CD-ROM
 
 sio0    3f8     4       n/a     n/a     Serial Port 0 (COM1)
 sio1    2f8     3       n/a     n/a     Serial Port 1 (COM2)
 sio2    3e8     5       n/a     n/a     Serial Port 2 (COM3)
-sio3    2e8     9       n/a     n/a     Serial Port 3 (COM4)
 
 lpt0    dyn     7       n/a     n/a     Printer Port 0
 lpt1    dyn     dyn     n/a     n/a     Printer Port 1
@@ -96,6 +97,8 @@ ed0     280     5       dyn     d8000   WD & SMC 80xx; Novell NE1000 &
 ed1     300     5       dyn     d8000   Same as ed0
 eg0     310     5       dyn     dyn     3Com 3C505
 ep0     300     10      dyn     dyn     3Com 3C509
+fe0     300     dyn     n/a     n/a     Fujitsu MB86960A/MB86965A cards
+fxp0    dyn     dyn     n/a     dyn     Intel EtherExpress Pro/100B
 ie0     360     7       dyn     d0000   AT&T StarLAN 10 and EN100;
                                         3Com 3C507; NI5210
 ix0     300     10      dyn     d0000   Intel EtherExpress cards
@@ -104,6 +107,7 @@ le0     300     5       dyn     d0000   Digital Equipment EtherWorks
 lnc0    280     10      n/a     dyn     Lance/PCnet cards
                                         (Isolan, Novell NE2100, NE32-VL)
 lnc1    300     10      n/a     dyn     See lnc0
+vx0     dyn     dyn     n/a     dyn
 ze0     300     5       dyn     d8000   IBM/National Semiconductor
                                         PCMCIA Ethernet Controller
 zp0     300     10      dyn     d8000   3Com PCMCIA Etherlink III
diff --git a/release/sysinstall/help/install.hlp b/release/sysinstall/help/install.hlp
index 553a90c..1badeae 100644
--- a/release/sysinstall/help/install.hlp
+++ b/release/sysinstall/help/install.hlp
@@ -1,4 +1,4 @@
-                QUICK INSTALLATION GUIDE FOR FREEBSD 2.1
+                QUICK INSTALLATION GUIDE FOR FREEBSD 2.2
 
 This manual documents the process of installing FreeBSD on your
 machine.  Please also see the Hardware Guide for hardware-specific
@@ -28,7 +28,7 @@ Table of Contents:
 
 3.1     Repairing an existing FreeBSD installation.
 
-3.2     Upgrading from FreeBSD 2.0.5
+3.2     Upgrading from FreeBSD 2.1
 
 
 1.0     DOS user's Question and Answer section
@@ -540,13 +540,13 @@ systems and their contents.  Some UNIX administration experience *is*
 required to use the fixit option!
 
 
-3.2     Upgrading from FreeBSD 2.0.5
+3.2     Upgrading from FreeBSD 2.1
 ---     ----------------------------
 
 It must first be said that this upgrade DOES NOT take a particularly
 sophisticated approach to the upgrade problem, it being more a question
 of providing what seemed "good enough" at the time.  A truly polished
-upgrade that deals properly with the broad spectrum of installed 2.0.5
+upgrade that deals properly with the broad spectrum of installed 2.1
 systems would be nice to have, but until that gets written what you get is
 this - the brute-force approach!
 
@@ -575,7 +575,7 @@ close to the edge, that's all we can say!
 NOTE to 2.0 users: We're sorry, but the "slice" changes that were
 added in FreeBSD 2.0.5 made automated upgrades pretty difficult due to
 the fact that a complete reinstall is pretty much called for.  Things
-may still *work* after a 2.1 upgrade, but you will also no doubt
+may still *work* after a 2.2 upgrade, but you will also no doubt
 receive many warnings at boot time about non-aligned slices and such;
 we really do recommend a fresh installation for 2.0 systems!  (But
 back up your user data first :-).
diff --git a/release/sysinstall/help/media.hlp b/release/sysinstall/help/media.hlp
index dbf7d9b..54f04f5 100644
--- a/release/sysinstall/help/media.hlp
+++ b/release/sysinstall/help/media.hlp
@@ -4,6 +4,7 @@ You can install from the following types of media:
             Sony CDU 31/33A
             Matushita/Panasonic "Sound Blaster" CDROM.
             Mitsumi FX-001{A-D} (older non-IDE drives).
+            IDE CDROM (only some models - experimental!)
             SCSI - Any standard SCSI CDROM drive hooked to
             a supported controller (see Hardware Guide).
 
diff --git a/release/sysinstall/help/upgrade.hlp b/release/sysinstall/help/upgrade.hlp
index 5cba594..1a78466 100644
--- a/release/sysinstall/help/upgrade.hlp
+++ b/release/sysinstall/help/upgrade.hlp
@@ -1,4 +1,4 @@
-Welcome to the 2.0.5 -> 2.1 upgrade procedure!
+Welcome to the 2.1 (or 2.0.5) -> 2.2 upgrade procedure!
 
 It must first be said that this upgrade DOES NOT take a particularly
 sophisticated approach to the upgrade problem, it being more a question
diff --git a/release/sysinstall/help/usage.hlp b/release/sysinstall/help/usage.hlp
index 03a8159..5537d14 100644
--- a/release/sysinstall/help/usage.hlp
+++ b/release/sysinstall/help/usage.hlp
@@ -6,22 +6,16 @@ encounter during this installation:
 
 KEY             ACTION
 ---             ------
+SPACE           Select or toggle the current item.
+RETURN          Continue or invoke selected menu button.
 UP ARROW        Move to previous item (or up, in a text field).
 DOWN ARROW      Move to next item (or down, in a text field).
 TAB             Move to next item or group.
 RIGHT ARROW     Move to next item or group (same as TAB).
 SHIFT-TAB       Move to previous item or group.
 LEFT ARROW      Move to previous item or group (same as SHIFT-TAB).
-RETURN          Select item.
 PAGE UP         In text boxes, scrolls up one page.
 PAGE DOWN       In text boxes, scrolls down one page.
-SPACE           In "radio" or multiple choice menus, toggle the current
-                item.  In help screens, scroll to next page of text.
-F1              Help (in screens that provide it).
-
-In text fields, the amount of text above the current point will be
-displayed as a percentage in the lower right corner.  100% means
-you're at the bottom of the available text.
 
 If you see small "^(-)" or "v(+)" symbols at the edges of a menu, it
 means that there are more items above or below the current one that
@@ -29,8 +23,9 @@ aren't being shown (due to insufficient screen space).  Using the
 up/down arrow keys will cause the menu to scroll.  The PageUp and
 PageDown keys will scroll by entire screens.
 
-When an arrow symbol disappears, it means you are at the top (or
-bottom) of the menu.
+In text fields, the amount of text above the current point will be
+displayed as a percentage in the lower right corner.  A value of
+100% means that you're at the bottom of the available text.
 
 Selecting OK in a menu will confirm whatever action it's controlling.
 Selecting Cancel will cancel the operation and generally return you to
diff --git a/usr.sbin/sysinstall/help/distributions.hlp b/usr.sbin/sysinstall/help/distributions.hlp
index b614937..f77241c 100644
--- a/usr.sbin/sysinstall/help/distributions.hlp
+++ b/usr.sbin/sysinstall/help/distributions.hlp
@@ -1,11 +1,16 @@
+DISTRIBUTION INFORMATION
+------------------------
+
 An ``X-'' prefixed before a distribution set means that the XFree86
 3.1.2-S base distribution, libraries, manual pages, SVGA server and a
 set of default fonts will be selected in addition to the set itself.
-
 If you select such a set, you will also be presented with a set of
 menus for customizing the selections to your desired X Window System
 setup.
 
+Any distribution may be further customized by selecting the `Custom'
+item before leaving the menu.
+
 N.B. All references in this document to `complete source' mean the
 complete source tree minus any legally encumbered cryptography code.
 
@@ -30,7 +35,7 @@ Everything:     The base distribution, man pages, dictionary files,
                 in this collection.  You will need to select that by
                 hand if you're inside the United States.
 
-Custom:         Allows you to modify or create your distribution set on
+Custom:         Allows you to create or modify your distribution set on
                 a piece-by-piece basis.
 
 Reset:          Clear all currently selected distributions.
@@ -53,13 +58,14 @@ obvious, though two possible exceptions may be the "commerce" and
         you'll get the whole collection (between 10 and 30MB).
 
 
-        If you're installing from CDROM then all of the commercial and
-        "experimental" offerings are also easily available in their
-        individual subdirectories and can be copied to hard disk at
-        any time.
+        If you're installing from a 2 disc CDROM set then all of the
+        commercial and "experimental" offerings are also available already
+        installed on the 2nd "live filesystem" CD.
 
 
-You may also notice that certain distributions, like "des" and "krb",
+ENCRYPTION SOFTWARE:
+--------------------
+You may notice that certain distributions, like "des" and "krb",
 are marked "NOT FOR EXPORT!"  This is because it's illegal to export
 them from the United States (or any other country which considers
 encryption technology to be on its restricted export list).  Since
diff --git a/usr.sbin/sysinstall/help/media.hlp b/usr.sbin/sysinstall/help/media.hlp
index dbf7d9b..54f04f5 100644
--- a/usr.sbin/sysinstall/help/media.hlp
+++ b/usr.sbin/sysinstall/help/media.hlp
@@ -4,6 +4,7 @@ You can install from the following types of media:
             Sony CDU 31/33A
             Matushita/Panasonic "Sound Blaster" CDROM.
             Mitsumi FX-001{A-D} (older non-IDE drives).
+            IDE CDROM (only some models - experimental!)
             SCSI - Any standard SCSI CDROM drive hooked to
             a supported controller (see Hardware Guide).
 
diff --git a/usr.sbin/sysinstall/help/usage.hlp b/usr.sbin/sysinstall/help/usage.hlp
index 03a8159..5537d14 100644
--- a/usr.sbin/sysinstall/help/usage.hlp
+++ b/usr.sbin/sysinstall/help/usage.hlp
@@ -6,22 +6,16 @@ encounter during this installation:
 
 KEY             ACTION
 ---             ------
+SPACE           Select or toggle the current item.
+RETURN          Continue or invoke selected menu button.
 UP ARROW        Move to previous item (or up, in a text field).
 DOWN ARROW      Move to next item (or down, in a text field).
 TAB             Move to next item or group.
 RIGHT ARROW     Move to next item or group (same as TAB).
 SHIFT-TAB       Move to previous item or group.
 LEFT ARROW      Move to previous item or group (same as SHIFT-TAB).
-RETURN          Select item.
 PAGE UP         In text boxes, scrolls up one page.
 PAGE DOWN       In text boxes, scrolls down one page.
-SPACE           In "radio" or multiple choice menus, toggle the current
-                item.  In help screens, scroll to next page of text.
-F1              Help (in screens that provide it).
-
-In text fields, the amount of text above the current point will be
-displayed as a percentage in the lower right corner.  100% means
-you're at the bottom of the available text.
 
 If you see small "^(-)" or "v(+)" symbols at the edges of a menu, it
 means that there are more items above or below the current one that
@@ -29,8 +23,9 @@ aren't being shown (due to insufficient screen space).  Using the
 up/down arrow keys will cause the menu to scroll.  The PageUp and
 PageDown keys will scroll by entire screens.
 
-When an arrow symbol disappears, it means you are at the top (or
-bottom) of the menu.
+In text fields, the amount of text above the current point will be
+displayed as a percentage in the lower right corner.  A value of
+100% means that you're at the bottom of the available text.
 
 Selecting OK in a menu will confirm whatever action it's controlling.
 Selecting Cancel will cancel the operation and generally return you to