From d346f075d06aeb501ddbc3f6a0870c78bea1a9e9 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Tue, 28 Jan 2020 21:04:15 -0800 Subject: [PATCH] [3.0.x] Refs #25778 -- Updated sphinx-doc.org links to HTTPS. Backport of 32166a9f7c8afd6d34ff7e7c0a13a46a6eedcc5e from master. --- docs/README | 2 +- docs/conf.py | 2 +- docs/internals/contributing/writing-documentation.txt | 2 +- docs/intro/whatsnext.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/README b/docs/README index f34aa8782a..f61b75bd26 100644 --- a/docs/README +++ b/docs/README @@ -14,4 +14,4 @@ To create an HTML version of the docs: The documentation in _build/html/index.html can then be viewed in a web browser. [1] http://docutils.sourceforge.net/rst.html -[2] http://sphinx-doc.org/ +[2] https://www.sphinx-doc.org/ diff --git a/docs/conf.py b/docs/conf.py index 39aacd778d..886be3c3d2 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -140,7 +140,7 @@ pygments_style = 'trac' # branch, which is located at this URL. intersphinx_mapping = { 'python': ('https://docs.python.org/3/', None), - 'sphinx': ('http://www.sphinx-doc.org/en/master/', None), + 'sphinx': ('https://www.sphinx-doc.org/en/master/', None), 'psycopg2': ('http://initd.org/psycopg/docs/', None), } diff --git a/docs/internals/contributing/writing-documentation.txt b/docs/internals/contributing/writing-documentation.txt index af04ad317a..caad5eeecd 100644 --- a/docs/internals/contributing/writing-documentation.txt +++ b/docs/internals/contributing/writing-documentation.txt @@ -42,7 +42,7 @@ Django's documentation uses the Sphinx__ documentation system, which in turn is based on docutils__. The basic idea is that lightly-formatted plain-text documentation is transformed into HTML, PDF, and any other output format. -__ http://sphinx-doc.org/ +__ https://www.sphinx-doc.org/ __ http://docutils.sourceforge.net/ To build the documentation locally, install Sphinx: diff --git a/docs/intro/whatsnext.txt b/docs/intro/whatsnext.txt index 0222050827..8dc97f9cc0 100644 --- a/docs/intro/whatsnext.txt +++ b/docs/intro/whatsnext.txt @@ -183,7 +183,7 @@ You can get a local copy of the HTML documentation following a few steps: * The HTML documentation will be placed in ``docs/_build/html``. -__ http://sphinx-doc.org/ +__ https://www.sphinx-doc.org/ __ https://www.gnu.org/software/make/ .. _differences-between-doc-versions: