Replace "master/slave" terms in documentation

Replace those terms with the preferred "primary/secondary" keywords.

diff --git a/bin/rndc/rndc.rst b/bin/rndc/rndc.rst
index 6221073ae8eb00f82020d0dac48faa1cf9b1e9ae..1e4625c6599cc104c77d3f24687e2a9321dc5085 100644 (file)
--- a/bin/rndc/rndc.rst
+++ b/bin/rndc/rndc.rst
@@ -136,7 +136,7 @@ Currently supported commands are:
    This sample ``addzone`` command adds the zone ``example.com`` to
    the default view:
 
-   ``rndc addzone example.com '{ type master; file "example.com.db"; };'``
+   ``rndc addzone example.com '{ type primary; file "example.com.db"; };'``
 
    (Note the brackets around and semi-colon after the zone configuration
    text.)

diff --git a/contrib/dlz/example/README b/contrib/dlz/example/README
index f8667ac5d7b5fe36bc93925beb62b0ad3ff958b8..d82a0461fdfd3b13a050e3ed32b8537770b52f46 100644 (file)
--- a/contrib/dlz/example/README
+++ b/contrib/dlz/example/README
@@ -22,8 +22,8 @@ The response is converted to DNS wire format by named.  This conversion,
 and the lack of any internal caching, places significant limits on the
 query performance of DLZ modules.  Consequently, DLZ is not recommended
 for use on high-volume servers.  However, it can be used in a hidden
-master configuration, with slaves retrieving zone updates via AXFR.
-(Note, however, that DLZ has no built-in support for DNS notify; slaves
+primary configuration, with secondaries retrieving zone updates via AXFR.
+(Note, however, that DLZ has no built-in support for DNS notify; secondaries
 are not automatically informed of changes to the zones in the database.)
 
 CONFIGURING DLZ:

diff --git a/doc/arm/advanced.rst b/doc/arm/advanced.rst
index 875d814f1b2c010cf1ba4e2323843d026ede7917..70822302d49157b2d1f3cac556bad232ca74aa3f 100644 (file)
--- a/doc/arm/advanced.rst
+++ b/doc/arm/advanced.rst
@@ -353,7 +353,7 @@ External (bastion host) DNS server configuration:
    zone "site2.example.com" {
      type secondary;
      file "s/site2.foo.com";
-     masters { another_bastion_host_maybe; };
+     primaries { another_bastion_host_maybe; };
      allow-transfer { internals; externals; }
    };
 

diff --git a/doc/arm/catz.rst b/doc/arm/catz.rst
index 2b03a945a2cd517d962ad5860868ad29074fe609..29da26467cd5e17b1bcc942343e35feab35730c3 100644 (file)
--- a/doc/arm/catz.rst
+++ b/doc/arm/catz.rst
@@ -243,5 +243,5 @@ configuration file.
 
 Note that none of the global records for an option are inherited if any
 records are defined for that option for the specific zone. For example,
-if the zone had a ``masters`` record of type A but not AAAA, it
+if the zone had a ``primaries`` record of type A but not AAAA, it
 would *not* inherit the type AAAA record from the global option.

diff --git a/doc/arm/configuration.rst b/doc/arm/configuration.rst
index 00f9f6b49b216ab152368e6305bcff6e637e51ee..8cce40a553dc4a69e3ada8744c484da2035685aa 100644 (file)
--- a/doc/arm/configuration.rst
+++ b/doc/arm/configuration.rst
@@ -96,7 +96,7 @@ the primary server for ``example.com`` and a secondary server for the subdomain
         type secondary;
         file "eng.example.com.bk";
         // IP address of eng.example.com primary server
-        masters { 192.168.4.12; };
+        primaries { 192.168.4.12; };
    };
 
 .. _load_balancing:

diff --git a/doc/design/database b/doc/design/database
index 8a8fa58ee0702fc3cd01e8bee92513014c119c8d..0d711eae0c4dfb5642b8812b8a5f8cebaa99393b 100644 (file)
--- a/doc/design/database
+++ b/doc/design/database
@@ -35,8 +35,8 @@ validation status, may change.
 
 Database Updates
 
-A master zone is updated by a Dynamic Update message.  A slave zone is
-updated by IXFR or AXFR.  AXFR provides the entire contents of the new
+A primary zone is updated by a Dynamic Update message.  A secondary zone
+is updated by IXFR or AXFR.  AXFR provides the entire contents of the new
 zone version, and replaces the entire contents of the database.  IXFR
 and Dynamic Update, although completely different protocols, have the
 same basic database requirements.  They are differential update

diff --git a/doc/design/keydone b/doc/design/keydone
index 212d0bde0f8d34217e8b1ed340b333c774939421..d31fae0189c81a6a377c976aab1b9a9ac89bbe1f 100644 (file)
--- a/doc/design/keydone
+++ b/doc/design/keydone
@@ -17,7 +17,7 @@ See COPYRIGHT in the source root or https://isc.org/copyright.html for terms.
         [view]]'.
                 Err: DNS_R_NOTFOUND
 
