From e1cbf95aec7cb11a66285ccbffa552c501d2ac3c Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 20 Feb 2002 04:31:44 +0000
Subject: [PATCH] regen

---
 bin/check/named-checkconf.8    |  6 +++-
 bin/check/named-checkconf.html | 26 ++++++++++----
 bin/check/named-checkzone.8    | 13 ++++++-
 bin/check/named-checkzone.html | 64 +++++++++++++++++++++++++++++++---
 bin/dnssec/dnssec-keygen.8     |  3 +-
 bin/dnssec/dnssec-keygen.html  |  3 +-
 doc/arm/Bv9ARM.ch06.html       |  2 +-
 doc/misc/options               |  4 +++
 8 files changed, 103 insertions(+), 18 deletions(-)

diff --git a/bin/check/named-checkconf.8 b/bin/check/named-checkconf.8
index 2781449e9d..40aff3553a 100644
--- a/bin/check/named-checkconf.8
+++ b/bin/check/named-checkconf.8
@@ -19,7 +19,7 @@
 named-checkconf \- named configuration file syntax checking tool
 .SH SYNOPSIS
 .sp
-\fBnamed-checkconf\fR [ \fB-v\fR ]  [ \fB-t \fIdirectory\fB\fR ]  \fBfilename\fR
+\fBnamed-checkconf\fR [ \fB-v\fR ]  [ \fB-t \fIdirectory\fB\fR ]  \fBfilename\fR [ \fB-z\fR ] 
 .SH "DESCRIPTION"
 .PP
 \fBnamed-checkconf\fR checks the syntax, but not
@@ -35,6 +35,10 @@ run by a similarly chrooted named.
 Print the version of the \fBnamed-checkconf\fR
 program and exit.
 .TP
+\fB-z\fR
+Perform a check load the master zonefiles found in
+\fInamed.conf\fR.
+.TP
 \fBfilename\fR
 The name of the configuration file to be checked. If not
 specified, it defaults to \fI/etc/named.conf\fR.
diff --git a/bin/check/named-checkconf.html b/bin/check/named-checkconf.html
index 19c330f394..3c912f9ef8 100644
--- a/bin/check/named-checkconf.html
+++ b/bin/check/named-checkconf.html
@@ -70,12 +70,15 @@ CLASS="REPLACEABLE"
 >directory</I
 ></TT
 ></TT
->] {filename}</P
+>] {filename} [<TT
+CLASS="OPTION"
+>-z</TT
+>]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN22"
+NAME="AEN24"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -90,7 +93,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN26"
+NAME="AEN28"
 ></A
 ><H2
 >OPTIONS</H2
@@ -128,6 +131,17 @@ CLASS="COMMAND"
 	  </P
 ></DD
 ><DT
+>-z</DT
+><DD
+><P
+>	      Perform a check load the master zonefiles found in
+	      <TT
+CLASS="FILENAME"
+>named.conf</TT
+>.
+	  </P
+></DD
+><DT
 >filename</DT
 ><DD
 ><P
@@ -144,7 +158,7 @@ CLASS="FILENAME"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN45"
+NAME="AEN52"
 ></A
 ><H2
 >RETURN VALUES</H2
@@ -159,7 +173,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN49"
+NAME="AEN56"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -180,7 +194,7 @@ CLASS="CITETITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN56"
+NAME="AEN63"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/bin/check/named-checkzone.8 b/bin/check/named-checkzone.8
index 6346798892..7da817a705 100644
--- a/bin/check/named-checkzone.8
+++ b/bin/check/named-checkzone.8
@@ -19,7 +19,7 @@
 named-checkzone \- zone file validity checking tool
 .SH SYNOPSIS
 .sp
-\fBnamed-checkzone\fR [ \fB-d\fR ]  [ \fB-q\fR ]  [ \fB-v\fR ]  [ \fB-c \fIclass\fB\fR ]  \fBzonename\fR \fBfilename\fR
+\fBnamed-checkzone\fR [ \fB-d\fR ]  [ \fB-q\fR ]  [ \fB-v\fR ]  [ \fB-c \fIclass\fB\fR ]  [ \fB-t \fIdirectory\fB\fR ]  [ \fB-w \fIdirectory\fB\fR ]  \fBzonename\fR \fBfilename\fR
 .SH "DESCRIPTION"
 .PP
 \fBnamed-checkzone\fR checks the syntax and integrity of
@@ -42,6 +42,17 @@ program and exit.
 \fB-c \fIclass\fB\fR
 Specify the class of the zone. If not specified "IN" is assumed.
 .TP
+\fB-t \fIdirectory\fB\fR
+chroot to \fIdirectory\fR so that include
+directives in the configuration file are processed as if
+run by a similarly chrooted named.
+.TP
+\fB-w \fIdirectory\fB\fR
+chdir to \fIdirectory\fR so that relative
+filenames in master file $INCLUDE directives work. This
+is similar to the directory clause in
+\fInamed.conf\fR.
+.TP
 \fBzonename\fR
 The domain name of the zone being checked.
 .TP
diff --git a/bin/check/named-checkzone.html b/bin/check/named-checkzone.html
index 136d01195a..1923326c2e 100644
--- a/bin/check/named-checkzone.html
+++ b/bin/check/named-checkzone.html
@@ -76,12 +76,28 @@ CLASS="REPLACEABLE"
 >class</I
 ></TT
 ></TT
