From 637f77495253b54c12e7432a50c34eef52f8cd07 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 30 Dec 2016 19:06:30 -0500 Subject: [PATCH] [1.10.x] Removed links to deprecated GeoIP. Backport of e2335deeba0ba65ac52145c8bcdc685cf603eec8 from master --- docs/internals/deprecation.txt | 6 +++--- docs/ref/contrib/gis/install/geolibs.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 5223fb5d5e..9a39c09c33 100644 --- a/docs/internals/deprecation.txt +++ b/docs/internals/deprecation.txt @@ -709,9 +709,9 @@ details on these changes. and ``django.utils.text.truncate_html_words()`` will be removed in favor of the ``django.utils.text.Truncator`` class. -* The :class:`~django.contrib.gis.geoip.GeoIP` class was moved to - :mod:`django.contrib.gis.geoip` in 1.4 -- the shortcut in - :mod:`django.contrib.gis.utils` will be removed. +* The ``django.contrib.gis.geoip.GeoIP`` class was moved to + ``django.contrib.gis.geoip`` in 1.4 -- the shortcut in + ``django.contrib.gis.utils`` will be removed. * ``django.conf.urls.defaults`` will be removed. The functions :func:`~django.conf.urls.include`, ``patterns()`` and diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt index 13e1be2e40..5572d395d7 100644 --- a/docs/ref/contrib/gis/install/geolibs.txt +++ b/docs/ref/contrib/gis/install/geolibs.txt @@ -11,7 +11,7 @@ Program Description Required :doc:`GEOS <../geos>` Geometry Engine Open Source Yes 3.4, 3.3 `PROJ.4`_ Cartographic Projections library Yes (PostgreSQL and SQLite only) 4.9, 4.8, 4.7, 4.6, 4.5, 4.4 :doc:`GDAL <../gdal>` Geospatial Data Abstraction Library Yes (SQLite only) 2.1, 2.0, 1.11, 1.10, 1.9, 1.8, 1.7 -:doc:`GeoIP <../geoip>` IP-based geolocation library No 1.4 +:doc:`GeoIP <../geoip2>` IP-based geolocation library No 2 `PostGIS`__ Spatial extensions for PostgreSQL Yes (PostgreSQL only) 2.3, 2.2, 2.1, 2.0 `SpatiaLite`__ Spatial extensions for SQLite Yes (SQLite only) 4.3, 4.2, 4.1, 4.0, 3.0 ======================== ==================================== ================================ =================================== @@ -67,7 +67,7 @@ install, directly or by dependency, the required geospatial libraries: Optional packages to consider: -* ``libgeoip1``: for :doc:`GeoIP <../geoip>` support +* ``libgeoip1``: for :doc:`GeoIP <../geoip2>` support * ``python-gdal`` for GDAL's own Python bindings -- includes interfaces for raster manipulation Please also consult platform-specific instructions if you are on :ref:`macosx`