Add more items to the glossary menu and reformat it slightly.

1 files changed, 19 insertions, 13 deletions

diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 7b4f9f2..d6033d2 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.68 1996/06/16 21:57:33 jkh Exp $
+ * $Id: menus.c,v 1.69 1996/06/16 23:17:33 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -202,14 +202,14 @@ checkTrue(dialogMenuItem *item)
 DMenu MenuIndex = {
     DMENU_NORMAL_TYPE,
     "Glossary of functions",
-    "This menu contains an alphabetized index of all top level\n"
-    "functions in this program (sysinstall).  Please select the\n"
-    "function you wish to invoke below and press [ENTER] or\n"
-    "Cancel to leave this menu.",
+    "This menu contains an alphabetized index of all top level functions in\n"
+    "this program (sysinstall).    Invoke an option by pressing [ENTER].\n"
+    "Exit the installation by selecting Cancel [TAB-ENTER].",
     "Use PageUp or PageDown to move through this menu faster!",
     NULL,
     { { "Add User",	"Add users to the system.", NULL, dmenuSystemCommand, NULL, "adduser -config_create ; adduser -s" },
       { "Anon FTP",	"Configure anonymous FTP logins.",	dmenuVarCheck, configAnonFTP, NULL, "anon_ftp" },
+      { "Commit",	"Commit any pending actions (dangerous!)", NULL, installCustomCommit },
       { "Console settings",	"Customize system console behavior.", NULL, dmenuSubmenu, NULL, &MenuSyscons },
       { "Configure",		"The system configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuConfigure },
       { "Device, Mouse",	"The mouse configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuMouse },
@@ -223,20 +223,23 @@ DMenu MenuIndex = {
       { "Dists, User",		"Select average user distribution.", checkDistUser, distSetUser },
       { "Dists, X User",	"Select average X user distribution.", checkDistXUser, distSetXUser },
       { "Distributions, XFree86","XFree86 distribution menu.",		NULL, distSetXF86 },
-      { "Doc Menu",		"Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation },
+      { "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, Copyright",	"The distribution copyright notices.",	NULL, dmenuDisplayFile,	NULL, "COPYRIGHT" },
       { "Doc, Release",		"The distribution release notes.",	NULL, dmenuDisplayFile, NULL, "relnotes" },
       { "Doc, HTML",		"The HTML documentation menu.",		NULL, docBrowser },
+      { "Extract",		"Extract selected distributions from media.",		NULL, distExtractAll },
       { "Fixit",		"Repair mode with CDROM or floppy.",	NULL, dmenuSubmenu, NULL, &MenuFixit },
       { "FTP sites",		"The FTP mirror site listing.",		NULL, dmenuSubmenu, NULL, &MenuMediaFTP },
       { "Gated",		"Load and configure gated instead of routed.",  dmenuVarCheck, configGated, NULL, "gated" },
       { "Gateway",		"Set flag to route packets between interfaces.", dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" },
+      { "HTML Docs",		"The HTML documentation menu",		NULL, docBrowser },
       { "Install, Novice",	"A novice system installation.",	NULL, installNovice },
       { "Install, Express",	"An express system installation.",	NULL, installExpress },
-      { "Install, Custom Menu",	"The custom installation menu",		NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
+      { "Install, Custom",	"The custom installation menu",		NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
+      { "Label",		"The disk Label editor",		NULL, diskLabelEditor },
       { "Media, All",		"Top level media selection menu.",	NULL, dmenuSubmenu, NULL, &MenuMedia },
       { "Media, Tape",		"Select tape installation media.",	NULL, mediaSetTape },
       { "Media, NFS",		"Select NFS installation media.",	NULL, mediaSetNFS },
@@ -246,20 +249,23 @@ DMenu MenuIndex = {
       { "Media, UFS",		"Select UFS installation media.",	NULL, mediaSetUFS },
       { "Media, FTP",		"Select FTP installation media.",	NULL, mediaSetFTP },
       { "Media, FTP Passive",	"Select passive FTP installation media.", NULL, mediaSetFTPPassive },
-      { "Networking Menu",	"The network configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuNetworking },
+      { "Network Interfaces",	"Configure network interfaces",		NULL, tcpMenuSelect },
+      { "Networking Services",	"The network services menu.",		NULL, dmenuSubmenu, NULL, &MenuNetworking },
       { "NFS, client",		"Set NFS client flag.",			dmenuVarCheck, dmenuToggleVariable, NULL, "nfs_client=YES" },
       { "NFS, server",		"Set NFS server flag.",			dmenuVarCheck, configNFSServer, NULL, "nfs_server" },
-      { "NTP Menu",		"The NTP configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuNTP },
+      { "NTP Menu",		"The NTP configuration menu.",		NULL, dmenuSubmenu, NULL, &MenuNTP },
       { "Options",		"The options editor.",			NULL, optionsEditor },
+      { "Packages",		"The packages collection",		NULL, configPackages },
+      { "Partition",		"The disk Partition Editor",		NULL, diskPartitionEditor },
       { "PCNFSD",		"Run authentication server for PC-NFS.",	dmenuVarCheck, configPCNFSD, NULL, "pcnfsd" },
       { "Ports",		"Link to FreeBSD ports collection.",	NULL, configPorts },
       { "Root Password",	"Set the system manager's password.",   NULL, dmenuSystemCommand, NULL, "passwd root" },
       { "Routed",		"Set flags for routed (default: -q)",	dmenuVarCheck, configRoutedFlags, NULL, "routed" },
       { "Samba",		"Configure Samba for LanManager access.", dmenuVarCheck, configSamba, NULL, "samba" },
-      { "Syscons Menu",		"The system console configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSyscons },
-      { "Syscons Menu, Keymap",	"The console keymap configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
-      { "Syscons Menu, Keyrate","The console key rate configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate },
-      { "Syscons Menu, Saver",	"The console screen saver configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSysconsSaver },
+      { "Syscons",		"The system console configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSyscons },
+      { "Syscons, Keymap",	"The console keymap configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeymap },
+      { "Syscons, Keyrate",	"The console key rate configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSysconsKeyrate },
+      { "Syscons, Saver",	"The console screen saver configuration menu.",	NULL, dmenuSubmenu, NULL, &MenuSysconsSaver },
       { "Time Zone",		"Set the system's time zone.",		NULL, dmenuSystemCommand, NULL, "rm -f /etc/wall_cmos_clock /etc/localtime; tzsetup" },
       { "Upgrade",		"Upgrade an existing system.",		NULL, installUpgrade },
       { "Usage",		"Quick start - How to use this menu system.",	NULL, dmenuDisplayFile, NULL, "usage" },