Merge remote-tracking branch 'upstream/master'

[nominatim.git] / README.md

diff --git a/README.md b/README.md
index c5a01a3623d68982bc4d0926e6d843b20a3c0d90..42c4d72c72b0ea9eba5da446b3577498c5371243 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/openstreetmap/Nominatim.svg?branch=master)](https://travis-ci.org/openstreetmap/Nominatim)
+
 Nominatim
 =========
 
@@ -19,41 +21,38 @@ http://wiki.openstreetmap.org/wiki/Nominatim
 Installation
 ============
 
-There are detailed installation instructions in the /docs directory.
-Here is a quick summary of the necessary steps.
+The latest stable release can be downloaded from http://nominatim.org.
+There you can also find [installation instructions for the release](http://nominatim.org/release-docs/latest/Installation).
 
-1. Compile Nominatim:
+Detailed installation instructions for the development version can be
+found in the `/docs` directory, see [docs/Installation.md](docs/Installation.md).
+
+A quick summary of the necessary steps:
 
-     mkdir build
-     cd build
-     cmake ..
-     make
+1. Compile Nominatim:
 
-   For more detailed installation instructions see [docs/installation.md]().
-   There are also step-by-step instructions for
-     [Ubuntu 16.04](docs/install-on-ubuntu-16.md) and
-     [CentOS 7.2](docs/install-on-centos-7.md).
+        mkdir build
+        cd build
+        cmake ..
+        make
 
 2. Get OSM data and import:
 
-     ./build/utils/setup.php --osm-file <your planet file> --all
-
-   Details can be found in [docs/Import_and_update.md]()
+        ./build/utils/setup.php --osm-file <your planet file> --all
 
 3. Point your webserver to the ./build/website directory.
 
 
-
 License
 =======
 
 The source code is available under a GPLv2 license.
 
-Contact and Bugreports
+Contact and Bug reports
 ======================
 
 For questions you can join the geocoding mailinglist, see
 http://lists.openstreetmap.org/listinfo/geocoding
 
 Bugs may be reported on the github project site:
-https://github.com/twain47/Nominatim
+https://github.com/openstreetmap/Nominatim