regen master

diff --git a/bin/dig/dig.1 b/bin/dig/dig.1
index f8943144fdf7f1a991647f4e3b9ba92626d505fd..9850b6aa17b171d4b441d259f568f9b2c34beab1 100644 (file)
--- a/bin/dig/dig.1
+++ b/bin/dig/dig.1
@@ -711,9 +711,11 @@ In this case, each
 \fIquery\fR
 argument represent an individual query in the command\-line syntax described above\&. Each consists of any of the standard options and flags, the name to be looked up, an optional query type and class and any query options that should be applied to that query\&.
 .PP
-A global set of query options, which should be applied to all queries, can also be supplied\&. These global query options must precede the first tuple of name, class, type, options, flags, and query options supplied on the command line\&. Any global query options (except the
+A global set of query options, which should be applied to all queries, can also be supplied\&. These global query options must precede the first tuple of name, class, type, options, flags, and query options supplied on the command line\&. Any global query options (except
 \fB+[no]cmd\fR
-option) can be overridden by a query\-specific set of query options\&. For example:
+and
+\fB+[no]short\fR
+options) can be overridden by a query\-specific set of query options\&. For example:
 .sp
 .if n \{\
 .RS 4

diff --git a/bin/dig/dig.html b/bin/dig/dig.html
index 255c055646d01f61183a5d7279a878e86d8a457c..122f174fa9b2707f55e8a2d4118209dabef233a0 100644 (file)
--- a/bin/dig/dig.html
+++ b/bin/dig/dig.html
@@ -753,8 +753,9 @@
       can also be supplied.  These global query options must precede the
       first tuple of name, class, type, options, flags, and query options
       supplied on the command line.  Any global query options (except
-      the <code class="option">+[no]cmd</code> option) can be
-      overridden by a query-specific set of query options.  For example:
+      <code class="option">+[no]cmd</code> and <code class="option">+[no]short</code> options)
+      can be overridden by a query-specific set of query options.
+      For example:
       </p>
 <pre class="programlisting">
 dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr

diff --git a/doc/arm/man.dig.html b/doc/arm/man.dig.html
index 601610f7b9490b56e50cc2c0e27599088fc866d5..b47b3c76c04f4cec7cdfab6e9d4c1561ef27e5b2 100644 (file)
--- a/doc/arm/man.dig.html
+++ b/doc/arm/man.dig.html
@@ -771,8 +771,9 @@
       can also be supplied.  These global query options must precede the
       first tuple of name, class, type, options, flags, and query options
       supplied on the command line.  Any global query options (except
-      the <code class="option">+[no]cmd</code> option) can be
-      overridden by a query-specific set of query options.  For example:
+      <code class="option">+[no]cmd</code> and <code class="option">+[no]short</code> options)
+      can be overridden by a query-specific set of query options.
+      For example:
       </p>
 <pre class="programlisting">
 dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr