Rebuild documentation

diff --git a/CONTRIBUTING b/CONTRIBUTING
index 3e780d2fae7b4eddd21a15f0a9e02769c7d4bcc5..6c1ffa07231c5c55e40c7c6ac204d5704a7cfc93 100644 (file)
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -69,7 +69,7 @@ Whenever a branch is ready for publication, a tag is placed of the form
 v9_X_Y. The 9.12.0 release, for instance, is tagged as v9_12_0.
 
 The branch in which the next major release is being developed is called
-master.
+main.
 
 Reporting bugs
 
@@ -125,7 +125,7 @@ Patches for BIND may be submitted directly via merge requests in ISC's
 GitLab source repository for BIND.
 
 Patches can also be submitted as diffs against a specific version of BIND
--- preferably the current top of the master branch. Diffs may be generated
+-- preferably the current top of the main branch. Diffs may be generated
 using either git format-patch or git diff.
 
 Those wanting to write code for BIND may be interested in the developer

diff --git a/README b/README
index 7d6e4278f5873dfacd38a2f5bde7701a34500019..c423f5ddb57c742f441ab2304f936df26edb54bd 100644 (file)
--- a/README
+++ b/README
@@ -329,8 +329,8 @@ the change that was made; these categories are:
 [doc]          Documentation
 [contrib]      Changes to the contributed tools and libraries in the
                'contrib' subdirectory
-               Used in the master development branch to reserve change
-[placeholder]  numbers for use in other branches, e.g. when fixing a bug
+               Used in the main development branch to reserve change
+[placeholder]  numbers for use in other branches, e.g., when fixing a bug
                that only exists in older releases
 
 In general, [func] and [experimental] tags will only appear in new-feature

diff --git a/doc/man/dig.1in b/doc/man/dig.1in
index 713d0e4d748df2d4f1f3f0fe6a10f98820ee7559..1ec88716ca0b9da21b2a26b381f672534ad7b988 100644 (file)
--- a/doc/man/dig.1in
+++ b/doc/man/dig.1in
@@ -263,12 +263,12 @@ received.
 Attempt to display the contents of messages which are malformed. The
 default is to not display malformed answers.
 .TP
-.B \fB+bufsize=B\fP
-Set the UDP message buffer size advertised using EDNS0 to \fBB\fP
-bytes. The maximum and minimum sizes of this buffer are 65535 and 0
-respectively. Values outside this range are rounded up or down
-appropriately. Values other than zero will cause a EDNS query to be
-sent.
+.B \fB+bufsize[=B]\fP
+This option sets the UDP message buffer size advertised using EDNS0
+to \fBB\fP bytes.  The maximum and minimum sizes of this buffer are
+65535 and 0, respectively.  \fB+bufsize=0\fP disables EDNS (use
+\fB+bufsize=0 +edns\fP to send a EDNS messages with a advertised size
+of 0 bytes). \fB+bufsize\fP restores the default buffer size.
 .TP
 .B \fB+[no]cdflag\fP
 Set [do not set] the CD (checking disabled) bit in the query. This

diff --git a/doc/man/dnssec-settime.8in b/doc/man/dnssec-settime.8in
index fa8200c5421d021ac9010a772f7236f92c5087fd..9cfd1c5c231c375343d4f3ad21327be1fcd976e4 100644 (file)
--- a/doc/man/dnssec-settime.8in
+++ b/doc/man/dnssec-settime.8in
@@ -32,7 +32,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 ..
 .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 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 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]
+\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]
 .SH DESCRIPTION
 .sp
 \fBdnssec\-settime\fP reads a DNSSEC private key file and sets the key
@@ -126,6 +126,10 @@ Sets the date on which a key is to be published to the zone. After
 that date, the key will be included in the zone but will not be used
 to sign it.
 .TP
+\fB\-P\fP ds date/offset
+Sets the date on which DS records that match this key have been
+seen in the parent zone.
+.TP
 \fB\-P\fP sync date/offset
 Sets the date on which CDS and CDNSKEY records that match this key
 are to be published to the zone.
@@ -149,6 +153,10 @@ Sets the date on which the key is to be deleted. After that date, the
 key will no longer be included in the zone. (It may remain in the key
 repository, however.)
 .TP
+\fB\-D\fP ds date/offset
+Sets the date on which the DS records that match this key have
+been seen removed from the parent zone.
+.TP
 \fB\-D\fP sync date/offset
 Sets the date on which the CDS and CDNSKEY records that match this
 key are to be deleted.
@@ -216,15 +224,16 @@ associated with a key.
 \fB\-u\fP
 Print times in UNIX epoch format.
 .TP
-\fB\-p\fP C/P/Psync/A/R/I/D/Dsync/all
-Print a specific metadata value or set of metadata values. The \fB\-p\fP
-option may be followed by one or more of the following letters or
-strings to indicate which value or values to print: \fBC\fP for the
-creation date, \fBP\fP for the publication date, \fBPsync\fP for the CDS
-and CDNSKEY publication date, \fBA\fP for the activation date, \fBR\fP
-for the revocation date, \fBI\fP for the inactivation date, \fBD\fP for
-the deletion date, and \fBDsync\fP for the CDS and CDNSKEY deletion
-date To print all of the metadata, use \fB\-p all\fP\&.
+\fB\-p\fP C/P/Pds/Psync/A/R/I/D/Dds/Dsync/all
+Prints a specific metadata value or set of metadata values. The \fB\-p\fP
+option may be followed by one or more of the following letters or strings
+to indicate which value or values to print: \fBC\fP for the creation date,
+\fBP\fP for the publication date, \fBPds\(ga for the DS publication date,
+\(ga\(gaPsync\fP for the CDS and CDNSKEY publication date, \fBA\fP for the
+activation date, \fBR\fP for the revocation date, \fBI\fP for the inactivation
+date, \fBD\fP for the deletion date, \fBDds\fP for the DS deletion date,
+and \fBDsync\fP for the CDS and CDNSKEY deletion date. To print all of the
+metadata, use \fBall\fP\&.
 .UNINDENT
 .SH SEE ALSO
 .sp