From 11f4c52ec74ea5244bc5988f37cbfdce2586b642 Mon Sep 17 00:00:00 2001
From: Nick Pope <nick.pope@flightdataservices.com>
Date: Thu, 18 May 2017 14:12:28 +0100
Subject: [PATCH] Fixed #28525 -- Documented GDAL and GeoIP exceptions.

---
 docs/ref/contrib/gis/gdal.txt   | 12 ++++++++++++
 docs/ref/contrib/gis/geoip2.txt |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/docs/ref/contrib/gis/gdal.txt b/docs/ref/contrib/gis/gdal.txt
index c2d0345be8d..832d91977c8 100644
--- a/docs/ref/contrib/gis/gdal.txt
+++ b/docs/ref/contrib/gis/gdal.txt
@@ -1832,3 +1832,15 @@ Settings
 A string specifying the location of the GDAL library.  Typically,
 this setting is only used if the GDAL library is in a non-standard
 location (e.g., ``/home/john/lib/libgdal.so``).
+
+Exceptions
+==========
+
+.. exception:: GDALException
+
+    The base GDAL exception, indicating a GDAL-related error.
+
+.. exception:: SRSException
+
+    An exception raised when an error occurs when constructing or using a
+    spatial reference system object.
diff --git a/docs/ref/contrib/gis/geoip2.txt b/docs/ref/contrib/gis/geoip2.txt
index 7a280af6eb6..b6622edb52b 100644
--- a/docs/ref/contrib/gis/geoip2.txt
+++ b/docs/ref/contrib/gis/geoip2.txt
@@ -168,5 +168,13 @@ The basename to use for the GeoIP country data file. Defaults to
 The basename to use for the GeoIP city data file. Defaults to
 ``'GeoLite2-City.mmdb'``.
 
+Exceptions
+==========
+
+.. exception:: GeoIP2Exception
+
+    The exception raised when an error occurs in a call to the underlying
+    ``geoip2`` library.
+
 .. rubric:: Footnotes
 .. [#] GeoIP(R) is a registered trademark of MaxMind, Inc.