1 files changed, 32 insertions, 37 deletions

diff --git a/release/sysinstall/help/install.hlp b/release/sysinstall/help/install.hlp
index ac390bf808a9..a48dbd1df0a7 100644
--- a/release/sysinstall/help/install.hlp
+++ b/release/sysinstall/help/install.hlp
@@ -1,4 +1,4 @@
-                QUICK INSTALLATION GUIDE FOR FREEBSD 2.2
+           QUICK INSTALLATION GUIDE FOR FREEBSD 2.2
 
 This manual documents the process of installing FreeBSD on your
 machine.  Please also see the Hardware Guide (HARDWARE.TXT, or
@@ -31,7 +31,7 @@ Table of Contents:
 
 3.1     Repairing an existing FreeBSD installation.
 
-3.2     Upgrading from FreeBSD 2.1
+3.2     Upgrading from earlier releases of FreeBSD.
 
 
 1.0     DOS user's Question and Answer section
@@ -160,7 +160,9 @@ If you must install from floppy disks, either due to unsupported
 hardware or just because you enjoy doing things the hard way, you must
 first prepare some floppies for the install.
 
-You will need, at minimum, as many 1.44MB or 1.2MB floppies as it
+First, make a boot floppy as described in section 2.1.
+
+Next you will need, at minimum, as many 1.44MB or 1.2MB floppies as it
 takes to hold all files in the bin (binary distribution) directory.
 If you're preparing these floppies under DOS, then THESE floppies
 *must* be formatted using the MS-DOS FORMAT command.  If you're using
@@ -189,7 +191,15 @@ chunks conveniently sized so that 5 of them will fit on a conventional
 1.44MB floppy.  Go through all your floppies, packing as many files as
 will fit on each one, until you've got all the distributions you want
 packed up in this fashion.  Each distribution should go into its own
-subdirectory on the floppy, e.g.: a:\bin\bin.aa, a:\bin\bin.ab, ...
+subdirectory on the floppy, e.g.: a:\bin\bin.inf, a:\bin\bin.aa,
+a:\bin\bin.ab, ...
+
+The bin.inf file also needs to go on the first floppy of the bin set
+since it is read by the installation program in order to figure out
+how many additional pieces to look for when fetching and concatenating
+the distribution.  When putting distributions onto floppies, the
+<distname>.inf file MUST occupy the first floppy of each distribution
+set!
 
 Once you come to the Media screen of the install, select "Floppy" and
 you'll be prompted for the rest.
@@ -213,6 +223,12 @@ For as many `DISTS' as you wish to install from DOS (and you have free
 space for), install each one in a directory under `C:\FREEBSD' - the
 BIN dist is only the minimal requirement.
 
+Now you can simply launch the installation from DOS by running the
+following command:  e:\fbsdboot.exe -D e:\kernel
+(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 2.1, Installing from CDROM.
+
 
 2.4     Before installing from QIC/SCSI Tape:
 
@@ -237,9 +253,15 @@ SPECIAL NOTE:  When going to do the installation, the tape must be in
 the drive *before* booting from the boot floppy.  The installation
 "probe" may otherwise fail to find it.
 
+Now create a boot floppy as described in section 2.1. and proceed
+with the installation.
+
 
 2.5     Before installing over a network:
 
+After making a boot floppy, as described in section 2.1, you can load
+the rest of the installation over a network.
+
 You can do network installations over 3 types of connections:
 
         Serial port:    SLIP / PPP
@@ -388,32 +410,6 @@ can fix it in future releases!  It is the objective of the FreeBSD
 installation program (sysinstall) to be self-documenting enough that
 painful "step-by-step" guides are no longer necessary.
 
-You may also find the following "typical installation sequence" to be
-useful reading:
-
-o Boot the boot floppy.  After a boot sequence which can take
-  anywhere from from 30 seconds to 3 minutes, depending on the
-  speed of your hardware, you should be presented with a menu of
-  initial choices.  If the floppy doesn't boot at all, or the boot
-  hangs at some stage, go read the Q&A section of the Hardware
-  Guide for some possible causes.
-
-o Press F1.  You should see some basic usage instructions on
-  the menu system and general navigation within it.  If you haven't
-  used this installation system before then PLEASE read this
-  thoroughly!
-
-o Select the Novice installation and follow the instructions.  Even
-  if you're moderately familiar with UNIX, chose the Novice install!
-  "Novice" in this context means new to the FreeBSD installer, not
-  computers in general!  The other installation types (Custom and
-  Express) assume that you've installed FreeBSD using *this* version
-  of the installation utility and know *exactly* what you are doing!
-
-  Novice users and 25 year veterans of UNIX alike can benefit from the
-  tips provided by the Novice install, so don't be proud - be a novice! :)
-
-
 Installation type overview:
 
 o Custom installation:
@@ -446,11 +442,10 @@ Novice installation method is recommended.
 
 o Novice installation:
 
-As previously mentioned, the Novice installation leads you through the
-required stages in the proper order and presents you with various
-helpful prompts in between.  Once the system is installed, it will
-also present you with the opportunity to perform a variety of "post
-install" actions.
+The Novice installation leads you through the required stages in the
+proper order and presents you with various helpful prompts in between.
+Once the system is installed, it will also present you with the
+opportunity to perform a variety of "post install" actions.
 
 A quick synopsis of the stages involved in a novice installation
 follows:
@@ -529,8 +524,8 @@ systems and their contents.  Some UNIX administration experience *is*
 required to use the fixit option!
 
 
-3.2     Upgrading from FreeBSD 2.1.X
----     ----------------------------
+3.2     Upgrading from earlier releases of FreeBSD.
+---     -------------------------------------------
 
 It must first be said that this upgrade DOES NOT take a particularly
 sophisticated approach to the upgrade problem, it being more a question