Fix various bogons reported in this PR.

PR:		4765
Submitted by:	fdiv

6 files changed, 20 insertions, 11 deletions

diff --git a/release/sysinstall/help/hardware.hlp b/release/sysinstall/help/hardware.hlp
index 8c4a89e..a9c5d51 100644
--- a/release/sysinstall/help/hardware.hlp
+++ b/release/sysinstall/help/hardware.hlp
@@ -1,4 +1,4 @@
-Hardware Documentation Guide:  $Id: hardware.hlp,v 1.27 1997/05/21 18:49:34 nate Exp $
+Hardware Documentation Guide:  $Id: hardware.hlp,v 1.28 1997/08/30 10:42:21 helbig Exp $
 
 Contents last changed:  Jan 14th, 1997
 
@@ -232,8 +232,9 @@ when the field is active.
 
 To finish configuring a driver, press 'Q'.
 
-Note that PCI and EISA devices can be probed reliably, therefore are
-not shown in the table above, nor can be changed using UserConfig.
+Note that PCI and EISA devices can be probed reliably, therefore they
+are not shown in the table above nor can their settings be changed
+using UserConfig.
 
 
 3.      LINT - other possible configurations
diff --git a/release/sysinstall/help/relnotes.hlp b/release/sysinstall/help/relnotes.hlp
index 2a3d647..fac806e0 100644
--- a/release/sysinstall/help/relnotes.hlp
+++ b/release/sysinstall/help/relnotes.hlp
@@ -12,6 +12,13 @@ For information about FreeBSD and the layout of the 3.0-SNAPSHOT release
 directory (especially if you're installing from floppies!), see ABOUT.TXT.
 For installation instructions, see the INSTALL.TXT and HARDWARE.TXT files.
 
+And for the latest 3.0-current (HEAD branch) snapshot releases,
+please install from:
+
+        ftp://current.freebsd.org/pub/FreeBSD
+
+Many many bugs fixed and security enhancements made.
+
 
 1. What's new since 2.2.X-RELEASE
 ------------------------------------
@@ -304,7 +311,7 @@ The following CD-ROM type systems are supported at this time:
 (matcd) Matsushita/Panasonic (Creative SoundBlaster) proprietary
         interface (562/563 models)
 (scd)   Sony proprietary interface (all models)
-(wcd)   ATAPI IDE interface (should be considered BETA quality).
+(wcd)   ATAPI IDE interface
 
 
 Unmaintained drivers, they might or might not work for your hardware:
diff --git a/release/sysinstall/help/tcp.hlp b/release/sysinstall/help/tcp.hlp
index 05fe118..9faa797 100644
--- a/release/sysinstall/help/tcp.hlp
+++ b/release/sysinstall/help/tcp.hlp
@@ -4,7 +4,7 @@ given interface (which was selected from the menu before this screen).
 
 PLIP/SLIP users - please read through to the end of this doc!
 
-You can move through the fields with the TAB, BACK-TAB and RETURN
+You can move through the fields with the TAB, BACK-TAB and ENTER
 keys.  To edit a field, use DELETE or BACKSPACE.  You may also use ^A
 (control-A) to go to the beginning of the line, ^E (control-E) to go
 to the end, ^F (control-F) to go forward a character, ^B (control-B)
diff --git a/release/sysinstall/help/usage.hlp b/release/sysinstall/help/usage.hlp
index 8c497f0..d9274d5 100644
--- a/release/sysinstall/help/usage.hlp
+++ b/release/sysinstall/help/usage.hlp
@@ -10,7 +10,7 @@ encounter during this installation:
 KEY             ACTION
 ---             ------
 SPACE           Select or toggle the current item.
-RETURN          Finish with a menu or item.
+ENTER          Finish with a menu or item.
 UP ARROW        Move to previous item (or up, in a text display box).
 DOWN ARROW      Move to next item (or down, in a text display box).
 TAB             Move to next item or group.
diff --git a/release/sysinstall/help/usermgmt.hlp b/release/sysinstall/help/usermgmt.hlp
index 4d1b9f5..8a2664d 100644
--- a/release/sysinstall/help/usermgmt.hlp
+++ b/release/sysinstall/help/usermgmt.hlp
@@ -1,6 +1,6 @@
 These screens allow you to add groups and users to your system.
 
-You can move through the fields with the TAB, BACK-TAB and RETURN
+You can move through the fields with the TAB, BACK-TAB and ENTER
 keys.  To edit a field, use DELETE or BACKSPACE.  You may also use ^A
 (control-A) to go to the beginning of the line, ^E (control-E) to go
 to the end, ^F (control-F) to go forward a character, ^B (control-B)
diff --git a/release/sysinstall/package.c b/release/sysinstall/package.c
index ff9415e..da1ec9c 100644
--- a/release/sysinstall/package.c
+++ b/release/sysinstall/package.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: package.c,v 1.63 1997/09/16 10:14:22 jkh Exp $
+ * $Id: package.c,v 1.64 1997/09/17 16:18:16 pst Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -115,11 +115,12 @@ package_extract(Device *dev, char *name, Boolean depended)
     /* Be initially optimistic */
     ret = DITEM_SUCCESS | DITEM_RESTORE;
     /* Make a couple of paranoid locations for temp files to live if user specified none */
-    if (!variable_get("PKG_TMPDIR")) {
+    if (!variable_get(VAR_PKG_TMPDIR)) {
 	/* Set it to a location with as much space as possible */
-	variable_set2("PKG_TMPDIR", "/usr/tmp");
+	variable_set2(VAR_PKG_TMPDIR, "/usr/tmp");
     }
-    Mkdir(variable_get("PKG_TMPDIR"));
+    Mkdir(variable_get(VAR_PKG_TMPDIR));
+    vsystem("chmod 1777 %s", variable_get(VAR_PKG_TMPDIR));
 
     if (!index(name, '/'))
 	sprintf(path, "packages/All/%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");