[3.2.x] Refs #32720 -- Updated various links in docs to avoid redirects and use HTTPS.

Backport of c156e369553c75a30c78b8ed54a57b1101865105 from main

17 files changed, 34 insertions, 33 deletions

diff --git a/docs/ref/class-based-views/base.txt b/docs/ref/class-based-views/base.txt
index b12b6e5765..e64fc03555 100644
--- a/docs/ref/class-based-views/base.txt
+++ b/docs/ref/class-based-views/base.txt
@@ -225,7 +225,7 @@ MRO is an acronym for Method Resolution Order.
         urlpatterns = [
             path('counter/<int:pk>/', ArticleCounterRedirectView.as_view(), name='article-counter'),
             path('details/<int:pk>/', ArticleDetailView.as_view(), name='article-detail'),
-            path('go-to-django/', RedirectView.as_view(url='https://djangoproject.com'), name='go-to-django'),
+            path('go-to-django/', RedirectView.as_view(url='https://www.djangoproject.com/'), name='go-to-django'),
         ]
 
     **Attributes**
diff --git a/docs/ref/clickjacking.txt b/docs/ref/clickjacking.txt
index 9d7c5cb0c3..a50e5ab11f 100644
--- a/docs/ref/clickjacking.txt
+++ b/docs/ref/clickjacking.txt
@@ -132,5 +132,5 @@ See also
 
 A `complete list`_ of browsers supporting ``X-Frame-Options``.
 
-.. _complete list: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options#Browser_compatibility
+.. _complete list: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options#browser_compatibility
 .. _other clickjacking prevention techniques: https://en.wikipedia.org/wiki/Clickjacking#Prevention
diff --git a/docs/ref/contrib/gis/gdal.txt b/docs/ref/contrib/gis/gdal.txt
index e3d8b70ced..9f4bed1a5d 100644
--- a/docs/ref/contrib/gis/gdal.txt
+++ b/docs/ref/contrib/gis/gdal.txt
@@ -21,7 +21,7 @@ to raster (image) data.
     Although the module is named ``gdal``, GeoDjango only supports some of the
     capabilities of OGR and GDAL's raster features at this time.
 
-__ https://www.gdal.org/
+__ https://gdal.org/
 __ https://gdal.org/user/vector_data_model.html
 
 Overview
@@ -1640,7 +1640,7 @@ Examples of using the different keys when creating rasters can be found in the
 documentation of the corresponding attributes and methods of the
 :class:`GDALRaster` and :class:`GDALBand` classes.
 
-__ https://geojson.org
+__ https://geojson.org/
 
 The ``ds_input`` dictionary
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/ref/contrib/gis/geoip2.txt b/docs/ref/contrib/gis/geoip2.txt
index 5d0d31cfd8..3542090e0b 100644
--- a/docs/ref/contrib/gis/geoip2.txt
+++ b/docs/ref/contrib/gis/geoip2.txt
@@ -20,7 +20,7 @@ that ``geoip2`` can leverage the C library's faster speed.
 __ https://geoip2.readthedocs.io/
 __ https://pypi.org/project/geoip2/
 __ https://dev.maxmind.com/geoip/geoip2/geolite2/
-__ https://github.com/maxmind/libmaxminddb
+__ https://github.com/maxmind/libmaxminddb/
 
 Example
 =======
diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt
index 446fb38108..1bca37824a 100644
--- a/docs/ref/contrib/gis/geos.txt
+++ b/docs/ref/contrib/gis/geos.txt
@@ -19,7 +19,7 @@ maintained by `Refractions Research`__ of Victoria, Canada.
 
 __ https://trac.osgeo.org/geos/
 __ https://sourceforge.net/projects/jts-topo-suite/
-__ https://www.opengeospatial.org/standards/sfs
+__ https://www.ogc.org/standards/sfs
 __ http://www.refractions.net/
 
 Features
