[sr-dev] git:master:7a1fb3ae: geoip: updated the documentation with contc

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 7a1fb3aec976c53709cd3a27f5e2d16a9859d0e9
URL: https://github.com/kamailio/kamailio/commit/7a1fb3aec976c53709cd3a27f5e2d16a9859d0e9

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2015-03-12T10:04:52+01:00

geoip: updated the documentation with contc

- added remark about geoip2 module for using the new GeoIP API

---

Modified: modules/geoip/README
Modified: modules/geoip/doc/geoip_admin.xml

---

Diff:  https://github.com/kamailio/kamailio/commit/7a1fb3aec976c53709cd3a27f5e2d16a9859d0e9.diff
Patch: https://github.com/kamailio/kamailio/commit/7a1fb3aec976c53709cd3a27f5e2d16a9859d0e9.patch

---

diff --git a/modules/geoip/README b/modules/geoip/README
index a8ac4cc..ed56446 100644
--- a/modules/geoip/README
+++ b/modules/geoip/README
@@ -68,7 +68,9 @@ Chapter 1. Admin Guide
 1. Overview
 
    This module allows real-time queries against the Max Mind GeoIP
-   database to be performed from the config script.
+   database to be performed from the config script. It uses the old
+   version of API, still very common on OS distributions. For using the
+   new version of GeoIP API, see geoip2 module.
 
    The Max Mind GeoIP database is a map of IP network address assignments
    to geographical locales that can be useful -- though approximate -- in
@@ -160,6 +162,7 @@ if(geoip_match("$si", "src"))
           + regc - region
           + regn - region name
           + metro - metro code
+          + contc - continent code
 
    Exported pseudo-variables are documented at
-   http://www.kamailio.org/dokuwiki/.
+   http://www.kamailio.org/wiki/.
diff --git a/modules/geoip/doc/geoip_admin.xml b/modules/geoip/doc/geoip_admin.xml
index 7bd6427..e4db7e7 100644
--- a/modules/geoip/doc/geoip_admin.xml
+++ b/modules/geoip/doc/geoip_admin.xml
@@ -18,7 +18,9 @@
 	<title>Overview</title>
 	<para>
 		This module allows real-time queries against the Max Mind GeoIP 
-		database to be performed from the config script.  
+		database to be performed from the config script. It uses the old
+		version of API, still very common on OS distributions. For using
+		the new version of GeoIP API, see geoip2 module.
 	</para>
 	<para>
 		The Max Mind GeoIP database is a map of IP network address assignments 
@@ -182,6 +184,9 @@ if(geoip_match("$si", "src"))
 				<listitem><para>
 					<emphasis>metro</emphasis> - metro code
 				</para></listitem>
+				<listitem><para>
+					<emphasis>contc</emphasis> - continent code
+				</para></listitem>
 			</itemizedlist>
 			</listitem>
 		</itemizedlist>