Merge from -current: add kernelopts.sgml.

4 files changed, 19 insertions, 17 deletions

diff --git a/handbook/Makefile b/handbook/Makefile
index 00f0fd5394..8ae65c96f1 100644
--- a/handbook/Makefile
+++ b/handbook/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.17.2.3 1996-12-23 02:01:03 jkh Exp $
+# $Id: Makefile,v 1.17.2.4 1996-12-23 12:27:48 joerg Exp $
 
 SRCS= authors.sgml basics.sgml bibliography.sgml boothelp.sgml
 SRCS+= booting.sgml contrib.sgml crypt.sgml ctm.sgml current.sgml cvsup.sgml
@@ -6,7 +6,7 @@ SRCS+= cyclades.sgml development.sgml dialup.sgml dialout.sgml
 SRCS+= diskless.sgml dma.sgml eresources.sgml esdi.sgml 
 SRCS+= firewalls.sgml glossary.sgml goals.sgml
 SRCS+= handbook.sgml history.sgml hw.sgml install.sgml isdn.sgml 
-SRCS+= kerberos.sgml kernelconfig.sgml kerneldebug.sgml 
+SRCS+= kerberos.sgml kernelconfig.sgml kerneldebug.sgml kernelopts.sgml
 SRCS+= lists.sgml mail.sgml memoryuse.sgml
 SRCS+= mirrors.sgml nfs.sgml nutshell.sgml pgpkeys.sgml policies.sgml
 SRCS+= porting.sgml ports.sgml ppp.sgml printing.sgml 
diff --git a/handbook/handbook.sgml b/handbook/handbook.sgml
index 31710bd45b..53007a2589 100644
--- a/handbook/handbook.sgml
+++ b/handbook/handbook.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: handbook.sgml,v 1.58.2.3 1996-12-23 02:01:22 jkh Exp $ -->
+<!-- $Id: handbook.sgml,v 1.58.2.4 1996-12-23 12:27:49 joerg Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
@@ -146,6 +146,7 @@ name="FreeBSD FTP server"> or one of the numerous
     &submitters;
     &troubleshooting;
     &kerneldebug;
+    &kernelopts;
     &linuxemu;
     <chapt><heading>FreeBSD internals</heading>
       &booting;
diff --git a/handbook/kernelconfig.sgml b/handbook/kernelconfig.sgml
index fb830a67ee..b0dba4f120 100644
--- a/handbook/kernelconfig.sgml
+++ b/handbook/kernelconfig.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: kernelconfig.sgml,v 1.21.2.1 1996-12-23 02:01:38 jkh Exp $ -->
+<!-- $Id: kernelconfig.sgml,v 1.21.2.2 1996-12-23 12:27:50 joerg Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- <!DOCTYPE linuxdoc PUBLIC '-//FreeBSD//DTD linuxdoc//EN'> -->
   <chapt><heading>Configuring the FreeBSD Kernel<label id="kernelconfig"></heading>
@@ -135,19 +135,19 @@
 
     <sect><heading>The Configuration File<label id="kernelconfig:config"></heading>
 
-	<p>The general format of a configuration file is quite
-	simple.  Each line contains a keyword and one or more
-	arguments.  For simplicity, most lines only contain one
-	argument.  Anything following a <tt>#</tt> is considered
-	a comment and ignored.  The following sections describe
-	each keyword, generally in the order they are listed in
-	GENERIC, although some related keywords have been grouped
-	together in a single section (such as Networking) even
-	though they are actually scattered throughout the GENERIC
-	file.  An exhaustive list of options and more detailed explanations
+	<p>The general format of a configuration file is quite simple.
+	Each line contains a keyword and one or more arguments.  For
+	simplicity, most lines only contain one argument.  Anything
+	following a <tt>#</tt> is considered a comment and ignored.
+	The following sections describe each keyword, generally in the
+	order they are listed in GENERIC, although some related
+	keywords have been grouped together in a single section (such
+	as Networking) even though they are actually scattered
+	throughout the GENERIC file. <label id="kernelconfig:options">
+	An exhaustive list of options and more detailed explanations
 	of the device lines is present in the LINT configuration file,
-	located in the same directory as GENERIC.  If you are in doubt as to
-	the purpose or necessity of a line, check first in LINT.
+	located in the same directory as GENERIC.  If you are in doubt
+	as to the purpose or necessity of a line, check first in LINT.
 
 	<p>The kernel is currently being moved to a better organization
 	of the option handling.  Traditionally, each option in the
diff --git a/handbook/sections.sgml b/handbook/sections.sgml
index 7e6561de06..dcfabb41e3 100644
--- a/handbook/sections.sgml
+++ b/handbook/sections.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: sections.sgml,v 1.17.2.2 1996-12-23 02:02:12 jkh Exp $ -->
+<!-- $Id: sections.sgml,v 1.17.2.3 1996-12-23 12:27:51 joerg Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!-- Entities containing all the pieces of the handbook are -->
@@ -31,6 +31,7 @@
 <!ENTITY kerberos SYSTEM "kerberos.sgml">
 <!ENTITY kernelconfig SYSTEM "kernelconfig.sgml">
 <!ENTITY kerneldebug SYSTEM "kerneldebug.sgml">
+<!ENTITY kernelopts SYSTEM "kernelopts.sgml">
 <!ENTITY linuxemu SYSTEM "linuxemu.sgml">
 <!ENTITY mail SYSTEM "mail.sgml">
 <!ENTITY memoryuse SYSTEM "memoryuse.sgml">