mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 01:25:32 +00:00
Code Issues 32 Releases Wiki Activity

[1.10.x] Removed links to deprecated GeoIP.

Browse Source 
Backport of e2335deeba from master
This commit is contained in:
Tim Graham
2016-12-30 19:06:30 -05:00
parent 4a6dc71cae
commit 637f774952
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/internals/deprecation.txt
View File

@@ -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

4
docs/ref/contrib/gis/install/geolibs.txt
View File

@@ -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`