Regenerate .rst files with grammars after changes to rst generators

    $ make -C doc/misc rst

(reimplementation of commit e97c35b3bc5835f690d50dbcfa0d26b7caf56fb9)

diff --git a/doc/misc/acl.grammar.rst b/doc/misc/acl.grammar.rst
index 4b9d81458e804fc377863e3aead272a3f2509225..d27dab3a158703b8c447b2a6369410646de170f7 100644 (file)
--- a/doc/misc/acl.grammar.rst
+++ b/doc/misc/acl.grammar.rst
@@ -9,4 +9,6 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   acl <string> { <address_match_element>; ... };

diff --git a/doc/misc/controls.grammar.rst b/doc/misc/controls.grammar.rst
index 3c59b7d9081d46d1222ee760f75e1b568c406ce6..440bce492910bbc574985cb056058b2ab723c13c 100644 (file)
--- a/doc/misc/controls.grammar.rst
+++ b/doc/misc/controls.grammar.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   controls {
        inet ( <ipv4_address> | <ipv6_address> |
            * ) [ port ( <integer> | * ) ] allow

diff --git a/doc/misc/delegation-only.zoneopt.rst b/doc/misc/delegation-only.zoneopt.rst
index 3f7d8d1a272f3b13977e31007e5eb24cea6ee4cd..2a262d14f238af26d3afad9e01be142c35f1ff2b 100644 (file)
--- a/doc/misc/delegation-only.zoneopt.rst
+++ b/doc/misc/delegation-only.zoneopt.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   zone <string> [ <class> ] {
        type delegation-only;
   };

diff --git a/doc/misc/forward.zoneopt.rst b/doc/misc/forward.zoneopt.rst
index cf162b866f5faed10b8633eded58a4c921dcbac5..3ced3ac35653269cae37bd1f3e77905e6a75cf47 100644 (file)
--- a/doc/misc/forward.zoneopt.rst
+++ b/doc/misc/forward.zoneopt.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   zone <string> [ <class> ] {
        type forward;
        delegation-only <boolean>;

diff --git a/doc/misc/hint.zoneopt.rst b/doc/misc/hint.zoneopt.rst
index 33a9fb2cecc8df3f0c95b6bef306bf0721276cf4..998e66240cf23719034f62910e39df50f8f0990f 100644 (file)
--- a/doc/misc/hint.zoneopt.rst
+++ b/doc/misc/hint.zoneopt.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   zone <string> [ <class> ] {
        type hint;
        check-names ( fail | warn | ignore );

diff --git a/doc/misc/in-view.zoneopt.rst b/doc/misc/in-view.zoneopt.rst
index 8b3b5c1021d5ae91c56a0d738c0d8579c8598879..df1a587307ba4181177196c951fbf3f0bde4ba3d 100644 (file)
--- a/doc/misc/in-view.zoneopt.rst
+++ b/doc/misc/in-view.zoneopt.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   zone <string> [ <class> ] {
        in-view <string>;
   };

diff --git a/doc/misc/key.grammar.rst b/doc/misc/key.grammar.rst
index aec1c82c028b296b4c5c4f16a3c1e05e7439a978..a417997a72de2d5348dac26594aa52a75fe1a5b1 100644 (file)
--- a/doc/misc/key.grammar.rst
+++ b/doc/misc/key.grammar.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   key <string> {
        algorithm <string>;
        secret <string>;

diff --git a/doc/misc/logging.grammar.rst b/doc/misc/logging.grammar.rst
index 2a0d540640d0c7d5a9feb14d61833b6c9a140513..377d6e968d95ba1e3b7190ea7872146be7722a70 100644 (file)
--- a/doc/misc/logging.grammar.rst
+++ b/doc/misc/logging.grammar.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   logging {
        category <string> { <string>; ... };
        channel <string> {

diff --git a/doc/misc/managed-keys.grammar.rst b/doc/misc/managed-keys.grammar.rst
index 7d74262209d5a3f40d9d4d5d6913b80d13f8d403..a57f8ef8a62ceb6dee655f8b1357b5d8f79aad42 100644 (file)
--- a/doc/misc/managed-keys.grammar.rst
+++ b/doc/misc/managed-keys.grammar.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   managed-keys { <string> ( static-key
       | initial-key | static-ds |
       initial-ds ) <integer> <integer>

diff --git a/doc/misc/master.zoneopt.rst b/doc/misc/master.zoneopt.rst
index f05a3a719eaedfc958899ddf52a31d7e41be64e1..8fe18c6db0c463587ace9826e888418684c25776 100644 (file)
--- a/doc/misc/master.zoneopt.rst
+++ b/doc/misc/master.zoneopt.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   zone <string> [ <class> ] {
        type ( master | primary );
        allow-query { <address_match_element>; ... };

diff --git a/doc/misc/mirror.zoneopt.rst b/doc/misc/mirror.zoneopt.rst
index 84eb34373205e13655b3dbc326412fc356221f88..b425a96a93823d81b7d088bfb7843e1edad8f624 100644 (file)
--- a/doc/misc/mirror.zoneopt.rst
+++ b/doc/misc/mirror.zoneopt.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   zone <string> [ <class> ] {
        type mirror;
        allow-notify { <address_match_element>; ... };

diff --git a/doc/misc/options.grammar.rst b/doc/misc/options.grammar.rst
index 6ae3f33bc1b58ac45c8b7d8c1a8066a8ad190b3b..582053b40072461a58f8d1f1885bc9525b0efd76 100644 (file)
--- a/doc/misc/options.grammar.rst
+++ b/doc/misc/options.grammar.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   options {
        allow-new-zones <boolean>;
        allow-notify { <address_match_element>; ... };
@@ -91,12 +93,15 @@
        dnssec-secure-to-insecure <boolean>;
        dnssec-update-mode ( maintain | no-resign );
        dnssec-validation ( yes | no | auto );
-       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 { ( 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

diff --git a/doc/misc/parentals.grammar.rst b/doc/misc/parentals.grammar.rst
index ad3f565e011c144dc87594fe206fb6c748b3f1ac..509d01c3a6cb898cb305465509dfa2ebaa660de8 100644 (file)
--- a/doc/misc/parentals.grammar.rst
+++ b/doc/misc/parentals.grammar.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   parental-agents <string> [ port <integer> ] [
       dscp <integer> ] { ( <remote-servers> |
       <ipv4_address> [ port <integer> ] |

diff --git a/doc/misc/primaries.grammar.rst b/doc/misc/primaries.grammar.rst
index 107c24245609f2c894df511c32c697f86a5fb24f..7e1901ec3ec1da30defd5ed5f8b76cfe2139f139 100644 (file)
--- a/doc/misc/primaries.grammar.rst
+++ b/doc/misc/primaries.grammar.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   primaries <string> [ port <integer> ] [ dscp
       <integer> ] { ( <remote-servers> |
       <ipv4_address> [ port <integer> ] |

diff --git a/doc/misc/redirect.zoneopt.rst b/doc/misc/redirect.zoneopt.rst
index 841befe121a4873cb055762ad7697dc8394ef41f..51c378ad81c220c61baaf30f65fe7277e799a202 100644 (file)
--- a/doc/misc/redirect.zoneopt.rst
+++ b/doc/misc/redirect.zoneopt.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   zone <string> [ <class> ] {
        type redirect;
        allow-query { <address_match_element>; ... };

diff --git a/doc/misc/server.grammar.rst b/doc/misc/server.grammar.rst
index 056e186c68fbf76f191b32940c0bd9a5bd4b0bca..526636ec902d38c1596f99d56dafa5220851f52e 100644 (file)
--- a/doc/misc/server.grammar.rst
+++ b/doc/misc/server.grammar.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   server <netprefix> {
        bogus <boolean>;
        edns <boolean>;

diff --git a/doc/misc/slave.zoneopt.rst b/doc/misc/slave.zoneopt.rst
index 3700bf6fe62b8672ad7eb9bfd1586fa10a36f8a3..cc72dcbf67751a858ab39d1eab21a54d72f5b80e 100644 (file)
--- a/doc/misc/slave.zoneopt.rst
+++ b/doc/misc/slave.zoneopt.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   zone <string> [ <class> ] {
        type ( slave | secondary );
        allow-notify { <address_match_element>; ... };

diff --git a/doc/misc/static-stub.zoneopt.rst b/doc/misc/static-stub.zoneopt.rst
index b8681a821779af3ae2777014bb3a9e409a4334c3..d307586718f14d28b2b4da4519590d438bf39680 100644 (file)
--- a/doc/misc/static-stub.zoneopt.rst
+++ b/doc/misc/static-stub.zoneopt.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   zone <string> [ <class> ] {
        type static-stub;
        allow-query { <address_match_element>; ... };

diff --git a/doc/misc/statistics-channels.grammar.rst b/doc/misc/statistics-channels.grammar.rst
index dda9c682b2f28ed75d9df231254f7ff58e68e042..7a4ef27d253ed26a9d59060251da316d7c6fe68b 100644 (file)
--- a/doc/misc/statistics-channels.grammar.rst
+++ b/doc/misc/statistics-channels.grammar.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   statistics-channels {
        inet ( <ipv4_address> | <ipv6_address> |
            * ) [ port ( <integer> | * ) ] [

diff --git a/doc/misc/stub.zoneopt.rst b/doc/misc/stub.zoneopt.rst
index 454d53791fdee464da981bf4b7a811e7cac0ee23..6b5ce2d1cfa8e713414d5b55976bba6181fd0c32 100644 (file)
--- a/doc/misc/stub.zoneopt.rst
+++ b/doc/misc/stub.zoneopt.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   zone <string> [ <class> ] {
        type stub;
        allow-query { <address_match_element>; ... };

diff --git a/doc/misc/trust-anchors.grammar.rst b/doc/misc/trust-anchors.grammar.rst
index fffb8a5b968cca69ba9febf79f79870ed1fbeea5..eabe7c082c7cf85f45e4b1530766dea0faf6a764 100644 (file)
--- a/doc/misc/trust-anchors.grammar.rst
+++ b/doc/misc/trust-anchors.grammar.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   trust-anchors { <string> ( static-key |
       initial-key | static-ds | initial-ds )
       <integer> <integer> <integer>

diff --git a/doc/misc/trusted-keys.grammar.rst b/doc/misc/trusted-keys.grammar.rst
index 1428d2172ee7ff1f80cb9f04183e5a11bb89aef4..55cfa3805dfc37f642b673b7af6d488c4db3c6fb 100644 (file)
--- a/doc/misc/trusted-keys.grammar.rst
+++ b/doc/misc/trusted-keys.grammar.rst
@@ -9,6 +9,8 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
+::
+
   trusted-keys { <string> <integer>
       <integer> <integer>
       <quoted_string>; ... };, deprecated