From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 14 Dec 2017 23:12:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~346
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/e0ead17ad93bd34fde9ccdf3844d7c608dc7c12a?hp=-c

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

e0ead17ad93bd34fde9ccdf3844d7c608dc7c12a
diff --combined lib/template/includes/introduction.php
index 8bfce8ef,c8b82f33..f089881f
--- a/lib/template/includes/introduction.php
+++ b/lib/template/includes/introduction.php
@@@ -1,11 -1,9 +1,11 @@@
  <h2>Welcome to Nominatim</h2>
  
  <p>Nominatim is a search engine for <a href="https://www.openstreetmap.org">OpenStreetMap</a>
- data. This is the debugging interface. You may search for a name or address(forward search) or
- look up data by its geographic coordinate(reverse search). Each result comes with a
+ data. This is the debugging interface. You may search for a name or address (forward search) or
+ look up data by its geographic coordinate (reverse search). Each result comes with a
  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>
  
 -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://wiki.openstreetmap.org/wiki/Nominatim">Nominatim wiki 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>