update docs/*.md based on vagrant/*.sh

[nominatim.git] / docs / install-on-ubuntu-16.md

diff --git a/docs/install-on-ubuntu-16.md b/docs/install-on-ubuntu-16.md
index 8ddad65e8e7494427a3369fd609ee3e747c724e3..2baacc81718646a810ddf071a9b28af3a458de58 100644 (file)
--- a/docs/install-on-ubuntu-16.md
+++ b/docs/install-on-ubuntu-16.md
@@ -3,6 +3,9 @@
 
 
 
+
+
+
 *Note:* these installation instructions are also available in executable
         form for use with vagrant under vagrant/install-on-ubuntu-16.sh.
 
@@ -14,8 +17,8 @@ These instructions expect that you have a freshly installed Ubuntu 16.04.
 Make sure all packages are are up-to-date by running:
 
 
+
     sudo apt-get update -qq
-    sudo apt-get upgrade -y
 
 Now you can install all packages needed for Nominatim:
 
@@ -29,11 +32,10 @@ Now you can install all packages needed for Nominatim:
 If you want to run the test suite, you need to install the following
 additional packages:
 
-    sudo apt-get install -y python-dev python-pip python-levenshtein python-shapely \
-                            python-psycopg2 tidy python-nose python-tidylib \
-                            phpunit
+    sudo apt-get install -y python3-dev python3-pip python3-psycopg2 python3-tidylib phpunit
 
-    pip install --user lettuce==0.2.18 six==1.7 haversine
+    pip3 install --user behave nose # urllib3
+    sudo pear install PHP_CodeSniffer
 
 
 System Configuration
@@ -99,6 +101,7 @@ sudo tee /etc/apache2/conf-available/nominatim.conf << EOFAPACHECONF
 <Directory "$USERHOME/Nominatim/build/website">
   Options FollowSymLinks MultiViews
   AddType text/html   .php
+  DirectoryIndex search.php
   Require all granted
 </Directory>
 
@@ -127,7 +130,7 @@ Get the source code from Github and change into the source directory
 
 
     cd $USERHOME
-    git clone --recursive git://github.com/twain47/Nominatim.git
+    git clone --recursive git://github.com/openstreetmap/Nominatim.git
     cd Nominatim