diff --git a/doc/arm/Makefile.am b/doc/arm/Makefile.am index feebea0737..75d7e7434c 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 09e6202eaf..a3a75ded5b 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 0951e6aa97..3aab4c8b3e 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 144967d68e..f30e6a8105 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 [ port ] [ dscp - ] { ( | +:: + + parental-agents [ port ] [ + dscp ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... };