remove old zone type documentation

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

diff --git a/doc/arm/Makefile.am b/doc/arm/Makefile.am
index 75d7e7434cf372fc2eef90f06f99e430c3927bc5..9db674b8d65abf74e80c12d539f69b22d0464c0c 100644 (file)
--- a/doc/arm/Makefile.am
+++ b/doc/arm/Makefile.am
@@ -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                \

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index b9d1145e542c100f8e131e49fc035cafbc22a63c..b6aadb86ceac4c9e6af935066ebf8935c92d8e92 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -5454,8 +5454,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

diff --git a/doc/misc/Makefile.am b/doc/misc/Makefile.am
index 3aab4c8b3e3bca3c02974cfbdf8acc1ebd561d52..a2fa397d1bc7206c1cdd6ee8f0ec854b59a2820c 100644 (file)
--- a/doc/misc/Makefile.am
+++ b/doc/misc/Makefile.am
@@ -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 > $@

diff --git a/doc/misc/master.zoneopt b/doc/misc/primary.zoneopt
similarity index 99%
rename from doc/misc/master.zoneopt
rename to doc/misc/primary.zoneopt
index 69134fd1f4ddfcf21162db6f4bdfe099b33e2362..8811d2023e8e05f8dba8a1a10dbf47bfa77b9a4b 100644 (file)
--- a/doc/misc/master.zoneopt
+++ b/doc/misc/primary.zoneopt
@@ -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>; ... };

diff --git a/doc/misc/master.zoneopt.rst b/doc/misc/primary.zoneopt.rst
similarity index 99%
rename from doc/misc/master.zoneopt.rst
rename to doc/misc/primary.zoneopt.rst
index e4d01d68c754291783ead752572c7a2f6191bcae..b03d60b905be4f23f50b9c0c6d7e25da512a33bb 100644 (file)
--- a/doc/misc/master.zoneopt.rst
+++ b/doc/misc/primary.zoneopt.rst
@@ -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>; ... };

diff --git a/doc/misc/slave.zoneopt b/doc/misc/secondary.zoneopt
similarity index 99%
rename from doc/misc/slave.zoneopt
rename to doc/misc/secondary.zoneopt
index 595e94b5481db3125d706309c99c7ef9758ac0b8..22c3a8d19d33bd68151dcf403b9f53cbf06dae4c 100644 (file)
--- a/doc/misc/slave.zoneopt
+++ b/doc/misc/secondary.zoneopt
@@ -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>; ... };

diff --git a/doc/misc/slave.zoneopt.rst b/doc/misc/secondary.zoneopt.rst
similarity index 99%
rename from doc/misc/slave.zoneopt.rst
rename to doc/misc/secondary.zoneopt.rst
index 5e0e84b7c3aa6ead3ab13eb1359e47919a19cdf4..538f19117170d0ee7c680996162d291017aa63e6 100644 (file)
--- a/doc/misc/slave.zoneopt.rst
+++ b/doc/misc/secondary.zoneopt.rst
@@ -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>; ... };

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 5fa822c05f566cee175a7198794627fd8636bd69..4f4ded601073c22e1fa22830eb6363668e7d6d2f 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -3855,11 +3855,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);