diff options
author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1998-11-03 03:38:56 +0000 |
---|---|---|
committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1998-11-03 03:38:56 +0000 |
commit | aa9f92fbdbe9c71e2d98eba2c477973265a14d76 (patch) | |
tree | f081f058273d15959554aa36a7c1f00b51e34bd7 /release | |
parent | 93713c9d5f8550fc1745c7d79e4b368cec55fe37 (diff) | |
download | src-test2-aa9f92fbdbe9c71e2d98eba2c477973265a14d76.tar.gz src-test2-aa9f92fbdbe9c71e2d98eba2c477973265a14d76.zip |
Notes
Diffstat (limited to 'release')
-rw-r--r-- | release/sysinstall/installUpgrade.c | 4 | ||||
-rw-r--r-- | release/sysinstall/menus.c | 18 | ||||
-rw-r--r-- | release/sysinstall/system.c | 8 |
3 files changed, 18 insertions, 12 deletions
diff --git a/release/sysinstall/installUpgrade.c b/release/sysinstall/installUpgrade.c index d68009707107..099d3f398f32 100644 --- a/release/sysinstall/installUpgrade.c +++ b/release/sysinstall/installUpgrade.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: installUpgrade.c,v 1.58 1998/05/24 02:49:54 steve Exp $ + * $Id: installUpgrade.c,v 1.59 1998/08/28 01:03:41 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -164,7 +164,7 @@ installUpgrade(dialogMenuItem *self) return installUpgradeNonInteractive(self); variable_set2(SYSTEM_STATE, "upgrade"); - systemDisplayHelp("upgrade"); + systemDisplayHelp("UPGRADE"); dialog_clear_norefresh(); if (msgYesNo("Given all that scary stuff you just read, are you sure you want to\n" diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index 0fc25abdb5a8..1431e4cd5d96 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.170 1998/09/30 11:49:35 jkh Exp $ + * $Id: menus.c,v 1.171 1998/09/30 21:39:02 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -233,11 +233,11 @@ DMenu MenuIndex = { { "Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll }, { "Distributions, XFree86","XFree86 distribution menu.", NULL, distSetXF86 }, { "Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, - { "Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "readme" }, - { "Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "hardware" }, - { "Doc, Install", "The distribution installation guide.", NULL, dmenuDisplayFile, NULL, "install" }, + { "Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "README" }, + { "Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "HARDWARE" }, + { "Doc, Install", "The distribution installation guide.", NULL, dmenuDisplayFile, NULL, "INSTALL" }, { "Doc, Copyright", "The distribution copyright notices.", NULL, dmenuDisplayFile, NULL, "COPYRIGHT" }, - { "Doc, Release", "The distribution release notes.", NULL, dmenuDisplayFile, NULL, "relnotes" }, + { "Doc, Release", "The distribution release notes.", NULL, dmenuDisplayFile, NULL, "RELNOTES" }, { "Doc, HTML", "The HTML documentation menu.", NULL, docBrowser }, { "Emergency shell", "Start an Emergency Holographic shell.", NULL, installFixitHoloShell }, { "Fdisk", "The disk Partition Editor", NULL, diskPartitionEditor }, @@ -325,11 +325,11 @@ DMenu MenuDocumentation = { "consult the README file.", "Confused? Press F1 for help.", "usage", - { { "1 README", "A general description of FreeBSD. Read this!", NULL, dmenuDisplayFile, NULL, "readme" }, - { "2 Hardware", "The FreeBSD survival guide for PC hardware.", NULL, dmenuDisplayFile, NULL, "hardware" }, - { "3 Install", "A step-by-step guide to installing FreeBSD.", NULL, dmenuDisplayFile, NULL, "install" }, + { { "1 README", "A general description of FreeBSD. Read this!", NULL, dmenuDisplayFile, NULL, "README" }, + { "2 Hardware", "The FreeBSD survival guide for PC hardware.", NULL, dmenuDisplayFile, NULL, "HARDWARE" }, + { "3 Install", "A step-by-step guide to installing FreeBSD.", NULL, dmenuDisplayFile, NULL, "INSTALL" }, { "4 Copyright", "The FreeBSD Copyright notices.", NULL, dmenuDisplayFile, NULL, "COPYRIGHT" }, - { "5 Release" ,"The release notes for this version of FreeBSD.", NULL, dmenuDisplayFile, NULL, "relnotes" }, + { "5 Release" ,"The release notes for this version of FreeBSD.", NULL, dmenuDisplayFile, NULL, "RELNOTES" }, { "6 Shortcuts", "Creating shortcuts to sysinstall.", NULL, dmenuDisplayFile, NULL, "shortcuts" }, { "7 HTML Docs", "Go to the HTML documentation menu (post-install).", NULL, docBrowser }, { "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c index b1a12af5489c..a59137bf5294 100644 --- a/release/sysinstall/system.c +++ b/release/sysinstall/system.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: system.c,v 1.83 1998/09/30 11:44:29 jkh Exp $ + * $Id: system.c,v 1.84 1998/09/30 13:36:53 jkh Exp $ * * Jordan Hubbard * @@ -223,9 +223,15 @@ systemHelpFile(char *file, char *buf) snprintf(buf, FILENAME_MAX, "/stand/help/%s.hlp.gz", file); if (file_readable(buf)) return expand(buf); + snprintf(buf, FILENAME_MAX, "/stand/help/%s.TXT.gz", file); + if (file_readable(buf)) + return expand(buf); snprintf(buf, FILENAME_MAX, "/usr/src/release/sysinstall/help/%s.hlp", file); if (file_readable(buf)) return buf; + snprintf(buf, FILENAME_MAX, "/usr/src/release/sysinstall/help/%s.TXT", file); + if (file_readable(buf)) + return buf; return NULL; } |