From: Petr Špaček <pspacek@isc.org>
Date: Tue, 1 Feb 2022 12:04:21 +0000 (+0100)
Subject: Add missing parental-agents grammar generation
X-Git-Tag: v9.19.0~132^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34a3b35b08ed0b8f2f723ec78046e6e1d4bb6d31;p=thirdparty%2Fbind9.git

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 feebea07373..75d7e7434cf 100644
--- 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 09e6202eafd..a3a75ded5b3 100644
--- 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 0951e6aa97b..3aab4c8b3e3 100644
--- 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 144967d68e6..f30e6a81051 100644
--- 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> ]; ... };