diff --git a/bin/check/named-checkconf.8 b/bin/check/named-checkconf.8 index a444c0bd5a..68755b35aa 100644 --- 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 3161689f7e..3b41974ef4 100644 --- a/bin/check/named-checkconf.html +++ b/bin/check/named-checkconf.html @@ -20,7 +20,9 @@

Synopsis

-

named-checkconf [-h] [-v] [-j] [-t directory] {filename} [-p] [-x] [-z]

+

named-checkconf [-hjvz] [-p + [-x + ]] [-t directory] {filename}

DESCRIPTION

@@ -49,6 +51,16 @@

Print the usage summary and exit.

+
-j
+

+ When loading a zonefile read the journal if it exists. +

+
-p
+

+ Print out the named.conf and included files + in canonical form if no errors were detected. + See also the -x option. +

-t directory

Chroot to directory so that include @@ -60,11 +72,6 @@ Print the version of the named-checkconf program and exit.

-
-p
-

- Print out the named.conf and included files - in canonical form if no errors were detected. -

-x

When printing the configuration files in canonical @@ -80,10 +87,6 @@ Perform a test load of all master zones found in named.conf.

-
-j
-

- When loading a zonefile read the journal if it exists. -

filename

The name of the configuration file to be checked. If not diff --git a/bin/tools/mdig.1 b/bin/tools/mdig.1 index 1301a7fb31..aa3ad121b2 100644 --- 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 ac44ca7fe9..dd63756a54 100644 --- 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.

+
+[no]continue
+

+ Continue on errors (e.g. timeouts). +

+[no]crypto

Toggle the display of cryptographic fields in DNSSEC diff --git a/doc/arm/man.mdig.html b/doc/arm/man.mdig.html index c388808485..81787debd0 100644 --- 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.

+
+[no]continue
+

+ Continue on errors (e.g. timeouts). +

+[no]crypto

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 4e7adddcbd..f60aa5ff4a 100644 --- a/doc/arm/man.named-checkconf.html +++ b/doc/arm/man.named-checkconf.html @@ -38,7 +38,9 @@

Synopsis

-

named-checkconf [-h] [-v] [-j] [-t directory] {filename} [-p] [-x] [-z]

+

named-checkconf [-hjvz] [-p + [-x + ]] [-t directory] {filename}

DESCRIPTION

@@ -67,6 +69,16 @@

Print the usage summary and exit.

+
-j
+

+ When loading a zonefile read the journal if it exists. +

+
-p
+

+ Print out the named.conf and included files + in canonical form if no errors were detected. + See also the -x option. +

-t directory

Chroot to directory so that include @@ -78,11 +90,6 @@ Print the version of the named-checkconf program and exit.

-
-p
-

- Print out the named.conf and included files - in canonical form if no errors were detected. -

-x

When printing the configuration files in canonical @@ -98,10 +105,6 @@ Perform a test load of all master zones found in named.conf.

-
-j
-

- When loading a zonefile read the journal if it exists. -

filename

The name of the configuration file to be checked. If not