From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Fri, 20 Feb 2015 14:25:15 +0000 (+0100)
Subject: Merge pull request #2262 from hkraal/master
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~121
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=201b58d9ed9d706d42de1bb4e2694d6edfb3ddca;p=thirdparty%2Fpdns.git

Merge pull request #2262 from hkraal/master

Documentation enhancements (added links and MySQL replication information)
---

201b58d9ed9d706d42de1bb4e2694d6edfb3ddca
diff --cc docs/markdown/authoritative/settings.md
index 923bf4eddd,d6e7e65326..d44e9f3378
--- a/docs/markdown/authoritative/settings.md
+++ b/docs/markdown/authoritative/settings.md
@@@ -388,9 -380,9 +388,9 @@@ stable, and is in fact likely to change
  
  ## `master`
  * Boolean
 -* Default: yes
 +* Default: no
  
- Turn on master support.
+ Turn on master support. See ["Modes of operation"](modes-of-operation.md#master-operation).
  
  ## `max-cache-entries`
  * Integer