From 6a2daddf5b95375668945801f636c8335e300fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Mon, 31 May 2021 11:22:52 +0200
Subject: [PATCH] Regenerate man pages with docutils 0.16

Commit bdb777b2a2e079ce25f567a316e74436f0584029 updated the man pages
to contents produced using:

  - Sphinx 4.0.2
  - sphinx-rtd-theme 0.5.2
  - docutils 0.17.1

However, sphinx-rtd-theme 0.5.2 is incompatible with versions 0.17+ of
the docutils package.  This problem was addressed in the Docker image
used for building man pages by downgrading the docutils package to
version 0.16.

Regenerate the man pages again, this time using:

  - Sphinx 4.0.2
  - sphinx-rtd-theme 0.5.2
  - docutils 0.16

This is necessary to prevent the "docs" GitLab CI job from failing.
---
 doc/arm/requirements.txt        | 1 +
 doc/man/arpaname.1in            | 6 +++---
 doc/man/ddns-confgen.8in        | 6 +++---
 doc/man/delv.1in                | 6 +++---
 doc/man/dig.1in                 | 6 +++---
 doc/man/dnssec-cds.1in          | 6 +++---
 doc/man/dnssec-dsfromkey.1in    | 6 +++---
 doc/man/dnssec-importkey.1in    | 6 +++---
 doc/man/dnssec-keyfromlabel.1in | 6 +++---
 doc/man/dnssec-keygen.1in       | 6 +++---
 doc/man/dnssec-revoke.1in       | 6 +++---
 doc/man/dnssec-settime.1in      | 6 +++---
 doc/man/dnssec-signzone.1in     | 6 +++---
 doc/man/dnssec-verify.1in       | 6 +++---
 doc/man/dnstap-read.1in         | 6 +++---
 doc/man/filter-a.8in            | 6 +++---
 doc/man/filter-aaaa.8in         | 6 +++---
 doc/man/host.1in                | 6 +++---
 doc/man/mdig.1in                | 6 +++---
 doc/man/named-checkconf.1in     | 6 +++---
 doc/man/named-checkzone.1in     | 6 +++---
 doc/man/named-compilezone.1in   | 6 +++---
 doc/man/named-journalprint.1in  | 6 +++---
 doc/man/named-nzd2nzf.1in       | 6 +++---
 doc/man/named-rrchecker.1in     | 6 +++---
 doc/man/named.8in               | 6 +++---
 doc/man/named.conf.5in          | 6 +++---
 doc/man/nsec3hash.1in           | 6 +++---
 doc/man/nslookup.1in            | 6 +++---
 doc/man/nsupdate.1in            | 6 +++---
 doc/man/pkcs11-destroy.1in      | 6 +++---
 doc/man/pkcs11-keygen.1in       | 6 +++---
 doc/man/pkcs11-list.1in         | 6 +++---
 doc/man/pkcs11-tokens.1in       | 6 +++---
 doc/man/rndc-confgen.8in        | 6 +++---
 doc/man/rndc.8in                | 6 +++---
 doc/man/rndc.conf.5in           | 6 +++---
 doc/man/tsig-keygen.8in         | 6 +++---
 38 files changed, 112 insertions(+), 111 deletions(-)

diff --git a/doc/arm/requirements.txt b/doc/arm/requirements.txt
index bf5cf6620d..d2034cb33d 100644
--- a/doc/arm/requirements.txt
+++ b/doc/arm/requirements.txt
@@ -1 +1,2 @@
 Sphinx>=2
+docutils<0.17
diff --git a/doc/man/arpaname.1in b/doc/man/arpaname.1in
index cbad9f527e..53e6d2d5dc 100644
--- a/doc/man/arpaname.1in
+++ b/doc/man/arpaname.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "ARPANAME" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+arpaname \- translate IP addresses to the corresponding ARPA names
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "ARPANAME" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-arpaname \- translate IP addresses to the corresponding ARPA names
 .SH SYNOPSIS
 .sp
 \fBarpaname\fP {\fIipaddress\fP ...}
diff --git a/doc/man/ddns-confgen.8in b/doc/man/ddns-confgen.8in
index 2b297a7828..ab5939d2aa 100644
--- a/doc/man/ddns-confgen.8in
+++ b/doc/man/ddns-confgen.8in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "DDNS-CONFGEN" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+ddns-confgen \- ddns key generation tool
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "DDNS-CONFGEN" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-ddns-confgen \- ddns key generation tool
 .SH SYNOPSIS
 .sp
 \fBtsig\-keygen\fP [\fB\-a\fP algorithm] [\fB\-h\fP] [\fB\-r\fP randomfile] [name]
