[1.4.x] Updated obsolete links in the documentation

Backport of 8a5d1a6b93e05546c5fdbfc497d7fb3a3377cf85 from master.

13 files changed, 31 insertions, 32 deletions

diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt
index 832f21e3e7..a5a80aa525 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -1034,7 +1034,7 @@ Keyword Argument       Description
                        representation -- the default value is 8.
 =====================  =====================================================
 
-__ http://code.google.com/apis/kml/documentation/
+__ https://developers.google.com/kml/documentation/
 
 ``svg``
 ~~~~~~~
@@ -1195,7 +1195,7 @@ Keyword Argument       Description
                        details.
 =====================  =====================================================
 
-__ http://download.oracle.com/docs/html/B14255_01/sdo_intro.htm#sthref150
+__ http://docs.oracle.com/html/B14255_01/sdo_intro.htm#sthref150
 
 Aggregate Functions
 -------------------
@@ -1244,6 +1244,6 @@ Returns the same as the :meth:`GeoQuerySet.union` aggregate method.
 
 .. 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).
-.. [#fnsdorelate] *See* `SDO_RELATE documentation <http://download.oracle.com/docs/cd/B19306_01/appdev.102/b14255/sdo_operat.htm#sthref845>`_, from Ch. 11 of the Oracle Spatial User's Guide and Manual.
+.. [#fnsdorelate] *See* `SDO_RELATE documentation <http://docs.oracle.com/cd/B19306_01/appdev.102/b14255/sdo_operat.htm#sthref845>`_, from Ch. 11 of the Oracle Spatial User's Guide and Manual.
 .. [#fncovers] For an explanation of this routine, read `Quirks of the "Contains" Spatial Predicate <http://lin-ear-th-inking.blogspot.com/2007/06/subtleties-of-ogc-covers-spatial.html>`_ by Martin Davis (a PostGIS developer).
 .. [#fncontainsproperly] Refer to the PostGIS ``ST_ContainsProperly`` `documentation <http://postgis.refractions.net/documentation/manual-1.4/ST_ContainsProperly.html>`_ for more details.
diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt
index 24362f3b70..dc8cc4b46d 100644
--- a/docs/ref/contrib/gis/geos.txt
+++ b/docs/ref/contrib/gis/geos.txt
@@ -339,7 +339,7 @@ and Z values that are a part of this geometry.
 
 Returns the Well-Known Text of the geometry (an OGC standard).
 
-__ http://code.google.com/apis/kml/documentation/
+__ https://developers.google.com/kml/documentation/
 
 Spatial Predicate Methods
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -907,7 +907,7 @@ Returns the WKT of the given geometry. Example::
 
 
 .. rubric:: Footnotes
-.. [#fnogc] *See* `PostGIS EWKB, EWKT and Canonical Forms <http://postgis.refractions.net/docs/ch04.html#id2591381>`_, PostGIS documentation at Ch. 4.1.2.
+.. [#fnogc] *See* `PostGIS EWKB, EWKT and Canonical Forms <http://postgis.refractions.net/docs/using_postgis_dbmanagement.html#EWKB_EWKT>`_, PostGIS documentation at Ch. 4.1.2.
 .. [#fncascadedunion] For more information, read Paul Ramsey's blog post about `(Much) Faster Unions in PostGIS 1.4 <http://blog.cleverelephant.ca/2009/01/must-faster-unions-in-postgis-14.html>`_ and Martin Davis' blog post on `Fast polygon merging in JTS using Cascaded Union <http://lin-ear-th-inking.blogspot.com/2007/11/fast-polygon-merging-in-jts-using.html>`_.
 
 Settings
diff --git a/docs/ref/contrib/gis/install.txt b/docs/ref/contrib/gis/install.txt
index f6cd1346cb..eadd2ce69d 100644
--- a/docs/ref/contrib/gis/install.txt
+++ b/docs/ref/contrib/gis/install.txt
@@ -102,7 +102,7 @@ Program                   Description                           Required
 
 .. _PROJ.4: http://trac.osgeo.org/proj/
 __ http://postgis.refractions.net/
-__ http://www.gaia-gis.it/spatialite/index.html
+__ http://www.gaia-gis.it/gaia-sins/
 
 .. _build_from_source:
 
@@ -235,7 +235,7 @@ installed prior to building PostGIS.
     The `psycopg2`_ module is required for use as the database adaptor
     when using GeoDjango with PostGIS.
 
-.. _psycopg2: http://initd.org/projects/psycopg2
+.. _psycopg2: http://initd.org/psycopg/
 
 First download the source archive, and extract::
 
@@ -378,7 +378,7 @@ SpatiaLite.
 After installation is complete, don't forget to read the post-installation
 docs on :ref:`create_spatialite_db`.
 
-__ http://www.gaia-gis.it/spatialite/index.html
+__ http://www.gaia-gis.it/gaia-sins/
 
 .. _sqlite:
 
@@ -459,7 +459,7 @@ Finally, do the same for the SpatiaLite tools::
 
         $ ./configure --target=macosx
 
-__ http://www.gaia-gis.it/spatialite/sources.html
+__ http://www.gaia-gis.it/gaia-sins/libspatialite-sources/
 
 .. _pysqlite2:
 
@@ -668,7 +668,7 @@ community!  You can:
   and specify the component as "GIS".
 
 __ http://groups.google.com/group/geodjango
-__ https://code.djangoproject.com/simpleticket
+__ https://code.djangoproject.com/newticket
 
 .. _libsettings:
 
@@ -907,7 +907,7 @@ add the following to your ``settings.py``:
 
     SPATIALITE_LIBRARY_PATH='/Library/Frameworks/SQLite3.framework/SQLite3'
 
-__ http://www.gaia-gis.it/spatialite/binaries.html
+__ http://www.gaia-gis.it/spatialite-2.3.1/binaries.html
 
 .. _fink:
 
@@ -1318,8 +1318,8 @@ may be executed from the SQL Shell as the ``postgres`` user::
 .. rubric:: Footnotes
 .. [#] 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)
-       <http://spatialreference.org/ref/epsg/900913/proj4>`_ requires the
+       For example, the PROJ.4 string for the `Google projection (900913 or 3857)
+       <http://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 bbbf148106..0adbd4666c 100644
--- a/docs/ref/contrib/gis/model-api.txt
+++ b/docs/ref/contrib/gis/model-api.txt
@@ -142,7 +142,7 @@ __ http://en.wikipedia.org/wiki/Geodesy
 __ http://en.wikipedia.org/wiki/Great_circle
 __ http://www.spatialreference.org/ref/epsg/2796/
 __ http://spatialreference.org/
-__ http://welcome.warnercnr.colostate.edu/class_info/nr502/lg3/datums_coordinates/spcs.html
+__ http://web.archive.org/web/20080302095452/http://welcome.warnercnr.colostate.edu/class_info/nr502/lg3/datums_coordinates/spcs.html
 
 ``spatial_index``
 -----------------
@@ -256,7 +256,7 @@ for example::
     qs = Address.objects.filter(zipcode__poly__contains='POINT(-104.590948 38.319914)')
 
 .. rubric:: Footnotes
-.. [#fnogc] OpenGIS Consortium, Inc., `Simple Feature Specification For SQL <http://www.opengis.org/docs/99-049.pdf>`_, Document 99-049 (May 5, 1999).
+.. [#fnogc] OpenGIS Consortium, Inc., `Simple Feature Specification For SQL <http://www.opengeospatial.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.
 .. [#fnharvard] Harvard Graduate School of Design, `An Overview of Geodesy and Geographic Referencing Systems <http://www.gsd.harvard.edu/gis/manual/projections/fundamentals/>`_.  This is an excellent resource for an overview of principles relating to geographic and Cartesian coordinate systems.
diff --git a/docs/ref/contrib/gis/sitemaps.txt b/docs/ref/contrib/gis/sitemaps.txt
index 75bddd3b86..0ab8f75825 100644
--- a/docs/ref/contrib/gis/sitemaps.txt
+++ b/docs/ref/contrib/gis/sitemaps.txt
@@ -2,10 +2,10 @@
 Geographic Sitemaps
 ===================
 
-Google's sitemap protocol has been recently extended to support geospatial
-content. [#]_   This includes the addition of the ``<url>`` child element
+Google's sitemap protocol used to include geospatial content support. [#]_
+This included the addition of the ``<url>`` child element
 ``<geo:geo>``, which tells Google that the content located at the URL is
-geographic in nature. [#]_ 
+geographic in nature. This is now obsolete.
 
 Example
 =======
@@ -23,5 +23,4 @@ Reference
 -----------------
 
 .. rubric:: Footnotes
-.. [#] Google, Inc., `What is a Geo Sitemap? <http://www.google.com/support/webmasters/bin/answer.py?answer=94554>`_.
-.. [#] Google, Inc., `Submit Your Geo Content to Google <http://code.google.com/apis/kml/documentation/kmlSearch.html>`_.
+.. [#] Google, Inc., `What is a Geo Sitemap? <http://support.google.com/webmasters/bin/answer.py?answer=94555>`_.
diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
index 34014d7be4..a21fc2cd5e 100644
--- a/docs/ref/contrib/gis/tutorial.txt
+++ b/docs/ref/contrib/gis/tutorial.txt
@@ -784,4 +784,4 @@ option class in your ``admin.py`` file::
 .. [#] Special thanks to Bjørn Sandvik of `thematicmapping.org <http://thematicmapping.org>`_ for providing and maintaining this data set.
 .. [#] GeoDjango basic apps was written by Dane Springmeyer, Josh Livni, and Christopher Schmidt.
 .. [#] Here the point is for the `University of Houston Law Center <http://www.law.uh.edu/>`_.
-.. [#] Open Geospatial Consortium, Inc., `OpenGIS Simple Feature Specification For SQL <http://www.opengis.org/docs/99-049.pdf>`_, Document 99-049.
+.. [#] Open Geospatial Consortium, Inc., `OpenGIS Simple Feature Specification For SQL <http://www.opengeospatial.org/standards/sfs>`_.
diff --git a/docs/ref/contrib/localflavor.txt b/docs/ref/contrib/localflavor.txt
index 8ad8b8e9d6..bfab4f750a 100644
--- a/docs/ref/contrib/localflavor.txt
+++ b/docs/ref/contrib/localflavor.txt
@@ -92,7 +92,7 @@ Here's an example of how to use them::
     class MyForm(forms.Form):
         my_date_field = generic.forms.DateField()
 
-.. _ISO 3166 country codes: http://www.iso.org/iso/country_codes/iso_3166_code_lists/english_country_names_and_code_elements.htm
+.. _ISO 3166 country codes: http://www.iso.org/iso/country_codes.htm
 .. _Argentina: `Argentina (ar)`_
 .. _Australia: `Australia (au)`_
 .. _Austria: `Austria (at)`_
@@ -156,7 +156,7 @@ any code you'd like to contribute. One thing we ask is that you please use
 Unicode objects (``u'mystring'``) for strings, rather than setting the encoding
 in the file. See any of the existing flavors for examples.
 
-.. _create a ticket: https://code.djangoproject.com/simpleticket
+.. _create a ticket: https://code.djangoproject.com/newticket
 
 Localflavor and backwards compatibility
 =======================================
@@ -703,7 +703,7 @@ Italy (``it``)
     A form field that validates input as an Italian social security number
     (`codice fiscale`_).
 
-.. _codice fiscale: http://www.agenziaentrate.it/ilwwcm/connect/Nsi/Servizi/Codice+fiscale+-+tessera+sanitaria/NSI+Informazioni+sulla+codificazione+delle+persone+fisiche
+.. _codice fiscale: http://www.agenziaentrate.gov.it/wps/content/Nsilib/Nsi/Home/CosaDeviFare/Richiedere/Codice+fiscale+e+tessera+sanitaria/Richiesta+TS_CF/SchedaI/Informazioni+codificazione+pf/
 
 .. class:: it.forms.ITVatNumberField
 
diff --git a/docs/ref/contrib/sitemaps.txt b/docs/ref/contrib/sitemaps.txt
index 64400bc0fa..3e29ec88eb 100644
--- a/docs/ref/contrib/sitemaps.txt
+++ b/docs/ref/contrib/sitemaps.txt
@@ -410,7 +410,7 @@ generate a Google News compatible sitemap:
     {% endspaceless %}
     </urlset>
 
-.. _`Google news sitemaps`: http://www.google.com/support/webmasters/bin/answer.py?hl=en&answer=74288
+.. _`Google news sitemaps`: http://support.google.com/webmasters/bin/answer.py?hl=en&answer=74288
 
 Pinging Google
 ==============
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 45c3e6d3c4..1500f3f5c3 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -31,7 +31,7 @@ attempt to use the ``StdDev(sample=False)`` or ``Variance(sample=False)``
 aggregate with a database backend that falls within the affected release range.
 
 .. _known to be faulty: http://archives.postgresql.org/pgsql-bugs/2007-07/msg00046.php
-.. _Release 8.2.5: http://developer.postgresql.org/pgdocs/postgres/release-8-2-5.html
+.. _Release 8.2.5: http://www.postgresql.org/docs/devel/static/release-8-2-5.html
 
 Optimizing PostgreSQL's configuration
 -------------------------------------
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index c0ae73e1db..f0ee7fff16 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -685,7 +685,7 @@ Methods
       risk of client side script accessing the protected cookie
       data.
 
-    .. _HTTPOnly: http://www.owasp.org/index.php/HTTPOnly
+    .. _HTTPOnly: https://www.owasp.org/index.php/HTTPOnly
 
 .. method:: HttpResponse.set_signed_cookie(key, value='', salt='', max_age=None, expires=None, path='/', domain=None, secure=None, httponly=True)
 
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index dd33a441c8..8845b170c6 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1724,7 +1724,7 @@ consistently by all browsers. However, when it is honored, it can be a
 useful way to mitigate the risk of client side script accessing the
 protected cookie data.
 
-.. _HTTPOnly: http://www.owasp.org/index.php/HTTPOnly
+.. _HTTPOnly: https://www.owasp.org/index.php/HTTPOnly
 
 .. versionchanged:: 1.4
     The default value of the setting was changed from ``False`` to ``True``.
diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt
index 03fef1da45..47f7540191 100644
--- a/docs/ref/templates/api.txt
+++ b/docs/ref/templates/api.txt
@@ -792,7 +792,7 @@ Using an alternative template language
 The Django ``Template`` and ``Loader`` classes implement a simple API for
 loading and rendering templates. By providing some simple wrapper classes that
 implement this API we can use third party template systems like `Jinja2
-<http://jinja.pocoo.org/2/>`_ or `Cheetah <http://www.cheetahtemplate.org/>`_. This
+<http://jinja.pocoo.org/docs/>`_ or `Cheetah <http://www.cheetahtemplate.org/>`_. This
 allows us to use third-party template libraries without giving up useful Django
 features like the Django ``Context`` object and handy shortcuts like
 :func:`~django.shortcuts.render_to_response()`.
diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt
index a4fdf7dd48..cd79976265 100644
--- a/docs/ref/utils.txt
+++ b/docs/ref/utils.txt
@@ -247,13 +247,13 @@ For simplifying the selection of a generator use ``feedgenerator.DefaultFeed``
 which is currently ``Rss201rev2Feed``
 
 For definitions of the different versions of RSS, see:
-http://diveintomark.org/archives/2004/02/04/incompatible-rss
+http://web.archive.org/web/20110718035220/http://diveintomark.org/archives/2004/02/04/incompatible-rss
 
 .. function:: get_tag_uri(url, date)
 
     Creates a TagURI.
 
-    See http://diveintomark.org/archives/2004/05/28/howto-atom-id
+    See http://web.archive.org/web/20110514113830/http://diveintomark.org/archives/2004/05/28/howto-atom-id
 
 SyndicationFeed
 ---------------
@@ -331,7 +331,7 @@ Rss201rev2Feed
 
 .. class:: Rss201rev2Feed(RssFeed)
 
-    Spec: http://blogs.law.harvard.edu/tech/rss
+    Spec: http://cyber.law.harvard.edu/rss/rss.html
 
 RssUserland091Feed
 ------------------