From: Aki Tuomi <cmouse@cmouse.fi>
Date: Mon, 24 Jul 2017 06:47:08 +0000 (+0300)
Subject: geoipbackend: Update documentation to note the possibility of mixing service and... 
X-Git-Tag: dnsdist-1.2.0~11^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F5548%2Fhead;p=thirdparty%2Fpdns.git

geoipbackend: Update documentation to note the possibility of mixing service and static records
---

diff --git a/docs/backends/geoip.rst b/docs/backends/geoip.rst
index c164d29fca..0ac64ecbce 100644
--- a/docs/backends/geoip.rst
+++ b/docs/backends/geoip.rst
@@ -167,6 +167,9 @@ then caching will not happen for any records of something.example.com.
 If you need to use TXT for debugging, make sure you use dedicated name
 for it.
 
+Since v4.1.0 you can mix service and static records to produce the sum
+of these records, including apex record.
+
 .. warning::
   If your services match wildcard records in your zone file
   then these will be returned as CNAMEs. This will only be an issue if you