summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2020-01-29 09:34:37 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-01-29 09:35:45 +0100
commit27e4ebc0baa0c522a2ac7758e9dba4f654eac8fe (patch)
tree84e65e801f7a894111f82a4a93980fe86fde75ca
parent21cc09740343e89c951fa7fd9532a4eb62e1c8d7 (diff)
[3.0.x] Refs #25778 -- Updated some links to HTTPS and new locations.
Backport of 0ac8ac8b0dece68072548900e992fc31493154c1 from master
-rw-r--r--docs/internals/contributing/writing-documentation.txt2
-rw-r--r--docs/ref/contrib/admin/admindocs.txt2
-rw-r--r--docs/ref/contrib/gis/functions.txt4
-rw-r--r--docs/ref/contrib/gis/gdal.txt2
-rw-r--r--docs/ref/contrib/gis/install/geolibs.txt2
-rw-r--r--docs/ref/contrib/gis/model-api.txt4
-rw-r--r--docs/ref/contrib/gis/serializers.txt2
-rw-r--r--docs/ref/contrib/gis/tutorial.txt4
-rw-r--r--docs/ref/templates/language.txt2
-rw-r--r--docs/releases/1.0.txt2
-rw-r--r--docs/releases/1.4.txt2
11 files changed, 14 insertions, 14 deletions
diff --git a/docs/internals/contributing/writing-documentation.txt b/docs/internals/contributing/writing-documentation.txt
index caad5eeecd..34aa12daba 100644
--- a/docs/internals/contributing/writing-documentation.txt
+++ b/docs/internals/contributing/writing-documentation.txt
@@ -43,7 +43,7 @@ is based on docutils__. The basic idea is that lightly-formatted plain-text
documentation is transformed into HTML, PDF, and any other output format.
__ https://www.sphinx-doc.org/
-__ http://docutils.sourceforge.net/
+__ https://docutils.sourceforge.io/
To build the documentation locally, install Sphinx:
diff --git a/docs/ref/contrib/admin/admindocs.txt b/docs/ref/contrib/admin/admindocs.txt
index 7779fe822a..cf97af21e4 100644
--- a/docs/ref/contrib/admin/admindocs.txt
+++ b/docs/ref/contrib/admin/admindocs.txt
@@ -23,7 +23,7 @@ the following:
your ``urlpatterns``. Make sure it's included *before* the
``'admin/'`` entry, so that requests to ``/admin/doc/`` don't get
handled by the latter entry.
-* Install the docutils Python module (http://docutils.sf.net/).
+* Install the docutils Python module (https://docutils.sourceforge.io/).
* **Optional:** Using the admindocs bookmarklets requires
``django.contrib.admindocs.middleware.XViewMiddleware`` to be installed.
diff --git a/docs/ref/contrib/gis/functions.txt b/docs/ref/contrib/gis/functions.txt
index 0f50344ea4..fb46f98a72 100644
--- a/docs/ref/contrib/gis/functions.txt
+++ b/docs/ref/contrib/gis/functions.txt
@@ -57,8 +57,8 @@ geographic SRSes.
`PostGIS <https://postgis.net/docs/ST_AsGeoJSON.html>`__, SpatiaLite
Accepts a single geographic field or expression and returns a `GeoJSON
-<http://geojson.org/>`_ representation of the geometry. Note that the result is
-not a complete GeoJSON structure but only the ``geometry`` key content of a
+<https://geojson.org/>`_ representation of the geometry. Note that the result
+is not a complete GeoJSON structure but only the ``geometry`` key content of a
GeoJSON structure. See also :doc:`/ref/contrib/gis/serializers`.
Example::
diff --git a/docs/ref/contrib/gis/gdal.txt b/docs/ref/contrib/gis/gdal.txt
index 879ed855f6..f022c89040 100644
--- a/docs/ref/contrib/gis/gdal.txt
+++ b/docs/ref/contrib/gis/gdal.txt
@@ -1629,7 +1629,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.
-__ http://geojson.org
+__ https://geojson.org
The ``ds_input`` dictionary
~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt
index 0454124887..8f63139e60 100644
--- a/docs/ref/contrib/gis/install/geolibs.txt
+++ b/docs/ref/contrib/gis/install/geolibs.txt
@@ -231,7 +231,7 @@ the GDAL library. For example::
.. [#] The datum shifting files are needed for converting data to and from
certain projections.
For example, the PROJ.4 string for the `Google projection (900913 or 3857)
- <http://spatialreference.org/ref/sr-org/6864/prj/>`_ requires the
+ <https://spatialreference.org/ref/sr-org/6864/prj/>`_ requires the
``null`` grid file only included in the extra datum shifting files.
It is easier to install the shifting files now, then to have debug a
problem caused by their absence later.
diff --git a/docs/ref/contrib/gis/model-api.txt b/docs/ref/contrib/gis/model-api.txt
index 0f9c311922..2955d6f5d4 100644
--- a/docs/ref/contrib/gis/model-api.txt
+++ b/docs/ref/contrib/gis/model-api.txt
@@ -165,8 +165,8 @@ Additional Resources:
__ https://en.wikipedia.org/wiki/Geodesy
__ https://en.wikipedia.org/wiki/Great_circle
-__ http://www.spatialreference.org/ref/epsg/2796/
-__ http://spatialreference.org/
+__ https://www.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
``spatial_index``
diff --git a/docs/ref/contrib/gis/serializers.txt b/docs/ref/contrib/gis/serializers.txt
index 057462124d..5ab3e56704 100644
--- a/docs/ref/contrib/gis/serializers.txt
+++ b/docs/ref/contrib/gis/serializers.txt
@@ -8,7 +8,7 @@
GeoDjango provides a specific serializer for the `GeoJSON`__ format. See
:doc:`/topics/serialization` for more information on serialization.
-__ http://geojson.org/
+__ https://geojson.org/
The ``geojson`` serializer is not meant for round-tripping data, as it has no
deserializer equivalent. For example, you cannot use :djadmin:`loaddata` to
diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
index 8fd8d60b62..8cf95622f4 100644
--- a/docs/ref/contrib/gis/tutorial.txt
+++ b/docs/ref/contrib/gis/tutorial.txt
@@ -637,7 +637,7 @@ of abstraction::
>>> qs # printing evaluates the queryset
<QuerySet [<WorldBorder: United States>]>
-__ http://spatialreference.org/ref/epsg/32140/
+__ https://spatialreference.org/ref/epsg/32140/
.. _gis-raw-sql:
@@ -741,7 +741,7 @@ position.
.. _OpenLayers: https://openlayers.org/
.. _Open Street Map: https://www.openstreetmap.org/
-.. _Vector Map Level 0: http://earth-info.nga.mil/publications/vmap0.html
+.. _Vector Map Level 0: https://earth-info.nga.mil/publications/vmap0.html
.. _OSGeo: https://www.osgeo.org/
.. _osmgeoadmin-intro:
diff --git a/docs/ref/templates/language.txt b/docs/ref/templates/language.txt
index 62f866bbc0..de018c0896 100644
--- a/docs/ref/templates/language.txt
+++ b/docs/ref/templates/language.txt
@@ -29,7 +29,7 @@ or Jinja2_, you should feel right at home with Django's templates.
.. _`The Django template language: For Python programmers`: ../templates_python/
.. _Smarty: https://www.smarty.net/
-.. _Jinja2: http://jinja.pocoo.org/
+.. _Jinja2: https://palletsprojects.com/p/jinja/
Templates
=========
diff --git a/docs/releases/1.0.txt b/docs/releases/1.0.txt
index 0c24ca3fb9..680e81f812 100644
--- a/docs/releases/1.0.txt
+++ b/docs/releases/1.0.txt
@@ -154,7 +154,7 @@ Django's codebase has been refactored to remove incompatibilities with
on the Java Virtual Machine. Django is now compatible with the forthcoming
Jython 2.5 release.
-.. _Jython: http://www.jython.org/
+.. _Jython: https://www.jython.org/
Generic relations in forms and admin
------------------------------------
diff --git a/docs/releases/1.4.txt b/docs/releases/1.4.txt
index ccee3df153..b412d83064 100644
--- a/docs/releases/1.4.txt
+++ b/docs/releases/1.4.txt
@@ -115,7 +115,7 @@ comprehensively. See the
:class:`documentation<django.test.LiveServerTestCase>` for more details and
concrete examples.
-.. _Selenium: http://seleniumhq.org/
+.. _Selenium: https://selenium.dev/
Updated default project layout and ``manage.py``
------------------------------------------------