From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 5 Jul 2020 08:57:12 +0000 (+0200)
Subject: Merge branch 'move-datasources-into-separate-repos' of https://github.com/mtmail... 
X-Git-Tag: v3.6.0~116
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/1889643eca5754664da106665f3826960858eccf?ds=sidebyside;hp=-c

Merge branch 'move-datasources-into-separate-repos' of https://github.com/mtmail/Nominatim into mtmail-move-datasources-into-separate-repos
---

1889643eca5754664da106665f3826960858eccf
diff --combined docs/admin/Import.md
index b3b5448c,2cc26c2f..ded69293
--- a/docs/admin/Import.md
+++ b/docs/admin/Import.md
@@@ -195,17 -195,6 +195,17 @@@ Run this script to verify all required 
  ./utils/check_import_finished.php
  ```
  
 +### Setting up the website
 +
 +Run the following command to set up the `website/settings-frontend.php`.
 +These settings are used in website/*.php files. You can use the website only after this 
 +step is completed.
 +
 +```sh
 +./utils/setup.php --setup-website
 +```
 +!!! Note
 +    This step is not necessary if you use `--all` option while setting up the DB.
  
  ## Tuning the database
  
@@@ -247,7 -236,7 +247,7 @@@ entire US adds about 10GB to your datab
          wget https://nominatim.org/data/tiger2019-nominatim-preprocessed.tar.gz
          tar xf tiger2019-nominatim-preprocessed.tar.gz
  
-     `data-source/us-tiger/README.md` explains how the data got preprocessed.
+     `data-source/overview.md` explains how the data got preprocessed.
  
    2. Import the data into your Nominatim database: