From 82fc3ce41db298ae4b191d4a15bddfaf02ea11af Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 24 May 2013 12:35:20 -0400 Subject: [PATCH] [1.5.x] Fixed #20492 - Removed a broken link in GIS docs. Backport of fbab3209fc from master --- docs/ref/contrib/gis/geoip.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/ref/contrib/gis/geoip.txt b/docs/ref/contrib/gis/geoip.txt index e37c4c60b0..49f54f35cb 100644 --- a/docs/ref/contrib/gis/geoip.txt +++ b/docs/ref/contrib/gis/geoip.txt @@ -17,8 +17,7 @@ Geolocation with GeoIP in ``utils``, but will be removed in Django 1.6. The :class:`GeoIP` object is a ctypes wrapper for the -`MaxMind GeoIP C API`__. [#]_ This interface is a BSD-licensed alternative -to the GPL-licensed `Python GeoIP`__ interface provided by MaxMind. +`MaxMind GeoIP C API`__. [#]_ In order to perform IP-based geolocation, the :class:`GeoIP` object requires the GeoIP C libary and either the GeoIP `Country`__ or `City`__ @@ -29,7 +28,6 @@ you set :setting:`GEOIP_PATH` with in your settings. See the example and reference below for more details. __ http://www.maxmind.com/app/c -__ http://www.maxmind.com/app/python __ http://www.maxmind.com/app/country __ http://www.maxmind.com/app/city __ http://www.maxmind.com/download/geoip/database/