regen master

diff --git a/bin/check/named-checkconf.8 b/bin/check/named-checkconf.8
index a444c0bd5a321c9fd46f2c43d24f93a55a81eb71..68755b35aa68b8d0fb4d9d1c55963872cf14e63d 100644 (file)
--- a/bin/check/named-checkconf.8
+++ b/bin/check/named-checkconf.8
@@ -39,7 +39,7 @@
 named-checkconf \- named configuration file syntax checking tool
 .SH "SYNOPSIS"
 .HP \w'\fBnamed\-checkconf\fR\ 'u
-\fBnamed\-checkconf\fR [\fB\-h\fR] [\fB\-v\fR] [\fB\-j\fR] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] {filename} [\fB\-p\fR] [\fB\-x\fR] [\fB\-z\fR]
+\fBnamed\-checkconf\fR [\fB\-hjvz\fR] [\fB\-p\fR\ [\fB\-x\fR\ ]] [\fB\-t\ \fR\fB\fIdirectory\fR\fR] {filename}
 .SH "DESCRIPTION"
 .PP
 \fBnamed\-checkconf\fR
@@ -69,6 +69,20 @@ can be run on these files explicitly, however\&.
 Print the usage summary and exit\&.
 .RE
 .PP
+\-j
+.RS 4
+When loading a zonefile read the journal if it exists\&.
+.RE
+.PP
+\-p
+.RS 4
+Print out the
+named\&.conf
+and included files in canonical form if no errors were detected\&. See also the
+\fB\-x\fR
+option\&.
+.RE
+.PP
 \-t \fIdirectory\fR
 .RS 4
 Chroot to
@@ -84,13 +98,6 @@ Print the version of the
 program and exit\&.
 .RE
 .PP
-\-p
-.RS 4
-Print out the
-named\&.conf
-and included files in canonical form if no errors were detected\&.
-.RE
-.PP
 \-x
 .RS 4
 When printing the configuration files in canonical form, obscure shared secrets by replacing them with strings of question marks (\*(Aq?\*(Aq)\&. This allows the contents of
@@ -105,11 +112,6 @@ Perform a test load of all master zones found in
 named\&.conf\&.
 .RE
 .PP
-\-j
-.RS 4
-When loading a zonefile read the journal if it exists\&.
-.RE
-.PP
 filename
 .RS 4
 The name of the configuration file to be checked\&. If not specified, it defaults to

diff --git a/bin/check/named-checkconf.html b/bin/check/named-checkconf.html
index 3161689f7eb1ffa192f343a5b81d2b6cf2cd1513..3b41974ef4dd49669b4be49b7fd7a558de850ed7 100644 (file)
--- a/bin/check/named-checkconf.html
+++ b/bin/check/named-checkconf.html
@@ -20,7 +20,9 @@
 </div>
 <div class="refsynopsisdiv">
 <h2>Synopsis</h2>
-<div class="cmdsynopsis"><p><code class="command">named-checkconf</code>  [<code class="option">-h</code>] [<code class="option">-v</code>] [<code class="option">-j</code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] {filename} [<code class="option">-p</code>] [<code class="option">-x</code>] [<code class="option">-z</code>]</p></div>
+<div class="cmdsynopsis"><p><code class="command">named-checkconf</code>  [<code class="option">-hjvz</code>] [<code class="option">-p</code>
+        [<code class="option">-x</code>
+      ]] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] {filename}</p></div>
 </div>
 <div class="refsection">
 <a name="id-1.7"></a><h2>DESCRIPTION</h2>
@@ -49,6 +51,16 @@
 <dd><p>
             Print the usage summary and exit.
           </p></dd>
+<dt><span class="term">-j</span></dt>
+<dd><p>
+            When loading a zonefile read the journal if it exists.
+          </p></dd>
+<dt><span class="term">-p</span></dt>
+<dd><p>
+           Print out the <code class="filename">named.conf</code> and included files
+           in canonical form if no errors were detected.
+            See also the <code class="option">-x</code> option.
+          </p></dd>
 <dt><span class="term">-t <em class="replaceable"><code>directory</code></em></span></dt>
 <dd><p>
             Chroot to <code class="filename">directory</code> so that include
@@ -60,11 +72,6 @@
             Print the version of the <span class="command"><strong>named-checkconf</strong></span>
             program and exit.
           </p></dd>
-<dt><span class="term">-p</span></dt>
-<dd><p>
-           Print out the <code class="filename">named.conf</code> and included files
-           in canonical form if no errors were detected.
-          </p></dd>
 <dt><span class="term">-x</span></dt>
 <dd><p>
            When printing the configuration files in canonical
@@ -80,10 +87,6 @@
            Perform a test load of all master zones found in
            <code class="filename">named.conf</code>.
           </p></dd>
-<dt><span class="term">-j</span></dt>
-<dd><p>
-            When loading a zonefile read the journal if it exists.
-          </p></dd>
 <dt><span class="term">filename</span></dt>
 <dd><p>
             The name of the configuration file to be checked.  If not

diff --git a/bin/tools/mdig.1 b/bin/tools/mdig.1
index 1301a7fb314d3aa79d7c6c4ab3ad4a6ba67c85cb..aa3ad121b265e482bef469334129cfc19d34a3a7 100644 (file)
--- a/bin/tools/mdig.1
+++ b/bin/tools/mdig.1
@@ -158,6 +158,11 @@ Display [do not display] the CLASS when printing the record\&.
 Toggle the display of comment lines in the output\&. The default is to print comments\&.
 .RE
 .PP
+\fB+[no]continue\fR
+.RS 4
+Continue on errors (e\&.g\&. timeouts)\&.
+.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 ]"\&.

