8 files changed, 24 insertions, 12 deletions

diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c
index a4a0095e59aa..bb2785956e68 100644
--- a/release/sysinstall/disks.c
+++ b/release/sysinstall/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: disks.c,v 1.45 1996/04/28 20:53:54 jkh Exp $
+ * $Id: disks.c,v 1.46 1996/04/29 06:47:08 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -399,7 +399,11 @@ diskPartition(Device *dev, Disk *d)
     }
     p = CheckRules(d);
     if (p) {
+	char buf[FILENAME_MAX];
+
 	dialog_clear();
+        use_helpline("Press F1 to read more about disk partitioning.");
+	use_helpfile(systemHelpFile("partition", buf));
 	dialog_mesgbox("Disk partitioning warning:", p, -1, -1);
 	free(p);
     }
diff --git a/release/sysinstall/help/readme.hlp b/release/sysinstall/help/readme.hlp
index 18357f3ed5a9..5dec7fd69964 100644
--- a/release/sysinstall/help/readme.hlp
+++ b/release/sysinstall/help/readme.hlp
@@ -1,5 +1,5 @@
    -----------------------------------------
-       FreeBSD 2.2  ---  960428-SNAP Version           ,        ,
+       FreeBSD 2.2  ---  960430-SNAP Version           ,        ,
    -----------------------------------------          /(        )`
                                                       \ \___   / |
 Welcome to the latest 2.2 SNAPSHOT release of         /- _  `-/  '
diff --git a/release/sysinstall/help/relnotes.hlp b/release/sysinstall/help/relnotes.hlp
index dca59af75a8d..0375aae073b0 100644
--- a/release/sysinstall/help/relnotes.hlp
+++ b/release/sysinstall/help/relnotes.hlp
@@ -1,5 +1,5 @@
                                  RELEASE NOTES
-                        FreeBSD Release 2.2-960428-SNAP
+                        FreeBSD Release 2.2-960430-SNAP
 
 
 0. What's new since 2.2-960323-SNAP?
@@ -492,4 +492,4 @@ We sincerely hope you enjoy this release of FreeBSD!
 
                         The FreeBSD Core Team
 
-$Id: relnotes.hlp,v 1.3 1996/04/25 19:04:45 jkh Exp $
+$Id: relnotes.hlp,v 1.4 1996/04/28 06:08:41 jkh Exp $
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 33173468df4e..607c276fda30 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.92 1996/04/29 19:34:25 jkh Exp $
+ * $Id: install.c,v 1.93 1996/04/29 21:15:42 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -379,7 +379,7 @@ installNovice(dialogMenuItem *self)
 	msgConfirm("Congradulations!  You now have FreeBSD installed on your system.\n\n"
 		   "We will now move on to the final configuration questions.\n"
 		   "For any option you do not wish to configure, simply select\n"
-		   "Cancel.\n\n"
+		   "No.\n\n"
 		   "If you wish to re-enter this utility after the system is up, you\n"
 		   "may do so by typing: /stand/sysinstall.");
     variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c
index a4a0095e59aa..bb2785956e68 100644
--- a/usr.sbin/sade/disks.c
+++ b/usr.sbin/sade/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: disks.c,v 1.45 1996/04/28 20:53:54 jkh Exp $
+ * $Id: disks.c,v 1.46 1996/04/29 06:47:08 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -399,7 +399,11 @@ diskPartition(Device *dev, Disk *d)
     }
     p = CheckRules(d);
     if (p) {
+	char buf[FILENAME_MAX];
+
 	dialog_clear();
+        use_helpline("Press F1 to read more about disk partitioning.");
+	use_helpfile(systemHelpFile("partition", buf));
 	dialog_mesgbox("Disk partitioning warning:", p, -1, -1);
 	free(p);
     }
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 33173468df4e..607c276fda30 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.92 1996/04/29 19:34:25 jkh Exp $
+ * $Id: install.c,v 1.93 1996/04/29 21:15:42 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -379,7 +379,7 @@ installNovice(dialogMenuItem *self)
 	msgConfirm("Congradulations!  You now have FreeBSD installed on your system.\n\n"
 		   "We will now move on to the final configuration questions.\n"
 		   "For any option you do not wish to configure, simply select\n"
-		   "Cancel.\n\n"
+		   "No.\n\n"
 		   "If you wish to re-enter this utility after the system is up, you\n"
 		   "may do so by typing: /stand/sysinstall.");
     variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c
index a4a0095e59aa..bb2785956e68 100644
--- a/usr.sbin/sysinstall/disks.c
+++ b/usr.sbin/sysinstall/disks.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: disks.c,v 1.45 1996/04/28 20:53:54 jkh Exp $
+ * $Id: disks.c,v 1.46 1996/04/29 06:47:08 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -399,7 +399,11 @@ diskPartition(Device *dev, Disk *d)
     }
     p = CheckRules(d);
     if (p) {
+	char buf[FILENAME_MAX];
+
 	dialog_clear();
+        use_helpline("Press F1 to read more about disk partitioning.");
+	use_helpfile(systemHelpFile("partition", buf));
 	dialog_mesgbox("Disk partitioning warning:", p, -1, -1);
 	free(p);
     }
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 33173468df4e..607c276fda30 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.92 1996/04/29 19:34:25 jkh Exp $
+ * $Id: install.c,v 1.93 1996/04/29 21:15:42 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -379,7 +379,7 @@ installNovice(dialogMenuItem *self)
 	msgConfirm("Congradulations!  You now have FreeBSD installed on your system.\n\n"
 		   "We will now move on to the final configuration questions.\n"
 		   "For any option you do not wish to configure, simply select\n"
-		   "Cancel.\n\n"
+		   "No.\n\n"
 		   "If you wish to re-enter this utility after the system is up, you\n"
 		   "may do so by typing: /stand/sysinstall.");
     variable_set2(SYSTEM_STATE, DITEM_STATUS(i) == DITEM_FAILURE ? "error-install" : "full-install");