summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/gis/geoip2.txt12
-rw-r--r--docs/releases/4.2.txt3
2 files changed, 12 insertions, 3 deletions
diff --git a/docs/ref/contrib/gis/geoip2.txt b/docs/ref/contrib/gis/geoip2.txt
index 6312c5d874..c106acdf0f 100644
--- a/docs/ref/contrib/gis/geoip2.txt
+++ b/docs/ref/contrib/gis/geoip2.txt
@@ -10,9 +10,10 @@ library`__. [#]_
In order to perform IP-based geolocation, the :class:`GeoIP2` object requires
the `geoip2 Python library`__ and the GeoIP ``Country`` and/or ``City``
-`datasets in binary format`__ (the CSV files will not work!). Grab the
-``GeoLite2-Country.mmdb.gz`` and ``GeoLite2-City.mmdb.gz`` files and unzip them
-in a directory corresponding to the :setting:`GEOIP_PATH` setting.
+datasets in binary format (the CSV files will not work!), downloaded from e.g.
+`MaxMind`__ or `DB-IP`__ websites. Grab the ``GeoLite2-Country.mmdb.gz`` and
+``GeoLite2-City.mmdb.gz`` files and unzip them in a directory corresponding to
+the :setting:`GEOIP_PATH` setting.
Additionally, it is recommended to install the `libmaxminddb C library`__, so
that ``geoip2`` can leverage the C library's faster speed.
@@ -20,8 +21,13 @@ that ``geoip2`` can leverage the C library's faster speed.
__ https://geoip2.readthedocs.io/
__ https://pypi.org/project/geoip2/
__ https://dev.maxmind.com/geoip/geolite2-free-geolocation-data
+__ https://db-ip.com/db/lite.php
__ https://github.com/maxmind/libmaxminddb/
+.. versionchanged:: 4.2
+
+ Support for ``.mmdb`` files downloaded from DB-IP was added.
+
Example
=======
diff --git a/docs/releases/4.2.txt b/docs/releases/4.2.txt
index 078fc88193..3a9a99a3c2 100644
--- a/docs/releases/4.2.txt
+++ b/docs/releases/4.2.txt
@@ -60,6 +60,9 @@ Minor features
* The :class:`~django.contrib.gis.gdal.GDALRaster` class now supports
:class:`pathlib.Path`.
+* The :class:`~django.contrib.gis.geoip2.GeoIP2` class now supports ``.mmdb``
+ files downloaded from DB-IP.
+
:mod:`django.contrib.messages`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~