Merge remote-tracking branch 'upstream/master'

diff --combined utils/update.php
index 2fa773fe3dbbb46d53cb0ccb58cc4dfb50e6384b,6965cd57e2dbceed20ee00a8b9edcd1f5d2076c3..7b9338d5c03f43fcbfc0a2c578925e88cd59ae5e
--- 1/utils/update.php
--- 2/utils/update.php
+++ b/utils/update.php
@@@ -49,7 -49,6 +49,7 @@@ $aCMDOption
  getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
  
  if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 +
  if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
  
  date_default_timezone_set('Etc/UTC');
@@@ -355,7 -354,7 +355,7 @@@ if ($aResult['import-osmosis'] || $aRes
      //
      if (strpos(CONST_Replication_Url, 'download.geofabrik.de') !== false && CONST_Replication_Update_Interval < 86400) {
          fail('Error: Update interval too low for download.geofabrik.de. ' .
-              "Please check install documentation (http://nominatim.org/release-docs/latest/Import-and-Update#setting-up-the-update-process)\n");
+              "Please check install documentation (https://nominatim.org/release-docs/latest/admin/Import-and-Update#setting-up-the-update-process)\n");
      }
  
      $sImportFile = CONST_InstallPath.'/osmosischange.osc';