summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorigo95862 <igo95862@yandex.ru>2021-05-16 15:42:26 +0300
committerigo95862 <igo95862@yandex.ru>2021-05-16 15:53:49 +0300
commite67c9e5df1daf7904c2fc0a7983c45476f034bca (patch)
tree3458b0bced3a114f3b95ea720199ecccbbb8a90a
parent28b947501991239c274acbc100982fb2813073e5 (diff)
downloadsphinx-git-e67c9e5df1daf7904c2fc0a7983c45476f034bca.tar.gz
doc: Upgrade docutils.sourceforge.io links to HTTPS
Also change any docutils.sourceforge.net link to io top level domain.
-rw-r--r--doc/_templates/index.html4
-rw-r--r--doc/conf.py6
-rw-r--r--doc/development/tutorials/helloworld.rst6
-rw-r--r--doc/development/tutorials/recipe.rst2
-rw-r--r--doc/development/tutorials/todo.rst6
-rw-r--r--doc/extdev/index.rst2
-rw-r--r--doc/extdev/markupapi.rst2
-rw-r--r--doc/extdev/parserapi.rst2
-rw-r--r--doc/faq.rst10
-rw-r--r--doc/internals/contributing.rst2
-rw-r--r--doc/usage/configuration.rst10
-rw-r--r--doc/usage/extensions/napoleon.rst2
-rw-r--r--doc/usage/restructuredtext/basics.rst2
-rw-r--r--doc/usage/restructuredtext/index.rst2
-rw-r--r--sphinx/application.py6
-rw-r--r--sphinx/environment/collectors/metadata.py2
-rw-r--r--sphinx/transforms/i18n.py2
-rw-r--r--tests/roots/test-intl/refs.txt2
-rw-r--r--tests/test_intl.py2
-rw-r--r--tests/test_metadata.py2
-rw-r--r--tests/test_writer_latex.py2
21 files changed, 38 insertions, 38 deletions
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
index 9e9f7af56..4b2f13a42 100644
--- a/doc/_templates/index.html
+++ b/doc/_templates/index.html
@@ -38,10 +38,10 @@
most of them installable from PyPI{%endtrans%}</li>
</ul>
<p>{%trans%}
- Sphinx uses <a href="http://docutils.sourceforge.net/rst.html">reStructuredText</a>
+ Sphinx uses <a href="https://docutils.sourceforge.io/rst.html">reStructuredText</a>
as its markup language, and many of its strengths come from the power and
straightforwardness of reStructuredText and its parsing and translating
- suite, the <a href="http://docutils.sourceforge.net/">Docutils</a>.{%endtrans%}
+ suite, the <a href="https://docutils.sourceforge.io/">Docutils</a>.{%endtrans%}
</p>
<h2 style="margin-bottom: 0">{%trans%}Documentation{%endtrans%}</h2>
diff --git a/doc/conf.py b/doc/conf.py
index 3eb01b5ea..8ee97742e 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -80,11 +80,11 @@ latex_use_xindy = True
autodoc_member_order = 'groupwise'
autosummary_generate = False
todo_include_todos = True
-extlinks = {'duref': ('http://docutils.sourceforge.net/docs/ref/rst/'
+extlinks = {'duref': ('https://docutils.sourceforge.io/docs/ref/rst/'
'restructuredtext.html#%s', ''),
- 'durole': ('http://docutils.sourceforge.net/docs/ref/rst/'
+ 'durole': ('https://docutils.sourceforge.io/docs/ref/rst/'
'roles.html#%s', ''),
- 'dudir': ('http://docutils.sourceforge.net/docs/ref/rst/'
+ 'dudir': ('https://docutils.sourceforge.io/docs/ref/rst/'
'directives.html#%s', '')}
man_pages = [
diff --git a/doc/development/tutorials/helloworld.rst b/doc/development/tutorials/helloworld.rst
index 6eae5d6a3..2273330f1 100644
--- a/doc/development/tutorials/helloworld.rst
+++ b/doc/development/tutorials/helloworld.rst
@@ -181,9 +181,9 @@ This is the very basic principle of an extension that creates a new directive.
For a more advanced example, refer to :doc:`todo`.
-.. _docutils: http://docutils.sourceforge.net/
-.. _docutils directives: http://docutils.sourceforge.net/docs/howto/rst-directives.html
-.. _docutils nodes: http://docutils.sourceforge.net/docs/ref/doctree.html
+.. _docutils: https://docutils.sourceforge.io/
+.. _docutils directives: https://docutils.sourceforge.io/docs/howto/rst-directives.html
+.. _docutils nodes: https://docutils.sourceforge.io/docs/ref/doctree.html
.. _PyPI: https://pypi.org/
.. _Python package: https://packaging.python.org/
.. _Python path: https://docs.python.org/3/using/cmdline.html#envvar-PYTHONPATH
diff --git a/doc/development/tutorials/recipe.rst b/doc/development/tutorials/recipe.rst
index 404be542f..0e96a45cb 100644
--- a/doc/development/tutorials/recipe.rst
+++ b/doc/development/tutorials/recipe.rst
@@ -223,4 +223,4 @@ Further reading
For more information, refer to the `docutils`_ documentation and
:doc:`/extdev/index`.
-.. _docutils: http://docutils.sourceforge.net/docs/
+.. _docutils: https://docutils.sourceforge.io/docs/
diff --git a/doc/development/tutorials/todo.rst b/doc/development/tutorials/todo.rst
index 21d9e74be..c0a5c0d87 100644
--- a/doc/development/tutorials/todo.rst
+++ b/doc/development/tutorials/todo.rst
@@ -105,7 +105,7 @@ is just a "general" node.
Many extensions will not have to create their own node classes and work fine
with the nodes already provided by `docutils
- <http://docutils.sourceforge.net/docs/ref/doctree.html>`__ and :ref:`Sphinx
+ <https://docutils.sourceforge.io/docs/ref/doctree.html>`__ and :ref:`Sphinx
<nodes>`.
.. attention::
@@ -362,6 +362,6 @@ For more information, refer to the `docutils`_ documentation and
:doc:`/extdev/index`.
-.. _docutils: http://docutils.sourceforge.net/docs/
+.. _docutils: https://docutils.sourceforge.io/docs/
.. _Python path: https://docs.python.org/3/using/cmdline.html#envvar-PYTHONPATH
-.. _docutils documentation: http://docutils.sourceforge.net/docs/ref/rst/directives.html
+.. _docutils documentation: https://docutils.sourceforge.io/docs/ref/rst/directives.html
diff --git a/doc/extdev/index.rst b/doc/extdev/index.rst
index d9c04f413..d210ee49b 100644
--- a/doc/extdev/index.rst
+++ b/doc/extdev/index.rst
@@ -112,7 +112,7 @@ in which a Sphinx project is built: this works in several phases.
existing files are read, temporary nodes are created.
There are nodes provided by docutils, which are documented `in the docutils
- documentation <http://docutils.sourceforge.net/docs/ref/doctree.html>`__.
+ documentation <https://docutils.sourceforge.io/docs/ref/doctree.html>`__.
Additional nodes are provided by Sphinx and :ref:`documented here <nodes>`.
During reading, the build environment is updated with all meta- and cross
diff --git a/doc/extdev/markupapi.rst b/doc/extdev/markupapi.rst
index 7a21f8126..8fc884d7c 100644
--- a/doc/extdev/markupapi.rst
+++ b/doc/extdev/markupapi.rst
@@ -149,4 +149,4 @@ return ``node.children`` from the Directive.
`Creating directives`_ HOWTO of the Docutils documentation
-.. _Creating directives: http://docutils.sourceforge.net/docs/howto/rst-directives.html
+.. _Creating directives: https://docutils.sourceforge.io/docs/howto/rst-directives.html
diff --git a/doc/extdev/parserapi.rst b/doc/extdev/parserapi.rst
index 0beb51711..1bd03fd09 100644
--- a/doc/extdev/parserapi.rst
+++ b/doc/extdev/parserapi.rst
@@ -8,7 +8,7 @@ Parser API
The Parser analyzes the input document and creates a node tree
representation.
-__ http://docutils.sourceforge.net/docs/dev/hacking.html#parsing-the-document
+__ https://docutils.sourceforge.io/docs/dev/hacking.html#parsing-the-document
In Sphinx, the parser modules works as same as docutils. The parsers are
registered to Sphinx by extensions using Application APIs;
diff --git a/doc/faq.rst b/doc/faq.rst
index 49723d134..93486db75 100644
--- a/doc/faq.rst
+++ b/doc/faq.rst
@@ -145,7 +145,7 @@ Google Search
.. _Getting Started: https://docs.readthedocs.io/en/stable/intro/getting-started-with-sphinx.html
.. _api role: https://git.savannah.gnu.org/cgit/kenozooid.git/tree/doc/extapi.py
-.. _xhtml to reST: http://docutils.sourceforge.net/sandbox/xhtml2rest/xhtml2rest.py
+.. _xhtml to reST: https://docutils.sourceforge.io/sandbox/xhtml2rest/xhtml2rest.py
Sphinx vs. Docutils
@@ -179,10 +179,10 @@ of the *writers* provided by docutils. This allows Sphinx to provide many
features that would simply not be possible with docutils, such as those
outlined above.
-__ http://docutils.sourceforge.io/
-__ http://docutils.sourceforge.io/docs/dev/hacking.html
-__ http://docutils.sourceforge.io/rst.html
-__ http://docutils.sourceforge.net/docs/user/tools.html
+__ https://docutils.sourceforge.io/
+__ https://docutils.sourceforge.io/docs/dev/hacking.html
+__ https://docutils.sourceforge.io/rst.html
+__ https://docutils.sourceforge.io/docs/user/tools.html
.. _epub-faq:
diff --git a/doc/internals/contributing.rst b/doc/internals/contributing.rst
index 798736b03..04c3a8c96 100644
--- a/doc/internals/contributing.rst
+++ b/doc/internals/contributing.rst
@@ -297,7 +297,7 @@ Debugging tips
will complain about references without a known target.
* Set the debugging options in the `Docutils configuration file
- <http://docutils.sourceforge.net/docs/user/config.html>`_.
+ <https://docutils.sourceforge.io/docs/user/config.html>`_.
* JavaScript stemming algorithms in ``sphinx/search/*.py`` (except ``en.py``)
are generated by this `modified snowballcode generator
diff --git a/doc/usage/configuration.rst b/doc/usage/configuration.rst
index ddd3c930e..cf5282818 100644
--- a/doc/usage/configuration.rst
+++ b/doc/usage/configuration.rst
@@ -18,8 +18,8 @@ and output behavior.
directory to adjust `Docutils`_ configuration if not otherwise overridden or
set by Sphinx.
- .. _`docutils`: http://docutils.sourceforge.net/
- .. _`docutils.conf`: http://docutils.sourceforge.net/docs/user/config.html
+ .. _`docutils`: https://docutils.sourceforge.io/
+ .. _`docutils.conf`: https://docutils.sourceforge.io/docs/user/config.html
The configuration file is executed as Python code at build time (using
:func:`execfile`, and with the current directory set to its containing
@@ -484,7 +484,7 @@ General configuration
languages, will be used to convert quotes and dashes to typographically
correct entities. Default: ``True``.
- __ http://docutils.sourceforge.net/docs/user/smartquotes.html
+ __ https://docutils.sourceforge.io/docs/user/smartquotes.html
__ https://daringfireball.net/projects/smartypants/
.. versionadded:: 1.6.6
@@ -497,8 +497,8 @@ General configuration
*deactivates* smart quotes via the corresponding `Docutils option`__. But
if it *activates* them, then :confval:`smartquotes` does prevail.
- __ http://docutils.sourceforge.net/docs/user/config.html
- __ http://docutils.sourceforge.net/docs/user/config.html#smart-quotes
+ __ https://docutils.sourceforge.io/docs/user/config.html
+ __ https://docutils.sourceforge.io/docs/user/config.html#smart-quotes
.. confval:: smartquotes_action
diff --git a/doc/usage/extensions/napoleon.rst b/doc/usage/extensions/napoleon.rst
index bd2bcad3f..2752b1479 100644
--- a/doc/usage/extensions/napoleon.rst
+++ b/doc/usage/extensions/napoleon.rst
@@ -49,7 +49,7 @@ parse them. This happens in an intermediate step while Sphinx is processing
the documentation, so it doesn't modify any of the docstrings in your actual
source code files.
-.. _ReStructuredText: http://docutils.sourceforge.net/rst.html
+.. _ReStructuredText: https://docutils.sourceforge.io/rst.html
.. _docstrings: https://www.python.org/dev/peps/pep-0287/
.. _Google Python Style Guide:
https://google.github.io/styleguide/pyguide.html
diff --git a/doc/usage/restructuredtext/basics.rst b/doc/usage/restructuredtext/basics.rst
index 03b690f44..1c601ea2e 100644
--- a/doc/usage/restructuredtext/basics.rst
+++ b/doc/usage/restructuredtext/basics.rst
@@ -15,7 +15,7 @@ language, this will not take too long.
.. seealso::
The authoritative `reStructuredText User Documentation
- <http://docutils.sourceforge.net/rst.html>`_. The "ref" links in this
+ <https://docutils.sourceforge.io/rst.html>`_. The "ref" links in this
document link to the description of the individual constructs in the reST
reference.
diff --git a/doc/usage/restructuredtext/index.rst b/doc/usage/restructuredtext/index.rst
index ea346b3aa..87b6ed685 100644
--- a/doc/usage/restructuredtext/index.rst
+++ b/doc/usage/restructuredtext/index.rst
@@ -12,7 +12,7 @@ The below guides go through the most important aspects of reST. For the
authoritative reStructuredText reference, refer to the `docutils
documentation`__.
-__ http://docutils.sourceforge.net/rst.html
+__ https://docutils.sourceforge.io/rst.html
.. toctree::
:maxdepth: 2
diff --git a/sphinx/application.py b/sphinx/application.py
index 588a808f1..5319a3906 100644
--- a/sphinx/application.py
+++ b/sphinx/application.py
@@ -666,7 +666,7 @@ class Sphinx:
add_directive('my-directive', MyDirective)
For more details, see `the Docutils docs
- <http://docutils.sourceforge.net/docs/howto/rst-directives.html>`__ .
+ <https://docutils.sourceforge.io/docs/howto/rst-directives.html>`__ .
.. versionchanged:: 0.6
Docutils 0.5-style directive classes are now supported.
@@ -691,7 +691,7 @@ class Sphinx:
installed as the same name
For more details about role functions, see `the Docutils docs
- <http://docutils.sourceforge.net/docs/howto/rst-roles.html>`__ .
+ <https://docutils.sourceforge.io/docs/howto/rst-roles.html>`__ .
.. versionchanged:: 1.8
Add *override* keyword.
@@ -929,7 +929,7 @@ class Sphinx:
refs: `Transform Priority Range Categories`__
- __ http://docutils.sourceforge.net/docs/ref/transforms.html#transform-priority-range-categories
+ __ https://docutils.sourceforge.io/docs/ref/transforms.html#transform-priority-range-categories
""" # NOQA
self.registry.add_transform(transform)
diff --git a/sphinx/environment/collectors/metadata.py b/sphinx/environment/collectors/metadata.py
index 7b3628c9a..c684e4a4f 100644
--- a/sphinx/environment/collectors/metadata.py
+++ b/sphinx/environment/collectors/metadata.py
@@ -47,7 +47,7 @@ class MetadataCollector(EnvironmentCollector):
md[field_name.astext()] = field_body.astext()
elif isinstance(node, nodes.TextElement):
# other children must be TextElement
- # see: http://docutils.sourceforge.net/docs/ref/doctree.html#bibliographic-elements # NOQA
+ # see: https://docutils.sourceforge.io/docs/ref/doctree.html#bibliographic-elements # NOQA
md[node.__class__.__name__] = node.astext()
for name, value in md.items():
diff --git a/sphinx/transforms/i18n.py b/sphinx/transforms/i18n.py
index 2a5d6f121..cc5851f0e 100644
--- a/sphinx/transforms/i18n.py
+++ b/sphinx/transforms/i18n.py
@@ -261,7 +261,7 @@ class Locale(SphinxTransform):
# Structural Subelements phase1
# There is a possibility that only the title node is created.
- # see: http://docutils.sourceforge.net/docs/ref/doctree.html#structural-subelements
+ # see: https://docutils.sourceforge.io/docs/ref/doctree.html#structural-subelements
if isinstance(node, nodes.title):
# This generates: <section ...><title>msgstr</title></section>
msgstr = msgstr + '\n' + '=' * len(msgstr) * 2
diff --git a/tests/roots/test-intl/refs.txt b/tests/roots/test-intl/refs.txt
index 0f923a9e7..43c445cad 100644
--- a/tests/roots/test-intl/refs.txt
+++ b/tests/roots/test-intl/refs.txt
@@ -5,7 +5,7 @@ Translation Tips
-----------------
.. _download Sphinx: https://pypi.org/project/Sphinx/
-.. _Docutils site: http://docutils.sourceforge.net/
+.. _Docutils site: https://docutils.sourceforge.io/
.. _Sphinx site: http://sphinx-doc.org/
diff --git a/tests/test_intl.py b/tests/test_intl.py
index bb493c2f3..73d94166e 100644
--- a/tests/test_intl.py
+++ b/tests/test_intl.py
@@ -410,7 +410,7 @@ def test_text_admonitions(app):
app.build()
# --- admonitions
# #1206: gettext did not translate admonition directive's title
- # seealso: http://docutils.sourceforge.net/docs/ref/rst/directives.html#admonitions
+ # seealso: https://docutils.sourceforge.io/docs/ref/rst/directives.html#admonitions
result = (app.outdir / 'admonitions.txt').read_text()
directives = (
"attention", "caution", "danger", "error", "hint",
diff --git a/tests/test_metadata.py b/tests/test_metadata.py
index 465386430..0b803917e 100644
--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@@ -9,7 +9,7 @@
"""
# adapted from an example of bibliographic metadata at
-# http://docutils.sourceforge.net/docs/user/rst/demo.txt
+# https://docutils.sourceforge.io/docs/user/rst/demo.txt
import pytest
diff --git a/tests/test_writer_latex.py b/tests/test_writer_latex.py
index c3f6a622b..c3337b1df 100644
--- a/tests/test_writer_latex.py
+++ b/tests/test_writer_latex.py
@@ -15,7 +15,7 @@ from sphinx.writers.latex import rstdim_to_latexdim
def test_rstdim_to_latexdim():
# Length units docutils supported
- # http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#length-units
+ # https://docutils.sourceforge.io/docs/ref/rst/restructuredtext.html#length-units
assert rstdim_to_latexdim('160em') == '160em'
assert rstdim_to_latexdim('160px') == '160\\sphinxpxdimen'
assert rstdim_to_latexdim('160in') == '160in'