From df2c19c19b3931374454a46f7f88d76d7aa34aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Fri, 17 Jun 2022 11:13:52 +0200 Subject: [PATCH] Deduplicate request-expire definition in the ARM (cherry picked from commit 6e634c43cdd878fe83c9a7bd1c0c3dab72f298fd) --- doc/arm/reference.rst | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst index 8d646492da..df9322aa81 100644 --- a/doc/arm/reference.rst +++ b/doc/arm/reference.rst @@ -2302,7 +2302,13 @@ Boolean Options .. namedconf:statement:: request-expire - See the description of ``request-expire`` in :ref:`server_statement_definition_and_usage`. + The ``request-expire`` statement determines whether the local server, when + acting as a secondary, requests the EDNS EXPIRE value. The EDNS EXPIRE + value indicates the remaining time before the zone data expires and + needs to be refreshed. This is used when a secondary server transfers + a zone from another secondary server; when transferring from the + primary, the expiration timer is set from the EXPIRE field of the SOA + record instead. The default is ``yes``. .. namedconf:statement:: match-mapped-addresses @@ -5132,16 +5138,6 @@ any top-level ``server`` statements are used as defaults. as bogus prevents further queries to it. The default value of ``bogus`` is ``no``. -.. namedconf:statement:: request-expire - - The ``request-expire`` clause determines whether the local server, when - acting as a secondary, requests the EDNS EXPIRE value. The EDNS EXPIRE - value indicates the remaining time before the zone data expires and - needs to be refreshed. This is used when a secondary server transfers - a zone from another secondary server; when transferring from the - primary, the expiration timer is set from the EXPIRE field of the SOA - record instead. The default is ``yes``. - .. namedconf:statement:: edns The ``edns`` clause determines whether the local server attempts to @@ -5210,6 +5206,7 @@ and :namedconf:ref:`options` blocks: - :namedconf:ref:`provide-ixfr` - :namedconf:ref:`query-source-v6` - :namedconf:ref:`query-source` + - :namedconf:ref:`request-expire` - :namedconf:ref:`request-ixfr` - :namedconf:ref:`request-nsid` - :namedconf:ref:`send-cookie`