Add missing parental-agents grammar generation

Formerly parental-agents grammar was an exception and it did not
auto-generate itself from source code. From now on it is generated using
the same mechanism as other grammars.

For consistency with rest of the system, I've also renamed the grammar
file and the link anchors from "parentals" to "parental-agents".

Technically this is fixup for commit
0311705d4b36c536dd541b0b193bd01b68fe90b3.

Related: !5234

diff --git a/doc/arm/Makefile.am b/doc/arm/Makefile.am
index feebea0737380e25a842128bf2a253314988adf1..75d7e7434cf372fc2eef90f06f99e430c3927bc5 100644 (file)
--- a/doc/arm/Makefile.am
+++ b/doc/arm/Makefile.am
@@ -40,7 +40,7 @@ EXTRA_DIST =                                  \
        ../misc/master.zoneopt.rst              \
        ../misc/mirror.zoneopt.rst              \
        ../misc/options.grammar.rst             \
-       ../misc/parentals.grammar.rst           \
+       ../misc/parental-agents.grammar.rst     \
        ../misc/primaries.grammar.rst           \
        ../misc/redirect.zoneopt.rst            \
        ../misc/server.grammar.rst              \

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index 09e6202eafdd4a8fe5582b3a24296c524a6adc77..a3a75ded5b3af12bc0dd1c8f24ad10f6003806ca 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -851,14 +851,14 @@ At ``debug`` level 4 or higher, the detailed context information logged at
 ``debug`` level 2 is logged for errors other than SERVFAIL and for negative
 responses such as NXDOMAIN.
 
-.. _parentals_grammar:
+.. _parental_agents_grammar:
 
 ``parental-agents`` Statement Grammar
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. include:: ../misc/parentals.grammar.rst
+.. include:: ../misc/parental-agents.grammar.rst
 
-.. _parentals_statement:
+.. _parental_agents_statement:
 
 ``parental-agents`` Statement Definition and Usage
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/doc/misc/Makefile.am b/doc/misc/Makefile.am
index 0951e6aa97b7d01f0ee3c144e8849be8ac8769b7..3aab4c8b3e3bca3c02974cfbdf8acc1ebd561d52 100644 (file)
--- a/doc/misc/Makefile.am
+++ b/doc/misc/Makefile.am
@@ -38,7 +38,8 @@ OPTIONS_FILES =                               \
        trust-anchors.grammar.rst       \
        managed-keys.grammar.rst        \
        trusted-keys.grammar.rst        \
-       http.grammar.rst
+       http.grammar.rst                \
+       parental-agents.grammar.rst
 
 EXTRA_DIST =                   \
        $(OPTIONS_FILES)        \
@@ -179,4 +180,7 @@ trusted-keys.grammar.rst: options.active rst-grammars.pl
 http.grammar.rst: options.active rst-grammars.pl
        $(AM_V_RST_GRAMMARS)$(PERL) $(srcdir)/rst-grammars.pl options.active http > $@
 
+parental-agents.grammar.rst: options.active rst-grammars.pl
+       $(AM_V_RST_GRAMMARS)$(PERL) $(srcdir)/rst-grammars.pl options.active parental-agents > $@
+
 endif

diff --git a/doc/misc/parentals.grammar.rst b/doc/misc/parental-agents.grammar.rst
similarity index 84%
rename from doc/misc/parentals.grammar.rst
rename to doc/misc/parental-agents.grammar.rst
index 144967d68e6658c051916ea4a4ea4129a1af92f6..f30e6a81051a661532d19d78a2bb63e0fdd844d6 100644 (file)
--- a/doc/misc/parentals.grammar.rst
+++ b/doc/misc/parental-agents.grammar.rst
@@ -9,8 +9,10 @@
 .. See the COPYRIGHT file distributed with this work for additional
 .. information regarding copyright ownership.
 
-  parental-agents <string> [ port <integer> ] [ dscp
-      <integer> ] { ( <remote-servers> |
+::
+
+  parental-agents <string> [ port <integer> ] [
+      dscp <integer> ] { ( <remote-servers> |
       <ipv4_address> [ port <integer> ] |
       <ipv6_address> [ port <integer> ] ) [ key
       <string> ] [ tls <string> ]; ... };