Merge remote-tracking branch 'upstream/master'

Conflicts:
	utils/specialphrases.php

diff --combined lib/lib.php
index a05ddc4bf87f7f6af68c5a6e3cc0f617241bcd02,a2e58c4bac08b8f3f4de1985ae223104a25c3f07..4b68b4a392bcda71c4ccfc5ef33e3642cd82bfdd
--- 1/lib/lib.php
--- 2/lib/lib.php
+++ b/lib/lib.php
@@@ -178,7 -178,7 +178,7 @@@
        {
                $aResult = array(array(join(' ',$aWords)));
                $sFirstToken = '';
 -              if ($iDepth < 8) {
 +              if ($iDepth < 7) {
                        while(sizeof($aWords) > 1)
                        {
                                $sWord = array_shift($aWords);
@@@ -540,7 -540,6 +540,6 @@@
   'natural:beach' => array('label'=>'Beach','frequency'=>121,'icon'=>'tourist_beach',),
   'place:moor' => array('label'=>'Moor','frequency'=>118,'icon'=>'',),
   'amenity:grave_yard' => array('label'=>'Grave Yard','frequency'=>110,'icon'=>'',),
-  'waterway:derelict_canal' => array('label'=>'Derelict Canal','frequency'=>109,'icon'=>'',),
   'waterway:drain' => array('label'=>'Drain','frequency'=>108,'icon'=>'',),
   'landuse:grass' => array('label'=>'Grass','frequency'=>106,'icon'=>'',),
   'landuse:village_green' => array('label'=>'Village Green','frequency'=>106,'icon'=>'',),
@@@ -628,7 -627,7 +627,7 @@@
  
   'place:houses' => array('label'=>'Houses','frequency'=>85,'icon'=>'',),
   'railway:preserved' => array('label'=>'Preserved','frequency'=>227,'icon'=>'',),
-  'waterway:derelict canal' => array('label'=>'Derelict Canal','frequency'=>21,'icon'=>'',),
+  'waterway:derelict_canal' => array('label'=>'Derelict Canal','frequency'=>21,'icon'=>'',),
   'amenity:dead_pub' => array('label'=>'Dead Pub','frequency'=>20,'icon'=>'',),
   'railway:disused_station' => array('label'=>'Disused Station','frequency'=>114,'icon'=>'',),
   'railway:abandoned' => array('label'=>'Abandoned','frequency'=>641,'icon'=>'',),

diff --combined settings/settings.php
index 13239643fe44d1cd7761206be6cba4d14d579791,d2621ae383cfc65ee2d520985f509e329554815e..3da42133a4fd6ab769198a0203df8756346c0d5a
--- 1/settings/settings.php
--- 2/settings/settings.php
+++ b/settings/settings.php
@@@ -35,7 -35,7 +35,7 @@@
        // search tables - needed for lookups
        @define('CONST_Tablespace_Search_Data', false);
        @define('CONST_Tablespace_Search_Index', false);
-       // additional data, e.g. TIGER data - needed for lookups
+       // additional data, e.g. TIGER data, type searches - needed for lookups
        @define('CONST_Tablespace_Aux_Data', false);
        @define('CONST_Tablespace_Aux_Index', false);
  
@@@ -70,15 -70,13 +70,15 @@@
  
        // Website settings
        @define('CONST_NoAccessControl', true);
 -      @define('CONST_ClosedForIndexing', false);
 -      @define('CONST_ClosedForIndexingExceptionIPs', '');
        @define('CONST_BlockedIPs', '');
 +      @define('CONST_IPBanFile', CONST_BasePath.'/settings/ip_blocks');
 +      @define('CONST_WhitelistedIPs', '');
 +      @define('CONST_BlockedUserAgents', '');
 +      @define('CONST_BlockReverseMaxLoad', 15);
        @define('CONST_BulkUserIPs', '');
        @define('CONST_BlockMessage', ''); // additional info to show for blocked IPs
  
 -      @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
 +      @define('CONST_Website_BaseURL', 'http://nominatim.openstreetmap.org/');
        @define('CONST_Tile_Default', 'Mapnik');
  
        @define('CONST_Default_Language', false);