[1.10.x] Updated links to the current version of PostGIS docs.

Backport of cc282fa731dd4a427fb4e2aa6fb0e6763e44a72d from master

6 files changed, 16 insertions, 44 deletions

diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt
index 3c00f20d71..3909b2d25f 100644
--- a/docs/ref/contrib/gis/db-api.txt
+++ b/docs/ref/contrib/gis/db-api.txt
@@ -430,9 +430,9 @@ 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).
-.. [#fnewkb] *See* `PostGIS EWKB, EWKT and Canonical Forms <http://postgis.net/docs/manual-2.1/using_postgis_dbmanagement.html#EWKB_EWKT>`_, PostGIS documentation at Ch. 4.1.2.
+.. [#fnewkb] *See* `PostGIS EWKB, EWKT and Canonical Forms <http://postgis.net/docs/using_postgis_dbmanagement.html#EWKB_EWKT>`_, PostGIS documentation at Ch. 4.1.2.
 .. [#fngeojson] *See* Howard Butler, Martin Daly, Allan Doyle, Tim Schaub, & Christopher Schmidt, `The GeoJSON Format Specification <http://geojson.org/geojson-spec.html>`_, Revision 1.0 (June 16, 2008).
-.. [#fndistsphere15] *See* `PostGIS documentation <http://postgis.net/docs/manual-2.1/ST_Distance_Sphere.html>`_ on ``ST_distance_sphere``.
+.. [#fndistsphere15] *See* `PostGIS documentation <http://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>`_
    in the MySQL Reference Manual:
 
diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt
index 7d2bcbdd6e..fcf59a1a19 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -1416,4 +1416,4 @@ Example::
 .. [#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 <https://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.net/docs/manual-1.5/ST_ContainsProperly.html>`_ for more details.
+.. [#fncontainsproperly] Refer to the PostGIS ``ST_ContainsProperly`` `documentation <http://postgis.net/docs/ST_ContainsProperly.html>`_ for more details.
diff --git a/docs/ref/contrib/gis/install/postgis.txt b/docs/ref/contrib/gis/install/postgis.txt
index 7b2d6e55ec..392efbfa7d 100644
--- a/docs/ref/contrib/gis/install/postgis.txt
+++ b/docs/ref/contrib/gis/install/postgis.txt
@@ -2,56 +2,29 @@
 Installing PostGIS
 ==================
 
-`PostGIS`__ adds geographic object support to PostgreSQL, turning it
+`PostGIS`_ adds geographic object support to PostgreSQL, turning it
 into a spatial database. :ref:`geosbuild`, :ref:`proj4` and
 :ref:`gdalbuild` should be installed prior to building PostGIS. You
 might also need additional libraries, see `PostGIS requirements`_.
 
-.. note::
-
-    The `psycopg2`_ module is required for use as the database adapter
-    when using GeoDjango with PostGIS.
-
-.. _psycopg2: http://initd.org/psycopg/
-.. _PostGIS requirements: http://postgis.net/docs/manual-2.1/postgis_installation.html#install_requirements
+The `psycopg2`_ module is required for use as the database adapter when using
+GeoDjango with PostGIS.
 
 On Debian/Ubuntu, you are advised to install the following packages:
 postgresql-x.x, postgresql-x.x-postgis, postgresql-server-dev-x.x,
 python-psycopg2 (x.x matching the PostgreSQL version you want to install).
-Please also consult platform-specific instructions if you are on :ref:`macosx`
-or :ref:`windows`.
-
-Building from source
-====================
-
-First download the source archive, and extract::
-
-    $ wget http://download.osgeo.org/postgis/source/postgis-2.1.5.tar.gz
-    $ tar xzf postgis-2.1.5.tar.gz
-    $ cd postgis-2.1.5
-
-Next, configure, make and install PostGIS::
+Alternately, you can `build from source`_. Consult the platform-specific
+instructions if you are on :ref:`macosx` or :ref:`windows`.
 
-    $ ./configure
-
-Finally, make and install::
-
-    $ make
-    $ sudo make install
-    $ cd ..
-
-.. note::
-
-    GeoDjango does not automatically create a spatial database.  Please consult
-    the section on :ref:`spatialdb_template91` for more information.
-
-__ http://postgis.net/
+.. _PostGIS: http://postgis.net/
+.. _psycopg2: http://initd.org/psycopg/
+.. _PostGIS requirements: http://postgis.net/docs/postgis_installation.html#install_requirements
+.. _build from source: http://postgis.net/docs/postgis_installation.html#install_short_version
 
 Post-installation
 =================
 
 .. _spatialdb_template:
-.. _spatialdb_template91:
 
 Creating a spatial database
 ---------------------------
diff --git a/docs/ref/contrib/gis/model-api.txt b/docs/ref/contrib/gis/model-api.txt
index 18f8313300..1542ebcb4e 100644
--- a/docs/ref/contrib/gis/model-api.txt
+++ b/docs/ref/contrib/gis/model-api.txt
@@ -249,7 +249,7 @@ geography column to a geometry type in the query::
 
 For more information, the PostGIS documentation contains a helpful section on
 determining `when to use geography data type over geometry data type
-<http://postgis.net/docs/manual-2.1/using_postgis_dbmanagement.html#PostGIS_GeographyVSGeometry>`_.
+<http://postgis.net/docs/using_postgis_dbmanagement.html#PostGIS_GeographyVSGeometry>`_.
 
 ``GeoManager``
 ==============
@@ -298,4 +298,4 @@ The ``GeoManager`` is required in order to use the legacy
 .. [#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.
 .. [#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 <http://postgis.net/docs/manual-2.1/using_postgis_dbmanagement.html#PostGIS_Geography>`_ documentation for more details.
+.. [#fngeography] Please refer to the `PostGIS Geography Type <http://postgis.net/docs/using_postgis_dbmanagement.html#PostGIS_Geography>`_ documentation for more details.
diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
index 5d753a327e..f44fe921bf 100644
--- a/docs/ref/contrib/gis/tutorial.txt
+++ b/docs/ref/contrib/gis/tutorial.txt
@@ -303,7 +303,7 @@ besides the tools included within GeoDjango, you may also use the following:
   PostGIS.
 
 .. _ogr2ogr: http://www.gdal.org/ogr2ogr.html
-.. _shp2pgsql: http://postgis.net/docs/manual-1.5/ch04.html#shp2pgsql_usage
+.. _shp2pgsql: http://postgis.net/docs/using_postgis_dbmanagement.html#shp2pgsql_usage
 
 .. _gdalinterface:
 
diff --git a/docs/releases/1.2.txt b/docs/releases/1.2.txt
index 07efc6607b..c2676a90cc 100644
--- a/docs/releases/1.2.txt
+++ b/docs/releases/1.2.txt
@@ -348,8 +348,7 @@ are now included:
 * ``django.contrib.gis.db.backends.oracle``
 * ``django.contrib.gis.db.backends.spatialite``
 
-GeoDjango now supports the rich capabilities added
-in the `PostGIS 1.5 release <http://postgis.net/docs/manual-1.5/>`_.
+GeoDjango now supports the rich capabilities added in the PostGIS 1.5 release.
 New features include support for the :ref:`geography type <geography-type>`
 and enabling of :ref:`distance queries <distance-queries>`
 with non-point geometries on geographic coordinate systems.