[4.1] 8a165ad Update URLs

[Federico G. Schwindt]

commit 8a165adb5a893cea2e9ca76208d4d728d7800275
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Fri Jul 10 18:20:37 2015 +0100

    Update URLs

diff --git a/doc/sphinx/installation/install.rst b/doc/sphinx/installation/install.rst
index f5886cb..398e9af 100644
--- a/doc/sphinx/installation/install.rst
+++ b/doc/sphinx/installation/install.rst
@@ -36,7 +36,7 @@ on `repo.varnish-cache.org <http://repo.varnish-cache.org/>`_.  See the online
 <https://www.varnish-cache.org/installation/redhat>`_ for more information.
 
 Varnish is included in the `EPEL
-<http://fedoraproject.org/wiki/EPEL>`_ repository, however due to
+<https://fedoraproject.org/wiki/EPEL>`_ repository, however due to
 incompatible syntax changes in newer versions of Varnish, only older
 versions are available.
 
diff --git a/doc/sphinx/phk/dough.rst b/doc/sphinx/phk/dough.rst
index 65b53f8..b629e8b 100644
--- a/doc/sphinx/phk/dough.rst
+++ b/doc/sphinx/phk/dough.rst
@@ -260,7 +260,7 @@ Poul-Henning, 2014-04-11
 
 .. _Varnish Moral License: http://phk.freebsd.dk/VML
 
-.. _solicited the FreeBSD community: http://people.freebsd.org/~phk/funding.html
+.. _solicited the FreeBSD community: https://people.freebsd.org/~phk/funding.html
 
 .. _Extremely Large Telescope: http://www.eso.org/public/teles-instr/e-elt/
 
diff --git a/doc/sphinx/phk/platforms.rst b/doc/sphinx/phk/platforms.rst
index 6f448e6..18ee017 100644
--- a/doc/sphinx/phk/platforms.rst
+++ b/doc/sphinx/phk/platforms.rst
@@ -47,7 +47,7 @@ Platform specific bug reports gets acted on.
 *Linux*
 
 Obviously you can forget about running Varnish on your
-`WRT54G <http://en.wikipedia.org/wiki/Linksys_WRT54G_series>`_
+`WRT54G <https://en.wikipedia.org/wiki/Linksys_WRT54G_series>`_
 but if you have a real computer, you can expect Varnish to work
 "ok or better" on any distro that has a package available.
 
diff --git a/doc/sphinx/phk/sphinx.rst b/doc/sphinx/phk/sphinx.rst
index b6e23f7..d001826 100644
--- a/doc/sphinx/phk/sphinx.rst
+++ b/doc/sphinx/phk/sphinx.rst
@@ -64,7 +64,7 @@ link at the bottom of the left menu:
 
 (link to random python doc page:)
 
-        http://docs.python.org/py3k/reference/expressions.html
+        https://docs.python.org/py3k/reference/expressions.html
 
 Dependency wise, that means you can edit docs with no special
 tools, you need python+docutils+sphinx to format HTML and a LaTex
diff --git a/lib/libvarnish/binary_heap.c b/lib/libvarnish/binary_heap.c
index 664332b..e3bd2eb 100644
--- a/lib/libvarnish/binary_heap.c
+++ b/lib/libvarnish/binary_heap.c
@@ -29,7 +29,7 @@
  * Implementation of a binary heap API
  *
  * See also:
- *	http://portal.acm.org/citation.cfm?doid=1785414.1785434
+ *	http://dl.acm.org/citation.cfm?doid=1785414.1785434
  *	(or: http://queue.acm.org/detail.cfm?id=1814327)
  */
 
diff --git a/varnish.m4 b/varnish.m4
index b7ad6f9..fcf6b2d 100644
--- a/varnish.m4
+++ b/varnish.m4
@@ -48,7 +48,7 @@ PKG_CHECK_EXISTS([varnishapi],[],[
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
+To get pkg-config, see <http://www.freedesktop.org/wiki/Software/pkg-config/>.])
 	else
 		AC_MSG_FAILURE(
 [pkg-config was unable to locate the varnishapi configuration data.