add more tables and an experimental warning to new --drop function

[nominatim.git] / VAGRANT.md

diff --git a/VAGRANT.md b/VAGRANT.md
index 26b0ee7512f54a2738f89cf6e45baf76826860eb..c662d5e40302b5acb6f1d83270d0b946cceb638e 100644 (file)
--- a/VAGRANT.md
+++ b/VAGRANT.md
@@ -38,7 +38,8 @@ is.
 
 3. Import a small country (Monaco)
 
 
 3. Import a small country (Monaco)
 

-    You need to give the virtual machine more memory (2GB) for an import, see `Vagrantfile`.
+    You need to give the virtual machine more memory (2GB) for an import,
+    see `Vagrantfile`. Otherwise 1GB is enough.

     
     See the FAQ how to skip this step and point Nominatim to an existing database.
 
     
     See the FAQ how to skip this step and point Nominatim to an existing database.
 


@@ -46,7 +47,7 @@ is.
   # inside the virtual machine:
   cd Nominatim
     wget --no-verbose --output-document=data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf
   # inside the virtual machine:
   cd Nominatim
     wget --no-verbose --output-document=data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf

-    utils/setup.php --osm-file data/monaco.osm.pbf --osm2pgsql-cache 1000 --all | tee monaco.$$.log
+    ./utils/setup.php --osm-file data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log

     ./utils/specialphrases.php --countries > data/specialphrases_countries.sql
     psql -d nominatim -f data/specialphrases_countries.sql
     ```
     ./utils/specialphrases.php --countries > data/specialphrases_countries.sql
     psql -d nominatim -f data/specialphrases_countries.sql
     ```


@@ -102,8 +103,8 @@ and then
 
 ## Running unit tests
 
 
 ## Running unit tests
 

-    cd ~/Nominatim/tests
-    phpunit
+    cd ~/Nominatim/tests-php
+    phpunit ./