diff --git a/bin/tools/dnstap-read.1 b/bin/tools/dnstap-read.1
index c715545350..496b9cb643 100644
--- a/bin/tools/dnstap-read.1
+++ b/bin/tools/dnstap-read.1
@@ -1,31 +1,21 @@
-.\" Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC")
-.\"
-.\" Permission to use, copy, modify, and/or distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-.\" PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $Id$
+.\" Copyright (C) 2015, 2016 Internet Systems Consortium, Inc. ("ISC")
+.\"
+.\" This Source Code Form is subject to the terms of the Mozilla Public
+.\" License, v. 2.0. If a copy of the MPL was not distributed with this
+.\" file, You can obtain one at http://mozilla.org/MPL/2.0/.
.\"
.hy 0
.ad l
'\" t
.\" Title: dnstap-read
-.\" Author: [see the "AUTHOR" section]
+.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: September 13, 2015
+.\" Date: 2015-09-13
.\" Manual: BIND9
-.\" Source: BIND9
+.\" Source: ISC
.\" Language: English
.\"
-.TH "DNSTAP\-READ" "1" "September 13, 2015" "BIND9" "BIND9"
+.TH "DNSTAP\-READ" "1" "2015\-09\-13" "ISC" "BIND9"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -48,7 +38,7 @@
.SH "NAME"
dnstap-read \- print dnstap data in human\-readable form
.SH "SYNOPSIS"
-.HP 12
+.HP \w'\fBdnstap\-read\fR\ 'u
\fBdnstap\-read\fR [\fB\-m\fR] [\fB\-p\fR] [\fB\-y\fR] {\fIfile\fR}
.SH "DESCRIPTION"
.PP
@@ -90,8 +80,8 @@ data in a detailed YAML format\&. Implies
BIND 9 Administrator Reference Manual\&.
.SH "AUTHOR"
.PP
-Internet Systems Consortium
+\fBInternet Systems Consortium, Inc\&.\fR
.SH "COPYRIGHT"
.br
-Copyright \(co 2015 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2015, 2016 Internet Systems Consortium, Inc. ("ISC")
.br
diff --git a/bin/tools/dnstap-read.html b/bin/tools/dnstap-read.html
index 52d4ce57ef..406c804680 100644
--- a/bin/tools/dnstap-read.html
+++ b/bin/tools/dnstap-read.html
@@ -1,20 +1,10 @@
-
-
@@ -31,8 +21,8 @@
Synopsis
dnstap-read
[-m
] [-p
] [-y
] {file
}
-
-
DESCRIPTION
+
+
DESCRIPTION
dnstap-read
reads dnstap data from a specified file
@@ -42,8 +32,8 @@
then a longer and more detailed YAML format is used instead.
-
-
OPTIONS
+
-
-
SEE ALSO
+
+
SEE ALSO
named(8),
nsupdate(8),
BIND 9 Administrator Reference Manual.
-
-
AUTHOR
-
Internet Systems Consortium
-
-
diff --git a/bin/tools/named-nzd2nzf.8 b/bin/tools/named-nzd2nzf.8
index e69de29bb2..3d5ee0ec6e 100644
--- a/bin/tools/named-nzd2nzf.8
+++ b/bin/tools/named-nzd2nzf.8
@@ -0,0 +1,66 @@
+.\"
+.\" This Source Code Form is subject to the terms of the Mozilla Public
+.\" License, v. 2.0. If a copy of the MPL was not distributed with this
+.\" file, You can obtain one at http://mozilla.org/MPL/2.0/.
+.\"
+.hy 0
+.ad l
+'\" t
+.\" Title: named-nzd2nzf
+.\" Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.78.1
+.\" Date: May 5, 2016
+.\" Manual: BIND9
+.\" Source: BIND9
+.\" Language: English
+.\"
+.TH "NAMED\-NZD2NZF" "8" "May 5, 2016" "BIND9" "BIND9"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+named-nzd2nzf \- Convert an NZD database to NZF text format
+.SH "SYNOPSIS"
+.HP \w'\fBnamed\-nzd2nzf\fR\ 'u
+\fBnamed\-nzd2nzf\fR {filename}
+.SH "DESCRIPTION"
+.PP
+\fBnamed\-nzd2nzf\fR
+converts an NZD database to NZF format and prints it to standard output\&. This can be used to review the configuration of zones that were added to
+\fBnamed\fR
+via
+\fBrndc addzone\fR\&. It can also be used to restore the old file format when rolling back from a newer version of BIND to an older version\&.
+.SH "ARGUMENTS"
+.PP
+filename
+.RS 4
+The name of the
+\&.nzd
+file whose contents should be printed\&.
+.RE
+.SH "SEE ALSO"
+.PP
+BIND 9 Administrator Reference Manual,
+.SH "AUTHOR"
+.PP
+Internet Systems Consortium
+.SH "COPYRIGHT"
+.br
+Copyright \(co 2016 Internet Systems Consortium, Inc. ("ISC")
+.br
diff --git a/bin/tools/named-nzd2nzf.html b/bin/tools/named-nzd2nzf.html
index e69de29bb2..3ce654a7bf 100644
--- a/bin/tools/named-nzd2nzf.html
+++ b/bin/tools/named-nzd2nzf.html
@@ -0,0 +1,83 @@
+
+
+
+
+
named-nzd2nzf
+
+
+
+
+
+
+
+
+
+
Name
+
+ named-nzd2nzf
+ —
+ Convert an NZD database to NZF text format
+
+
+
+
+
+
+
+
Synopsis
+
+ named-nzd2nzf
+ {filename}
+
+
+
+
+
DESCRIPTION
+
+
+ named-nzd2nzf converts an NZD database to NZF
+ format and prints it to standard output. This can be used to
+ review the configuration of zones that were added to
+ named via rndc addzone.
+ It can also be used to restore the old file format
+ when rolling back from a newer version
+ of BIND to an older version.
+
+
+
+
+
ARGUMENTS
+
+
+- filename
+-
+
+ The name of the .nzd
file whose contents
+ should be printed.
+
+
+
+
+
+
+
SEE ALSO
+
+
+ BIND 9 Administrator Reference Manual,
+
+
+
+
+
AUTHOR
+
+
Internet Systems Consortium
+
+
+
+
+