aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Toews <mwtoews@gmail.com>2018-06-02 19:37:23 +1200
committerMike Toews <mwtoews@gmail.com>2018-06-02 19:40:46 +1200
commit152f34f98de9264eeb2ba92cd36e6c196b12ff8d (patch)
treeda21658b9282562ac1d4ee0531ff7607c7015f71
parent524a335e0b80cf4ba8c68bf72321405a2803fca4 (diff)
downloadPROJ-152f34f98de9264eeb2ba92cd36e6c196b12ff8d.tar.gz
PROJ-152f34f98de9264eeb2ba92cd36e6c196b12ff8d.zip
Upgrade http:// to https:// where feasible
-rw-r--r--CITATION4
-rw-r--r--CONTRIBUTING.md8
-rw-r--r--README.md2
-rw-r--r--cmake/ProjConfig.cmake4
-rw-r--r--cmake/ProjSystemInfo.cmake2
-rw-r--r--cmake/ProjUtilities.cmake4
-rw-r--r--configure.ac2
-rw-r--r--docs/source/about.rst4
-rw-r--r--docs/source/apps/cct.rst4
-rw-r--r--docs/source/apps/cs2cs.rst4
-rw-r--r--docs/source/apps/geod.rst4
-rw-r--r--docs/source/apps/gie.rst4
-rw-r--r--docs/source/apps/proj.rst4
-rw-r--r--docs/source/community/contributing.rst4
-rw-r--r--docs/source/development/bindings.rst4
-rw-r--r--docs/source/index.rst2
-rw-r--r--jniwrap/build.xml2
-rw-r--r--jniwrap/org.osgeo.proj/org/proj4/PJ.java2
-rw-r--r--jniwrap/org.osgeo.proj/org/proj4/package-info.java2
-rw-r--r--man/man1/cct.14
-rw-r--r--man/man1/cs2cs.14
-rw-r--r--man/man1/geod.14
-rw-r--r--man/man1/gie.14
-rw-r--r--man/man1/nad2nad.12
-rw-r--r--man/man1/proj.14
-rw-r--r--man/man3/geodesic.32
-rw-r--r--man/man3/pj_init.32
-rw-r--r--test/catch.hpp10
28 files changed, 51 insertions, 51 deletions
diff --git a/CITATION b/CITATION
index 82643d84..861599e8 100644
--- a/CITATION
+++ b/CITATION
@@ -1,7 +1,7 @@
To cite PROJ in publications use:
PROJ contributors (2018). PROJ coordinate transformation software
- library. Open Source Geospatial Foundation. URL http://proj4.org/.
+ library. Open Source Geospatial Foundation. URL https://proj4.org/.
A BibTeX entry for LaTeX users is
@@ -10,5 +10,5 @@ A BibTeX entry for LaTeX users is
author = {{PROJ contributors}},
organization = {Open Source Geospatial Foundation},
year = {2018},
- url = {http://proj4.org/},
+ url = {https://proj4.org/},
}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 61ba3772..73e3fc52 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -68,18 +68,18 @@ Note that not all feature requests are accepted.
## Write documentation
PROJ.4 is in dire need of better documentation. Any contributions of documentation
-are greatly appreciated. The PROJ.4 documentation is available on [proj4.org](ttp://proj4.org).
+are greatly appreciated. The PROJ.4 documentation is available on [proj4.org](https://proj4.org).
The website is generated with [Sphinx](http://www.sphinx-doc.org/en/stable/). Contributions
to the documentation should be made as [Pull Requests](https://github.com/OSGeo/proj.4/pulls)
on GitHub.
If you intend to document one of PROJ.4's supported projections please use the
-[Mercator projection](http://proj4.org/projections/merc.html) as a template.
+[Mercator projection](https://proj4.org/projections/merc.html) as a template.
## Code contributions
-See [Code Contributions](http://proj4.org/development/for_proj_contributors.html)
+See [Code Contributions](https://proj4.org/development/for_proj_contributors.html)
#### Legalese
Committers are the front line gatekeepers to keep the code base clear of improperly contributed code.
@@ -125,7 +125,7 @@ improperly contributing code to the source repository:
## Additional Resources
-* [General GitHub documentation](http://help.github.com/)
+* [General GitHub documentation](https://help.github.com/)
* [GitHub pull request documentation](https://help.github.com/articles/about-pull-requests/)
## Acknowledgements
diff --git a/README.md b/README.md
index 38140d4d..a12cef08 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ This includes cartographic projections as well as geodetic transformations.
For more information on the PROJ.4 project please see the web page at:
-http://proj4.org/
+https://proj4.org/
The PROJ.4 mailing list can be found at:
diff --git a/cmake/ProjConfig.cmake b/cmake/ProjConfig.cmake
index 3c5f110d..a97ea9b3 100644
--- a/cmake/ProjConfig.cmake
+++ b/cmake/ProjConfig.cmake
@@ -5,7 +5,7 @@
#
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
+# https://www.boost.org/LICENSE_1_0.txt)
################################################################################
include (CheckIncludeFiles)
include (CheckLibraryExists)
@@ -34,7 +34,7 @@ set(PACKAGE_BUGREPORT "https://github.com/OSGeo/proj.4/issues")
set(PACKAGE_NAME "PROJ")
set(PACKAGE_STRING "PROJ ${${PROJECT_INTERN_NAME}_VERSION}")
set(PACKAGE_TARNAME "proj")
-set(PACKAGE_URL "http://proj4.org")
+set(PACKAGE_URL "https://proj4.org")
set(PACKAGE_VERSION "${${PROJECT_INTERN_NAME}_VERSION}")
configure_file(cmake/proj_config.cmake.in src/proj_config.h)
diff --git a/cmake/ProjSystemInfo.cmake b/cmake/ProjSystemInfo.cmake
index 2c66e268..18a80fa7 100644
--- a/cmake/ProjSystemInfo.cmake
+++ b/cmake/ProjSystemInfo.cmake
@@ -7,7 +7,7 @@
#
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
+# https://www.boost.org/LICENSE_1_0.txt)
################################################################################
# The following variables are defined:
# PROJ_COMPILER_NAME - name of compiler toolset, follows Boost toolset naming.
diff --git a/cmake/ProjUtilities.cmake b/cmake/ProjUtilities.cmake
index 79ecf96b..70d3d518 100644
--- a/cmake/ProjUtilities.cmake
+++ b/cmake/ProjUtilities.cmake
@@ -9,7 +9,7 @@
#
# Distributed under the Boost Software License, Version 1.0.
# See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt
+# https://www.boost.org/LICENSE_1_0.txt
################################################################################
# Macros in this module:
#
@@ -355,7 +355,7 @@ endmacro()
#
# Scans the current directory and returns a list of subdirectories.
# Author: Robert Fleming
-# Source: http://www.cmake.org/pipermail/cmake/2008-February/020114.html
+# Source: https://www.cmake.org/pipermail/cmake/2008-February/020114.html
#
# Third parameter is 1 if you want relative paths returned.
# Usage: list_subdirectories(the_list_is_returned_here /path/to/project TRUE)
diff --git a/configure.ac b/configure.ac
index 68436081..2bedb7e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT([PROJ], [5.1.0],
- [https://github.com/OSGeo/proj.4/issues], proj, [http://proj4.org])
+ [https://github.com/OSGeo/proj.4/issues], proj, [https://proj4.org])
AC_CONFIG_MACRO_DIR([m4])
AC_LANG(C)
diff --git a/docs/source/about.rst b/docs/source/about.rst
index 198dbead..5e625288 100644
--- a/docs/source/about.rst
+++ b/docs/source/about.rst
@@ -26,7 +26,7 @@ Citation
To cite PROJ in publications use:
PROJ contributors (2018). PROJ coordinate transformation software
- library. Open Source Geospatial Foundation. URL http://proj4.org/.
+ library. Open Source Geospatial Foundation. URL https://proj4.org/.
A BibTeX entry for LaTeX users is
@@ -37,7 +37,7 @@ A BibTeX entry for LaTeX users is
author = {{PROJ contributors}},
organization = {Open Source Geospatial Foundation},
year = {2018},
- url = {http://proj4.org/},
+ url = {https://proj4.org/},
}
License
diff --git a/docs/source/apps/cct.rst b/docs/source/apps/cct.rst
index a08f1471..b8f63cbb 100644
--- a/docs/source/apps/cct.rst
+++ b/docs/source/apps/cct.rst
@@ -171,10 +171,10 @@ Hence, in honour of *cct* (the geodesist) this is :program:`cct` (the program).
Bugs
****
- A list of know bugs can be found at http://github.com/OSGeo/proj.4/issues
+ A list of know bugs can be found at https://github.com/OSGeo/proj.4/issues
where new bug reports can be submitted to.
Home page
*********
- http://proj4.org/
+ https://proj4.org/
diff --git a/docs/source/apps/cs2cs.rst b/docs/source/apps/cs2cs.rst
index 7256a44c..f17b74ed 100644
--- a/docs/source/apps/cs2cs.rst
+++ b/docs/source/apps/cs2cs.rst
@@ -183,10 +183,10 @@ The x-y output data will appear as three lines of:
Bugs
****
- A list of know bugs can be found at http://github.com/OSGeo/proj.4/issues
+ A list of know bugs can be found at https://github.com/OSGeo/proj.4/issues
where new bug reports can be submitted to.
Home page
*********
- http://proj4.org/
+ https://proj4.org/
diff --git a/docs/source/apps/geod.rst b/docs/source/apps/geod.rst
index f5e61de4..e890aede 100644
--- a/docs/source/apps/geod.rst
+++ b/docs/source/apps/geod.rst
@@ -205,10 +205,10 @@ Further reading
Bugs
****
- A list of know bugs can be found at http://github.com/OSGeo/proj.4/issues
+ A list of know bugs can be found at https://github.com/OSGeo/proj.4/issues
where new bug reports can be submitted to.
Home page
*********
- http://proj4.org/
+ https://proj4.org/
diff --git a/docs/source/apps/gie.rst b/docs/source/apps/gie.rst
index 9d3fa0c2..fac4898a 100644
--- a/docs/source/apps/gie.rst
+++ b/docs/source/apps/gie.rst
@@ -363,10 +363,10 @@ So in honour, and hopefully also in the spirit, of Gerald Ian Evenden
Bugs
****
- A list of know bugs can be found at http://github.com/OSGeo/proj.4/issues
+ A list of know bugs can be found at https://github.com/OSGeo/proj.4/issues
where new bug reports can be submitted to.
Home page
*********
- http://proj4.org/
+ https://proj4.org/
diff --git a/docs/source/apps/proj.rst b/docs/source/apps/proj.rst
index 43e2038c..0da1d929 100644
--- a/docs/source/apps/proj.rst
+++ b/docs/source/apps/proj.rst
@@ -230,10 +230,10 @@ data will appear as three lines of::
Bugs
****
- A list of know bugs can be found at http://github.com/OSGeo/proj.4/issues
+ A list of know bugs can be found at https://github.com/OSGeo/proj.4/issues
where new bug reports can be submitted to.
Home page
*********
- http://proj4.org/
+ https://proj4.org/
diff --git a/docs/source/community/contributing.rst b/docs/source/community/contributing.rst
index d56aef6e..867f7e1a 100644
--- a/docs/source/community/contributing.rst
+++ b/docs/source/community/contributing.rst
@@ -86,7 +86,7 @@ Write documentation
PROJ is in dire need of better documentation. Any contributions of
documentation are greatly appreciated. The PROJ documentation is
-available on `proj4.org <http://proj4.org>`__. The website is generated
+available on `proj4.org <https://proj4.org>`__. The website is generated
with `Sphinx <http://www.sphinx-doc.org/en/stable/>`__. Contributions to
the documentation should be made as `Pull
Requests <https://github.com/OSGeo/proj.4/pulls>`__ on GitHub.
@@ -159,7 +159,7 @@ repository:
Additional Resources
--------------------
-- `General GitHub documentation <http://help.github.com/>`__
+- `General GitHub documentation <https://help.github.com/>`__
- `GitHub pull request
documentation <https://help.github.com/articles/about-pull-requests/>`__
diff --git a/docs/source/development/bindings.rst b/docs/source/development/bindings.rst
index 3fac1869..74d0fd4b 100644
--- a/docs/source/development/bindings.rst
+++ b/docs/source/development/bindings.rst
@@ -8,7 +8,7 @@ PROJ bindings are available for a number of different development platforms.
Python
======
-`pyproj <http://pypi.python.org/pypi/pyproj>`_:
+`pyproj <https://pypi.python.org/pypi/pyproj>`_:
Python interface (wrapper for PROJ)
@@ -26,7 +26,7 @@ Bindings for PROJ in tcl (critcl source)
MySQL
=====
-`fProj4 <http://sourceforge.net/projects/mysqlscientific/files/fPROJ4/>`_:
+`fProj4 <https://sourceforge.net/projects/mysqlscientific/files/fPROJ4/>`_:
Bindings for PROJ in MySQL
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 67f6496d..29a3b75a 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -26,7 +26,7 @@ PROJ
PROJ is a standard UNIX filter function which converts geographic longitude
and latitude coordinates into cartesian coordinates (and vice versa), and it is
a C API for software developers to include coordinate transformation in their
- own software. PROJ is maintained on `GitHub <http://github.com/OSGeo/proj.4/>`_.
+ own software. PROJ is maintained on `GitHub <https://github.com/OSGeo/proj.4/>`_.
NEWS
diff --git a/jniwrap/build.xml b/jniwrap/build.xml
index be82d411..20c7523c 100644
--- a/jniwrap/build.xml
+++ b/jniwrap/build.xml
@@ -36,7 +36,7 @@
<attribute name="Implementation-Title" value="PROJ bridge to Java"/>
<attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Vendor" value="Proj.4 project"/>
- <attribute name="Implementation-URL" value="http://proj4.org/"/>
+ <attribute name="Implementation-URL" value="https://proj4.org/"/>
</manifest>
</jar>
</target>
diff --git a/jniwrap/org.osgeo.proj/org/proj4/PJ.java b/jniwrap/org.osgeo.proj/org/proj4/PJ.java
index de09f86a..d8facf76 100644
--- a/jniwrap/org.osgeo.proj/org/proj4/PJ.java
+++ b/jniwrap/org.osgeo.proj/org/proj4/PJ.java
@@ -32,7 +32,7 @@ import java.lang.annotation.Native;
/**
- * Wraps the <a href="http://proj4.org/">PROJ</a> {@code PJ} native data structure.
+ * Wraps the <a href="https://proj4.org/">PROJ</a> {@code PJ} native data structure.
* Almost every methods defined in this class are native methods delegating the work to the PROJ library.
* This class is the only place where such native methods are defined.
*
diff --git a/jniwrap/org.osgeo.proj/org/proj4/package-info.java b/jniwrap/org.osgeo.proj/org/proj4/package-info.java
index 814d2483..1dda16a3 100644
--- a/jniwrap/org.osgeo.proj/org/proj4/package-info.java
+++ b/jniwrap/org.osgeo.proj/org/proj4/package-info.java
@@ -27,7 +27,7 @@
*/
/**
- * Wrappers for the <a href="http://proj4.org/">PROJ</a> library.
+ * Wrappers for the <a href="https://proj4.org/">PROJ</a> library.
* The {@link org.proj4.PJ} class contains only native methods delegating their work to the PROJ library.
* For higher-level methods making use of those native methods, see for example the
* <a href="http://www.geoapi.org/geoapi-proj4/index.html">GeoAPI bindings for PROJ</a>.
diff --git a/man/man1/cct.1 b/man/man1/cct.1
index 3a4fdffc..7b6a31f3 100644
--- a/man/man1/cct.1
+++ b/man/man1/cct.1
@@ -232,11 +232,11 @@ Hence, in honour of \fIcct\fP (the geodesist) this is \fBcct\fP (the program).
\fBproj(1)\fP, \fBcs2cs(1)\fP, \fBgeod(1)\fP, \fBgie(1)\fP
.SH BUGS
.sp
-A list of know bugs can be found at \fI\%http://github.com/OSGeo/proj.4/issues\fP
+A list of know bugs can be found at \fI\%https://github.com/OSGeo/proj.4/issues\fP
where new bug reports can be submitted to.
.SH HOME PAGE
.sp
-\fI\%http://proj4.org/\fP
+\fI\%https://proj4.org/\fP
.SH AUTHOR
Thomas Knudsen
.SH COPYRIGHT
diff --git a/man/man1/cs2cs.1 b/man/man1/cs2cs.1
index eb1ad4da..77fe4247 100644
--- a/man/man1/cs2cs.1
+++ b/man/man1/cs2cs.1
@@ -213,11 +213,11 @@ The x\-y output data will appear as three lines of:
\fBproj(1)\fP, \fBcct(1)\fP, \fBgeod(1)\fP, \fBgie(1)\fP
.SH BUGS
.sp
-A list of know bugs can be found at \fI\%http://github.com/OSGeo/proj.4/issues\fP
+A list of know bugs can be found at \fI\%https://github.com/OSGeo/proj.4/issues\fP
where new bug reports can be submitted to.
.SH HOME PAGE
.sp
-\fI\%http://proj4.org/\fP
+\fI\%https://proj4.org/\fP
.SH AUTHOR
Frank Warmerdam
.SH COPYRIGHT
diff --git a/man/man1/geod.1 b/man/man1/geod.1
index 84cbf003..82aa471f 100644
--- a/man/man1/geod.1
+++ b/man/man1/geod.1
@@ -249,11 +249,11 @@ C. F. F. Karney, \fI\%Algorithms for Geodesics\fP, J. Geodesy \fB87\fP(1), 43–
\fBproj(1)\fP, \fBcs2cs(1)\fP, \fBcct(1)\fP, \fBgeod(1)\fP, \fBgie(1)\fP
.SH BUGS
.sp
-A list of know bugs can be found at \fI\%http://github.com/OSGeo/proj.4/issues\fP
+A list of know bugs can be found at \fI\%https://github.com/OSGeo/proj.4/issues\fP
where new bug reports can be submitted to.
.SH HOME PAGE
.sp
-\fI\%http://proj4.org/\fP
+\fI\%https://proj4.org/\fP
.SH AUTHOR
Charles Karney
.SH COPYRIGHT
diff --git a/man/man1/gie.1 b/man/man1/gie.1
index 8433e749..42a47db3 100644
--- a/man/man1/gie.1
+++ b/man/man1/gie.1
@@ -468,11 +468,11 @@ So in honour, and hopefully also in the spirit, of Gerald Ian Evenden
\fBproj(1)\fP, \fBcs2cs(1)\fP, \fBcct(1)\fP, \fBgeod(1)\fP
.SH BUGS
.sp
-A list of know bugs can be found at \fI\%http://github.com/OSGeo/proj.4/issues\fP
+A list of know bugs can be found at \fI\%https://github.com/OSGeo/proj.4/issues\fP
where new bug reports can be submitted to.
.SH HOME PAGE
.sp
-\fI\%http://proj4.org/\fP
+\fI\%https://proj4.org/\fP
.SH AUTHOR
Thomas Knudsen
.SH COPYRIGHT
diff --git a/man/man1/nad2nad.1 b/man/man1/nad2nad.1
index 1b8c1bb2..96db4049 100644
--- a/man/man1/nad2nad.1
+++ b/man/man1/nad2nad.1
@@ -192,4 +192,4 @@ output data values.
A list of known bugs can found at https://github.com/OSGeo/proj.4/issues
where new bug reports can be submitted too.
.SH HOME PAGE
-http://proj4.org/
+https://proj4.org/
diff --git a/man/man1/proj.1 b/man/man1/proj.1
index 8190b452..d85271b9 100644
--- a/man/man1/proj.1
+++ b/man/man1/proj.1
@@ -269,11 +269,11 @@ support for datum translation.
\fBcs2cs(1)\fP, \fBcct(1)\fP, \fBgeod(1)\fP, \fBgie(1)\fP
.SH BUGS
.sp
-A list of know bugs can be found at \fI\%http://github.com/OSGeo/proj.4/issues\fP
+A list of know bugs can be found at \fI\%https://github.com/OSGeo/proj.4/issues\fP
where new bug reports can be submitted to.
.SH HOME PAGE
.sp
-\fI\%http://proj4.org/\fP
+\fI\%https://proj4.org/\fP
.SH AUTHOR
Gerald I. Evenden
.SH COPYRIGHT
diff --git a/man/man3/geodesic.3 b/man/man3/geodesic.3
index c19cbce8..0fd85445 100644
--- a/man/man3/geodesic.3
+++ b/man/man3/geodesic.3
@@ -120,4 +120,4 @@ https://en.wikipedia.org/wiki/Geodesics_on_an_ellipsoid
A list of known bugs can found at https://github.com/OSGeo/proj.4/issues
where new bug reports can be submitted too.
.SH HOME PAGE
-http://proj4.org/
+https://proj4.org/
diff --git a/man/man3/pj_init.3 b/man/man3/pj_init.3
index 696561d6..964c642b 100644
--- a/man/man3/pj_init.3
+++ b/man/man3/pj_init.3
@@ -111,4 +111,4 @@ libproj.a \- library of projections and support procedures
A list of known bugs can found at https://github.com/OSGeo/proj.4/issues
where new bug reports can be submitted too.
.SH HOME PAGE
-http://proj4.org/
+https://proj4.org/
diff --git a/test/catch.hpp b/test/catch.hpp
index ecd8907e..1621c044 100644
--- a/test/catch.hpp
+++ b/test/catch.hpp
@@ -6,7 +6,7 @@
* Copyright (c) 2018 Two Blue Cubes Ltd. All rights reserved.
*
* Distributed under the Boost Software License, Version 1.0. (See accompanying
- * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ * file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
*/
#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
@@ -5216,7 +5216,7 @@ namespace Catch {
// Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+// file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt)
//
// See https://github.com/philsquared/Clara for more details
@@ -6893,7 +6893,7 @@ namespace {
// use POSIX/ ANSI console terminal codes
// Thanks to Adam Strzelecki for original contribution
- // (http://github.com/nanoant)
+ // (https://github.com/nanoant)
// https://github.com/philsquared/Catch/pull/131
class PosixColourImpl : public IColourImpl {
public:
@@ -11011,7 +11011,7 @@ namespace {
void XmlEncode::encodeTo( std::ostream& os ) const {
// Apostrophe escaping not necessary if we always use " to write attributes
- // (see: http://www.w3.org/TR/xml/#syntax)
+ // (see: https://www.w3.org/TR/xml/#syntax)
for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
uchar c = m_str[idx];
@@ -11020,7 +11020,7 @@ namespace {
case '&': os << "&amp;"; break;
case '>':
- // See: http://www.w3.org/TR/xml/#syntax
+ // See: https://www.w3.org/TR/xml/#syntax
if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
os << "&gt;";
else