Institute a fairly major format overhaul.

3 files changed, 64 insertions, 329 deletions

diff --git a/release/sysinstall/help/install.hlp b/release/sysinstall/help/install.hlp
index 5dac855..f8b9387 100644
--- a/release/sysinstall/help/install.hlp
+++ b/release/sysinstall/help/install.hlp
@@ -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
diff --git a/release/sysinstall/help/readme.hlp b/release/sysinstall/help/readme.hlp
index e6aff56..e033355 100644
--- a/release/sysinstall/help/readme.hlp
+++ b/release/sysinstall/help/readme.hlp
@@ -22,121 +22,19 @@ environments!  They are first and foremost test
 vehicles used by the project to periodically give testers or developers
 access to the latest -current technology.  They are not put through the
 same quality assurance mechanisms that full releases are!
-							 
-							 
-***** Final note: PLEASE also read the Hardware guide, which you will
-find in the root directory of your distribution as HARDWARE.TXT.  It
-is also available in the Documentation submenu of the boot floppy, but
-it's probably a good idea to read it before even getting that far.  It
-contains important checklist information on configuring your hardware
-before starting the installation process.  ****		 
-							 
-							 
-What is FreeBSD?  FreeBSD is an operating system based on 4.4 BSD Lite
-for Intel, AMD, Cyrix or NexGen "x86" based PC hardware.  It works
-with a very wide variety of PC peripherals and configurations and can
-be used for everything from software development to Internet Service
-Provision.
+                                                         
 
-This release of FreeBSD contains everything you need to run such a
-system, including full source code for everything.  With the source
-distribution installed you can literally recompile the entire system
-from scratch with one command, making it ideal for students,
-researchers or folks who simply want to see how it all works.
+** Most files here are also in the Documentation Menu of the boot floppy **
 
