Module: sip-router Branch: 3.1 Commit: abeaaff1f7a4ad3d9badb203273b249d5722a29b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=abeaaff… Author: Henning Westerholt &lt;henning.westerholt(a)1und1.de&gt; Committer: Henning Westerholt &lt;henning.westerholt(a)1und1.de&gt; Date: Mon May 16 18:21:09 2011 +0200 geoip: also include URL in docs (cherry picked from commit 4d777c5100927edc1bd99ef429625eaf552f8d23) --- modules/geoip/README | 14 +++++++------- modules/geoip/doc/geoip_admin.xml | 6 ++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/modules/geoip/README b/modules/geoip/README index 40bb01b..1300850 100644 --- a/modules/geoip/README +++ b/modules/geoip/README @@ -68,12 +68,12 @@ Chapter 1. Admin Guide identifying the physical location with which an IP host address is associated on a relatively granular level. - This database itself can be obtained on a free or commercial basis - here. The library that interfaces with the Max Mind API, as well as - scripts to automate downloading of the on-disk version of the - open-source database is also packaged by the Debian Linux distribution - and its derivatives as libgeoip, and probably by other distributions as - well. + This database itself can be obtained on a free or commercial basis from + http://www.maxmind.com/app/ip-location. The library that interfaces + with the Max Mind API, as well as scripts to automate downloading of + the on-disk version of the open-source database is also packaged by the + Debian Linux distribution and its derivatives as libgeoip, and probably + by other distributions as well. Debian Linux squeeze includes already a database as dependency, but as this contain the wrong data, it will not work correctly with the @@ -81,7 +81,7 @@ Chapter 1. Admin Guide will not work with the GeoIP Country Edition. In newer Debian Linux releases the package geoip-database-contrib should contain the necessary database. You can download the Lite edition of the DB from - here. + http://www.maxmind.com/app/geolitecity. This module exports a new class of pseudo-variables - $gip(pvc=>key) - to enable access to the results of a query to the database. diff --git a/modules/geoip/doc/geoip_admin.xml b/modules/geoip/doc/geoip_admin.xml index f1df9ca..e34b5cd 100644 --- a/modules/geoip/doc/geoip_admin.xml +++ b/modules/geoip/doc/geoip_admin.xml @@ -28,7 +28,8 @@ </para> <para> This database itself can be obtained on a free or commercial basis - <ulink url="http://www.maxmind.com/app/ip-location">here</ulink>;here</ulink>. The + from <ulink url="http://www.maxmind.com/app/ip-location"> + http://www.maxmind.com/app/ip-location</ulink>nk>. The library that interfaces with the Max Mind API, as well as scripts to automate downloading of the on-disk version of the open-source database is also packaged by the Debian Linux distribution and @@ -42,7 +43,8 @@ and will not work with the <emphasis>GeoIP Country Edition</emphasis>. In newer Debian Linux releases the package <emphasis>geoip-database-contrib</emphasis> should contain the necessary database. You can download the Lite edition - of the DB from <ulink url="http://www.maxmind.com/app/geolitecity">here</ulink>;here</ulink>. + of the DB from <ulink url="http://www.maxmind.com/app/geolitecity"> + http://www.maxmind.com/app/geolitecity</ulink>nk>. </para> <para> This module exports a new class of pseudo-variables -