]> git.openstreetmap.org Git - nominatim.git/blobdiff - docs/Installation.md
Merge remote-tracking branch 'upstream/master'
[nominatim.git] / docs / Installation.md
index 7f108160a25e40324e855bea2d83e532cd6ed3e9..1cdd9d109014b039cbaaf40965ecec74620fb12e 100644 (file)
@@ -5,8 +5,8 @@ This page contains generic installation instructions for Nominatim and its
 prerequisites. There are also step-by-step instructions available for
 the following operating systems:
 
-  * [Ubuntu 16.04](install-on-ubuntu-16.md)
-  * [CentOS 7.2](install-on-centos-7.md)
+  * [Ubuntu 16.04](Install-on-Ubuntu-16.md)
+  * [CentOS 7.2](Install-on-Centos-7.md)
 
 These OS-specific instructions can also be found in executable form
 in the `vagrant/` directory.
@@ -28,8 +28,7 @@ required for compiling osm2pgsql.
 
 For running tests:
 
-  * [lettuce](http://lettuce.it)
-  * [Shapely](http://toblerity.org/shapely/index.html)
+  * [behave](http://pythonhosted.org/behave/)
   * [Psycopg2](http://initd.org/psycopg)
   * [nose](https://nose.readthedocs.io)
   * [phpunit](https://phpunit.de)
@@ -40,12 +39,13 @@ For running Nominatim:
   * [PostGIS](http://postgis.refractions.net) (2.0 or later)
   * [PHP](http://php.net) (5.4 or later)
   * PHP-pgsql
+  * PHP-intl (bundled with PHP)
   * [PEAR::DB](http://pear.php.net/package/DB)
   * a webserver (apache or nginx are recommended)
 
 For running continuous updates:
 
-  * [osmosis](http://wiki.openstreetmap.org/wiki/Osmosis)
+  * [pyosmium](http://osmcode.org/pyosmium/)
 
 ### Hardware
 
@@ -151,4 +151,4 @@ Restart the nginx and php5-fpm services and the website should now be available
 on http://localhost/.
 
 
-Now continue with [importing the database](Import_and_update.md).
+Now continue with [importing the database](Import-and-Update.md).