take country names only from relations

[nominatim.git] / docs / Import-and-Update.md

diff --git a/docs/Import-and-Update.md b/docs/Import-and-Update.md
index 266a5d8b9e5a00dbb499da45cd3aad8e17b42541..fe95e8654ac1acbcb83408b57295a2cea043953d 100644 (file)
--- a/docs/Import-and-Update.md
+++ b/docs/Import-and-Update.md
@@ -39,6 +39,10 @@ This data is available as a binary download:
 Combined the 2 files are around 1.5GB and add around 30GB to the install
 size of nominatim. They also increase the install time by an hour or so.
 
+*NOTE:* you'll need to download the Wikipedia rankings before performing
+the initial import of the data if you want the rankings applied to the
+loaded data.
+
 ### UK postcodes
 
 Nominatim can use postcodes from an external source to improve searches that involve a UK postcode. This data can be optionally downloaded: 
@@ -108,7 +112,7 @@ instance by following these steps:
 
   6. Apply the new settings:
 
-        ./utils/setup.php --create-functions --enable-diff-updates --create-partition-functions
+         ./utils/setup.php --create-functions --enable-diff-updates --create-partition-functions
 
 Be warned that the import can take a very long time, especially if you
 import all of the US. The entire US adds about 10GB to your database.
@@ -124,7 +128,8 @@ For a list of other methods see the output of `./utils/update.php --help`.
 Installing the newest version of Pyosmium
 -----------------------------------------
 
-It is recommended to install Pyosmium via pip:
+It is recommended to install Pyosmium via pip. Run (as the same user who
+will later run the updates):
 
     pip install --user osmium
 
@@ -156,7 +161,7 @@ diffs for Ireland from geofabrik add the following:
 
 To set up the update process now run the following command:
 
-    ./utils/update --init-updates
+    ./utils/update.php --init-updates
 
 It outputs the date where updates will start. Recheck that this date is
 what you expect.
@@ -171,6 +176,8 @@ The following command will keep your database constantly up to date:
 
     ./utils/update.php --import-osmosis-all
 
+(Note that even though the old name "import-osmosis-all" has been kept for compatibility reasons, Osmosis is not required to run this - it uses pyosmium behind the scenes.)
+
 If you have imported multiple country extracts and want to keep them
 up-to-date, have a look at the script in
 [issue #60](https://github.com/openstreetmap/Nominatim/issues/60).