8 files changed, 50 insertions, 53 deletions

diff --git a/release/sysinstall/help/hardware.hlp b/release/sysinstall/help/hardware.hlp
index 7f3f9976f5f9b..d2b71e0a91315 100644
--- a/release/sysinstall/help/hardware.hlp
+++ b/release/sysinstall/help/hardware.hlp
@@ -1,6 +1,6 @@
-Hardware Documentation Guide:  $Id: hardware.hlp,v 1.9.2.22 1997/10/17 06:39:12 msmith Exp $
+Hardware Documentation Guide:  $Id: hardware.hlp,v 1.9.2.23 1997/10/19 13:15:26 joerg Exp $
 
-Contents last changed:  March 27th, 1997
+Contents last changed:  October 20th, 1997
 
 Table of Contents
 -----------------
@@ -266,6 +266,7 @@ gusxvi: Gravis Ultrasound 16-bit PCM
 joy:    Joystick
 labpc:  National Instrument's Lab-PC and Lab-PC+
 meteor:	Matrox Meteor frame-grabber card
+bktr:   Brooktree Bt848 based frame-grabber cards.
 mpu:    Roland MPU-401 stand-alone card
 mse:    Logitech & ATI InPort bus mouse ports
 mss:    Microsoft Sound System
diff --git a/release/sysinstall/help/install.hlp b/release/sysinstall/help/install.hlp
index 78dbb0e2b306d..3db18c601cc8e 100644
--- a/release/sysinstall/help/install.hlp
+++ b/release/sysinstall/help/install.hlp
@@ -70,16 +70,18 @@ sites, then this can be easily accomplished in one of three ways:
            NOTE: If this fails for some reason, go to step 3:
 
 
-        3. Build a FreeBSD boot floppy from the floppies/boot.flp
-           file in a FreeBSD distribution.  If you have a CD distribution,
-           simply run the ``makeflp.bat'' script, otherwise read
+        3. Build a FreeBSD boot floppy from the floppies/boot.flp file
+           in a FreeBSD distribution.  If you have a CD distribution
+           then simply run the ``makeflp.bat'' script, otherwise read
            floppies/README.TXT for information on how to "image copy"
-           this file onto a floppy.  Then simply boot directly from the
-           floppy and you should go into the installation after making a
-           stop at the kernel configuration menu.
+           this file onto a floppy using various utilities.
 
+           Then simply boot directly from the floppy and you should go
+           directly into the installation after making a stop at the
+           kernel configuration menu.
 
-Once you're in the installation screen, you should be able to follow
+
+Once you're at the installation screen, you should be able to follow
 the various menu prompts and go from there.  If you've never used the
 FreeBSD installation before, you are also encouraged to read some of
 the documentation in the first "Usage" menu choice, as well as the
@@ -297,11 +299,8 @@ Robert Nordier's "setup.exe" program.  It will give you a menu of
 distribution choices, verify that you have enough free space and do
 all the copying to C:\FREEBSD for you automatically.
 
-Once you've copied the directories or run setup.exe and let it do all
-the work for you, you can simply launch the installation from DOS by
-running the install.bat script (NOTE: Some memory managers don't like
-this - disable QEMM or EMM386 if they're running before trying this)
-or making a boot floppy as described in section 0.1.
+Once you've done all this, make a boot floppy as described in section
+0.1.3 and boot from it.
 
 
 
diff --git a/release/sysinstall/help/media.hlp b/release/sysinstall/help/media.hlp
index 54f04f5fec05d..7fccd8ef2be90 100644
--- a/release/sysinstall/help/media.hlp
+++ b/release/sysinstall/help/media.hlp
@@ -4,7 +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!)
+            IDE CDROM
             SCSI - Any standard SCSI CDROM drive hooked to
             a supported controller (see Hardware Guide).
 
@@ -19,7 +19,10 @@ You can install from the following types of media:
 
 
    Floppy   Get distribution files from one or more DOS or UFS
-            formatted floppies.
+            formatted floppies.  Such floppies are assumed to
+            contain the appropriate distribution pieces - see
+            ABOUT.TXT for more information about making floppy
+            distribution media.
 
 
    FTP      Get the distribution files from an anonymous ftp server
