ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

remove old zone type documentation

Browse Source 
we now document zone type as either "primary" or "secondary",
omitting the old terms (though they are still accepted).

(cherry picked from commit 0bde07261b)
This commit is contained in:
Evan Hunt
2022-02-23 17:18:38 -08:00
parent 87be8fea0d
commit 7b604df69d
8 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/arm/Makefile.am
View File

@@ -37,14 +37,14 @@ EXTRA_DIST = \
../misc/key.grammar.rst \
../misc/logging.grammar.rst \
../misc/managed-keys.grammar.rst \
../misc/master.zoneopt.rst \
../misc/primary.zoneopt.rst \
../misc/mirror.zoneopt.rst \
../misc/options.grammar.rst \
../misc/parental-agents.grammar.rst \
../misc/primaries.grammar.rst \
../misc/redirect.zoneopt.rst \
../misc/server.grammar.rst \
../misc/slave.zoneopt.rst \
../misc/secondary.zoneopt.rst \
../misc/static-stub.zoneopt.rst \
../misc/statistics-channels.grammar.rst \
../misc/stub.zoneopt.rst \

4
doc/arm/reference.rst
View File

@@ -5460,8 +5460,8 @@ Here is an example of a typical split DNS setup implemented using
``zone`` Statement Grammar
~~~~~~~~~~~~~~~~~~~~~~~~~~
.. include:: ../misc/master.zoneopt.rst
.. include:: ../misc/slave.zoneopt.rst
.. include:: ../misc/primary.zoneopt.rst
.. include:: ../misc/secondary.zoneopt.rst
.. include:: ../misc/mirror.zoneopt.rst
.. include:: ../misc/hint.zoneopt.rst
.. include:: ../misc/stub.zoneopt.rst

24
doc/misc/Makefile.am
View File

@@ -4,8 +4,8 @@ include $(top_srcdir)/Makefile.docs
OPTIONS_FILES = \
options \
options.active \
master.zoneopt \
slave.zoneopt \
primary.zoneopt \
secondary.zoneopt \
mirror.zoneopt \
forward.zoneopt \
hint.zoneopt \
@@ -15,8 +15,8 @@ OPTIONS_FILES = \
delegation-only.zoneopt \
in-view.zoneopt \
../../bin/named/named.conf.rst \
master.zoneopt.rst \
slave.zoneopt.rst \
primary.zoneopt.rst \
secondary.zoneopt.rst \
mirror.zoneopt.rst \
forward.zoneopt.rst \
hint.zoneopt.rst \
@@ -75,11 +75,11 @@ options: cfg_test
options.active: cfg_test
$(AM_V_CFG_TEST)$(builddir)/cfg_test --named --grammar --active | $(PERL) $(srcdir)/sort-options.pl | $(PERL) $(srcdir)/format-options.pl --strip-not-configured > $@
master.zoneopt: cfg_test
$(AM_V_CFG_TEST)$(builddir)/cfg_test --zonegrammar master --active > $@
primary.zoneopt: cfg_test
$(AM_V_CFG_TEST)$(builddir)/cfg_test --zonegrammar primary --active > $@
slave.zoneopt: cfg_test
$(AM_V_CFG_TEST)$(builddir)/cfg_test --zonegrammar slave --active > $@
secondary.zoneopt: cfg_test
$(AM_V_CFG_TEST)$(builddir)/cfg_test --zonegrammar secondary --active > $@
mirror.zoneopt: cfg_test
$(AM_V_CFG_TEST)$(builddir)/cfg_test --zonegrammar mirror --active > $@
@@ -108,11 +108,11 @@ in-view.zoneopt: cfg_test
../../bin/named/named.conf.rst: options.active rst-options.pl
$(AM_V_RST_OPTIONS)$(PERL) $(srcdir)/rst-options.pl options.active > $@
master.zoneopt.rst: master.zoneopt rst-zoneopt.pl
$(AM_V_RST_ZONEOPT)$(PERL) $(srcdir)/rst-zoneopt.pl master.zoneopt > $@
primary.zoneopt.rst: primary.zoneopt rst-zoneopt.pl
$(AM_V_RST_ZONEOPT)$(PERL) $(srcdir)/rst-zoneopt.pl primary.zoneopt > $@
slave.zoneopt.rst: slave.zoneopt rst-zoneopt.pl
$(AM_V_RST_ZONEOPT)$(PERL) $(srcdir)/rst-zoneopt.pl slave.zoneopt > $@
secondary.zoneopt.rst: secondary.zoneopt rst-zoneopt.pl
$(AM_V_RST_ZONEOPT)$(PERL) $(srcdir)/rst-zoneopt.pl secondary.zoneopt > $@
mirror.zoneopt.rst: mirror.zoneopt rst-zoneopt.pl
$(AM_V_RST_ZONEOPT)$(PERL) $(srcdir)/rst-zoneopt.pl mirror.zoneopt > $@

2
doc/misc/master.zoneopt → doc/misc/primary.zoneopt
View File

@@ -1,5 +1,5 @@
zone <string> [ <class> ] {
type ( master | primary );
type primary;
allow-query { <address_match_element>; ... };
allow-query-on { <address_match_element>; ... };
allow-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };

2
doc/misc/master.zoneopt.rst → doc/misc/primary.zoneopt.rst
View File

@@ -12,7 +12,7 @@
::
zone <string> [ <class> ] {
type ( master | primary );
type primary;
allow-query { <address_match_element>; ... };
allow-query-on { <address_match_element>; ... };
allow-transfer [ port <integer> ] [ transport <string> ] { <address_match_element>; ... };

2
doc/misc/slave.zoneopt → doc/misc/secondary.zoneopt
View File

@@ -1,5 +1,5 @@
zone <string> [ <class> ] {
type ( slave | secondary );
type secondary;
allow-notify { <address_match_element>; ... };
allow-query { <address_match_element>; ... };
allow-query-on { <address_match_element>; ... };

2
doc/misc/slave.zoneopt.rst → doc/misc/secondary.zoneopt.rst
View File

@@ -12,7 +12,7 @@
::
zone <string> [ <class> ] {
type ( slave | secondary );
type secondary;
allow-notify { <address_match_element>; ... };
allow-query { <address_match_element>; ... };
allow-query-on { <address_match_element>; ... };

4
lib/isccfg/namedconf.c
View File

@@ -3854,11 +3854,11 @@ cfg_print_zonegrammar(const unsigned int zonetype, unsigned int flags,
switch (zonetype) {
case CFG_ZONE_PRIMARY:
cfg_print_indent(&pctx);
cfg_print_cstr(&pctx, "type ( master | primary );\n");
cfg_print_cstr(&pctx, "type primary;\n");
break;
case CFG_ZONE_SECONDARY:
cfg_print_indent(&pctx);
cfg_print_cstr(&pctx, "type ( slave | secondary );\n");
cfg_print_cstr(&pctx, "type secondary;\n");
break;
case CFG_ZONE_MIRROR:
cfg_print_indent(&pctx);