From f1e93a8338a0b2a6ffddc124d7da9d18a12defdf Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Thu, 5 Mar 2020 10:48:32 +0100 Subject: [PATCH] dnsdist: Fix documentation for functions removed in 1.3.0 --- pdns/dnsdistdist/docs/rules-actions.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pdns/dnsdistdist/docs/rules-actions.rst b/pdns/dnsdistdist/docs/rules-actions.rst index 13e4ac7b8d..bba9781c55 100644 --- a/pdns/dnsdistdist/docs/rules-actions.rst +++ b/pdns/dnsdistdist/docs/rules-actions.rst @@ -79,7 +79,7 @@ Rule Generators .. deprecated:: 1.2.0 Set the TC-bit (truncate) on ANY queries received over UDP, forcing a retry over TCP. - This function is deprecated as of 1.2.0 and will be removed in 1.3.0. This is equivalent to doing:: + This function has been deprecated as of 1.2.0 and removed in 1.3.0. This is equivalent to doing:: addAction(AndRule({QTypeRule(DNSQType.ANY), TCPRule(false)}), TCAction()) @@ -91,7 +91,7 @@ Rule Generators .. deprecated:: 1.2.0 Delay the query for ``delay`` milliseconds before sending to a backend. - This function is deprecated as of 1.2.0 and will be removed in 1.3.0, please use instead: + This function has been deprecated as of 1.2.0 and removed in 1.3.0, please use instead: addAction(DNSRule, DelayAction(delay)) @@ -103,7 +103,7 @@ Rule Generators .. deprecated:: 1.2.0 Set the CD (Checking Disabled) flag to 1 for all queries matching the DNSRule. - This function is deprecated as of 1.2.0 and will be removed in 1.3.0. Please use the :func:`DisableValidationAction` action instead. + This function has been deprecated as of 1.2.0 and removed in 1.3.0. Please use the :func:`DisableValidationAction` action instead. .. function:: addDomainBlock(domain) @@ -122,7 +122,7 @@ Rule Generators .. deprecated:: 1.2.0 Generate answers for A/AAAA/ANY queries. - This function is deprecated as of 1.2.0 and will be removed in 1.3.0, please use: + This function has been deprecated as of 1.2.0 and removed in 1.3.0, please use: addAction(domain, SpoofAction({IP[,...]})) @@ -139,7 +139,7 @@ Rule Generators .. deprecated:: 1.2.0 - Generate CNAME answers for queries. This function is deprecated as of 1.2.0 and will be removed in 1.3.0, in favor of using: + Generate CNAME answers for queries. This function has been deprecated as of 1.2.0 and removed in 1.3.0, in favor of using: addAction(domain, SpoofCNAMEAction(cname)) @@ -215,7 +215,7 @@ Rule Generators .. deprecated:: 1.2.0 Clear the RD flag for all queries matching the rule. - This function is deprecated as of 1.2.0 and will be removed in 1.3.0, please use: + This function has been deprecated as of 1.2.0 and removed in 1.3.0, please use: addAction(DNSRule, NoRecurseAction()) @@ -230,7 +230,7 @@ Rule Generators addPoolRule("example.com", "myPool") - This function is deprecated as of 1.2.0 and will be removed in 1.3.0, this is equivalent to:: + This function has been deprecated as of 1.2.0 and removed in 1.3.0, this is equivalent to:: addAction("example.com", PoolAction("myPool")) @@ -243,7 +243,7 @@ Rule Generators Limit queries matching the DNSRule to ``limit`` queries per second. All queries over the limit are dropped. - This function is deprecated as of 1.2.0 and will be removed in 1.3.0, please use: + This function has been deprecated as of 1.2.0 and removed in 1.3.0, please use: addAction(DNSRule, QPSAction(limit)) @@ -255,7 +255,7 @@ Rule Generators .. deprecated:: 1.2.0 Send at most ``limit`` queries/s for this pool, letting the subsequent rules apply otherwise. - This function is deprecated as of 1.2.0 and will be removed in 1.3.0, as it is only a convience function for the following syntax:: + This function has been deprecated as of 1.2.0 and removed in 1.3.0, as it is only a convience function for the following syntax:: addAction("192.0.2.0/24", QPSPoolAction(15, "myPool") -- 2.47.2