Merge some doc updates which got only into the 3.0 branch during the last

release cycle.

11 files changed, 30 insertions, 104 deletions

diff --git a/release/sysinstall/help/configure.hlp b/release/sysinstall/help/configure.hlp
index 915172d..65be877 100644
--- a/release/sysinstall/help/configure.hlp
+++ b/release/sysinstall/help/configure.hlp
@@ -7,4 +7,4 @@ the Packages item in this menu.
 
 For setting the timezone after the system is installed, type
 ``tzsetup''.  For more information on the overall general system
-configuration, see the ``/etc/rc.conf'' file.
+configuration, see the ``/etc/defaults/rc.conf'' file.
diff --git a/release/sysinstall/help/distributions.hlp b/release/sysinstall/help/distributions.hlp
index 4ddb149..e0c91dc 100644
--- a/release/sysinstall/help/distributions.hlp
+++ b/release/sysinstall/help/distributions.hlp
@@ -2,7 +2,7 @@ DISTRIBUTION INFORMATION
 ------------------------
 
 An ``X-'' prefixed before a distribution set means that the XFree86
-3.3.3 base distribution, libraries, manual pages, SVGA server and a
+3.3.3.1 base distribution, libraries, manual pages, SVGA server 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
@@ -23,14 +23,15 @@ Kern-Developer: As above, 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 and 2.1.x compatibility sets.
+                the FreeBSD 1.x, 2.0, 2.1.x and 2.2.x compatibility sets.
 
 Minimal:        Only the base distribution.
 
 Everything:     The base distribution, man pages, dictionary files,
-                profiling libraries, the FreeBSD 1.x and the FreeBSD 2.0
-                compatibility libraries, the complete source tree,
-                games and your choice of XFree86 distribution components.
+                profiling libraries, the FreeBSD compatibility libraries,
+                the complete source tree, games and your choice of XFree86
+                distribution components.
+
                 Note that the cryptography source code is NOT included
                 in this collection.  You will need to select that by
                 hand if you're inside the United States.
diff --git a/release/sysinstall/help/partition.hlp b/release/sysinstall/help/partition.hlp
index 37520bf..6004d75 100644
--- a/release/sysinstall/help/partition.hlp
+++ b/release/sysinstall/help/partition.hlp
@@ -97,31 +97,6 @@ parts.  Take a typical name like ``/dev/da0s1a'':
               da0s1b          <swap space>
               da0s1e          /usr
 
-      Because of historical convention, there is also a short-cut,
-      or "compatibility slice", that is maintained for easy access
-      to the *first* FreeBSD slice on a disk.  This gives some
-      backwards compatibility to utilities that still may not know
-      how to deal with the new slice scheme.
-
-      The compatibility slice names for our filesystem above would
-      also look like:
-
-              Name            Mountpoint
-              ----            ----------
-              da0a            /
-              da0b            <swap space>
-              da0e            /usr
-
-      Again, let it be noted: FreeBSD automatically maps the
-      compatibility slice to the first FreeBSD slice it finds
-      (in this case, da0s1).  You may have multiple FreeBSD slices on a
-      drive, but only the first one will be mapped to the compatibility
-      slice!
-
-      The compatibility slice has essentially been phased out, but
-      it's important to be aware of when looking at or upgrading
-      older systems.
-
 Once you understand all this, then the purpose of the label editor
 becomes fairly clear:  You're carving up the FreeBSD slices displayed
 at the top of the screen into smaller pieces, which are displayed in
@@ -141,4 +116,3 @@ Install menu or (W)rite directly from this one.  You're working with
 what is essentially a copy of the disk label(s), both here and in the
 FDISK Partition Editor, and the actual on-disk labels won't be
 affected by any changes you make until you explicitly say so.
-
diff --git a/release/sysinstall/help/usermgmt.hlp b/release/sysinstall/help/usermgmt.hlp
index 8a2664d..d0819fe 100644
--- a/release/sysinstall/help/usermgmt.hlp
+++ b/release/sysinstall/help/usermgmt.hlp
@@ -39,11 +39,11 @@ unimplemented, sorry.)
 Users
 =====
 
