diff --git a/CHANGES b/CHANGES
index ba452f951c..6fecd55d38 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+ --- 9.14.5 released ---
+
5277. [bug] Cache DB statistics could underflow when serve-stale
was in use, because of a bug in counter maintenance
when RRsets become stale.
diff --git a/README b/README
index 4ea6d00700..9cd56d4b4b 100644
--- a/README
+++ b/README
@@ -380,8 +380,8 @@ issue number. Prior to 2018, these were usually of the form [RT #NNN] and
referred to entries in the "bind9-bugs" RT database, which was not open to
the public. More recent entries use the form [GL #NNN] or, less often, [GL
!NNN], which, respectively, refer to issues or merge requests in the
-Gitlab database. Most of these are publically readable, unless they
-include information which is confidential or security senstive.
+Gitlab database. Most of these are publicly readable, unless they include
+information which is confidential or security senstive.
To look up a Gitlab issue by its number, use the URL https://
gitlab.isc.org/isc-projects/bind9/issues/NNN. To look up a merge request,
diff --git a/README.md b/README.md
index cb4177caaa..dc40a41273 100644
--- a/README.md
+++ b/README.md
@@ -388,7 +388,7 @@ issue number. Prior to 2018, these were usually of the form `[RT #NNN]`
and referred to entries in the "bind9-bugs" RT database, which was not open
to the public. More recent entries use the form `[GL #NNN]` or, less often,
`[GL !NNN]`, which, respectively, refer to issues or merge requests in the
-Gitlab database. Most of these are publically readable, unless they include
+Gitlab database. Most of these are publicly readable, unless they include
information which is confidential or security senstive.
To look up a Gitlab issue by its number, use the URL
diff --git a/bin/dig/dig.1 b/bin/dig/dig.1
index 4b6bf0f156..c9a341cbd8 100644
--- a/bin/dig/dig.1
+++ b/bin/dig/dig.1
@@ -361,14 +361,20 @@ Display [do not display] the CLASS when printing the record\&.
.PP
\fB+[no]cmd\fR
.RS 4
-Toggles the printing of the initial comment in the output identifying the version of
+Toggles the printing of the initial comment in the output, identifying the version of
\fBdig\fR
-and the query options that have been applied\&. This comment is printed by default\&.
+and the query options that have been applied\&. This option always has global effect; it cannot be set globally and then overridden on a per\-lookup basis\&. The default is to print this comment\&.
.RE
.PP
\fB+[no]comments\fR
.RS 4
-Toggle the display of comment lines in the output\&. The default is to print comments\&.
+Toggles the display of some comment lines in the output, containing information about the packet header and OPT pseudosection, and the names of the response section\&. The default is to print these comments\&.
+.sp
+Other types of comments in the output are not affected by this option, but can be controlled using other command line switches\&. These include
+\fB+[no]cmd\fR,
+\fB+[no]question\fR,
+\fB+[no]stats\fR, and
+\fB+[no]rrcomments\fR\&.
.RE
.PP
\fB+[no]cookie\fR\fB[=####]\fR
@@ -561,12 +567,12 @@ would cause a 48\-byte query to be padded to 64 bytes\&. The default block size
.PP
\fB+[no]qr\fR
.RS 4
-Print [do not print] the query as it is sent\&. By default, the query is not printed\&.
+Toggles the display of the query message as it is sent\&. By default, the query is not printed\&.
.RE
.PP
\fB+[no]question\fR
.RS 4
-Print [do not print] the question section of a query when an answer is returned\&. The default is to print the question section as a comment\&.
+Toggles the display of the question section of a query when an answer is returned\&. The default is to print the question section as a comment\&.
.RE
.PP
\fB+[no]raflag\fR
@@ -619,7 +625,7 @@ determines if the name will be treated as relative or not and hence whether a se
.PP
\fB+[no]short\fR
.RS 4
-Provide a terse answer\&. The default is to print the answer in a verbose form\&.
+Provide a terse answer\&. The default is to print the answer in a verbose form\&. This option always has global effect; it cannot be set globally and then overridden on a per\-lookup basis\&.
.RE
.PP
\fB+[no]showsearch\fR
@@ -649,7 +655,7 @@ causes fields not to be split at all\&. The default is 56 characters, or 44 char
.PP
\fB+[no]stats\fR
.RS 4
-This query option toggles the printing of statistics: when the query was made, the size of the reply and so on\&. The default behavior is to print the query statistics\&.
+Toggles the printing of statistics: when the query was made, the size of the reply and so on\&. The default behavior is to print the query statistics as a comment after each lookup\&.
.RE
.PP
\fB+[no]subnet=addr[/prefix\-length]\fR
diff --git a/bin/dig/dig.html b/bin/dig/dig.html
index 4364f0583e..552a8cbae6 100644
--- a/bin/dig/dig.html
+++ b/bin/dig/dig.html
@@ -481,16 +481,28 @@
Toggles the printing of the initial comment in the
- output identifying the version of dig
- and the query options that have been applied. This
- comment is printed by default.
+ output, identifying the version of dig
+ and the query options that have been applied. This option
+ always has global effect; it cannot be set globally
+ and then overridden on a per-lookup basis. The default
+ is to print this comment.
+[no]comments
- Toggle the display of comment lines in the output.
- The default is to print comments.
+ Toggles the display of some comment lines in the output,
+ containing information about the packet header and
+ OPT pseudosection, and the names of the response
+ section. The default is to print these comments.
+
+
+ Other types of comments in the output are not affected by
+ this option, but can be controlled using other command
+ line switches. These include +[no]cmd,
+ +[no]question,
+ +[no]stats, and
+ +[no]rrcomments.
+[no]cookie[=####]
@@ -757,14 +769,14 @@
+[no]qr
- Print [do not print] the query as it is sent. By
- default, the query is not printed.
+ Toggles the display of the query message as it is sent.
+ By default, the query is not printed.
+[no]question
- Print [do not print] the question section of a query
+ Toggles the display of the question section of a query
when an answer is returned. The default is to print
the question section as a comment.
@@ -834,7 +846,9 @@
Provide a terse answer. The default is to print the
- answer in a verbose form.
+ answer in a verbose form. This option always has global
+ effect; it cannot be set globally and then overridden on
+ a per-lookup basis.
+[no]showsearch
@@ -867,10 +881,9 @@
+[no]stats
- This query option toggles the printing of statistics:
- when the query was made, the size of the reply and
- so on. The default behavior is to print the query
- statistics.
+ Toggles the printing of statistics: when the query was made,
+ the size of the reply and so on. The default behavior is to
+ print the query statistics as a comment after each lookup.
+[no]subnet=addr[/prefix-length]
diff --git a/bin/named/named.conf.5 b/bin/named/named.conf.5
index 91fc10c9ed..3611d97bd7 100644
--- a/bin/named/named.conf.5
+++ b/bin/named/named.conf.5
@@ -10,12 +10,12 @@
.\" Title: named.conf
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 2019-04-25
+.\" Date: 2019-07-21
.\" Manual: BIND9
.\" Source: ISC
.\" Language: English
.\"
-.TH "NAMED\&.CONF" "5" "2019\-04\-25" "ISC" "BIND9"
+.TH "NAMED\&.CONF" "5" "2019\-07\-21" "ISC" "BIND9"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -227,7 +227,7 @@ options {
check\-wildcard \fIboolean\fR;
cleaning\-interval \fIinteger\fR;
clients\-per\-query \fIinteger\fR;
- cookie\-algorithm ( aes | sha1 | sha256 );
+ cookie\-algorithm ( aes | sha1 | sha256 | siphash24 );
cookie\-secret \fIstring\fR;
coresize ( default | unlimited | \fIsizeval\fR );
datasize ( default | unlimited | \fIsizeval\fR );
diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index 5f7dd754a5..c4b2c2fcfa 100644
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -13,7 +13,7 @@
- 2019-04-25
+ 2019-07-21
ISC
diff --git a/bin/named/named.conf.html b/bin/named/named.conf.html
index a5f131f3d7..0b2d5943c1 100644
--- a/bin/named/named.conf.html
+++ b/bin/named/named.conf.html
@@ -208,7 +208,7 @@ options
check-wildcard boolean;
cleaning-interval integer;
clients-per-query integer;
- cookie-algorithm ( aes | sha1 | sha256 );
+ cookie-algorithm ( aes | sha1 | sha256 | siphash24 );
cookie-secret string;
coresize ( default | unlimited | sizeval );
datasize ( default | unlimited | sizeval );
diff --git a/doc/arm/Bv9ARM.ch01.html b/doc/arm/Bv9ARM.ch01.html
index edcdb724f0..2ffa1803d9 100644
--- a/doc/arm/Bv9ARM.ch01.html
+++ b/doc/arm/Bv9ARM.ch01.html
@@ -614,6 +614,6 @@
-BIND 9.14.4 (Stable Release)
+BIND 9.14.5 (Stable Release)