regen master

diff --git a/bin/dig/dig.1 b/bin/dig/dig.1
index efa617d386502dc1c5f32f9bfcb031f9d0f018ae..2053d57096077e39d7fde564b52d41ba1d6053dd 100644 (file)
--- a/bin/dig/dig.1
+++ b/bin/dig/dig.1
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2004-2011, 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2011, 2013-2016 Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (C) 2000-2003 Internet Software Consortium.
 .\" 
 .\" Permission to use, copy, modify, and/or distribute this software for any
@@ -611,9 +611,13 @@ causes fields not to be split at all\&. The default is 56 characters, or 44 char
 This query option toggles the printing of statistics: when the query was made, the size of the reply and so on\&. The default behavior is to print the query statistics\&.
 .RE
 .PP
-\fB+[no]subnet=addr/prefix\fR
+\fB+[no]subnet=addr[/netmask]\fR
 .RS 4
-Send an EDNS Client Subnet option with the specified IP address or network prefix\&.
+Send (don\*(Aqt send) an EDNS Client Subnet option with the specified IP address or network prefix\&.
+.sp
+\fBdig +subnet=0\&.0\&.0\&.0/0\fR, or simply
+\fBdig +subnet=0\fR
+for short, sends a Client Subnet option with an empty address and a source prefix length of zero, which signals a resolver that the EDNS Client Subnet option should not be used when resolving this query\&.
 .RE
 .PP
 \fB+[no]tcp\fR
@@ -765,7 +769,7 @@ There are probably too many query options\&.
 \fBInternet Systems Consortium, Inc\&.\fR
 .SH "COPYRIGHT"
 .br
-Copyright \(co 2004-2011, 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2004-2011, 2013-2016 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 be78e226f8b9067903b327e90fd46c77f2698b27..47d24f05f27d22352cdc09de56b63bd92f0358ad 100644 (file)
--- a/bin/dig/dig.html
+++ b/bin/dig/dig.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2004-2011, 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2004-2011, 2013-2016 Internet Systems Consortium, Inc. ("ISC")
  - Copyright (C) 2000-2003 Internet Software Consortium.
  - 
  - Permission to use, copy, modify, and/or distribute this software for any
@@ -618,11 +618,21 @@
              so on.  The default behavior is to print the query
              statistics.
            </p></dd>
-<dt><span class="term"><code class="option">+[no]subnet=addr/prefix</code></span></dt>
-<dd><p>
-             Send an EDNS Client Subnet option with the specified
-             IP address or network prefix.
-           </p></dd>
+<dt><span class="term"><code class="option">+[no]subnet=addr[/netmask]</code></span></dt>
+<dd>
+<p>
+             Send (don't send) an EDNS Client Subnet option with the
+              specified IP address or network prefix.
+           </p>
+<p>
+              <span class="command"><strong>dig +subnet=0.0.0.0/0</strong></span>, or simply
+              <span class="command"><strong>dig +subnet=0</strong></span> for short, sends a
+              Client Subnet option with an empty address and a
+              source prefix length of zero, which signals a resolver
+              that the EDNS Client Subnet option should not be used
+              when resolving this query.
+           </p>
+</dd>
 <dt><span class="term"><code class="option">+[no]tcp</code></span></dt>
 <dd><p>
              Use [do not use] TCP when querying name servers. The

diff --git a/bin/tools/mdig.1 b/bin/tools/mdig.1
index f8c072786119d6ad9c489dce9ad328abd055d35a..6f3b3840c5b3eced27d4642e8224e5a688cb3625 100644 (file)
--- a/bin/tools/mdig.1
+++ b/bin/tools/mdig.1
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2015, 2016 Internet Systems Consortium, Inc. ("ISC")
 .\" 
 .\" Permission to use, copy, modify, and/or distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -351,9 +351,13 @@ instead of the default, 2\&. Unlike
 \fI+tries\fR, this does not include the initial query\&.
 .RE
 .PP
-\fB+[no]subnet=addr/prefix\fR
+\fB+[no]subnet=addr[/netmask]\fR
 .RS 4
-Send an EDNS Client Subnet option with the specified IP address or network prefix\&.
+Send (don\*(Aqt send) an EDNS Client Subnet option with the specified IP address or network prefix\&.
+.sp
+\fBmdig +subnet=0\&.0\&.0\&.0/0\fR, or simply
+\fBmdig +subnet=0\fR
+for short, sends a Client Subnet option with an empty address and a source prefix length of zero, which signals a resolver that the EDNS Client Subnet option should not be used when resolving this query\&.
 .RE
 .PP
 \fB+timeout=T\fR
@@ -392,5 +396,5 @@ RFC1035\&.
 \fBInternet Systems Consortium, Inc\&.\fR
 .SH "COPYRIGHT"
 .br
-Copyright \(co 2015 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2015, 2016 Internet Systems Consortium, Inc. ("ISC")
 .br

diff --git a/bin/tools/mdig.html b/bin/tools/mdig.html
index 68fa9e8fecda4340c68542ee81293b672b60290f..e66ffcb48edb07de06aa2631e92cc9413d172da3 100644 (file)
--- a/bin/tools/mdig.html
+++ b/bin/tools/mdig.html
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2015, 2016 Internet Systems Consortium, Inc. ("ISC")
  - 
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -371,11 +371,21 @@
               default, 2.  Unlike <em class="parameter"><code>+tries</code></em>,
               this does not include the initial query.
             </p></dd>
-<dt><span class="term"><code class="option">+[no]subnet=addr/prefix</code></span></dt>
-<dd><p>
-              Send an EDNS Client Subnet option with the specified
-              IP address or network prefix.
-            </p></dd>
+<dt><span class="term"><code class="option">+[no]subnet=addr[/netmask]</code></span></dt>
+<dd>
+<p>
+             Send (don't send) an EDNS Client Subnet option with the
+              specified IP address or network prefix.
+           </p>
+<p>
+              <span class="command"><strong>mdig +subnet=0.0.0.0/0</strong></span>, or simply
+              <span class="command"><strong>mdig +subnet=0</strong></span> for short, sends a
+              Client Subnet option with an empty address and a
+              source prefix length of zero, which signals a resolver
+              that the EDNS Client Subnet option should not be used
+              when resolving this query.
+           </p>
+</dd>
 <dt><span class="term"><code class="option">+timeout=T</code></span></dt>
 <dd><p>
               Sets the timeout for a query to

diff --git a/doc/arm/Bv9ARM.ch04.html b/doc/arm/Bv9ARM.ch04.html
index 633ed672baff44fca8f2302807edad1ed99ec356..5c4fdd5a3a5fe5b8c136d2e8c5ce68a28bed98f4 100644 (file)
--- a/doc/arm/Bv9ARM.ch04.html
+++ b/doc/arm/Bv9ARM.ch04.html
@@ -1611,16 +1611,16 @@ $ <strong class="userinput"><code> /opt/pkcs11/usr/bin/softhsm-util --init-token
 <p>
       The modified OpenSSL code is included in the BIND 9 release,
       in the form of a context diff against the latest versions of
-      OpenSSL.  OpenSSL 0.9.8, 1.0.0, and 1.0.1 are supported; there are
-      separate diffs for each version.  In the examples to follow,
-      we use OpenSSL 0.9.8, but the same methods work with OpenSSL
-      1.0.0 and 1.0.1.
+      OpenSSL.  OpenSSL 0.9.8, 1.0.0, 1.0.1 and 1.0.2 are supported;
+      there are separate diffs for each version.  In the examples to
+      follow, we use OpenSSL 0.9.8, but the same methods work with
+      OpenSSL 1.0.0 through 1.0.2.
     </p>
 <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Note</h3>
 <p>
-      The latest OpenSSL versions as of this writing (January 2015)
-      are 0.9.8zc, 1.0.0o, and 1.0.1j.
+      The OpenSSL patches as of this writing (January 2016)
+      support versions 0.9.8zh, 1.0.0t, 1.0.1q and 1.0.2f.
       ISC will provide updated patches as new versions of OpenSSL
       are released. The version number in the following examples
       is expected to change.

diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html
index 04c41ebd981f9b2e88531bb00d81db51e2e8d2b6..45c9544f49df76beba9b7dee886560e4c637e321 100644 (file)
--- a/doc/arm/Bv9ARM.ch06.html
+++ b/doc/arm/Bv9ARM.ch06.html
@@ -2432,9 +2432,8 @@ badresp:1,adberr:0,findfail:0,valfail:0]
     [<span class="optional"> notify-source (<em class="replaceable"><code>ip4_addr</code></em> | <code class="constant">*</code>) [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] [<span class="optional">dscp <em class="replaceable"><code>ip_dscp</code></em></span>] ; </span>]
     [<span class="optional"> notify-source-v6 (<em class="replaceable"><code>ip6_addr</code></em> | <code class="constant">*</code>) [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] [<span class="optional">dscp <em class="replaceable"><code>ip_dscp</code></em></span>] ; </span>]
     [<span class="optional"> notify-to-soa <em class="replaceable"><code>yes_or_no</code></em> ; </span>]
-    [<span class="optional"> also-notify { <em class="replaceable"><code>ip_addr</code></em>
-                    [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] [<span class="optional">dscp <em class="replaceable"><code>ip_dscp</code></em></span>] [<span class="optional">key <em class="replaceable"><code>keyname</code></em></span>] ;
-                    [<span class="optional"> <em class="replaceable"><code>ip_addr</code></em> [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] [<span class="optional">dscp <em class="replaceable"><code>ip_dscp</code></em></span>] [<span class="optional">key <em class="replaceable"><code>keyname</code></em></span>] ; ... </span>] }; </span>]
+    [<span class="optional"> also-notify [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] [<span class="optional">dscp <em class="replaceable"><code>ip_dscp</code></em></span>] { ( <em class="replaceable"><code>masters</code></em> | <em class="replaceable"><code>ip_addr</code></em>
+                    [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] ) [<span class="optional">key <em class="replaceable"><code>keyname</code></em></span>] ; ... }; </span>]
     [<span class="optional"> max-ixfr-log-size <em class="replaceable"><code>number</code></em>; </span>]
     [<span class="optional"> max-journal-size <em class="replaceable"><code>size_spec</code></em>; </span>]
     [<span class="optional"> coresize <em class="replaceable"><code>size_spec</code></em> ; </span>]
@@ -8255,8 +8254,9 @@ view "external" {
     [<span class="optional"> dnssec-dnskey-kskonly <em class="replaceable"><code>yes_or_no</code></em>; </span>]
     [<span class="optional"> dnssec-loadkeys-interval <em class="replaceable"><code>number</code></em>; </span>]
     [<span class="optional"> update-policy <em class="replaceable"><code>local</code></em> | { <em class="replaceable"><code>update_policy_rule</code></em> [<span class="optional">...</span>] }; </span>]
-    [<span class="optional"> also-notify { <em class="replaceable"><code>ip_addr</code></em> [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] [<span class="optional">dscp <em class="replaceable"><code>ip_dscp</code></em></span>] ;
-                  [<span class="optional"> <em class="replaceable"><code>ip_addr</code></em> [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] [<span class="optional">dscp <em class="replaceable"><code>ip_dscp</code></em></span>] ; ... </span>] }; </span>]
+    [<span class="optional"> also-notify [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] [<span class="optional">dscp <em class="replaceable"><code>ip_dscp</code></em></span>] { ( <em class="replaceable"><code>masters_list</code></em> | <em class="replaceable"><code>ip_addr</code></em>
+                              [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>]
+                              [<span class="optional">key <em class="replaceable"><code>key</code></em></span>] ) ; [<span class="optional">...</span>] }; </span>]
     [<span class="optional"> check-names (<code class="constant">warn</code>|<code class="constant">fail</code>|<code class="constant">ignore</code>) ; </span>]
     [<span class="optional"> check-mx (<code class="constant">warn</code>|<code class="constant">fail</code>|<code class="constant">ignore</code>) ; </span>]
     [<span class="optional"> check-wildcard <em class="replaceable"><code>yes_or_no</code></em>; </span>]
@@ -8316,7 +8316,6 @@ zone <em class="replaceable"><code>zone_name</code></em> [<span class="optional"
     [<span class="optional"> try-tcp-refresh <em class="replaceable"><code>yes_or_no</code></em>; </span>]
     [<span class="optional"> also-notify [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>] [<span class="optional">dscp <em class="replaceable"><code>ip_dscp</code></em></span>] { ( <em class="replaceable"><code>masters_list</code></em> | <em class="replaceable"><code>ip_addr</code></em>
                               [<span class="optional">port <em class="replaceable"><code>ip_port</code></em></span>]
-                              [<span class="optional">dscp <em class="replaceable"><code>ip_dscp</code></em></span>]
                               [<span class="optional">key <em class="replaceable"><code>key</code></em></span>] ) ; [<span class="optional">...</span>] }; </span>]
     [<span class="optional"> check-names (<code class="constant">warn</code>|<code class="constant">fail</code>|<code class="constant">ignore</code>) ; </span>]
     [<span class="optional"> dialup <em class="replaceable"><code>dialup_option</code></em> ; </span>]

diff --git a/doc/arm/man.dig.html b/doc/arm/man.dig.html
index 0a617a782b196dbb054cf02dd428b43299b95263..df0cba4da3670082eed105b465537f13e7496053 100644 (file)
--- a/doc/arm/man.dig.html
+++ b/doc/arm/man.dig.html
@@ -636,11 +636,21 @@
              so on.  The default behavior is to print the query
              statistics.
            </p></dd>
-<dt><span class="term"><code class="option">+[no]subnet=addr/prefix</code></span></dt>
-<dd><p>
-             Send an EDNS Client Subnet option with the specified
-             IP address or network prefix.
-           </p></dd>
+<dt><span class="term"><code class="option">+[no]subnet=addr[/netmask]</code></span></dt>
+<dd>
+<p>
+             Send (don't send) an EDNS Client Subnet option with the
+              specified IP address or network prefix.
+           </p>
+<p>
+              <span class="command"><strong>dig +subnet=0.0.0.0/0</strong></span>, or simply
+              <span class="command"><strong>dig +subnet=0</strong></span> for short, sends a
+              Client Subnet option with an empty address and a
+              source prefix length of zero, which signals a resolver
+              that the EDNS Client Subnet option should not be used
+              when resolving this query.
+           </p>
+</dd>
 <dt><span class="term"><code class="option">+[no]tcp</code></span></dt>
 <dd><p>
              Use [do not use] TCP when querying name servers. The