From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 26 Sep 2022 07:34:40 +0000 (+0200)
Subject: Only say EOL if a version is actually EOL, plus some fixes to cross references.
X-Git-Tag: rec-4.9.0-alpha0~43^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F12015%2Fhead;p=thirdparty%2Fpdns.git

Only say EOL if a version is actually EOL, plus some fixes to cross references.
---

diff --git a/pdns/recursordist/docs/appendices/EOL.rst b/pdns/recursordist/docs/appendices/EOL.rst
index 3cec036833..40d56dd9b5 100644
--- a/pdns/recursordist/docs/appendices/EOL.rst
+++ b/pdns/recursordist/docs/appendices/EOL.rst
@@ -37,15 +37,15 @@ for details.
    * - 4.7
      - May 30 2022
      - ~ December 2022
-     - EOL ~ December 2023
+     - ~ December 2023
    * - 4.6
      - December 17 2021
      - May 30 2022
-     - EOL ~ May 2023
+     - ~ May 2023
    * - 4.5
      - May 11 2021
      - December 17 2021
-     - EOL ~ December 2022
+     - ~ December 2022
    * - 4.4
      - October 19 2020
      - May 11 2021
diff --git a/pdns/recursordist/docs/changelog/4.8.rst b/pdns/recursordist/docs/changelog/4.8.rst
index bb007113cd..89011a2f95 100644
--- a/pdns/recursordist/docs/changelog/4.8.rst
+++ b/pdns/recursordist/docs/changelog/4.8.rst
@@ -9,7 +9,7 @@ Changelogs for 4.8.X
     :tags: Improvements
     :pullreq: 11958
 
-    Lock record cache entries if enabled by :ref:`record-cache-locked-ttl-perc`.
+    Lock record cache entries if enabled by :ref:`setting-record-cache-locked-ttl-perc`.
 
   .. change::
     :tags: Improvements
@@ -40,13 +40,13 @@ Changelogs for 4.8.X
     :tags: Improvements
     :pullreq: 11776
 
-    Implement optional Serve stale functionality, enabled by :ref:`serve-stale-extensions`..
+    Implement optional Serve stale functionality, enabled by :ref:`setting-serve-stale-extensions`..
 
   .. change::
     :tags: Improvements
     :pullreq: 11906
 
-    Implement padding of (DoT) messages to authoritative servers, if set by :ref:`edns-padding-out` (default ``yes``).
+    Implement padding of (DoT) messages to authoritative servers, if set by :ref:`setting-edns-padding-out` (default ``yes``).
 
   .. change::
     :tags: Improvements
@@ -176,7 +176,7 @@ Changelogs for 4.8.X
     :pullreq: 11660,11709
     :tickets: 11705, 11706
 
-    Use ``systemd-journal`` for structured logging if it is available and set by :ref:`settings-structured-logging-backend`.
+    Use ``systemd-journal`` for structured logging if it is available and set by :ref:`setting-structured-logging-backend`.
 
   .. change::
     :tags: Improvements
diff --git a/pdns/recursordist/docs/upgrade.rst b/pdns/recursordist/docs/upgrade.rst
index 2f8d95487a..c5bbae5ff8 100644
--- a/pdns/recursordist/docs/upgrade.rst
+++ b/pdns/recursordist/docs/upgrade.rst
@@ -18,7 +18,7 @@ New settings
 ^^^^^^^^^^^^
 - The :ref:`setting-max-ns-per-resolve` setting to limit the number of NS records processed to resolve a name has been introduced.
 - The :ref:`setting-serve-stale-extensions` setting to control the new ``Serve Stale`` feature has been introduced.
-- The :ref:`setting record-cache-locked-ttl-perc` setting to control locking of record sets in the record cache has been introduced.
+- The :ref:`setting-record-cache-locked-ttl-perc` setting to control locking of record sets in the record cache has been introduced.
 - The :ref:`setting-edns-padding-out` setting to control EDNS padding for outgoing DoT has been introduced.
 - The :ref:`setting-structured-logging-backend` setting to control the type of structiured logging to ``journald`` has been introduced.