apply doc review comments from Pieter

diff --git a/docs/modes-of-operation.rst b/docs/modes-of-operation.rst
index 6b434552690f822ec4afa11129391960ed049f42..e2ec6804ca62a5451bd694ae2f6ed34115ee7680 100644 (file)
--- a/docs/modes-of-operation.rst
+++ b/docs/modes-of-operation.rst
@@ -31,8 +31,8 @@ managing records etc.
 .. _master-operation:
 .. _primary-operation:
 
-Master operation
-----------------
+Primary operation
+-----------------
 
 When operating as a master, PowerDNS sends out notifications of changes
 to slaves, which react to these notifications by querying PowerDNS to
@@ -89,8 +89,8 @@ the :ref:`pdns_control <running-pdnscontrol>` tool:
 .. _slave-operation:
 .. _secondary-operation:
 
-Slave operation
----------------
+Secondary operation
+-------------------
 
 On launch, PowerDNS requests from all backends a list of domains which
 have not been checked recently for changes. This should happen every

diff --git a/docs/settings.rst b/docs/settings.rst
index b1090562e6e355f7c8c19c3e5237558eb77894ed..d83489fdfd9034ca0689d3e3cf1ab98186ae8f94 100644 (file)
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1854,9 +1854,9 @@ If a PID file should be written.
 -  Integer
 -  Default: 60
 
-On a master, this is the amount of seconds between the master checking
+On a primary, this is the amount of seconds between the primary checking
 the SOA serials in its database to determine to send out NOTIFYs to the
-slaves. On slaves, this is the number of seconds between the slave
+secondaries. On secondaries, this is the number of seconds between the secondary
 checking for updates to zones.
 
 .. _setting-xfr-max-received-mbytes: