[1.9.x] Fixed #26554 -- Updated docs URLs to readthedocs.io

Backport of f945fb24a31737c6625205a8cd90eabdf1c33584 from master

22 files changed, 36 insertions, 36 deletions

diff --git a/django/contrib/gis/geoip2/__init__.py b/django/contrib/gis/geoip2/__init__.py
index b6142e0844..b76dfa6ef8 100644
--- a/django/contrib/gis/geoip2/__init__.py
+++ b/django/contrib/gis/geoip2/__init__.py
@@ -1,6 +1,6 @@
 """
 This module houses the GeoIP2 object, a wrapper for the MaxMind GeoIP2(R)
-Python API (http://geoip2.readthedocs.org/). This is an alternative to the
+Python API (https://geoip2.readthedocs.io/). This is an alternative to the
 Python GeoIP2 interface provided by MaxMind.
 
 GeoIP(R) is a registered trademark of MaxMind, Inc.
diff --git a/docs/conf.py b/docs/conf.py
index b146392c0d..49f8d82b07 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -138,7 +138,7 @@ intersphinx_mapping = {
     'python': ('https://docs.python.org/3/', None),
     'sphinx': ('http://sphinx-doc.org/', None),
     'six': ('https://pythonhosted.org/six/', None),
-    'formtools': ('http://django-formtools.readthedocs.org/en/latest/', None),
+    'formtools': ('https://django-formtools.readthedocs.io/en/latest/', None),
     'psycopg2': ('http://initd.org/psycopg/docs/', None),
 }
 
diff --git a/docs/howto/deployment/checklist.txt b/docs/howto/deployment/checklist.txt
index 5effdb7072..fe3692bf06 100644
--- a/docs/howto/deployment/checklist.txt
+++ b/docs/howto/deployment/checklist.txt
@@ -233,7 +233,7 @@ See :doc:`/howto/error-reporting` for details on error reporting by email.
     Consider using an error monitoring system such as Sentry_ before your
     inbox is flooded by reports. Sentry can also aggregate logs.
 
-    .. _Sentry: https://sentry.readthedocs.org/en/latest/
+    .. _Sentry: https://docs.getsentry.com/
 
 Customize the default error views
 ---------------------------------
diff --git a/docs/howto/deployment/wsgi/apache-auth.txt b/docs/howto/deployment/wsgi/apache-auth.txt
index e6fea98c85..ff84a3f433 100644
--- a/docs/howto/deployment/wsgi/apache-auth.txt
+++ b/docs/howto/deployment/wsgi/apache-auth.txt
@@ -97,8 +97,8 @@ Requests beginning with ``/secret/`` will now require a user to authenticate.
 The mod_wsgi `access control mechanisms documentation`_ provides additional
 details and information about alternative methods of authentication.
 
-.. _Defining Application Groups: https://modwsgi.readthedocs.org/en/develop/user-guides/configuration-guidelines.html#defining-application-groups
-.. _access control mechanisms documentation: https://modwsgi.readthedocs.org/en/develop/user-guides/access-control-mechanisms.html
+.. _Defining Application Groups: https://modwsgi.readthedocs.io/en/develop/user-guides/configuration-guidelines.html#defining-application-groups
+.. _access control mechanisms documentation: https://modwsgi.readthedocs.io/en/develop/user-guides/access-control-mechanisms.html
 
 Authorization with ``mod_wsgi`` and Django groups
 -------------------------------------------------
diff --git a/docs/howto/deployment/wsgi/modwsgi.txt b/docs/howto/deployment/wsgi/modwsgi.txt
index 96c7e48293..de02d3b367 100644
--- a/docs/howto/deployment/wsgi/modwsgi.txt
+++ b/docs/howto/deployment/wsgi/modwsgi.txt
@@ -18,8 +18,8 @@ The `official mod_wsgi documentation`_ is fantastic; it's your source for all
 the details about how to use mod_wsgi. You'll probably want to start with the
 `installation and configuration documentation`_.
 
-.. _official mod_wsgi documentation: https://modwsgi.readthedocs.org/
-.. _installation and configuration documentation: https://modwsgi.readthedocs.org/en/develop/installation.html
+.. _official mod_wsgi documentation: https://modwsgi.readthedocs.io/
+.. _installation and configuration documentation: https://modwsgi.readthedocs.io/en/develop/installation.html
 
 Basic configuration
 ===================
@@ -139,7 +139,7 @@ to the configuration above:
 See the official mod_wsgi documentation for `details on setting up daemon
 mode`_.
 
-.. _details on setting up daemon mode: https://modwsgi.readthedocs.org/en/develop/user-guides/quick-configuration-guide.html#delegation-to-daemon-process
+.. _details on setting up daemon mode: https://modwsgi.readthedocs.io/en/develop/user-guides/quick-configuration-guide.html#delegation-to-daemon-process
 
 .. _serving-files:
 
@@ -197,7 +197,7 @@ If you are using a version of Apache older than 2.4, replace
 .. More details on configuring a mod_wsgi site to serve static files can be found
 .. in the mod_wsgi documentation on `hosting static files`_.
 
-.. _hosting static files: https://modwsgi.readthedocs.org/en/develop/user-guides/configuration-guidelines.html#hosting-of-static-files
+.. _hosting static files: https://modwsgi.readthedocs.io/en/develop/user-guides/configuration-guidelines.html#hosting-of-static-files
 
 .. _serving-the-admin-files:
 
diff --git a/docs/howto/deployment/wsgi/uwsgi.txt b/docs/howto/deployment/wsgi/uwsgi.txt
index 666d735fa2..bf869a77b8 100644
--- a/docs/howto/deployment/wsgi/uwsgi.txt
+++ b/docs/howto/deployment/wsgi/uwsgi.txt
@@ -15,7 +15,7 @@ container server coded in pure C.
     possible deployment setup of many). The docs below are focused on how to
     integrate Django with uWSGI.
 
-    .. _tutorial: https://uwsgi.readthedocs.org/en/latest/tutorials/Django_and_nginx.html
+    .. _tutorial: https://uwsgi.readthedocs.io/en/latest/tutorials/Django_and_nginx.html
 
 Prerequisite: uWSGI
 ===================
@@ -32,7 +32,7 @@ command. For example:
     # Or install LTS (long term support).
     $ pip install https://projects.unbit.it/downloads/uwsgi-lts.tar.gz
 
-.. _installation procedures: http://uwsgi-docs.readthedocs.org/en/latest/Install.html
+.. _installation procedures: https://uwsgi-docs.readthedocs.io/en/latest/Install.html
 
 .. warning::
 
@@ -58,7 +58,7 @@ Configuring and starting the uWSGI server for Django
 uWSGI supports multiple ways to configure the process. See uWSGI's
 `configuration documentation`_ and `examples`_.
 
-.. _configuration documentation: https://uwsgi.readthedocs.org/en/latest/Configuration.html
+.. _configuration documentation: https://uwsgi.readthedocs.io/en/latest/Configuration.html
 .. _examples: https://projects.unbit.it/uwsgi/wiki/Example
 
 Here's an example command to start a uWSGI server::
@@ -122,4 +122,4 @@ Example ini configuration file usage::
 See the uWSGI docs on `managing the uWSGI process`_ for information on
 starting, stopping and reloading the uWSGI workers.
 
-.. _managing the uWSGI process: http://uwsgi-docs.readthedocs.org/en/latest/Management.html
+.. _managing the uWSGI process: https://uwsgi-docs.readthedocs.io/en/latest/Management.html
diff --git a/docs/howto/jython.txt b/docs/howto/jython.txt
index 981e43d630..607bbbdd1b 100644
--- a/docs/howto/jython.txt
+++ b/docs/howto/jython.txt
@@ -71,4 +71,4 @@ running on standard Python. However, are a few differences to keep in mind:
 
 * Any part of Django that requires `Pillow`_ will not work.
 
-.. _Pillow: https://pillow.readthedocs.org/en/latest/
+.. _Pillow: https://pillow.readthedocs.io/en/latest/
diff --git a/docs/internals/team.txt b/docs/internals/team.txt
index ecb7c84162..72574d26a1 100644
--- a/docs/internals/team.txt
+++ b/docs/internals/team.txt
@@ -405,7 +405,7 @@ Daniele Procida
 
     .. _Divio: https://divio.ch/
     .. _Arkestra: http://arkestra-project.org/
-    .. _Don\'t be afraid to commit: https://dont-be-afraid-to-commit.readthedocs.org
+    .. _Don\'t be afraid to commit: https://dont-be-afraid-to-commit.readthedocs.io
 
 `Erik Romijn`_
     Erik started using Django in the days of 1.2. His largest contribution to Django was
diff --git a/docs/intro/contributing.txt b/docs/intro/contributing.txt
index 1c6d321375..ab183896ae 100644
--- a/docs/intro/contributing.txt
+++ b/docs/intro/contributing.txt
@@ -188,7 +188,7 @@ If the ``source`` command is not available, you can try using a dot instead:
 You have to activate the virtualenv whenever you open a new terminal window.
 virtualenvwrapper__ is a useful tool for making this more convenient.
 
-__ https://virtualenvwrapper.readthedocs.org/en/latest/
+__ https://virtualenvwrapper.readthedocs.io/en/latest/
 
 Anything you install through ``pip`` from now on will be installed in your new
 virtualenv, isolated from other environments and system-wide packages. Also, the
diff --git a/docs/ref/contrib/gis/geoip2.txt b/docs/ref/contrib/gis/geoip2.txt
index 8e51aa6fb5..208a160537 100644
--- a/docs/ref/contrib/gis/geoip2.txt
+++ b/docs/ref/contrib/gis/geoip2.txt
@@ -19,7 +19,7 @@ in a directory corresponding to the :setting:`GEOIP_PATH` setting.
 Additionally, it is recommended to install the `libmaxminddb C library`__, so
 that ``geoip2`` can leverage the C library's faster speed.
 
-__ https://geoip2.readthedocs.org/
+__ https://geoip2.readthedocs.io/
 __ https://pypi.python.org/pypi/geoip2
 __ http://dev.maxmind.com/geoip/geoip2/geolite2/
 __ https://github.com/maxmind/libmaxminddb
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index d1d3e04894..fda7a0af6e 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -936,6 +936,6 @@ the support channels provided by each 3rd party project.
 
 .. _SAP SQL Anywhere: https://github.com/sqlanywhere/sqlany-django
 .. _IBM DB2: https://pypi.python.org/pypi/ibm_db/
-.. _Microsoft SQL Server: http://django-mssql.readthedocs.org/en/latest/
+.. _Microsoft SQL Server: https://django-mssql.readthedocs.io/en/latest/
 .. _Firebird: https://github.com/maxirobaina/django-firebird
 .. _ODBC: https://github.com/lionheart/django-pyodbc/
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index 56b82044fa..577329fab9 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -716,8 +716,8 @@ For each field, we describe the default widget used if you don't specify
         The ``image`` and ``content_type`` attributes described in the last
         paragraph were added.
 
-.. _Pillow: https://pillow.readthedocs.org/en/latest/
-.. _Image: https://pillow.readthedocs.org/en/latest/reference/Image.html
+.. _Pillow: https://pillow.readthedocs.io/en/latest/
+.. _Image: https://pillow.readthedocs.io/en/latest/reference/Image.html
 
 ``IntegerField``
 ----------------
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index 9de9206bc8..5976ee70ac 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -14,7 +14,7 @@ This document contains all the API references of :class:`Field` including the
 
     If the built-in fields don't do the trick, you can try `django-localflavor
     <https://github.com/django/django-localflavor>`_ (`documentation
-    <https://django-localflavor.readthedocs.org/>`_), which contains assorted
+    <https://django-localflavor.readthedocs.io/>`_), which contains assorted
     pieces of code that are useful for particular countries and cultures.
 
     Also, you can easily :doc:`write your own custom model fields
@@ -929,7 +929,7 @@ optional arguments:
 
 Requires the `Pillow`_ library.
 
-.. _Pillow: https://pillow.readthedocs.org/en/latest/
+.. _Pillow: https://pillow.readthedocs.io/en/latest/
 
 :class:`ImageField` instances are created in your database as ``varchar``
 columns with a default max length of 100 characters. As with other fields, you
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index e67dc637c3..12a7b6efb8 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1945,7 +1945,7 @@ removetags
     ``removetags`` cannot guarantee HTML safe output and has been deprecated due
     to security concerns. Consider using `bleach`_ instead.
 
-.. _bleach: http://bleach.readthedocs.org/en/latest/
+.. _bleach: https://bleach.readthedocs.io/en/latest/
 
 Removes a space-separated list of [X]HTML tags from the output.
 
@@ -2089,7 +2089,7 @@ output will be ``"Joel is a slug"``.
     more robust, you can use the ``bleach`` Python library, notably its
     `clean`_ method.
 
-.. _clean: https://bleach.readthedocs.org/en/latest/clean.html
+.. _clean: https://bleach.readthedocs.io/en/latest/clean.html
 
 .. templatefilter:: time
 
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index ee125157b3..cf01dc7b7c 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -81,7 +81,7 @@ but a few of the key features are:
 
 * If you are upgrading from South, see our :ref:`upgrading-from-south`
   documentation, and third-party app authors should read the
-  `South 1.0 release notes <http://south.readthedocs.org/en/latest/releasenotes/1.0.html#library-migration-path>`_
+  `South 1.0 release notes <https://south.readthedocs.io/en/latest/releasenotes/1.0.html#library-migration-path>`_
   for details on how to support South and Django migrations simultaneously.
 
 .. _app-loading-refactor-17-release-note:
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index 78245d8b6f..0871c70d09 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -116,7 +116,7 @@ though:
 * The new :attr:`~django.contrib.auth.mixins.AccessMixin.permission_denied_message`
   attribute allows passing a message to the ``PermissionDenied`` exception.
 
-.. _django-braces: http://django-braces.readthedocs.org/en/latest/index.html
+.. _django-braces: https://django-braces.readthedocs.io/en/latest/index.html
 
 New styling for ``contrib.admin``
 ---------------------------------
diff --git a/docs/topics/external-packages.txt b/docs/topics/external-packages.txt
index e74274c0fd..0234264c2d 100644
--- a/docs/topics/external-packages.txt
+++ b/docs/topics/external-packages.txt
@@ -13,7 +13,7 @@ Localflavor
 and cultures.
 
 * `GitHub <https://github.com/django/django-localflavor>`__
-* `Documentation <https://django-localflavor.readthedocs.org/>`__
+* `Documentation <https://django-localflavor.readthedocs.io/>`__
 * `PyPI <https://pypi.python.org/pypi/django-localflavor>`__
 
 Comments
@@ -25,7 +25,7 @@ else. Most users will be better served with a custom solution, or a hosted
 product like Disqus.
 
 * `GitHub <https://github.com/django/django-contrib-comments>`__
-* `Documentation <http://django-contrib-comments.readthedocs.org/>`__
+* `Documentation <https://django-contrib-comments.readthedocs.io/>`__
 * `PyPI <https://pypi.python.org/pypi/django-contrib-comments>`__
 
 Formtools
@@ -34,5 +34,5 @@ Formtools
 ``django-formtools`` is a collection of assorted utilities to work with forms.
 
 * `GitHub <https://github.com/django/django-formtools>`__
-* `Documentation <http://django-formtools.readthedocs.org/>`__
+* `Documentation <https://django-formtools.readthedocs.io/>`__
 * `PyPI <https://pypi.python.org/pypi/django-formtools>`__
diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt
index b7255c2d52..6119a65d8d 100644
--- a/docs/topics/i18n/translation.txt
+++ b/docs/topics/i18n/translation.txt
@@ -1302,7 +1302,7 @@ You can even pre-generate the JavaScript catalog as part of your deployment
 procedure and serve it as a static file. This radical technique is implemented
 in django-statici18n_.
 
-.. _django-statici18n: http://django-statici18n.readthedocs.org/en/latest/
+.. _django-statici18n: https://django-statici18n.readthedocs.io/en/latest/
 
 .. _url-internationalization:
 
diff --git a/docs/topics/install.txt b/docs/topics/install.txt
index fcfd3a89af..2b5a5d045f 100644
--- a/docs/topics/install.txt
+++ b/docs/topics/install.txt
@@ -178,7 +178,7 @@ This is the recommended way to install Django.
 
 .. _pip: https://pip.pypa.io/
 .. _virtualenv: http://www.virtualenv.org/
-.. _virtualenvwrapper: https://virtualenvwrapper.readthedocs.org/en/latest/
+.. _virtualenvwrapper: https://virtualenvwrapper.readthedocs.io/en/latest/
 .. _standalone pip installer: https://pip.pypa.io/en/latest/installing.html#install-pip
 
 Installing a distribution-specific package
diff --git a/docs/topics/migrations.txt b/docs/topics/migrations.txt
index 5534e1dd6c..8bb292bfc4 100644
--- a/docs/topics/migrations.txt
+++ b/docs/topics/migrations.txt
@@ -825,7 +825,7 @@ as you put your South migrations in the ``south_migrations`` directory and
 your Django migrations in the ``migrations`` directory.
 
 More information is available in the
-`South 1.0 release notes <http://south.readthedocs.org/en/latest/releasenotes/1.0.html#library-migration-path>`_.
+`South 1.0 release notes <https://south.readthedocs.io/en/latest/releasenotes/1.0.html#library-migration-path>`_.
 
 .. seealso::
 
diff --git a/docs/topics/testing/tools.txt b/docs/topics/testing/tools.txt
index c315051080..50a23e0afd 100644
--- a/docs/topics/testing/tools.txt
+++ b/docs/topics/testing/tools.txt
@@ -935,7 +935,7 @@ out the `full reference`_ for more details.
 
 .. _Selenium: http://seleniumhq.org/
 .. _selenium package: https://pypi.python.org/pypi/selenium
-.. _full reference: http://selenium-python.readthedocs.org/en/latest/api.html
+.. _full reference: https://selenium-python.readthedocs.io/api.html
 .. _Firefox: https://www.mozilla.com/firefox/
 
 .. note::
diff --git a/tests/auth_tests/test_handlers.py b/tests/auth_tests/test_handlers.py
index 6228607fae..22e7b14aa1 100644
--- a/tests/auth_tests/test_handlers.py
+++ b/tests/auth_tests/test_handlers.py
@@ -23,7 +23,7 @@ class ModWsgiHandlerTestCase(TransactionTestCase):
     def test_check_password(self):
         """
         Verify that check_password returns the correct values as per
