From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 14 Jan 2020 20:56:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~263
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/b3f1f45f97ebbe378be8e9e3b09f90aa5e22c0e1?ds=sidebyside

Merge remote-tracking branch 'upstream/master'
---

b3f1f45f97ebbe378be8e9e3b09f90aa5e22c0e1
diff --cc lib/template/includes/introduction.php
index f089881f,f891c785..ce136d2d
--- a/lib/template/includes/introduction.php
+++ b/lib/template/includes/introduction.php
@@@ -6,6 -6,4 +6,6 @@@ look up data by its geographic coordina
  link to a details page where you can inspect what data about the object is saved in 
  the database and investigate how the address of the object has been computed.</p>
  
- <p>For more information visit the <a href="https://wiki.openstreetmap.org/wiki/Nominatim">Nominatim wiki page</a>.</p>
 -For more information visit the <a href="https://nominatim.org">Nominatim home page</a>.
++<p>For more information visit the <a href="https://nominatim.org">Nominatim home page</a>.</p>
 +
 +<p>All usage of nominatim.openstreetmap.org must follow the <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.</p>