Merge remote-tracking branch 'upstream/master'

[nominatim.git] / README.md

diff --git a/README.md b/README.md
index 42c4d72c72b0ea9eba5da446b3577498c5371243..406f7c858a065a11ffa56c6d806680a94f471fce 100644 (file)
--- a/README.md
+++ b/README.md
@@ -6,26 +6,25 @@ 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 (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
 ============
 

-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).
+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
 
 Detailed installation instructions for the development version can be

-found in the `/docs` directory, see [docs/Installation.md](docs/Installation.md).
+found at [nominatim.org](https://nominatim.org/release-docs/develop/admin/Installation)
+as well.

 
 A quick summary of the necessary steps:
 
 
 A quick summary of the necessary steps:
 


@@ -52,7 +51,7 @@ 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