Merge remote-tracking branch 'upstream/master'

diff --combined settings/settings.php
index 3da42133a4fd6ab769198a0203df8756346c0d5a,a04795efa30035455d9ab65fda19f87492a3fdbc..598ce86e7fe823d9f83c51434ba97df510d5e24d
--- 1/settings/settings.php
--- 2/settings/settings.php
+++ b/settings/settings.php
@@@ -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);
@@@ -92,7 -90,7 +92,7 @@@
        @define('CONST_Search_BatchMode', false);
  
        @define('CONST_Search_TryDroppedAddressTerms', false);
-       @define('CONST_Search_NameOnlySearchFrequencyThreshold', false);
+       @define('CONST_Search_NameOnlySearchFrequencyThreshold', 500);
  
        // Set to zero to disable polygon output
        @define('CONST_PolygonOutput_MaximumTypes', 1);