diff --git a/bin/check/named-checkconf.8 b/bin/check/named-checkconf.8 index cab8e22f8a..07c3033c31 100644 --- a/bin/check/named-checkconf.8 +++ b/bin/check/named-checkconf.8 @@ -1,4 +1,4 @@ -.\" Copyright (C) 2004, 2005, 2007, 2009, 2014, 2015 Internet Systems Consortium, Inc. ("ISC") +.\" Copyright (C) 2004, 2005, 2007, 2009, 2014-2016 Internet Systems Consortium, Inc. ("ISC") .\" Copyright (C) 2000-2002 Internet Software Consortium. .\" .\" Permission to use, copy, modify, and/or distribute this software for any @@ -48,7 +48,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 @@ -78,11 +78,26 @@ 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 directory -so that include directives in the configuration file are processed as if run by a similarly chrooted named\&. +so that include directives in the configuration file are processed as if run by a similarly chrooted +\fBnamed\fR\&. .RE .PP \-v @@ -92,13 +107,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 @@ -113,11 +121,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 @@ -137,7 +140,7 @@ BIND 9 Administrator Reference Manual\&. \fBInternet Systems Consortium, Inc\&.\fR .SH "COPYRIGHT" .br -Copyright \(co 2004, 2005, 2007, 2009, 2014, 2015 Internet Systems Consortium, Inc. ("ISC") +Copyright \(co 2004, 2005, 2007, 2009, 2014-2016 Internet Systems Consortium, Inc. ("ISC") .br Copyright \(co 2000-2002 Internet Software Consortium. .br diff --git a/bin/check/named-checkconf.html b/bin/check/named-checkconf.html index 4537bc58da..a43900ce0c 100644 --- a/bin/check/named-checkconf.html +++ b/bin/check/named-checkconf.html @@ -1,6 +1,6 @@