Merge pull request #16016 from Habbie/random-doc-nits

auth: random doc nits

diff --cc docs/appendices/EOL.rst
index 2d1d42919489831f4127ec9390a09a4d0ccd990d,1ba5448c11a85725a8dd7f1d60fbc8a3b3251972..d510fd645287bc896bd078b132da3201e925ccc9
--- 1/docs/appendices/EOL.rst
--- 2/docs/appendices/EOL.rst
+++ b/docs/appendices/EOL.rst
@@@ -7,16 -7,16 +7,16 @@@ The two releases before that get critic
  Older releases are marked end of life and receive no updates at all.
  Pre-releases do not receive immediate security updates.
  
 -The currently supported release train of PowerDNS Authoritative Server is 4.9.
 +The currently supported release train of PowerDNS Authoritative Server is 5.0.
  
 -PowerDNS Authoritative Server 4.8 will only receive critical updates; it will be end of life after PowerDNS Authoritative Server 5.1 is released.
 +PowerDNS Authoritative Server 4.9 will only receive critical updates; it will be end of life after PowerDNS Authoritative Server 5.2 is released.
  
 -PowerDNS Authoritative Server 4.7 will only receive critical updates; it will be end of life after PowerDNS Authoritative Server 5.0 is released.
 +PowerDNS Authoritative Server 4.8 will only receive critical updates; it will be end of life after PowerDNS Authoritative Server 5.1 is released.
  
 -PowerDNS Authoritative Server 4.0 through 4.6, 3.x, and 2.x are End of Life.
 +PowerDNS Authoritative Server 4.0 through 4.7, 3.x, and 2.x are End of Life.
  
- Note: Users with a commercial agreement with PowerDNS.COM BV or Open-Xchange
- can receive extended support for releases which are End Of Life. If you are
+ Note: Users with a commercial agreement with PowerDNS.com B.V. or Open-Xchange
+ can receive support for releases which are End Of Life. If you are
  such a user, these EOL statements do not apply to you.
  
  .. list-table:: PowerDNS Authoritative Server Release Life Cycle

diff --cc docs/upgrading.rst
Simple merge

diff --cc pdns/recursordist/docs/appendices/EOL.rst
index 2ac95e41e1077a21e70c322e1484bf44ef41244e,103e677b3f58f77c0819fee3df25ad04c06b6ff8..09b5aaa038acb0251a175864593ca2da412ff59f
--- 1/pdns/recursordist/docs/appendices/EOL.rst
--- 2/pdns/recursordist/docs/appendices/EOL.rst
+++ b/pdns/recursordist/docs/appendices/EOL.rst
@@@ -10,16 -10,16 +10,16 @@@ We support older releases with critica
  Older releases are marked end of life and receive no updates at all.
  Pre-releases do not receive immediate security updates.
  
 -The currently supported release train of the PowerDNS Recursor is 5.2.
 +The currently supported release train of the PowerDNS Recursor is 5.3.
  
 -PowerDNS Recursor 5.1 will only receive critical updates and will be End of Life one year after PowerDNS Recursor 5.2 was released.
 +PowerDNS Recursor 5.2 will only receive critical updates and will be End of Life one year after PowerDNS Recursor 5.3 was released.
  
 -PowerDNS Recursor 5.0 will only receive critical updates and will be End of Life one year after PowerDNS Recursor 5.1 was released.
 +PowerDNS Recursor 5.1 will only receive critical updates and will be End of Life one year after PowerDNS Recursor 5.2 was released.
  
 -PowerDNS Recursor 4.0 through 4.9, 3.x, and 2.x are End of Life.
 +PowerDNS Recursor 5.0, 4.x, 3.x, and 2.x are End of Life.
  
- Note: Users with a commercial agreement with PowerDNS.COM BV or Open-Xchange
- can receive extended support for releases which are End Of Life. If you are
+ Note: Users with a commercial agreement with PowerDNS.com B.V. or Open-Xchange
+ can receive support for releases which are End Of Life. If you are
  such a user, these EOL statements do not apply to you.
  Please refer to the support `commitment
  <https://www.powerdns.com/support-commitment>`_