Merge remote-tracking branch 'upstream/master'

diff --combined lib/template/includes/introduction.php
index 8bfce8ef588d3fd1c2cd3c14de604e87f02c75c8,c8b82f331ef31330d833bdcba18569c355631eb6..f089881faac81594961b933561ef6fda99ce5e03
--- 1/lib/template/includes/introduction.php
--- 2/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>