diff --git a/release/sysinstall/help/readme.hlp b/release/sysinstall/help/readme.hlp
index cae7d45943ae3..80c762ef95008 100644
--- a/release/sysinstall/help/readme.hlp
+++ b/release/sysinstall/help/readme.hlp
@@ -1,14 +1,14 @@
    -----------------------------------------
-       FreeBSD 2.2.x  ---  RELENG Version              ,        ,
+       FreeBSD 2.2.5  ---  RELEASE Version              ,        ,
    -----------------------------------------          /(        )`
                                                       \ \___   / |
-Welcome to the 2.2 RELEASE branch of FreeBSD!         /- _  `-/  '
+Welcome to the 2.2.5 RELEASE version of FreeBSD!      /- _  `-/  '
                                                      (/\/ \ \   /\
-This is a full release on the RELENG_2_2 branch,     / /   | `    \
-part of a new cycle of FreeBSD release technology    O O   ) /    |
-which takes over from where the 2.1 branch left      `-^--'`<     '
-off.                                                (_.)  _  )   /
-                                                     `.___/`    /
+This is a full release to follow 2.2.2-RELEASE,      / /   | `    \
+which was released in June, 1997.  Many bugs have    O O   ) /    |
+been fixed and the general stability of the system   `-^--'`<     '
+enhanced, a conservative set of subsystem upgrades  (_.)  _  )   /
+and new features also being added for 2.2.5.         `.___/`    /
                                                        `-----' /
 Feedback or offers to help with anything  <----.     __ / __   \
 you see in this release are most welcome  <----|====O)))==) \) /====
@@ -18,7 +18,7 @@ ABOUT.TXT file for more information.                    \       /       /\
                                                    ______( (_  / \______/
                                                  ,'  ,-----'   |
                                                  `--{__________)
-
+					    
 
 
 ** Most files here are also in the Documentation Menu of the boot floppy **
diff --git a/release/sysinstall/help/register.hlp b/release/sysinstall/help/register.hlp
index a7b397c35a40d..35ff6ebd286d9 100644
--- a/release/sysinstall/help/register.hlp
+++ b/release/sysinstall/help/register.hlp
@@ -22,7 +22,7 @@ of registering can help both you and FreeBSD.
    processing packages to games) if they only had some idea that it
    might be worth the trouble.  The only way to convince the ISVs that
    FreeBSD is worth their trouble is to show them how many users
-   we have, and to do that we need your registration!  At this time
+   we have and, to do that, we need your registration!  At this time
    we literally do not know how many users FreeBSD has, and that's
    hardly helpful when you're trying to convince someone to port
    software to it.
diff --git a/release/sysinstall/help/relnotes.hlp b/release/sysinstall/help/relnotes.hlp
index f6c345ec0f229..34b4742fbe2d0 100644
--- a/release/sysinstall/help/relnotes.hlp
+++ b/release/sysinstall/help/relnotes.hlp
@@ -1,31 +1,19 @@
                                  RELEASE NOTES
-                   FreeBSD 2.2-STABLE BRANCH [now in 2.2.5-BETA]
-
-o The 2.2-stable branch is now in BETA test for 2.2.5. This
-  release should be considered essentially equivalent to a
-  2.2.5 BETA release though, since BETAs now "float", the
-  latest available 2.2-YYMMDD-BETA release should always be your
-  testing target of choice if you wish to avoid bugs which have
-  already been found and fixed during this BETA period.  The
-  2.2.5-BETA cycle commenced on October 1st, 1997 and will
-  end on October 20th, 1997 with a full 2.2.5-RELEASE, barring
-  any unforseen problems.  During that period, the snapshots on
-  the releng22.freebsd.org server (see below) will carry a -BETA
-  suffix instead of the usual -RELENG.
+                             FreeBSD 2.2.5-RELEASE
 
 o For information about the layout of the release directory, see
-  the ABOUT.TXT file.  If you are installing from floppies, *read this
-  section!*
+  the ABOUT.TXT file.  If you are installing from floppies, it is
+  especially important that you *read this section!*
 
 o For installation instructions, see the INSTALL.TXT and HARDWARE.TXT
   files.
 
 For the most up-to-date releases along the RELENG_2_2 branch (which
-is now proceeding onwards toward release 2.2.5), please install from:
+is now proceeding onwards toward release 2.2.6), please install from:
 
         ftp://releng22.freebsd.org/pub/FreeBSD/
 