diff --git a/docs/ref/contrib/gis/install/index.txt b/docs/ref/contrib/gis/install/index.txt
index c8343913cf..9682643d9f 100644
--- a/docs/ref/contrib/gis/install/index.txt
+++ b/docs/ref/contrib/gis/install/index.txt
@@ -117,7 +117,7 @@ community!  You can:
   sure to provide a complete description of the problem, versions used,
   and specify the component as "GIS".
 
-__ https://groups.google.com/d/forum/geodjango
+__ https://groups.google.com/g/geodjango
 __ https://code.djangoproject.com/newticket
 
 .. _libsettings:
@@ -333,8 +333,8 @@ of the `Fink`__ package system. `Different packages are available`__ (starting
 with ``django-gis``), depending on which version of Python you want to use.
 
 __ https://schwehr.blogspot.com/
-__ http://www.finkproject.org/
-__ http://pdb.finkproject.org/pdb/browse.php?summary=django-gis
+__ https://www.finkproject.org/
+__ https://pdb.finkproject.org/pdb/browse.php?summary=django-gis
 
 .. _macports:
 
diff --git a/docs/ref/contrib/gis/install/spatialite.txt b/docs/ref/contrib/gis/install/spatialite.txt
index 21929e7f84..3d9493352c 100644
--- a/docs/ref/contrib/gis/install/spatialite.txt
+++ b/docs/ref/contrib/gis/install/spatialite.txt
@@ -18,7 +18,7 @@ For Windows, you may find binaries on the `Gaia-SINS`__ home page.
 In any case, you should always be able to :ref:`install from source
 <spatialite_source>`.
 
-__ https://www.gaia-gis.it/fossil/libspatialite
+__ https://www.gaia-gis.it/fossil/libspatialite/index
 __ https://www.gaia-gis.it/gaia-sins/
 
 .. _spatialite_source:
diff --git a/docs/ref/contrib/gis/model-api.txt b/docs/ref/contrib/gis/model-api.txt
index 2955d6f5d4..8ad7cd8772 100644
--- a/docs/ref/contrib/gis/model-api.txt
+++ b/docs/ref/contrib/gis/model-api.txt
@@ -165,7 +165,7 @@ Additional Resources:
 
 __ https://en.wikipedia.org/wiki/Geodesy
 __ https://en.wikipedia.org/wiki/Great_circle
-__ https://www.spatialreference.org/ref/epsg/2796/
+__ https://spatialreference.org/ref/epsg/2796/
 __ https://spatialreference.org/
 __ https://web.archive.org/web/20080302095452/http://welcome.warnercnr.colostate.edu/class_info/nr502/lg3/datums_coordinates/spcs.html
 
@@ -263,9 +263,9 @@ determining `when to use geography data type over geometry data type
 <https://postgis.net/docs/using_postgis_dbmanagement.html#PostGIS_GeographyVSGeometry>`_.
 
 .. rubric:: Footnotes
