summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Pope <nick@nickpope.me.uk>2021-04-27 16:38:57 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2021-05-17 12:14:20 +0200
commit55b89e8cac2f8cc7cf3f96dfa138b3b9fda81160 (patch)
treed2652c7512bb98834b08c0b1d4b7614e4b4b3c4e
parent0c19b075b239bc99886979c9af706b18e634ed69 (diff)
downloaddjango-55b89e8cac2f8cc7cf3f96dfa138b3b9fda81160.tar.gz
[3.2.x] Refs #32720 -- Fixed some broken links in docs.
Backport of 7c4ee487c7392a3a394caf62efad355fad639655 from main
-rw-r--r--docs/ref/contrib/gis/db-api.txt2
-rw-r--r--docs/ref/contrib/gis/geoquerysets.txt2
-rw-r--r--docs/ref/contrib/gis/tutorial.txt4
-rw-r--r--docs/ref/contrib/syndication.txt2
-rw-r--r--docs/releases/1.0.txt2
-rw-r--r--docs/releases/1.1.txt5
-rw-r--r--docs/releases/1.2.txt3
-rw-r--r--docs/releases/1.3.txt2
-rw-r--r--docs/releases/1.4.txt2
-rw-r--r--docs/topics/db/transactions.txt2
10 files changed, 12 insertions, 14 deletions
diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt
index 928d12aa42..b38a022ec1 100644
--- a/docs/ref/contrib/gis/db-api.txt
+++ b/docs/ref/contrib/gis/db-api.txt
@@ -409,7 +409,7 @@ Aggregate PostGIS Oracle SpatiaLite
======================= ======= ====== ==========
.. rubric:: Footnotes
-.. [#fnwkt] *See* Open Geospatial Consortium, Inc., `OpenGIS Simple Feature Specification For SQL <http://www.opengis.org/docs/99-049.pdf>`_, Document 99-049 (May 5, 1999), at Ch. 3.2.5, p. 3-11 (SQL Textual Representation of Geometry).
+.. [#fnwkt] *See* Open Geospatial Consortium, Inc., `OpenGIS Simple Feature Specification For SQL <https://portal.ogc.org/files/?artifact_id=829>`_, Document 99-049 (May 5, 1999), at Ch. 3.2.5, p. 3-11 (SQL Textual Representation of Geometry).
.. [#fnewkb] *See* `PostGIS EWKB, EWKT and Canonical Forms <https://postgis.net/docs/using_postgis_dbmanagement.html#EWKB_EWKT>`_, PostGIS documentation at Ch. 4.1.2.
.. [#fndistsphere15] *See* `PostGIS documentation <https://postgis.net/docs/ST_DistanceSphere.html>`_ on ``ST_DistanceSphere``.
.. [#fnmysqlidx] *See* `Creating Spatial Indexes <https://dev.mysql.com/doc/refman/en/creating-spatial-indexes.html>`_
diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt
index dfda2fa3b7..0a41cf106a 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -939,7 +939,7 @@ Example::
>>> u = Zipcode.objects.filter(poly__within=bbox).aggregate(Union(poly)) # A more sensible approach.
.. rubric:: Footnotes
-.. [#fnde9im] *See* `OpenGIS Simple Feature Specification For SQL <http://www.opengis.org/docs/99-049.pdf>`_, at Ch. 2.1.13.2, p. 2-13 (The Dimensionally Extended Nine-Intersection Model).
+.. [#fnde9im] *See* `OpenGIS Simple Feature Specification For SQL <https://portal.ogc.org/files/?artifact_id=829>`_, at Ch. 2.1.13.2, p. 2-13 (The Dimensionally Extended Nine-Intersection Model).
.. [#fnsdorelate] *See* `SDO_RELATE documentation <https://docs.oracle.com/en/
database/oracle/oracle-database/18/spatl/spatial-operators-reference.html#
GUID-97C17C18-F05E-49B4-BE11-E89B972E2A02>`_, from the Oracle Spatial and
diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
index c585dd9248..3a200ca6b7 100644
--- a/docs/ref/contrib/gis/tutorial.txt
+++ b/docs/ref/contrib/gis/tutorial.txt
@@ -38,7 +38,7 @@ basic apps`_ project. [#]_
.. _OGC: https://www.opengeospatial.org/
.. _world borders: https://thematicmapping.org/downloads/world_borders.php
-.. _GeoDjango basic apps: https://code.google.com/p/geodjango-basic-apps/
+.. _GeoDjango basic apps: https://code.google.com/archive/p/geodjango-basic-apps
Setting Up
==========
@@ -737,7 +737,7 @@ position.
.. _OpenLayers: https://openlayers.org/
.. _Open Street Map: https://www.openstreetmap.org/
-.. _Vector Map Level 0: https://earth-info.nga.mil/publications/vmap0.html
+.. _Vector Map Level 0: http://web.archive.org/web/20201024202709/https://earth-info.nga.mil/publications/vmap0.html
.. _OSGeo: https://www.osgeo.org/
.. _osmgeoadmin-intro:
diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt
index e9063d0629..a268bad8cc 100644
--- a/docs/ref/contrib/syndication.txt
+++ b/docs/ref/contrib/syndication.txt
@@ -16,7 +16,7 @@ Django also comes with a lower-level feed-generating API. Use this if
you want to generate feeds outside of a Web context, or in some other
lower-level way.
-.. _RSS: http://www.whatisrss.com/
+.. _RSS: https://developer.mozilla.org/en-US/docs/Glossary/RSS
The high-level framework
========================
diff --git a/docs/releases/1.0.txt b/docs/releases/1.0.txt
index 680e81f812..6db106f4d7 100644
--- a/docs/releases/1.0.txt
+++ b/docs/releases/1.0.txt
@@ -132,7 +132,7 @@ will be merged into the main Django documentation shortly. Huge thanks go to
Justin Bronn, Jeremy Dunck, Brett Hoerner and Travis Pinney for their efforts in
creating and completing this feature.
-See http://geodjango.org/ for details.
+See :doc:`GeoDjango </ref/contrib/gis/index>` for details.
.. _Geographic Information Systems: https://en.wikipedia.org/wiki/Geographic_information_system
diff --git a/docs/releases/1.1.txt b/docs/releases/1.1.txt
index 49c375b5ce..99cb1b8081 100644
--- a/docs/releases/1.1.txt
+++ b/docs/releases/1.1.txt
@@ -347,8 +347,8 @@ For full details, see :ref:`the documentation on defining URL namespaces
GeoDjango
---------
-In Django 1.1, GeoDjango_ (i.e. ``django.contrib.gis``) has several new
-features:
+In Django 1.1, :doc:`GeoDjango </ref/contrib/gis/index>` (i.e.
+``django.contrib.gis``) has several new features:
* Support for SpatiaLite_ -- a spatial database for SQLite -- as a spatial
backend.
@@ -363,7 +363,6 @@ features:
For more details, see the GeoDjango documentation.
-.. _geodjango: http://geodjango.org/
.. _spatialite: https://www.gaia-gis.it/gaia-sins/
Other improvements
diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt
index 0b761138e6..ff622cb54a 100644
--- a/docs/releases/1.2.txt
+++ b/docs/releases/1.2.txt
@@ -370,8 +370,7 @@ The GDAL interface now allows the user to set a
when iterating over a :class:`~django.contrib.gis.gdal.Layer`.
Finally, :doc:`GeoDjango's documentation </ref/contrib/gis/index>` is now
-included with Django's and is no longer
-hosted separately at `geodjango.org <http://geodjango.org/>`_.
+included with Django's and is no longer hosted separately at ``geodjango.org``.
.. _1.2-js-assisted-inlines:
diff --git a/docs/releases/1.3.txt b/docs/releases/1.3.txt
index a8239140f3..3d381ca8ac 100644
--- a/docs/releases/1.3.txt
+++ b/docs/releases/1.3.txt
@@ -72,7 +72,7 @@ extended.
See :doc:`the documentation on class-based generic views</topics/class-based-views/index>`
for more details. There is also a document to help you `convert
your function-based generic views to class-based
-views <https://docs.djangoproject.com/en/1.4/topics/generic-views-migration/>`_.
+views <https://raw.githubusercontent.com/django/django/ea9dc9f4b03ae034c1dc080730422dda7a9c2e47/docs/topics/generic-views-migration.txt>`_.
Logging
-------
diff --git a/docs/releases/1.4.txt b/docs/releases/1.4.txt
index aa760cc4c9..3661f177ac 100644
--- a/docs/releases/1.4.txt
+++ b/docs/releases/1.4.txt
@@ -593,7 +593,7 @@ Django 1.4 also includes several smaller improvements worth noting:
* The :djadmin:`makemessages` command uses a new and more accurate lexer,
`JsLex`_, for extracting translatable strings from JavaScript files.
-.. _JsLex: https://bitbucket.org/ned/jslex
+.. _JsLex: https://pypi.org/project/jslex/
* The :ttag:`trans` template tag now takes an optional ``as`` argument to
be able to retrieve a translation string without displaying it but setting
diff --git a/docs/topics/db/transactions.txt b/docs/topics/db/transactions.txt
index bdfb99cdfd..bffbf94ee6 100644
--- a/docs/topics/db/transactions.txt
+++ b/docs/topics/db/transactions.txt
@@ -632,7 +632,7 @@ function in autocommit mode: statements will be executed and committed as soon
as they're called. If your MySQL setup *does* support transactions, Django
will handle transactions as explained in this document.
-.. _information on MySQL transactions: https://dev.mysql.com/doc/refman/en/sql-syntax-transactions.html
+.. _information on MySQL transactions: https://dev.mysql.com/doc/refman/en/sql-transactional-statements.html
Handling exceptions within PostgreSQL transactions
--------------------------------------------------