Bring these files somewhat into the present.

Perform some rewording while here.

Remove register.hlp, since the code that deals with it was removed
nearly 7 years ago.

14 files changed, 126 insertions, 149 deletions

diff --git a/usr.sbin/sade/help/partition.hlp b/usr.sbin/sade/help/partition.hlp
index 1d62148..3d13b34 100644
--- a/usr.sbin/sade/help/partition.hlp
+++ b/usr.sbin/sade/help/partition.hlp
@@ -29,10 +29,10 @@ filesystems:
         ----    -------                 ---------       ---------
         /       Root filesystem         118MB           No
         swap    Swap space              2 * MEM         No
-        /usr    System & user files     80MB or more    Yes
+        /usr    System & user files     128MB or more   Yes
 
 Note: If you do not create a /usr filesystem then your / filesystem
-will need to be bigger - at least 200MB.  This is not recommended as
+will need to be bigger - at least 240MB.  This is not recommended as
 any media errors that may occur during disk I/O to user files will
 corrupt the filesystem containing vital system files as well.  It is
 for this reason that / is generally kept on its own filesystem, where
diff --git a/usr.sbin/sade/help/slice.hlp b/usr.sbin/sade/help/slice.hlp
index b6f6a83..3a55f65 100644
--- a/usr.sbin/sade/help/slice.hlp
+++ b/usr.sbin/sade/help/slice.hlp
@@ -43,14 +43,8 @@ FreeBSD server or workstation, not a typical `home PC'.
 The flags field has the following legend:
 
         '='  -- This slice is properly aligned.
-        '>'  -- This slice doesn't end before cylinder 1024
-        'R'  -- This slice contains the root (/) filesystem
-        'B'  -- Slice employs BAD144 bad-spot handling
-        'C'  -- This is the FreeBSD 2.0-compatibility slice (default)
         'A'  -- This slice is marked active.
-
-If you select a slice for Bad144 handling, it will be scanned
-for bad blocks before any new filesystems are made on it.
+        'R'  -- This slice contains the root (/) filesystem
 
 If no slice is marked Active, you will need to either install
 a Boot Manager (the option for which will be presented later in the
diff --git a/usr.sbin/sysinstall/help/anonftp.hlp b/usr.sbin/sysinstall/help/anonftp.hlp
index e90985e..a85b8aa 100644
--- a/usr.sbin/sysinstall/help/anonftp.hlp
+++ b/usr.sbin/sysinstall/help/anonftp.hlp
@@ -17,3 +17,5 @@ FTP Root Directory:
 Upload subdirectory:
 
         Where files uploaded by anonymous FTP users will go.
+        If you do not wish to allow anonymous uploads, then this
+        field should be blank - note that this is not the default!
diff --git a/usr.sbin/sysinstall/help/distributions.hlp b/usr.sbin/sysinstall/help/distributions.hlp
index b6bae5c..f78262a 100644
--- a/usr.sbin/sysinstall/help/distributions.hlp
+++ b/usr.sbin/sysinstall/help/distributions.hlp
@@ -1,8 +1,8 @@
 DISTRIBUTION INFORMATION
 ------------------------
 
-An ``X-'' prefixed before a distribution set means that the XFree86
-base distribution, libraries, manual pages, SVGA server and a set
+An ``X-'' prefixed before a distribution set means that the Xorg
+base distribution, libraries, manual pages, servers 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
@@ -13,22 +13,21 @@ item before leaving the menu.
 
 The current "canned" installations are provided:
 
+All:            The base distribution, man pages, dictionary files,
+                profiling libraries, the FreeBSD compatibility libraries,
+                the complete source tree, games and your choice of XFree86
+                distribution components.
+
 Developer:      Base ("bin") distribution, man pages, dictionary
                 files, profiling libraries and the complete source tree.
 
-Kern-Developer: As above, but with only kernel sources instead of
+Kern-Developer: As Developer, but with only kernel sources instead of
                 the complete source tree.
 
-User:           The base distribution, man pages, dictionary files and
-                the FreeBSD 1.x, 2.0, 2.1.x, 2.2.x and 3.x compatibility sets.
+User:           The base distribution, man pages, and dictionary files.
 
 Minimal:        Only the base distribution.
 
-Everything:     The base distribution, man pages, dictionary files,
-                profiling libraries, the FreeBSD compatibility libraries,
-                the complete source tree, games and your choice of XFree86
-                distribution components.
-
 Custom:         Allows you to create or modify your distribution set on
                 a piece-by-piece basis.
 
diff --git a/usr.sbin/sysinstall/help/fixit.hlp b/usr.sbin/sysinstall/help/fixit.hlp
index e47394e..5f37da1 100644
--- a/usr.sbin/sysinstall/help/fixit.hlp
+++ b/usr.sbin/sysinstall/help/fixit.hlp
@@ -1,7 +1,3 @@
 A special shell will be launched by this option with a fixit floppy
 (or 2nd CDROM) mounted as /mnt2.  This provides access to extra
-commands under /mnt2 as well as a more complete set of device files in
-/mnt2/dev.  Some device operations, like fsck and disklabel, may
-therefore require you to go to /mnt2/dev and use the entries there
-rather than assuming that they will be present in the default /dev
-(which came from the boot floppy and is very minimal).
+commands under /mnt2.
diff --git a/usr.sbin/sysinstall/help/html.hlp b/usr.sbin/sysinstall/help/html.hlp
index e6f22c4..c12f82c 100644
--- a/usr.sbin/sysinstall/help/html.hlp
+++ b/usr.sbin/sysinstall/help/html.hlp
@@ -4,7 +4,7 @@ resources such as the FreeBSD Handbook & FreeBSD FAQ
 
      file:/usr/share/doc/
 
-If you've loaded the doc distribution.
+if you've loaded the doc distribution.
 
 The default browser package used is links (a text based
 browser which can render tables), which will be
diff --git a/usr.sbin/sysinstall/help/options.hlp b/usr.sbin/sysinstall/help/options.hlp
index 1f32172..0896845 100644
--- a/usr.sbin/sysinstall/help/options.hlp
+++ b/usr.sbin/sysinstall/help/options.hlp
@@ -15,6 +15,20 @@ NFS Slow:     User is using a slow PC or Ethernet card
     the PC from becoming swamped with data.
 
 
+NFS TCP:      Use TCP for the NFS mount
+
+    This option can be used if your NFS server supports TCP
+    connections; not all do!  This may be useful if your NFS server
+    is at a remote site in which case it may offer some additional
+    stability.
+
+
+NFS version 3:   Use NFS version 3
+
+    This option forces the use of NFS version 3 and is on by default.
+    If your NFS server only supports NFS version 2, disable this option.
+
+
 Debugging:    Turn on the extra debugging flag
 
     This turns on a lot of extra noise over on the second screen
@@ -25,6 +39,14 @@ Debugging:    Turn on the extra debugging flag
     the developers in tracking such problems down!
 
 
+No Warnings:  Disable some warnings
+
+    This flag tells sysinstall, and particularly the disk editing
+    routines, that you consider yourself to know what you are
+    doing and disables various warning.  It is not recommended that
+    you enable this option.
+
+
 Yes To All:   Assume "Yes" answers to all non-critical dialogs
 
     This flag should be used with caution.  It will essentially
@@ -34,25 +56,26 @@ Yes To All:   Assume "Yes" answers to all non-critical dialogs
     installs.
 
 
-FTP username:  Specify username and password instead of anonymous.
+DHCP:         Enable DHCP configuration of interfaces
 
-    By default, the installation attempts to log in as the
-    anonymous user.  If you wish to log in as someone else,
-    specify the username and password with this option.
+    This option specifies whether DHCP configuration of interfaces
+    may be attempted.  The default setting is to interactively ask
+    the user.
 
 
-Install Root:  Specify some directory other than / as your "root".
+IPv6:         Enable IPv6 router solicitation configuration
 
-    This should be left as / unless you have a really good reason to
-    change it.  One good reason might be if you were installing to a
-    disk other than your own, as might happen if you needed to prepare a
-    disk for another machine which couldn't load FreeBSD directly
-    for some reason.
+    This option specifies whether automatic configuration of IPv6
+    interfaces may be attempted.  This uses the router solicitation
+    method of automatic configuration.  The default setting is to
+    interactively ask the user.
 
-    Note:  If you set this option, you will only be able to install
-    packages if the bin distribution is also installed (usually
-    the case anyway) since /usr/sbin/pkg_add will otherwise not be
-    found after the chroot() call.
+
+FTP username:  Specify username and password instead of anonymous.
+
+    By default, the installation attempts to log in as the
+    anonymous user.  If you wish to log in as someone else,
+    specify the username and password with this option.
 
 
 Editor:  Specify which screen editor to use.
@@ -91,6 +114,20 @@ Release Name:  Which release to attempt to load from installation media.
     with an older release (say, on CDROM).
 
 
+Install Root:  Specify some directory other than / as your "root".
+
+    This should be left as / unless you have a really good reason to
+    change it.  One good reason might be if you were installing to a
+    disk other than your own, as might happen if you needed to prepare a
+    disk for another machine which couldn't load FreeBSD directly
+    for some reason.
+
+    Note:  If you set this option, you will only be able to install
+    packages if the bin distribution is also installed (usually
+    the case anyway) since /usr/sbin/pkg_add will otherwise not be
+    found after the chroot() call.
+
+
 Browser Package:  Which package to load for an HTML browser.
 
     By default, this is set to links but may also be set to any other
@@ -101,7 +138,7 @@ Browser Package:  Which package to load for an HTML browser.
 
 Browser Exec:  Which binary to run for the HTML browser.
 
-    The full pathname to the main executable in Browser Package
+    The full pathname to the main executable in Browser Package.
 
 
 Media Type:   Which media type is being used.
@@ -114,9 +151,29 @@ Media Type:   Which media type is being used.
 Package Temp:  Where package temporary files should go
 
    Some packages, like emacs, can use a LOT of temporary space - up to
-   20 or 30MB.  If you are going to configure a small / directory (and
-   hence a small /tmp) then you may wish to set this to point at another
-   location (say, /usr/tmp).
+   20 or 30MB.  If you are going to configure a small / directory and no
+   seperate /var (and hence a small /var/tmp), then you may wish to set
+   this to point at another location (say, /usr/tmp).
+
+
+Newfs Args:    Specify default arguments to newfs(8)
+
+   The default parameters used to build new filesystems.
+   If you will be running a service that creates millions of small
+   files or need to specify different default parameters for any
+   other reason, you may do so here.
+
+
+Fixit Console: The location of the fixit console
+
+    Specifies where sysinstall should start the fixit shell for
+    interactive repair.  Valid arguments are "serial" for a serial
+    port, or "standard" for VTY4.
+
+
+Re-scan Devices:  
+
+   Reprobe the system for devices.
 
 
 Use Defaults:  Use default values.
diff --git a/usr.sbin/sysinstall/help/partition.hlp b/usr.sbin/sysinstall/help/partition.hlp
index 1d62148..3d13b34 100644
--- a/usr.sbin/sysinstall/help/partition.hlp
+++ b/usr.sbin/sysinstall/help/partition.hlp
@@ -29,10 +29,10 @@ filesystems:
         ----    -------                 ---------       ---------
         /       Root filesystem         118MB           No
         swap    Swap space              2 * MEM         No
-        /usr    System & user files     80MB or more    Yes
+        /usr    System & user files     128MB or more   Yes
 
 Note: If you do not create a /usr filesystem then your / filesystem
-will need to be bigger - at least 200MB.  This is not recommended as
+will need to be bigger - at least 240MB.  This is not recommended as
 any media errors that may occur during disk I/O to user files will
 corrupt the filesystem containing vital system files as well.  It is
 for this reason that / is generally kept on its own filesystem, where
diff --git a/usr.sbin/sysinstall/help/register.hlp b/usr.sbin/sysinstall/help/register.hlp
deleted file mode 100644
index 811f71d..0000000
--- a/usr.sbin/sysinstall/help/register.hlp
+++ /dev/null
@@ -1,76 +0,0 @@
-This screen allows you to register yourself with the FreeBSD Project's
-user counter & statistics database.
-
-** IT IS VERY IMPORTANT THAT YOU DO THIS! **
-
-Believe me, I hate filling out forms as much as anyone, and most
-people's understandable reaction to a registration form is to say "Eh,
-what's this?  They want to send me junk mail and then on top of that
-they expect me to go to *extra* trouble in order to make it easy for
-them?!  Forget it!"
-
-This is not that kind of registration, and I strongly urge you to take
-just a few minutes to read this and find out how much the simple act
-of registering can help both you and FreeBSD.
-
-1. It is very much in your best interest, as a FreeBSD user, to stand
-   up and be counted so that various software vendors will begin to
-   take you and your operating system seriously.  There are numerous
-   ISVs (Independent Software Vendors) who would be only too happy
-   to port the kinds of applications that many FreeBSD users are
-   currently screaming for (everything from spreadsheets and word
-   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 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.
-
-
-2. We will not send you *anything* you do not ask for.  Some people
-   are genuinely interested in new product announcements for FreeBSD
-   or want to hear about security issues & other important advisories
-   as they come up, and for such people we've added registration
-   options for selecting various types of additional material they
-   might be interested in receiving as a side-effect of registration.
-
-   The default behavior is to NOT put the user on any special mailing
-   lists or provide their names in mailing list data sent to
-   (carefully screened) FreeBSD product advertisers - all of that must
-   be specifically requested during the registration.
-
-Most fields in the form are fairly self-explanatory.  At the minimum,
-you should enter your first and last name as well as your email
-address so that we can weed obvious duplicates from the counter.  You
-will NOT be sent any mail at this address unless you also sign up for
-one of the additional notification services, and it's only used to
-provide us with a way of differentiating "John Smith <smith@foo.org>"
-from "John Smith <jsm@bar.com>" in the simple, no-frills registration
-case.  If you do not have an email address, some sort of postal
-address will serve the same purpose.
-
-If you also wish to receive the FreeBSD Newsletter, published and
-distributed free of charge by Walnut Creek CDROM in printed form,
-then you must specify some sort of postal address.  Likewise, if you
-elect to receive notification on the email version then you should
-specify a valid Email address.  Back-issues of the FreeBSD newsletter
-are available at ftp://ftp.freebsd.org/pub/FreeBSD/doc/newsletter/ .
-
-Should you wish to unsubscribe to the FreeBSD Newsletter or otherwise
-de-register yourself at a later time, you can simply send mail to
-register-request@freebsd.org.  If you subscribe to the announce
-mailing list (and it's a good idea) then you can modify your
-subscription at any time by sending mail to majordomo@freebsd.org
-
-
-Your cooperation with this new registration service is greatly
-appreciated, and by taking just 5 minutes to fill this out now you
-will be helping us to gather data which will greatly assist FreeBSD in
-firmly establishing a position as a serious UN*X operating system
-contender.
-
-Regards,
-
-                                Jordan Hubbard,
-                                FreeBSD PR Officer
diff --git a/usr.sbin/sysinstall/help/securelevel.hlp b/usr.sbin/sysinstall/help/securelevel.hlp
index c0964e4..06910d5 100644
--- a/usr.sbin/sysinstall/help/securelevel.hlp
+++ b/usr.sbin/sysinstall/help/securelevel.hlp
@@ -3,7 +3,7 @@ This menu allows you to configure the Securelevel mechanism in FreeBSD.
 Securelevels may be used to limit the privileges assigned to the
 root user in multi-user mode, which in turn may limit the effects of
 a root compromise, at the cost of reducing administrative functions.
-Refer to the init(8) manual page for complete details.
+Refer to the security(7) manual page for complete details.
 
    -1    Permanently insecure mode - always run the system in level 0
          mode.  This is the default initial value.
@@ -21,7 +21,7 @@ Refer to the init(8) manual page for complete details.
          be opened for writing (except by mount(2)) whether mounted or
          not.  This level precludes tampering with file systems by
          unmounting them, but also inhibits running newfs(8) while the
-         system is multi- user.
+         system is multi-user.
 
          In addition, kernel time changes are restricted to less than
          or equal to one second.  Attempts to change the time by more
diff --git a/usr.sbin/sysinstall/help/shortcuts.hlp b/usr.sbin/sysinstall/help/shortcuts.hlp
index 8964ead..0054394 100644
--- a/usr.sbin/sysinstall/help/shortcuts.hlp
+++ b/usr.sbin/sysinstall/help/shortcuts.hlp
@@ -1,11 +1,11 @@
-/stand/sysinstall now supports command-line "shortcuts" which can
+sysinstall now supports command-line "shortcuts" which can
 often replace outdated commands, like pkg_manage.  Multiple commands
 can be invoked in sequence, and variables may be set on-the-fly to
 customize the installation program's behavior in various ways.
 
 Syntax:
 
-/stand/sysinstall [var=value ..] [command ..]
+/usr/sbin/sysinstall [var=value ..] [command ..]
 
 Where "var" can be one or more of:
 
@@ -15,7 +15,7 @@ browserBinary           Which doc browser to use (default: links)
 browserPackage          Which package to get browser from (default: links)
 cpioVerbose             How verbose to be with cpio: high, medium or low
 debug                   Extra debugging?
-disk                    Which disk to operate on (wd0, da0, etc).
+disk                    Which disk to operate on (ad0, da0, etc).
 domainname              Domain name
 editor                  Which screen editor to use
 ifconfig_<iface>        For each <iface> in network_devices
@@ -59,9 +59,12 @@ And "command" can be one or more of:
 addUser                 Add a new user to the system
 addGroup                Add a new group to the system
 configAnonFTP           Configure system for anonymous FTP
-configGated             Configure and install gated
+configInetd             Configure the inetd super-server
 configNFSServer         Configure host as an NFS server
+configNTP               Configure host as an NTP client
 configPackages          Browse / install packages
+configRouter            Configure a routing daemon
+configUsers             Add users and/or groups to the system
 diskPartitionEditor     Partition a new or existing disk
 diskPartitionWrite      Write out any changed partition information
 diskLabelEditor         Label/Newfs/Mount new or existing filesystems
@@ -81,34 +84,34 @@ distExtractAll          Extract all selected distributions
 docBrowser              Browse documentation
 installCommit           Commit any pending installation operations
 installExpress          Express installation
+installStandard         Standard installation
 installUpgrade          Upgrade installation
-installFixup            Go into "fixit" mode
 mediaSetCDROM           Select CDROM media
 mediaSetFloppy          Select floppy media
 mediaSetDOS             Select DOS media
-mediaSetTape            Select tape media
 mediaSetFTP             Select FTP media
 mediaSetFTPPassive      Select FTP media in passive mode
-mediaSetUFS             Select UFS media
 mediaSetNFS             Select NFS media
-mediaSetFtpUserPass     Prompt for FTP username and password
+mediaSetTape            Select tape media
+mediaSetUFS             Select UFS media
+mediaSetFTPUserPass     Prompt for FTP username and password
 mediaSetCPIOVerbosity   Prompt for CPIO verbosity
 mediaGetType            Prompt for media type
 optionsEditor           Go to options editor
-register                Go to registration editor.
+tcpMenuSelect           Configure TCP/IP networking
 
 Examples:
 
-/stand/sysinstall       mediaSetFTP configPackages
+/usr/sbin/sysinstall       mediaSetFTP configPackages
 
 Selects an FTP site and then goes to the package configuration menu.
 
 
-/stand/sysinstall       disk=da0 diskPartitionEditor
+/usr/sbin/sysinstall       disk=da0 diskPartitionEditor
 
 Invokes the disk partition editor on disk da0.
 
 
-If /stand/sysinstall is linked to another filename, say
+If /usr/sbin/sysinstall is linked to another filename, say
 `/usr/local/bin/configPackages', then the basename will be used
 as an implicit command name.