-The user's login ID is a short (8 characters) alphanumeric ID 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).
+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
+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).
 
 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
diff --git a/release/sysinstall/kget.c b/release/sysinstall/kget.c
index 7dc207c..b3cc55e 100644
--- a/release/sysinstall/kget.c
+++ b/release/sysinstall/kget.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kget.c,v 1.2 1999/02/15 07:07:37 jkh Exp $
+ * $Id: kget.c,v 1.3 1999/02/16 01:58:04 jkh Exp $
  */
 
 #include "sysinstall.h"
@@ -101,7 +101,8 @@ kget(char *out)
     /* Now, print the changes to PnP override table */
     i = sysctlbyname(mib2, NULL, &len, NULL, NULL);
     if (i) {
-	msgDebug("kget: error sizing buffer\n");
+	/* Possibly our kernel doesn't support PnP. Ignore the error. */
+	msgDebug("kget: can't get PnP data - skipping...\n");
 	goto bail;
     }
     buf = (char *)malloc(len * sizeof(char));
diff --git a/usr.sbin/sade/help/partition.hlp b/usr.sbin/sade/help/partition.hlp
index 37520bf..6004d75 100644
--- a/usr.sbin/sade/help/partition.hlp
+++ b/usr.sbin/sade/help/partition.hlp
@@ -97,31 +97,6 @@ parts.  Take a typical name like ``/dev/da0s1a'':
               da0s1b          <swap space>
               da0s1e          /usr
 
-      Because of historical convention, there is also a short-cut,
-      or "compatibility slice", that is maintained for easy access
-      to the *first* FreeBSD slice on a disk.  This gives some
-      backwards compatibility to utilities that still may not know
-      how to deal with the new slice scheme.
-
-      The compatibility slice names for our filesystem above would
-      also look like:
-
-              Name            Mountpoint
-              ----            ----------
-              da0a            /
-              da0b            <swap space>
-              da0e            /usr
-
-      Again, let it be noted: FreeBSD automatically maps the
-      compatibility slice to the first FreeBSD slice it finds
-      (in this case, da0s1).  You may have multiple FreeBSD slices on a
-      drive, but only the first one will be mapped to the compatibility
-      slice!
-
-      The compatibility slice has essentially been phased out, but
-      it's important to be aware of when looking at or upgrading
-      older systems.
-
 Once you understand all this, then the purpose of the label editor
 becomes fairly clear:  You're carving up the FreeBSD slices displayed
 at the top of the screen into smaller pieces, which are displayed in
@@ -141,4 +116,3 @@ Install menu or (W)rite directly from this one.  You're working with
 what is essentially a copy of the disk label(s), both here and in the
 FDISK Partition Editor, and the actual on-disk labels won't be
 affected by any changes you make until you explicitly say so.
-
diff --git a/usr.sbin/sysinstall/help/configure.hlp b/usr.sbin/sysinstall/help/configure.hlp
index 915172d..65be877 100644
--- a/usr.sbin/sysinstall/help/configure.hlp
+++ b/usr.sbin/sysinstall/help/configure.hlp
@@ -7,4 +7,4 @@ the Packages item in this menu.
 
 For setting the timezone after the system is installed, type
 ``tzsetup''.  For more information on the overall general system
-configuration, see the ``/etc/rc.conf'' file.
+configuration, see the ``/etc/defaults/rc.conf'' file.
diff --git a/usr.sbin/sysinstall/help/distributions.hlp b/usr.sbin/sysinstall/help/distributions.hlp
index 4ddb149..e0c91dc 100644
--- a/usr.sbin/sysinstall/help/distributions.hlp
+++ b/usr.sbin/sysinstall/help/distributions.hlp
@@ -2,7 +2,7 @@ DISTRIBUTION INFORMATION
 ------------------------
 
 An ``X-'' prefixed before a distribution set means that the XFree86
