From: Matt Nordhoff Date: Thu, 11 Apr 2019 07:34:13 +0000 (+0000) Subject: Merge branch 'master' into ref X-Git-Tag: rec-4.2.0-rc1~43^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9aa7a7a973be0ddc4100e603d43ace80915bc2ec;p=thirdparty%2Fpdns.git Merge branch 'master' into ref --- 9aa7a7a973be0ddc4100e603d43ace80915bc2ec diff --cc pdns/dnsdistdist/docs/rules-actions.rst index 9dbb3f6a4c,f2ad20a6d3..a0d1e38b51 --- a/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 `, for instance ``DNSQType.A`` or ``DNSQType.TXT``. :param int section: The section to match on :param int qtype: The QTYPE to match on