Merge branch 'master' into ref

diff --cc pdns/dnsdistdist/docs/rules-actions.rst
index 9dbb3f6a4c9329616f4932a93bf3e05bfe7d3264,f2ad20a6d30e33652c1b39ed4f4d478f73a4a498..a0d1e38b51b67ef98b284022763db2243d3c8108
--- 1/pdns/dnsdistdist/docs/rules-actions.rst
--- 2/pdns/dnsdistdist/docs/rules-actions.rst
+++ b/pdns/dnsdistdist/docs/rules-actions.rst
@@@ -717,8 -720,8 +720,8 @@@ These ``DNSRule``\ s be one of the foll
  .. function:: RecordsTypeCountRule(section, qtype, minCount, maxCount)
  
    Matches if there is at least ``minCount`` and at most ``maxCount`` records of type ``type`` in the section ``section``.
 -  ``section`` can be specified as an integer or as a ref:`DNSSection`.
 +  ``section`` can be specified as an integer or as a :ref:`DNSSection`.
-   ``qtype`` may be specified as an integer or as one of the built-in QTypes, for instance ``dnsdist.A`` or ``dnsdist.TXT``.
+   ``qtype`` may be specified as an integer or as one of the :ref:`built-in QTypes <DNSQType>`, for instance ``DNSQType.A`` or ``DNSQType.TXT``.
  
    :param int section: The section to match on
    :param int qtype: The QTYPE to match on