doc nits + NEWS item, for quic

diff --git a/NEWS b/NEWS
index 401cb82d54cba3a28ffa2b80a6bfb5713e4a127f..3095df347f568d8be3659908dbe5f6ca51b0e932 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
-Knot Resolver 6.1.1 (2026-0m-dd)
+Knot Resolver 6.2.0 (2026-02-dd)
 ================================
 
+Improvements:
+-------------
+- DNS-over-QUIC (DoQ) is available for serving (beta, !1747)
+
 Bugfixes
 --------
 - fix UDP answers without sendmmsg, e.g. on non-Linux (!1795)

diff --git a/doc/user/config-network-server-tls.rst b/doc/user/config-network-server-tls.rst
index 143a0d9ff196c70f585350bea7cc0fff0e828c20..98bff10a10c4a6bae33e728eff6aae7ad057ccbd 100644 (file)
--- a/doc/user/config-network-server-tls.rst
+++ b/doc/user/config-network-server-tls.rst
@@ -212,10 +212,12 @@ policies.
 DNS-over-QUIC (DoQ)
 ^^^^^^^^^^^^^^^^^^^
 
-.. note::
-    DoQ is currently considered an experimental feature. If you encounter any
-    issues or have any questions, please do not hesitate to contact us via the
-    standard communication channels.
+.. warning::
+    DoQ is currently considered a beta feature,
+    and its configuration might change.
+
+    If you encounter any issues or have any questions,
+    please do not hesitate to contact us via the standard communication channels.
 
 
 DNS-over-QUIC server (:rfc:`9250`) can be configured using ``doq`` kind in
@@ -225,15 +227,15 @@ For certificate configuration, refer to :ref:`dot-doh-doq-config-options`.
 
 .. option:: network/quic:
 
-    .. option:: max_conns: <1-4096>
+    .. option:: max-conns: <1-4096>
 
     :default: 1024
 
-    The maximum number of active connections a worker is permitted to accept.
+    The maximum number of active connections each worker is permitted to accept.
     Setting this value too low or too high may negatively affect performance.
     Changing this value requires a worker restart.
 
-    .. option:: max_streams: <1-4096>
+    .. option:: max-streams: <1-4096>
 
     :default: 1024
 
@@ -241,7 +243,7 @@ For certificate configuration, refer to :ref:`dot-doh-doq-config-options`.
     Setting this value too low or too high may negatively affect performance.
     Changing this value requires a worker restart.
 
-    .. option:: require_retry: true|false
+    .. option:: require-retry: true|false
 
     :default: false