diff --git a/doc/man/ddns-confgen.8in b/doc/man/ddns-confgen.8in
index fe0d8431e7..625859a82c 100644
--- a/doc/man/ddns-confgen.8in
+++ b/doc/man/ddns-confgen.8in
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "DDNS-CONFGEN" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.TH "DDNS-CONFGEN" "8" "@RELEASE_DATE@" "@BIND9_VERSION@" "BIND 9"
 .SH NAME
 ddns-confgen \- ddns key generation tool
 .
@@ -32,7 +32,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 ..
 .SH SYNOPSIS
 .sp
-\fBtsig\-keygen\fP [\fB\-a\fP algorithm] [\fB\-h\fP] [\fB\-r\fP randomfile] [\fB\-s\fP name]
+\fBtsig\-keygen\fP [\fB\-a\fP algorithm] [\fB\-h\fP] [\fB\-r\fP randomfile] [name]
 .sp
 \fBddns\-confgen\fP [\fB\-a\fP algorithm] [\fB\-h\fP] [\fB\-k\fP keyname] [\fB\-q\fP] [\fB\-r\fP randomfile] [\fB\-s\fP name] [\fB\-z\fP zone]
 .SH DESCRIPTION
@@ -43,57 +43,57 @@ can be used, for example, to secure dynamic DNS updates to a zone or for
 the \fBrndc\fP command channel.
 .sp
 When run as \fBtsig\-keygen\fP, a domain name can be specified on the
-command line to be used as the name of the generated key. If no
+command line which will be used as the name of the generated key. If no
 name is specified, the default is \fBtsig\-key\fP\&.
 .sp
 When run as \fBddns\-confgen\fP, the generated key is accompanied by
 configuration text and instructions that can be used with \fBnsupdate\fP
 and \fBnamed\fP when setting up dynamic DNS, including an example
-\fBupdate\-policy\fP statement. (This usage is similar to the \fBrndc\-confgen\fP
-command for setting up command\-channel security.)
+\fBupdate\-policy\fP statement. (This usage similar to the \fBrndc\-confgen\fP
+command for setting up command channel security.)
 .sp
 Note that \fBnamed\fP itself can configure a local DDNS key for use with
-\fBnsupdate \-l\fP; it does this when a zone is configured with
+\fBnsupdate \-l\fP: it does this when a zone is configured with
 \fBupdate\-policy local;\fP\&. \fBddns\-confgen\fP is only needed when a more
 elaborate configuration is required: for instance, if \fBnsupdate\fP is to
 be used from a remote system.
 .SH OPTIONS
 .INDENT 0.0
 .TP
-.B \fB\-a algorithm\fP
-This option specifies the algorithm to use for the TSIG key. Available choices
-are: hmac\-md5, hmac\-sha1, hmac\-sha224, hmac\-sha256, hmac\-sha384, and
+\fB\-a\fP algorithm
+Specifies the algorithm to use for the TSIG key. Available choices
+are: hmac\-md5, hmac\-sha1, hmac\-sha224, hmac\-sha256, hmac\-sha384 and
 hmac\-sha512. The default is hmac\-sha256. Options are
 case\-insensitive, and the "hmac\-" prefix may be omitted.
 .TP
-.B \fB\-h\fP
-This option prints a short summary of options and arguments.
+\fB\-h\fP
+Prints a short summary of options and arguments.
 .TP
-.B \fB\-k keyname\fP
-This option specifies the key name of the DDNS authentication key. The default is
+\fB\-k\fP keyname
+Specifies the key name of the DDNS authentication key. The default is
 \fBddns\-key\fP when neither the \fB\-s\fP nor \fB\-z\fP option is specified;
 otherwise, the default is \fBddns\-key\fP as a separate label followed
 by the argument of the option, e.g., \fBddns\-key.example.com.\fP The
 key name must have the format of a valid domain name, consisting of
-letters, digits, hyphens, and periods.
+letters, digits, hyphens and periods.
 .TP
-.B \fB\-q\fP (\fBddns\-confgen\fP only)
-This option enables quiet mode, which prints only the key, with no
-explanatory text or usage examples. This is essentially identical to
+\fB\-q\fP
+(\fBddns\-confgen\fP only.) Quiet mode: Print only the key, with no
+explanatory text or usage examples; This is essentially identical to
 \fBtsig\-keygen\fP\&.
 .TP
-.B \fB\-s name\fP (\fBddns\-confgen\fP only)
-This option generates a configuration example to allow
+\fB\-s\fP name
+(\fBddns\-confgen\fP only.) Generate configuration example to allow
 dynamic updates of a single hostname. The example \fBnamed.conf\fP text
 shows how to set an update policy for the specified name using the
-"name" nametype. The default key name is \fBddns\-key.name\fP\&. Note that the
+"name" nametype. The default key name is ddns\-key.name. Note that the
 "self" nametype cannot be used, since the name to be updated may
 differ from the key name. This option cannot be used with the \fB\-z\fP
 option.
 .TP
-.B \fB\-z zone\fP (\fBddns\-confgen\fP only)
-This option generates a configuration example to allow
-dynamic updates of a zone. The example \fBnamed.conf\fP text shows how
+\fB\-z\fP zone
+(\fBddns\-confgen\fP only.) Generate configuration example to allow
+dynamic updates of a zone: The example \fBnamed.conf\fP text shows how
 to set an update policy for the specified zone using the "zonesub"
 nametype, allowing updates to all subdomain names within that zone.
 This option cannot be used with the \fB\-s\fP option.