-        https://modwsgi.readthedocs.org/en/develop/user-guides/access-control-mechanisms.html#apache-authentication-provider
+        https://modwsgi.readthedocs.io/en/develop/user-guides/access-control-mechanisms.html#apache-authentication-provider
         """
         User.objects.create_user('test', 'test@example.com', 'test')
 
@@ -44,7 +44,7 @@ class ModWsgiHandlerTestCase(TransactionTestCase):
     def test_check_password_custom_user(self):
         """
         Verify that check_password returns the correct values as per
-        https://modwsgi.readthedocs.org/en/develop/user-guides/access-control-mechanisms.html#apache-authentication-provider
+        https://modwsgi.readthedocs.io/en/develop/user-guides/access-control-mechanisms.html#apache-authentication-provider
         with custom user installed
         """
 
@@ -62,7 +62,7 @@ class ModWsgiHandlerTestCase(TransactionTestCase):
     def test_groups_for_user(self):
         """
         Check that groups_for_user returns correct values as per
-        https://modwsgi.readthedocs.org/en/develop/user-guides/access-control-mechanisms.html#apache-group-authorisation
+        https://modwsgi.readthedocs.io/en/develop/user-guides/access-control-mechanisms.html#apache-group-authorisation
         """
         user1 = User.objects.create_user('test', 'test@example.com', 'test')
         User.objects.create_user('test1', 'test1@example.com', 'test1')