Update documentation

diff --git a/docs/admin/Customization.md b/docs/admin/Customization.md
index 646465afd1efed1a80e3b32ff38aa62c968b86ab..373356383325a241ae1d75ca293239e5ea424b64 100644 (file)
--- a/docs/admin/Customization.md
+++ b/docs/admin/Customization.md
@@ -85,7 +85,7 @@ To do so, you have access to the following command:
 nominatim special-phrases --import-from-csv <csv file>
 ```
 
 nominatim special-phrases --import-from-csv <csv file>
 ```
 

-Note that the 2 previous import commands will update the phrases from your database.
+Note that the two previous import commands will update the phrases from your database.

 This means that if you import some phrases from a csv file, only the phrases
 present in the csv file will be kept into the database. All other phrases will
 be removed.
 This means that if you import some phrases from a csv file, only the phrases
 present in the csv file will be kept into the database. All other phrases will
 be removed.

diff --git a/docs/admin/Import.md b/docs/admin/Import.md
index 3701df9285112d2ca2cad3bbc193495d97d4a5b9..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

diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh
index 1e10f0412abd5fc3052f04123902316e2a4b7483..5fb5252917002ecb1f6830db04f78571cfcbaa8d 100755 (executable)
--- a/vagrant/Install-on-Ubuntu-20.sh
+++ b/vagrant/Install-on-Ubuntu-20.sh
@@ -244,6 +244,9 @@ server {
 EOF_NGINX_CONF
 #DOCS:```
 
 EOF_NGINX_CONF
 #DOCS:```
 

+# If you have some errors, make sure that php7.4-fpm.sock is well under
+# /var/run/ and not under /var/run/php. Otherwise change the Nginx configuration
+# to /var/run/php/php7.4-fpm.sock.

 #
 # Enable the configuration and restart Nginx
 #
 #
 # Enable the configuration and restart Nginx
 #