mirror of
https://github.com/django/django.git
synced 2025-04-14 20:34:36 +00:00
[1.11.x] Reordered GeoIP docs be consistent with GDAL/GEOS ordering.
Backport of cbb27d603b33192a4bb4bd506747c33084620d1a from master
This commit is contained in:
parent
6346d64873
commit
511dfb336f
@ -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.
|
||||
|
Loading…
x
Reference in New Issue
Block a user