Merge branch 'xorg/1.0.2/master' into xorg/master

[platal.git] / configs / platal.ini

diff --git a/configs/platal.ini b/configs/platal.ini
index a8cb4c2..7263936 100644 (file)
--- a/configs/platal.ini
+++ b/configs/platal.ini
@@ -77,8 +77,12 @@ robotstxt_disallowed_uris =
 ;   1 - DEBUG_BT: displays the backtraces (SQL, mailman, banana executions)
 ;   2 - DEBUG_VALID: checks that the html of the page is valid
 ;   4 - DEBUG_SMARTY: don't hide error reported during the execution of smarty
+;   8 - DEBUG_NOCACHE: disable data caching
+;  16 - DEBUG_SCRIPTCACHE: cache expires after the execution of the script (no caching
+;                          in session or via memcache)
 ;  - provided by xorg:
-; 256 - DEBUG_NOCACHE: don't cache db content in the session
+; 256 - DEBUG_NOCACHE: don't cache db content in the session (this feature as been moved
+;                      to the core and this flag is deprecated)
 ;
 ; debug = 0
 
@@ -125,6 +129,10 @@ baseurl = "https://www.example.org/"
 ; The charset to use when talking to the database
 ; dbcharset = "utf8"
 
+; $globals->core->memcache
+; List of space separated addresses of memcache servers
+memcache = ""
+
 ; $globals->static_cache_duration
 ; Cache duration for static content
 ; static_cache_duration = "604800"
@@ -198,6 +206,13 @@ gmaps_key = ""
 ; URL of geocoding webservice
 gmaps_url = "http://maps.google.com/maps/geo"
 
+; $globals->geocoder->gmaps_hl
+; Default output language.
+gmaps_hl = "fr"
+
+; $globals->geocoder->gmaps_gl
+; Default location preference.
+gmaps_gl = "fr"
 
 ; The lists section contains parameters used to interact with mailman.
 [Lists]