Merge branch 'master' of https://github.com/and0x000/unbound into and0x000-master

gthess · gthess · commit 4231883480af · 2020-07-27T13:07:19.000+02:00
diff --git a/doc/example.conf.in b/doc/example.conf.in
@@ -589,7 +589,7 @@ server:
 	#
 	# Time in milliseconds before replying to the client with expired data.
 	# This essentially enables the serve-stale behavior as specified in
-	# draft-ietf-dnsop-serve-stale-10 that first tries to resolve before
+	# RFC 8767 that first tries to resolve before
 	# immediately responding with expired data.  0 disables this behavior.
 	# A recommended value is 1800.
 	# serve-expired-client-timeout: 0
diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
@@ -1108,7 +1108,7 @@ later on.  Default is "no".
 .B serve\-expired\-ttl: \fI<seconds>
 Limit serving of expired responses to configured seconds after expiration. 0
 disables the limit.  This option only applies when \fBserve\-expired\fR is
-enabled.  A suggested value per draft-ietf-dnsop-serve-stale-10 is between
+enabled.  A suggested value per RFC 8767 is between
 86400 (1 day) and 259200 (3 days).  The default is 0.
 .TP
 .B serve\-expired\-ttl\-reset: \fI<yes or no>
@@ -1120,14 +1120,14 @@ expired records will be served as long as there are queries for it.  Default is
 .B serve\-expired\-reply\-ttl: \fI<seconds>
 TTL value to use when replying with expired data.  If
 \fBserve\-expired\-client\-timeout\fR is also used then it is RECOMMENDED to
-use 30 as the value (draft-ietf-dnsop-serve-stale-10).  The default is 30.
+use 30 as the value (RFC 8767).  The default is 30.
 .TP
 .B serve\-expired\-client\-timeout: \fI<msec>
 Time in milliseconds before replying to the client with expired data.  This
 essentially enables the serve-stale behavior as specified in
-draft-ietf-dnsop-serve-stale-10 that first tries to resolve before immediately
+RFC 8767 that first tries to resolve before immediately
 responding with expired data.  A recommended value per
-draft-ietf-dnsop-serve-stale-10 is 1800.  Setting this to 0 will disable this
+RFC 8767 is 1800.  Setting this to 0 will disable this
 behavior.  Default is 0.
 .TP
 .B val\-nsec3\-keysize\-iterations: \fI<"list of values">

Original file line number	Diff line number	Diff line change
`@@ -589,7 +589,7 @@ server:`
`589`	`589`	`#`
`590`	`590`	`# Time in milliseconds before replying to the client with expired data.`
`591`	`591`	`# This essentially enables the serve-stale behavior as specified in`
`592`		`- # draft-ietf-dnsop-serve-stale-10 that first tries to resolve before`
	`592`	`+ # RFC 8767 that first tries to resolve before`
`593`	`593`	`# immediately responding with expired data. 0 disables this behavior.`
`594`	`594`	`# A recommended value is 1800.`
`595`	`595`	`# serve-expired-client-timeout: 0`