From 2ed4bed33a9233cd049ddae8680240a966dc154d Mon Sep 17 00:00:00 2001
From: Matt Ficke
Date: Tue, 16 Nov 2021 10:52:02 -0500
Subject: [PATCH] Update RFC base url
The tools.ietf.org subdomain is being wound down and services are moving to
datatracker.ietf.org. Links to RFC documents using the old subdomain are being
redirected to datatracker; this updates the configured `rfc_base_url` to
point to the current subdomain.
Discussion: https://mailarchive.ietf.org/arch/msg/ietf/0n-6EXEmkTp3Uv_vj-5Vnm3o0bo/
---
doc/usage/configuration.rst | 4 ++--
sphinx/environment/__init__.py | 2 +-
tests/test_build_html.py | 4 ++--
tests/test_markup.py | 10 +++++-----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/doc/usage/configuration.rst b/doc/usage/configuration.rst
index 551ef5dbda6..cd6fa06a1bc 100644
--- a/doc/usage/configuration.rst
+++ b/doc/usage/configuration.rst
@@ -1005,7 +1005,7 @@ that use Sphinx's HTMLWriter class.
to indicate the location of document using `The Canonical Link Relation`_.
Default: ``''``.
- .. _The Canonical Link Relation: https://tools.ietf.org/html/rfc6596
+ .. _The Canonical Link Relation: https://datatracker.ietf.org/doc/html/rfc6596
.. versionadded:: 1.8
@@ -2679,7 +2679,7 @@ Options for the linkcheck builder
doubling the wait time between attempts until it succeeds or exceeds the
``linkcheck_rate_limit_timeout``. By default, the timeout is 5 minutes.
- .. _Retry-After: https://tools.ietf.org/html/rfc7231#section-7.1.3
+ .. _Retry-After: https://datatracker.ietf.org/doc/html/rfc7231#section-7.1.3
.. versionadded:: 3.4
diff --git a/sphinx/environment/__init__.py b/sphinx/environment/__init__.py
index dc494add122..478db40e672 100644
--- a/sphinx/environment/__init__.py
+++ b/sphinx/environment/__init__.py
@@ -51,7 +51,7 @@
'cloak_email_addresses': True,
'pep_base_url': 'https://www.python.org/dev/peps/',
'pep_references': None,
- 'rfc_base_url': 'https://tools.ietf.org/html/',
+ 'rfc_base_url': 'https://datatracker.ietf.org/doc/html/',
'rfc_references': None,
'input_encoding': 'utf-8-sig',
'doctitle_xform': False,
diff --git a/tests/test_build_html.py b/tests/test_build_html.py
index 106ad047009..a1d4717e77d 100644
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -225,9 +225,9 @@ def test_html4_output(app, status, warning):
(".//a[@href='https://www.python.org/dev/peps/pep-0008']"
"[@class='pep reference external']/strong",
'Python Enhancement Proposal #8'),
- (".//a[@href='https://tools.ietf.org/html/rfc1.html']"
+ (".//a[@href='https://datatracker.ietf.org/doc/html/rfc1.html']"
"[@class='rfc reference external']/strong", 'RFC 1'),
- (".//a[@href='https://tools.ietf.org/html/rfc1.html']"
+ (".//a[@href='https://datatracker.ietf.org/doc/html/rfc1.html']"
"[@class='rfc reference external']/strong", 'Request for Comments #1'),
(".//a[@href='objects.html#envvar-HOME']"
"[@class='reference internal']/code/span[@class='pre']", 'HOME'),
diff --git a/tests/test_markup.py b/tests/test_markup.py
index f8fff1c2d03..b3960bc5ebd 100644
--- a/tests/test_markup.py
+++ b/tests/test_markup.py
@@ -36,7 +36,7 @@ def settings(app):
settings.env = app.builder.env
settings.env.temp_data['docname'] = 'dummy'
settings.contentsname = 'dummy'
- settings.rfc_base_url = 'http://tools.ietf.org/html/'
+ settings.rfc_base_url = 'http://datatracker.ietf.org/doc/html/'
domain_context = sphinx_domains(settings.env)
domain_context.enable()
yield settings
@@ -181,10 +181,10 @@ def get(name):
'verify',
':rfc:`2324`',
('RFC 2324
'),
+ 'href="http://datatracker.ietf.org/doc/html/rfc2324.html">RFC 2324
'),
('\\sphinxAtStartPar\n'
'\\index{RFC@\\spxentry{RFC}!RFC 2324@\\spxentry{RFC 2324}}'
- '\\sphinxhref{http://tools.ietf.org/html/rfc2324.html}'
+ '\\sphinxhref{http://datatracker.ietf.org/doc/html/rfc2324.html}'
'{\\sphinxstylestrong{RFC 2324}}')
),
(
@@ -192,11 +192,11 @@ def get(name):
'verify',
':rfc:`2324#id1`',
(''
+ 'href="http://datatracker.ietf.org/doc/html/rfc2324.html#id1">'
'RFC 2324#id1
'),
('\\sphinxAtStartPar\n'
'\\index{RFC@\\spxentry{RFC}!RFC 2324\\#id1@\\spxentry{RFC 2324\\#id1}}'
- '\\sphinxhref{http://tools.ietf.org/html/rfc2324.html\\#id1}'
+ '\\sphinxhref{http://datatracker.ietf.org/doc/html/rfc2324.html\\#id1}'
'{\\sphinxstylestrong{RFC 2324\\#id1}}')
),
(