regen v9_10

diff --git a/bin/dig/dig.1 b/bin/dig/dig.1
index 9041c9628242b99225527bb110e752eac202d149..7eafab2faa1fca28ca4f960ea1a2996182e83c89 100644 (file)
--- a/bin/dig/dig.1
+++ b/bin/dig/dig.1
@@ -367,6 +367,26 @@ and the query options that have been applied\&. This comment is printed by defau
 Toggle the display of comment lines in the output\&. The default is to print comments\&.
 .RE
 .PP
+\fB+[no]cookie\fR\fB[=####]\fR
+.RS 4
+Send an COOKIE EDNS option, containing an optional
+\fIvalue\fR\&. Replaying a COOKIE from a previous response will allow the server to identify a previous client\&. The default is
+\fB+nocookie\fR\&.
+.sp
+\fB+cookie\fR
+is automatically set when +trace is in use, to better emulate the default queries from a nameserver\&.
+.sp
+This option was formerly called
+\fB+[no]sit\fR
+(Server Identity Token)\&. In BIND 9\&.10\&.0 through BIND 9\&.10\&.2, it sent the experimental option code 65001\&. This was changed to option code 10 in BIND 9\&.10\&.3 when the DNS COOKIE option was allocated\&.
+.sp
+The
+\fB+[no]sit\fR
+is now deprecated, but has been retained as a synonym for
+\fB+[no]cookie\fR
+for backward compatibility within the BIND 9\&.10 branch\&.
+.RE
+.PP
 \fB+[no]crypto\fR
 .RS 4
 Toggle the display of cryptographic fields in DNSSEC records\&. The contents of these field are unnecessary to debug most DNSSEC validation failures and removing them makes it easier to see the common failures\&. The default is to display the fields\&. When omitted they are replaced by the string "[omitted]" or in the DNSKEY case the key id is displayed as the replacement, e\&.g\&. "[ key id = value ]"\&.
@@ -579,12 +599,12 @@ instead\&.
 .PP
 \fB+[no]sit\fR\fB[=####]\fR
 .RS 4
-Send a DNS COOKIE option, with optional value\&. Replaying a DNS COOKIE from a previous response will allow the server to identify a previous client\&. The default is
-\fB+nosit\fR\&.
+This option is a synonym for
+\fB+[no]cookie\fR\&.
 .sp
-This option is
-\fB+[no]cookie\fR
-from BIND 9\&.11\&.0 onwards\&. BIND 9\&.10\&.0 through BIND 9\&.10\&.2 sent the experimental option code 65001\&. This was changed to 10 in BIND 9\&.10\&.3 when the DNS COOKIE option was allocated\&.
+The
+\fB+[no]sit\fR
+is deprecated\&.
 .RE
 .PP
 \fB+split=W\fR

diff --git a/bin/dig/dig.html b/bin/dig/dig.html
index fbfad1f80d010de05d8c0952f48c37387ba0e5d3..1eca0a1a5b599a51bfba872172c928d6247c4ced 100644 (file)
--- a/bin/dig/dig.html
+++ b/bin/dig/dig.html
@@ -482,6 +482,33 @@
              The default is to print comments.
            </p>
          </dd>
+<dt><span class="term"><code class="option">+[no]cookie[<span class="optional">=####</span>]</code></span></dt>
+<dd>
+           <p>
+             Send an COOKIE EDNS option, containing an optional
+             <em class="replaceable"><code>value</code></em>.  Replaying a COOKIE
+             from a previous response will allow the server to
+             identify a previous client.  The default is
+             <code class="option">+nocookie</code>.
+           </p>
+           <p>
+             <span class="command"><strong>+cookie</strong></span> is automatically set when +trace
+             is in use, to better emulate the default queries from a
+             nameserver.
+           </p>
+           <p>
+             This option was formerly called <code class="option">+[no]sit</code>
+              (Server Identity Token). In BIND 9.10.0 through BIND 9.10.2,
+              it sent the experimental option code 65001.  This was
+              changed to option code 10 in BIND 9.10.3 when the DNS
+              COOKIE option was allocated.
+           </p>
+           <p>
+             The <code class="option">+[no]sit</code> is now deprecated, but has
+              been retained as a synonym for <code class="option">+[no]cookie</code>
+              for backward compatibility within the BIND 9.10 branch.
+           </p>
+         </dd>
 <dt><span class="term"><code class="option">+[no]crypto</code></span></dt>
 <dd>
            <p>
@@ -756,17 +783,10 @@
 <dt><span class="term"><code class="option">+[no]sit[<span class="optional">=####</span>]</code></span></dt>
 <dd>
            <p>
-             Send a DNS COOKIE option, with optional value.
-             Replaying a DNS COOKIE from a previous response will
-             allow the server to identify a previous client.  The
-             default is <code class="option">+nosit</code>.
+             This option is a synonym for <code class="option">+[no]cookie</code>.
            </p>
            <p>
-             This option is <code class="option">+[no]cookie</code> from
-             BIND 9.11.0 onwards.  BIND 9.10.0 through BIND 9.10.2
-             sent the experimental option code 65001.  This was
-             changed to 10 in BIND 9.10.3 when the DNS COOKIE
-             option was allocated.
+             The <code class="option">+[no]sit</code> is deprecated.
            </p>
          </dd>
 <dt><span class="term"><code class="option">+split=W</code></span></dt>

diff --git a/doc/arm/man.dig.html b/doc/arm/man.dig.html
index 4767bade54326cf5c6f5f90d97827d37398234ff..c13db90da735cf9aac7be0324686498dc5226624 100644 (file)
--- a/doc/arm/man.dig.html
+++ b/doc/arm/man.dig.html
@@ -500,6 +500,33 @@
              The default is to print comments.
            </p>
          </dd>
+<dt><span class="term"><code class="option">+[no]cookie[<span class="optional">=####</span>]</code></span></dt>
+<dd>
+           <p>
+             Send an COOKIE EDNS option, containing an optional
+             <em class="replaceable"><code>value</code></em>.  Replaying a COOKIE
+             from a previous response will allow the server to
+             identify a previous client.  The default is
+             <code class="option">+nocookie</code>.
+           </p>
+           <p>
+             <span class="command"><strong>+cookie</strong></span> is automatically set when +trace
+             is in use, to better emulate the default queries from a
+             nameserver.
+           </p>
+           <p>
+             This option was formerly called <code class="option">+[no]sit</code>
+              (Server Identity Token). In BIND 9.10.0 through BIND 9.10.2,
+              it sent the experimental option code 65001.  This was
+              changed to option code 10 in BIND 9.10.3 when the DNS
+              COOKIE option was allocated.
+           </p>
+           <p>
+             The <code class="option">+[no]sit</code> is now deprecated, but has
+              been retained as a synonym for <code class="option">+[no]cookie</code>
+              for backward compatibility within the BIND 9.10 branch.
+           </p>
+         </dd>
 <dt><span class="term"><code class="option">+[no]crypto</code></span></dt>
 <dd>
            <p>
@@ -774,17 +801,10 @@
 <dt><span class="term"><code class="option">+[no]sit[<span class="optional">=####</span>]</code></span></dt>
 <dd>
            <p>
-             Send a DNS COOKIE option, with optional value.
-             Replaying a DNS COOKIE from a previous response will
-             allow the server to identify a previous client.  The
-             default is <code class="option">+nosit</code>.
+             This option is a synonym for <code class="option">+[no]cookie</code>.
            </p>
            <p>
-             This option is <code class="option">+[no]cookie</code> from
-             BIND 9.11.0 onwards.  BIND 9.10.0 through BIND 9.10.2
-             sent the experimental option code 65001.  This was
-             changed to 10 in BIND 9.10.3 when the DNS COOKIE
-             option was allocated.
+             The <code class="option">+[no]sit</code> is deprecated.
            </p>
          </dd>
 <dt><span class="term"><code class="option">+split=W</code></span></dt>