Merge remote-tracking branch 'upstream/master'

[nominatim.git] / README.md

diff --git a/README.md b/README.md
index 7e8c776ef94fb3080b4973e909bd8acaa6a932a1..3b0f328a458447b58abdf82bdea15ad19f8be77a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/openstreetmap/Nominatim.svg?branch=master)](https://travis-ci.org/openstreetmap/Nominatim)
+[![Build Status](https://github.com/osm-search/Nominatim/workflows/CI%20Tests/badge.svg)](https://github.com/osm-search/Nominatim/actions?query=workflow%3A%22CI+Tests%22)

 
 Nominatim
 =========
 
 Nominatim
 =========


@@ -20,44 +20,58 @@ Installation
 ============
 
 The latest stable release can be downloaded from https://nominatim.org.
 ============
 
 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).
+There you can also find [installation instructions for the release](https://nominatim.org/release-docs/latest/admin/Installation), as well as an extensive [Troubleshooting/FAQ section](https://nominatim.org/release-docs/latest/admin/Faq/).

 
 

-Detailed installation instructions for the development version can be
-found at [nominatim.org](https://nominatim.org/release-docs/develop/admin/Installation)
-as well.
+[Detailed installation instructions for current master](https://nominatim.org/release-docs/develop/admin/Installation)
+can be found at nominatim.org as well.

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

-1. Compile Nominatim:
+1. Create a Python virtualenv and install the packages:

 
 

-        mkdir build
-        cd build
-        cmake ..
-        make
+        python3 -m venv nominatim-venv
+        ./nominatim-venv/bin/pip install packaging/nominatim-{api,db}

 
 

-2. Get OSM data and import:
+2. Create a project directory, get OSM data and import:

 
 

-        ./build/utils/setup.php --osm-file <your planet file> --all
+        mkdir nominatim-project
+        cd nominatim-project
+        ../nominatim-venv/bin/nominatim import --osm-file <your planet file>

 
 

-3. Point your webserver to the ./build/website directory.
+3. Start the webserver:
+
+        ./nominatim-venv/bin/pip install uvicorn falcon
+        ../nominatim-venv/bin/nominatim serve

 
 
 License
 =======
 
 
 
 License
 =======
 

-The source code is available under a GPLv2 license.
+The Python source code is available under a GPL license version 3 or later.
+The Lua configuration files for osm2pgsql are released under the
+Apache License, Version 2.0. All other files are under a GPLv2 license.

 
 
 Contributing
 ============
 
 
 
 Contributing
 ============
 

-Contributions are welcome. For details see [contribution guide](CONTRIBUTING.md).
+Contributions, bug reports and pull requests are welcome. When reporting a
+bug, please use one of the
+[issue templates](https://github.com/osm-search/Nominatim/issues/new/choose)
+and make sure to provide all the information requested. If you are not
+sure if you have really found a bug, please ask for help in the forums
+first (see 'Questions' below).

 
 

-Both bug reports and pull requests are welcome.
+For details on contributing, have a look at the
+[contribution guide](CONTRIBUTING.md).

 
 
 
 

-Mailing list
-============
+Questions and help
+==================
+
+If you have questions about search results and the OpenStreetMap data
+used in the search, use the [OSM Forum](https://community.openstreetmap.org/).

 
 

-For questions you can join the geocoding mailinglist, see
-https://lists.openstreetmap.org/listinfo/geocoding
+For questions, community help and discussions around the software and
+your own installation of Nominatim, use the
+[Github discussions forum](https://github.com/osm-search/Nominatim/discussions).