fix quotes to make phpcs happy

[nominatim.git] / README.md

diff --git a/README.md b/README.md
index 70ef579354e75196b9ea2df86c78ffa2cacf54d7..406f7c858a065a11ffa56c6d806680a94f471fce 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,26 +1,32 @@
+[![Build Status](https://travis-ci.org/openstreetmap/Nominatim.svg?branch=master)](https://travis-ci.org/openstreetmap/Nominatim)
+

 Nominatim
 =========
 
 Nominatim (from the Latin, 'by name') is a tool to search OpenStreetMap data
 by name and address (geocoding) and to generate synthetic addresses of
 OSM points (reverse geocoding). An instance with up-to-date data can be found
 Nominatim
 =========
 
 Nominatim (from the Latin, 'by name') is a tool to search OpenStreetMap data
 by name and address (geocoding) and to generate synthetic addresses of
 OSM points (reverse geocoding). An instance with up-to-date data can be found

-at http://nominatim.openstreetmap.org. Nominatim is also used as one of the
-sources for the Search box on the OpenStreetMap home page and powers the search
-on the MapQuest Open Initiative websites.
+at https://nominatim.openstreetmap.org. Nominatim is also used as one of the
+sources for the Search box on the OpenStreetMap home page.

 
 Documentation
 =============
 
 
 Documentation
 =============
 

-More information about Nominatim, including usage and installation instructions,
-can be found in the docs/ subdirectory and in the OSM wiki at:
-
-http://wiki.openstreetmap.org/wiki/Nominatim
+The documentation of the latest development version is in the
+`docs/` subdirectory. A HTML version can be found at
+https://nominatim.org/release-docs/develop/ .

 
 Installation
 ============
 
 
 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 https://nominatim.org.
+There you can also find [installation instructions for the release](https://nominatim.org/release-docs/latest/admin/Installation).
+
+Detailed installation instructions for the development version can be
+found at [nominatim.org](https://nominatim.org/release-docs/develop/admin/Installation)
+as well.
+
+A quick summary of the necessary steps:

 
 1. Compile Nominatim:
 
 
 1. Compile Nominatim:
 


@@ -29,31 +35,23 @@ Here is a quick summary of the necessary steps.
         cmake ..
         make
 
         cmake ..
         make
 

-   For more detailed installation instructions see [docs/Installation.md](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).
-

 2. Get OSM data and import:
 
         ./build/utils/setup.php --osm-file <your planet file> --all
 
 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](docs/Import_and_update.md)
-

 3. Point your webserver to the ./build/website directory.
 
 
 3. Point your webserver to the ./build/website directory.
 
 

-

 License
 =======
 
 The source code is available under a GPLv2 license.
 
 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
 ======================
 
 For questions you can join the geocoding mailinglist, see

-http://lists.openstreetmap.org/listinfo/geocoding
+https://lists.openstreetmap.org/listinfo/geocoding

 
 Bugs may be reported on the github project site:
 https://github.com/openstreetmap/Nominatim
 
 Bugs may be reported on the github project site:
 https://github.com/openstreetmap/Nominatim