-And for the latest 3.0-current (HEAD branch) snapshot releases,
+Or for the latest 3.0-current (HEAD branch) snapshot releases,
 please install from:
 
         ftp://current.freebsd.org/pub/FreeBSD
@@ -33,14 +21,20 @@ please install from:
 
 1. What's new since 2.2.2
 -------------------------
+
+Better support for Cyrix and AMD processors.
+
 The "world" target in /usr/src/Makefile has been made more
 independent of the host system, allowing for easier bootstrapping
 via source from very old systems.
 
 Many many fixes to the documentation.
 
-Many security enhancements, as documented with CERT and other
-security organizations.
+Many security enhancements, as reported through CERT and other
+computer security organizations.
+
+The installation program was further updated and fixed, some
+year-old bogons finally eliminated for 2.2.5.
 
 Important subsystems such as BIND and sendmail updated.
 
@@ -56,22 +50,18 @@ Enhancements to the serial boot code and GDB remote support.
 
 Make work-around available for CMD640 chipset (see /sys/i386/conf/LINT).
 
-Better support for Cyrix and AMD processors.
-
 Newer 3Com 3c589D PCMCIA cards are now supported.
 
 A new VGA library (/usr/src/lib/libvgl) now exists for doing simple
 VGA graphics to syscons ttys (sort of like Linux's libSVGA).
 
-Many many bugs fixed and security enhancements made.
-
 The TCP connection timeout in lpd & friends can now be specified by a
 printcap(5) capability, preventing it from hanging for too long when
 working in an environment with many network printservers.
 
 User-mode ppp updated with various fixes and enhancements from 3.0-current.
-It's worth re-reading the manual page.  The following things may disturb
-peoples current configuration:
+It's worth re-reading the manual page since some of the following changes
+may disturb peoples current configurations:
 
   o The "set debug" command is now "set log".
   o The LCP log has been split into an LCP, IPCP and CCP log, so any
diff --git a/release/sysinstall/help/tcp.hlp b/release/sysinstall/help/tcp.hlp
index fdee91c556e4b..2f62a8ecc23e1 100644
--- a/release/sysinstall/help/tcp.hlp
+++ b/release/sysinstall/help/tcp.hlp
@@ -25,6 +25,6 @@ specify which one to use.  The following strings are recognized:
         "media 10base5/AUI" - Select the AUI port.
         "media 10baseT/UTP" - Select the twisted pair port.
         "media 10base2/BNC" - Select the BNC connector.
-        "media 100baseTX" - Select 100BaseT on a 100/10 dual adaptor.
+        "media 100baseTX"   - Select 100BaseT on a 100/10 dual adaptor.
 
 When you're done with this form, select OK.
diff --git a/release/sysinstall/help/usage.hlp b/release/sysinstall/help/usage.hlp
index d9274d59e8ef9..6b9a1e88eeb72 100644
--- a/release/sysinstall/help/usage.hlp
+++ b/release/sysinstall/help/usage.hlp
@@ -10,7 +10,7 @@ encounter during this installation:
 KEY             ACTION
 ---             ------
 SPACE           Select or toggle the current item.
-ENTER          Finish with a menu or item.
+ENTER           Finish with a menu or item.
 UP ARROW        Move to previous item (or up, in a text display box).
 DOWN ARROW      Move to next item (or down, in a text display box).
 TAB             Move to next item or group.
@@ -31,7 +31,11 @@ PageUp and PageDown keys will scroll by entire screens.
 
 Selecting OK in a menu will confirm whatever action it's controlling.
 Selecting Cancel will cancel the operation and generally return you to
-the previous menu.
+the previous menu.  Note also that "checkbox" menus use SPACE to select
+their items, not ENTER!  Pressing ENTER will leave the menu with either
+an OK or Cancel status, depending on which button at the bottom is
+selected, and is probably not what you wanted to do if still selecting
+options.  Remember the spacebar!
 
 Most screens obey the Help key (F1) - USE IT!  It generally offers useful
 context-specific hints on what to do at each stage of the installation,