-A large collection of 3rd party ported software (the "ports
-collection") is also provided to make it easier for you to obtain and
-install all your favorite traditional UNIX utilities for FreeBSD.
-Over 600 ports, from editors to programming languages to graphical
-applications, make FreeBSD a powerful and comprehensive operating
-environment that extends far beyond what's provided by many commercial
-versions of UNIX.
+ROAD MAP:
 
+  README.TXT            This file.
+  ABOUT.TXT             All about FreeBSD and the physical organization
+                        of this distribution.
+  INSTALL.TXT           How to install FreeBSD on your PC using the files
+                        you'll find here.
+  HARDWARE.TXT          PC Hardware information & troubleshooting guide.
+  RELNOTES.TXT          Release Notes - what's new & different in this
+                        release.
 
-For more documentation on this system it is recommended that you
-purchase the 4.4BSD Document Set from O'Reilly Associates and the
-USENIX Association, ISBN 1-56592-082-1.  We have no connection with
-O'Reilly, we're just satisfied customers!
-
-If you're new to FreeBSD then you should also read EVERYTHING listed
-in the Documentation menu on the boot floppy.  It may seem like a lot
-to read, but you should at least acquaint yourself with the types of
-information available should you later get stuck.  Once the system is
-installed, you can also revisit this menu and use a WEB browser to
-read the installed FAQ (Frequently Asked Questions) and Handbook HTML
-documentation sets for FreeBSD.  You can also use the browser to visit
-other WEB sites on the net (such as http://www.freebsd.org) if you
-have an Internet connection.
-
-
-DISCLAIMER: While FreeBSD does its best to safeguard against accidental
-loss of data, it's still more than possible to WIPE OUT YOUR ENTIRE DISK
-with this installation!  Please do not proceed to the final FreeBSD
-installation menu unless you've adequately backed up any important
-data first!  We really mean it!
-
-o E-mail addresses and tech support info:
-
-For general questions, please send email to :
-
-        questions@FreeBSD.org
-
-Please also have patience if your questions are not answered right
-away - this mailing list is staffed purely by volunteers and they also
-have real life schedules to contend with.  Questions which are asked
-intelligently (e.g. not "My system doesn't work!  What's wrong!?")
-also stand a far greater chance of being answered. If your question
-does not contain enough information to allow the responder to generate
-a meaningful answer, they generally won't.
-
-Bug reports submitted with the send-pr command are also logged and
-tracked in our bugs database, and you'll be kept informed of any
-changes in status during the life of the bug (or feature request).
-
-Technical comments on this release should be sent (in English!) to:
-
-        hackers@FreeBSD.org
-
-Bug reports should be sent using the `send-pr' command, if you were
-able to get the system installed, otherwise to:
-
-        bugs@FreeBSD.org
-
-
-PLEASE ALSO BE SURE TO INDICATE WHICH VERSION OF FREEBSD YOU'RE
-RUNNING IN ANY BUG REPORTS OR QUESTIONS!
-
-Sorry for the caps, but you'd be amazed at how many times people
-forget this and there are many different release versions of FreeBSD
-out there now.  It's imperative that we know what you're running so
-that we tell if you're suffering from a bug which has already been
-fixed.
-
-
-o WWW Resources:
-
-Our WEB site, http://www.freebsd.org, is also a very good source for
-updated information and provides a number of advanced documentation
-searching facilities.  If you wish to use Netscape as your browser,
-you may install the BSDI version from ftp://ftp.mcom.com or simply
-type:
-
-        # cd /usr/ports/www/netscape3
-        # make all install
-
-If you have the Ports collection installed on your machine (usually on
-the 2nd CDROM of a CDROM release).
-
-
-Several other non-commercial browsers are also available in
-/usr/ports/net and may be compiled and installed in the same fashion.
-Many are also available as pre-compiled packages - see the Packages
-entry in the Configuration menu for more details.
-
-The Handbook and FAQ are also available as on-line documents in
-/usr/share/doc and can be read using the ``file:/usr/share/doc''
-syntax in any HTML capable browser.
-
-We sincerely hope you enjoy this release of FreeBSD!
-
-                                        The FreeBSD Project
+---
diff --git a/release/sysinstall/help/relnotes.hlp b/release/sysinstall/help/relnotes.hlp
index 4d6f2c5..032832e 100644
--- a/release/sysinstall/help/relnotes.hlp
+++ b/release/sysinstall/help/relnotes.hlp
@@ -14,7 +14,7 @@ For installation instructions, see the INSTALL.TXT and HARDWARE.TXT
 files.
 
 
-0. What's new since 2.2.X-RELEASE
+1. What's new since 2.2.X-RELEASE
 ------------------------------------
 
 The ATAPI CD-ROM support is now reported to work for quite an
@@ -45,82 +45,7 @@ programming interfaces.  We are still seeking volunteers to document
 interfaces here!
 
 
-2. Technical overview
----------------------
-
-FreeBSD is a freely available, full source 4.4 BSD Lite based release
-for Intel i386/i486/Pentium (or compatible) based PC's.  It is based
-primarily on software from U.C. Berkeley's CSRG group, with some
-enhancements from NetBSD, 386BSD, and the Free Software Foundation.
-
-Since our release of FreeBSD 2.0 over 2 years ago, the performance,
-feature set and stability of FreeBSD has improved dramatically.  The
-largest change is a revamped VM system with a merged VM/file buffer
-cache that not only increases performance but reduces FreeBSD's memory
-footprint, making a 5MB configuration a more acceptable minimum.
-Other enhancements include full NIS client and server support,
-transaction TCP support, dial-on-demand PPP, an improved SCSI
-subsystem, early ISDN support, support for FDDI and Fast Ethernet
-(100Mbit) adapters, improved support for the Adaptec 2940 (WIDE and
-narrow) and 3940 SCSI adaptors along with many hundreds of bug fixes.
-
-We've taken the comments and suggestions of many of our users to
-heart and have attempted to provide what we hope is a more sane and
-easily understood installation process.  Your feedback on this
-(constantly evolving) process is especially welcome!
-
-In addition to the base distributions, FreeBSD offers a ported
-software collection with over 700 commonly sought-after programs.  The
-list of ports ranges from http (WWW) servers, to games, languages,
-editors and almost everything in between.  The entire ports collection
-requires only 6MB of storage, all ports being expressed as "deltas"
-to their original sources.  This makes it much easier for us to update
-ports and greatly reduces the disk space demands made by the ports
-collection.  To compile a port, you simply change to the directory of
-the program you wish to install, type make and let the system do the
-rest.  The full original distribution for each port you build is
-retrieved dynamically off of CDROM or a local ftp site, so you need
-only enough disk space to build the ports you want.  (Almost) every
-port is also provided as a pre-compiled "package" which can be
-installed with a simple command (pkg_add).  See also the new Packages
-option in the Configuration menu for an especially convenient interface
-to the package collection.
-
-
-A number of additional documents which you may find helpful in the
-process of installing and using FreeBSD may now also be found in the
-/usr/share/doc directory.  You may view the manuals with any HTML
-capable browser by saying:
-
-  To read the handbook:
-      <browser> file:/usr/share/doc/handbook/handbook.html
-
-  To read the FAQ:
-      <browser> file:/usr/share/doc/FAQ/FAQ.html
-
-You can also visit the master (and most frequently updated) copies at
-http://www.freebsd.org.
-
-The core of FreeBSD does not contain DES code which would inhibit its
-being exported outside the United States.  There is an add-on package
-to the core distribution, for use only in the United States, that
-contains the programs that normally use DES.  The auxiliary packages
-provided separately can be used by anyone.  A freely (from outside the
-U.S.) exportable distribution of DES for our non-U.S. users also
-exists at ftp://ftp.internat.freebsd.org/pub/FreeBSD.
-
-If password security for FreeBSD is all you need and you have no
-requirement for copying encrypted passwords from different hosts
-(Suns, DEC machines, etc) into FreeBSD password entries, then
-FreeBSD's MD5 based security may be all you require!  We feel that our
-default security model is more than a match for DES, and without any
-messy export issues to deal with.  If you're outside (or even inside)
-the U.S., give it a try!  This snapshot also includes support for
-mixed password files - either DES or MD5 passwords will be accepted,
-making it easier to transition from one scheme to the other.
-
-
-3. Supported Configurations
+2. Supported Configurations
 ---------------------------
 
 FreeBSD currently runs on a wide variety of ISA, VLB, EISA and PCI bus
@@ -134,7 +59,7 @@ FreeBSD.  Other configurations may also work, we have simply not as yet
 received confirmation of this.
 
 
-3.1. Disk Controllers
+2.1. Disk Controllers
 ---------------------
 
 WD1003 (any generic MFM/RLL)
@@ -208,7 +133,7 @@ The following CD-ROM type systems are supported at this time:
         quality!).
 
 
-3.2. Ethernet cards
+2.2. Ethernet cards
 -------------------
 
 Allied-Telesis AT1700 and RE2000 cards
@@ -257,7 +182,7 @@ still waiting for someone to donate a driver for one of them.  Any
 takers?
 
 
-3.3. Misc
+2.3. Misc
 ---------
 
 AST 4 port serial card using shared IRQ.
@@ -304,13 +229,13 @@ Genius and Mustek hand scanners.
 FreeBSD currently does NOT support IBM's microchannel (MCA) bus.
 
 
-
-4. Obtaining FreeBSD
+3. Obtaining FreeBSD
 --------------------
 
 You may obtain FreeBSD in a variety of ways:
 
-4.1. FTP/Mail
+3.1. FTP/Mail
+-------------
 
 You can ftp FreeBSD and any or all of its optional packages from
 `ftp.freebsd.org' - the official FreeBSD release site.
@@ -330,7 +255,8 @@ megabytes* through the mail and should only be employed as an absolute
 LAST resort!
 
 
-4.2. CDROM
+3.2. CDROM
+----------
 
 FreeBSD 2.1.6-RELEASE and 2.2-RELEASE CDs may be ordered on CDROM from:
 
@@ -359,8 +285,8 @@ Should you be dissatisfied for any reason, the CD comes with an
 unconditional return policy.
 
 
-Reporting problems, making suggestions, submitting code
--------------------------------------------------------
+4. Reporting problems, making suggestions, submitting code.
+-----------------------------------------------------------
 
 Your suggestions, bug reports and contributions of code are always
 valued - please do not hesitate to report any problems you may find
@@ -419,101 +345,19 @@ special interest groups not mentioned here, so send mail to majordomo
 and ask about them!
 
 
-6. Acknowledgements
+5. Acknowledgements
 -------------------
 
 FreeBSD represents the cumulative work of many dozens, if not
 hundreds, of individuals from around the world who have worked very
-hard to bring you this release.  It would be very difficult, if not
-impossible, to enumerate everyone who's contributed to FreeBSD, but
-nonetheless we shall try (in alphabetical order, of course). If you've
-contributed something substantive to us and your name is not mentioned
-here, please be assured that its omission is entirely accidental.
-Please contact hackers@FreeBSD.org for any desired updates to the
-lists that follow:
-
-
-The Computer Systems Research Group (CSRG), U.C. Berkeley.
-
-Bill Jolitz, for his initial work with 386BSD.
-
-The FreeBSD Core Team
-(in alphabetical order by last name):
-
-        Satoshi Asami <asami@FreeBSD.org>
-        Andrey A. Chernov <ache@FreeBSD.org>
-        John Dyson <dyson@FreeBSD.org>
-        Bruce Evans <bde@FreeBSD.org>
-        Justin Gibbs <gibbs@FreeBSD.org>
-        David Greenman <davidg@FreeBSD.org>
-        Jordan K. Hubbard <jkh@FreeBSD.org>
-        Poul-Henning Kamp <phk@FreeBSD.org>
-        Rich Murphey <rich@FreeBSD.org>
-        Gary Palmer <gpalmer@FreeBSD.org>
-        Søren Schmidt <sos@FreeBSD.org>
-        Peter Wemm <peter@FreeBSD.org>
-        Garrett A. Wollman <wollman@FreeBSD.org>
-        Jörg Wunsch <joerg@FreeBSD.org>
-
-
-The FreeBSD Development Team, excluding core team members
-(in alphabetical order by last name):
-
-        Torsten Blum <torstenb@FreeBSD.org>
-        Gary Clark II <gclarkii@FreeBSD.org>
-        Adam David <adam@FreeBSD.org>
-        Peter Dufault <dufault@FreeBSD.org>
-        Frank Durda IV <uhclem@FreeBSD.org>
-        Julian Elischer <julian@FreeBSD.org>
-        Sean Eric Fagan <sef@FreeBSD.org>
-        Stefan Esser <se@FreeBSD.org>
-        Bill Fenner <fenner@FreeBSD.org>
-        John Fieber <jfieber@FreeBSD.org>
-        Lars Fredriksen <lars@freeBSD.org>
-        Thomas Gellekum <tg@FreeBSD.org>
-        Thomas Graichen <graichen@FreeBSD.org>
-        Rod Grimes <rgrimes@FreeBSD.org>
-        James FitzGibbon <jfitz@FreeBSD.org>
-        John Hay <jhay@FreeBSD.org>
-        Jeffrey Hsu <hsu@FreeBSD.org>
-        Ugen J.S. Antsilevich <ugen@FreeBSD.org>
-        Gary Jennejohn <gj@FreeBSD.org>
-        Andreas Klemm <andreas@FreeBSD.org>
-        Warner Losh <imp@FreeBSD.org>
-        L Jonas Olsson <ljo@FreeBSD.org>
-        Eric L. Hernes <erich@FreeBSD.org>
-        Scott Mace <smace@FreeBSD.org>
-        Atsushi Murai <amurai@FreeBSD.org>
-        Mark Murray <markm@FreeBSD.org>
-        Alex Nash <alex@FreeBSD.org>
-        Masafumi NAKANE <max@FreeBSD.org>
-        David E. O'Brien <obrien@FreeBSD.org>
-        Andras Olah <olah@FreeBSD.org>
-        Steve Passe <smp@FreeBSD.org>
-        Sujal Patel <smpatel@FreeBSD.org>
-        Bill Paul <wpaul@FreeBSD.org>
-        Joshua Peck Macdonald <jmacd@FreeBSD.org>
-        John Polstra <jdp@FreeBSD.org>
-        Steve Price <steve@FreeBSD.org>
-        Mike Pritchard <mpp@FreeBSD.org>
-        Doug Rabson <dfr@FreeBSD.org>
-        James Raynard <jraynard@FreeBSD.org>
-        Geoff Rehmet <csgr@FreeBSD.org>
-        Martin Renters <martin@FreeBSD.org>
-        Paul Richards <paul@FreeBSD.org>
-        Ollivier Robert <roberto@FreeBSD.org>
-        Chuck Robey <chuckr@FreeBSD.org>
-        Dima Ruban <dima@FreeBSD.org>
-        Wolfram Schneider <wosch@FreeBSD.org>
-        Andreas Schulz <ats@FreeBSD.org>
-        Karl Strickland <karl@FreeBSD.org>
-        Michael Smith <msmith@FreeBSD.org>
-        Paul Traina <pst@FreeBSD.org>
-        Guido van Rooij <guido@FreeBSD.org>
-        Steven Wallace <swallace@FreeBSD.org>
-        Nate Williams <nate@FreeBSD.org>
-        Jean-Marc Zucconi <jmz@FreeBSD.org>
+hard to bring you this release.  For a complete list of FreeBSD
+project staffers, please see:
 
+        http://www.freebsd.org/handbook/staff.html
+
+or, if you've loaded the doc distribution:
+
+        file:/usr/share/doc/handbook/staff.html
 
 Additional FreeBSD helpers and beta testers:
 
@@ -545,6 +389,4 @@ Special mention to:
 
 We sincerely hope you enjoy this release of FreeBSD!
 
-                        The FreeBSD Core Team
-
-$FreeBSD$
+                        The FreeBSD Project