From 359433b8c18f540db7129a1105fd64dd9d9db961 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Mon, 8 Jul 1996 12:00:47 +0000 Subject: [PATCH] Update the documentation here and there. --- release/sysinstall/help/options.hlp | 17 ----------------- release/sysinstall/media.c | 4 ++-- release/sysinstall/menus.c | 7 +++---- usr.sbin/sade/menus.c | 7 +++---- usr.sbin/sysinstall/help/options.hlp | 17 ----------------- usr.sbin/sysinstall/media.c | 4 ++-- usr.sbin/sysinstall/menus.c | 7 +++---- 7 files changed, 13 insertions(+), 50 deletions(-) diff --git a/release/sysinstall/help/options.hlp b/release/sysinstall/help/options.hlp index b445382e94e3..daa927e12c1c 100644 --- a/release/sysinstall/help/options.hlp +++ b/release/sysinstall/help/options.hlp @@ -34,23 +34,6 @@ Yes To All: Assume "Yes" answers to all non-critical dialogs installs. -FTP OnError: What to do when FTP transfer errors occur. - - This is pretty self-explanatory. If you're transfering from a - host that drops the connection or cannot provide a file, you can - chose to Abort the connection, Retry the request (see next option) - or Reselect another FTP host, attempting to retry the request from - a new site. Pressing SPACE will toggle through these options. - - -FTP Retries: How many times to retry failing FTP requests. - - If FTP OnError is set to `retry', this is the number of times to - loop on a failing request before giving up. If you're talking to a - site that's chronically overloaded (like ours!) you may wish to - simply set this to some large value and go to lunch or something. - - FTP username: Specify username and password instead of anonymous. By default, the installation attempts to log in as the diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c index ae5e66f0a991..7ef51097ced3 100644 --- a/release/sysinstall/media.c +++ b/release/sysinstall/media.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: media.c,v 1.47 1996/07/08 10:08:12 jkh Exp $ + * $Id: media.c,v 1.48 1996/07/08 11:07:08 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -271,7 +271,7 @@ mediaSetFTP(dialogMenuItem *self) } else if (!strcmp(cp, "other")) { variable_set2(VAR_FTP_PATH, "ftp://"); - dialog_clear(); + dialog_clear(); cp = variable_get_value(VAR_FTP_PATH, "Please specify the URL of a FreeBSD distribution on a\n" "remote ftp site. This site must accept either anonymous\n" "ftp or you should have set an ftp username and password\n" diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index 73026e28ad06..4eaa965dc602 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.78 1996/07/02 10:57:54 jkh Exp $ + * $Id: menus.c,v 1.79 1996/07/04 23:11:59 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -704,9 +704,8 @@ DMenu MenuDESDistributions = { "Select the encryption facilities you wish to install.", "Please check off any special DES-based encryption distributions\n\ you would like to install. Please note that these services are NOT FOR\n\ -EXPORT from the United States, nor are they available on CDROM (for the\n\ -same reason). For information on non-U.S. FTP distributions of this\n\ -software, please consult the release notes.", +EXPORT from the United States. For information on non-U.S. FTP\n\ +distributions of this software, please consult the release notes.", NULL, NULL, { { "des", "Basic DES encryption services [1MB]", diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 73026e28ad06..4eaa965dc602 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.78 1996/07/02 10:57:54 jkh Exp $ + * $Id: menus.c,v 1.79 1996/07/04 23:11:59 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -704,9 +704,8 @@ DMenu MenuDESDistributions = { "Select the encryption facilities you wish to install.", "Please check off any special DES-based encryption distributions\n\ you would like to install. Please note that these services are NOT FOR\n\ -EXPORT from the United States, nor are they available on CDROM (for the\n\ -same reason). For information on non-U.S. FTP distributions of this\n\ -software, please consult the release notes.", +EXPORT from the United States. For information on non-U.S. FTP\n\ +distributions of this software, please consult the release notes.", NULL, NULL, { { "des", "Basic DES encryption services [1MB]", diff --git a/usr.sbin/sysinstall/help/options.hlp b/usr.sbin/sysinstall/help/options.hlp index b445382e94e3..daa927e12c1c 100644 --- a/usr.sbin/sysinstall/help/options.hlp +++ b/usr.sbin/sysinstall/help/options.hlp @@ -34,23 +34,6 @@ Yes To All: Assume "Yes" answers to all non-critical dialogs installs. -FTP OnError: What to do when FTP transfer errors occur. - - This is pretty self-explanatory. If you're transfering from a - host that drops the connection or cannot provide a file, you can - chose to Abort the connection, Retry the request (see next option) - or Reselect another FTP host, attempting to retry the request from - a new site. Pressing SPACE will toggle through these options. - - -FTP Retries: How many times to retry failing FTP requests. - - If FTP OnError is set to `retry', this is the number of times to - loop on a failing request before giving up. If you're talking to a - site that's chronically overloaded (like ours!) you may wish to - simply set this to some large value and go to lunch or something. - - FTP username: Specify username and password instead of anonymous. By default, the installation attempts to log in as the diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c index ae5e66f0a991..7ef51097ced3 100644 --- a/usr.sbin/sysinstall/media.c +++ b/usr.sbin/sysinstall/media.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: media.c,v 1.47 1996/07/08 10:08:12 jkh Exp $ + * $Id: media.c,v 1.48 1996/07/08 11:07:08 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -271,7 +271,7 @@ mediaSetFTP(dialogMenuItem *self) } else if (!strcmp(cp, "other")) { variable_set2(VAR_FTP_PATH, "ftp://"); - dialog_clear(); + dialog_clear(); cp = variable_get_value(VAR_FTP_PATH, "Please specify the URL of a FreeBSD distribution on a\n" "remote ftp site. This site must accept either anonymous\n" "ftp or you should have set an ftp username and password\n" diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 73026e28ad06..4eaa965dc602 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.78 1996/07/02 10:57:54 jkh Exp $ + * $Id: menus.c,v 1.79 1996/07/04 23:11:59 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -704,9 +704,8 @@ DMenu MenuDESDistributions = { "Select the encryption facilities you wish to install.", "Please check off any special DES-based encryption distributions\n\ you would like to install. Please note that these services are NOT FOR\n\ -EXPORT from the United States, nor are they available on CDROM (for the\n\ -same reason). For information on non-U.S. FTP distributions of this\n\ -software, please consult the release notes.", +EXPORT from the United States. For information on non-U.S. FTP\n\ +distributions of this software, please consult the release notes.", NULL, NULL, { { "des", "Basic DES encryption services [1MB]",