Merge remote-tracking branch 'upstream/master'

[nominatim.git] / docs / admin / Import.md

diff --git a/docs/admin/Import.md b/docs/admin/Import.md
index 2686942ebcfd8cd67b723d35eabbcb1455c3f90b..39c45a6e83b865bf26f14e873ce445dbd5e9762f 100644 (file)
--- a/docs/admin/Import.md
+++ b/docs/admin/Import.md
@@ -40,7 +40,7 @@ all commands from the project directory.
 
 ### Configuration setup in `.env`
 
 
 ### Configuration setup in `.env`
 

-The Nominatim server can be customized via an `.env` configuration file in the
+The Nominatim server can be customized via an `.env` configuration file in the 

 project directory. This is a file in [dotenv](https://github.com/theskumar/python-dotenv)
 format which looks the same as variable settings in a standard shell environment.
 You can also set the same configuration via environment variables. All
 project directory. This is a file in [dotenv](https://github.com/theskumar/python-dotenv)
 format which looks the same as variable settings in a standard shell environment.
 You can also set the same configuration via environment variables. All


@@ -48,7 +48,7 @@ settings have a `NOMINATIM_` prefix to avoid conflicts with other environment
 variables.
 
 There are lots of configuration settings you can tweak. Have a look
 variables.
 
 There are lots of configuration settings you can tweak. Have a look

-at `settings/env.default` for a full list. Most should have a sensible default.
+at `Nominatim/settings/env.default` for a full list. Most should have a sensible default.

 
 #### Flatnode files
 
 
 #### Flatnode files
 


@@ -193,12 +193,15 @@ can be found in the development section.
     [Geofabrik](https://download.geofabrik.de).
 
 Download the data to import. Then issue the following command
     [Geofabrik](https://download.geofabrik.de).
 
 Download the data to import. Then issue the following command

-from the **build directory** to start the import:
+from the **project directory** to start the import:

 
 ```sh
 nominatim import --osm-file <data file> 2>&1 | tee setup.log
 ```
 
 
 ```sh
 nominatim import --osm-file <data file> 2>&1 | tee setup.log
 ```
 

+The **project directory** is the one that you have set up at the beginning.
+See [creating the project directory](Import#creating-the-project-directory).
+

 ### Notes on full planet imports
 
 Even on a perfectly configured machine
 ### Notes on full planet imports
 
 Even on a perfectly configured machine


@@ -277,7 +280,12 @@ If you want to be able to search for places by their type through
 [special key phrases](https://wiki.openstreetmap.org/wiki/Nominatim/Special_Phrases)
 you also need to import these key phrases like this:
 
 [special key phrases](https://wiki.openstreetmap.org/wiki/Nominatim/Special_Phrases)
 you also need to import these key phrases like this:
 

-    nominatim special-phrases --import-from-wiki
+```sh
+nominatim special-phrases --import-from-wiki
+```

 
 Note that this command downloads the phrases from the wiki link above. You
 need internet access for the step.
 
 Note that this command downloads the phrases from the wiki link above. You
 need internet access for the step.

+
+You can also import special phrases from a csv file, for more 
+information please read the [Customization chapter](Customization.md).