From 3688d706dad574f504239f2b07447d194468ef71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Fri, 17 Jun 2022 10:57:41 +0200 Subject: [PATCH] Deduplicate request-nsid definition in the ARM (cherry picked from commit e91529a48b20d6a85c7933fbfa6931a1af3df9de) --- doc/arm/reference.rst | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst index 3929cf188d..45bc4e86a3 100644 --- a/doc/arm/reference.rst +++ b/doc/arm/reference.rst @@ -5219,12 +5219,6 @@ any top-level ``server`` statements are used as defaults. can be specified. Similarly, for an IPv6 remote server, only ``notify-source-v6`` can be specified. -.. namedconf:statement:: request-nsid - - The ``request-nsid`` clause determines whether the local server adds - an NSID EDNS option to requests sent to the server. This overrides - ``request-nsid`` set at the view or option level. - It is possible to override the following values defined in :namedconf:ref:`view` and :namedconf:ref:`options` blocks: @@ -5232,6 +5226,7 @@ and :namedconf:ref:`options` blocks: - :namedconf:ref:`max-udp-size` - :namedconf:ref:`query-source-v6` - :namedconf:ref:`query-source` + - :namedconf:ref:`request-nsid` - :namedconf:ref:`send-cookie` - :namedconf:ref:`transfer-format` - :namedconf:ref:`transfer-source-v6`