diff xml/en/docs/http/ngx_http_geoip_module.xml @ 689:3cc1c7bb0674

Documented geoip_org directive and fixed parameter names
author Vladimir Homutov <vl@nginx.com>
date Wed, 26 Sep 2012 12:36:37 +0000
parents 764fbac1b8b4
children c66610f9a53f
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_geoip_module.xml
+++ b/xml/en/docs/http/ngx_http_geoip_module.xml
@@ -53,7 +53,7 @@ http {
 <section id="directives" name="Directives">
 
 <directive name="geoip_country">
-<syntax><value>database</value></syntax>
+<syntax><value>file</value></syntax>
 <default/>
 <context>http</context>
 
@@ -88,7 +88,7 @@ country name, for example,
 
 
 <directive name="geoip_city">
-<syntax><value>database</value></syntax>
+<syntax><value>file</value></syntax>
 <default/>
 <context>http</context>
 
@@ -140,6 +140,29 @@ postal code.
 </directive>
 
 
+<directive name="geoip_org">
+<syntax><value>file</value></syntax>
+<default/>
+<context>http</context>
+<appeared-in>1.0.3</appeared-in>
+
+<para>
+Specifies a database used to determine an organization
+depending on the client IP address.
+The following variable is available when using this database:
+<list type="tag">
+
+<tag-name><var>$geoip_org</var></tag-name>
+<tag-desc>
+organization name, for example, “The University of Melbourne”.
+</tag-desc>
+
+</list>
+</para>
+
+</directive>
+
+
 <directive name="geoip_proxy">
 <syntax><value>address</value> | <value>CIDR</value></syntax>
 <default/>