Use current settings names rather than the ones deprecated in 4.5.

diff --git a/docs/backends/bind.rst b/docs/backends/bind.rst
index d1b97991be8db6360b97cb7c16cc15629fd33910..e4ab8a577945bf528631f8bb19d787c7f96521a8 100644 (file)
--- a/docs/backends/bind.rst
+++ b/docs/backends/bind.rst
@@ -175,7 +175,7 @@ If :ref:`setting-bind-check-interval` is specified as
 zero, no checks will be performed until the ``pdns_control reload`` command
 is issued.
 
-Please note that also the :ref:`setting-slave-cycle-interval` setting
+Please note that also the :ref:`setting-xfr-cycle-interval` setting
 controls how often a master would notify a slave about changes.
 Especially in 'hidden master' configurations, where servers usually
 don't receive regular queries, you may want to lower that setting to a

diff --git a/docs/backends/tinydns.rst b/docs/backends/tinydns.rst
index 8e65e836e62837ecdb041ff81a5ecbc83c3d964e..a9610ba10abab50658caa7e73a1112ec24729318 100644 (file)
--- a/docs/backends/tinydns.rst
+++ b/docs/backends/tinydns.rst
@@ -116,7 +116,7 @@ domains or updated serial numbers. The CDB datafile requires us to do a
 full scan of all the records. When running with verbose logging, this
 could lead to a lot of output. The scanning of the CDB file may also
 take a while on systems with large files. The scan happens at an
-interval set by the :ref:`setting-slave-cycle-interval`. It
+interval set by the :ref:`setting-xfr-cycle-interval`. It
 might be useful to raise this value to limit the amount of scans on the
 CDB file.
 

diff --git a/docs/domainmetadata.rst b/docs/domainmetadata.rst
index 75422e2e1d6e0d15355e1b7c8cbdac51c71d1943..0a2ad4899d46d0b7e298823ee90a9bf8ee5daa98 100644 (file)
--- a/docs/domainmetadata.rst
+++ b/docs/domainmetadata.rst
@@ -196,7 +196,7 @@ SLAVE-RENOTIFY
 
 If set to 1, will make PowerDNS renotify the secondaries after an AXFR is received from a master.
 Any other value means that no renotifies are done. If not set at all, action will depend on
-the :ref:`setting-slave-renotify` setting.
+the :ref:`setting-secondary-do-renotify` setting.
 
 .. _metadata-soa-edit:
 

diff --git a/docs/migration.rst b/docs/migration.rst
index 4bd177467a1a4d4d8958b0f1b496b8961b6719f7..a25f54c6d31dae3151ccb9a32e58db82a01b607a 100644 (file)
--- a/docs/migration.rst
+++ b/docs/migration.rst
@@ -15,7 +15,7 @@ Using AXFR to a Slave-Capable Backend
 The easiest way to migrate all your zones from your old infrastructure
 to PowerDNS is to add all your domains as a slave domain with your
 current master as the master, wait for the zones to be transferred and
-change the zones to master. Make sure :ref:`setting-slave` is set to "yes"
+change the zones to master. Make sure :ref:`setting-secondary` is set to "yes"
 in your pdns.conf.
 
 To A Generic SQL Backend
@@ -40,7 +40,7 @@ domain in the database:
 
     UPDATE domains set type='MASTER' where type='SLAVE';
 
-And set :ref:`setting-master` to "yes" in your pdns.conf
+And set :ref:`setting-primary` to "yes" in your pdns.conf
 and restart PowerDNS.
 
 Or, if you want to use :ref:`native <native-operation>`:
@@ -76,7 +76,7 @@ transferred. Now you can change the zone type to master:
       file "/var/lib/powerdns/zones/example.net.zone";
     };
 
-Don't forget to enable :ref:`setting-master` in your
+Don't forget to enable :ref:`setting-primary` in your
 pdns.conf and restart, or if this setting was already set, use
 ``pdns_control rediscover`` to load these zones as master zones.