From: Tom Hughes <tom@compton.nu>
Date: Wed, 21 Dec 2016 11:55:19 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1395'
X-Git-Tag: live~4235
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/109e69efc186113380eccca35bfdb4bd83365db5

Merge remote-tracking branch 'openstreetmap/pull/1395'
---

109e69efc186113380eccca35bfdb4bd83365db5
diff --cc config/locales/en.yml
index 1b7c113b0,17d161c87..a6bbf655f
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1013,10 -1013,10 +1013,10 @@@ en
          FAQ</a>.
        more_2_html: |
          Although OpenStreetMap is open data, we cannot provide a
 -        free-of-charge map API for third-party developers.
 +        free-of-charge map API for third-parties.
-         See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>,
-         <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a>
-         and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
+         See our <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
+         <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a>
+         and <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.
        contributors_title_html: Our contributors
        contributors_intro_html: |
          Our contributors are thousands of individuals. We also include