diff --git a/doc/man/delv.1in b/doc/man/delv.1in
index e115a0b4c2..baab36d879 100644
--- a/doc/man/delv.1in
+++ b/doc/man/delv.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "DELV" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+delv \- DNS lookup and validation utility
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "DELV" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-delv \- DNS lookup and validation utility
 .SH SYNOPSIS
 .sp
 \fBdelv\fP [@server] [ [\fB\-4\fP] | [\fB\-6\fP] ] [\fB\-a\fP anchor\-file] [\fB\-b\fP address] [\fB\-c\fP class] [\fB\-d\fP level] [\fB\-i\fP] [\fB\-m\fP] [\fB\-p\fP port#] [\fB\-q\fP name] [\fB\-t\fP type] [\fB\-x\fP addr] [name] [type] [class] [queryopt...]
diff --git a/doc/man/dig.1in b/doc/man/dig.1in
index 4f01d734f3..bc42c4d543 100644
--- a/doc/man/dig.1in
+++ b/doc/man/dig.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "DIG" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+dig \- DNS lookup utility
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "DIG" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-dig \- DNS lookup utility
 .SH SYNOPSIS
 .sp
 \fBdig\fP [@server] [\fB\-b\fP address] [\fB\-c\fP class] [\fB\-f\fP filename] [\fB\-k\fP filename] [\fB\-m\fP] [\fB\-p\fP port#] [\fB\-q\fP name] [\fB\-t\fP type] [\fB\-v\fP] [\fB\-x\fP addr] [\fB\-y\fP [hmac:]name:key] [ [\fB\-4\fP] | [\fB\-6\fP] ] [name] [type] [class] [queryopt...]
diff --git a/doc/man/dnssec-cds.1in b/doc/man/dnssec-cds.1in
index a890c6b37b..764ccfaab9 100644
--- a/doc/man/dnssec-cds.1in
+++ b/doc/man/dnssec-cds.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "DNSSEC-CDS" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+dnssec-cds \- change DS records for a child zone based on CDS/CDNSKEY
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "DNSSEC-CDS" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-dnssec-cds \- change DS records for a child zone based on CDS/CDNSKEY
 .SH SYNOPSIS
 .sp
 \fBdnssec\-cds\fP [\fB\-a\fP alg...] [\fB\-c\fP class] [\fB\-D\fP] {\fB\-d\fP dsset\-file} {\fB\-f\fP child\-file} [\fB\-i**[extension]] [\fP\-s** start\-time] [\fB\-T\fP ttl] [\fB\-u\fP] [\fB\-v\fP level] [\fB\-V\fP] {domain}
diff --git a/doc/man/dnssec-dsfromkey.1in b/doc/man/dnssec-dsfromkey.1in
index 75684f1ea1..0ed4c57c81 100644
--- a/doc/man/dnssec-dsfromkey.1in
+++ b/doc/man/dnssec-dsfromkey.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "DNSSEC-DSFROMKEY" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+dnssec-dsfromkey \- DNSSEC DS RR generation tool
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "DNSSEC-DSFROMKEY" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-dnssec-dsfromkey \- DNSSEC DS RR generation tool
 .SH SYNOPSIS
 .sp
 \fBdnssec\-dsfromkey\fP [ \fB\-1\fP | \fB\-2\fP | \fB\-a\fP alg ] [ \fB\-C\fP ] [\fB\-T\fP TTL] [\fB\-v\fP level] [\fB\-K\fP directory] {keyfile}
diff --git a/doc/man/dnssec-importkey.1in b/doc/man/dnssec-importkey.1in
index 9809ed7d13..291d07be64 100644
--- a/doc/man/dnssec-importkey.1in
+++ b/doc/man/dnssec-importkey.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "DNSSEC-IMPORTKEY" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+dnssec-importkey \- import DNSKEY records from external systems so they can be managed
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "DNSSEC-IMPORTKEY" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-dnssec-importkey \- import DNSKEY records from external systems so they can be managed
 .SH SYNOPSIS
 .sp
 \fBdnssec\-importkey\fP [\fB\-K\fP directory] [\fB\-L\fP ttl] [\fB\-P\fP date/offset] [\fB\-P\fP sync date/offset] [\fB\-D\fP date/offset] [\fB\-D\fP sync date/offset] [\fB\-h\fP] [\fB\-v\fP level] [\fB\-V\fP] {keyfile}
diff --git a/doc/man/dnssec-keyfromlabel.1in b/doc/man/dnssec-keyfromlabel.1in
index be4104ab01..56d5dc19ef 100644
--- a/doc/man/dnssec-keyfromlabel.1in
+++ b/doc/man/dnssec-keyfromlabel.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "DNSSEC-KEYFROMLABEL" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+dnssec-keyfromlabel \- DNSSEC key generation tool
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "DNSSEC-KEYFROMLABEL" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-dnssec-keyfromlabel \- DNSSEC key generation tool
 .SH SYNOPSIS
 .sp
 \fBdnssec\-keyfromlabel\fP {\fB\-l\fP label} [\fB\-3\fP] [\fB\-a\fP algorithm] [\fB\-A\fP date/offset] [\fB\-c\fP class] [\fB\-D\fP date/offset] [\fB\-D\fP sync date/offset] [\fB\-E\fP engine] [\fB\-f\fP flag] [\fB\-G\fP] [\fB\-I\fP date/offset] [\fB\-i\fP interval] [\fB\-k\fP] [\fB\-K\fP directory] [\fB\-L\fP ttl] [\fB\-n\fP nametype] [\fB\-P\fP date/offset] [\fB\-P\fP sync date/offset] [\fB\-p\fP protocol] [\fB\-R\fP date/offset] [\fB\-S\fP key] [\fB\-t\fP type] [\fB\-v\fP level] [\fB\-V\fP] [\fB\-y\fP] {name}
diff --git a/doc/man/dnssec-keygen.1in b/doc/man/dnssec-keygen.1in
index 22ffe7cd97..057ff3d37f 100644
--- a/doc/man/dnssec-keygen.1in
+++ b/doc/man/dnssec-keygen.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "DNSSEC-KEYGEN" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+dnssec-keygen \- DNSSEC key generation tool
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "DNSSEC-KEYGEN" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-dnssec-keygen \- DNSSEC key generation tool
 .SH SYNOPSIS
 .sp
 \fBdnssec\-keygen\fP [\fB\-3\fP] [\fB\-A\fP date/offset] [\fB\-a\fP algorithm] [\fB\-b\fP keysize] [\fB\-C\fP] [\fB\-c\fP class] [\fB\-D\fP date/offset] [\fB\-d\fP bits] [\fB\-D\fP sync date/offset] [\fB\-E\fP engine] [\fB\-f\fP flag] [\fB\-G\fP] [\fB\-g\fP generator] [\fB\-h\fP] [\fB\-I\fP date/offset] [\fB\-i\fP interval] [\fB\-K\fP directory] [\fB\-k\fP policy] [\fB\-L\fP ttl] [\fB\-l\fP file] [\fB\-n\fP nametype] [\fB\-P\fP date/offset] [\fB\-P\fP sync date/offset] [\fB\-p\fP protocol] [\fB\-q\fP] [\fB\-R\fP date/offset] [\fB\-S\fP key] [\fB\-s\fP strength] [\fB\-T\fP rrtype] [\fB\-t\fP type] [\fB\-V\fP] [\fB\-v\fP level] {name}
diff --git a/doc/man/dnssec-revoke.1in b/doc/man/dnssec-revoke.1in
index 23b11930e5..11c65032e5 100644
--- a/doc/man/dnssec-revoke.1in
+++ b/doc/man/dnssec-revoke.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "DNSSEC-REVOKE" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+dnssec-revoke \- set the REVOKED bit on a DNSSEC key
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "DNSSEC-REVOKE" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-dnssec-revoke \- set the REVOKED bit on a DNSSEC key
 .SH SYNOPSIS
 .sp
 \fBdnssec\-revoke\fP [\fB\-hr\fP] [\fB\-v\fP level] [\fB\-V\fP] [\fB\-K\fP directory] [\fB\-E\fP engine] [\fB\-f\fP] [\fB\-R\fP] {keyfile}
diff --git a/doc/man/dnssec-settime.1in b/doc/man/dnssec-settime.1in
index e2957360cf..32ae197b54 100644
--- a/doc/man/dnssec-settime.1in
+++ b/doc/man/dnssec-settime.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "DNSSEC-SETTIME" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+dnssec-settime \- set the key timing metadata for a DNSSEC key
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "DNSSEC-SETTIME" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-dnssec-settime \- set the key timing metadata for a DNSSEC key
 .SH SYNOPSIS
 .sp
 \fBdnssec\-settime\fP [\fB\-f\fP] [\fB\-K\fP directory] [\fB\-L\fP ttl] [\fB\-P\fP date/offset] [\fB\-P\fP ds date/offset] [\fB\-P\fP sync date/offset] [\fB\-A\fP date/offset] [\fB\-R\fP date/offset] [\fB\-I\fP date/offset] [\fB\-D\fP date/offset] [\fB\-D\fP ds date/offset] [\fB\-D\fP sync date/offset] [\fB\-S\fP key] [\fB\-i\fP interval] [\fB\-h\fP] [\fB\-V\fP] [\fB\-v\fP level] [\fB\-E\fP engine] {keyfile} [\fB\-s\fP] [\fB\-g\fP state] [\fB\-d\fP state date/offset] [\fB\-k\fP state date/offset] [\fB\-r\fP state date/offset] [\fB\-z\fP state date/offset]
diff --git a/doc/man/dnssec-signzone.1in b/doc/man/dnssec-signzone.1in
index 7e44689089..e999d2d1fc 100644
--- a/doc/man/dnssec-signzone.1in
+++ b/doc/man/dnssec-signzone.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "DNSSEC-SIGNZONE" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+dnssec-signzone \- DNSSEC zone signing tool
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "DNSSEC-SIGNZONE" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-dnssec-signzone \- DNSSEC zone signing tool
 .SH SYNOPSIS
 .sp
 \fBdnssec\-signzone\fP [\fB\-a\fP] [\fB\-c\fP class] [\fB\-d\fP directory] [\fB\-D\fP] [\fB\-E\fP engine] [\fB\-e\fP end\-time] [\fB\-f\fP output\-file] [\fB\-g\fP] [\fB\-h\fP] [\fB\-i\fP interval] [\fB\-I\fP input\-format] [\fB\-j\fP jitter] [\fB\-K\fP directory] [\fB\-k\fP key] [\fB\-L\fP serial] [\fB\-M\fP maxttl] [\fB\-N\fP soa\-serial\-format] [\fB\-o\fP origin] [\fB\-O\fP output\-format] [\fB\-P\fP] [\fB\-Q\fP] [\fB\-q\fP] [\fB\-R\fP] [\fB\-S\fP] [\fB\-s\fP start\-time] [\fB\-T\fP ttl] [\fB\-t\fP] [\fB\-u\fP] [\fB\-v\fP level] [\fB\-V\fP] [\fB\-X\fP extended end\-time] [\fB\-x\fP] [\fB\-z\fP] [\fB\-3\fP salt] [\fB\-H\fP iterations] [\fB\-A\fP] {zonefile} [key...]
diff --git a/doc/man/dnssec-verify.1in b/doc/man/dnssec-verify.1in
index 37f633ab08..8d61ef690b 100644
--- a/doc/man/dnssec-verify.1in
+++ b/doc/man/dnssec-verify.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "DNSSEC-VERIFY" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+dnssec-verify \- DNSSEC zone verification tool
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "DNSSEC-VERIFY" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-dnssec-verify \- DNSSEC zone verification tool
 .SH SYNOPSIS
 .sp
 \fBdnssec\-verify\fP [\fB\-c\fP class] [\fB\-E\fP engine] [\fB\-I\fP input\-format] [\fB\-o\fP origin] [\fB\-q\fP] [\fB\-v\fP level] [\fB\-V\fP] [\fB\-x\fP] [\fB\-z\fP] {zonefile}
diff --git a/doc/man/dnstap-read.1in b/doc/man/dnstap-read.1in
index 6984f2aea3..fc25109071 100644
--- a/doc/man/dnstap-read.1in
+++ b/doc/man/dnstap-read.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "DNSTAP-READ" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+dnstap-read \- print dnstap data in human-readable form
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "DNSTAP-READ" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-dnstap-read \- print dnstap data in human-readable form
 .SH SYNOPSIS
 .sp
 \fBdnstap\-read\fP [\fB\-m\fP] [\fB\-p\fP] [\fB\-x\fP] [\fB\-y\fP] {file}
diff --git a/doc/man/filter-a.8in b/doc/man/filter-a.8in
index 1656ca09c7..6e38500e72 100644
--- a/doc/man/filter-a.8in
+++ b/doc/man/filter-a.8in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "FILTER-A" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+filter-a \- filter A in DNS responses when AAAA is present
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "FILTER-A" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-filter-a \- filter A in DNS responses when AAAA is present
 .SH SYNOPSIS
 .sp
 \fBplugin query\fP "filter\-a.so" [{ parameters }];
diff --git a/doc/man/filter-aaaa.8in b/doc/man/filter-aaaa.8in
index 021e8bdbe7..579d73cb8f 100644
--- a/doc/man/filter-aaaa.8in
+++ b/doc/man/filter-aaaa.8in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "FILTER-AAAA" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+filter-aaaa \- filter AAAA in DNS responses when A is present
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "FILTER-AAAA" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-filter-aaaa \- filter AAAA in DNS responses when A is present
 .SH SYNOPSIS
 .sp
 \fBplugin query\fP "filter\-aaaa.so" [{ parameters }];
diff --git a/doc/man/host.1in b/doc/man/host.1in
index 89bdf531fe..627c3832b9 100644
--- a/doc/man/host.1in
+++ b/doc/man/host.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "HOST" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+host \- DNS lookup utility
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "HOST" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-host \- DNS lookup utility
 .SH SYNOPSIS
 .sp
 \fBhost\fP [\fB\-aACdlnrsTUwv\fP] [\fB\-c\fP class] [\fB\-N\fP ndots] [\fB\-p\fP port] [\fB\-R\fP number] [\fB\-t\fP type] [\fB\-W\fP wait] [\fB\-m\fP flag] [ [\fB\-4\fP] | [\fB\-6\fP] ] [\fB\-v\fP] [\fB\-V\fP] {name} [server]
diff --git a/doc/man/mdig.1in b/doc/man/mdig.1in
index 844f9469fd..405d50fc82 100644
--- a/doc/man/mdig.1in
+++ b/doc/man/mdig.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "MDIG" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+mdig \- DNS pipelined lookup utility
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "MDIG" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-mdig \- DNS pipelined lookup utility
 .SH SYNOPSIS
 .sp
 \fBmdig\fP \fI\%{@server\fP} [\fB\-f\fP filename] [\fB\-h\fP] [\fB\-v\fP] [ [\fB\-4\fP] | [\fB\-6\fP] ] [\fB\-m\fP] [\fB\-b\fP address] [\fB\-p\fP port#] [\fB\-c\fP class] [\fB\-t\fP type] [\fB\-i\fP] [\fB\-x\fP addr] [plusopt...]
diff --git a/doc/man/named-checkconf.1in b/doc/man/named-checkconf.1in
index bd278f6827..6d65a033c2 100644
--- a/doc/man/named-checkconf.1in
+++ b/doc/man/named-checkconf.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "NAMED-CHECKCONF" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+named-checkconf \- named configuration file syntax checking tool
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "NAMED-CHECKCONF" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-named-checkconf \- named configuration file syntax checking tool
 .SH SYNOPSIS
 .sp
 \fBnamed\-checkconf\fP [\fB\-chjlvz\fP] [\fB\-p\fP [\fB\-x\fP ]] [\fB\-t\fP directory] {filename}
diff --git a/doc/man/named-checkzone.1in b/doc/man/named-checkzone.1in
index 8a89574ca6..95a9ef8ebc 100644
--- a/doc/man/named-checkzone.1in
+++ b/doc/man/named-checkzone.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "NAMED-CHECKZONE" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+named-checkzone \- zone file validity checking or converting tool
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "NAMED-CHECKZONE" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-named-checkzone \- zone file validity checking or converting tool
 .SH SYNOPSIS
 .sp
 \fBnamed\-checkzone\fP [\fB\-d\fP] [\fB\-h\fP] [\fB\-j\fP] [\fB\-q\fP] [\fB\-v\fP] [\fB\-c\fP class] [\fB\-f\fP format] [\fB\-F\fP format] [\fB\-J\fP filename] [\fB\-i\fP mode] [\fB\-k\fP mode] [\fB\-m\fP mode] [\fB\-M\fP mode] [\fB\-n\fP mode] [\fB\-l\fP ttl] [\fB\-L\fP serial] [\fB\-o\fP filename] [\fB\-r\fP mode] [\fB\-s\fP style] [\fB\-S\fP mode] [\fB\-t\fP directory] [\fB\-T\fP mode] [\fB\-w\fP directory] [\fB\-D\fP] [\fB\-W\fP mode] {zonename} {filename}
diff --git a/doc/man/named-compilezone.1in b/doc/man/named-compilezone.1in
index 100f9bdf5a..8ac29f999f 100644
--- a/doc/man/named-compilezone.1in
+++ b/doc/man/named-compilezone.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "NAMED-COMPILEZONE" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+named-compilezone \- zone file validity checking or converting tool
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "NAMED-COMPILEZONE" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-named-compilezone \- zone file validity checking or converting tool
 .SH SYNOPSIS
 .sp
 \fBnamed\-checkzone\fP [\fB\-d\fP] [\fB\-h\fP] [\fB\-j\fP] [\fB\-q\fP] [\fB\-v\fP] [\fB\-c\fP class] [\fB\-f\fP format] [\fB\-F\fP format] [\fB\-J\fP filename] [\fB\-i\fP mode] [\fB\-k\fP mode] [\fB\-m\fP mode] [\fB\-M\fP mode] [\fB\-n\fP mode] [\fB\-l\fP ttl] [\fB\-L\fP serial] [\fB\-o\fP filename] [\fB\-r\fP mode] [\fB\-s\fP style] [\fB\-S\fP mode] [\fB\-t\fP directory] [\fB\-T\fP mode] [\fB\-w\fP directory] [\fB\-D\fP] [\fB\-W\fP mode] {zonename} {filename}
diff --git a/doc/man/named-journalprint.1in b/doc/man/named-journalprint.1in
index fbc286dcab..8b4c7c6929 100644
--- a/doc/man/named-journalprint.1in
+++ b/doc/man/named-journalprint.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "NAMED-JOURNALPRINT" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+named-journalprint \- print zone journal in human-readable form
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "NAMED-JOURNALPRINT" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-named-journalprint \- print zone journal in human-readable form
 .SH SYNOPSIS
 .sp
 \fBnamed\-journalprint\fP [\-c serial] [\fB\-dux\fP] {journal}
diff --git a/doc/man/named-nzd2nzf.1in b/doc/man/named-nzd2nzf.1in
index 63c30d76ff..f52b93f012 100644
--- a/doc/man/named-nzd2nzf.1in
+++ b/doc/man/named-nzd2nzf.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "NAMED-NZD2NZF" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+named-nzd2nzf \- convert an NZD database to NZF text format
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "NAMED-NZD2NZF" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-named-nzd2nzf \- convert an NZD database to NZF text format
 .SH SYNOPSIS
 .sp
 \fBnamed\-nzd2nzf\fP {filename}
diff --git a/doc/man/named-rrchecker.1in b/doc/man/named-rrchecker.1in
index 2f9413592f..1c6f7ab818 100644
--- a/doc/man/named-rrchecker.1in
+++ b/doc/man/named-rrchecker.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "NAMED-RRCHECKER" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+named-rrchecker \- syntax checker for individual DNS resource records
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "NAMED-RRCHECKER" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-named-rrchecker \- syntax checker for individual DNS resource records
 .SH SYNOPSIS
 .sp
 \fBnamed\-rrchecker\fP [\fB\-h\fP] [\fB\-o\fP origin] [\fB\-p\fP] [\fB\-u\fP] [\fB\-C\fP] [\fB\-T\fP] [\fB\-P\fP]
diff --git a/doc/man/named.8in b/doc/man/named.8in
index 19a12af21b..c5d81eac5c 100644
--- a/doc/man/named.8in
+++ b/doc/man/named.8in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "NAMED" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+named \- Internet domain name server
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "NAMED" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-named \- Internet domain name server
 .SH SYNOPSIS
 .sp
 \fBnamed\fP [ [\fB\-4\fP] | [\fB\-6\fP] ] [\fB\-c\fP config\-file] [\fB\-d\fP debug\-level] [\fB\-D\fP string] [\fB\-E\fP engine\-name] [\fB\-f\fP] [\fB\-g\fP] [\fB\-L\fP logfile] [\fB\-M\fP option] [\fB\-m\fP flag] [\fB\-n\fP #cpus] [\fB\-p\fP port] [\fB\-s\fP] [\fB\-S\fP #max\-socks] [\fB\-t\fP directory] [\fB\-U\fP #listeners] [\fB\-u\fP user] [\fB\-v\fP] [\fB\-V\fP] [\fB\-X\fP lock\-file] [\fB\-x\fP cache\-file]
diff --git a/doc/man/named.conf.5in b/doc/man/named.conf.5in
index 30bd87a9d1..5a311c30db 100644
--- a/doc/man/named.conf.5in
+++ b/doc/man/named.conf.5in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "NAMED.CONF" "5" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+named.conf \- configuration file for **named**
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "NAMED.CONF" "5" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-named.conf \- configuration file for **named**
 .SH SYNOPSIS
 .sp
 \fBnamed.conf\fP
diff --git a/doc/man/nsec3hash.1in b/doc/man/nsec3hash.1in
index 3ee19be810..88cc9030ff 100644
--- a/doc/man/nsec3hash.1in
+++ b/doc/man/nsec3hash.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "NSEC3HASH" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+nsec3hash \- generate NSEC3 hash
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "NSEC3HASH" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-nsec3hash \- generate NSEC3 hash
 .SH SYNOPSIS
 .sp
 \fBnsec3hash\fP {salt} {algorithm} {iterations} {domain}
diff --git a/doc/man/nslookup.1in b/doc/man/nslookup.1in
index 57d5577b54..2540113ea3 100644
--- a/doc/man/nslookup.1in
+++ b/doc/man/nslookup.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "NSLOOKUP" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+nslookup \- query Internet name servers interactively
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "NSLOOKUP" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-nslookup \- query Internet name servers interactively
 .SH SYNOPSIS
 .sp
 \fBnslookup\fP [\-option] [name | \-] [server]
diff --git a/doc/man/nsupdate.1in b/doc/man/nsupdate.1in
index 86ad7c373f..08f6049b4f 100644
--- a/doc/man/nsupdate.1in
+++ b/doc/man/nsupdate.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "NSUPDATE" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+nsupdate \- dynamic DNS update utility
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "NSUPDATE" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-nsupdate \- dynamic DNS update utility
 .SH SYNOPSIS
 .sp
 \fBnsupdate\fP [\fB\-d\fP] [\fB\-D\fP] [\fB\-i\fP] [\fB\-L\fP level] [ [\fB\-g\fP] | [\fB\-o\fP] | [\fB\-l\fP] | [\fB\-y\fP [hmac:]keyname:secret] | [\fB\-k\fP keyfile] ] [\fB\-t\fP timeout] [\fB\-u\fP udptimeout] [\fB\-r\fP udpretries] [\fB\-v\fP] [\fB\-T\fP] [\fB\-P\fP] [\fB\-V\fP] [ [\fB\-4\fP] | [\fB\-6\fP] ] [filename]
diff --git a/doc/man/pkcs11-destroy.1in b/doc/man/pkcs11-destroy.1in
index 92fa3fee43..5e9d2f50e2 100644
--- a/doc/man/pkcs11-destroy.1in
+++ b/doc/man/pkcs11-destroy.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "PKCS11-DESTROY" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+pkcs11-destroy \- destroy PKCS#11 objects
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PKCS11-DESTROY" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-pkcs11-destroy \- destroy PKCS#11 objects
 pkcs11\-destroy \- destroy PKCS#11 objects
 .sp
 \fBpkcs11\-destroy\fP [\fB\-m\fP module] [\fB\-s\fP slot] [\fB\-i\fP ID] [\fB\-l\fP label] [\fB\-p\fP PIN] [\fB\-w\fP seconds]
diff --git a/doc/man/pkcs11-keygen.1in b/doc/man/pkcs11-keygen.1in
index 981ca60b64..aa9177ab81 100644
--- a/doc/man/pkcs11-keygen.1in
+++ b/doc/man/pkcs11-keygen.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "PKCS11-KEYGEN" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+pkcs11-keygen \- generate keys on a PKCS#11 device
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PKCS11-KEYGEN" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-pkcs11-keygen \- generate keys on a PKCS#11 device
 .SH SYNOPSIS
 .sp
 \fBpkcs11\-keygen\fP [\fB\-a\fP algorithm] [\fB\-b\fP keysize] [\fB\-e\fP] [\fB\-i\fP id] [\fB\-m\fP module] [\fB\-P\fP] [\fB\-p\fP PIN] [\fB\-q\fP] [\fB\-S\fP] [\fB\-s\fP slot] label
diff --git a/doc/man/pkcs11-list.1in b/doc/man/pkcs11-list.1in
index c6ebb05899..19e12f3f85 100644
--- a/doc/man/pkcs11-list.1in
+++ b/doc/man/pkcs11-list.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "PKCS11-LIST" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+pkcs11-list \- list PKCS#11 objects
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PKCS11-LIST" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-pkcs11-list \- list PKCS#11 objects
 .sp
 \fBpkcs11\-list\fP [\fB\-P\fP] [\fB\-m\fP module] [\fB\-s\fP slot] [\fB\-i\fP ID \fB] [\-l\fP label] [\fB\-p\fP PIN]
 .SH DESCRIPTION
diff --git a/doc/man/pkcs11-tokens.1in b/doc/man/pkcs11-tokens.1in
index 32228d27cf..a83c7bfa59 100644
--- a/doc/man/pkcs11-tokens.1in
+++ b/doc/man/pkcs11-tokens.1in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "PKCS11-TOKENS" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+pkcs11-tokens \- list PKCS#11 available tokens
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PKCS11-TOKENS" "1" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-pkcs11-tokens \- list PKCS#11 available tokens
 .SH SYNOPSIS
 .sp
 \fBpkcs11\-tokens\fP [\fB\-m\fP module] [\fB\-v\fP]
diff --git a/doc/man/rndc-confgen.8in b/doc/man/rndc-confgen.8in
index 730bcc981c..287af1dcfa 100644
--- a/doc/man/rndc-confgen.8in
+++ b/doc/man/rndc-confgen.8in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "RNDC-CONFGEN" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+rndc-confgen \- rndc key generation tool
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "RNDC-CONFGEN" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-rndc-confgen \- rndc key generation tool
 .SH SYNOPSIS
 .sp
 \fBrndc\-confgen\fP [\fB\-a\fP] [\fB\-A\fP algorithm] [\fB\-b\fP keysize] [\fB\-c\fP keyfile] [\fB\-h\fP] [\fB\-k\fP keyname] [\fB\-p\fP port] [\fB\-s\fP address] [\fB\-t\fP chrootdir] [\fB\-u\fP user]
diff --git a/doc/man/rndc.8in b/doc/man/rndc.8in
index e4027c4a28..a17124ee7e 100644
--- a/doc/man/rndc.8in
+++ b/doc/man/rndc.8in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "RNDC" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+rndc \- name server control utility
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "RNDC" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-rndc \- name server control utility
 .SH SYNOPSIS
 .sp
 \fBrndc\fP [\fB\-b\fP source\-address] [\fB\-c\fP config\-file] [\fB\-k\fP key\-file] [\fB\-s\fP server] [\fB\-p\fP port] [\fB\-q\fP] [\fB\-r\fP] [\fB\-V\fP] [\fB\-y\fP key_id] [[\fB\-4\fP] | [\fB\-6\fP]] {command}
diff --git a/doc/man/rndc.conf.5in b/doc/man/rndc.conf.5in
index 6cc58f9103..515d1928bd 100644
--- a/doc/man/rndc.conf.5in
+++ b/doc/man/rndc.conf.5in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "RNDC.CONF" "5" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+rndc.conf \- rndc configuration file
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "RNDC.CONF" "5" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-rndc.conf \- rndc configuration file
 .SH SYNOPSIS
 .sp
 \fBrndc.conf\fP
diff --git a/doc/man/tsig-keygen.8in b/doc/man/tsig-keygen.8in
index 65824594ff..7ec840c2db 100644
--- a/doc/man/tsig-keygen.8in
+++ b/doc/man/tsig-keygen.8in
@@ -1,5 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
+.TH "TSIG-KEYGEN" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
+.SH NAME
+tsig-keygen \- TSIG key generation tool
 .
 .nr rst2man-indent-level 0
 .
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "TSIG-KEYGEN" "8" "@RELEASE_DATE@" "@PACKAGE_VERSION@" "BIND 9"
-.SH NAME
-tsig-keygen \- TSIG key generation tool
 .SH SYNOPSIS
 .sp
 \fBtsig\-keygen\fP [\fB\-a\fP algorithm] [\fB\-h\fP] [\fB\-r\fP randomfile] [name]