From 511dfb336fc271e538f714b7a9bdb0b375924b53 Mon Sep 17 00:00:00 2001
From: Nick Pope <nick.pope@flightdataservices.com>
Date: Wed, 23 Aug 2017 11:25:42 +0100
Subject: [PATCH] [1.11.x] Reordered GeoIP docs be consistent with GDAL/GEOS
ordering.
Backport of cbb27d603b33192a4bb4bd506747c33084620d1a from master
---
docs/ref/contrib/gis/geoip2.txt | 56 ++++++++++++++++-----------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/docs/ref/contrib/gis/geoip2.txt b/docs/ref/contrib/gis/geoip2.txt
index a7bd773e6f..2c6ec4f03d 100644
--- a/docs/ref/contrib/gis/geoip2.txt
+++ b/docs/ref/contrib/gis/geoip2.txt
@@ -47,34 +47,6 @@ Here is an example of its usage::
>>> g.geos('24.124.1.80').wkt
'POINT (-97 38)'
-Settings
-========
-
-.. setting:: GEOIP_PATH
-
-``GEOIP_PATH``
---------------
-
-A string specifying the directory where the GeoIP data files are
-located. This setting is *required* unless manually specified
-with ``path`` keyword when initializing the :class:`GeoIP2` object.
-
-.. setting:: GEOIP_COUNTRY
-
-``GEOIP_COUNTRY``
------------------
-
-The basename to use for the GeoIP country data file. Defaults to
-``'GeoLite2-Country.mmdb'``.
-
-.. setting:: GEOIP_CITY
-
-``GEOIP_CITY``
---------------
-
-The basename to use for the GeoIP city data file. Defaults to
-``'GeoLite2-City.mmdb'``.
-
API Reference
=============
@@ -167,5 +139,33 @@ Returns a coordinate tuple of (latitude, longitude),
Returns a :class:`~django.contrib.gis.geos.Point` object corresponding to the
query.
+Settings
+========
+
+.. setting:: GEOIP_PATH
+
+``GEOIP_PATH``
+--------------
+
+A string specifying the directory where the GeoIP data files are
+located. This setting is *required* unless manually specified
+with ``path`` keyword when initializing the :class:`GeoIP2` object.
+
+.. setting:: GEOIP_COUNTRY
+
+``GEOIP_COUNTRY``
+-----------------
+
+The basename to use for the GeoIP country data file. Defaults to
+``'GeoLite2-Country.mmdb'``.
+
+.. setting:: GEOIP_CITY
+
+``GEOIP_CITY``
+--------------
+
+The basename to use for the GeoIP city data file. Defaults to
+``'GeoLite2-City.mmdb'``.
+
.. rubric:: Footnotes
.. [#] GeoIP(R) is a registered trademark of MaxMind, Inc.