-        zone must be a master (signed inline == master) or normal
+        zone must be a primary (signed inline == primary) or normal
         dynamic zone.
                 Err: DNS_R_NOTMASTER
 

diff --git a/doc/design/unsupported-algorithms-in-bind9 b/doc/design/unsupported-algorithms-in-bind9
index ffb258c2cdb7e6e79031e3db6921bc28a320071d..d732b122a40bbc27ffe38a69fa675f85f46ffd30 100644 (file)
--- a/doc/design/unsupported-algorithms-in-bind9
+++ b/doc/design/unsupported-algorithms-in-bind9
@@ -37,7 +37,7 @@ as it is not used for *signing* that zone.
 BIND 9 also does not allow unsupported algorithms to be used with `auto-dnssec`:
 
     zone "example" IN {
-        type master;
+        type primary;
         file "db/example.db";
         key-directory "keys/example";
         inline-signing yes;

diff --git a/doc/design/zone b/doc/design/zone
index 4d12e6680fe1ef654073c46bdbb6012ee4bc8f05..5e2e3e10bed1afe4bda6d5c0ed7010330c58b284 100644 (file)
--- a/doc/design/zone
+++ b/doc/design/zone
@@ -15,14 +15,14 @@ Overview
 
        * name
        * class
-       * master / slave / stub / hint / cache / forward
+       * primary / secondary / stub / hint / cache / forward
        * serial number
        * signed / unsigned
-       * update periods (refresh / retry) (slave / stub)
+       * update periods (refresh / retry) (secondary / stub)
        * last update time (slave / stub)
        * access restrictions
-       * transfer restrictions (master / slave)
-       * update restictions (master / slave)
+       * transfer restrictions (primary / slave)
+       * update restictions (primary / slave)
        * expire period (slave / stub)
        * children => bottom
        * glue
@@ -30,8 +30,8 @@ Overview
        * transfer "in" in progress
        * transfers "out" in progress
        * "current" check in progress
-       * our masters
-       * primary master name (required to auto generate our masters)
+       * our primaries
+       * primary server name (required to auto generate our primaries)
        * master file name
        * database name
        * database type
@@ -96,7 +96,7 @@ Overview
        slave setups are continual and ongoing sources of problems in the
        DNS.  Periodic checks to ensure parent and child servers agree on
        the list of nameservers and that slaves are tracking the changes
-       made in the master server's zone will allow problems in
+       made in the primary server's zone will allow problems in
        configurations to be identified earlier providing for a more stable
        DNS.
 
@@ -175,7 +175,7 @@ Functions:
     dns_zone_axfrin(dns_zone_t *zone, isc_sockaddr_t *addr);
 
        Initiate transfer of the zone from the given server or the
-       masters masters listed in the zone structure.
+       primary servers listed in the zone structure.
 
     dns_zone_maintenance(dns_zone_t *zone);
 
@@ -186,15 +186,15 @@ Functions:
 
     dns_zone_locateprimary(dns_zone_t *zone);
 
-       Working from the root zone locate the primary master for the zone.
-       Used if masters are not given in named.conf.
+       Working from the root zone locate the primary server for the zone.
+       Used if primaries are not given in named.conf.
 
     dns_zone_locateservers(dns_zone_t *zone);
 
        Working from the root zone locate the servers for the zone.
-       Primary master moved to first in list if in NS set.  Remove self
+       Primary server moved to first in list if in NS set.  Remove self
        from list.
-       Used if masters are not given in named.conf.
+       Used if primaries are not given in named.conf.
 
     dns_zone_notify(dns_zone_t *);
 
@@ -204,7 +204,7 @@ Functions:
 
        check that the parent nameservers NS lists for this zone agree with
        the NS list this zone, check glue A records. Warn if not identical.
-       This operation is performed on master zones.
+       This operation is performed on primary zones.
 
     dns_zone_checkchildren(dns_zone_t *);
 
@@ -229,11 +229,11 @@ Functions:
 
     dns_zone_addmaster(dns_zone_t *zone, isc_sockaddr_t *addr);
 
-       Add addr to the set of masters for the zone.
+       Add addr to the set of primaries for the zone.
 
     dns_zone_clearmasters(dns_zone_t *zone);
 
-       Clear the master set.
+       Clear the primary set.
 
     dns_zone_setreadacl(dns_zone_t *, dns_acl_t *)
 

diff --git a/doc/man/rndc.8in b/doc/man/rndc.8in
index e4027c4a2883b713a7e7984fb08d83a41034adf2..25543d58926299dac805389bb3fc013cb2effec1 100644 (file)
--- a/doc/man/rndc.8in
+++ b/doc/man/rndc.8in
@@ -136,7 +136,7 @@ after a restart.
 This sample \fBaddzone\fP command adds the zone \fBexample.com\fP to
 the default view:
 .sp
-\fBrndc addzone example.com \(aq{ type master; file "example.com.db"; };\(aq\fP
+\fBrndc addzone example.com \(aq{ type primary; file "example.com.db"; };\(aq\fP
 .sp
 (Note the brackets around and semi\-colon after the zone configuration
 text.)