-3.3.3 base distribution, libraries, manual pages, SVGA server and a
+3.3.3.1 base distribution, libraries, manual pages, SVGA server 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
@@ -23,14 +23,15 @@ Kern-Developer: As above, 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 and 2.1.x compatibility sets.
+                the FreeBSD 1.x, 2.0, 2.1.x and 2.2.x compatibility sets.
 
 Minimal:        Only the base distribution.
 
 Everything:     The base distribution, man pages, dictionary files,
-                profiling libraries, the FreeBSD 1.x and the FreeBSD 2.0
-                compatibility libraries, the complete source tree,
-                games and your choice of XFree86 distribution components.
+                profiling libraries, the FreeBSD compatibility libraries,
+                the complete source tree, games and your choice of XFree86
+                distribution components.
+
                 Note that the cryptography source code is NOT included
                 in this collection.  You will need to select that by
                 hand if you're inside the United States.
diff --git a/usr.sbin/sysinstall/help/partition.hlp b/usr.sbin/sysinstall/help/partition.hlp
index 37520bf..6004d75 100644
--- a/usr.sbin/sysinstall/help/partition.hlp
+++ b/usr.sbin/sysinstall/help/partition.hlp
@@ -97,31 +97,6 @@ parts.  Take a typical name like ``/dev/da0s1a'':
               da0s1b          <swap space>
               da0s1e          /usr
 
-      Because of historical convention, there is also a short-cut,
-      or "compatibility slice", that is maintained for easy access
-      to the *first* FreeBSD slice on a disk.  This gives some
-      backwards compatibility to utilities that still may not know
-      how to deal with the new slice scheme.
-
-      The compatibility slice names for our filesystem above would
-      also look like:
-
-              Name            Mountpoint
-              ----            ----------
-              da0a            /
-              da0b            <swap space>
-              da0e            /usr
-
-      Again, let it be noted: FreeBSD automatically maps the
-      compatibility slice to the first FreeBSD slice it finds
-      (in this case, da0s1).  You may have multiple FreeBSD slices on a
-      drive, but only the first one will be mapped to the compatibility
-      slice!
-
-      The compatibility slice has essentially been phased out, but
-      it's important to be aware of when looking at or upgrading
-      older systems.
-
 Once you understand all this, then the purpose of the label editor
 becomes fairly clear:  You're carving up the FreeBSD slices displayed
 at the top of the screen into smaller pieces, which are displayed in
@@ -141,4 +116,3 @@ Install menu or (W)rite directly from this one.  You're working with
 what is essentially a copy of the disk label(s), both here and in the
 FDISK Partition Editor, and the actual on-disk labels won't be
 affected by any changes you make until you explicitly say so.
-
diff --git a/usr.sbin/sysinstall/help/usermgmt.hlp b/usr.sbin/sysinstall/help/usermgmt.hlp
index 8a2664d..d0819fe 100644
--- a/usr.sbin/sysinstall/help/usermgmt.hlp
+++ b/usr.sbin/sysinstall/help/usermgmt.hlp
@@ -39,11 +39,11 @@ unimplemented, sorry.)
 Users
 =====
 
-The user's login ID is a short (8 characters) alphanumeric ID 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).
+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
+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).
 
 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
diff --git a/usr.sbin/sysinstall/kget.c b/usr.sbin/sysinstall/kget.c
index 7dc207c..b3cc55e 100644
--- a/usr.sbin/sysinstall/kget.c
+++ b/usr.sbin/sysinstall/kget.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kget.c,v 1.2 1999/02/15 07:07:37 jkh Exp $
+ * $Id: kget.c,v 1.3 1999/02/16 01:58:04 jkh Exp $
  */
 
 #include "sysinstall.h"
@@ -101,7 +101,8 @@ kget(char *out)
     /* Now, print the changes to PnP override table */
     i = sysctlbyname(mib2, NULL, &len, NULL, NULL);
     if (i) {
-	msgDebug("kget: error sizing buffer\n");
+	/* Possibly our kernel doesn't support PnP. Ignore the error. */
+	msgDebug("kget: can't get PnP data - skipping...\n");
 	goto bail;
     }
     buf = (char *)malloc(len * sizeof(char));