- Clarify some of the text in sysinstall in regards to the cryto bits.

- Note that we are up to about 3600 ports now rather than about 3000 ports.

Submitted by:	kris

3 files changed, 14 insertions, 16 deletions

diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 7d637aa..032d77d 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -822,9 +822,7 @@ DMenu MenuSubDistributions = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "Select the distributions you wish to install.",
     "Please check off the distributions you wish to install.  At the\n"
-    "very minimum, this should be \"bin\".  WARNING:  Do not export the\n"
-    "Encryption distribution out of the U.S.!\n"
-    "It is for U.S. customers only.",
+    "very minimum, this should be \"bin\".",
     NULL,
     NULL,
     { { "X Exit", "Exit this menu (returning to previous)",
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 6fa0d35..ed54c2b 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -388,15 +388,17 @@ distMaybeSetCRYPTO(dialogMenuItem *self)
 
     dialog_clear_norefresh();
     if (!msgYesNo("Do you wish to install cryptographic software?\n\n"
-		  "If you choose No, FreeBSD will use an MD5 based password scheme which,\n"
-		  "while perhaps more secure, is not interoperable with the traditional\n"
-		  "DES-based passwords on other Unix systems.  There will also be some\n"
-		  "differences in the type of RSA code you use.\n\n"
-		  "Please do NOT choose Yes at this point if you are outside the\n"
-		  "United States and Canada and are installing from a U.S. FTP server.\n"
-		  "Instead, install everything but the crypto bits from the U.S. site\n"
-		  "and then switch to an international FTP server to install crypto on\n"
-		  "a second pass with the Custom Installation option.")) {
+		  "If you choose No, FreeBSD will use an MD5-based password scheme which,\n"
+		  "while more secure, is not interoperable with the traditional\n"
+		  "DES-based passwords used on other Unix systems.\n\n"
+		  "Please do NOT choose Yes at this point if you are outside the United\n"
+		  "States and Canada and are installing from a U.S. FTP server (installing\n"
+		  "from the CD is fine). Instead, install everything but the crypto bits\n"
+		  "from the U.S. site and then switch to an international FTP server to\n"
+		  "install crypto on a second pass with the Custom Installation option.\n\n"
+		  "Note that the international crypto distribution has a better\n"
+		  "implementation of the RSA algorithm, which cannot be used in the U.S.\n"
+		  "for patent reasons.\n")) {
 	if (!dmenuOpenSimple(&MenuCRYPTODistributions, FALSE))
 	    i = DITEM_FAILURE;
     }
@@ -413,7 +415,7 @@ distMaybeSetPorts(dialogMenuItem *self)
 {
     dialog_clear_norefresh();
     if (!msgYesNo("Would you like to install the FreeBSD ports collection?\n\n"
-		  "This will give you ready access to over 3000 ported software packages,\n"
+		  "This will give you ready access to over 3600 ported software packages,\n"
 		  "at a cost of around 70MB of disk space when \"clean\" and possibly\n"
 		  "much more than that when a lot of the distribution tarballs are loaded\n"
 		  "(unless you have the extra CDs available from a FreeBSD CDROM distribution\n"
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 7d637aa..032d77d 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -822,9 +822,7 @@ DMenu MenuSubDistributions = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
     "Select the distributions you wish to install.",
     "Please check off the distributions you wish to install.  At the\n"
-    "very minimum, this should be \"bin\".  WARNING:  Do not export the\n"
-    "Encryption distribution out of the U.S.!\n"
-    "It is for U.S. customers only.",
+    "very minimum, this should be \"bin\".",
     NULL,
     NULL,
     { { "X Exit", "Exit this menu (returning to previous)",