upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 03:09:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add missing parental-agents grammar generation

Browse source 
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
0311705d4b.

Related: !5234
(cherry picked from commit 34a3b35b08)
This commit is contained in:
Petr Špaček 2022-02-01 13:04:21 +01:00
parent 2262bb9538
commit 724a051820
No known key found for this signature in database
GPG key ID: ABD587CDF06581AE
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/arm/Makefile.am
View file

@ -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 \

6
doc/arm/reference.rst
View file

@ -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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

6
doc/misc/Makefile.am
View file

@ -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

6
doc/misc/parentals.grammar.rst → doc/misc/parental-agents.grammar.rst
View file

@ -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> ]; ... };