1 files changed, 179 insertions, 160 deletions

diff --git a/release/sysinstall/help/install.hlp b/release/sysinstall/help/install.hlp
index 3c958fe478da4..a083926820b4e 100644
--- a/release/sysinstall/help/install.hlp
+++ b/release/sysinstall/help/install.hlp
@@ -44,7 +44,13 @@ preserving the original partition and allowing you to install onto the
 second free piece.  You first "defrag" your DOS partition, using the
 DOS 6.xx "DEFRAG" utility or the Norton Disk tools, then run FIPS.  It
 will prompt you for the rest of the information it needs.  Afterwards,
-you can reboot and install FreeBSD on the new free slice.  See the
+you can reboot and install FreeBSD on the new partition.  Also note
+that FIPS will create the second partition as a "clone" of the first,
+so you'll actually see that you now have two DOS Primary partitions where
+you formerly had one.  Don't be alarmed!  You can simply delete the extra
+DOS Primary parititon (making sure it's the right one by examining its size! :)
+
+See the
 Distributions menu for an estimation of how much free space you'll
 need for the kind of installation you want.
 
@@ -64,7 +70,8 @@ such is your desire.
 
 1.3     Can I mount my DOS extended partitions?
 
-NOTE for 2.1:  This feature MAY work but is currently untested.
+Unfortunately, this remains unsupported.  All the framework is in place
+for doing so, but it didn't get done in time for the 2.1 installation.
 
 
 1.4     Can I run DOS binaries under FreeBSD?
@@ -96,11 +103,12 @@ CDROM distributions may work as well, though we cannot say for certain
 as we have no hand or say in how they're created).  You can either
 boot into the CD installation directly from DOS using Walnut Creek's
 supplied ``install.bat'' batch file or you can make a boot floppy with
-the ``makeflp.bat'' command.
+the ``makeflp.bat'' command [NOTE: If you're using an IDE CDROM, use
+the inst_ide.bat or atapiflp.bat batch files instead].
 
-For the easiest interface of all (from DOS), type "view".  This
-will bring up a DOS menu utility that leads you through all
-the available options.
+For the easiest interface of all (from DOS), type "view".  This will
+bring up a DOS menu utility that leads you through all the available
+options.
 
 If you're creating the boot floppy from a UNIX machine, you may find
 that ``dd if=floppies/boot.flp of=/dev/rfd0'' or
@@ -114,22 +122,8 @@ be required.
 
 After your system is fully installed and you have rebooted from the
 hard disk, you can mount the cdrom at any time by typing: ``mount /cdrom''
-
-A utility called `lndir' comes with the XFree86 distribution which you
-may also find useful: It allows you to create "link tree" directories
-to things on Read-Only media like CDROM.  One example might be
-something like this:
-
-        mkdir /usr/ports
-        lndir /cdrom/ports /usr/ports
-
-Which would allow you to then "cd /usr/ports; make" and get all the
-sources from the CD while creating all the intermediate files in
-/usr/ports, which is presumably on a more writable media! :-)
-
-This is, in fact, what the Ports entry in the Configuration menu does
-at installation time if you select it (this option is also offered to
-you as part of the Novice installation).
+Before removing the CD again, also note that it's necessary to first
+type ``umount /cdrom''.  Don't just remove it from the drive!
 
 SPECIAL NOTE: Before invoking the installation, be sure that the CDROM
 is in the drive so that the "probe" can find it!  This is also true if
@@ -144,9 +138,9 @@ following line to the password file (using the vipw command):
 
         ftp:*:99:99::0:0:FTP:/cdrom:/nonexistent
 
-No further work is necessary.  The other installers will now be able
-to chose a Media type of FTP and type in: ftp://<your machine> after
-picking "Other" in the ftp sites menu!
+Anyone else at your site will now be able to chose a Media type of FTP
+and type in: ftp://<your machine> after picking "Other" in the ftp
+sites menu to install from the CD in your machine!
 
 
 2.2     Before installing from Floppy:
@@ -155,32 +149,43 @@ 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.
 
-The first floppy you'll need is ``floppies/root.flp'', which is
-somewhat special in that it's not a DOS filesystem floppy at all, but
-rather an "image" floppy (it's actually a gzip'd cpio file).  You can
-use the rawrite.exe program to do this under DOS, or ``dd'' to do it
-on a UNIX Workstation (see notes in section 2.1 concerning the
-``floppies/boot.flp'' image).  Once this floppy is made, go on to make
-the distribution set floppies:
+The first floppy you'll need in addition to the boot.flp image is
+``floppies/root.flp'', which is somewhat special in that it's not a
+DOS filesystem floppy at all, but rather a floppy "image" (it's
+actually a gzip'd cpio file).  You can create this floppy in the same
+way that you created the boot floppy (see notes in section 2.1).  Once
+this floppy is made, you can go on to make the distribution set
+floppies using ordinary DOS or UFS (if you're preparing the floppies
+on another FreeBSD machine) formatted diskettes.
 
 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.
-THESE floppies *must* be formatted using MS-DOS, using the FORMAT
-command in MS-DOS or the File Manager format command in Microsoft
-Windows(tm).  Don't trust Factory Preformatted floppies!  Format them
-again yourself, just to make sure!
-
-Many problems reported by our users in the past have resulted from the
-use of improperly formatted media, so we simply take special care to
-mention it here!
-
-After you've DOS formatted the floppies, you'll need to copy the files
-onto them.  The distribution files are split into 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 a subdirectory on the
-floppy, e.g.: a:\bin\bin.aa, a:\bin\bin.ab, ...
+If you're preparing these floppies under DOS, then THESE floppies
+*must* be formatted using the MS-DOS FORMAT command.  If you're using
+Windows, use the Windows File Manager format command.
+
+Don't trust Factory Preformatted floppies!  Format them again
+yourself, just to make sure!  Many problems reported by our users in
+the past have resulted from the use of improperly formatted media,
+which is why I'm taking such special care to mention it here!
+
+If you're creating the floppies from another FreeBSD machine, a format
+is still not a bad idea though you don't need to put a DOS filesystem
+on each floppy.  You can use the `disklabel' and `newfs' commands to
+put a UFS filesystem on them instead, like so:
+
+	disklabel -w -r fd0 floppy3	(use floppy5 for 1.2MB disks)
+	newfs /dev/rfd0
+
+Then you can mount and write to them like any other file system.
+
+After you've formatted the floppies for DOS or UFS, you'll need to
+copy the files onto them.  The distribution files are split into
+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, ...
 
 Once you come to the Media screen of the install, select "Floppy" and
 you'll be prompted for the rest.
@@ -211,17 +216,17 @@ BIN dist is only the minimal requirement.
 2.4     Before installing from QIC/SCSI Tape:
 
 Installing from tape is probably the easiest method, short of an
-on-line install using FTP or a CDROM install.  The installation
-program expects the files to be simply tar'ed onto the tape, so after
-getting all of the files for distribution you're interested in, simply
+on-line install using FTP or a CDROM.  The installation program
+expects the files to be simply tar'ed onto the tape, so after getting
+all of the files for the distributions you're interested in, simply
 tar them onto the tape with a command like:
 
-        cd /freebsd/distdir
-        tar cvf /dev/rwt0 (or /dev/rst0) dist1 .. dist2
+        cd /where/you/have/your/dists
+        tar cvf /dev/rwt0 (or /dev/rst0) floppies dist1 .. dist2
 
-Make sure that the `floppies/' directory is one of the "dists" given
-above, since the installation will look for `floppies/root.flp' on
-the tape.
+It's important to make sure that the `floppies/' directory is
+specified along with the dists because the installation will look for
+`floppies/root.flp' on the tape.
 
 When you go to do the installation, you should also make sure that you
 leave enough room in some temporary directory (which you'll be allowed
@@ -241,25 +246,26 @@ the drive *before* booting from the boot floppy.  The installation
 You can do network installations over 3 types of connections:
 
         Serial port:    SLIP / PPP
-        Parallel port:  PLIP (using ``laplink'' cable)
+        Parallel port:  PLIP (using ``laplink'' style cable)
         Ethernet:       A standard ethernet controller (includes some PCMCIA).
 
-SLIP support is rather primitive, and limited primarily to hard-wired
-links, such as a serial cable running between a laptop computer and
-another computer.  The link should be hard-wired as the SLIP
-installation doesn't currently offer a dialing capability; that
-facility is provided with the PPP utility, which should be used in
-preference to SLIP whenever possible.
-
-If you're using a modem, then PPP is almost certainly your only
-choice.  Make sure that you have your service provider's information
-handy as you'll need to know it fairly soon in the installation
-process.  You will need to know, at the minimum, your service
-provider's IP address and possibly your own (though you can also leave
-it blank and allow PPP to negotiate it with your ISP).  You also need
-to know how to use the various "AT commands" to dial the ISP with your
-particular modem as the PPP dialer provides only a very simple
-terminal emulator.
+SLIP support is rather primitive, and is limited primarily to
+hard-wired links, such as a serial cable running between two
+computers.  The link must be hard-wired because the SLIP installation
+doesn't currently offer a dialing capability.  If you need to dial out
+with a modem or otherwise dialog with the link before connecting to
+it, then I recommend that the PPP utility be used instead.
+
+If you're using PPP, make sure that you have your Internet Service
+Provider's IP address and DNS information handy as you'll need to know
+it fairly early in the installation process.  You may also need to
+know your own IP address, though PPP supports dynamic address
+negotiation and may be able to pick up this information directly from
+your ISP if they support it.
+
+You will also need to know how to use the various "AT commands" for
+dialing out with your particular brand of modem as the PPP dialer
+provides only a very simple terminal emulator.
 
 If a hard-wired connection to another FreeBSD (2.0R or later) machine
 is available, you might also consider installing over a "laplink"
@@ -270,22 +276,25 @@ much higher than what is typically possible over a serial line (up to
 Finally, for the fastest possible network installation, an ethernet
 adaptor is always a good choice!  FreeBSD supports most common PC
 ethernet cards, a table of supported cards (and their required
-settings) being provided as part of the FreeBSD Hardware Guide.  See
-the Documentation menu on the boot floppy.  If you are using one of
-the supported PCMCIA ethernet cards, also be sure that it's plugged in
-_before_ the laptop is powered on!  FreeBSD does not, unfortunately,
-currently support "hot insertion" of PCMCIA cards.
+settings) being provided as part of the FreeBSD Hardware Guide (see
+the Documentation menu on the boot floppy or the top level directory
+of the CDROM).  If you are using one of the supported PCMCIA ethernet
+cards, also be sure that it's plugged in _before_ the laptop is
+powered on!  FreeBSD does not, unfortunately, currently support "hot
+insertion" of PCMCIA cards.
 
 You will also need to know your IP address on the network, the
-"netmask" value for your address class, and the name of your machine.
-Your system administrator can tell you which values to use for your
-particular network setup.  If you will be referring to other hosts by
-name rather than IP address, you'll also need a name server and
-possibly the address of a gateway (if you're using PPP, it's your
-provider's IP address) to use in talking to it.  If you do not know
-the answers to all or most of these questions then you should really
-probably talk to your system administrator _first_ before trying this
-type of installation!
+"netmask" value for your address class and the name of your machine.
+Your system administrator can tell you which values are appropriate to
+your particular network setup.  If you will be referring to other
+hosts by name rather than IP address, you'll also need a name server
+and possibly the address of a gateway (if you're using PPP, it's your
+provider's IP address) to use in talking to it.
+
+If you do not know the answers to these questions then you should
+really probably talk to your system administrator _first_ before
+trying this type of installation!  Using a randomly chosen IP address
+or netmask on a live network will almost certainly get you shot.
 
 Once you have a network connection of some sort working, the
 installation can continue over NFS or FTP.
@@ -297,8 +306,9 @@ installation can continue over NFS or FTP.
         and then point the NFS media selection at it.
 
         If this server supports only "privileged port" access (as is
-        generally the default for Sun workstations), you will need to set
-        this option in the Options menu before installation can proceed.
+        generally the default for Sun and Linux workstations), you
+        will need to set this option in the Options menu before
+        installation can proceed.
 
         If you have a poor quality ethernet card which suffers from very
         slow transfer rates, you may also wish to toggle the appropriate
@@ -314,42 +324,44 @@ installation can continue over NFS or FTP.
         ``-alldirs'' option.  Other NFS servers may have different
         conventions.  If you are getting `Permission Denied' messages
         from the server then it's likely that you don't have this
-        enabled properly!
+        properly enabled!
 
 
 2.5.2   Preparing for FTP Installation
 
         FTP installation may be done from any mirror site containing a
         reasonably up-to-date version of FreeBSD 2.1.  A full menu of
-        reasonable choices for almost any location in the world is provided
-        in the FTP site menu.
+        reasonable choices for almost any location in the world is
+	provided in the FTP site menu.
 
-        If you are installing from some other FTP site not listed in this
-        menu, or you are having troubles getting your name server configured
-        properly, you can also specify your own URL by selecting the ``Other''
-        choice in that menu.  A URL can also be a direct IP address, so
-        the following would work in the absence of a name server:
+        If you are installing from some other FTP site not listed in
+	this menu, or you are having troubles getting your name server
+	configured properly, you can also specify your own URL by
+	selecting the ``Other'' choice in that menu.  A URL can
+	contain a hostname or an IP address, so the following would
+	work in the absence of a name server:
 
-                ftp://192.216.222.4/pub/FreeBSD/2.1-RELEASE
+                ftp://192.216.191.11/pub/FreeBSD/2.1.0-RELEASE
         
         There are two FTP installation modes you can use:
 
            o FTP:
 
-             For all FTP transfers, use the standard "Active" mode for transfers.
-             This will not work through most firewalls but will often work best
-             with older ftp servers that do not support passive mode.  If your
-             connection hangs with passive mode, try this one!
+             For all FTP transfers, use the standard "Active" mode for
+	     transfers.  This will not work through most firewalls but
+	     will often work best with older ftp servers that do not
+	     support passive mode.  If your connection hangs with
+	     passive mode, try this one!
 
            o FTP Passive:
 
-             For all FTP transfers, use "Passive" mode.  This allows the user
-             to pass through firewalls that do not allow incoming connections
-             on random port addresses.
+             For all FTP transfers, use "Passive" mode.  This allows
+	     the user to pass through firewalls that do not allow
+	     incoming connections on random port addresses.
 
         NOTE: ACTIVE AND PASSIVE MODES ARE NOT THE SAME AS A `PROXY'
-        CONNECTION, WHERE A PROXY FTP SERVER IS LISTENING ON A DIFFERENT
-        PORT!
+        CONNECTIONS, WHERE A PROXY FTP SERVER IS LISTENING ON A
+	DIFFERENT PORT!
 
         In such instances, you should specify the URL as something like:
 
@@ -365,20 +377,19 @@ installation can continue over NFS or FTP.
 Once you've taken note of the appropriate preinstallation steps, you
 should be able to install FreeBSD without any further trouble.
 
-Should the installation fail then you may wish to go back and re-read
-the relevant preparation section (section 2.x) for the installation
-media type you're trying to use - perhaps there's a helpful hint there
-that you missed the first time?  If you're having hardware trouble or
-FreeBSD refuses to boot at all then read the Hardware Guide provided
-on the boot floppy for a list of possible solutions.
+Should the installation fail at some stage, then you may wish to go
+back and re-read the relevant preparation section (section 2.x) for
+the installation media type you're trying to use.  Perhaps there's a
+helpful hint there that you missed the first time?  If you're having
+hardware trouble or FreeBSD refuses to boot at all, then read the
+Hardware Guide again for a list of possible solutions.
 
 The FreeBSD boot floppy contains all the on-line documentation you
-should need to be able to navigate through an installation and if it
-doesn't then I'd like to know what you found most confusing!  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.  It may take us a little while to reach that
-objective, but that's the basic idea!
+should need to be able to navigate through an installation, and if it
+doesn't then I'd like to know what you found most confusing so that I
+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:
@@ -395,21 +406,15 @@ o Press F1.  You should see some basic usage instructions on
   used this installation system before then PLEASE read this
   thoroughly!
 
-o Select the Options item and set any special preferences you may have.
+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!
 
-o Select a Custom, Express or Novice install depending on whether or not
-  you'd like the installation to give you a high degree of control over each
-  step of the installation, run through it as quickly as possible or simply
-  lead you through it, chosing reasonable defaults when possible.  Further
-  details on the different installation types are given below.
-
-o The Configure menu choice allows you to furthur configure your FreeBSD
-  installation by giving you menu-driven access to various system
-  defaults.  Some items, like networking, may be especially important if
-  you did a CDROM/Tape/Floppy installation and have not yet configured
-  your network interfaces (assuming you have any).  Properly configuring
-  such interfaces here will allow FreeBSD to come up on the network when
-  you first reboot from the hard disk.
+  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:
@@ -420,10 +425,14 @@ You can do anything you like in this menu without altering your system
 _except_ for "Commit", which will perform any pending actions you may
 have selected.  Some of the menu options will also have direct `Write'
 commands available for commiting an operation immediately, but they
-should only be used if you're absolutely sure it's necessary.  It's
+should only be used if you're *absolutely sure* it's necessary.  It's
 generally safer to stack up your changes and then commit them all at
 once so that you're left with the option of changing your mind up to
-the very last moment.
+the very last moment.  In particular, the (W)rite options in the fdisk
+and label screens WILL NOT WORK for a new installation!  They're meant
+for tweaking *existing* installations, not doing new ones.  Use the
+final commit option as there is no advantage whatsoever to be gained
+in writing the information out stage by stage in a new installation.
 
 If you're confused at any point, the F1 key will pull up what is
 hopefully some helpful information for the screen you're in.
@@ -431,19 +440,20 @@ hopefully some helpful information for the screen you're in.
 
 o Express installation:
 
-This installation will invoke all the appropriate steps in order as
-if you'd selected them one by one from the custom installation menu.
-It assumes that you *know what you are doing* and have run the
+This installation will invoke all the appropriate steps in order as if
+you'd selected them one by one from the custom installation menu.  It
+assumes that you *know what you are doing* and have run the
 installation at least once before.  If this is not the case, the
 Novice installation method is recommended.
 
 
 o Novice installation:
 
-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.
+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.
 
 A quick synopsis of the stages involved in a novice installation
 follows:
@@ -451,23 +461,28 @@ follows:
         o The first step is the `Partition Editor', which allows
           you to chose how your drives will be used for FreeBSD.
           If you're dedicating an entire drive to FreeBSD, the
-          `A' command is probably all you need to type here.
+          `A' command is probably all you need to type here, otherwise
+	  move to a partition marked `Unused' (or delete an existing one)
+	  and use the `C' command to create a FreeBSD partition in its
+	  place.
 
         o Next, with the `Label Editor', you can specify how the space
-          in any allocated FreeBSD partitions should be used by FreeBSD,
-          or where to mount a non-FreeBSD partition (such as DOS).  If
-          you want the standard layout, simply type `A' here.
-
-        o Next, the `Distributions' menu allows you to specify which
-          parts of FreeBSD you wish to load.  A good choice is
-          "User" for a small system or "Developer" for someone
-          wanting a bit more out of FreeBSD.  If none of the existing
-          collections seem applicable, select Custom.
+          in any FreeBSD partitions should be used by FreeBSD.  You
+          can also mount any non-FreeBSD partitions (such as DOS) in this
+	  screen.  If you want the standard layout, simply type `A' for
+	  the defaults.
+
+        o Next, the `Distributions' menu allows you to specify how much
+          of FreeBSD you'd like to load.  A good choice is the "User"
+          distribution for a small system or the "Developer" distribution
+          for someone wanting a more programmer-oriented configuration.
+	  If none of the existing collections seem applicable, select
+          Custom to choose the component distributions yourself.
 
         o Next, the `Media' menu allows you to specify what kind of
           media you wish to install from.  If a given media type requires
           extra information, such as networking information for an FTP
-          or NFS install, it will also be asked at this point.
+          or NFS install, it will also be asked for at this point.
 
         o Finally, you'll be prompted to commit all of these actions at
           once (nothing has been written to your disk so far, nor will
@@ -484,19 +499,23 @@ follows:
           WEB server, etc.
 
 At this point, you're generally done with the sysinstall utility and
-can select the final `Quit'.  If you're running it as an installer
-(e.g., before the system is all the way up) then the system will now
-reboot after you press return one last time.  If you selected the boot
-manager option, you will see a small boot menu with an `F?' prompt.
-Press the function key for BSD (it will be shown) and you should boot up
+can reboot the system.  If you elected to install the boot manager,
+you should now see a small boot menu with an `F?' prompt.  Press the
+function key corresponding to the BSD partition and you should boot up
 into FreeBSD off the hard disk.
 
-If this fails to happen for some reason, see the Q & A section
-of the Hardware Guide for possible clues!
+If this fails to happen for some reason, see the Q & A section of the
+Hardware Guide for possible clues!  The most likely problem is a
+mis-matched disk geometry, which will have to be corrected with a
+second pass through the install, using the (G) command in the fdisk
+menu to properly set the geometry the next time.
 
 Should you wish to re-enter this installation later, you will find it
 under /stand/sysinstall on the installed system.
 
+Good luck!  If you really get stuck, you may send mail to our support
+mailing list - questions@FreeBSD.org.  We'll do our best to help you!
+
                                         Jordan
 
 ---- End of Installation Guide ---