Tweak the new copyright page a bit.

[rails.git] / app / views / site / copyright.html.erb

diff --git a/app/views/site/copyright.html.erb b/app/views/site/copyright.html.erb
index 9b8fd8252fb090b4ed97cc178d78b89d136b95fd..f7ef2afa3d860eec26ea8df1becf76486318b4b3 100644 (file)
--- a/app/views/site/copyright.html.erb
+++ b/app/views/site/copyright.html.erb
@@ -1,16 +1,16 @@
-<h2>Copyright</h2>
+<p style="float: right"><a href="http://creativecommons.org/licenses/by-sa/2.0/"><img src="/images/cc_button.png" border="0" alt="" /></a></p>

 
 

-<p><a href="http://creativecommons.org/licenses/by-sa/2.0/"><img src="/images/cc_button.png" border="0" alt="" /></a></p>
+<h2>Copyright and License</h2>

 
 

-<p>OpenStreetMap is <i>open data</i>, licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> licence ('CC-BY-SA').</p>
+<p>OpenStreetMap is <i>open data</i>, licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0</a> licence (CC-BY-SA).</p>

 
 <p>You are free to copy, distribute, transmit and adapt our maps and data, as long as you credit OpenStreetMap and its contributors. If you alter or build upon our maps or data, you may distribute the result only under the same or similar licence. The full <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal code</a> explains your rights and responsibilities.</p>
 
 <h3>How to credit OpenStreetMap</h3>
 
 
 <p>You are free to copy, distribute, transmit and adapt our maps and data, as long as you credit OpenStreetMap and its contributors. If you alter or build upon our maps or data, you may distribute the result only under the same or similar licence. The full <a href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal code</a> explains your rights and responsibilities.</p>
 
 <h3>How to credit OpenStreetMap</h3>
 

-<p>If you are using OpenStreetMap map images, we request that your credit reads at least "&copy; OpenStreetMap contributors, CC-BY-SA". If you are using map data only, we request "Map data &copy; OpenStreetMap contributors, CC-BY-SA".</p>
+<p>If you are using OpenStreetMap map images, we request that your credit reads at least &ldquo;&copy; OpenStreetMap contributors, CC-BY-SA&rdquo;. If you are using map data only, we request &ldquo;Map data &copy; OpenStreetMap contributors, CC-BY-SA&rdquo;.</p>

 
 

-<p>Where possible, OpenStreetMap should be hyperlinked to <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a> and CC-BY-SA to <a href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a>. If you are using a medium where links are not possible (e.g. a printed work), we suggest you direct your readers to www.openstreetmap.org (perhaps by expanding 'OpenStreetMap' to this full address) and to www.creativecommons.org.</p>
+<p>Where possible, OpenStreetMap should be hyperlinked to <a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a> and CC-BY-SA to <a href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a>. If you are using a medium where links are not possible (e.g. a printed work), we suggest you direct your readers to www.openstreetmap.org (perhaps by expanding &lsquo;OpenStreetMap&rsquo; to this full address) and to www.creativecommons.org.</p>

 
 <h3>Finding out more</h3>
 
 
 <h3>Finding out more</h3>
 


@@ -18,11 +18,11 @@
        
 <p>OSM contributors are reminded never to add data from any copyrighted sources (e.g. Google Maps or printed maps) without explicit permission from the copyright holders.</p>
 
        
 <p>OSM contributors are reminded never to add data from any copyrighted sources (e.g. Google Maps or printed maps) without explicit permission from the copyright holders.</p>
 

-<p>Although OpenStreetMap is open data, we cannot provide a free-of-charge map API for third-party developers. See our <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a>.
+<p>Although OpenStreetMap is open data, we cannot provide a free-of-charge map API for third-party developers. See our <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>.

 
 <h3>Our contributors</h3>
 
 
 <h3>Our contributors</h3>
 

-<p>Our CC-BY-SA licence requires you to "give the Original Author credit reasonable to the medium or means You are utilizing". Individual OSM mappers do not request a credit over and above that to "OpenStreetMap contributors", but where data from a national mapping agency or other major source has been included in OpenStreetMap, it may be reasonable to credit them by directly reproducing their credit or by linking to it on this page.</p>
+<p>Our CC-BY-SA licence requires you to &ldquo;give the Original Author credit reasonable to the medium or means You are utilising&rdquo;. Individual OSM mappers do not request a credit over and above that to &ldquo;OpenStreetMap contributors&rdquo;, but where data from a national mapping agency or other major source has been included in OpenStreetMap, it may be reasonable to credit them by directly reproducing their credit or by linking to it on this page.</p>

 
 <!--
 
 
 <!--
 


@@ -34,7 +34,7 @@ Any additions here must be discussed with OSM sysadmins first.
 
 -->
 
 
 -->
 

-<ul id='contributors'>
+<ul id="contributors">

        
 <li><strong>Australia</strong>: Contains suburb data based on Australian Bureau of Statistics data.
 
        
 <li><strong>Australia</strong>: Contains suburb data based on Australian Bureau of Statistics data.