rebuild option grammar documentation

diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index 0a6c7bde3e2355ac0b120334ab7b63e71c68edfe..04fc8476a87b9c30b13244c6cd0db0d548c4a0a1 100644 (file)
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -13,7 +13,7 @@
 
 <refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="man.named.conf">
   <info>
-    <date>2018-06-21</date>
+    <date>2018-09-04</date>
   </info>
   <refentryinfo>
     <corpname>ISC</corpname>
@@ -192,6 +192,7 @@ options {
            ] [ dscp <replaceable>integer</replaceable> ];
        alt-transfer-source-v6 ( <replaceable>ipv6_address</replaceable> | * ) [ port ( <replaceable>integer</replaceable> |
            * ) ] [ dscp <replaceable>integer</replaceable> ];
+       answer-cookie <replaceable>boolean</replaceable>;
        attach-cache <replaceable>string</replaceable>;
        auth-nxdomain <replaceable>boolean</replaceable>; // default changed
        auto-dnssec ( allow | maintain | off );
@@ -257,8 +258,8 @@ options {
        dnssec-secure-to-insecure <replaceable>boolean</replaceable>;
        dnssec-update-mode ( maintain | no-resign );
        dnssec-validation ( yes | no | auto );
-       dnstap { ( all | auth | client | forwarder | resolver ) [ ( query |
-           response ) ]; ... };
+       dnstap { ( all | auth | client | forwarder | resolver | update ) [
+           ( query | response ) ]; ... };
        dnstap-identity ( <replaceable>quoted_string</replaceable> | none | hostname );
        dnstap-output ( file | unix ) <replaceable>quoted_string</replaceable> [ size ( unlimited |
            <replaceable>size</replaceable> ) ] [ versions ( unlimited | <replaceable>integer</replaceable> ) ] [ suffix (
@@ -340,6 +341,7 @@ options {
        min-retry-time <replaceable>integer</replaceable>;
        minimal-any <replaceable>boolean</replaceable>;
        minimal-responses ( no-auth | no-auth-recursive | <replaceable>boolean</replaceable> );
+       mirror <replaceable>boolean</replaceable>;
        multi-master <replaceable>boolean</replaceable>;
        new-zones-directory <replaceable>quoted_string</replaceable>;
        no-case-compress { <replaceable>address_match_element</replaceable>; ... };
@@ -609,8 +611,8 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
        dnssec-secure-to-insecure <replaceable>boolean</replaceable>;
        dnssec-update-mode ( maintain | no-resign );
        dnssec-validation ( yes | no | auto );
-       dnstap { ( all | auth | client | forwarder | resolver ) [ ( query |
-           response ) ]; ... };
+       dnstap { ( all | auth | client | forwarder | resolver | update ) [
+           ( query | response ) ]; ... };
        dual-stack-servers [ port <replaceable>integer</replaceable> ] { ( <replaceable>quoted_string</replaceable> [ port
            <replaceable>integer</replaceable> ] [ dscp <replaceable>integer</replaceable> ] | <replaceable>ipv4_address</replaceable> [ port
            <replaceable>integer</replaceable> ] [ dscp <replaceable>integer</replaceable> ] | <replaceable>ipv6_address</replaceable> [ port
@@ -671,6 +673,7 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
        min-retry-time <replaceable>integer</replaceable>;
        minimal-any <replaceable>boolean</replaceable>;
        minimal-responses ( no-auth | no-auth-recursive | <replaceable>boolean</replaceable> );
+       mirror <replaceable>boolean</replaceable>;
        multi-master <replaceable>boolean</replaceable>;
        new-zones-directory <replaceable>quoted_string</replaceable>;
        no-case-compress { <replaceable>address_match_element</replaceable>; ... };
@@ -893,10 +896,10 @@ view <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
                    static-stub | stub );
                update-check-ksk <replaceable>boolean</replaceable>;
                update-policy ( local | { ( deny | grant ) <replaceable>string</replaceable> (
-                   6to4-self | external | krb5-self | krb5-subdomain |
-                   ms-self | ms-subdomain | name | self | selfsub |
-                   selfwild | subdomain | tcp-self | wildcard | zonesub )
-                   [ <replaceable>string</replaceable> ] <replaceable>rrtypelist</replaceable>; ... };
+                   6to4-self | external | krb5-self | krb5-selfsub |
+                   krb5-subdomain | ms-self | ms-selfsub | ms-subdomain |
+                   name | self | selfsub | selfwild | subdomain | tcp-self
+                   | wildcard | zonesub ) [ <replaceable>string</replaceable> ] <replaceable>rrtypelist</replaceable>; ... };
                use-alt-transfer-source <replaceable>boolean</replaceable>;
                zero-no-soa-ttl <replaceable>boolean</replaceable>;
                zone-statistics ( full | terse | none | <replaceable>boolean</replaceable> );
@@ -996,9 +999,10 @@ zone <replaceable>string</replaceable> [ <replaceable>class</replaceable> ] {
            forward | hint | redirect | static-stub | stub );
        update-check-ksk <replaceable>boolean</replaceable>;
        update-policy ( local | { ( deny | grant ) <replaceable>string</replaceable> ( 6to4-self |
-           external | krb5-self | krb5-subdomain | ms-self | ms-subdomain
-           | name | self | selfsub | selfwild | subdomain | tcp-self |
-           wildcard | zonesub ) [ <replaceable>string</replaceable> ] <replaceable>rrtypelist</replaceable>; ... };
+           external | krb5-self | krb5-selfsub | krb5-subdomain | ms-self
+           | ms-selfsub | ms-subdomain | name | self | selfsub | selfwild
+           | subdomain | tcp-self | wildcard | zonesub ) [ <replaceable>string</replaceable> ]
+           <replaceable>rrtypelist</replaceable>; ... };
        use-alt-transfer-source <replaceable>boolean</replaceable>;
        zero-no-soa-ttl <replaceable>boolean</replaceable>;
        zone-statistics ( full | terse | none | <replaceable>boolean</replaceable> );

diff --git a/doc/arm/master.zoneopt.xml b/doc/arm/master.zoneopt.xml
index e1261b4e9a18f4160d2ddfb9990d35bee3997e03..d6124458809b1d9cced09677ccaee466353ffdab 100644 (file)
--- a/doc/arm/master.zoneopt.xml
+++ b/doc/arm/master.zoneopt.xml
@@ -63,7 +63,7 @@
        <command>sig-signing-type</command> <replaceable>integer</replaceable>;
        <command>sig-validity-interval</command> <replaceable>integer</replaceable> [ <replaceable>integer</replaceable> ];
        <command>update-check-ksk</command> <replaceable>boolean</replaceable>;
-       <command>update-policy</command> ( local | { ( deny | grant ) <replaceable>string</replaceable> ( 6to4-self | external | krb5-self | krb5-subdomain | ms-self | ms-subdomain | name | self | selfsub | selfwild | subdomain | tcp-self | wildcard | zonesub ) [ <replaceable>string</replaceable> ] <replaceable>rrtypelist</replaceable>; ... };
+       <command>update-policy</command> ( local | { ( deny | grant ) <replaceable>string</replaceable> ( 6to4-self | external | krb5-self | krb5-selfsub | krb5-subdomain | ms-self | ms-selfsub | ms-subdomain | name | self | selfsub | selfwild | subdomain | tcp-self | wildcard | zonesub ) [ <replaceable>string</replaceable> ] <replaceable>rrtypelist</replaceable>; ... };
        <command>zero-no-soa-ttl</command> <replaceable>boolean</replaceable>;
        <command>zone-statistics</command> ( full | terse | none | <replaceable>boolean</replaceable> );
 };

diff --git a/doc/arm/options.grammar.xml b/doc/arm/options.grammar.xml
index 41c115c4a0fdb5cafcb5da77fd6e49729beaac5c..3eae56c229202c618adc47ad0f169f0e8a9ec355 100644 (file)
--- a/doc/arm/options.grammar.xml
+++ b/doc/arm/options.grammar.xml
@@ -31,6 +31,7 @@
            ] [ dscp <replaceable>integer</replaceable> ];
        <command>alt-transfer-source-v6</command> ( <replaceable>ipv6_address</replaceable> | * ) [ port ( <replaceable>integer</replaceable> |
            * ) ] [ dscp <replaceable>integer</replaceable> ];
+       <command>answer-cookie</command> <replaceable>boolean</replaceable>;
        <command>attach-cache</command> <replaceable>string</replaceable>;
        <command>auth-nxdomain</command> <replaceable>boolean</replaceable>; // default changed
        <command>auto-dnssec</command> ( allow | maintain | off );
@@ -96,8 +97,8 @@
        <command>dnssec-secure-to-insecure</command> <replaceable>boolean</replaceable>;
        <command>dnssec-update-mode</command> ( maintain | no-resign );
        <command>dnssec-validation</command> ( yes | no | auto );
-       <command>dnstap</command> { ( all | auth | client | forwarder | resolver ) [ ( query |
-           <command>response</command> ) ]; ... };
+       <command>dnstap</command> { ( all | auth | client | forwarder | resolver | update ) [
+           ( query | response ) ]; ... };
        <command>dnstap-identity</command> ( <replaceable>quoted_string</replaceable> | none | hostname );
        <command>dnstap-output</command> ( file | unix ) <replaceable>quoted_string</replaceable> [ size ( unlimited |
            <replaceable>size</replaceable> ) ] [ versions ( unlimited | <replaceable>integer</replaceable> ) ] [ suffix (

diff --git a/doc/misc/master.zoneopt b/doc/misc/master.zoneopt
index 42b794de51127cd51b4c4f779871c1df6ce9bc56..12cf2160930657b9ee009078fe85ad93a4eaf99e 100644 (file)
--- a/doc/misc/master.zoneopt
+++ b/doc/misc/master.zoneopt
@@ -51,7 +51,7 @@ zone <string> [ <class> ] {
        sig-signing-type <integer>;
        sig-validity-interval <integer> [ <integer> ];
        update-check-ksk <boolean>;
-       update-policy ( local | { ( deny | grant ) <string> ( 6to4-self | external | krb5-self | krb5-subdomain | ms-self | ms-subdomain | name | self | selfsub | selfwild | subdomain | tcp-self | wildcard | zonesub ) [ <string> ] <rrtypelist>; ... };
+       update-policy ( local | { ( deny | grant ) <string> ( 6to4-self | external | krb5-self | krb5-selfsub | krb5-subdomain | ms-self | ms-selfsub | ms-subdomain | name | self | selfsub | selfwild | subdomain | tcp-self | wildcard | zonesub ) [ <string> ] <rrtypelist>; ... };
        zero-no-soa-ttl <boolean>;
        zone-statistics ( full | terse | none | <boolean> );
 };

diff --git a/doc/misc/options b/doc/misc/options
index d0c83103700a72f105a2fb2f3df24f0b7c446ecd..546e5144d4cfc4dd69582897c4e6f521e3d6ba92 100644 (file)
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -146,15 +146,13 @@ options {
         dnssec-secure-to-insecure <boolean>;
         dnssec-update-mode ( maintain | no-resign );
         dnssec-validation ( yes | no | auto );
-        dnstap { ( all | auth | client | forwarder |
-            resolver ) [ ( query | response ) ]; ... }; // not configured
-        dnstap-identity ( <quoted_string> | none |
-            hostname ); // not configured
-        dnstap-output ( file | unix ) <quoted_string> [
-            size ( unlimited | <size> ) ] [ versions (
-            unlimited | <integer> ) ] [ suffix ( increment
-            | timestamp ) ]; // not configured
-        dnstap-version ( <quoted_string> | none ); // not configured
+        dnstap { ( all | auth | client | forwarder | resolver | update ) [
+            ( query | response ) ]; ... };
+        dnstap-identity ( <quoted_string> | none | hostname );
+        dnstap-output ( file | unix ) <quoted_string> [ size ( unlimited |
+            <size> ) ] [ versions ( unlimited | <integer> ) ] [ suffix (
+            increment | timestamp ) ];
+        dnstap-version ( <quoted_string> | none );
         dscp <integer>;
         dual-stack-servers [ port <integer> ] { ( <quoted_string> [ port
             <integer> ] [ dscp <integer> ] | <ipv4_address> [ port
@@ -178,14 +176,14 @@ options {
         forward ( first | only );
         forwarders [ port <integer> ] [ dscp <integer> ] { ( <ipv4_address>
             | <ipv6_address> ) [ port <integer> ] [ dscp <integer> ]; ... };
-        fstrm-set-buffer-hint <integer>; // not configured
-        fstrm-set-flush-timeout <integer>; // not configured
-        fstrm-set-input-queue-size <integer>; // not configured
-        fstrm-set-output-notify-threshold <integer>; // not configured
-        fstrm-set-output-queue-model ( mpsc | spsc ); // not configured
-        fstrm-set-output-queue-size <integer>; // not configured
-        fstrm-set-reopen-interval <ttlval>; // not configured
-        geoip-directory ( <quoted_string> | none ); // not configured
+        fstrm-set-buffer-hint <integer>;
+        fstrm-set-flush-timeout <integer>;
+        fstrm-set-input-queue-size <integer>;
+        fstrm-set-output-notify-threshold <integer>;
+        fstrm-set-output-queue-model ( mpsc | spsc );
+        fstrm-set-output-queue-size <integer>;
+        fstrm-set-reopen-interval <ttlval>;
+        geoip-directory ( <quoted_string> | none );
         geoip-use-ecs <boolean>; // obsolete
         glue-cache <boolean>;
         has-old-clients <boolean>; // obsolete
@@ -206,7 +204,7 @@ options {
         listen-on-v6 [ port <integer> ] [ dscp
             <integer> ] {
             <address_match_element>; ... }; // may occur multiple times
-        lmdb-mapsize <sizeval>; // non-operational
+        lmdb-mapsize <sizeval>;
         lock-file ( <quoted_string> | none );
         maintain-ixfr-base <boolean>; // obsolete
         managed-keys-directory <quoted_string>;
@@ -515,8 +513,8 @@ view <string> [ <class> ] {
         dnssec-secure-to-insecure <boolean>;
         dnssec-update-mode ( maintain | no-resign );
         dnssec-validation ( yes | no | auto );
-        dnstap { ( all | auth | client | forwarder |
-            resolver ) [ ( query | response ) ]; ... }; // not configured
+        dnstap { ( all | auth | client | forwarder | resolver | update ) [
+            ( query | response ) ]; ... };
         dual-stack-servers [ port <integer> ] { ( <quoted_string> [ port
             <integer> ] [ dscp <integer> ] | <ipv4_address> [ port
             <integer> ] [ dscp <integer> ] | <ipv6_address> [ port
@@ -547,7 +545,7 @@ view <string> [ <class> ] {
         }; // may occur multiple times
         key-directory <quoted_string>;
         lame-ttl <ttlval>;
-        lmdb-mapsize <sizeval>; // non-operational
+        lmdb-mapsize <sizeval>;
         maintain-ixfr-base <boolean>; // obsolete
         managed-keys { <string> <string>
             <integer> <integer> <integer>
@@ -822,10 +820,10 @@ view <string> [ <class> ] {
                     static-stub | stub );
                 update-check-ksk <boolean>;
                 update-policy ( local | { ( deny | grant ) <string> (
-                    6to4-self | external | krb5-self | krb5-subdomain |
-                    ms-self | ms-subdomain | name | self | selfsub |
-                    selfwild | subdomain | tcp-self | wildcard | zonesub )
-                    [ <string> ] <rrtypelist>; ... };
+                    6to4-self | external | krb5-self | krb5-selfsub |
+                    krb5-subdomain | ms-self | ms-selfsub | ms-subdomain |
+                    name | self | selfsub | selfwild | subdomain | tcp-self
+                    | wildcard | zonesub ) [ <string> ] <rrtypelist>; ... };
                 use-alt-transfer-source <boolean>;
                 zero-no-soa-ttl <boolean>;
                 zone-statistics ( full | terse | none | <boolean> );
@@ -926,9 +924,10 @@ zone <string> [ <class> ] {
             forward | hint | redirect | static-stub | stub );
         update-check-ksk <boolean>;
         update-policy ( local | { ( deny | grant ) <string> ( 6to4-self |
-            external | krb5-self | krb5-subdomain | ms-self | ms-subdomain
-            | name | self | selfsub | selfwild | subdomain | tcp-self |
-            wildcard | zonesub ) [ <string> ] <rrtypelist>; ... };
+            external | krb5-self | krb5-selfsub | krb5-subdomain | ms-self
+            | ms-selfsub | ms-subdomain | name | self | selfsub | selfwild
+            | subdomain | tcp-self | wildcard | zonesub ) [ <string> ]
+            <rrtypelist>; ... };
         use-alt-transfer-source <boolean>;
         zero-no-soa-ttl <boolean>;
         zone-statistics ( full | terse | none | <boolean> );