regen master

diff --git a/bin/dig/dig.1 b/bin/dig/dig.1
index 152e4075b7b94cd7880a20160e7abe7e1097b8d4..a7b60f66e1433763b010f7bb8bd4224dcbfcc43f 100644 (file)
--- a/bin/dig/dig.1
+++ b/bin/dig/dig.1
@@ -611,13 +611,15 @@ 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[/netmask]\fR
+\fB+[no]subnet=addr[/prefix\-length]\fR
 .RS 4
 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\&.
+for short, sends an EDNS client\-subnet option with an empty address and a source prefix\-length of zero, which signals a resolver that the client\*(Aqs address information must
+\fInot\fR
+be used when resolving this query\&.
 .RE
 .PP
 \fB+[no]tcp\fR

diff --git a/bin/dig/dig.html b/bin/dig/dig.html
index 39235f49e3b6971de5bd46eb7958ddd3e95591d8..0ba30ab22051fef3668eec401986906f07331bd6 100644 (file)
--- a/bin/dig/dig.html
+++ b/bin/dig/dig.html
@@ -618,19 +618,20 @@
              so on.  The default behavior is to print the query
              statistics.
            </p></dd>
-<dt><span class="term"><code class="option">+[no]subnet=addr[/netmask]</code></span></dt>
+<dt><span class="term"><code class="option">+[no]subnet=addr[/prefix-length]</code></span></dt>
 <dd>
 <p>
              Send (don't send) an EDNS Client Subnet option with the
-              specified IP address or network prefix.
+             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.
+              <span class="command"><strong>dig +subnet=0</strong></span> for short, sends an EDNS
+              client-subnet option with an empty address and a source
+              prefix-length of zero, which signals a resolver that
+              the client's address information must
+              <span class="emphasis"><em>not</em></span> be used when resolving
+              this query.
            </p>
 </dd>
 <dt><span class="term"><code class="option">+[no]tcp</code></span></dt>

diff --git a/bin/tools/mdig.1 b/bin/tools/mdig.1
index 853665eb8c16ef99d21813a1f716dfad4878d1b7..93434ac84179e3c6d784bac918883d91411fc6f5 100644 (file)
--- a/bin/tools/mdig.1
+++ b/bin/tools/mdig.1
@@ -351,13 +351,15 @@ instead of the default, 2\&. Unlike
 \fI+tries\fR, this does not include the initial query\&.
 .RE
 .PP
-\fB+[no]subnet=addr[/netmask]\fR
+\fB+[no]subnet=addr[/prefix\-length]\fR
 .RS 4
 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\&.
+for short, sends an EDNS client\-subnet option with an empty address and a source prefix\-length of zero, which signals a resolver that the client\*(Aqs address information must
+\fInot\fR
+be used when resolving this query\&.
 .RE
 .PP
 \fB+timeout=T\fR

diff --git a/bin/tools/mdig.html b/bin/tools/mdig.html
index e8159e5bad63c036e8a4ab0b0dc0f68b0dd90a52..bb7be68b76ff6d1a7108667c3bac1ffdd1acb531 100644 (file)
--- a/bin/tools/mdig.html
+++ b/bin/tools/mdig.html
@@ -371,7 +371,7 @@
               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[/netmask]</code></span></dt>
+<dt><span class="term"><code class="option">+[no]subnet=addr[/prefix-length]</code></span></dt>
 <dd>
 <p>
              Send (don't send) an EDNS Client Subnet option with the
@@ -379,11 +379,12 @@
            </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.
+              <span class="command"><strong>mdig +subnet=0</strong></span> for short, sends an EDNS
+              client-subnet option with an empty address and a source
+              prefix-length of zero, which signals a resolver that
+              the client's address information must
+              <span class="emphasis"><em>not</em></span> be used when resolving
+              this query.
            </p>
 </dd>
 <dt><span class="term"><code class="option">+timeout=T</code></span></dt>

diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index fb08a164ce35bde8da6873f2d70b3c2c9d2d8846..50f741ba612bf895004f566328f4d15e595c4907 100644 (file)
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -67,7 +67,7 @@
 <p>
       BIND 9.11.0 is a new feature release of BIND, still under development.
       This document summarizes new features and functional changes that
-      have been introduced on this branch.  With each development 
+      have been introduced on this branch.  With each development
       release leading up to the final BIND 9.11.0 release, this document
       will be updated with additional features added and bugs fixed.
     </p>
@@ -626,7 +626,7 @@
          the newly-created "cname" log category.
        </p></li>
 <li class="listitem"><p>
-         If <span class="command"><strong>named</strong></span> is not configured to validate 
+         If <span class="command"><strong>named</strong></span> is not configured to validate
          answers, 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

diff --git a/doc/arm/man.dig.html b/doc/arm/man.dig.html
index c3d4116f95d474f67c6626eb97ef18f03ce50e1d..10c4167cd9cceac0383fca5b68c42b0b14c9ea4c 100644 (file)
--- a/doc/arm/man.dig.html
+++ b/doc/arm/man.dig.html
@@ -636,19 +636,20 @@
              so on.  The default behavior is to print the query
              statistics.
            </p></dd>
-<dt><span class="term"><code class="option">+[no]subnet=addr[/netmask]</code></span></dt>
+<dt><span class="term"><code class="option">+[no]subnet=addr[/prefix-length]</code></span></dt>
 <dd>
 <p>
              Send (don't send) an EDNS Client Subnet option with the
-              specified IP address or network prefix.
+             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.
+              <span class="command"><strong>dig +subnet=0</strong></span> for short, sends an EDNS
+              client-subnet option with an empty address and a source
+              prefix-length of zero, which signals a resolver that
+              the client's address information must
+              <span class="emphasis"><em>not</em></span> be used when resolving
+              this query.
            </p>
 </dd>
 <dt><span class="term"><code class="option">+[no]tcp</code></span></dt>

diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index 96a27e243b586050ebf1af38cff817d928929ba0..c0fa078c8d73ccf6386b649fc6535db214f7c5f3 100644 (file)
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -28,7 +28,7 @@
 <p>
       BIND 9.11.0 is a new feature release of BIND, still under development.
       This document summarizes new features and functional changes that
-      have been introduced on this branch.  With each development 
+      have been introduced on this branch.  With each development
       release leading up to the final BIND 9.11.0 release, this document
       will be updated with additional features added and bugs fixed.
     </p>
@@ -587,7 +587,7 @@
          the newly-created "cname" log category.
        </p></li>
 <li class="listitem"><p>
-         If <span class="command"><strong>named</strong></span> is not configured to validate 
+         If <span class="command"><strong>named</strong></span> is not configured to validate
          answers, 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