-.. [#fnogc] OpenGIS Consortium, Inc., `Simple Feature Specification For SQL <https://www.opengeospatial.org/standards/sfs>`_.
+.. [#fnogc] OpenGIS Consortium, Inc., `Simple Feature Specification For SQL <https://www.ogc.org/standards/sfs>`_.
 .. [#fnogcsrid] *See id.* at Ch. 2.3.8, p. 39 (Geometry Values and Spatial Reference Systems).
-.. [#fnsrid] Typically, SRID integer corresponds to an EPSG (`European Petroleum Survey Group <http://www.epsg.org>`_) identifier.  However, it may also be associated with custom projections defined in spatial database's spatial reference systems table.
+.. [#fnsrid] Typically, SRID integer corresponds to an EPSG (`European Petroleum Survey Group <https://epsg.org/>`_) identifier.  However, it may also be associated with custom projections defined in spatial database's spatial reference systems table.
 .. [#fnthematic] Terry A. Slocum, Robert B. McMaster, Fritz C. Kessler, & Hugh H. Howard, *Thematic Cartography and Geographic Visualization* (Prentice Hall, 2nd edition), at Ch. 7.1.3.
 .. [#fndist] This limitation does not apply to PostGIS.
 .. [#fngeography] Please refer to the `PostGIS Geography Type <https://postgis.net/docs/using_postgis_dbmanagement.html#PostGIS_Geography>`_ documentation for more details.
diff --git a/docs/ref/contrib/gis/sitemaps.txt b/docs/ref/contrib/gis/sitemaps.txt
index 7d6db492b5..c81760a2af 100644
--- a/docs/ref/contrib/gis/sitemaps.txt
+++ b/docs/ref/contrib/gis/sitemaps.txt
@@ -19,4 +19,4 @@ Reference
 --------------
 
 .. rubric:: Footnotes
-.. [#] https://www.opengeospatial.org/standards/kml
+.. [#] https://www.ogc.org/standards/kml
diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
index 3a200ca6b7..d6a01c3790 100644
--- a/docs/ref/contrib/gis/tutorial.txt
+++ b/docs/ref/contrib/gis/tutorial.txt
@@ -36,7 +36,7 @@ basic apps`_ project. [#]_
     Proceed through the tutorial sections sequentially for step-by-step
     instructions.
 
-.. _OGC: https://www.opengeospatial.org/
+.. _OGC: https://www.ogc.org/
 .. _world borders: https://thematicmapping.org/downloads/world_borders.php
 .. _GeoDjango basic apps: https://code.google.com/archive/p/geodjango-basic-apps
 
@@ -769,4 +769,4 @@ in your ``admin.py`` file::
 .. [#] This point is the `University of Houston Law Center
        <https://www.law.uh.edu/>`_.
 .. [#] Open Geospatial Consortium, Inc., `OpenGIS Simple Feature Specification
-       For SQL <https://www.opengeospatial.org/standards/sfs>`_.
+       For SQL <https://www.ogc.org/standards/sfs>`_.
diff --git a/docs/ref/contrib/sitemaps.txt b/docs/ref/contrib/sitemaps.txt
index 936567411e..43ad1212d9 100644
--- a/docs/ref/contrib/sitemaps.txt
+++ b/docs/ref/contrib/sitemaps.txt
@@ -273,7 +273,7 @@ Note:
         links pointing to other language versions using the `hreflang
         attribute`_. The default is ``False``.
 
-        .. _hreflang attribute: https://support.google.com/webmasters/answer/189077
+        .. _hreflang attribute: https://developers.google.com/search/docs/advanced/crawling/localized-versions
 
     .. attribute:: Sitemap.x_default
 
@@ -516,7 +516,7 @@ generate a Google News compatible sitemap:
     {% endspaceless %}
     </urlset>
 
-.. _`Google news sitemaps`: https://support.google.com/news/publisher/answer/74288?hl=en
+.. _`Google news sitemaps`: https://support.google.com/news/publisher-center/answer/9606710
 
 Pinging Google
 ==============
@@ -547,9 +547,9 @@ that: :func:`django.contrib.sitemaps.ping_google()`.
 .. admonition:: Register with Google first!
 
     The :func:`ping_google` command only works if you have registered your
-    site with `Google Webmaster Tools`_.
+    site with `Google Search Console`_.
 
-.. _`Google Webmaster Tools`: https://www.google.com/webmasters/tools/
+.. _`Google Search Console`: https://search.google.com/search-console/welcome
 
 One useful way to call :func:`ping_google` is from a model's ``save()``
 method::
diff --git a/docs/ref/contrib/sites.txt b/docs/ref/contrib/sites.txt
index 11abed3231..30d21b17f4 100644
--- a/docs/ref/contrib/sites.txt
+++ b/docs/ref/contrib/sites.txt
@@ -91,7 +91,7 @@ This accomplishes several things quite nicely:
               raise Http404("Article does not exist on this site")
           # ...
 
-.. _ljworld.com: http://www.ljworld.com/
+.. _ljworld.com: https://www2.ljworld.com/
 .. _lawrence.com: http://www.lawrence.com/
 
 Associating content with a single site
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 8fc9e89662..e1b4991920 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -232,7 +232,7 @@ Another option is to wrap each ``QuerySet`` using server-side cursors in an
 for the duration of the transaction. This way, the server-side cursor will only
 live for the duration of the transaction.
 
-.. _PgBouncer: https://pgbouncer.github.io/
+.. _PgBouncer: https://www.pgbouncer.org/
 
 .. _manually-specified-autoincrement-pk:
 
@@ -346,7 +346,7 @@ MySQL has a couple drivers that implement the Python Database API described in
   library.
 
 .. _mysqlclient: https://pypi.org/project/mysqlclient/
-.. _MySQL Connector/Python: https://dev.mysql.com/downloads/connector/python
+.. _MySQL Connector/Python: https://dev.mysql.com/downloads/connector/python/
 
 These drivers are thread-safe and provide connection pooling.
 
@@ -787,7 +787,7 @@ a row is added, changed, or deleted within the loop, then that row may or may
 not appear, or may appear twice, in subsequent results fetched from the
 iterator. Your code must handle this.
 
-.. _`Isolation in SQLite`: https://sqlite.org/isolation.html
+.. _`Isolation in SQLite`: https://www.sqlite.org/isolation.html
 
 .. _sqlite-json1:
 
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 0b5b9f712b..943a96a445 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -1790,7 +1790,7 @@ Example usage::
 
     django-admin migrate --pythonpath='/home/djangoprojects/myproject'
 
-.. _import search path: https://www.diveinto.org/python3/your-first-python-program.html#importsearchpath
+.. _import search path: https://diveinto.org/python3/your-first-python-program.html#importsearchpath
 
 .. django-admin-option:: --settings SETTINGS
 
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
index 0078c716c0..e6188d1792 100644
--- a/docs/ref/middleware.txt
+++ b/docs/ref/middleware.txt
@@ -443,7 +443,7 @@ in the :setting:`SECURE_REDIRECT_EXEMPT` setting.
     Django can't seem to tell when a request actually is already secure, you
     may need to set the :setting:`SECURE_PROXY_SSL_HEADER` setting.
 
-.. _nginx: https://nginx.org
+.. _nginx: https://nginx.org/
 
 Session middleware
 ------------------
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index 9595161671..b4bcc22122 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -1126,9 +1126,9 @@ Without passing ``safe=False``, a :exc:`TypeError` will be raised.
 .. warning::
 
     Before the `5th edition of ECMAScript
-    <https://www.ecma-international.org/ecma-262/5.1/index.html#sec-11.1.4>`_
-    it was possible to poison the JavaScript ``Array`` constructor. For this
-    reason, Django does not allow passing non-dict objects to the
+    <https://262.ecma-international.org/5.1/#sec-11.1.4>`_ it was possible to
+    poison the JavaScript ``Array`` constructor. For this reason, Django does
+    not allow passing non-dict objects to the
     :class:`~django.http.JsonResponse` constructor by default.  However, most
     modern browsers implement EcmaScript 5 which removes this attack vector.
     Therefore it is possible to disable this security precaution.
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 02b63db248..709f231729 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1337,8 +1337,9 @@ If ``value`` is ``"String with spaces"``, the output will be
 
 Formats a date according to the given format.
 
-Uses a similar format as PHP's ``date()`` function (https://php.net/date)
-with some differences.
+Uses a similar format to PHP's `date()
+<https://www.php.net/manual/en/function.date.php>`_ function with some
+differences.
 
 .. note::
     These format characters are not used in Django outside of templates. They
@@ -2124,8 +2125,8 @@ individual elements of the sequence.
 Returns a slice of the list.
 
 Uses the same syntax as Python's list slicing. See
-https://www.diveinto.org/python3/native-datatypes.html#slicinglists
-for an introduction.
+https://diveinto.org/python3/native-datatypes.html#slicinglists for an
+introduction.
 
 Example::