From 15eb9fcea794e44d5fe4e62c6e12ee088a9d20b9 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Fri, 2 Feb 1996 06:44:02 +0000 Subject: [PATCH] Understand about the doc distribution. --- release/sysinstall/dist.c | 4 ++-- release/sysinstall/dist.h | 6 +++--- release/sysinstall/menus.c | 4 +++- usr.sbin/sade/menus.c | 4 +++- usr.sbin/sysinstall/dist.c | 4 ++-- usr.sbin/sysinstall/dist.h | 6 +++--- usr.sbin/sysinstall/menus.c | 4 +++- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index d01c84f47aa8..0966458a49c5 100644 --- a/release/sysinstall/dist.c +++ b/release/sysinstall/dist.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: dist.c,v 1.37 1995/09/18 16:52:24 peter Exp $ + * $Id: dist.c,v 1.38 1995/12/07 10:33:41 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -68,8 +68,8 @@ extern Distribution XF86ServerDistTable[]; /* The top-level distribution categories */ static Distribution DistTable[] = { { "bin", "/", &Dists, DIST_BIN, NULL }, +{ "doc", "/", &Dists, DIST_DOC, NULL }, { "games", "/", &Dists, DIST_GAMES, NULL }, -{ "help", NULL, &Dists, DIST_HELP, NULL }, { "manpages", "/", &Dists, DIST_MANPAGES, NULL }, { "proflibs", "/", &Dists, DIST_PROFLIBS, NULL }, { "dict", "/", &Dists, DIST_DICT, NULL }, diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h index b923d8748ce3..06fa72329c64 100644 --- a/release/sysinstall/dist.h +++ b/release/sysinstall/dist.h @@ -8,7 +8,7 @@ #define DIST_PROFLIBS 0x0008 #define DIST_DICT 0x0010 #define DIST_SRC 0x0020 -#define DIST_HELP 0x0040 /* Not yet used; reserved */ +#define DIST_DOC 0x0040 #define DIST_INFO 0x0080 #define DIST_COMPAT1X 0x0100 #define DIST_COMPAT20 0x0200 @@ -20,10 +20,10 @@ /* Canned distribution sets */ #define _DIST_DEVELOPER \ - (DIST_BIN | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC) + (DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC) #define _DIST_USER \ - (DIST_BIN | DIST_MANPAGES | DIST_DICT | DIST_COMPAT1X | DIST_COMPAT20) + (DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_COMPAT1X | DIST_COMPAT20) /* Subtypes for DES distribution */ #define DIST_DES_DES 0x0001 diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index 017bb268969b..4cab22e54ae1 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.43 1995/09/18 16:52:32 peter Exp $ + * $Id: menus.c,v 1.44 1995/12/07 10:34:05 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -398,6 +398,8 @@ DES distribution out of the U.S.! It is for U.S. customers only.", DMENU_CALL, distSetDES, 0, 0, DESFlagCheck }, { "dict", "Spelling checker dictionary files [4.2MB]", DMENU_SET_FLAG, &Dists, DIST_DICT, 0, dmenuFlagCheck }, + { "doc", "FreeBSD Handbook and other online docs [10MB]", + DMENU_SET_FLAG, &Dists, DIST_DOC, 0, dmenuFlagCheck }, { "games", "Games (non-commercial) [6.4MB]", DMENU_SET_FLAG, &Dists, DIST_GAMES, 0, dmenuFlagCheck }, { "info", "GNU info files [4.1MB]", diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 017bb268969b..4cab22e54ae1 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.43 1995/09/18 16:52:32 peter Exp $ + * $Id: menus.c,v 1.44 1995/12/07 10:34:05 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -398,6 +398,8 @@ DES distribution out of the U.S.! It is for U.S. customers only.", DMENU_CALL, distSetDES, 0, 0, DESFlagCheck }, { "dict", "Spelling checker dictionary files [4.2MB]", DMENU_SET_FLAG, &Dists, DIST_DICT, 0, dmenuFlagCheck }, + { "doc", "FreeBSD Handbook and other online docs [10MB]", + DMENU_SET_FLAG, &Dists, DIST_DOC, 0, dmenuFlagCheck }, { "games", "Games (non-commercial) [6.4MB]", DMENU_SET_FLAG, &Dists, DIST_GAMES, 0, dmenuFlagCheck }, { "info", "GNU info files [4.1MB]", diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index d01c84f47aa8..0966458a49c5 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: dist.c,v 1.37 1995/09/18 16:52:24 peter Exp $ + * $Id: dist.c,v 1.38 1995/12/07 10:33:41 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -68,8 +68,8 @@ extern Distribution XF86ServerDistTable[]; /* The top-level distribution categories */ static Distribution DistTable[] = { { "bin", "/", &Dists, DIST_BIN, NULL }, +{ "doc", "/", &Dists, DIST_DOC, NULL }, { "games", "/", &Dists, DIST_GAMES, NULL }, -{ "help", NULL, &Dists, DIST_HELP, NULL }, { "manpages", "/", &Dists, DIST_MANPAGES, NULL }, { "proflibs", "/", &Dists, DIST_PROFLIBS, NULL }, { "dict", "/", &Dists, DIST_DICT, NULL }, diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h index b923d8748ce3..06fa72329c64 100644 --- a/usr.sbin/sysinstall/dist.h +++ b/usr.sbin/sysinstall/dist.h @@ -8,7 +8,7 @@ #define DIST_PROFLIBS 0x0008 #define DIST_DICT 0x0010 #define DIST_SRC 0x0020 -#define DIST_HELP 0x0040 /* Not yet used; reserved */ +#define DIST_DOC 0x0040 #define DIST_INFO 0x0080 #define DIST_COMPAT1X 0x0100 #define DIST_COMPAT20 0x0200 @@ -20,10 +20,10 @@ /* Canned distribution sets */ #define _DIST_DEVELOPER \ - (DIST_BIN | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC) + (DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC) #define _DIST_USER \ - (DIST_BIN | DIST_MANPAGES | DIST_DICT | DIST_COMPAT1X | DIST_COMPAT20) + (DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_COMPAT1X | DIST_COMPAT20) /* Subtypes for DES distribution */ #define DIST_DES_DES 0x0001 diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 017bb268969b..4cab22e54ae1 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.43 1995/09/18 16:52:32 peter Exp $ + * $Id: menus.c,v 1.44 1995/12/07 10:34:05 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -398,6 +398,8 @@ DES distribution out of the U.S.! It is for U.S. customers only.", DMENU_CALL, distSetDES, 0, 0, DESFlagCheck }, { "dict", "Spelling checker dictionary files [4.2MB]", DMENU_SET_FLAG, &Dists, DIST_DICT, 0, dmenuFlagCheck }, + { "doc", "FreeBSD Handbook and other online docs [10MB]", + DMENU_SET_FLAG, &Dists, DIST_DOC, 0, dmenuFlagCheck }, { "games", "Games (non-commercial) [6.4MB]", DMENU_SET_FLAG, &Dists, DIST_GAMES, 0, dmenuFlagCheck }, { "info", "GNU info files [4.1MB]",