diff --git a/bin/tools/mdig.html b/bin/tools/mdig.html
index ac44ca7fe9d9ea2f9a7159c6767b787d7372069c..dd63756a544ec1262ff060beeb0c02f18b6883fd 100644 (file)
--- a/bin/tools/mdig.html
+++ b/bin/tools/mdig.html
@@ -155,6 +155,10 @@
               Toggle the display of comment lines in the output.
               The default is to print comments.
             </p></dd>
+<dt><span class="term"><code class="option">+[no]continue</code></span></dt>
+<dd><p>
+              Continue on errors (e.g. timeouts).
+            </p></dd>
 <dt><span class="term"><code class="option">+[no]crypto</code></span></dt>
 <dd><p>
               Toggle the display of cryptographic fields in DNSSEC

diff --git a/doc/arm/man.mdig.html b/doc/arm/man.mdig.html
index c388808485a1def66f699236add058680bbb79d5..81787debd024198abc1e5934351a656a4183dee2 100644 (file)
--- a/doc/arm/man.mdig.html
+++ b/doc/arm/man.mdig.html
@@ -173,6 +173,10 @@
               Toggle the display of comment lines in the output.
               The default is to print comments.
             </p></dd>
+<dt><span class="term"><code class="option">+[no]continue</code></span></dt>
+<dd><p>
+              Continue on errors (e.g. timeouts).
+            </p></dd>
 <dt><span class="term"><code class="option">+[no]crypto</code></span></dt>
 <dd><p>
               Toggle the display of cryptographic fields in DNSSEC

diff --git a/doc/arm/man.named-checkconf.html b/doc/arm/man.named-checkconf.html
index 4e7adddcbd3c74bdd36af43f090bb9ad12ede97a..f60aa5ff4a472499dae337312ba8227875915a78 100644 (file)
--- a/doc/arm/man.named-checkconf.html
+++ b/doc/arm/man.named-checkconf.html
@@ -38,7 +38,9 @@
 </div>
 <div class="refsynopsisdiv">
 <h2>Synopsis</h2>
-<div class="cmdsynopsis"><p><code class="command">named-checkconf</code>  [<code class="option">-h</code>] [<code class="option">-v</code>] [<code class="option">-j</code>] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] {filename} [<code class="option">-p</code>] [<code class="option">-x</code>] [<code class="option">-z</code>]</p></div>
+<div class="cmdsynopsis"><p><code class="command">named-checkconf</code>  [<code class="option">-hjvz</code>] [<code class="option">-p</code>
+        [<code class="option">-x</code>
+      ]] [<code class="option">-t <em class="replaceable"><code>directory</code></em></code>] {filename}</p></div>
 </div>
 <div class="refsection">
 <a name="id-1.14.21.7"></a><h2>DESCRIPTION</h2>
@@ -67,6 +69,16 @@
 <dd><p>
             Print the usage summary and exit.
           </p></dd>
+<dt><span class="term">-j</span></dt>
+<dd><p>
+            When loading a zonefile read the journal if it exists.
+          </p></dd>
+<dt><span class="term">-p</span></dt>
+<dd><p>
+           Print out the <code class="filename">named.conf</code> and included files
+           in canonical form if no errors were detected.
+            See also the <code class="option">-x</code> option.
+          </p></dd>
 <dt><span class="term">-t <em class="replaceable"><code>directory</code></em></span></dt>
 <dd><p>
             Chroot to <code class="filename">directory</code> so that include
@@ -78,11 +90,6 @@
             Print the version of the <span class="command"><strong>named-checkconf</strong></span>
             program and exit.
           </p></dd>
-<dt><span class="term">-p</span></dt>
-<dd><p>
-           Print out the <code class="filename">named.conf</code> and included files
-           in canonical form if no errors were detected.
-          </p></dd>
 <dt><span class="term">-x</span></dt>
 <dd><p>
            When printing the configuration files in canonical
@@ -98,10 +105,6 @@
            Perform a test load of all master zones found in
            <code class="filename">named.conf</code>.
           </p></dd>
-<dt><span class="term">-j</span></dt>
-<dd><p>
-            When loading a zonefile read the journal if it exists.
-          </p></dd>
 <dt><span class="term">filename</span></dt>
 <dd><p>
             The name of the configuration file to be checked.  If not