From 194f099f30e1759b36d36be4ab6653cb67c697fa Mon Sep 17 00:00:00 2001
From: Tinderbox User <tbox@isc.org>
Date: Sat, 28 Feb 2015 01:12:33 +0000
Subject: [PATCH] regen v9_9

---
 bin/dig/dig.1                        |   4 +-
 bin/dig/dig.html                     |  20 +-
 bin/named/named.8                    |   4 +-
 bin/named/named.html                 |  16 +-
 bin/nsupdate/nsupdate.1              | 214 ++++----
 bin/nsupdate/nsupdate.html           | 706 +++++++++++++--------------
 doc/arm/Bv9ARM.ch09.html             | 181 +------
 doc/arm/Bv9ARM.ch12.html             |  40 +-
 doc/arm/Bv9ARM.html                  |  14 +-
 doc/arm/man.arpaname.html            |   6 +-
 doc/arm/man.ddns-confgen.html        |   8 +-
 doc/arm/man.dig.html                 |  18 +-
 doc/arm/man.dnssec-checkds.html      |   8 +-
 doc/arm/man.dnssec-coverage.html     |   8 +-
 doc/arm/man.dnssec-dsfromkey.html    |  14 +-
 doc/arm/man.dnssec-keyfromlabel.html |  12 +-
 doc/arm/man.dnssec-keygen.html       |  14 +-
 doc/arm/man.dnssec-revoke.html       |   8 +-
 doc/arm/man.dnssec-settime.html      |  12 +-
 doc/arm/man.dnssec-signzone.html     |  10 +-
 doc/arm/man.dnssec-verify.html       |   8 +-
 doc/arm/man.genrandom.html           |   8 +-
 doc/arm/man.host.html                |   8 +-
 doc/arm/man.isc-hmac-fixup.html      |   8 +-
 doc/arm/man.named-checkconf.html     |  10 +-
 doc/arm/man.named-checkzone.html     |  10 +-
 doc/arm/man.named-journalprint.html  |   6 +-
 doc/arm/man.named.html               |  14 +-
 doc/arm/man.nsec3hash.html           |   8 +-
 doc/arm/man.nsupdate.html            | 704 +++++++++++++-------------
 doc/arm/man.rndc-confgen.html        |  10 +-
 doc/arm/man.rndc.conf.html           |  10 +-
 doc/arm/man.rndc.html                |  12 +-
 doc/arm/notes.html                   | 181 +------
 34 files changed, 985 insertions(+), 1329 deletions(-)

diff --git a/bin/dig/dig.1 b/bin/dig/dig.1
index 801563f1c4..0b454651ae 100644
--- a/bin/dig/dig.1
+++ b/bin/dig/dig.1
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2004-2011, 2013, 2014 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2011, 2013-2015 Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (C) 2000-2003 Internet Software Consortium.
 .\" 
 .\" Permission to use, copy, modify, and/or distribute this software for any
@@ -646,7 +646,7 @@ RFC1035.
 .PP
 There are probably too many query options.
 .SH "COPYRIGHT"
-Copyright \(co 2004\-2011, 2013, 2014 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2004\-2011, 2013\-2015 Internet Systems Consortium, Inc. ("ISC")
 .br
 Copyright \(co 2000\-2003 Internet Software Consortium.
 .br
diff --git a/bin/dig/dig.html b/bin/dig/dig.html
index 6e8b5936f5..c25f729b79 100644
--- a/bin/dig/dig.html
+++ b/bin/dig/dig.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2011, 2013, 2014 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2011, 2013-2015 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  - 
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -34,7 +34,7 @@
 <div class="cmdsynopsis"><p><code class="command">dig</code>  [global-queryopt...] [query...]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543544"></a><h2>DESCRIPTION</h2>
+<a name="id2543547"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">dig</strong></span>
       (domain information groper) is a flexible tool
       for interrogating DNS name servers.  It performs DNS lookups and
@@ -81,7 +81,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543623"></a><h2>SIMPLE USAGE</h2>
+<a name="id2543626"></a><h2>SIMPLE USAGE</h2>
 <p>
       A typical invocation of <span><strong class="command">dig</strong></span> looks like:
       </p>
@@ -134,7 +134,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543726"></a><h2>OPTIONS</h2>
+<a name="id2543730"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-4</span></dt>
 <dd><p>
@@ -262,7 +262,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544178"></a><h2>QUERY OPTIONS</h2>
+<a name="id2544181"></a><h2>QUERY OPTIONS</h2>
 <p><span><strong class="command">dig</strong></span>
       provides a number of query options which affect
       the way in which lookups are made and the results displayed.  Some of
@@ -620,7 +620,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2545546"></a><h2>MULTIPLE QUERIES</h2>
+<a name="id2545549"></a><h2>MULTIPLE QUERIES</h2>
 <p>
       The BIND 9 implementation of <span><strong class="command">dig </strong></span>
       supports
@@ -666,7 +666,7 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543014"></a><h2>IDN SUPPORT</h2>
+<a name="id2543017"></a><h2>IDN SUPPORT</h2>
 <p>
       If <span><strong class="command">dig</strong></span> has been built with IDN (internationalized
       domain name) support, it can accept and display non-ASCII domain names.
@@ -680,14 +680,14 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543036"></a><h2>FILES</h2>
+<a name="id2543040"></a><h2>FILES</h2>
 <p><code class="filename">/etc/resolv.conf</code>
     </p>
 <p><code class="filename">${HOME}/.digrc</code>
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543053"></a><h2>SEE ALSO</h2>
+<a name="id2543057"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">host</span>(1)</span>,
       <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
@@ -695,7 +695,7 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543091"></a><h2>BUGS</h2>
+<a name="id2543094"></a><h2>BUGS</h2>
 <p>
       There are probably too many query options.
     </p>
diff --git a/bin/named/named.8 b/bin/named/named.8
index fddb0832e0..09bd4c117d 100644
--- a/bin/named/named.8
+++ b/bin/named/named.8
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2004-2009, 2011, 2013, 2014 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2009, 2011, 2013-2015 Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (C) 2000, 2001, 2003 Internet Software Consortium.
 .\" 
 .\" Permission to use, copy, modify, and/or distribute this software for any
@@ -286,7 +286,7 @@ BIND 9 Administrator Reference Manual.
 .PP
 Internet Systems Consortium
 .SH "COPYRIGHT"
-Copyright \(co 2004\-2009, 2011, 2013, 2014 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2004\-2009, 2011, 2013\-2015 Internet Systems Consortium, Inc. ("ISC")
 .br
 Copyright \(co 2000, 2001, 2003 Internet Software Consortium.
 .br
diff --git a/bin/named/named.html b/bin/named/named.html
index 22848d9e18..83494ee5d9 100644
--- a/bin/named/named.html
+++ b/bin/named/named.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2009, 2011, 2013, 2014 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2009, 2011, 2013-2015 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000, 2001, 2003 Internet Software Consortium.
  - 
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -32,7 +32,7 @@
 <div class="cmdsynopsis"><p><code class="command">named</code>  [<code class="option">-4</code>] [<code class="option">-6</code>] [<code class="option">-c <em class="replaceable"><code>config-file</code></em></code>] [<code class="option">-d <em class="replaceable"><code>debug-level</code></em></code>] [<code class="option">-E <em class="replaceable"><code>engine-name</code></em></code>] [<code class="option">-f</code>] [<code class="option">-g</code>] [<code class="option">-M <em class="replaceable"><code>option</code></em></code>] [<code class="option">-m <em class="replaceable"><code>flag</code></em></code>] [<code class="option">-n <em class="replaceable"><code>#cpus</code></em></code>] [<code class="option">-p <em class="replaceable"><code>port</code></em></code>] [<code class="option">-s</code>] [<code class="option">-S <em class="replaceable"><code>#max-socks</code></em></code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-U <em class="replaceable"><code>#listeners</code></em></code>] [<code class="option">-u <em class="replaceable"><code>user</code></em></code>] [<code class="option">-v</code>] [<code class="option">-V</code>] [<code class="option">-x <em class="replaceable"><code>cache-file</code></em></code>]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543515"></a><h2>DESCRIPTION</h2>
+<a name="id2543518"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">named</strong></span>
       is a Domain Name System (DNS) server,
       part of the BIND 9 distribution from ISC.  For more
@@ -47,7 +47,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543540"></a><h2>OPTIONS</h2>
+<a name="id2543543"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-4</span></dt>
 <dd><p>
@@ -248,7 +248,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544188"></a><h2>SIGNALS</h2>
+<a name="id2544192"></a><h2>SIGNALS</h2>
 <p>
       In routine operation, signals should not be used to control
       the nameserver; <span><strong class="command">rndc</strong></span> should be used
@@ -269,7 +269,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544305"></a><h2>CONFIGURATION</h2>
+<a name="id2544308"></a><h2>CONFIGURATION</h2>
 <p>
       The <span><strong class="command">named</strong></span> configuration file is too complex
       to describe in detail here.  A complete description is provided
@@ -286,7 +286,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544341"></a><h2>FILES</h2>
+<a name="id2544344"></a><h2>FILES</h2>
 <div class="variablelist"><dl>
 <dt><span class="term"><code class="filename">/etc/named.conf</code></span></dt>
 <dd><p>
@@ -299,7 +299,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544380"></a><h2>SEE ALSO</h2>
+<a name="id2544384"></a><h2>SEE ALSO</h2>
 <p><em class="citetitle">RFC 1033</em>,
       <em class="citetitle">RFC 1034</em>,
       <em class="citetitle">RFC 1035</em>,
@@ -312,7 +312,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544451"></a><h2>AUTHOR</h2>
+<a name="id2544454"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/bin/nsupdate/nsupdate.1 b/bin/nsupdate/nsupdate.1
index c46d023e8e..28d5f42d78 100644
--- a/bin/nsupdate/nsupdate.1
+++ b/bin/nsupdate/nsupdate.1
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2004-2012, 2014 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2012, 2014, 2015 Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (C) 2000-2003 Internet Software Consortium.
 .\" 
 .\" Permission to use, copy, modify, and/or distribute this software for any
@@ -33,7 +33,7 @@
 nsupdate \- Dynamic DNS update utility
 .SH "SYNOPSIS"
 .HP 9
-\fBnsupdate\fR [\fB\-d\fR] [\fB\-D\fR] [[\fB\-g\fR] | [\fB\-o\fR] | [\fB\-l\fR] | [\fB\-y\ \fR\fB\fI[hmac:]\fR\fIkeyname:secret\fR\fR] | [\fB\-k\ \fR\fB\fIkeyfile\fR\fR]] [\fB\-t\ \fR\fB\fItimeout\fR\fR] [\fB\-u\ \fR\fB\fIudptimeout\fR\fR] [\fB\-r\ \fR\fB\fIudpretries\fR\fR] [\fB\-R\ \fR\fB\fIrandomdev\fR\fR] [\fB\-v\fR] [\fB\-V\fR] [filename]
+\fBnsupdate\fR [\fB\-d\fR] [\fB\-D\fR] [\fB\-L\ \fR\fB\fIlevel\fR\fR] [[\fB\-g\fR] | [\fB\-o\fR] | [\fB\-l\fR] | [\fB\-y\ \fR\fB\fI[hmac:]\fR\fIkeyname:secret\fR\fR] | [\fB\-k\ \fR\fB\fIkeyfile\fR\fR]] [\fB\-t\ \fR\fB\fItimeout\fR\fR] [\fB\-u\ \fR\fB\fIudptimeout\fR\fR] [\fB\-r\ \fR\fB\fIudpretries\fR\fR] [\fB\-R\ \fR\fB\fIrandomdev\fR\fR] [\fB\-v\fR] [\fB\-V\fR] [filename]
 .SH "DESCRIPTION"
 .PP
 \fBnsupdate\fR
@@ -47,53 +47,126 @@ The resource records that are dynamically added or removed with
 \fBnsupdate\fR
 have to be in the same zone. Requests are sent to the zone's master server. This is identified by the MNAME field of the zone's SOA record.
 .PP
-The
-\fB\-d\fR
-option makes
-\fBnsupdate\fR
-operate in debug mode. This provides tracing information about the update requests that are made and the replies received from the name server.
+Transaction signatures can be used to authenticate the Dynamic DNS updates. These use the TSIG resource record type described in RFC 2845 or the SIG(0) record described in RFC 2535 and RFC 2931 or GSS\-TSIG as described in RFC 3645.
 .PP
-The
-\fB\-D\fR
-option makes
+TSIG relies on a shared secret that should only be known to
 \fBnsupdate\fR
-report additional debugging information to
-\fB\-d\fR.
-.PP
-The
-\fB\-L\fR
-option with an integer argument of zero or higher sets the logging debug level. If zero, logging is disabled.
-.PP
-Transaction signatures can be used to authenticate the Dynamic DNS updates. These use the TSIG resource record type described in RFC 2845 or the SIG(0) record described in RFC 2535 and RFC 2931 or GSS\-TSIG as described in RFC 3645. TSIG relies on a shared secret that should only be known to
-\fBnsupdate\fR
-and the name server. Currently, the only supported encryption algorithm for TSIG is HMAC\-MD5, which is defined in RFC 2104. Once other algorithms are defined for TSIG, applications will need to ensure they select the appropriate algorithm as well as the key when authenticating each other. For instance, suitable
+and the name server. For instance, suitable
 \fBkey\fR
 and
 \fBserver\fR
 statements would be added to
 \fI/etc/named.conf\fR
-so that the name server can associate the appropriate secret key and algorithm with the IP address of the client application that will be using TSIG authentication. SIG(0) uses public key cryptography. To use a SIG(0) key, the public key must be stored in a KEY record in a zone served by the name server.
+so that the name server can associate the appropriate secret key and algorithm with the IP address of the client application that will be using TSIG authentication. You can use
+\fBddns\-confgen\fR
+to generate suitable configuration fragments.
 \fBnsupdate\fR
-does not read
-\fI/etc/named.conf\fR.
+uses the
+\fB\-y\fR
+or
+\fB\-k\fR
+options to provide the TSIG shared secret. These options are mutually exclusive.
+.PP
+SIG(0) uses public key cryptography. To use a SIG(0) key, the public key must be stored in a KEY record in a zone served by the name server.
 .PP
 GSS\-TSIG uses Kerberos credentials. Standard GSS\-TSIG mode is switched on with the
 \fB\-g\fR
 flag. A non\-standards\-compliant variant of GSS\-TSIG used by Windows 2000 can be switched on with the
 \fB\-o\fR
 flag.
+.SH "OPTIONS"
 .PP
-\fBnsupdate\fR
-uses the
-\fB\-y\fR
-or
+\-d
+.RS 4
+Debug mode. This provides tracing information about the update requests that are made and the replies received from the name server.
+.RE
+.PP
+\-D
+.RS 4
+Extra debug mode.
+.RE
+.PP
+\-k \fIkeyfile\fR
+.RS 4
+The file containing the TSIG authentication key. Keyfiles may be in two formats: a single file containing a
+\fInamed.conf\fR\-format
+\fBkey\fR
+statement, which may be generated automatically by
+\fBddns\-confgen\fR, or a pair of files whose names are of the format
+\fIK{name}.+157.+{random}.key\fR
+and
+\fIK{name}.+157.+{random}.private\fR, which can be generated by
+\fBdnssec\-keygen\fR. The
 \fB\-k\fR
-option to provide the shared secret needed to generate a TSIG record for authenticating Dynamic DNS update requests, default type HMAC\-MD5. These options are mutually exclusive.
+may also be used to specify a SIG(0) key used to authenticate Dynamic DNS update requests. In this case, the key specified is not an HMAC\-MD5 key.
+.RE
 .PP
-When the
-\fB\-y\fR
-option is used, a signature is generated from
-[\fIhmac:\fR]\fIkeyname:secret.\fR
+\-l
+.RS 4
+Local\-host only mode. This sets the server address to localhost (disabling the
+\fBserver\fR
+so that the server address cannot be overridden). Connections to the local server will use a TSIG key found in
+\fI/var/run/named/session.key\fR, which is automatically generated by
+\fBnamed\fR
+if any local master zone has set
+\fBupdate\-policy\fR
+to
+\fBlocal\fR. The location of this key file can be overridden with the
+\fB\-k\fR
+option.
+.RE
+.PP
+\-L \fIlevel\fR
+.RS 4
+Set the logging debug level. If zero, logging is disabled.
+.RE
+.PP
+\-p \fIport\fR
+.RS 4
+Set the port to use for connections to a name server. The default is 53.
+.RE
+.PP
+\-r \fIudpretries\fR
+.RS 4
+The number of UDP retries. The default is 3. If zero, only one update request will be made.
+.RE
+.PP
+\-R \fIrandomdev\fR
+.RS 4
+Where to obtain randomness. If the operating system does not provide a
+\fI/dev/random\fR
+or equivalent device, the default source of randomness is keyboard input.
+\fIrandomdev\fR
+specifies the name of a character device or file containing random data to be used instead of the default. The special value
+\fIkeyboard\fR
+indicates that keyboard input should be used. This option may be specified multiple times.
+.RE
+.PP
+\-t \fItimeout\fR
+.RS 4
+The maximum time an update request can take before it is aborted. The default is 300 seconds. Zero can be used to disable the timeout.
+.RE
+.PP
+\-u \fIudptimeout\fR
+.RS 4
+The UDP retry interval. The default is 3 seconds. If zero, the interval will be computed from the timeout interval and number of UDP retries.
+.RE
+.PP
+\-v
+.RS 4
+Use TCP even for small update requests. By default,
+\fBnsupdate\fR
+uses UDP to send update requests to the name server unless they are too large to fit in a UDP request in which case TCP will be used. TCP may be preferable when a batch of update requests is made.
+.RE
+.PP
+\-V
+.RS 4
+Print the version number and exit.
+.RE
+.PP
+\-y \fI[hmac:]\fR\fIkeyname:secret\fR
+.RS 4
+Literal TSIG authentication key.
 \fIkeyname\fR
 is the name of the key, and
 \fIsecret\fR
@@ -108,81 +181,14 @@ hmac\-sha384, or
 hmac\-sha512. If
 \fIhmac\fR
 is not specified, the default is
-hmac\-md5. NOTE: Use of the
+hmac\-md5.
+.sp
+NOTE: Use of the
 \fB\-y\fR
 option is discouraged because the shared secret is supplied as a command line argument in clear text. This may be visible in the output from
 \fBps\fR(1)
 or in a history file maintained by the user's shell.
-.PP
-With the
-\fB\-k\fR
-option,
-\fBnsupdate\fR
-reads the shared secret from the file
-\fIkeyfile\fR. Keyfiles may be in two formats: a single file containing a
-\fInamed.conf\fR\-format
-\fBkey\fR
-statement, which may be generated automatically by
-\fBddns\-confgen\fR, or a pair of files whose names are of the format
-\fIK{name}.+157.+{random}.key\fR
-and
-\fIK{name}.+157.+{random}.private\fR, which can be generated by
-\fBdnssec\-keygen\fR. The
-\fB\-k\fR
-may also be used to specify a SIG(0) key used to authenticate Dynamic DNS update requests. In this case, the key specified is not an HMAC\-MD5 key.
-.PP
-\fBnsupdate\fR
-can be run in a local\-host only mode using the
-\fB\-l\fR
-flag. This sets the server address to localhost (disabling the
-\fBserver\fR
-so that the server address cannot be overridden). Connections to the local server will use a TSIG key found in
-\fI/var/run/named/session.key\fR, which is automatically generated by
-\fBnamed\fR
-if any local master zone has set
-\fBupdate\-policy\fR
-to
-\fBlocal\fR. The location of this key file can be overridden with the
-\fB\-k\fR
-option.
-.PP
-By default,
-\fBnsupdate\fR
-uses UDP to send update requests to the name server unless they are too large to fit in a UDP request in which case TCP will be used. The
-\fB\-v\fR
-option makes
-\fBnsupdate\fR
-use a TCP connection. This may be preferable when a batch of update requests is made.
-.PP
-The
-\fB\-p\fR
-sets the default port number to use for connections to a name server. The default is 53.
-.PP
-The
-\fB\-t\fR
-option sets the maximum time an update request can take before it is aborted. The default is 300 seconds. Zero can be used to disable the timeout.
-.PP
-The
-\fB\-u\fR
-option sets the UDP retry interval. The default is 3 seconds. If zero, the interval will be computed from the timeout interval and number of UDP retries.
-.PP
-The
-\fB\-r\fR
-option sets the number of UDP retries. The default is 3. If zero, only one update request will be made.
-.PP
-The
-\fB\-R \fR\fB\fIrandomdev\fR\fR
-option specifies a source of randomness. If the operating system does not provide a
-\fI/dev/random\fR
-or equivalent device, the default source of randomness is keyboard input.
-\fIrandomdev\fR
-specifies the name of a character device or file containing random data to be used instead of the default. The special value
-\fIkeyboard\fR
-indicates that keyboard input should be used. This option may be specified multiple times.
-.PP
-The \-V option causes
-\fBnsupdate\fR
-to print the version number and exit.
+.RE
 .SH "INPUT FORMAT"
 .PP
 \fBnsupdate\fR
@@ -463,7 +469,7 @@ RFC 2931,
 .PP
 The TSIG key is redundantly stored in two separate files. This is a consequence of nsupdate using the DST library for its cryptographic operations, and may change in future releases.
 .SH "COPYRIGHT"
-Copyright \(co 2004\-2012, 2014 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2004\-2012, 2014, 2015 Internet Systems Consortium, Inc. ("ISC")
 .br
 Copyright \(co 2000\-2003 Internet Software Consortium.
 .br
diff --git a/bin/nsupdate/nsupdate.html b/bin/nsupdate/nsupdate.html
index 2e71ec1b1a..76c54db290 100644
--- a/bin/nsupdate/nsupdate.html
+++ b/bin/nsupdate/nsupdate.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2012, 2014 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2012, 2014, 2015 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  - 
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -29,10 +29,10 @@
 </div>
 <div class="refsynopsisdiv">
 <h2>Synopsis</h2>
-<div class="cmdsynopsis"><p><code class="command">nsupdate</code>  [<code class="option">-d</code>] [<code class="option">-D</code>] [[<code class="option">-g</code>] |  [<code class="option">-o</code>] |  [<code class="option">-l</code>] |  [<code class="option">-y <em class="replaceable"><code>[<span class="optional">hmac:</span>]keyname:secret</code></em></code>] |  [<code class="option">-k <em class="replaceable"><code>keyfile</code></em></code>]] [<code class="option">-t <em class="replaceable"><code>timeout</code></em></code>] [<code class="option">-u <em class="replaceable"><code>udptimeout</code></em></code>] [<code class="option">-r <em class="replaceable"><code>udpretries</code></em></code>] [<code class="option">-R <em class="replaceable"><code>randomdev</code></em></code>] [<code class="option">-v</code>] [<code class="option">-V</code>] [filename]</p></div>
+<div class="cmdsynopsis"><p><code class="command">nsupdate</code>  [<code class="option">-d</code>] [<code class="option">-D</code>] [<code class="option">-L <em class="replaceable"><code>level</code></em></code>] [[<code class="option">-g</code>] |  [<code class="option">-o</code>] |  [<code class="option">-l</code>] |  [<code class="option">-y <em class="replaceable"><code>[<span class="optional">hmac:</span>]keyname:secret</code></em></code>] |  [<code class="option">-k <em class="replaceable"><code>keyfile</code></em></code>]] [<code class="option">-t <em class="replaceable"><code>timeout</code></em></code>] [<code class="option">-u <em class="replaceable"><code>udptimeout</code></em></code>] [<code class="option">-r <em class="replaceable"><code>udpretries</code></em></code>] [<code class="option">-R <em class="replaceable"><code>randomdev</code></em></code>] [<code class="option">-v</code>] [<code class="option">-V</code>] [filename]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543479"></a><h2>DESCRIPTION</h2>
+<a name="id2543491"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">nsupdate</strong></span>
       is used to submit Dynamic DNS Update requests as defined in RFC 2136
       to a name server.
@@ -56,44 +56,31 @@
       Requests are sent to the zone's master server.
       This is identified by the MNAME field of the zone's SOA record.
     </p>
-<p>
-      The
-      <code class="option">-d</code>
-      option makes
-      <span><strong class="command">nsupdate</strong></span>
-      operate in debug mode.
-      This provides tracing information about the update requests that are
-      made and the replies received from the name server.
-    </p>
-<p>
-      The <code class="option">-D</code> option makes <span><strong class="command">nsupdate</strong></span>
-      report additional debugging information to <code class="option">-d</code>.
-    </p>
-<p>
-      The <code class="option">-L</code> option with an integer argument of zero or
-      higher sets the logging debug level.  If zero, logging is disabled.
-    </p>
 <p>
       Transaction signatures can be used to authenticate the Dynamic
       DNS updates.  These use the TSIG resource record type described
       in RFC 2845 or the SIG(0) record described in RFC 2535 and
-      RFC 2931 or GSS-TSIG as described in RFC 3645.  TSIG relies on
+      RFC 2931 or GSS-TSIG as described in RFC 3645.
+    </p>
+<p>
+      TSIG relies on
       a shared secret that should only be known to
-      <span><strong class="command">nsupdate</strong></span> and the name server.  Currently,
-      the only supported encryption algorithm for TSIG is HMAC-MD5,
-      which is defined in RFC 2104.  Once other algorithms are
-      defined for TSIG, applications will need to ensure they select
-      the appropriate algorithm as well as the key when authenticating
-      each other.  For instance, suitable <span class="type">key</span> and
+      <span><strong class="command">nsupdate</strong></span> and the name server.
+      For instance, suitable <span class="type">key</span> and
       <span class="type">server</span> statements would be added to
       <code class="filename">/etc/named.conf</code> so that the name server
       can associate the appropriate secret key and algorithm with
       the IP address of the client application that will be using
-      TSIG authentication.  SIG(0) uses public key cryptography.
+      TSIG authentication. You can use <span><strong class="command">ddns-confgen</strong></span>
+      to generate suitable configuration fragments.
+      <span><strong class="command">nsupdate</strong></span>
+      uses the <code class="option">-y</code> or <code class="option">-k</code> options
+      to provide the TSIG shared secret.  These options are mutually exclusive.
+    </p>
+<p>
+      SIG(0) uses public key cryptography.
       To use a SIG(0) key, the public key must be stored in a KEY
       record in a zone served by the name server.
-      <span><strong class="command">nsupdate</strong></span> does not read
-      <code class="filename">/etc/named.conf</code>.
     </p>
 <p>
       GSS-TSIG uses Kerberos credentials.  Standard GSS-TSIG mode
@@ -101,108 +88,119 @@
       non-standards-compliant variant of GSS-TSIG used by Windows
       2000 can be switched on with the <code class="option">-o</code> flag.
     </p>
-<p><span><strong class="command">nsupdate</strong></span>
-      uses the <code class="option">-y</code> or <code class="option">-k</code> option
-      to provide the shared secret needed to generate a TSIG record
-      for authenticating Dynamic DNS update requests, default type
-      HMAC-MD5.  These options are mutually exclusive. 
-    </p>
-<p>
-      When the <code class="option">-y</code> option is used, a signature is
-      generated from
-      [<span class="optional"><em class="parameter"><code>hmac:</code></em></span>]<em class="parameter"><code>keyname:secret.</code></em>
-      <em class="parameter"><code>keyname</code></em> is the name of the key, and
-      <em class="parameter"><code>secret</code></em> is the base64 encoded shared secret.
-      <em class="parameter"><code>hmac</code></em> is the name of the key algorithm;
-      valid choices are <code class="literal">hmac-md5</code>,
-      <code class="literal">hmac-sha1</code>, <code class="literal">hmac-sha224</code>,
-      <code class="literal">hmac-sha256</code>, <code class="literal">hmac-sha384</code>, or
-      <code class="literal">hmac-sha512</code>.  If <em class="parameter"><code>hmac</code></em>
-      is not specified, the default is <code class="literal">hmac-md5</code>.
-      NOTE: Use of the <code class="option">-y</code> option is discouraged because the
-      shared secret is supplied as a command line argument in clear text.
-      This may be visible in the output from
-      <span class="citerefentry"><span class="refentrytitle">ps</span>(1)</span>
-      or in a history file maintained by the user's shell.
-    </p>
-<p>
-      With the
-      <code class="option">-k</code> option, <span><strong class="command">nsupdate</strong></span> reads
-      the shared secret from the file <em class="parameter"><code>keyfile</code></em>.
-      Keyfiles may be in two formats: a single file containing
-      a <code class="filename">named.conf</code>-format <span><strong class="command">key</strong></span>
-      statement, which may be generated automatically by
-      <span><strong class="command">ddns-confgen</strong></span>, or a pair of files whose names are
-      of the format <code class="filename">K{name}.+157.+{random}.key</code> and
-      <code class="filename">K{name}.+157.+{random}.private</code>, which can be
-      generated by <span><strong class="command">dnssec-keygen</strong></span>.
-      The <code class="option">-k</code> may also be used to specify a SIG(0) key used
-      to authenticate Dynamic DNS update requests.  In this case, the key
-      specified is not an HMAC-MD5 key.
-    </p>
-<p>
-      <span><strong class="command">nsupdate</strong></span> can be run in a local-host only mode
-      using the <code class="option">-l</code> flag.  This sets the server address to
-      localhost (disabling the <span><strong class="command">server</strong></span> so that the server
-      address cannot be overridden).  Connections to the local server will
-      use a TSIG key found in <code class="filename">/var/run/named/session.key</code>,
-      which is automatically generated by <span><strong class="command">named</strong></span> if any
-      local master zone has set <span><strong class="command">update-policy</strong></span> to
-      <span><strong class="command">local</strong></span>.  The location of this key file can be
-      overridden with the <code class="option">-k</code> option.
-    </p>
-<p>
-      By default, <span><strong class="command">nsupdate</strong></span>
-      uses UDP to send update requests to the name server unless they are too
-      large to fit in a UDP request in which case TCP will be used.
-      The
-      <code class="option">-v</code>
-      option makes
-      <span><strong class="command">nsupdate</strong></span>
-      use a TCP connection.
-      This may be preferable when a batch of update requests is made.
-    </p>
-<p>
-      The <code class="option">-p</code> sets the default port number to use for
-      connections to a name server.  The default is 53.
-    </p>
-<p>
-      The <code class="option">-t</code> option sets the maximum time an update request
-      can
-      take before it is aborted.  The default is 300 seconds.  Zero can be
-      used
-      to disable the timeout.
-    </p>
-<p>
-      The <code class="option">-u</code> option sets the UDP retry interval.  The default
-      is
-      3 seconds.  If zero, the interval will be computed from the timeout
-      interval
-      and number of UDP retries.
-    </p>
-<p>
-      The <code class="option">-r</code> option sets the number of UDP retries. The
-      default is
-      3.  If zero, only one update request will be made.
-    </p>
-<p>
-      The <code class="option">-R <em class="replaceable"><code>randomdev</code></em></code> option
-      specifies a source of randomness.  If the operating system
-      does not provide a <code class="filename">/dev/random</code> or
-      equivalent device, the default source of randomness is keyboard
-      input.  <code class="filename">randomdev</code> specifies the name of
-      a character device or file containing random data to be used
-      instead of the default.  The special value
-      <code class="filename">keyboard</code> indicates that keyboard input
-      should be used.  This option may be specified multiple times.
-    </p>
-<p>
-      The -V option causes <span><strong class="command">nsupdate</strong></span> to print the
-      version number and exit.
-    </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543849"></a><h2>INPUT FORMAT</h2>
+<a name="id2543564"></a><h2>OPTIONS</h2>
+<div class="variablelist"><dl>
+<dt><span class="term">-d</span></dt>
+<dd><p>
+	    Debug mode. This provides tracing information about the
+	    update requests that are made and the replies received
+	    from the name server.
+	  </p></dd>
+<dt><span class="term">-D</span></dt>
+<dd><p>
+	    Extra debug mode.
+	  </p></dd>
+<dt><span class="term">-k <em class="replaceable"><code>keyfile</code></em></span></dt>
+<dd><p>
+	    The file containing the TSIG authentication key.
+	    Keyfiles may be in two formats: a single file containing
+	    a <code class="filename">named.conf</code>-format <span><strong class="command">key</strong></span>
+	    statement, which may be generated automatically by
+	    <span><strong class="command">ddns-confgen</strong></span>, or a pair of files whose names are
+	    of the format <code class="filename">K{name}.+157.+{random}.key</code> and
+	    <code class="filename">K{name}.+157.+{random}.private</code>, which can be
+	    generated by <span><strong class="command">dnssec-keygen</strong></span>.
+	    The <code class="option">-k</code> may also be used to specify a SIG(0) key used
+	    to authenticate Dynamic DNS update requests.  In this case, the key
+	    specified is not an HMAC-MD5 key.
+	  </p></dd>
+<dt><span class="term">-l</span></dt>
+<dd><p>
+	    Local-host only mode. This sets the server address to
+	    localhost (disabling the <span><strong class="command">server</strong></span> so that the server
+	    address cannot be overridden).  Connections to the local server will
+	    use a TSIG key found in <code class="filename">/var/run/named/session.key</code>,
+	    which is automatically generated by <span><strong class="command">named</strong></span> if any
+	    local master zone has set <span><strong class="command">update-policy</strong></span> to
+	    <span><strong class="command">local</strong></span>.  The location of this key file can be
+	    overridden with the <code class="option">-k</code> option.
+	  </p></dd>
+<dt><span class="term">-L <em class="replaceable"><code>level</code></em></span></dt>
+<dd><p>
+	    Set the logging debug level.  If zero, logging is disabled.
+	  </p></dd>
+<dt><span class="term">-p <em class="replaceable"><code>port</code></em></span></dt>
+<dd><p>
+	    Set the port to use for connections to a name server. The
+	    default is 53.
+	  </p></dd>
+<dt><span class="term">-r <em class="replaceable"><code>udpretries</code></em></span></dt>
+<dd><p>
+	    The number of UDP retries. The default is 3. If zero, only
+	    one update request will be made.
+	  </p></dd>
+<dt><span class="term">-R <em class="replaceable"><code>randomdev</code></em></span></dt>
+<dd><p>
+	  Where to obtain randomness. If the operating system
+	  does not provide a <code class="filename">/dev/random</code> or
+	  equivalent device, the default source of randomness is keyboard
+	  input.  <code class="filename">randomdev</code> specifies the name of
+	  a character device or file containing random data to be used
+	  instead of the default.  The special value
+	  <code class="filename">keyboard</code> indicates that keyboard input
+	  should be used.  This option may be specified multiple times.
+	</p></dd>
+<dt><span class="term">-t <em class="replaceable"><code>timeout</code></em></span></dt>
+<dd><p>
+	    The maximum time an update request can take before it is
+	    aborted. The default is 300 seconds. Zero can be used to
+	    disable the timeout.
+	  </p></dd>
+<dt><span class="term">-u <em class="replaceable"><code>udptimeout</code></em></span></dt>
+<dd><p>
+	    The UDP retry interval. The default is 3 seconds. If zero,
+	    the interval will be computed from the timeout interval and
+	    number of UDP retries.
+	  </p></dd>
+<dt><span class="term">-v</span></dt>
+<dd><p>
+	    Use TCP even for small update requests.
+	    By default, <span><strong class="command">nsupdate</strong></span>
+	    uses UDP to send update requests to the name server unless they are too
+	    large to fit in a UDP request in which case TCP will be used.
+	    TCP may be preferable when a batch of update requests is made.
+	  </p></dd>
+<dt><span class="term">-V</span></dt>
+<dd><p>
+	    Print the version number and exit.
+	  </p></dd>
+<dt><span class="term">-y <em class="replaceable"><code>[<span class="optional">hmac:</span>]keyname:secret</code></em></span></dt>
+<dd>
+<p>
+	    Literal TSIG authentication key.
+	    <em class="parameter"><code>keyname</code></em> is the name of the key, and
+	    <em class="parameter"><code>secret</code></em> is the base64 encoded shared secret.
+	    <em class="parameter"><code>hmac</code></em> is the name of the key algorithm;
+	    valid choices are <code class="literal">hmac-md5</code>,
+	    <code class="literal">hmac-sha1</code>, <code class="literal">hmac-sha224</code>,
+	    <code class="literal">hmac-sha256</code>, <code class="literal">hmac-sha384</code>, or
+	    <code class="literal">hmac-sha512</code>.  If <em class="parameter"><code>hmac</code></em>
+	    is not specified, the default is <code class="literal">hmac-md5</code>.
+	  </p>
+<p>
+	    NOTE: Use of the <code class="option">-y</code> option is discouraged because the
+	    shared secret is supplied as a command line argument in clear text.
+	    This may be visible in the output from
+	    <span class="citerefentry"><span class="refentrytitle">ps</span>(1)</span>
+	    or in a history file maintained by the user's shell.
+	  </p>
+</dd>
+</dl></div>
+</div>
+<div class="refsect1" lang="en">
+<a name="id2543963"></a><h2>INPUT FORMAT</h2>
 <p><span><strong class="command">nsupdate</strong></span>
       reads input from
       <em class="parameter"><code>filename</code></em>
@@ -232,270 +230,270 @@
       </p>
 <div class="variablelist"><dl>
 <dt><span class="term">
-              <span><strong class="command">server</strong></span>
-               {servername}
-               [port]
-            </span></dt>
+	      <span><strong class="command">server</strong></span>
+	       {servername}
+	       [port]
+	    </span></dt>
 <dd><p>
-              Sends all dynamic update requests to the name server
-              <em class="parameter"><code>servername</code></em>.
-              When no server statement is provided,
-              <span><strong class="command">nsupdate</strong></span>
-              will send updates to the master server of the correct zone.
-              The MNAME field of that zone's SOA record will identify the
-              master
-              server for that zone.
-              <em class="parameter"><code>port</code></em>
-              is the port number on
-              <em class="parameter"><code>servername</code></em>
-              where the dynamic update requests get sent.
-              If no port number is specified, the default DNS port number of
-              53 is
-              used.
-            </p></dd>
+	      Sends all dynamic update requests to the name server
+	      <em class="parameter"><code>servername</code></em>.
+	      When no server statement is provided,
+	      <span><strong class="command">nsupdate</strong></span>
+	      will send updates to the master server of the correct zone.
+	      The MNAME field of that zone's SOA record will identify the
+	      master
+	      server for that zone.
+	      <em class="parameter"><code>port</code></em>
+	      is the port number on
+	      <em class="parameter"><code>servername</code></em>
+	      where the dynamic update requests get sent.
+	      If no port number is specified, the default DNS port number of
+	      53 is
+	      used.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">local</strong></span>
-               {address}
-               [port]
-            </span></dt>
+	      <span><strong class="command">local</strong></span>
+	       {address}
+	       [port]
+	    </span></dt>
 <dd><p>
-              Sends all dynamic update requests using the local
-              <em class="parameter"><code>address</code></em>.
+	      Sends all dynamic update requests using the local
+	      <em class="parameter"><code>address</code></em>.
 
-              When no local statement is provided,
-              <span><strong class="command">nsupdate</strong></span>
-              will send updates using an address and port chosen by the
-              system.
-              <em class="parameter"><code>port</code></em>
-              can additionally be used to make requests come from a specific
-              port.
-              If no port number is specified, the system will assign one.
-            </p></dd>
+	      When no local statement is provided,
+	      <span><strong class="command">nsupdate</strong></span>
+	      will send updates using an address and port chosen by the
+	      system.
+	      <em class="parameter"><code>port</code></em>
+	      can additionally be used to make requests come from a specific
+	      port.
+	      If no port number is specified, the system will assign one.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">zone</strong></span>
-               {zonename}
-            </span></dt>
+	      <span><strong class="command">zone</strong></span>
+	       {zonename}
+	    </span></dt>
 <dd><p>
-              Specifies that all updates are to be made to the zone
-              <em class="parameter"><code>zonename</code></em>.
-              If no
-              <em class="parameter"><code>zone</code></em>
-              statement is provided,
-              <span><strong class="command">nsupdate</strong></span>
-              will attempt determine the correct zone to update based on the
-              rest of the input.
-            </p></dd>
+	      Specifies that all updates are to be made to the zone
+	      <em class="parameter"><code>zonename</code></em>.
+	      If no
+	      <em class="parameter"><code>zone</code></em>
+	      statement is provided,
+	      <span><strong class="command">nsupdate</strong></span>
+	      will attempt determine the correct zone to update based on the
+	      rest of the input.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">class</strong></span>
-               {classname}
-            </span></dt>
+	      <span><strong class="command">class</strong></span>
+	       {classname}
+	    </span></dt>
 <dd><p>
-              Specify the default class.
-              If no <em class="parameter"><code>class</code></em> is specified, the
-              default class is
-              <em class="parameter"><code>IN</code></em>.
-            </p></dd>
+	      Specify the default class.
+	      If no <em class="parameter"><code>class</code></em> is specified, the
+	      default class is
+	      <em class="parameter"><code>IN</code></em>.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">ttl</strong></span>
-               {seconds}
-            </span></dt>
+	      <span><strong class="command">ttl</strong></span>
+	       {seconds}
+	    </span></dt>
 <dd><p>
-              Specify the default time to live for records to be added.
+	      Specify the default time to live for records to be added.
 	      The value <em class="parameter"><code>none</code></em> will clear the default
 	      ttl.
-            </p></dd>
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">key</strong></span>
-               [hmac:] {keyname}
-               {secret}
-            </span></dt>
+	      <span><strong class="command">key</strong></span>
+	       [hmac:] {keyname}
+	       {secret}
+	    </span></dt>
 <dd><p>
-              Specifies that all updates are to be TSIG-signed using the
-              <em class="parameter"><code>keyname</code></em> <em class="parameter"><code>secret</code></em> pair.
-              If <em class="parameter"><code>hmac</code></em> is specified, then it sets the
-              signing algorithm in use; the default is
-              <code class="literal">hmac-md5</code>.  The <span><strong class="command">key</strong></span>
-              command overrides any key specified on the command line via
-              <code class="option">-y</code> or <code class="option">-k</code>.
-            </p></dd>
+	      Specifies that all updates are to be TSIG-signed using the
+	      <em class="parameter"><code>keyname</code></em> <em class="parameter"><code>secret</code></em> pair.
+	      If <em class="parameter"><code>hmac</code></em> is specified, then it sets the
+	      signing algorithm in use; the default is
+	      <code class="literal">hmac-md5</code>.  The <span><strong class="command">key</strong></span>
+	      command overrides any key specified on the command line via
+	      <code class="option">-y</code> or <code class="option">-k</code>.
+	    </p></dd>
 <dt><span class="term">
-            <span><strong class="command">gsstsig</strong></span>
-          </span></dt>
+	    <span><strong class="command">gsstsig</strong></span>
+	  </span></dt>
 <dd><p>
 	      Use GSS-TSIG to sign the updated.  This is equivalent to
 	      specifying <code class="option">-g</code> on the commandline.
-            </p></dd>
+	    </p></dd>
 <dt><span class="term">
-            <span><strong class="command">oldgsstsig</strong></span>
-          </span></dt>
+	    <span><strong class="command">oldgsstsig</strong></span>
+	  </span></dt>
 <dd><p>
 	      Use the Windows 2000 version of GSS-TSIG to sign the updated.
 	      This is equivalent to specifying <code class="option">-o</code> on the
 	      commandline.
-            </p></dd>
+	    </p></dd>
 <dt><span class="term">
-            <span><strong class="command">realm</strong></span>
-             {[<span class="optional">realm_name</span>]}
-          </span></dt>
+	    <span><strong class="command">realm</strong></span>
+	     {[<span class="optional">realm_name</span>]}
+	  </span></dt>
 <dd><p>
 	      When using GSS-TSIG use <em class="parameter"><code>realm_name</code></em> rather
 	      than the default realm in <code class="filename">krb5.conf</code>.  If no
 	      realm is specified the saved realm is cleared.
-            </p></dd>
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">[<span class="optional">prereq</span>] nxdomain</strong></span>
-               {domain-name}
-            </span></dt>
+	      <span><strong class="command">[<span class="optional">prereq</span>] nxdomain</strong></span>
+	       {domain-name}
+	    </span></dt>
 <dd><p>
-              Requires that no resource record of any type exists with name
-              <em class="parameter"><code>domain-name</code></em>.
-            </p></dd>
+	      Requires that no resource record of any type exists with name
+	      <em class="parameter"><code>domain-name</code></em>.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">[<span class="optional">prereq</span>] yxdomain</strong></span>
-               {domain-name}
-            </span></dt>
+	      <span><strong class="command">[<span class="optional">prereq</span>] yxdomain</strong></span>
+	       {domain-name}
+	    </span></dt>
 <dd><p>
-              Requires that
-              <em class="parameter"><code>domain-name</code></em>
-              exists (has as at least one resource record, of any type).
-            </p></dd>
+	      Requires that
+	      <em class="parameter"><code>domain-name</code></em>
+	      exists (has as at least one resource record, of any type).
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">[<span class="optional">prereq</span>] nxrrset</strong></span>
-               {domain-name}
-               [class]
-               {type}
-            </span></dt>
+	      <span><strong class="command">[<span class="optional">prereq</span>] nxrrset</strong></span>
+	       {domain-name}
+	       [class]
+	       {type}
+	    </span></dt>
 <dd><p>
-              Requires that no resource record exists of the specified
-              <em class="parameter"><code>type</code></em>,
-              <em class="parameter"><code>class</code></em>
-              and
-              <em class="parameter"><code>domain-name</code></em>.
-              If
-              <em class="parameter"><code>class</code></em>
-              is omitted, IN (internet) is assumed.
-            </p></dd>
+	      Requires that no resource record exists of the specified
+	      <em class="parameter"><code>type</code></em>,
+	      <em class="parameter"><code>class</code></em>
+	      and
+	      <em class="parameter"><code>domain-name</code></em>.
+	      If
+	      <em class="parameter"><code>class</code></em>
+	      is omitted, IN (internet) is assumed.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">[<span class="optional">prereq</span>] yxrrset</strong></span>
-               {domain-name}
-               [class]
-               {type}
-            </span></dt>
+	      <span><strong class="command">[<span class="optional">prereq</span>] yxrrset</strong></span>
+	       {domain-name}
+	       [class]
+	       {type}
+	    </span></dt>
 <dd><p>
-              This requires that a resource record of the specified
-              <em class="parameter"><code>type</code></em>,
-              <em class="parameter"><code>class</code></em>
-              and
-              <em class="parameter"><code>domain-name</code></em>
-              must exist.
-              If
-              <em class="parameter"><code>class</code></em>
-              is omitted, IN (internet) is assumed.
-            </p></dd>
+	      This requires that a resource record of the specified
+	      <em class="parameter"><code>type</code></em>,
+	      <em class="parameter"><code>class</code></em>
+	      and
+	      <em class="parameter"><code>domain-name</code></em>
+	      must exist.
+	      If
+	      <em class="parameter"><code>class</code></em>
+	      is omitted, IN (internet) is assumed.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">[<span class="optional">prereq</span>] yxrrset</strong></span>
-               {domain-name}
-               [class]
-               {type}
-               {data...}
-            </span></dt>
+	      <span><strong class="command">[<span class="optional">prereq</span>] yxrrset</strong></span>
+	       {domain-name}
+	       [class]
+	       {type}
+	       {data...}
+	    </span></dt>
 <dd><p>
-              The
-              <em class="parameter"><code>data</code></em>
-              from each set of prerequisites of this form
-              sharing a common
-              <em class="parameter"><code>type</code></em>,
-              <em class="parameter"><code>class</code></em>,
-              and
-              <em class="parameter"><code>domain-name</code></em>
-              are combined to form a set of RRs.  This set of RRs must
-              exactly match the set of RRs existing in the zone at the
-              given
-              <em class="parameter"><code>type</code></em>,
-              <em class="parameter"><code>class</code></em>,
-              and
-              <em class="parameter"><code>domain-name</code></em>.
-              The
-              <em class="parameter"><code>data</code></em>
-              are written in the standard text representation of the resource
-              record's
-              RDATA.
-            </p></dd>
+	      The
+	      <em class="parameter"><code>data</code></em>
+	      from each set of prerequisites of this form
+	      sharing a common
+	      <em class="parameter"><code>type</code></em>,
+	      <em class="parameter"><code>class</code></em>,
+	      and
+	      <em class="parameter"><code>domain-name</code></em>
+	      are combined to form a set of RRs.  This set of RRs must
+	      exactly match the set of RRs existing in the zone at the
+	      given
+	      <em class="parameter"><code>type</code></em>,
+	      <em class="parameter"><code>class</code></em>,
+	      and
+	      <em class="parameter"><code>domain-name</code></em>.
+	      The
+	      <em class="parameter"><code>data</code></em>
+	      are written in the standard text representation of the resource
+	      record's
+	      RDATA.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">[<span class="optional">update</span>] del[<span class="optional">ete</span>]</strong></span>
-               {domain-name}
-               [ttl]
-               [class]
-               [type [data...]]
-            </span></dt>
+	      <span><strong class="command">[<span class="optional">update</span>] del[<span class="optional">ete</span>]</strong></span>
+	       {domain-name}
+	       [ttl]
+	       [class]
+	       [type [data...]]
+	    </span></dt>
 <dd><p>
-              Deletes any resource records named
-              <em class="parameter"><code>domain-name</code></em>.
-              If
-              <em class="parameter"><code>type</code></em>
-              and
-              <em class="parameter"><code>data</code></em>
-              is provided, only matching resource records will be removed.
-              The internet class is assumed if
-              <em class="parameter"><code>class</code></em>
-              is not supplied.  The
-              <em class="parameter"><code>ttl</code></em>
-              is ignored, and is only allowed for compatibility.
-            </p></dd>
+	      Deletes any resource records named
+	      <em class="parameter"><code>domain-name</code></em>.
+	      If
+	      <em class="parameter"><code>type</code></em>
+	      and
+	      <em class="parameter"><code>data</code></em>
+	      is provided, only matching resource records will be removed.
+	      The internet class is assumed if
+	      <em class="parameter"><code>class</code></em>
+	      is not supplied.  The
+	      <em class="parameter"><code>ttl</code></em>
+	      is ignored, and is only allowed for compatibility.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">[<span class="optional">update</span>] add</strong></span>
-               {domain-name}
-               {ttl}
-               [class]
-               {type}
-               {data...}
-            </span></dt>
+	      <span><strong class="command">[<span class="optional">update</span>] add</strong></span>
+	       {domain-name}
+	       {ttl}
+	       [class]
+	       {type}
+	       {data...}
+	    </span></dt>
 <dd><p>
-              Adds a new resource record with the specified
-              <em class="parameter"><code>ttl</code></em>,
-              <em class="parameter"><code>class</code></em>
-              and
-              <em class="parameter"><code>data</code></em>.
-            </p></dd>
+	      Adds a new resource record with the specified
+	      <em class="parameter"><code>ttl</code></em>,
+	      <em class="parameter"><code>class</code></em>
+	      and
+	      <em class="parameter"><code>data</code></em>.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">show</strong></span>
-            </span></dt>
+	      <span><strong class="command">show</strong></span>
+	    </span></dt>
 <dd><p>
-              Displays the current message, containing all of the
-              prerequisites and
-              updates specified since the last send.
-            </p></dd>
+	      Displays the current message, containing all of the
+	      prerequisites and
+	      updates specified since the last send.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">send</strong></span>
-            </span></dt>
+	      <span><strong class="command">send</strong></span>
+	    </span></dt>
 <dd><p>
-              Sends the current message.  This is equivalent to entering a
-              blank line.
-            </p></dd>
+	      Sends the current message.  This is equivalent to entering a
+	      blank line.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">answer</strong></span>
-            </span></dt>
+	      <span><strong class="command">answer</strong></span>
+	    </span></dt>
 <dd><p>
-              Displays the answer.
-            </p></dd>
+	      Displays the answer.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">debug</strong></span>
-            </span></dt>
+	      <span><strong class="command">debug</strong></span>
+	    </span></dt>
 <dd><p>
-              Turn on debugging.
-            </p></dd>
+	      Turn on debugging.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">version</strong></span>
-            </span></dt>
+	      <span><strong class="command">version</strong></span>
+	    </span></dt>
 <dd><p>
-              Print version number.
-            </p></dd>
+	      Print version number.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">help</strong></span>
-            </span></dt>
+	      <span><strong class="command">help</strong></span>
+	    </span></dt>
 <dd><p>
-              Print a list of commands.
-            </p></dd>
+	      Print a list of commands.
+	    </p></dd>
 </dl></div>
 <p>
     </p>
@@ -504,7 +502,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544823"></a><h2>EXAMPLES</h2>
+<a name="id2545067"></a><h2>EXAMPLES</h2>
 <p>
       The examples below show how
       <span><strong class="command">nsupdate</strong></span>
@@ -558,30 +556,30 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544867"></a><h2>FILES</h2>
+<a name="id2545111"></a><h2>FILES</h2>
 <div class="variablelist"><dl>
 <dt><span class="term"><code class="constant">/etc/resolv.conf</code></span></dt>
 <dd><p>
-            used to identify default name server
-          </p></dd>
+	    used to identify default name server
+	  </p></dd>
 <dt><span class="term"><code class="constant">/var/run/named/session.key</code></span></dt>
 <dd><p>
-            sets the default TSIG key for use in local-only mode
-          </p></dd>
+	    sets the default TSIG key for use in local-only mode
+	  </p></dd>
 <dt><span class="term"><code class="constant">K{name}.+157.+{random}.key</code></span></dt>
 <dd><p>
-            base-64 encoding of HMAC-MD5 key created by
-            <span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>.
-          </p></dd>
+	    base-64 encoding of HMAC-MD5 key created by
+	    <span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>.
+	  </p></dd>
 <dt><span class="term"><code class="constant">K{name}.+157.+{random}.private</code></span></dt>
 <dd><p>
-            base-64 encoding of HMAC-MD5 key created by
-            <span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>.
-          </p></dd>
+	    base-64 encoding of HMAC-MD5 key created by
+	    <span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>.
+	  </p></dd>
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2544950"></a><h2>SEE ALSO</h2>
+<a name="id2545197"></a><h2>SEE ALSO</h2>
 <p>
       <em class="citetitle">RFC 2136</em>,
       <em class="citetitle">RFC 3007</em>,
@@ -596,7 +594,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2542004"></a><h2>BUGS</h2>
+<a name="id2545255"></a><h2>BUGS</h2>
 <p>
       The TSIG key is redundantly stored in two separate files.
       This is a consequence of nsupdate using the DST library
diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index a23994e3c3..9443710845 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -83,48 +83,7 @@
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_security"></a>Security Fixes</h3></div></div></div>
-<div class="itemizedlist"><ul type="disc">
-<li>
-<p>
-	  On servers configured to perform DNSSEC validation using
-	  managed trust anchors (i.e., keys configured explicitly
-	  via <span><strong class="command">managed-keys</strong></span>, or implicitly 
-	  via <span><strong class="command">dnssec-validation auto;</strong></span> or
-	  <span><strong class="command">dnssec-lookaside auto;</strong></span>), revoking
-	  a trust anchor and sending a new untrusted replacement
-	  could cause <span><strong class="command">named</strong></span> to crash with an
-	  assertion failure. This could occur in the event of a
-	  botched key rollover, or potentially as a result of a
-	  deliberate attack if the attacker was in position to
-	  monitor the victim's DNS traffic.
-	</p>
-<p>
-	  This flaw was discovered by Jan-Piet Mens, and is
-	  disclosed in CVE-2015-1349. [RT #38344]
-	</p>
-</li>
-<li>
-<p>
-	  A flaw in delegation handling could be exploited to put
-	  <span><strong class="command">named</strong></span> into an infinite loop, in which
-	  each lookup of a name server triggered additional lookups
-	  of more name servers.  This has been addressed by placing
-	  limits on the number of levels of recursion
-	  <span><strong class="command">named</strong></span> will allow (default 7), and
-	  on the number of queries that it will send before
-	  terminating a recursive query (default 50).
-	</p>
-<p>
-	  The recursion depth limit is configured via the
-	  <code class="option">max-recursion-depth</code> option, and the query limit
-	  via the <code class="option">max-recursion-queries</code> option.
-	</p>
-<p>
-	  The flaw was discovered by Florian Maury of ANSSI, and is
-	  disclosed in CVE-2014-8500. [RT #37580]
-	</p>
-</li>
-</ul></div>
+<div class="itemizedlist"><ul type="disc"><li><p>None</p></li></ul></div>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
@@ -134,148 +93,16 @@
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_changes"></a>Feature Changes</h3></div></div></div>
-<div class="itemizedlist"><ul type="disc">
-<li><p>
-          NXDOMAIN responses to queries of type DS are now cached separately
-          from those for other types. This helps when using "grafted" zones
-          of type forward, for which the parent zone does not contain a
-          delegation, such as local top-level domains.  Previously a query
-          of type DS for such a zone could cause the zone apex to be cached
-          as NXDOMAIN, blocking all subsequent queries.  (Note: This
-          change is only helpful when DNSSEC validation is not enabled.
-          "Grafted" zones without a delegation in the parent are not a
-          recommended configuration.)
-        </p></li>
-<li><p>
-          NOTIFY messages that are sent because a zone has been updated
-          are now given priority above NOTIFY messages that were scheduled
-          when the server started up. This should mitigate delays in zone
-          propagation when servers are restarted frequently.
-        </p></li>
-<li><p>
-          Errors reported when running <span><strong class="command">rndc addzone</strong></span>
-          (e.g., when a zone file cannot be loaded) have been clarified
-          to make it easier to diagnose problems.
-        </p></li>
-<li><p>
-	  Added support for OPENPGPKEY type.
-        </p></li>
-<li><p>
-	  When encountering an authoritative name server whose name is
-	  an alias pointing to another name, the resolver treats
-	  this as an error and skips to the next server. Previously
-	  this happened silently; now the error will be logged to
-	  the newly-created "cname" log category.
-	</p></li>
-<li><p>
-	  If named is not configured to validate the answer then
-	  allow fallback to plain DNS on timeout even when we know
-	  the server supports EDNS.  This will allow the server to
-	  potentially resolve signed queries when TCP is being
-	  blocked.
-	</p></li>
-</ul></div>
+<div class="itemizedlist"><ul type="disc"><li><p>None</p></li></ul></div>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_bugs"></a>Bug Fixes</h3></div></div></div>
-<div class="itemizedlist"><ul type="disc">
-<li><p>
-	  <span><strong class="command">dig</strong></span>, <span><strong class="command">host</strong></span> and
-	  <span><strong class="command">nslookup</strong></span> aborted when encountering
-	  a name which, after appending search list elements,
-	  exceeded 255 bytes. Such names are now skipped, but
-	  processing of other names will continue. [RT #36892]
-        </p></li>
-<li><p>
-	  The error message generated when
-	  <span><strong class="command">named-checkzone</strong></span> or
-	  <span><strong class="command">named-checkconf -z</strong></span> encounters a
-	  <code class="option">$TTL</code> directive without a value has
-	  been clarified. [RT #37138]
-        </p></li>
-<li><p>
-	  Semicolon characters (;) included in TXT records were
-	  incorrectly escaped with a backslash when the record was
-	  displayed as text. This is actually only necessary when there
-	  are no quotation marks. [RT #37159]
-        </p></li>
-<li><p>
-	  When files opened for writing by <span><strong class="command">named</strong></span>,
-	  such as zone journal files, were referenced more than once
-	  in <code class="filename">named.conf</code>, it could lead to file
-	  corruption as multiple threads wrote to the same file. This
-	  is now detected when loading <code class="filename">named.conf</code>
-	  and reported as an error. [RT #37172]
-        </p></li>
-<li><p>
-          <span><strong class="command">dnssec-keygen -S</strong></span> failed to generate successor
-          keys for some algorithm types (including ECDSA and GOST) due to
-          a difference in the content of private key files. This has been
-          corrected. [RT #37183]
-        </p></li>
-<li><p>
-          UPDATE messages that arrived too soon after
-          an <span><strong class="command">rndc thaw</strong></span> could be lost. [RT #37233]
-        </p></li>
-<li><p>
-          Forwarding of UPDATE messages did not work when they were
-          signed with SIG(0); they resulted in a BADSIG response code.
-          [RT #37216]
-        </p></li>
-<li><p>
-          When checking for updates to trust anchors listed in
-          <code class="option">managed-keys</code>, <span><strong class="command">named</strong></span>
-          now revalidates keys based on the current set of
-          active trust anchors, without relying on any cached
-          record of previous validation. [RT #37506]
-        </p></li>
-<li><p>
-	  When NXDOMAIN redirection is in use, queries for a name
-	  that is present in the redirection zone but a type that
-	  is not present will now return NOERROR instead of NXDOMAIN.
-        </p></li>
-<li><p>
-	  When a zone contained a delegation to an IPv6 name server
-	  but not an IPv4 name server, it was possible for a memory
-	  reference to be left un-freed. This caused an assertion
-	  failure on server shutdown, but was otherwise harmless.
-	  [RT #37796]
-        </p></li>
-<li><p>
-	  Due to an inadvertent removal of code in the previous
-	  release, when <span><strong class="command">named</strong></span> encountered an
-	  authoritative name server which dropped all EDNS queries,
-	  it did not always try plain DNS. This has been corrected.
-	  [RT #37965]
-        </p></li>
-<li><p>
-	  A regression caused nsupdate to use the default recursive servers
-	  rather than the SOA MNAME server when sending the UPDATE.
-        </p></li>
-<li><p>
-	  Adjusted max-recursion-queries to better accommodate empty
-	  caches.
-        </p></li>
-<li><p>
-	  Built-in "empty" zones did not correctly inherit the
-	  "allow-transfer" ACL from the options or view. [RT #38310]
-        </p></li>
-<li><p>
-	  A mutex leak was fixed that could cause <span><strong class="command">named</strong></span>
-	  processes to grow to very large sizes. [RT #38454]
-	</p></li>
-<li><p>
-	  Fixed some bugs in RFC 5011 trust anchor management,
-	  including a memory leak and a possible loss of state
-	  information. [RT #38458]
-	</p></li>
-<li><p>
+<div class="itemizedlist"><ul type="disc"><li><p>
 	  Asynchronous zone loads were not handled correctly when the
 	  zone load was already in progress; this could trigger a crash
 	  in zt.c. [RT #37573]
-	</p></li>
-</ul></div>
+ 	</p></li></ul></div>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
diff --git a/doc/arm/Bv9ARM.ch12.html b/doc/arm/Bv9ARM.ch12.html
index 3dfafc0964..0ad9562f9a 100644
--- a/doc/arm/Bv9ARM.ch12.html
+++ b/doc/arm/Bv9ARM.ch12.html
@@ -47,13 +47,13 @@
 <dl>
 <dt><span class="sect1"><a href="Bv9ARM.ch12.html#bind9.library">BIND 9 DNS Library Support</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2611402">Prerequisite</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2609227">Compilation</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2609252">Installation</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2609283">Known Defects/Restrictions</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2610861">The dns.conf File</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2610888">Sample Applications</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2611724">Library References</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2611641">Prerequisite</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2611651">Compilation</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2611675">Installation</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2609249">Known Defects/Restrictions</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2610281">The dns.conf File</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2610308">Sample Applications</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2611349">Library References</a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -89,7 +89,7 @@
 </ul></div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2611402"></a>Prerequisite</h3></div></div></div>
+<a name="id2611641"></a>Prerequisite</h3></div></div></div>
 <p>GNU make is required to build the export libraries (other
   part of BIND 9 can still be built with other types of make). In
   the reminder of this document, "make" means GNU make. Note that
@@ -98,7 +98,7 @@
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2609227"></a>Compilation</h3></div></div></div>
+<a name="id2611651"></a>Compilation</h3></div></div></div>
 <pre class="screen">
 $ <strong class="userinput"><code>./configure --enable-exportlib <em class="replaceable"><code>[other flags]</code></em></code></strong>
 $ <strong class="userinput"><code>make</code></strong>
@@ -113,7 +113,7 @@ $ <strong class="userinput"><code>make</code></strong>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2609252"></a>Installation</h3></div></div></div>
+<a name="id2611675"></a>Installation</h3></div></div></div>
 <pre class="screen">
 $ <strong class="userinput"><code>cd lib/export</code></strong>
 $ <strong class="userinput"><code>make install</code></strong>
@@ -135,7 +135,7 @@ $ <strong class="userinput"><code>make install</code></strong>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2609283"></a>Known Defects/Restrictions</h3></div></div></div>
+<a name="id2609249"></a>Known Defects/Restrictions</h3></div></div></div>
 <div class="itemizedlist"><ul type="disc">
 <li><p>Currently, win32 is not supported for the export
       library. (Normal BIND 9 application can be built as
@@ -175,7 +175,7 @@ $ <strong class="userinput"><code>make</code></strong>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2610861"></a>The dns.conf File</h3></div></div></div>
+<a name="id2610281"></a>The dns.conf File</h3></div></div></div>
 <p>The IRS library supports an "advanced" configuration file
   related to the DNS library for configuration parameters that
   would be beyond the capability of the
@@ -193,14 +193,14 @@ $ <strong class="userinput"><code>make</code></strong>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2610888"></a>Sample Applications</h3></div></div></div>
+<a name="id2610308"></a>Sample Applications</h3></div></div></div>
 <p>Some sample application programs using this API are
   provided for reference. The following is a brief description of
   these applications.
   </p>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2610897"></a>sample: a simple stub resolver utility</h4></div></div></div>
+<a name="id2610316"></a>sample: a simple stub resolver utility</h4></div></div></div>
 <p>
   It sends a query of a given name (of a given optional RR type) to a
   specified recursive server, and prints the result as a list of
@@ -264,7 +264,7 @@ $ <strong class="userinput"><code>make</code></strong>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2610987"></a>sample-async: a simple stub resolver, working asynchronously</h4></div></div></div>
+<a name="id2610407"></a>sample-async: a simple stub resolver, working asynchronously</h4></div></div></div>
 <p>
   Similar to "sample", but accepts a list
   of (query) domain names as a separate file and resolves the names
@@ -305,7 +305,7 @@ $ <strong class="userinput"><code>make</code></strong>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2611109"></a>sample-request: a simple DNS transaction client</h4></div></div></div>
+<a name="id2610460"></a>sample-request: a simple DNS transaction client</h4></div></div></div>
 <p>
   It sends a query to a specified server, and
   prints the response with minimal processing. It doesn't act as a
@@ -346,7 +346,7 @@ $ <strong class="userinput"><code>make</code></strong>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2611173"></a>sample-gai: getaddrinfo() and getnameinfo() test code</h4></div></div></div>
+<a name="id2610797"></a>sample-gai: getaddrinfo() and getnameinfo() test code</h4></div></div></div>
 <p>
   This is a test program
   to check getaddrinfo() and getnameinfo() behavior. It takes a
@@ -363,7 +363,7 @@ $ <strong class="userinput"><code>make</code></strong>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2611188"></a>sample-update: a simple dynamic update client program</h4></div></div></div>
+<a name="id2610812"></a>sample-update: a simple dynamic update client program</h4></div></div></div>
 <p>
   It accepts a single update command as a
   command-line argument, sends an update request message to the
@@ -458,7 +458,7 @@ $ <strong class="userinput"><code>sample-update -a sample-update -k Kxxx.+nnn+mm
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="id2611660"></a>nsprobe: domain/name server checker in terms of RFC 4074</h4></div></div></div>
+<a name="id2611285"></a>nsprobe: domain/name server checker in terms of RFC 4074</h4></div></div></div>
 <p>
   It checks a set
   of domains to see the name servers of the domains behave
@@ -515,7 +515,7 @@ $ <strong class="userinput"><code>sample-update -a sample-update -k Kxxx.+nnn+mm
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="id2611724"></a>Library References</h3></div></div></div>
+<a name="id2611349"></a>Library References</h3></div></div></div>
 <p>As of this writing, there is no formal "manual" of the
   libraries, except this document, header files (some of them
   provide pretty detailed explanations), and sample application
diff --git a/doc/arm/Bv9ARM.html b/doc/arm/Bv9ARM.html
index 21d2ef280e..8342e98499 100644
--- a/doc/arm/Bv9ARM.html
+++ b/doc/arm/Bv9ARM.html
@@ -262,13 +262,13 @@
 <dd><dl>
 <dt><span class="sect1"><a href="Bv9ARM.ch12.html#bind9.library">BIND 9 DNS Library Support</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2611402">Prerequisite</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2609227">Compilation</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2609252">Installation</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2609283">Known Defects/Restrictions</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2610861">The dns.conf File</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2610888">Sample Applications</a></span></dt>
-<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2611724">Library References</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2611641">Prerequisite</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2611651">Compilation</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2611675">Installation</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2609249">Known Defects/Restrictions</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2610281">The dns.conf File</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2610308">Sample Applications</a></span></dt>
+<dt><span class="sect2"><a href="Bv9ARM.ch12.html#id2611349">Library References</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="reference"><a href="Bv9ARM.ch13.html">I. Manual pages</a></span></dt>
diff --git a/doc/arm/man.arpaname.html b/doc/arm/man.arpaname.html
index 5fac57d342..42b075239e 100644
--- a/doc/arm/man.arpaname.html
+++ b/doc/arm/man.arpaname.html
@@ -50,20 +50,20 @@
 <div class="cmdsynopsis"><p><code class="command">arpaname</code>  {<em class="replaceable"><code>ipaddress </code></em>...}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2620585"></a><h2>DESCRIPTION</h2>
+<a name="id2616555"></a><h2>DESCRIPTION</h2>
 <p>
       <span><strong class="command">arpaname</strong></span> translates IP addresses (IPv4 and
       IPv6) to the corresponding IN-ADDR.ARPA or IP6.ARPA names.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2620600"></a><h2>SEE ALSO</h2>
+<a name="id2616570"></a><h2>SEE ALSO</h2>
 <p>
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2620614"></a><h2>AUTHOR</h2>
+<a name="id2616584"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.ddns-confgen.html b/doc/arm/man.ddns-confgen.html
index 14df588463..e7260bdda4 100644
--- a/doc/arm/man.ddns-confgen.html
+++ b/doc/arm/man.ddns-confgen.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">ddns-confgen</code>  [<code class="option">-a <em class="replaceable"><code>algorithm</code></em></code>] [<code class="option">-h</code>] [<code class="option">-k <em class="replaceable"><code>keyname</code></em></code>] [<code class="option">-r <em class="replaceable"><code>randomfile</code></em></code>] [ -s <em class="replaceable"><code>name</code></em>  |   -z <em class="replaceable"><code>zone</code></em> ] [<code class="option">-q</code>] [name]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2659792"></a><h2>DESCRIPTION</h2>
+<a name="id2658356"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">ddns-confgen</strong></span>
       generates a key for use by <span><strong class="command">nsupdate</strong></span>
       and <span><strong class="command">named</strong></span>.  It simplifies configuration
@@ -77,7 +77,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2659879"></a><h2>OPTIONS</h2>
+<a name="id2658443"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-a <em class="replaceable"><code>algorithm</code></em></span></dt>
 <dd><p>
@@ -144,7 +144,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2660080"></a><h2>SEE ALSO</h2>
+<a name="id2658780"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">nsupdate</span>(1)</span>,
       <span class="citerefentry"><span class="refentrytitle">named.conf</span>(5)</span>,
       <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
@@ -152,7 +152,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2660118"></a><h2>AUTHOR</h2>
+<a name="id2658819"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.dig.html b/doc/arm/man.dig.html
index feafdf4818..d30e1d5ab9 100644
--- a/doc/arm/man.dig.html
+++ b/doc/arm/man.dig.html
@@ -52,7 +52,7 @@
 <div class="cmdsynopsis"><p><code class="command">dig</code>  [global-queryopt...] [query...]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2612221"></a><h2>DESCRIPTION</h2>
+<a name="id2612262"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">dig</strong></span>
       (domain information groper) is a flexible tool
       for interrogating DNS name servers.  It performs DNS lookups and
@@ -99,7 +99,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2612392"></a><h2>SIMPLE USAGE</h2>
+<a name="id2664110"></a><h2>SIMPLE USAGE</h2>
 <p>
       A typical invocation of <span><strong class="command">dig</strong></span> looks like:
       </p>
@@ -152,7 +152,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2664196"></a><h2>OPTIONS</h2>
+<a name="id2664236"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-4</span></dt>
 <dd><p>
@@ -280,7 +280,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2664711"></a><h2>QUERY OPTIONS</h2>
+<a name="id2664752"></a><h2>QUERY OPTIONS</h2>
 <p><span><strong class="command">dig</strong></span>
       provides a number of query options which affect
       the way in which lookups are made and the results displayed.  Some of
@@ -638,7 +638,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2665962"></a><h2>MULTIPLE QUERIES</h2>
+<a name="id2665866"></a><h2>MULTIPLE QUERIES</h2>
 <p>
       The BIND 9 implementation of <span><strong class="command">dig </strong></span>
       supports
@@ -684,7 +684,7 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2666048"></a><h2>IDN SUPPORT</h2>
+<a name="id2665952"></a><h2>IDN SUPPORT</h2>
 <p>
       If <span><strong class="command">dig</strong></span> has been built with IDN (internationalized
       domain name) support, it can accept and display non-ASCII domain names.
@@ -698,14 +698,14 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2666076"></a><h2>FILES</h2>
+<a name="id2665980"></a><h2>FILES</h2>
 <p><code class="filename">/etc/resolv.conf</code>
     </p>
 <p><code class="filename">${HOME}/.digrc</code>
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2666098"></a><h2>SEE ALSO</h2>
+<a name="id2666002"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">host</span>(1)</span>,
       <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
@@ -713,7 +713,7 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2666135"></a><h2>BUGS</h2>
+<a name="id2666107"></a><h2>BUGS</h2>
 <p>
       There are probably too many query options.
     </p>
diff --git a/doc/arm/man.dnssec-checkds.html b/doc/arm/man.dnssec-checkds.html
index b84808429c..4c0cc2c9a3 100644
--- a/doc/arm/man.dnssec-checkds.html
+++ b/doc/arm/man.dnssec-checkds.html
@@ -51,7 +51,7 @@
 <div class="cmdsynopsis"><p><code class="command">dnssec-dsfromkey</code>  [<code class="option">-l <em class="replaceable"><code>domain</code></em></code>] [<code class="option">-f <em class="replaceable"><code>file</code></em></code>] [<code class="option">-d <em class="replaceable"><code>dig path</code></em></code>] [<code class="option">-D <em class="replaceable"><code>dsfromkey path</code></em></code>] {zone}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2614374"></a><h2>DESCRIPTION</h2>
+<a name="id2614275"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">dnssec-checkds</strong></span>
       verifies the correctness of Delegation Signer (DS) or DNSSEC
       Lookaside Validation (DLV) resource records for keys in a specified
@@ -59,7 +59,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2614388"></a><h2>OPTIONS</h2>
+<a name="id2614289"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-f <em class="replaceable"><code>file</code></em></span></dt>
 <dd><p>
@@ -88,14 +88,14 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2614558"></a><h2>SEE ALSO</h2>
+<a name="id2614391"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">dnssec-dsfromkey</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2614593"></a><h2>AUTHOR</h2>
+<a name="id2614425"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.dnssec-coverage.html b/doc/arm/man.dnssec-coverage.html
index c1af251c80..17ff9a6604 100644
--- a/doc/arm/man.dnssec-coverage.html
+++ b/doc/arm/man.dnssec-coverage.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">dnssec-coverage</code>  [<code class="option">-K <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-f <em class="replaceable"><code>file</code></em></code>] [<code class="option">-d <em class="replaceable"><code>DNSKEY TTL</code></em></code>] [<code class="option">-m <em class="replaceable"><code>max TTL</code></em></code>] [<code class="option">-r <em class="replaceable"><code>interval</code></em></code>] [<code class="option">-c <em class="replaceable"><code>compilezone path</code></em></code>] [zone]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2614685"></a><h2>DESCRIPTION</h2>
+<a name="id2614586"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">dnssec-coverage</strong></span>
       verifies that the DNSSEC keys for a given zone or a set of zones
       have timing metadata set properly to ensure no future lapses in DNSSEC
@@ -78,7 +78,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2614712"></a><h2>OPTIONS</h2>
+<a name="id2614613"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-f <em class="replaceable"><code>file</code></em></span></dt>
 <dd><p>
@@ -168,7 +168,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2615099"></a><h2>SEE ALSO</h2>
+<a name="id2615068"></a><h2>SEE ALSO</h2>
 <p>
       <span class="citerefentry"><span class="refentrytitle">dnssec-checkds</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">dnssec-dsfromkey</span>(8)</span>,
@@ -177,7 +177,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2615143"></a><h2>AUTHOR</h2>
+<a name="id2615112"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.dnssec-dsfromkey.html b/doc/arm/man.dnssec-dsfromkey.html
index d5709d648a..3bb1bfdb36 100644
--- a/doc/arm/man.dnssec-dsfromkey.html
+++ b/doc/arm/man.dnssec-dsfromkey.html
@@ -52,14 +52,14 @@
 <div class="cmdsynopsis"><p><code class="command">dnssec-dsfromkey</code>  [<code class="option">-h</code>] [<code class="option">-V</code>]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2615828"></a><h2>DESCRIPTION</h2>
+<a name="id2616002"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">dnssec-dsfromkey</strong></span>
       outputs the Delegation Signer (DS) resource record (RR), as defined in
       RFC 3658 and RFC 4509, for the given key(s).
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2615842"></a><h2>OPTIONS</h2>
+<a name="id2616016"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-1</span></dt>
 <dd><p>
@@ -144,7 +144,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2616514"></a><h2>EXAMPLE</h2>
+<a name="id2617712"></a><h2>EXAMPLE</h2>
 <p>
       To build the SHA-256 DS RR from the
       <strong class="userinput"><code>Kexample.com.+003+26160</code></strong>
@@ -159,7 +159,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2617506"></a><h2>FILES</h2>
+<a name="id2617748"></a><h2>FILES</h2>
 <p>
       The keyfile can be designed by the key identification
       <code class="filename">Knnnn.+aaa+iiiii</code> or the full file name
@@ -173,13 +173,13 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2617547"></a><h2>CAVEAT</h2>
+<a name="id2617789"></a><h2>CAVEAT</h2>
 <p>
       A keyfile error can give a "file not found" even if the file exists.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2617557"></a><h2>SEE ALSO</h2>
+<a name="id2617799"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>,
@@ -189,7 +189,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2617596"></a><h2>AUTHOR</h2>
+<a name="id2617838"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.dnssec-keyfromlabel.html b/doc/arm/man.dnssec-keyfromlabel.html
index 07676ef7c9..b668c4c6f8 100644
--- a/doc/arm/man.dnssec-keyfromlabel.html
+++ b/doc/arm/man.dnssec-keyfromlabel.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">dnssec-keyfromlabel</code>  {-l <em class="replaceable"><code>label</code></em>} [<code class="option">-3</code>] [<code class="option">-a <em class="replaceable"><code>algorithm</code></em></code>] [<code class="option">-A <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-D <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-E <em class="replaceable"><code>engine</code></em></code>] [<code class="option">-f <em class="replaceable"><code>flag</code></em></code>] [<code class="option">-G</code>] [<code class="option">-I <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-i <em class="replaceable"><code>interval</code></em></code>] [<code class="option">-k</code>] [<code class="option">-K <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-L <em class="replaceable"><code>ttl</code></em></code>] [<code class="option">-n <em class="replaceable"><code>nametype</code></em></code>] [<code class="option">-P <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-p <em class="replaceable"><code>protocol</code></em></code>] [<code class="option">-R <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-S <em class="replaceable"><code>key</code></em></code>] [<code class="option">-t <em class="replaceable"><code>type</code></em></code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] [<code class="option">-V</code>] [<code class="option">-y</code>] {name}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2617004"></a><h2>DESCRIPTION</h2>
+<a name="id2617178"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">dnssec-keyfromlabel</strong></span>
       generates a key pair of files that referencing a key object stored
       in a cryptographic hardware service module (HSM).  The private key
@@ -66,7 +66,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2617030"></a><h2>OPTIONS</h2>
+<a name="id2617204"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-a <em class="replaceable"><code>algorithm</code></em></span></dt>
 <dd>
@@ -209,7 +209,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2619300"></a><h2>TIMING OPTIONS</h2>
+<a name="id2668216"></a><h2>TIMING OPTIONS</h2>
 <p>
       Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS.
       If the argument begins with a '+' or '-', it is interpreted as
@@ -281,7 +281,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2670075"></a><h2>GENERATED KEY FILES</h2>
+<a name="id2668406"></a><h2>GENERATED KEY FILES</h2>
 <p>
       When <span><strong class="command">dnssec-keyfromlabel</strong></span> completes
       successfully,
@@ -320,7 +320,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2670169"></a><h2>SEE ALSO</h2>
+<a name="id2668568"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>,
@@ -328,7 +328,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2670202"></a><h2>AUTHOR</h2>
+<a name="id2668601"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.dnssec-keygen.html b/doc/arm/man.dnssec-keygen.html
index 7b540f9807..c972431c99 100644
--- a/doc/arm/man.dnssec-keygen.html
+++ b/doc/arm/man.dnssec-keygen.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">dnssec-keygen</code>  [<code class="option">-a <em class="replaceable"><code>algorithm</code></em></code>] [<code class="option">-b <em class="replaceable"><code>keysize</code></em></code>] [<code class="option">-n <em class="replaceable"><code>nametype</code></em></code>] [<code class="option">-3</code>] [<code class="option">-A <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-C</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-D <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-E <em class="replaceable"><code>engine</code></em></code>] [<code class="option">-f <em class="replaceable"><code>flag</code></em></code>] [<code class="option">-G</code>] [<code class="option">-g <em class="replaceable"><code>generator</code></em></code>] [<code class="option">-h</code>] [<code class="option">-I <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-i <em class="replaceable"><code>interval</code></em></code>] [<code class="option">-K <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-L <em class="replaceable"><code>ttl</code></em></code>] [<code class="option">-k</code>] [<code class="option">-P <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-p <em class="replaceable"><code>protocol</code></em></code>] [<code class="option">-q</code>] [<code class="option">-R <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-r <em class="replaceable"><code>randomdev</code></em></code>] [<code class="option">-S <em class="replaceable"><code>key</code></em></code>] [<code class="option">-s <em class="replaceable"><code>strength</code></em></code>] [<code class="option">-t <em class="replaceable"><code>type</code></em></code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] [<code class="option">-V</code>] [<code class="option">-z</code>] {name}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2617984"></a><h2>DESCRIPTION</h2>
+<a name="id2618294"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">dnssec-keygen</strong></span>
       generates keys for DNSSEC (Secure DNS), as defined in RFC 2535
       and RFC 4034.  It can also generate keys for use with
@@ -64,7 +64,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2618004"></a><h2>OPTIONS</h2>
+<a name="id2618314"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-a <em class="replaceable"><code>algorithm</code></em></span></dt>
 <dd>
@@ -280,7 +280,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2670636"></a><h2>TIMING OPTIONS</h2>
+<a name="id2669104"></a><h2>TIMING OPTIONS</h2>
 <p>
       Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS.
       If the argument begins with a '+' or '-', it is interpreted as
@@ -354,7 +354,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2670894"></a><h2>GENERATED KEYS</h2>
+<a name="id2669225"></a><h2>GENERATED KEYS</h2>
 <p>
       When <span><strong class="command">dnssec-keygen</strong></span> completes
       successfully,
@@ -400,7 +400,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2671070"></a><h2>EXAMPLE</h2>
+<a name="id2669401"></a><h2>EXAMPLE</h2>
 <p>
       To generate a 768-bit DSA key for the domain
       <strong class="userinput"><code>example.com</code></strong>, the following command would be
@@ -421,7 +421,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2671127"></a><h2>SEE ALSO</h2>
+<a name="id2669526"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>,
       <em class="citetitle">RFC 2539</em>,
@@ -430,7 +430,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2671158"></a><h2>AUTHOR</h2>
+<a name="id2669557"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.dnssec-revoke.html b/doc/arm/man.dnssec-revoke.html
index d3e494e528..1724060cd2 100644
--- a/doc/arm/man.dnssec-revoke.html
+++ b/doc/arm/man.dnssec-revoke.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">dnssec-revoke</code>  [<code class="option">-hr</code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] [<code class="option">-V</code>] [<code class="option">-K <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-E <em class="replaceable"><code>engine</code></em></code>] [<code class="option">-f</code>] [<code class="option">-R</code>] {keyfile}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2618365"></a><h2>DESCRIPTION</h2>
+<a name="id2618608"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">dnssec-revoke</strong></span>
       reads a DNSSEC key file, sets the REVOKED bit on the key as defined
       in RFC 5011, and creates a new pair of key files containing the
@@ -58,7 +58,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2618379"></a><h2>OPTIONS</h2>
+<a name="id2618621"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-h</span></dt>
 <dd><p>
@@ -100,14 +100,14 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2619469"></a><h2>SEE ALSO</h2>
+<a name="id2618756"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>,
       <em class="citetitle">RFC 5011</em>.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2619494"></a><h2>AUTHOR</h2>
+<a name="id2618780"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.dnssec-settime.html b/doc/arm/man.dnssec-settime.html
index 9e0309375e..093b149d87 100644
--- a/doc/arm/man.dnssec-settime.html
+++ b/doc/arm/man.dnssec-settime.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">dnssec-settime</code>  [<code class="option">-f</code>] [<code class="option">-K <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-L <em class="replaceable"><code>ttl</code></em></code>] [<code class="option">-P <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-A <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-R <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-I <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-D <em class="replaceable"><code>date/offset</code></em></code>] [<code class="option">-h</code>] [<code class="option">-V</code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] [<code class="option">-E <em class="replaceable"><code>engine</code></em></code>] {keyfile}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2619954"></a><h2>DESCRIPTION</h2>
+<a name="id2619445"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">dnssec-settime</strong></span>
       reads a DNSSEC private key file and sets the key timing metadata
       as specified by the <code class="option">-P</code>, <code class="option">-A</code>,
@@ -76,7 +76,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2620012"></a><h2>OPTIONS</h2>
+<a name="id2619504"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-f</span></dt>
 <dd><p>
@@ -124,7 +124,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2620149"></a><h2>TIMING OPTIONS</h2>
+<a name="id2619845"></a><h2>TIMING OPTIONS</h2>
 <p>
       Dates can be expressed in the format YYYYMMDD or YYYYMMDDHHMMSS.
       If the argument begins with a '+' or '-', it is interpreted as
@@ -203,7 +203,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2620492"></a><h2>PRINTING OPTIONS</h2>
+<a name="id2619984"></a><h2>PRINTING OPTIONS</h2>
 <p>
       <span><strong class="command">dnssec-settime</strong></span> can also be used to print the
       timing metadata associated with a key.
@@ -229,7 +229,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2630881"></a><h2>SEE ALSO</h2>
+<a name="id2620064"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>,
@@ -237,7 +237,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2630914"></a><h2>AUTHOR</h2>
+<a name="id2620097"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.dnssec-signzone.html b/doc/arm/man.dnssec-signzone.html
index ec7d2f29c7..9121aa15ae 100644
--- a/doc/arm/man.dnssec-signzone.html
+++ b/doc/arm/man.dnssec-signzone.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">dnssec-signzone</code>  [<code class="option">-a</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-d <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-D</code>] [<code class="option">-E <em class="replaceable"><code>engine</code></em></code>] [<code class="option">-e <em class="replaceable"><code>end-time</code></em></code>] [<code class="option">-f <em class="replaceable"><code>output-file</code></em></code>] [<code class="option">-g</code>] [<code class="option">-h</code>] [<code class="option">-K <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-k <em class="replaceable"><code>key</code></em></code>] [<code class="option">-L <em class="replaceable"><code>serial</code></em></code>] [<code class="option">-l <em class="replaceable"><code>domain</code></em></code>] [<code class="option">-i <em class="replaceable"><code>interval</code></em></code>] [<code class="option">-I <em class="replaceable"><code>input-format</code></em></code>] [<code class="option">-j <em class="replaceable"><code>jitter</code></em></code>] [<code class="option">-N <em class="replaceable"><code>soa-serial-format</code></em></code>] [<code class="option">-o <em class="replaceable"><code>origin</code></em></code>] [<code class="option">-O <em class="replaceable"><code>output-format</code></em></code>] [<code class="option">-P</code>] [<code class="option">-p</code>] [<code class="option">-R</code>] [<code class="option">-r <em class="replaceable"><code>randomdev</code></em></code>] [<code class="option">-S</code>] [<code class="option">-s <em class="replaceable"><code>start-time</code></em></code>] [<code class="option">-T <em class="replaceable"><code>ttl</code></em></code>] [<code class="option">-t</code>] [<code class="option">-u</code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] [<code class="option">-V</code>] [<code class="option">-X <em class="replaceable"><code>extended end-time</code></em></code>] [<code class="option">-x</code>] [<code class="option">-z</code>] [<code class="option">-3 <em class="replaceable"><code>salt</code></em></code>] [<code class="option">-H <em class="replaceable"><code>iterations</code></em></code>] [<code class="option">-A</code>] {zonefile} [key...]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2622598"></a><h2>DESCRIPTION</h2>
+<a name="id2622157"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">dnssec-signzone</strong></span>
       signs a zone.  It generates
       NSEC and RRSIG records and produces a signed version of the
@@ -61,7 +61,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2634564"></a><h2>OPTIONS</h2>
+<a name="id2622177"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-a</span></dt>
 <dd><p>
@@ -483,7 +483,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2676788"></a><h2>EXAMPLE</h2>
+<a name="id2672729"></a><h2>EXAMPLE</h2>
 <p>
       The following command signs the <strong class="userinput"><code>example.com</code></strong>
       zone with the DSA key generated by <span><strong class="command">dnssec-keygen</strong></span>
@@ -513,14 +513,14 @@ db.example.com.signed
 %</pre>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2676867"></a><h2>SEE ALSO</h2>
+<a name="id2672808"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>,
       <em class="citetitle">RFC 4033</em>, <em class="citetitle">RFC 4641</em>.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2676963"></a><h2>AUTHOR</h2>
+<a name="id2672836"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.dnssec-verify.html b/doc/arm/man.dnssec-verify.html
index d821a9e4f9..f846aab903 100644
--- a/doc/arm/man.dnssec-verify.html
+++ b/doc/arm/man.dnssec-verify.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">dnssec-verify</code>  [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-E <em class="replaceable"><code>engine</code></em></code>] [<code class="option">-I <em class="replaceable"><code>input-format</code></em></code>] [<code class="option">-o <em class="replaceable"><code>origin</code></em></code>] [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] [<code class="option">-V</code>] [<code class="option">-x</code>] [<code class="option">-z</code>] {zonefile}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2634914"></a><h2>DESCRIPTION</h2>
+<a name="id2634473"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">dnssec-verify</strong></span>
       verifies that a zone is fully signed for each algorithm found
       in the DNSKEY RRset for the zone, and that the NSEC / NSEC3
@@ -58,7 +58,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2634928"></a><h2>OPTIONS</h2>
+<a name="id2634487"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-c <em class="replaceable"><code>class</code></em></span></dt>
 <dd><p>
@@ -124,7 +124,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2635091"></a><h2>SEE ALSO</h2>
+<a name="id2634650"></a><h2>SEE ALSO</h2>
 <p>
       <span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>,
@@ -132,7 +132,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2638939"></a><h2>AUTHOR</h2>
+<a name="id2634676"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.genrandom.html b/doc/arm/man.genrandom.html
index 7276d88b71..e1b9b5b66d 100644
--- a/doc/arm/man.genrandom.html
+++ b/doc/arm/man.genrandom.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">genrandom</code>  [<code class="option">-n <em class="replaceable"><code>number</code></em></code>] {<em class="replaceable"><code>size</code></em>} {<em class="replaceable"><code>filename</code></em>}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2660306"></a><h2>DESCRIPTION</h2>
+<a name="id2659006"></a><h2>DESCRIPTION</h2>
 <p>
       <span><strong class="command">genrandom</strong></span>
       generates a file or a set of files containing a specified quantity
@@ -59,7 +59,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2660321"></a><h2>ARGUMENTS</h2>
+<a name="id2659021"></a><h2>ARGUMENTS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-n <em class="replaceable"><code>number</code></em></span></dt>
 <dd><p>
@@ -77,14 +77,14 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2660381"></a><h2>SEE ALSO</h2>
+<a name="id2659082"></a><h2>SEE ALSO</h2>
 <p>
       <span class="citerefentry"><span class="refentrytitle">rand</span>(3)</span>,
       <span class="citerefentry"><span class="refentrytitle">arc4random</span>(3)</span>
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2660408"></a><h2>AUTHOR</h2>
+<a name="id2659109"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.host.html b/doc/arm/man.host.html
index 8e98ce63c2..c61b91b52d 100644
--- a/doc/arm/man.host.html
+++ b/doc/arm/man.host.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">host</code>  [<code class="option">-aCdlnrsTwv</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-N <em class="replaceable"><code>ndots</code></em></code>] [<code class="option">-R <em class="replaceable"><code>number</code></em></code>] [<code class="option">-t <em class="replaceable"><code>type</code></em></code>] [<code class="option">-W <em class="replaceable"><code>wait</code></em></code>] [<code class="option">-m <em class="replaceable"><code>flag</code></em></code>] [<code class="option">-4</code>] [<code class="option">-6</code>] [<code class="option">-v</code>] [<code class="option">-V</code>] {name} [server]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2613003"></a><h2>DESCRIPTION</h2>
+<a name="id2612836"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">host</strong></span>
       is a simple utility for performing DNS lookups.
       It is normally used to convert names to IP addresses and vice versa.
@@ -206,7 +206,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2614145"></a><h2>IDN SUPPORT</h2>
+<a name="id2613294"></a><h2>IDN SUPPORT</h2>
 <p>
       If <span><strong class="command">host</strong></span> has been built with IDN (internationalized
       domain name) support, it can accept and display non-ASCII domain names. 
@@ -220,12 +220,12 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2614173"></a><h2>FILES</h2>
+<a name="id2613323"></a><h2>FILES</h2>
 <p><code class="filename">/etc/resolv.conf</code>
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2614187"></a><h2>SEE ALSO</h2>
+<a name="id2613337"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">dig</span>(1)</span>,
       <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>.
     </p>
diff --git a/doc/arm/man.isc-hmac-fixup.html b/doc/arm/man.isc-hmac-fixup.html
index 757be09ad9..b5dfb606e7 100644
--- a/doc/arm/man.isc-hmac-fixup.html
+++ b/doc/arm/man.isc-hmac-fixup.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">isc-hmac-fixup</code>  {<em class="replaceable"><code>algorithm</code></em>} {<em class="replaceable"><code>secret</code></em>}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2620802"></a><h2>DESCRIPTION</h2>
+<a name="id2617591"></a><h2>DESCRIPTION</h2>
 <p>
       Versions of BIND 9 up to and including BIND 9.6 had a bug causing
       HMAC-SHA* TSIG keys which were longer than the digest length of the
@@ -76,7 +76,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2661858"></a><h2>SECURITY CONSIDERATIONS</h2>
+<a name="id2659739"></a><h2>SECURITY CONSIDERATIONS</h2>
 <p>
       Secrets that have been converted by <span><strong class="command">isc-hmac-fixup</strong></span>
       are shortened, but as this is how the HMAC protocol works in
@@ -87,14 +87,14 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2661874"></a><h2>SEE ALSO</h2>
+<a name="id2659755"></a><h2>SEE ALSO</h2>
 <p>
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>,
       <em class="citetitle">RFC 2104</em>.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2661891"></a><h2>AUTHOR</h2>
+<a name="id2659772"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.named-checkconf.html b/doc/arm/man.named-checkconf.html
index 2d1f238e7e..e3e6b575fd 100644
--- a/doc/arm/man.named-checkconf.html
+++ b/doc/arm/man.named-checkconf.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">named-checkconf</code>  [<code class="option">-h</code>] [<code class="option">-v</code>] [<code class="option">-j</code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] {filename} [<code class="option">-p</code>] [<code class="option">-x</code>] [<code class="option">-z</code>]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2639059"></a><h2>DESCRIPTION</h2>
+<a name="id2635000"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">named-checkconf</strong></span>
       checks the syntax, but not the semantics, of a
       <span><strong class="command">named</strong></span> configuration file.  The file is parsed
@@ -70,7 +70,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2639129"></a><h2>OPTIONS</h2>
+<a name="id2635070"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-h</span></dt>
 <dd><p>
@@ -119,21 +119,21 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2640718"></a><h2>RETURN VALUES</h2>
+<a name="id2640824"></a><h2>RETURN VALUES</h2>
 <p><span><strong class="command">named-checkconf</strong></span>
       returns an exit status of 1 if
       errors were detected and 0 otherwise.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2640732"></a><h2>SEE ALSO</h2>
+<a name="id2640838"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">named-checkzone</span>(8)</span>,
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2640762"></a><h2>AUTHOR</h2>
+<a name="id2640868"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.named-checkzone.html b/doc/arm/man.named-checkzone.html
index 74c429c47c..5b7a6d3cb5 100644
--- a/doc/arm/man.named-checkzone.html
+++ b/doc/arm/man.named-checkzone.html
@@ -51,7 +51,7 @@
 <div class="cmdsynopsis"><p><code class="command">named-compilezone</code>  [<code class="option">-d</code>] [<code class="option">-j</code>] [<code class="option">-q</code>] [<code class="option">-v</code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-C <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-f <em class="replaceable"><code>format</code></em></code>] [<code class="option">-F <em class="replaceable"><code>format</code></em></code>] [<code class="option">-i <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-k <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-m <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-n <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-L <em class="replaceable"><code>serial</code></em></code>] [<code class="option">-r <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-s <em class="replaceable"><code>style</code></em></code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-T <em class="replaceable"><code>mode</code></em></code>] [<code class="option">-w <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-D</code>] [<code class="option">-W <em class="replaceable"><code>mode</code></em></code>] {<code class="option">-o <em class="replaceable"><code>filename</code></em></code>} {zonename} {filename}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2642898"></a><h2>DESCRIPTION</h2>
+<a name="id2642321"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">named-checkzone</strong></span>
       checks the syntax and integrity of a zone file.  It performs the
       same checks as <span><strong class="command">named</strong></span> does when loading a
@@ -71,7 +71,7 @@
      </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2679334"></a><h2>OPTIONS</h2>
+<a name="id2674251"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-d</span></dt>
 <dd><p>
@@ -288,14 +288,14 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2680243"></a><h2>RETURN VALUES</h2>
+<a name="id2675160"></a><h2>RETURN VALUES</h2>
 <p><span><strong class="command">named-checkzone</strong></span>
       returns an exit status of 1 if
       errors were detected and 0 otherwise.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2680257"></a><h2>SEE ALSO</h2>
+<a name="id2675174"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">named-checkconf</span>(8)</span>,
       <em class="citetitle">RFC 1035</em>,
@@ -303,7 +303,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2680358"></a><h2>AUTHOR</h2>
+<a name="id2675207"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.named-journalprint.html b/doc/arm/man.named-journalprint.html
index 196b341874..9596903532 100644
--- a/doc/arm/man.named-journalprint.html
+++ b/doc/arm/man.named-journalprint.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">named-journalprint</code>  {<em class="replaceable"><code>journal</code></em>}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2618624"></a><h2>DESCRIPTION</h2>
+<a name="id2615592"></a><h2>DESCRIPTION</h2>
 <p>
       <span><strong class="command">named-journalprint</strong></span>
       prints the contents of a zone journal file in a human-readable
@@ -76,7 +76,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2644816"></a><h2>SEE ALSO</h2>
+<a name="id2643900"></a><h2>SEE ALSO</h2>
 <p>
       <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">nsupdate</span>(8)</span>,
@@ -84,7 +84,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2644846"></a><h2>AUTHOR</h2>
+<a name="id2643931"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.named.html b/doc/arm/man.named.html
index 689dc5f768..e4e595c302 100644
--- a/doc/arm/man.named.html
+++ b/doc/arm/man.named.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">named</code>  [<code class="option">-4</code>] [<code class="option">-6</code>] [<code class="option">-c <em class="replaceable"><code>config-file</code></em></code>] [<code class="option">-d <em class="replaceable"><code>debug-level</code></em></code>] [<code class="option">-E <em class="replaceable"><code>engine-name</code></em></code>] [<code class="option">-f</code>] [<code class="option">-g</code>] [<code class="option">-M <em class="replaceable"><code>option</code></em></code>] [<code class="option">-m <em class="replaceable"><code>flag</code></em></code>] [<code class="option">-n <em class="replaceable"><code>#cpus</code></em></code>] [<code class="option">-p <em class="replaceable"><code>port</code></em></code>] [<code class="option">-s</code>] [<code class="option">-S <em class="replaceable"><code>#max-socks</code></em></code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] [<code class="option">-U <em class="replaceable"><code>#listeners</code></em></code>] [<code class="option">-u <em class="replaceable"><code>user</code></em></code>] [<code class="option">-v</code>] [<code class="option">-V</code>] [<code class="option">-x <em class="replaceable"><code>cache-file</code></em></code>]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2643193"></a><h2>DESCRIPTION</h2>
+<a name="id2642622"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">named</strong></span>
       is a Domain Name System (DNS) server,
       part of the BIND 9 distribution from ISC.  For more
@@ -65,7 +65,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2643361"></a><h2>OPTIONS</h2>
+<a name="id2642653"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-4</span></dt>
 <dd><p>
@@ -266,7 +266,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2680562"></a><h2>SIGNALS</h2>
+<a name="id2680537"></a><h2>SIGNALS</h2>
 <p>
       In routine operation, signals should not be used to control
       the nameserver; <span><strong class="command">rndc</strong></span> should be used
@@ -287,7 +287,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2680612"></a><h2>CONFIGURATION</h2>
+<a name="id2680587"></a><h2>CONFIGURATION</h2>
 <p>
       The <span><strong class="command">named</strong></span> configuration file is too complex
       to describe in detail here.  A complete description is provided
@@ -304,7 +304,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2680661"></a><h2>FILES</h2>
+<a name="id2680636"></a><h2>FILES</h2>
 <div class="variablelist"><dl>
 <dt><span class="term"><code class="filename">/etc/named.conf</code></span></dt>
 <dd><p>
@@ -317,7 +317,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2680705"></a><h2>SEE ALSO</h2>
+<a name="id2680680"></a><h2>SEE ALSO</h2>
 <p><em class="citetitle">RFC 1033</em>,
       <em class="citetitle">RFC 1034</em>,
       <em class="citetitle">RFC 1035</em>,
@@ -330,7 +330,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2680775"></a><h2>AUTHOR</h2>
+<a name="id2680819"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.nsec3hash.html b/doc/arm/man.nsec3hash.html
index 1ad4da8f07..27df3e8e0d 100644
--- a/doc/arm/man.nsec3hash.html
+++ b/doc/arm/man.nsec3hash.html
@@ -48,7 +48,7 @@
 <div class="cmdsynopsis"><p><code class="command">nsec3hash</code>  {<em class="replaceable"><code>salt</code></em>} {<em class="replaceable"><code>algorithm</code></em>} {<em class="replaceable"><code>iterations</code></em>} {<em class="replaceable"><code>domain</code></em>}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2661936"></a><h2>DESCRIPTION</h2>
+<a name="id2659817"></a><h2>DESCRIPTION</h2>
 <p>
       <span><strong class="command">nsec3hash</strong></span> generates an NSEC3 hash based on
       a set of NSEC3 parameters.  This can be used to check the validity
@@ -56,7 +56,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2661950"></a><h2>ARGUMENTS</h2>
+<a name="id2659832"></a><h2>ARGUMENTS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">salt</span></dt>
 <dd><p>
@@ -80,14 +80,14 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2662081"></a><h2>SEE ALSO</h2>
+<a name="id2659962"></a><h2>SEE ALSO</h2>
 <p>
       <em class="citetitle">BIND 9 Administrator Reference Manual</em>,
       <em class="citetitle">RFC 5155</em>.
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2662098"></a><h2>AUTHOR</h2>
+<a name="id2659979"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.nsupdate.html b/doc/arm/man.nsupdate.html
index 4a0422bccc..b7829ce770 100644
--- a/doc/arm/man.nsupdate.html
+++ b/doc/arm/man.nsupdate.html
@@ -47,10 +47,10 @@
 </div>
 <div class="refsynopsisdiv">
 <h2>Synopsis</h2>
-<div class="cmdsynopsis"><p><code class="command">nsupdate</code>  [<code class="option">-d</code>] [<code class="option">-D</code>] [[<code class="option">-g</code>] |  [<code class="option">-o</code>] |  [<code class="option">-l</code>] |  [<code class="option">-y <em class="replaceable"><code>[<span class="optional">hmac:</span>]keyname:secret</code></em></code>] |  [<code class="option">-k <em class="replaceable"><code>keyfile</code></em></code>]] [<code class="option">-t <em class="replaceable"><code>timeout</code></em></code>] [<code class="option">-u <em class="replaceable"><code>udptimeout</code></em></code>] [<code class="option">-r <em class="replaceable"><code>udpretries</code></em></code>] [<code class="option">-R <em class="replaceable"><code>randomdev</code></em></code>] [<code class="option">-v</code>] [<code class="option">-V</code>] [filename]</p></div>
+<div class="cmdsynopsis"><p><code class="command">nsupdate</code>  [<code class="option">-d</code>] [<code class="option">-D</code>] [<code class="option">-L <em class="replaceable"><code>level</code></em></code>] [[<code class="option">-g</code>] |  [<code class="option">-o</code>] |  [<code class="option">-l</code>] |  [<code class="option">-y <em class="replaceable"><code>[<span class="optional">hmac:</span>]keyname:secret</code></em></code>] |  [<code class="option">-k <em class="replaceable"><code>keyfile</code></em></code>]] [<code class="option">-t <em class="replaceable"><code>timeout</code></em></code>] [<code class="option">-u <em class="replaceable"><code>udptimeout</code></em></code>] [<code class="option">-r <em class="replaceable"><code>udpretries</code></em></code>] [<code class="option">-R <em class="replaceable"><code>randomdev</code></em></code>] [<code class="option">-v</code>] [<code class="option">-V</code>] [filename]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2645172"></a><h2>DESCRIPTION</h2>
+<a name="id2644708"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">nsupdate</strong></span>
       is used to submit Dynamic DNS Update requests as defined in RFC 2136
       to a name server.
@@ -74,44 +74,31 @@
       Requests are sent to the zone's master server.
       This is identified by the MNAME field of the zone's SOA record.
     </p>
-<p>
-      The
-      <code class="option">-d</code>
-      option makes
-      <span><strong class="command">nsupdate</strong></span>
-      operate in debug mode.
-      This provides tracing information about the update requests that are
-      made and the replies received from the name server.
-    </p>
-<p>
-      The <code class="option">-D</code> option makes <span><strong class="command">nsupdate</strong></span>
-      report additional debugging information to <code class="option">-d</code>.
-    </p>
-<p>
-      The <code class="option">-L</code> option with an integer argument of zero or
-      higher sets the logging debug level.  If zero, logging is disabled.
-    </p>
 <p>
       Transaction signatures can be used to authenticate the Dynamic
       DNS updates.  These use the TSIG resource record type described
       in RFC 2845 or the SIG(0) record described in RFC 2535 and
-      RFC 2931 or GSS-TSIG as described in RFC 3645.  TSIG relies on
+      RFC 2931 or GSS-TSIG as described in RFC 3645.
+    </p>
+<p>
+      TSIG relies on
       a shared secret that should only be known to
-      <span><strong class="command">nsupdate</strong></span> and the name server.  Currently,
-      the only supported encryption algorithm for TSIG is HMAC-MD5,
-      which is defined in RFC 2104.  Once other algorithms are
-      defined for TSIG, applications will need to ensure they select
-      the appropriate algorithm as well as the key when authenticating
-      each other.  For instance, suitable <span class="type">key</span> and
+      <span><strong class="command">nsupdate</strong></span> and the name server.
+      For instance, suitable <span class="type">key</span> and
       <span class="type">server</span> statements would be added to
       <code class="filename">/etc/named.conf</code> so that the name server
       can associate the appropriate secret key and algorithm with
       the IP address of the client application that will be using
-      TSIG authentication.  SIG(0) uses public key cryptography.
+      TSIG authentication. You can use <span><strong class="command">ddns-confgen</strong></span>
+      to generate suitable configuration fragments.
+      <span><strong class="command">nsupdate</strong></span>
+      uses the <code class="option">-y</code> or <code class="option">-k</code> options
+      to provide the TSIG shared secret.  These options are mutually exclusive.
+    </p>
+<p>
+      SIG(0) uses public key cryptography.
       To use a SIG(0) key, the public key must be stored in a KEY
       record in a zone served by the name server.
-      <span><strong class="command">nsupdate</strong></span> does not read
-      <code class="filename">/etc/named.conf</code>.
     </p>
 <p>
       GSS-TSIG uses Kerberos credentials.  Standard GSS-TSIG mode
@@ -119,108 +106,119 @@
       non-standards-compliant variant of GSS-TSIG used by Windows
       2000 can be switched on with the <code class="option">-o</code> flag.
     </p>
-<p><span><strong class="command">nsupdate</strong></span>
-      uses the <code class="option">-y</code> or <code class="option">-k</code> option
-      to provide the shared secret needed to generate a TSIG record
-      for authenticating Dynamic DNS update requests, default type
-      HMAC-MD5.  These options are mutually exclusive. 
-    </p>
-<p>
-      When the <code class="option">-y</code> option is used, a signature is
-      generated from
-      [<span class="optional"><em class="parameter"><code>hmac:</code></em></span>]<em class="parameter"><code>keyname:secret.</code></em>
-      <em class="parameter"><code>keyname</code></em> is the name of the key, and
-      <em class="parameter"><code>secret</code></em> is the base64 encoded shared secret.
-      <em class="parameter"><code>hmac</code></em> is the name of the key algorithm;
-      valid choices are <code class="literal">hmac-md5</code>,
-      <code class="literal">hmac-sha1</code>, <code class="literal">hmac-sha224</code>,
-      <code class="literal">hmac-sha256</code>, <code class="literal">hmac-sha384</code>, or
-      <code class="literal">hmac-sha512</code>.  If <em class="parameter"><code>hmac</code></em>
-      is not specified, the default is <code class="literal">hmac-md5</code>.
-      NOTE: Use of the <code class="option">-y</code> option is discouraged because the
-      shared secret is supplied as a command line argument in clear text.
-      This may be visible in the output from
-      <span class="citerefentry"><span class="refentrytitle">ps</span>(1)</span>
-      or in a history file maintained by the user's shell.
-    </p>
-<p>
-      With the
-      <code class="option">-k</code> option, <span><strong class="command">nsupdate</strong></span> reads
-      the shared secret from the file <em class="parameter"><code>keyfile</code></em>.
-      Keyfiles may be in two formats: a single file containing
-      a <code class="filename">named.conf</code>-format <span><strong class="command">key</strong></span>
-      statement, which may be generated automatically by
-      <span><strong class="command">ddns-confgen</strong></span>, or a pair of files whose names are
-      of the format <code class="filename">K{name}.+157.+{random}.key</code> and
-      <code class="filename">K{name}.+157.+{random}.private</code>, which can be
-      generated by <span><strong class="command">dnssec-keygen</strong></span>.
-      The <code class="option">-k</code> may also be used to specify a SIG(0) key used
-      to authenticate Dynamic DNS update requests.  In this case, the key
-      specified is not an HMAC-MD5 key.
-    </p>
-<p>
-      <span><strong class="command">nsupdate</strong></span> can be run in a local-host only mode
-      using the <code class="option">-l</code> flag.  This sets the server address to
-      localhost (disabling the <span><strong class="command">server</strong></span> so that the server
-      address cannot be overridden).  Connections to the local server will
-      use a TSIG key found in <code class="filename">/var/run/named/session.key</code>,
-      which is automatically generated by <span><strong class="command">named</strong></span> if any
-      local master zone has set <span><strong class="command">update-policy</strong></span> to
-      <span><strong class="command">local</strong></span>.  The location of this key file can be
-      overridden with the <code class="option">-k</code> option.
-    </p>
-<p>
-      By default, <span><strong class="command">nsupdate</strong></span>
-      uses UDP to send update requests to the name server unless they are too
-      large to fit in a UDP request in which case TCP will be used.
-      The
-      <code class="option">-v</code>
-      option makes
-      <span><strong class="command">nsupdate</strong></span>
-      use a TCP connection.
-      This may be preferable when a batch of update requests is made.
-    </p>
-<p>
-      The <code class="option">-p</code> sets the default port number to use for
-      connections to a name server.  The default is 53.
-    </p>
-<p>
-      The <code class="option">-t</code> option sets the maximum time an update request
-      can
-      take before it is aborted.  The default is 300 seconds.  Zero can be
-      used
-      to disable the timeout.
-    </p>
-<p>
-      The <code class="option">-u</code> option sets the UDP retry interval.  The default
-      is
-      3 seconds.  If zero, the interval will be computed from the timeout
-      interval
-      and number of UDP retries.
-    </p>
-<p>
-      The <code class="option">-r</code> option sets the number of UDP retries. The
-      default is
-      3.  If zero, only one update request will be made.
-    </p>
-<p>
-      The <code class="option">-R <em class="replaceable"><code>randomdev</code></em></code> option
-      specifies a source of randomness.  If the operating system
-      does not provide a <code class="filename">/dev/random</code> or
-      equivalent device, the default source of randomness is keyboard
-      input.  <code class="filename">randomdev</code> specifies the name of
-      a character device or file containing random data to be used
-      instead of the default.  The special value
-      <code class="filename">keyboard</code> indicates that keyboard input
-      should be used.  This option may be specified multiple times.
-    </p>
-<p>
-      The -V option causes <span><strong class="command">nsupdate</strong></span> to print the
-      version number and exit.
-    </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2645565"></a><h2>INPUT FORMAT</h2>
+<a name="id2644865"></a><h2>OPTIONS</h2>
+<div class="variablelist"><dl>
+<dt><span class="term">-d</span></dt>
+<dd><p>
+	    Debug mode. This provides tracing information about the
+	    update requests that are made and the replies received
+	    from the name server.
+	  </p></dd>
+<dt><span class="term">-D</span></dt>
+<dd><p>
+	    Extra debug mode.
+	  </p></dd>
+<dt><span class="term">-k <em class="replaceable"><code>keyfile</code></em></span></dt>
+<dd><p>
+	    The file containing the TSIG authentication key.
+	    Keyfiles may be in two formats: a single file containing
+	    a <code class="filename">named.conf</code>-format <span><strong class="command">key</strong></span>
+	    statement, which may be generated automatically by
+	    <span><strong class="command">ddns-confgen</strong></span>, or a pair of files whose names are
+	    of the format <code class="filename">K{name}.+157.+{random}.key</code> and
+	    <code class="filename">K{name}.+157.+{random}.private</code>, which can be
+	    generated by <span><strong class="command">dnssec-keygen</strong></span>.
+	    The <code class="option">-k</code> may also be used to specify a SIG(0) key used
+	    to authenticate Dynamic DNS update requests.  In this case, the key
+	    specified is not an HMAC-MD5 key.
+	  </p></dd>
+<dt><span class="term">-l</span></dt>
+<dd><p>
+	    Local-host only mode. This sets the server address to
+	    localhost (disabling the <span><strong class="command">server</strong></span> so that the server
+	    address cannot be overridden).  Connections to the local server will
+	    use a TSIG key found in <code class="filename">/var/run/named/session.key</code>,
+	    which is automatically generated by <span><strong class="command">named</strong></span> if any
+	    local master zone has set <span><strong class="command">update-policy</strong></span> to
+	    <span><strong class="command">local</strong></span>.  The location of this key file can be
+	    overridden with the <code class="option">-k</code> option.
+	  </p></dd>
+<dt><span class="term">-L <em class="replaceable"><code>level</code></em></span></dt>
+<dd><p>
+	    Set the logging debug level.  If zero, logging is disabled.
+	  </p></dd>
+<dt><span class="term">-p <em class="replaceable"><code>port</code></em></span></dt>
+<dd><p>
+	    Set the port to use for connections to a name server. The
+	    default is 53.
+	  </p></dd>
+<dt><span class="term">-r <em class="replaceable"><code>udpretries</code></em></span></dt>
+<dd><p>
+	    The number of UDP retries. The default is 3. If zero, only
+	    one update request will be made.
+	  </p></dd>
+<dt><span class="term">-R <em class="replaceable"><code>randomdev</code></em></span></dt>
+<dd><p>
+	  Where to obtain randomness. If the operating system
+	  does not provide a <code class="filename">/dev/random</code> or
+	  equivalent device, the default source of randomness is keyboard
+	  input.  <code class="filename">randomdev</code> specifies the name of
+	  a character device or file containing random data to be used
+	  instead of the default.  The special value
+	  <code class="filename">keyboard</code> indicates that keyboard input
+	  should be used.  This option may be specified multiple times.
+	</p></dd>
+<dt><span class="term">-t <em class="replaceable"><code>timeout</code></em></span></dt>
+<dd><p>
+	    The maximum time an update request can take before it is
+	    aborted. The default is 300 seconds. Zero can be used to
+	    disable the timeout.
+	  </p></dd>
+<dt><span class="term">-u <em class="replaceable"><code>udptimeout</code></em></span></dt>
+<dd><p>
+	    The UDP retry interval. The default is 3 seconds. If zero,
+	    the interval will be computed from the timeout interval and
+	    number of UDP retries.
+	  </p></dd>
+<dt><span class="term">-v</span></dt>
+<dd><p>
+	    Use TCP even for small update requests.
+	    By default, <span><strong class="command">nsupdate</strong></span>
+	    uses UDP to send update requests to the name server unless they are too
+	    large to fit in a UDP request in which case TCP will be used.
+	    TCP may be preferable when a batch of update requests is made.
+	  </p></dd>
+<dt><span class="term">-V</span></dt>
+<dd><p>
+	    Print the version number and exit.
+	  </p></dd>
+<dt><span class="term">-y <em class="replaceable"><code>[<span class="optional">hmac:</span>]keyname:secret</code></em></span></dt>
+<dd>
+<p>
+	    Literal TSIG authentication key.
+	    <em class="parameter"><code>keyname</code></em> is the name of the key, and
+	    <em class="parameter"><code>secret</code></em> is the base64 encoded shared secret.
+	    <em class="parameter"><code>hmac</code></em> is the name of the key algorithm;
+	    valid choices are <code class="literal">hmac-md5</code>,
+	    <code class="literal">hmac-sha1</code>, <code class="literal">hmac-sha224</code>,
+	    <code class="literal">hmac-sha256</code>, <code class="literal">hmac-sha384</code>, or
+	    <code class="literal">hmac-sha512</code>.  If <em class="parameter"><code>hmac</code></em>
+	    is not specified, the default is <code class="literal">hmac-md5</code>.
+	  </p>
+<p>
+	    NOTE: Use of the <code class="option">-y</code> option is discouraged because the
+	    shared secret is supplied as a command line argument in clear text.
+	    This may be visible in the output from
+	    <span class="citerefentry"><span class="refentrytitle">ps</span>(1)</span>
+	    or in a history file maintained by the user's shell.
+	  </p>
+</dd>
+</dl></div>
+</div>
+<div class="refsect1" lang="en">
+<a name="id2654740"></a><h2>INPUT FORMAT</h2>
 <p><span><strong class="command">nsupdate</strong></span>
       reads input from
       <em class="parameter"><code>filename</code></em>
@@ -250,270 +248,270 @@
       </p>
 <div class="variablelist"><dl>
 <dt><span class="term">
-              <span><strong class="command">server</strong></span>
-               {servername}
-               [port]
-            </span></dt>
+	      <span><strong class="command">server</strong></span>
+	       {servername}
+	       [port]
+	    </span></dt>
 <dd><p>
-              Sends all dynamic update requests to the name server
-              <em class="parameter"><code>servername</code></em>.
-              When no server statement is provided,
-              <span><strong class="command">nsupdate</strong></span>
-              will send updates to the master server of the correct zone.
-              The MNAME field of that zone's SOA record will identify the
-              master
-              server for that zone.
-              <em class="parameter"><code>port</code></em>
-              is the port number on
-              <em class="parameter"><code>servername</code></em>
-              where the dynamic update requests get sent.
-              If no port number is specified, the default DNS port number of
-              53 is
-              used.
-            </p></dd>
+	      Sends all dynamic update requests to the name server
+	      <em class="parameter"><code>servername</code></em>.
+	      When no server statement is provided,
+	      <span><strong class="command">nsupdate</strong></span>
+	      will send updates to the master server of the correct zone.
+	      The MNAME field of that zone's SOA record will identify the
+	      master
+	      server for that zone.
+	      <em class="parameter"><code>port</code></em>
+	      is the port number on
+	      <em class="parameter"><code>servername</code></em>
+	      where the dynamic update requests get sent.
+	      If no port number is specified, the default DNS port number of
+	      53 is
+	      used.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">local</strong></span>
-               {address}
-               [port]
-            </span></dt>
+	      <span><strong class="command">local</strong></span>
+	       {address}
+	       [port]
+	    </span></dt>
 <dd><p>
-              Sends all dynamic update requests using the local
-              <em class="parameter"><code>address</code></em>.
+	      Sends all dynamic update requests using the local
+	      <em class="parameter"><code>address</code></em>.
 
-              When no local statement is provided,
-              <span><strong class="command">nsupdate</strong></span>
-              will send updates using an address and port chosen by the
-              system.
-              <em class="parameter"><code>port</code></em>
-              can additionally be used to make requests come from a specific
-              port.
-              If no port number is specified, the system will assign one.
-            </p></dd>
+	      When no local statement is provided,
+	      <span><strong class="command">nsupdate</strong></span>
+	      will send updates using an address and port chosen by the
+	      system.
+	      <em class="parameter"><code>port</code></em>
+	      can additionally be used to make requests come from a specific
+	      port.
+	      If no port number is specified, the system will assign one.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">zone</strong></span>
-               {zonename}
-            </span></dt>
+	      <span><strong class="command">zone</strong></span>
+	       {zonename}
+	    </span></dt>
 <dd><p>
-              Specifies that all updates are to be made to the zone
-              <em class="parameter"><code>zonename</code></em>.
-              If no
-              <em class="parameter"><code>zone</code></em>
-              statement is provided,
-              <span><strong class="command">nsupdate</strong></span>
-              will attempt determine the correct zone to update based on the
-              rest of the input.
-            </p></dd>
+	      Specifies that all updates are to be made to the zone
+	      <em class="parameter"><code>zonename</code></em>.
+	      If no
+	      <em class="parameter"><code>zone</code></em>
+	      statement is provided,
+	      <span><strong class="command">nsupdate</strong></span>
+	      will attempt determine the correct zone to update based on the
+	      rest of the input.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">class</strong></span>
-               {classname}
-            </span></dt>
+	      <span><strong class="command">class</strong></span>
+	       {classname}
+	    </span></dt>
 <dd><p>
-              Specify the default class.
-              If no <em class="parameter"><code>class</code></em> is specified, the
-              default class is
-              <em class="parameter"><code>IN</code></em>.
-            </p></dd>
+	      Specify the default class.
+	      If no <em class="parameter"><code>class</code></em> is specified, the
+	      default class is
+	      <em class="parameter"><code>IN</code></em>.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">ttl</strong></span>
-               {seconds}
-            </span></dt>
+	      <span><strong class="command">ttl</strong></span>
+	       {seconds}
+	    </span></dt>
 <dd><p>
-              Specify the default time to live for records to be added.
+	      Specify the default time to live for records to be added.
 	      The value <em class="parameter"><code>none</code></em> will clear the default
 	      ttl.
-            </p></dd>
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">key</strong></span>
-               [hmac:] {keyname}
-               {secret}
-            </span></dt>
+	      <span><strong class="command">key</strong></span>
+	       [hmac:] {keyname}
+	       {secret}
+	    </span></dt>
 <dd><p>
-              Specifies that all updates are to be TSIG-signed using the
-              <em class="parameter"><code>keyname</code></em> <em class="parameter"><code>secret</code></em> pair.
-              If <em class="parameter"><code>hmac</code></em> is specified, then it sets the
-              signing algorithm in use; the default is
-              <code class="literal">hmac-md5</code>.  The <span><strong class="command">key</strong></span>
-              command overrides any key specified on the command line via
-              <code class="option">-y</code> or <code class="option">-k</code>.
-            </p></dd>
+	      Specifies that all updates are to be TSIG-signed using the
+	      <em class="parameter"><code>keyname</code></em> <em class="parameter"><code>secret</code></em> pair.
+	      If <em class="parameter"><code>hmac</code></em> is specified, then it sets the
+	      signing algorithm in use; the default is
+	      <code class="literal">hmac-md5</code>.  The <span><strong class="command">key</strong></span>
+	      command overrides any key specified on the command line via
+	      <code class="option">-y</code> or <code class="option">-k</code>.
+	    </p></dd>
 <dt><span class="term">
-            <span><strong class="command">gsstsig</strong></span>
-          </span></dt>
+	    <span><strong class="command">gsstsig</strong></span>
+	  </span></dt>
 <dd><p>
 	      Use GSS-TSIG to sign the updated.  This is equivalent to
 	      specifying <code class="option">-g</code> on the commandline.
-            </p></dd>
+	    </p></dd>
 <dt><span class="term">
-            <span><strong class="command">oldgsstsig</strong></span>
-          </span></dt>
+	    <span><strong class="command">oldgsstsig</strong></span>
+	  </span></dt>
 <dd><p>
 	      Use the Windows 2000 version of GSS-TSIG to sign the updated.
 	      This is equivalent to specifying <code class="option">-o</code> on the
 	      commandline.
-            </p></dd>
+	    </p></dd>
 <dt><span class="term">
-            <span><strong class="command">realm</strong></span>
-             {[<span class="optional">realm_name</span>]}
-          </span></dt>
+	    <span><strong class="command">realm</strong></span>
+	     {[<span class="optional">realm_name</span>]}
+	  </span></dt>
 <dd><p>
 	      When using GSS-TSIG use <em class="parameter"><code>realm_name</code></em> rather
 	      than the default realm in <code class="filename">krb5.conf</code>.  If no
 	      realm is specified the saved realm is cleared.
-            </p></dd>
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">[<span class="optional">prereq</span>] nxdomain</strong></span>
-               {domain-name}
-            </span></dt>
+	      <span><strong class="command">[<span class="optional">prereq</span>] nxdomain</strong></span>
+	       {domain-name}
+	    </span></dt>
 <dd><p>
-              Requires that no resource record of any type exists with name
-              <em class="parameter"><code>domain-name</code></em>.
-            </p></dd>
+	      Requires that no resource record of any type exists with name
+	      <em class="parameter"><code>domain-name</code></em>.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">[<span class="optional">prereq</span>] yxdomain</strong></span>
-               {domain-name}
-            </span></dt>
+	      <span><strong class="command">[<span class="optional">prereq</span>] yxdomain</strong></span>
+	       {domain-name}
+	    </span></dt>
 <dd><p>
-              Requires that
-              <em class="parameter"><code>domain-name</code></em>
-              exists (has as at least one resource record, of any type).
-            </p></dd>
+	      Requires that
+	      <em class="parameter"><code>domain-name</code></em>
+	      exists (has as at least one resource record, of any type).
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">[<span class="optional">prereq</span>] nxrrset</strong></span>
-               {domain-name}
-               [class]
-               {type}
-            </span></dt>
+	      <span><strong class="command">[<span class="optional">prereq</span>] nxrrset</strong></span>
+	       {domain-name}
+	       [class]
+	       {type}
+	    </span></dt>
 <dd><p>
-              Requires that no resource record exists of the specified
-              <em class="parameter"><code>type</code></em>,
-              <em class="parameter"><code>class</code></em>
-              and
-              <em class="parameter"><code>domain-name</code></em>.
-              If
-              <em class="parameter"><code>class</code></em>
-              is omitted, IN (internet) is assumed.
-            </p></dd>
+	      Requires that no resource record exists of the specified
+	      <em class="parameter"><code>type</code></em>,
+	      <em class="parameter"><code>class</code></em>
+	      and
+	      <em class="parameter"><code>domain-name</code></em>.
+	      If
+	      <em class="parameter"><code>class</code></em>
+	      is omitted, IN (internet) is assumed.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">[<span class="optional">prereq</span>] yxrrset</strong></span>
-               {domain-name}
-               [class]
-               {type}
-            </span></dt>
+	      <span><strong class="command">[<span class="optional">prereq</span>] yxrrset</strong></span>
+	       {domain-name}
+	       [class]
+	       {type}
+	    </span></dt>
 <dd><p>
-              This requires that a resource record of the specified
-              <em class="parameter"><code>type</code></em>,
-              <em class="parameter"><code>class</code></em>
-              and
-              <em class="parameter"><code>domain-name</code></em>
-              must exist.
-              If
-              <em class="parameter"><code>class</code></em>
-              is omitted, IN (internet) is assumed.
-            </p></dd>
+	      This requires that a resource record of the specified
+	      <em class="parameter"><code>type</code></em>,
+	      <em class="parameter"><code>class</code></em>
+	      and
+	      <em class="parameter"><code>domain-name</code></em>
+	      must exist.
+	      If
+	      <em class="parameter"><code>class</code></em>
+	      is omitted, IN (internet) is assumed.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">[<span class="optional">prereq</span>] yxrrset</strong></span>
-               {domain-name}
-               [class]
-               {type}
-               {data...}
-            </span></dt>
+	      <span><strong class="command">[<span class="optional">prereq</span>] yxrrset</strong></span>
+	       {domain-name}
+	       [class]
+	       {type}
+	       {data...}
+	    </span></dt>
 <dd><p>
-              The
-              <em class="parameter"><code>data</code></em>
-              from each set of prerequisites of this form
-              sharing a common
-              <em class="parameter"><code>type</code></em>,
-              <em class="parameter"><code>class</code></em>,
-              and
-              <em class="parameter"><code>domain-name</code></em>
-              are combined to form a set of RRs.  This set of RRs must
-              exactly match the set of RRs existing in the zone at the
-              given
-              <em class="parameter"><code>type</code></em>,
-              <em class="parameter"><code>class</code></em>,
-              and
-              <em class="parameter"><code>domain-name</code></em>.
-              The
-              <em class="parameter"><code>data</code></em>
-              are written in the standard text representation of the resource
-              record's
-              RDATA.
-            </p></dd>
+	      The
+	      <em class="parameter"><code>data</code></em>
+	      from each set of prerequisites of this form
+	      sharing a common
+	      <em class="parameter"><code>type</code></em>,
+	      <em class="parameter"><code>class</code></em>,
+	      and
+	      <em class="parameter"><code>domain-name</code></em>
+	      are combined to form a set of RRs.  This set of RRs must
+	      exactly match the set of RRs existing in the zone at the
+	      given
+	      <em class="parameter"><code>type</code></em>,
+	      <em class="parameter"><code>class</code></em>,
+	      and
+	      <em class="parameter"><code>domain-name</code></em>.
+	      The
+	      <em class="parameter"><code>data</code></em>
+	      are written in the standard text representation of the resource
+	      record's
+	      RDATA.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">[<span class="optional">update</span>] del[<span class="optional">ete</span>]</strong></span>
-               {domain-name}
-               [ttl]
-               [class]
-               [type [data...]]
-            </span></dt>
+	      <span><strong class="command">[<span class="optional">update</span>] del[<span class="optional">ete</span>]</strong></span>
+	       {domain-name}
+	       [ttl]
+	       [class]
+	       [type [data...]]
+	    </span></dt>
 <dd><p>
-              Deletes any resource records named
-              <em class="parameter"><code>domain-name</code></em>.
-              If
-              <em class="parameter"><code>type</code></em>
-              and
-              <em class="parameter"><code>data</code></em>
-              is provided, only matching resource records will be removed.
-              The internet class is assumed if
-              <em class="parameter"><code>class</code></em>
-              is not supplied.  The
-              <em class="parameter"><code>ttl</code></em>
-              is ignored, and is only allowed for compatibility.
-            </p></dd>
+	      Deletes any resource records named
+	      <em class="parameter"><code>domain-name</code></em>.
+	      If
+	      <em class="parameter"><code>type</code></em>
+	      and
+	      <em class="parameter"><code>data</code></em>
+	      is provided, only matching resource records will be removed.
+	      The internet class is assumed if
+	      <em class="parameter"><code>class</code></em>
+	      is not supplied.  The
+	      <em class="parameter"><code>ttl</code></em>
+	      is ignored, and is only allowed for compatibility.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">[<span class="optional">update</span>] add</strong></span>
-               {domain-name}
-               {ttl}
-               [class]
-               {type}
-               {data...}
-            </span></dt>
+	      <span><strong class="command">[<span class="optional">update</span>] add</strong></span>
+	       {domain-name}
+	       {ttl}
+	       [class]
+	       {type}
+	       {data...}
+	    </span></dt>
 <dd><p>
-              Adds a new resource record with the specified
-              <em class="parameter"><code>ttl</code></em>,
-              <em class="parameter"><code>class</code></em>
-              and
-              <em class="parameter"><code>data</code></em>.
-            </p></dd>
+	      Adds a new resource record with the specified
+	      <em class="parameter"><code>ttl</code></em>,
+	      <em class="parameter"><code>class</code></em>
+	      and
+	      <em class="parameter"><code>data</code></em>.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">show</strong></span>
-            </span></dt>
+	      <span><strong class="command">show</strong></span>
+	    </span></dt>
 <dd><p>
-              Displays the current message, containing all of the
-              prerequisites and
-              updates specified since the last send.
-            </p></dd>
+	      Displays the current message, containing all of the
+	      prerequisites and
+	      updates specified since the last send.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">send</strong></span>
-            </span></dt>
+	      <span><strong class="command">send</strong></span>
+	    </span></dt>
 <dd><p>
-              Sends the current message.  This is equivalent to entering a
-              blank line.
-            </p></dd>
+	      Sends the current message.  This is equivalent to entering a
+	      blank line.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">answer</strong></span>
-            </span></dt>
+	      <span><strong class="command">answer</strong></span>
+	    </span></dt>
 <dd><p>
-              Displays the answer.
-            </p></dd>
+	      Displays the answer.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">debug</strong></span>
-            </span></dt>
+	      <span><strong class="command">debug</strong></span>
+	    </span></dt>
 <dd><p>
-              Turn on debugging.
-            </p></dd>
+	      Turn on debugging.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">version</strong></span>
-            </span></dt>
+	      <span><strong class="command">version</strong></span>
+	    </span></dt>
 <dd><p>
-              Print version number.
-            </p></dd>
+	      Print version number.
+	    </p></dd>
 <dt><span class="term">
-              <span><strong class="command">help</strong></span>
-            </span></dt>
+	      <span><strong class="command">help</strong></span>
+	    </span></dt>
 <dd><p>
-              Print a list of commands.
-            </p></dd>
+	      Print a list of commands.
+	    </p></dd>
 </dl></div>
 <p>
     </p>
@@ -522,7 +520,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2682049"></a><h2>EXAMPLES</h2>
+<a name="id2684117"></a><h2>EXAMPLES</h2>
 <p>
       The examples below show how
       <span><strong class="command">nsupdate</strong></span>
@@ -576,30 +574,30 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2682099"></a><h2>FILES</h2>
+<a name="id2684167"></a><h2>FILES</h2>
 <div class="variablelist"><dl>
 <dt><span class="term"><code class="constant">/etc/resolv.conf</code></span></dt>
 <dd><p>
-            used to identify default name server
-          </p></dd>
+	    used to identify default name server
+	  </p></dd>
 <dt><span class="term"><code class="constant">/var/run/named/session.key</code></span></dt>
 <dd><p>
-            sets the default TSIG key for use in local-only mode
-          </p></dd>
+	    sets the default TSIG key for use in local-only mode
+	  </p></dd>
 <dt><span class="term"><code class="constant">K{name}.+157.+{random}.key</code></span></dt>
 <dd><p>
-            base-64 encoding of HMAC-MD5 key created by
-            <span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>.
-          </p></dd>
+	    base-64 encoding of HMAC-MD5 key created by
+	    <span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>.
+	  </p></dd>
 <dt><span class="term"><code class="constant">K{name}.+157.+{random}.private</code></span></dt>
 <dd><p>
-            base-64 encoding of HMAC-MD5 key created by
-            <span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>.
-          </p></dd>
+	    base-64 encoding of HMAC-MD5 key created by
+	    <span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>.
+	  </p></dd>
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2682182"></a><h2>SEE ALSO</h2>
+<a name="id2684322"></a><h2>SEE ALSO</h2>
 <p>
       <em class="citetitle">RFC 2136</em>,
       <em class="citetitle">RFC 3007</em>,
@@ -614,7 +612,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2682308"></a><h2>BUGS</h2>
+<a name="id2684379"></a><h2>BUGS</h2>
 <p>
       The TSIG key is redundantly stored in two separate files.
       This is a consequence of nsupdate using the DST library
diff --git a/doc/arm/man.rndc-confgen.html b/doc/arm/man.rndc-confgen.html
index 91f5dce2c4..0de3e20f05 100644
--- a/doc/arm/man.rndc-confgen.html
+++ b/doc/arm/man.rndc-confgen.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">rndc-confgen</code>  [<code class="option">-a</code>] [<code class="option">-b <em class="replaceable"><code>keysize</code></em></code>] [<code class="option">-c <em class="replaceable"><code>keyfile</code></em></code>] [<code class="option">-h</code>] [<code class="option">-k <em class="replaceable"><code>keyname</code></em></code>] [<code class="option">-p <em class="replaceable"><code>port</code></em></code>] [<code class="option">-r <em class="replaceable"><code>randomfile</code></em></code>] [<code class="option">-s <em class="replaceable"><code>address</code></em></code>] [<code class="option">-t <em class="replaceable"><code>chrootdir</code></em></code>] [<code class="option">-u <em class="replaceable"><code>user</code></em></code>]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2657897"></a><h2>DESCRIPTION</h2>
+<a name="id2657281"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">rndc-confgen</strong></span>
       generates configuration files
       for <span><strong class="command">rndc</strong></span>.  It can be used as a
@@ -66,7 +66,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2657963"></a><h2>OPTIONS</h2>
+<a name="id2657347"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-a</span></dt>
 <dd>
@@ -173,7 +173,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2659715"></a><h2>EXAMPLES</h2>
+<a name="id2657938"></a><h2>EXAMPLES</h2>
 <p>
       To allow <span><strong class="command">rndc</strong></span> to be used with
       no manual configuration, run
@@ -190,7 +190,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2661614"></a><h2>SEE ALSO</h2>
+<a name="id2659360"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">rndc</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">rndc.conf</span>(5)</span>,
       <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
@@ -198,7 +198,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2661653"></a><h2>AUTHOR</h2>
+<a name="id2659671"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.rndc.conf.html b/doc/arm/man.rndc.conf.html
index 8a9cd32957..7e6da4bc35 100644
--- a/doc/arm/man.rndc.conf.html
+++ b/doc/arm/man.rndc.conf.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">rndc.conf</code> </p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2619587"></a><h2>DESCRIPTION</h2>
+<a name="id2653786"></a><h2>DESCRIPTION</h2>
 <p><code class="filename">rndc.conf</code> is the configuration file
       for <span><strong class="command">rndc</strong></span>, the BIND 9 name server control
       utility.  This file has a similar structure and syntax to
@@ -135,7 +135,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2651366"></a><h2>EXAMPLE</h2>
+<a name="id2653958"></a><h2>EXAMPLE</h2>
 <pre class="programlisting">
       options {
         default-server  localhost;
@@ -209,7 +209,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2651556"></a><h2>NAME SERVER CONFIGURATION</h2>
+<a name="id2654830"></a><h2>NAME SERVER CONFIGURATION</h2>
 <p>
       The name server must be configured to accept rndc connections and
       to recognize the key specified in the <code class="filename">rndc.conf</code>
@@ -219,7 +219,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2651581"></a><h2>SEE ALSO</h2>
+<a name="id2654856"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">rndc</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">rndc-confgen</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">mmencode</span>(1)</span>,
@@ -227,7 +227,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2651620"></a><h2>AUTHOR</h2>
+<a name="id2654894"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.rndc.html b/doc/arm/man.rndc.html
index 390092033d..7567330ef7 100644
--- a/doc/arm/man.rndc.html
+++ b/doc/arm/man.rndc.html
@@ -50,7 +50,7 @@
 <div class="cmdsynopsis"><p><code class="command">rndc</code>  [<code class="option">-b <em class="replaceable"><code>source-address</code></em></code>] [<code class="option">-c <em class="replaceable"><code>config-file</code></em></code>] [<code class="option">-k <em class="replaceable"><code>key-file</code></em></code>] [<code class="option">-s <em class="replaceable"><code>server</code></em></code>] [<code class="option">-p <em class="replaceable"><code>port</code></em></code>] [<code class="option">-V</code>] [<code class="option">-y <em class="replaceable"><code>key_id</code></em></code>] {command}</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2645909"></a><h2>DESCRIPTION</h2>
+<a name="id2650617"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">rndc</strong></span>
       controls the operation of a name
       server.  It supersedes the <span><strong class="command">ndc</strong></span> utility
@@ -79,7 +79,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2645959"></a><h2>OPTIONS</h2>
+<a name="id2650667"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-b <em class="replaceable"><code>source-address</code></em></span></dt>
 <dd><p>
@@ -145,7 +145,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2650401"></a><h2>COMMANDS</h2>
+<a name="id2650876"></a><h2>COMMANDS</h2>
 <p>
       A list of commands supported by <span><strong class="command">rndc</strong></span> can
       be seen by running <span><strong class="command">rndc</strong></span> without arguments.
@@ -498,7 +498,7 @@
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2683454"></a><h2>LIMITATIONS</h2>
+<a name="id2685705"></a><h2>LIMITATIONS</h2>
 <p>
       There is currently no way to provide the shared secret for a
       <code class="option">key_id</code> without using the configuration file.
@@ -508,7 +508,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2683473"></a><h2>SEE ALSO</h2>
+<a name="id2685723"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">rndc.conf</span>(5)</span>,
       <span class="citerefentry"><span class="refentrytitle">rndc-confgen</span>(8)</span>,
       <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
@@ -518,7 +518,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2683528"></a><h2>AUTHOR</h2>
+<a name="id2685779"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index 9b199dbb07..06a0061e4d 100644
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -44,48 +44,7 @@
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_security"></a>Security Fixes</h3></div></div></div>
-<div class="itemizedlist"><ul type="disc">
-<li>
-<p>
-	  On servers configured to perform DNSSEC validation using
-	  managed trust anchors (i.e., keys configured explicitly
-	  via <span><strong class="command">managed-keys</strong></span>, or implicitly 
-	  via <span><strong class="command">dnssec-validation auto;</strong></span> or
-	  <span><strong class="command">dnssec-lookaside auto;</strong></span>), revoking
-	  a trust anchor and sending a new untrusted replacement
-	  could cause <span><strong class="command">named</strong></span> to crash with an
-	  assertion failure. This could occur in the event of a
-	  botched key rollover, or potentially as a result of a
-	  deliberate attack if the attacker was in position to
-	  monitor the victim's DNS traffic.
-	</p>
-<p>
-	  This flaw was discovered by Jan-Piet Mens, and is
-	  disclosed in CVE-2015-1349. [RT #38344]
-	</p>
-</li>
-<li>
-<p>
-	  A flaw in delegation handling could be exploited to put
-	  <span><strong class="command">named</strong></span> into an infinite loop, in which
-	  each lookup of a name server triggered additional lookups
-	  of more name servers.  This has been addressed by placing
-	  limits on the number of levels of recursion
-	  <span><strong class="command">named</strong></span> will allow (default 7), and
-	  on the number of queries that it will send before
-	  terminating a recursive query (default 50).
-	</p>
-<p>
-	  The recursion depth limit is configured via the
-	  <code class="option">max-recursion-depth</code> option, and the query limit
-	  via the <code class="option">max-recursion-queries</code> option.
-	</p>
-<p>
-	  The flaw was discovered by Florian Maury of ANSSI, and is
-	  disclosed in CVE-2014-8500. [RT #37580]
-	</p>
-</li>
-</ul></div>
+<div class="itemizedlist"><ul type="disc"><li><p>None</p></li></ul></div>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
@@ -95,148 +54,16 @@
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_changes"></a>Feature Changes</h3></div></div></div>
-<div class="itemizedlist"><ul type="disc">
-<li><p>
-          NXDOMAIN responses to queries of type DS are now cached separately
-          from those for other types. This helps when using "grafted" zones
-          of type forward, for which the parent zone does not contain a
-          delegation, such as local top-level domains.  Previously a query
-          of type DS for such a zone could cause the zone apex to be cached
-          as NXDOMAIN, blocking all subsequent queries.  (Note: This
-          change is only helpful when DNSSEC validation is not enabled.
-          "Grafted" zones without a delegation in the parent are not a
-          recommended configuration.)
-        </p></li>
-<li><p>
-          NOTIFY messages that are sent because a zone has been updated
-          are now given priority above NOTIFY messages that were scheduled
-          when the server started up. This should mitigate delays in zone
-          propagation when servers are restarted frequently.
-        </p></li>
-<li><p>
-          Errors reported when running <span><strong class="command">rndc addzone</strong></span>
-          (e.g., when a zone file cannot be loaded) have been clarified
-          to make it easier to diagnose problems.
-        </p></li>
-<li><p>
-	  Added support for OPENPGPKEY type.
-        </p></li>
-<li><p>
-	  When encountering an authoritative name server whose name is
-	  an alias pointing to another name, the resolver treats
-	  this as an error and skips to the next server. Previously
-	  this happened silently; now the error will be logged to
-	  the newly-created "cname" log category.
-	</p></li>
-<li><p>
-	  If named is not configured to validate the answer then
-	  allow fallback to plain DNS on timeout even when we know
-	  the server supports EDNS.  This will allow the server to
-	  potentially resolve signed queries when TCP is being
-	  blocked.
-	</p></li>
-</ul></div>
+<div class="itemizedlist"><ul type="disc"><li><p>None</p></li></ul></div>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_bugs"></a>Bug Fixes</h3></div></div></div>
-<div class="itemizedlist"><ul type="disc">
-<li><p>
-	  <span><strong class="command">dig</strong></span>, <span><strong class="command">host</strong></span> and
-	  <span><strong class="command">nslookup</strong></span> aborted when encountering
-	  a name which, after appending search list elements,
-	  exceeded 255 bytes. Such names are now skipped, but
-	  processing of other names will continue. [RT #36892]
-        </p></li>
-<li><p>
-	  The error message generated when
-	  <span><strong class="command">named-checkzone</strong></span> or
-	  <span><strong class="command">named-checkconf -z</strong></span> encounters a
-	  <code class="option">$TTL</code> directive without a value has
-	  been clarified. [RT #37138]
-        </p></li>
-<li><p>
-	  Semicolon characters (;) included in TXT records were
-	  incorrectly escaped with a backslash when the record was
-	  displayed as text. This is actually only necessary when there
-	  are no quotation marks. [RT #37159]
-        </p></li>
-<li><p>
-	  When files opened for writing by <span><strong class="command">named</strong></span>,
-	  such as zone journal files, were referenced more than once
-	  in <code class="filename">named.conf</code>, it could lead to file
-	  corruption as multiple threads wrote to the same file. This
-	  is now detected when loading <code class="filename">named.conf</code>
-	  and reported as an error. [RT #37172]
-        </p></li>
-<li><p>
-          <span><strong class="command">dnssec-keygen -S</strong></span> failed to generate successor
-          keys for some algorithm types (including ECDSA and GOST) due to
-          a difference in the content of private key files. This has been
-          corrected. [RT #37183]
-        </p></li>
-<li><p>
-          UPDATE messages that arrived too soon after
-          an <span><strong class="command">rndc thaw</strong></span> could be lost. [RT #37233]
-        </p></li>
-<li><p>
-          Forwarding of UPDATE messages did not work when they were
-          signed with SIG(0); they resulted in a BADSIG response code.
-          [RT #37216]
-        </p></li>
-<li><p>
-          When checking for updates to trust anchors listed in
-          <code class="option">managed-keys</code>, <span><strong class="command">named</strong></span>
-          now revalidates keys based on the current set of
-          active trust anchors, without relying on any cached
-          record of previous validation. [RT #37506]
-        </p></li>
-<li><p>
-	  When NXDOMAIN redirection is in use, queries for a name
-	  that is present in the redirection zone but a type that
-	  is not present will now return NOERROR instead of NXDOMAIN.
-        </p></li>
-<li><p>
-	  When a zone contained a delegation to an IPv6 name server
-	  but not an IPv4 name server, it was possible for a memory
-	  reference to be left un-freed. This caused an assertion
-	  failure on server shutdown, but was otherwise harmless.
-	  [RT #37796]
-        </p></li>
-<li><p>
-	  Due to an inadvertent removal of code in the previous
-	  release, when <span><strong class="command">named</strong></span> encountered an
-	  authoritative name server which dropped all EDNS queries,
-	  it did not always try plain DNS. This has been corrected.
-	  [RT #37965]
-        </p></li>
-<li><p>
-	  A regression caused nsupdate to use the default recursive servers
-	  rather than the SOA MNAME server when sending the UPDATE.
-        </p></li>
-<li><p>
-	  Adjusted max-recursion-queries to better accommodate empty
-	  caches.
-        </p></li>
-<li><p>
-	  Built-in "empty" zones did not correctly inherit the
-	  "allow-transfer" ACL from the options or view. [RT #38310]
-        </p></li>
-<li><p>
-	  A mutex leak was fixed that could cause <span><strong class="command">named</strong></span>
-	  processes to grow to very large sizes. [RT #38454]
-	</p></li>
-<li><p>
-	  Fixed some bugs in RFC 5011 trust anchor management,
-	  including a memory leak and a possible loss of state
-	  information. [RT #38458]
-	</p></li>
-<li><p>
+<div class="itemizedlist"><ul type="disc"><li><p>
 	  Asynchronous zone loads were not handled correctly when the
 	  zone load was already in progress; this could trigger a crash
 	  in zt.c. [RT #37573]
-	</p></li>
-</ul></div>
+ 	</p></li></ul></div>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">