[2.2.x] Fixed broken links and redirects to OGR library in docs.

Backport of 49aeabbf27637dbdb7a96d43b164a20c8c8ea70b from master

3 files changed, 9 insertions, 8 deletions

diff --git a/docs/ref/contrib/gis/gdal.txt b/docs/ref/contrib/gis/gdal.txt
index c1860a204d..4043a6baa1 100644
--- a/docs/ref/contrib/gis/gdal.txt
+++ b/docs/ref/contrib/gis/gdal.txt
@@ -22,7 +22,7 @@ to raster (image) data.
     capabilities of OGR and GDAL's raster features at this time.
 
 __ https://www.gdal.org/
-__ https://www.gdal.org/ogr_arch.html
+__ https://gdal.org/user/vector_data_model.html
 
 Overview
 ========
@@ -92,7 +92,7 @@ each feature in that layer.
 
     Returns the name of the data source.
 
-__ https://www.gdal.org/ogr_formats.html
+__ https://gdal.org/drivers/vector/
 
 ``Layer``
 ---------
@@ -446,7 +446,7 @@ coordinate transformation::
     :class:`Feature.geom` attribute, when reading vector data from
     :class:`Layer` (which is in turn a part of a :class:`DataSource`).
 
-    __ https://www.gdal.org/classOGRGeometry.html
+    __ https://gdal.org/api/ogrgeometry_cpp.html#ogrgeometry-class
 
     .. classmethod:: from_gml(gml_string)
 
@@ -1176,7 +1176,7 @@ blue.
         needed. For instance, use ``GTiff`` for a ``GeoTiff`` file. For a list of file types,
         see also the `GDAL Raster Formats`__ list.
 
-        __ https://www.gdal.org/formats_list.html
+        __ https://gdal.org/drivers/raster/
 
         An in-memory raster is created through the following example:
 
@@ -1403,7 +1403,7 @@ blue.
         Returns a string with a summary of the raster. This is equivalent to
         the `gdalinfo`__ command line utility.
 
-        __ https://www.gdal.org/gdalinfo.html
+        __ https://gdal.org/programs/gdalinfo.html
 
     .. attribute:: metadata
 
@@ -1732,7 +1732,7 @@ Key               Default  Usage
         ...    }
         ... })
 
-__ https://www.gdal.org/frmt_gtiff.html
+__ https://gdal.org/drivers/raster/gtiff.html
 
 The ``band_input`` dictionary
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt
index 877c894bee..1c44e83db7 100644
--- a/docs/ref/contrib/gis/install/geolibs.txt
+++ b/docs/ref/contrib/gis/install/geolibs.txt
@@ -240,4 +240,5 @@ the GDAL library.  For example::
        It is easier to install the shifting files now, then to have debug a
        problem caused by their absence later.
 .. [#] Specifically, GeoDjango provides support for the `OGR
-       <https://gdal.org/ogr_arch.html>`_ library, a component of GDAL.
+       <https://gdal.org/user/vector_data_model.html>`_ library, a component of
+       GDAL.
diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
index 072e8a3311..299fb36082 100644
--- a/docs/ref/contrib/gis/tutorial.txt
+++ b/docs/ref/contrib/gis/tutorial.txt
@@ -302,7 +302,7 @@ besides the tools included within GeoDjango, you may also use the following:
 * `shp2pgsql`_: This utility included with PostGIS imports ESRI shapefiles into
   PostGIS.
 
-.. _ogr2ogr: https://www.gdal.org/ogr2ogr.html
+.. _ogr2ogr: https://gdal.org/programs/ogr2ogr.html
 .. _shp2pgsql: https://postgis.net/docs/using_postgis_dbmanagement.html#shp2pgsql_usage
 
 .. _gdalinterface: