From 7196a64fdf94bb0b3eae9c5477eda1d34c4abf27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 29 Jun 2020 19:37:18 +0200 Subject: [PATCH 1/2] Add missing rndc.conf header that was breaking manpages section The rndc.conf main header was missing the header markup and that was breaking the TOC for all manpages in the ARM because sphinx-build incorrectly remembered the markup for subheader to be ~~~~ instead of ----. (cherry picked from commit 5c56a0ddbcf3f0aae5ef35704334732126d1b3b9) --- bin/rndc/rndc.conf.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/rndc/rndc.conf.rst b/bin/rndc/rndc.conf.rst index 8cbdcd025b..60c782b9d9 100644 --- a/bin/rndc/rndc.conf.rst +++ b/bin/rndc/rndc.conf.rst @@ -24,6 +24,7 @@ .. _man_rndc.conf: rndc.conf - rndc configuration file +----------------------------------- Synopsis ~~~~~~~~ From 9d876eccd345d5165de1821521d7a22b371018a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 29 Jun 2020 19:39:03 +0200 Subject: [PATCH 2/2] Fix miscellaneous little bugs in RST formatting (cherry picked from commit b51d10608e6281ea8d1a39463f6c5d0af8395289) --- bin/dig/dig.rst | 2 +- doc/arm/general.rst | 4 +-- doc/arm/index.rst | 1 - doc/arm/manpages.rst | 72 +++++++++++++++++++++---------------------- doc/arm/reference.rst | 2 +- 5 files changed, 40 insertions(+), 41 deletions(-) diff --git a/bin/dig/dig.rst b/bin/dig/dig.rst index 3c899ceebc..f1d57430e4 100644 --- a/bin/dig/dig.rst +++ b/bin/dig/dig.rst @@ -24,7 +24,7 @@ .. _man_dig: dig - DNS lookup utility ----------------------------------- +------------------------ Synopsis ~~~~~~~~ diff --git a/doc/arm/general.rst b/doc/arm/general.rst index bca2c0bc6d..dbd52d4ec9 100644 --- a/doc/arm/general.rst +++ b/doc/arm/general.rst @@ -533,7 +533,7 @@ RFCs No Longer Supported in BIND 9 (DNS).* March 1999. Notes -^^^^^ +~~~~~ [1] Queries to zones that have failed to load return SERVFAIL rather than a non-authoritative response. This is considered a feature. @@ -576,7 +576,7 @@ server is under attack or there is stale/bogus authoritative data. [12] Updating of parent zones is not yet implemented. -[13] ``named` does not currently encrypt DNS requests, so the PAD option +[13] ``named`` does not currently encrypt DNS requests, so the PAD option is accepted but not returned in responses. [14] Section 4 is ignored. diff --git a/doc/arm/index.rst b/doc/arm/index.rst index d608d73968..a0fe1b81de 100644 --- a/doc/arm/index.rst +++ b/doc/arm/index.rst @@ -33,4 +33,3 @@ BIND 9 Administrator Reference Manual history general manpages - diff --git a/doc/arm/manpages.rst b/doc/arm/manpages.rst index 9f1617df2b..7fed28890a 100644 --- a/doc/arm/manpages.rst +++ b/doc/arm/manpages.rst @@ -13,39 +13,39 @@ Manual Pages ============ -.. include:: ../../bin//rndc/rndc.conf.rst -.. include:: ../../bin//rndc/rndc.rst -.. include:: ../../bin//tools/nsec3hash.rst -.. include:: ../../bin//tools/dnstap-read.rst -.. include:: ../../bin//tools/named-nzd2nzf.rst -.. include:: ../../bin//tools/named-journalprint.rst -.. include:: ../../bin//tools/mdig.rst -.. include:: ../../bin//tools/named-rrchecker.rst -.. include:: ../../bin//tools/arpaname.rst -.. include:: ../../bin//dnssec/dnssec-revoke.rst -.. include:: ../../bin//dnssec/dnssec-cds.rst -.. include:: ../../bin//dnssec/dnssec-keygen.rst -.. include:: ../../bin//dnssec/dnssec-keyfromlabel.rst -.. include:: ../../bin//dnssec/dnssec-verify.rst -.. include:: ../../bin//dnssec/dnssec-settime.rst -.. include:: ../../bin//dnssec/dnssec-importkey.rst -.. include:: ../../bin//dnssec/dnssec-signzone.rst -.. include:: ../../bin//dnssec/dnssec-dsfromkey.rst -.. include:: ../../bin//python/dnssec-checkds.rst -.. include:: ../../bin//python/dnssec-coverage.rst -.. include:: ../../bin//python/dnssec-keymgr.rst -.. include:: ../../bin//plugins/filter-aaaa.rst -.. include:: ../../bin//confgen/ddns-confgen.rst -.. include:: ../../bin//confgen/rndc-confgen.rst -.. include:: ../../bin//delv/delv.rst -.. include:: ../../bin//nsupdate/nsupdate.rst -.. include:: ../../bin//dig/host.rst -.. include:: ../../bin//dig/dig.rst -.. include:: ../../bin//dig/nslookup.rst -.. include:: ../../bin//named/named.rst -.. include:: ../../bin//pkcs11/pkcs11-keygen.rst -.. include:: ../../bin//pkcs11/pkcs11-tokens.rst -.. include:: ../../bin//pkcs11/pkcs11-list.rst -.. include:: ../../bin//pkcs11/pkcs11-destroy.rst -.. include:: ../../bin//check/named-checkconf.rst -.. include:: ../../bin//check/named-checkzone.rst +.. include:: ../../bin/rndc/rndc.conf.rst +.. include:: ../../bin/rndc/rndc.rst +.. include:: ../../bin/tools/nsec3hash.rst +.. include:: ../../bin/tools/dnstap-read.rst +.. include:: ../../bin/tools/named-nzd2nzf.rst +.. include:: ../../bin/tools/named-journalprint.rst +.. include:: ../../bin/tools/mdig.rst +.. include:: ../../bin/tools/named-rrchecker.rst +.. include:: ../../bin/tools/arpaname.rst +.. include:: ../../bin/dnssec/dnssec-revoke.rst +.. include:: ../../bin/dnssec/dnssec-cds.rst +.. include:: ../../bin/dnssec/dnssec-keygen.rst +.. include:: ../../bin/dnssec/dnssec-keyfromlabel.rst +.. include:: ../../bin/dnssec/dnssec-verify.rst +.. include:: ../../bin/dnssec/dnssec-settime.rst +.. include:: ../../bin/dnssec/dnssec-importkey.rst +.. include:: ../../bin/dnssec/dnssec-signzone.rst +.. include:: ../../bin/dnssec/dnssec-dsfromkey.rst +.. include:: ../../bin/python/dnssec-checkds.rst +.. include:: ../../bin/python/dnssec-coverage.rst +.. include:: ../../bin/python/dnssec-keymgr.rst +.. include:: ../../bin/plugins/filter-aaaa.rst +.. include:: ../../bin/confgen/ddns-confgen.rst +.. include:: ../../bin/confgen/rndc-confgen.rst +.. include:: ../../bin/delv/delv.rst +.. include:: ../../bin/nsupdate/nsupdate.rst +.. include:: ../../bin/dig/host.rst +.. include:: ../../bin/dig/dig.rst +.. include:: ../../bin/dig/nslookup.rst +.. include:: ../../bin/named/named.rst +.. include:: ../../bin/pkcs11/pkcs11-keygen.rst +.. include:: ../../bin/pkcs11/pkcs11-tokens.rst +.. include:: ../../bin/pkcs11/pkcs11-list.rst +.. include:: ../../bin/pkcs11/pkcs11-destroy.rst +.. include:: ../../bin/check/named-checkconf.rst +.. include:: ../../bin/check/named-checkzone.rst diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst index 6cc4b39a42..d7434a4413 100644 --- a/doc/arm/reference.rst +++ b/doc/arm/reference.rst @@ -6237,7 +6237,7 @@ file, conversion to ``text`` format is recommended. .. _statistics: BIND 9 Statistics ----------------- +----------------- BIND 9 maintains lots of statistics information and provides several interfaces for users to access those statistics. The available