9 files changed, 13 insertions, 9 deletions
diff --git a/doc/announce/release-1.0.txt b/doc/announce/release-1.0.txt
index 9dcee3c..ae46d41 100644
--- a/doc/announce/release-1.0.txt
+++ b/doc/announce/release-1.0.txt
@@ -22,7 +22,7 @@ Installation:
 
 Note that code hosting and issue tracking has moved from Google to Bitbucket:
 
-    http://bitbucket.org/hpk42/tox
+    https://bitbucket.org/hpk42/tox
 
 The 1.0 release includes contributions and is based on feedback and
 work from Chris Rose, Ronny Pfannschmidt, Jannis Leidel, Jakob Kaplan-Moss,
diff --git a/doc/announce/release-1.1.txt b/doc/announce/release-1.1.txt
index a41c72f..8ab78db 100644
--- a/doc/announce/release-1.1.txt
+++ b/doc/announce/release-1.1.txt
@@ -24,7 +24,7 @@ Installation:
 
 Note that code hosting and issue tracking has moved from Google to Bitbucket:
 
-    http://bitbucket.org/hpk42/tox
+    https://bitbucket.org/hpk42/tox
 
 The 1.0 release includes contributions and is based on feedback and
 work from Chris Rose, Ronny Pfannschmidt, Jannis Leidel, Jakob Kaplan-Moss,
diff --git a/doc/announce/release-1.2.txt b/doc/announce/release-1.2.txt
index 49e3166..139d812 100644
--- a/doc/announce/release-1.2.txt
+++ b/doc/announce/release-1.2.txt
@@ -24,7 +24,7 @@ Installation:
 
 code hosting and issue tracking on bitbucket:
 
-    http://bitbucket.org/hpk42/tox
+    https://bitbucket.org/hpk42/tox
 
 best,
 Holger Krekel
diff --git a/doc/announce/release-1.3.txt b/doc/announce/release-1.3.txt
index 31d60d5..b88fc39 100644
--- a/doc/announce/release-1.3.txt
+++ b/doc/announce/release-1.3.txt
@@ -21,7 +21,7 @@ Installation:
 
 code hosting and issue tracking on bitbucket:
 
-    http://bitbucket.org/hpk42/tox
+    https://bitbucket.org/hpk42/tox
 
 best,
 Holger Krekel
diff --git a/doc/announce/release-1.4.txt b/doc/announce/release-1.4.txt
index 5565bb3..243ecec 100644
--- a/doc/announce/release-1.4.txt
+++ b/doc/announce/release-1.4.txt
@@ -23,7 +23,7 @@ Installation:
 
 code hosting and issue tracking on bitbucket:
 
-    http://bitbucket.org/hpk42/tox
+    https://bitbucket.org/hpk42/tox
 
 What is tox?
 ----------------
diff --git a/doc/check_sphinx.py b/doc/check_sphinx.py
index 0f536ff..26f6b11 100644
--- a/doc/check_sphinx.py
+++ b/doc/check_sphinx.py
@@ -4,7 +4,7 @@ def test_build_docs(tmpdir):
     doctrees = tmpdir.join("doctrees")
     htmldir = tmpdir.join("html")
     subprocess.check_call([
-        "sphinx-build", "-W", "-bhtml",
+        "sphinx-build", "-bhtml",
           "-d", str(doctrees), ".", str(htmldir)])
 
 def test_linkcheck(tmpdir):
diff --git a/doc/conf.py b/doc/conf.py
index f643b48..19fe11b 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -261,3 +261,7 @@ def setup(app):
     app.add_description_unit('confval', 'confval',
                              objname='configuration value',
                              indextemplate='pair: %s; configuration value')
+
+
+linkcheck_timeout = 30
+linkcheck_ignore = [r'http://holgerkrekel.net']
diff --git a/doc/example/general.txt b/doc/example/general.txt
index 296036f..7179a87 100644
--- a/doc/example/general.txt
+++ b/doc/example/general.txt
@@ -122,7 +122,7 @@ strings which must be compliant with :pep:`386`.
 
 If you want to use this with Jenkins_, also checkout the :ref:`jenkins artifact example`.
 
-.. _verlib: http://bitbucket.org/tarek/distutilsversion/
+.. _verlib: https://bitbucket.org/tarek/distutilsversion/
 
 basepython defaults, overriding
 ++++++++++++++++++++++++++++++++++++++++++
diff --git a/doc/install.txt b/doc/install.txt
index c794692..5914ac1 100644
--- a/doc/install.txt
+++ b/doc/install.txt
@@ -12,7 +12,7 @@ Install info in a nutshell
 
 **License**: MIT license
 
-**hg repository**: http://bitbucket.org/hpk42/tox
+**hg repository**: https://bitbucket.org/hpk42/tox
 
 Installation with pip/easy_install
 --------------------------------------
@@ -29,7 +29,7 @@ Install from Checkout
 
 Consult the Bitbucket page to get a checkout of the mercurial repository:
 
-    http://bitbucket.org/hpk42/tox
+    https://bitbucket.org/hpk42/tox
 
 and then install in your environment with something like::