Author: desruisseaux
Date: Thu Jul 2 08:07:05 2020
New Revision: 1879429
URL: http://svn.apache.org/viewvc?rev=1879429&view=rev
Log:
Update links to EPSG terms of use.
Modified:
sis/site/trunk/content/apidocs/org/apache/sis/setup/InstallationResources.html
sis/site/trunk/content/downloads.mdtext
sis/site/trunk/content/epsg.mdtext
sis/site/trunk/content/openoffice/en/formula.html
sis/site/trunk/content/openoffice/fr/formula.html
sis/site/trunk/content/source.mdtext
Modified: sis/site/trunk/content/apidocs/org/apache/sis/setup/InstallationResources.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/apidocs/org/apache/sis/setup/InstallationResources.html?rev=1879429&r1=1879428&r2=1879429&view=diff
==============================================================================
--- sis/site/trunk/content/apidocs/org/apache/sis/setup/InstallationResources.html (original)
+++ sis/site/trunk/content/apidocs/org/apache/sis/setup/InstallationResources.html Thu Jul
2 08:07:05 2020
@@ -156,7 +156,7 @@ extends <a href="https://docs.oracle.com
But the weight of those files (about 2.4 Mb) is unnecessary for users who do not live
in North America.</li>
<li>On the other hand, the <a href="http://www.epsg.org/">EPSG geodetic dataset</a>
is important for most users.
Codes like <code>"EPSG:4326"</code> became a <i>de-facto</i>
standard in various places like <cite>Web Map Services</cite>,
- images encoded in GeoTIFF format, <i>etc</i>. But the <a href="http://www.epsg.org/TermsOfUse.aspx">EPSG
terms of use</a>
+ images encoded in GeoTIFF format, <i>etc</i>. But the <a href="https://epsg.org/terms-of-use.html">EPSG
terms of use</a>
are more restrictive than the Apache license and require that we inform the users about
those conditions.</li>
</ul></div>
@@ -369,7 +369,7 @@ extends <a href="https://docs.oracle.com
<th>License</th>
</tr><tr>
<td><code>"EPSG"</code></td>
- <td>A copy of the <a href="http://www.epsg.org/TermsOfUse.aspx">http://www.epsg.org/TermsOfUse.aspx</a>
page.</td>
+ <td>A copy of the <a href="https://epsg.org/terms-of-use.html">https://epsg.org/terms-of-use.html</a>
page.</td>
</tr><tr>
<td><code>"Embedded"</code></td>
<td>Above EPSG license.</td>
Modified: sis/site/trunk/content/downloads.mdtext
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/downloads.mdtext?rev=1879429&r1=1879428&r2=1879429&view=diff
==============================================================================
--- sis/site/trunk/content/downloads.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/downloads.mdtext [UTF-8] Thu Jul 2 08:07:05 2020
@@ -156,4 +156,4 @@ See [How to use EPSG geodetic dataset](e
[doc-SHA]: https://www.apache.org/dist/sis/1.0/apache-sis-1.0-doc.zip.sha
[bin-SHA]: https://www.apache.org/dist/sis/1.0/apache-sis-1.0-bin.zip.sha
[EPSG]: http://www.epsg.org/
-[EPSG-ToU]: http://www.epsg.org/TermsOfUse.aspx
+[EPSG-ToU]: https://epsg.org/terms-of-use.html
Modified: sis/site/trunk/content/epsg.mdtext
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/epsg.mdtext?rev=1879429&r1=1879428&r2=1879429&view=diff
==============================================================================
--- sis/site/trunk/content/epsg.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/epsg.mdtext [UTF-8] Thu Jul 2 08:07:05 2020
@@ -265,5 +265,5 @@ fetching the data source from the `conte
[IOGP]: http://www.iogp.org/
[EPSG]: http://www.epsg.org/
-[EPSG-ToU]: http://www.epsg.org/TermsOfUse.aspx
+[EPSG-ToU]: https://epsg.org/terms-of-use.html
[Derby]: http://db.apache.org/derby/derby_downloads.html
Modified: sis/site/trunk/content/openoffice/en/formula.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/openoffice/en/formula.html?rev=1879429&r1=1879428&r2=1879429&view=diff
==============================================================================
--- sis/site/trunk/content/openoffice/en/formula.html [UTF-8] (original)
+++ sis/site/trunk/content/openoffice/en/formula.html [UTF-8] Thu Jul 2 08:07:05 2020
@@ -44,7 +44,7 @@
</p><p>
Authoritative definitions of <abbr>EPSG</abbr> codes can be browsed on-line
on <a href="http://epsg-registry.org/"><abbr>EPSG</abbr> registry</a>.
This add-in for Open/LibreOffice contains a copy (in binary format) of <abbr>EPSG</abbr>
database for convenience,
- but note that its use <a href="http://www.epsg.org/TermsOfUse.aspx">is subject
to conditions</a>.
+ but note that its use <a href="https://epsg.org/terms-of-use.html">is subject
to conditions</a>.
Apache <abbr>SIS</abbr> extends this list with a few codes defined outside
<abbr>EPSG</abbr>, in particular codes defined by <abbr title="Open Geospatial
Consortium">OGC</abbr>.
A summary of codes embedded in Apache <abbr>SIS</abbr> is <a href="../../tables/CoordinateReferenceSystems.html">available
here</a>.
Recognized code syntax
Modified: sis/site/trunk/content/openoffice/fr/formula.html
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/openoffice/fr/formula.html?rev=1879429&r1=1879428&r2=1879429&view=diff
==============================================================================
--- sis/site/trunk/content/openoffice/fr/formula.html [UTF-8] (original)
+++ sis/site/trunk/content/openoffice/fr/formula.html [UTF-8] Thu Jul 2 08:07:05 2020
@@ -46,7 +46,7 @@
</p><p>
Les définitions officielles des codes <abbr>EPSG</abbr> peuvent être
explorées en-ligne avec le <a href="http://epsg-registry.org/">registre <abbr>EPSG</abbr></a>.
Cette extension pour Open/LibreOffice est toutefois livrée avec sa propre copie (dans
un format binaire) de la base de données <abbr>EPSG</abbr>,
- dont <a href="http://www.epsg.org/TermsOfUse.aspx">l’utilisation est soumise
à des conditions</a>.
+ dont <a href="https://epsg.org/terms-of-use.html">l’utilisation est soumise
à des conditions</a>.
Apache <abbr>SIS</abbr> étend cette liste avec quelques codes définis
en dehors d’<abbr>EPSG</abbr>, notamment par l’<abbr title="Open Geospatial
Consortium">OGC</abbr>.
Un sommaire des codes embarqués par Apache <abbr>SIS</abbr> est <a
href="../../tables/CoordinateReferenceSystems.html">donné ici</a>.
La syntaxe des codes acceptés
Modified: sis/site/trunk/content/source.mdtext
URL: http://svn.apache.org/viewvc/sis/site/trunk/content/source.mdtext?rev=1879429&r1=1879428&r2=1879429&view=diff
==============================================================================
--- sis/site/trunk/content/source.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/source.mdtext [UTF-8] Thu Jul 2 08:07:05 2020
@@ -252,7 +252,7 @@ The development branches on that reposit
[git]: http://git-scm.com
[viewvc]: http://svn.apache.org/viewvc/sis/
[epsg-install]: epsg.html
-[EPSG-ToU]: http://www.epsg.org/TermsOfUse.aspx
+[EPSG-ToU]: https://epsg.org/terms-of-use.html
[svn-sis-tags]: https://svn.apache.org/repos/asf/sis/tags/
[geoapi-stable]: http://www.geoapi.org/3.0/index.html
[geoapi-snapshot]: http://www.geoapi.org/snapshot/index.html
|