update NEWS, docs

Fixes https://gitlab.labs.nic.cz/knot/resolver/issues/204

diff --git a/NEWS b/NEWS
index 177cc9a6d250cc9e4fee03e070ec313b30e3ee20..311f5ac0a3d3f35cac8b43cebff0bc908acbfd44 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ Bugfixes
 - daemon: check existence of config file even if rundir isn't specified
 - policy.FORWARD and STUB: use RTT tracking to choose servers (#125, #208)
 - dns64: fix CNAME problems (#203)  It still won't work with query policies.
+- hints: better interpretation of hosts-like files (#204)
 
 Improvements
 ------------

diff --git a/modules/hints/README.rst b/modules/hints/README.rst
index 26486fbbc4d18db352e480db70774a6783a934f2..57f2628454a2961fee13e9c5aeec41e2c1f84662 100644 (file)
--- a/modules/hints/README.rst
+++ b/modules/hints/README.rst
@@ -6,7 +6,7 @@ Static hints
 This is a module providing static hints for forward records (A/AAAA) and reverse records (PTR).
 The records can be loaded from ``/etc/hosts``-like files and/or added directly.
 
-You can also use the module to change root hints that are used as a safety belt, or if the root NS
+You can also use the module to change root hints.  They are used as a safety belt or if the root NS
 drops out of cache.
 
 Examples
@@ -22,7 +22,7 @@ Examples
     hints.root({
       ['j.root-servers.net.'] = { '2001:503:c27::2:30', '192.58.128.30' }
     })
-    -- Set custom hint
+    -- Add a custom hint
     hints['localhost'] = '127.0.0.1'
 
 Properties
@@ -57,6 +57,12 @@ Properties
 
   Add a hostname - address pair hint.
 
+  .. note::
+
+    If multiple addresses have been added for a name, all are returned in a forward query.
+    If multiple names have been added to an address, the last one defined is returned
+    in a corresponding PTR query.
+
 .. function:: hints.del(pair)
 
   :param string pair:  ``hostname address`` i.e. ``"localhost 127.0.0.1"``, or just ``hostname``