+>] [<TT
+CLASS="OPTION"
+>-t <TT
+CLASS="REPLACEABLE"
+><I
+>directory</I
+></TT
+></TT
+>] [<TT
+CLASS="OPTION"
+>-w <TT
+CLASS="REPLACEABLE"
+><I
+>directory</I
+></TT
+></TT
 >] {zonename} {filename}</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN27"
+NAME="AEN33"
 ></A
 ><H2
 >DESCRIPTION</H2
@@ -105,7 +121,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN33"
+NAME="AEN39"
 ></A
 ><H2
 >OPTIONS</H2
@@ -152,6 +168,44 @@ CLASS="REPLACEABLE"
 	  </P
 ></DD
 ><DT
+>-t <TT
+CLASS="REPLACEABLE"
+><I
+>directory</I
+></TT
+></DT
+><DD
+><P
+>              chroot to <TT
+CLASS="FILENAME"
+>directory</TT
+> so that include
+              directives in the configuration file are processed as if
+              run by a similarly chrooted named.
+          </P
+></DD
+><DT
+>-w <TT
+CLASS="REPLACEABLE"
+><I
+>directory</I
+></TT
+></DT
+><DD
+><P
+>              chdir to <TT
+CLASS="FILENAME"
+>directory</TT
+> so that relative
+	      filenames in master file $INCLUDE directives work.  This
+	      is similar to the directory clause in
+	      <TT
+CLASS="FILENAME"
+>named.conf</TT
+>.
+          </P
+></DD
+><DT
 >zonename</DT
 ><DD
 ><P
@@ -171,7 +225,7 @@ CLASS="REPLACEABLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN62"
+NAME="AEN81"
 ></A
 ><H2
 >RETURN VALUES</H2
@@ -186,7 +240,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN66"
+NAME="AEN85"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -211,7 +265,7 @@ CLASS="CITETITLE"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN74"
+NAME="AEN93"
 ></A
 ><H2
 >AUTHOR</H2
diff --git a/bin/dnssec/dnssec-keygen.8 b/bin/dnssec/dnssec-keygen.8
index ae16469db4..de949b8b66 100644
--- a/bin/dnssec/dnssec-keygen.8
+++ b/bin/dnssec/dnssec-keygen.8
@@ -71,8 +71,7 @@ Prints a short summary of the options and arguments to
 .TP
 \fB-p \fIprotocol\fB\fR
 Sets the protocol value for the generated key. The protocol
-is a number between 0 and 255. The default is 2 (email) for
-keys of type USER and 3 (DNSSEC) for all other key types.
+is a number between 0 and 255. The default is 3 (DNSSEC).
 Other possible values for this argument are listed in
 RFC 2535 and its successors.
 .TP
diff --git a/bin/dnssec/dnssec-keygen.html b/bin/dnssec/dnssec-keygen.html
index d7ba6e412e..d80dbcfd07 100644
--- a/bin/dnssec/dnssec-keygen.html
+++ b/bin/dnssec/dnssec-keygen.html
@@ -281,8 +281,7 @@ CLASS="REPLACEABLE"
 ><DD
 ><P
 >	       Sets the protocol value for the generated key.  The protocol
-	       is a number between 0 and 255.  The default is 2 (email) for
-	       keys of type USER and 3 (DNSSEC) for all other key types.
+	       is a number between 0 and 255.  The default is 3 (DNSSEC).
 	       Other possible values for this argument are listed in
 	       RFC 2535 and its successors.
 	  </P
diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
index 87afffaa9c..9a80f0137b 100644
--- a/doc/arm/Bv9ARM.ch06.html
+++ b/doc/arm/Bv9ARM.ch06.html
@@ -8765,7 +8765,7 @@ configured.</P
 >Stub zones can also be used as a way of forcing the resolution
 of a given domain to use a particular set of authoritative servers.
 For example, the caching name servers on a private network using
-RFC2157 addressing may be configured with stub zones for
+RFC1981 addressing may be configured with stub zones for
 <TT
 CLASS="literal"
 >10.in-addr.arpa</TT
diff --git a/doc/misc/options b/doc/misc/options
index 35fd457026..9e4394342a 100644
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -98,6 +98,7 @@ options {
         min-refresh-time <integer>;
         sig-validity-interval <integer>;
         zone-statistics <boolean>;
+        key-directory <quoted_string>;
 };
 
 controls {
@@ -176,6 +177,7 @@ view <string> <optional_class> {
                 min-refresh-time <integer>;
                 sig-validity-interval <integer>;
                 zone-statistics <boolean>;
+                key-directory <quoted_string>;
         };
         server {
                 bogus <boolean>;
@@ -242,6 +244,7 @@ view <string> <optional_class> {
         min-refresh-time <integer>;
         sig-validity-interval <integer>;
         zone-statistics <boolean>;
+        key-directory <quoted_string>;
 };
 
 lwres {
@@ -298,6 +301,7 @@ zone <string> <optional_class> {
         min-refresh-time <integer>;
         sig-validity-interval <integer>;
         zone-statistics <boolean>;
+        key-directory <quoted_string>;
 };
 
 server {