summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2020-05-15 17:00:27 -0700
committerClaude Paroz <claude@2xlibre.net>2020-05-18 08:46:51 +0200
commit3f977c58378437635a37a96403530ba5fba7ea47 (patch)
tree5c5bfb7ab548b6b189688c9b6b5f80d118898f22
parent5480fab290655682db7fc12c087675df43115a01 (diff)
[3.1.x] Updated docutils link to HTTPS and new location.
Backport of 7070d4611471db701ed0d51d23e72d5f5c647085 from master
-rw-r--r--django/contrib/admindocs/templates/admin_doc/missing_docutils.html4
-rw-r--r--tests/admin_docs/test_views.py5
2 files changed, 6 insertions, 3 deletions
diff --git a/django/contrib/admindocs/templates/admin_doc/missing_docutils.html b/django/contrib/admindocs/templates/admin_doc/missing_docutils.html
index 984aea6278..633d7c063c 100644
--- a/django/contrib/admindocs/templates/admin_doc/missing_docutils.html
+++ b/django/contrib/admindocs/templates/admin_doc/missing_docutils.html
@@ -14,9 +14,9 @@
<h1>{% translate 'Documentation' %}</h1>
<div id="content-main">
- <h3>{% blocktranslate with "http://docutils.sf.net/" as link %}The admin documentation system requires Python's <a href="{{ link }}">docutils</a> library.{% endblocktranslate %}</h3>
+ <h3>{% blocktranslate with "https://docutils.sourceforge.io/" as link %}The admin documentation system requires Python's <a href="{{ link }}">docutils</a> library.{% endblocktranslate %}</h3>
- <p>{% blocktranslate with "http://docutils.sf.net/" as link %}Please ask your administrators to install <a href="{{ link }}">docutils</a>.{% endblocktranslate %}</p>
+ <p>{% blocktranslate with "https://docutils.sourceforge.io/" as link %}Please ask your administrators to install <a href="{{ link }}">docutils</a>.{% endblocktranslate %}</p>
</div>
{% endblock %}
diff --git a/tests/admin_docs/test_views.py b/tests/admin_docs/test_views.py
index fb021f3dd2..f06afd336a 100644
--- a/tests/admin_docs/test_views.py
+++ b/tests/admin_docs/test_views.py
@@ -114,7 +114,10 @@ class AdminDocViewTests(TestDataMixin, AdminDocsTestCase):
self.assertContains(
response,
'<h3>The admin documentation system requires Python\'s '
- '<a href="http://docutils.sf.net/">docutils</a> library.</h3>',
+ '<a href="https://docutils.sourceforge.io/">docutils</a> '
+ 'library.</h3>'
+ '<p>Please ask your administrators to install '
+ '<a href="https://docutils.sourceforge.io/">docutils</a>.</p>',
html=True
)
self.assertContains(response, '<h1 id="site-name"><a href="/admin/">Django administration</a></h1>')