diff --git a/usr.sbin/sysinstall/help/slice.hlp b/usr.sbin/sysinstall/help/slice.hlp
index b6f6a83..3a55f65 100644
--- a/usr.sbin/sysinstall/help/slice.hlp
+++ b/usr.sbin/sysinstall/help/slice.hlp
@@ -43,14 +43,8 @@ FreeBSD server or workstation, not a typical `home PC'.
 The flags field has the following legend:
 
         '='  -- This slice is properly aligned.
-        '>'  -- This slice doesn't end before cylinder 1024
-        'R'  -- This slice contains the root (/) filesystem
-        'B'  -- Slice employs BAD144 bad-spot handling
-        'C'  -- This is the FreeBSD 2.0-compatibility slice (default)
         'A'  -- This slice is marked active.
-
-If you select a slice for Bad144 handling, it will be scanned
-for bad blocks before any new filesystems are made on it.
+        'R'  -- This slice contains the root (/) filesystem
 
 If no slice is marked Active, you will need to either install
 a Boot Manager (the option for which will be presented later in the
diff --git a/usr.sbin/sysinstall/help/tcp.hlp b/usr.sbin/sysinstall/help/tcp.hlp
index d79cf27..4c86198 100644
--- a/usr.sbin/sysinstall/help/tcp.hlp
+++ b/usr.sbin/sysinstall/help/tcp.hlp
@@ -15,20 +15,28 @@ Basically, the standard EMACS motion sequences.
 The "Extra options to ifconfig" field is kind of special (read: a
 hack :-):
 
+Any valid options to ifconfig can be specified here, so if you need
+to do something "special" to get your interface working, then here
+is the place to do it.
+
 If you're running SLIP or PLIP, you also need to use it for specifying
 the remote end of the link (simply type the foreign IP address in).
 In the specific case where you're running PLIP with a Linux host peer
 rather than a FreeBSD one, you also must add the "-link0" flag after the
 foreign address.
 
-
 If you're dealing with an ethernet adaptor with multiple media
 connectors (e.g. AUI, 10BT, 10B2, etc), you can use this field to
-specify which one to use.  The following strings are recognized:
+specify which one to use.  Examples of valid strings include:
 
         "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.
 
+If you have a wireless interface and must specify arguments such as a
+WEP key here, you may use something like:
+
+	"wepmode on wepkey 0xFEEDFACE"
+
 When you're done with this form, select OK.
diff --git a/usr.sbin/sysinstall/help/usermgmt.hlp b/usr.sbin/sysinstall/help/usermgmt.hlp
index d0819fe..fbd7cac 100644
--- a/usr.sbin/sysinstall/help/usermgmt.hlp
+++ b/usr.sbin/sysinstall/help/usermgmt.hlp
@@ -26,7 +26,7 @@ permissions for users that belong to the same group.  Several group
 names are already used for system files.
 
 The numerical user or group IDs are often nothing you want to care for
-explicitly.  If you don't fill in these fields, the system will chose
+explicitly.  If you don't fill in these fields, the system will choose
 reasonable defaults.  However, these numbers (rather than the
 associated names) are what the operating system actually uses to
 distinguish users and groups -- hence they should normally be unique
@@ -40,14 +40,14 @@ Users
 =====
 
 The user's login ID is a short (up to 15 characters) alphanumeric ID
-the user must enter when logging into the system.  It's often the
+that the user must enter when logging into the system.  It's often the
 initial letters of the user's name, and commonly used in lower case.
 It's also the local mail name for this user (though it's possible to
-also setup more descriptive mail alias names later).
+also set up more descriptive mail alias names later).
 
 The user's login group determines which group access rights the user
 will initially get when logging in.  If an additional list of groups is
-provided where the user will become a member of, (s)he will also be
+provided which the user will become a member of, (s)he will also be
 able to access files of those groups later without providing any
 additional password etc.  Except for the "wheel" case mentioned below,
 the additional group membership list should normally not contain the
@@ -68,7 +68,7 @@ in the very first place. :)
 Also, members of group "operator" will by default get permissions for
 minor administrative operations, like performing system backups, or
 shutting down the system -- without first becoming superuser!  So,
-take care with adding people to this group.
+take care when adding people to this group.
 
 The ``full name'' field serves as a comment only.  It is also used by
 mail front ends to determine the real name of the user, hence you