From: Tinderbox User <tbox@isc.org>
Date: Sat, 29 Oct 2016 01:06:53 +0000 (+0000)
Subject: regen master
X-Git-Tag: v9.12.0a1~702
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=c970f162b6daae68154ef350efcbc6bb6bf32b59;p=thirdparty%2Fbind9.git

regen master
---

diff --git a/bin/dig/dig.1 b/bin/dig/dig.1
index 9850b6aa17b..42246d8e295 100644
--- a/bin/dig/dig.1
+++ b/bin/dig/dig.1
@@ -454,6 +454,11 @@ Show [or do not show] the IP address and port number that supplied the answer wh
 option is enabled\&. If short form answers are requested, the default is not to show the source address and port number of the server that provided the answer\&.
 .RE
 .PP
+\fB+[no]idnout\fR
+.RS 4
+Convert [do not convert] puny code on output\&. This requires IDN SUPPORT to have been enabled at compile time\&. The default is to convert output\&.
+.RE
+.PP
 \fB+[no]ignore\fR
 .RS 4
 Ignore truncation in UDP responses instead of retrying with TCP\&. By default, TCP retries are performed\&.
diff --git a/bin/dig/dig.html b/bin/dig/dig.html
index 122f174fa9b..f50671d93d4 100644
--- a/bin/dig/dig.html
+++ b/bin/dig/dig.html
@@ -462,6 +462,12 @@
 	      to show the source address and port number of the
 	      server that provided the answer.
 	    </p></dd>
+<dt><span class="term"><code class="option">+[no]idnout</code></span></dt>
+<dd><p>
+	      Convert [do not convert] puny code on output.
+	      This requires IDN SUPPORT to have been enabled at
+	      compile time.  The default is to convert output.
+	    </p></dd>
 <dt><span class="term"><code class="option">+[no]ignore</code></span></dt>
 <dd><p>
 	      Ignore truncation in UDP responses instead of retrying
diff --git a/doc/arm/man.dig.html b/doc/arm/man.dig.html
index b47b3c76c04..9e648a9486f 100644
--- a/doc/arm/man.dig.html
+++ b/doc/arm/man.dig.html
@@ -480,6 +480,12 @@
 	      to show the source address and port number of the
 	      server that provided the answer.
 	    </p></dd>
+<dt><span class="term"><code class="option">+[no]idnout</code></span></dt>
+<dd><p>
+	      Convert [do not convert] puny code on output.
+	      This requires IDN SUPPORT to have been enabled at
+	      compile time.  The default is to convert output.
+	    </p></dd>
 <dt><span class="term"><code class="option">+[no]ignore</code></span></dt>
 <dd><p>
 	      Ignore truncation in UDP responses instead of retrying