Merging upstream version 1:9.18.24.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/doc/man/named.conf.5in b/doc/man/named.conf.5in
index c5619dc..f3e37b7 100644
--- a/doc/man/named.conf.5in
+++ b/doc/man/named.conf.5in
@@ -309,9 +309,9 @@ options {
 	request\-nsid <boolean>;
 	require\-server\-cookie <boolean>;
 	reserved\-sockets <integer>; // deprecated
-	resolver\-nonbackoff\-tries <integer>;
+	resolver\-nonbackoff\-tries <integer>; // deprecated
 	resolver\-query\-timeout <integer>;
-	resolver\-retry\-interval <integer>;
+	resolver\-retry\-interval <integer>; // deprecated
 	response\-padding { <address_match_element>; ... } block\-size <integer>;
 	response\-policy { zone <string> [ add\-soa <boolean> ] [ log <boolean> ] [ max\-policy\-ttl <duration> ] [ min\-update\-interval <duration> ] [ policy ( cname | disabled | drop | given | no\-op | nodata | nxdomain | passthru | tcp\-only <quoted_string> ) ] [ recursive\-only <boolean> ] [ nsip\-enable <boolean> ] [ nsdname\-enable <boolean> ]; ... } [ add\-soa <boolean> ] [ break\-dnssec <boolean> ] [ max\-policy\-ttl <duration> ] [ min\-update\-interval <duration> ] [ min\-ns\-dots <integer> ] [ nsip\-wait\-recurse <boolean> ] [ nsdname\-wait\-recurse <boolean> ] [ qname\-wait\-recurse <boolean> ] [ recursive\-only <boolean> ] [ nsip\-enable <boolean> ] [ nsdname\-enable <boolean> ] [ dnsrps\-enable <boolean> ] [ dnsrps\-options { <unspecified\-text> } ];
 	reuseport <boolean>;
@@ -362,7 +362,7 @@ options {
 	transfers\-in <integer>;
 	transfers\-out <integer>;
 	transfers\-per\-ns <integer>;
-	trust\-anchor\-telemetry <boolean>; // experimental
+	trust\-anchor\-telemetry <boolean>;
 	try\-tcp\-refresh <boolean>;
 	udp\-receive\-buffer <integer>;
 	udp\-send\-buffer <integer>;
@@ -589,9 +589,9 @@ view <string> [ <class> ] {
 	request\-ixfr <boolean>;
 	request\-nsid <boolean>;
 	require\-server\-cookie <boolean>;
-	resolver\-nonbackoff\-tries <integer>;
+	resolver\-nonbackoff\-tries <integer>; // deprecated
 	resolver\-query\-timeout <integer>;
-	resolver\-retry\-interval <integer>;
+	resolver\-retry\-interval <integer>; // deprecated
 	response\-padding { <address_match_element>; ... } block\-size <integer>;
 	response\-policy { zone <string> [ add\-soa <boolean> ] [ log <boolean> ] [ max\-policy\-ttl <duration> ] [ min\-update\-interval <duration> ] [ policy ( cname | disabled | drop | given | no\-op | nodata | nxdomain | passthru | tcp\-only <quoted_string> ) ] [ recursive\-only <boolean> ] [ nsip\-enable <boolean> ] [ nsdname\-enable <boolean> ]; ... } [ add\-soa <boolean> ] [ break\-dnssec <boolean> ] [ max\-policy\-ttl <duration> ] [ min\-update\-interval <duration> ] [ min\-ns\-dots <integer> ] [ nsip\-wait\-recurse <boolean> ] [ nsdname\-wait\-recurse <boolean> ] [ qname\-wait\-recurse <boolean> ] [ recursive\-only <boolean> ] [ nsip\-enable <boolean> ] [ nsdname\-enable <boolean> ] [ dnsrps\-enable <boolean> ] [ dnsrps\-options { <unspecified\-text> } ];
 	root\-delegation\-only [ exclude { <string>; ... } ]; // deprecated
@@ -639,7 +639,7 @@ view <string> [ <class> ] {
 	transfer\-format ( many\-answers | one\-answer );
 	transfer\-source ( <ipv4_address> | * ) ;
 	transfer\-source\-v6 ( <ipv6_address> | * ) ;
-	trust\-anchor\-telemetry <boolean>; // experimental
+	trust\-anchor\-telemetry <boolean>;
 	trust\-anchors { <string> ( static\-key | initial\-key | static\-ds | initial\-ds ) <integer> <integer> <integer> <quoted_string>; ... }; // may occur multiple times
 	trusted\-keys { <string> <integer> <integer> <integer> <quoted_string>; ... }; // may occur multiple times, deprecated
 	try\-tcp\-refresh <boolean>;
@@ -1007,6 +1007,6 @@ zone <string> [ <class> ] {
 .SH AUTHOR
 Internet Systems Consortium
 .SH COPYRIGHT
-2023, Internet Systems Consortium
+2024, Internet Systems Consortium
 .\" Generated by docutils manpage writer.
 .