Fix spelling of "DNS over HTTPS" & "DNS over TLS"

The terms "DNS over HTTPS" and "DNS over TLS" should be hyphenated when
they are used as adjectives and non-hyphenated otherwise.  Ensure all
occurrences of these terms in the source tree follow the above rule.
(CHANGES and release notes are intentionally left intact.)

Tweak a related ARM snippet, fixing a typo in the process.

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 19a9d5b0f303fad130cf3542807603aa40227160..c268e35218c8adfadd98f041fa3583db7e9e4755 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -229,7 +229,7 @@ help(void) {
               "SERVFAIL)\n"
               "                 +[no]header-only    (Send query without a "
               "question section)\n"
-              "                 +[no]https[=###]    (DNS over HTTPS mode) "
+              "                 +[no]https[=###]    (DNS-over-HTTPS mode) "
               "[/]\n"
               "                 +[no]https-get      (Use GET instead of "
               "default POST method\n"
@@ -294,7 +294,7 @@ help(void) {
               "(+[no]tcflag))\n"
               "                 +[no]tcp            (TCP mode (+[no]vc))\n"
               "                 +timeout=###        (Set query timeout) [5]\n"
-              "                 +[no]tls            (DNS over TLS mode)\n"
+              "                 +[no]tls            (DNS-over-TLS mode)\n"
               "                 +[no]trace          (Trace delegation down "
               "from root "
               "[+dnssec])\n"

diff --git a/bin/dig/dig.rst b/bin/dig/dig.rst
index 556b41d69f747f0c0a8bfed56d62f10627d6a8c9..6889ce6bb4fb7611e2d23f5b34385d9c3f08ea9d 100644 (file)
--- a/bin/dig/dig.rst
+++ b/bin/dig/dig.rst
@@ -340,7 +340,7 @@ abbreviation is unambiguous; for example, ``+cd`` is equivalent to
    are ignored when this is set.
 
 ``+[no]https[=value]``
-   This option indicates whether to use DNS-over-HTTPS (DoH) when querying
+   This option indicates whether to use DNS over HTTPS (DoH) when querying
    name servers.  When this option is in use, the port number defaults to 443.
    The HTTP POST request mode is used when sending the query.
 
@@ -537,7 +537,7 @@ abbreviation is unambiguous; for example, ``+cd`` is equivalent to
    5 seconds. An attempt to set ``T`` to less than 1 is silently set to 1.
 
 ``+[no]tls``
-   This option indicates whether to use DNS-over-TLS (DoT) when querying
+   This option indicates whether to use DNS over TLS (DoT) when querying
    name servers. When this option is in use, the port number defaults
    to 853.
 

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index 3fc60e17864fa20e15cf50723915b717d044049c..2a851361c0726dcfa8a0704f496554a4f5cb95f6 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -2530,10 +2530,10 @@ Use of an ``http`` specification requires ``tls`` to be specified
 as well.  If an unencrypted connection is desired (for example,
 on load-sharing servers behind a reverse proxy), ``tls none`` may be used.
 
-If a port number is not specified, the default is 53 for standard DNS, 853
-for DNS over TLS, 443 for DNS over HTTPS, and 80 for DNS over unenecrypted
-HTTP.  These defaults may be overridden using the ``port``, ``tls-port``,
-``https-port`` and ``http-port`` options.
+If a port number is not specified, the default is 53 for standard DNS,
+853 for DNS over TLS, 443 for DNS over HTTPS, and 80 for
+DNS over HTTP (unencrypted).  These defaults may be overridden using the
+``port``, ``tls-port``, ``https-port`` and ``http-port`` options.
 
 Multiple ``listen-on`` statements are allowed. For example:
 

diff --git a/doc/arm/troubleshooting.rst b/doc/arm/troubleshooting.rst
index 33f414bcec8f8be488856b815be0da76fd67d296..1bd5f9890c9f01b1bc974919dcbaee35f60e5a08 100644 (file)
--- a/doc/arm/troubleshooting.rst
+++ b/doc/arm/troubleshooting.rst
@@ -77,7 +77,7 @@ Inspecting Encrypted DNS Traffic
    BIND 9 is built against.  For OpenSSL, version 1.1.1 or newer is
    required (use ``named -V`` to check).
 
-By definition, TLS-encrypted traffic (e.g. DNS-over-TLS, DNS-over-HTTPS)
+By definition, TLS-encrypted traffic (e.g. DNS over TLS, DNS over HTTPS)
 is opaque to packet sniffers, which makes debugging problems with
 encrypted DNS close to impossible. However, Wireshark_ offers a
 solution_ to this problem by being able to read key log files. In order

diff --git a/doc/man/dig.1in b/doc/man/dig.1in
index f75e6a6c1f668068c521b461743396bd39f25a62..ab8f59ddddf6ddde4313b105737c814fa45882e4 100644 (file)
--- a/doc/man/dig.1in
+++ b/doc/man/dig.1in
@@ -362,7 +362,7 @@ default is to add a question section. The query type and query name
 are ignored when this is set.
 .TP
 .B \fB+[no]https[=value]\fP
-This option indicates whether to use DNS\-over\-HTTPS (DoH) when querying
+This option indicates whether to use DNS over HTTPS (DoH) when querying
 name servers.  When this option is in use, the port number defaults to 443.
 The HTTP POST request mode is used when sending the query.
 .sp
@@ -559,7 +559,7 @@ This option sets the timeout for a query to \fBT\fP seconds. The default timeout
 5 seconds. An attempt to set \fBT\fP to less than 1 is silently set to 1.
 .TP
 .B \fB+[no]tls\fP
-This option indicates whether to use DNS\-over\-TLS (DoT) when querying
+This option indicates whether to use DNS over TLS (DoT) when querying
 name servers. When this option is in use, the port number defaults
 to 853.
 .TP