Merge branch 'master' of github.com:celery/celery

CONTRIBUTING.rst

@@ -929,7 +929,7 @@ Messaging library.
 :CI: http://travis-ci.org/#!/celery/kombu
 :Windows-CI: https://ci.appveyor.com/project/ask/kombu
 :PyPI: http://pypi.python.org/pypi/kombu
-:docs: http://kombu.readthedocs.org
+:docs: https://kombu.readthedocs.io
 
 ``amqp``
 --------
@@ -940,7 +940,7 @@ Python AMQP 0.9.1 client.
 :CI: http://travis-ci.org/#!/celery/py-amqp
 :Windows-CI: https://ci.appveyor.com/project/ask/py-amqp
 :PyPI: http://pypi.python.org/pypi/amqp
-:docs: http://amqp.readthedocs.org
+:docs: https://amqp.readthedocs.io
 
 ``vine``
 --------
@@ -951,7 +951,7 @@ Promise/deferred implementation.
 :CI: http://travis-ci.org/#!/celery/vine/
 :Windows-CI: https://ci.appveyor.com/project/ask/vine
 :PyPI: http://pypi.python.org/pypi/vine
-:docs: http://vine.readthedocs.org
+:docs: https://vine.readthedocs.io
 
 ``billiard``
 ------------
@@ -996,7 +996,7 @@ Distributed Celery Instance manager.
 
 :git: https://github.com/celery/cyme
 :PyPI: http://pypi.python.org/pypi/cyme
-:docs: http://cyme.readthedocs.org/
+:docs: https://cyme.readthedocs.io/
 
 
 Deprecated

docs/conf.py

@@ -23,7 +23,7 @@ globals().update(conf.build_config(
         'celerydocs',
     ],
     extra_intersphinx_mapping={
-        'cyanide': ('http://cyanide.readthedocs.org/en/latest', None),
+        'cyanide': ('https://cyanide.readthedocs.io/en/latest', None),
     },
     apicheck_ignore_modules=[
         'celery.five',

docs/contributing.rst

@@ -962,7 +962,7 @@ Messaging library.
 :CI: http://travis-ci.org/#!/celery/kombu
 :Windows-CI: https://ci.appveyor.com/project/ask/kombu
 :PyPI: http://pypi.python.org/pypi/kombu
-:docs: http://kombu.readthedocs.org
+:docs: https://kombu.readthedocs.io
 
 ``amqp``
 --------
@@ -973,7 +973,7 @@ Python AMQP 0.9.1 client.
 :CI: http://travis-ci.org/#!/celery/py-amqp
 :Windows-CI: https://ci.appveyor.com/project/ask/py-amqp
 :PyPI: http://pypi.python.org/pypi/amqp
-:docs: http://amqp.readthedocs.org
+:docs: https://amqp.readthedocs.io
 
 ``vine``
 --------
@@ -984,7 +984,7 @@ Promise/deferred implementation.
 :CI: http://travis-ci.org/#!/celery/vine/
 :Windows-CI: https://ci.appveyor.com/project/ask/vine
 :PyPI: http://pypi.python.org/pypi/vine
-:docs: http://vine.readthedocs.org
+:docs: https://vine.readthedocs.io
 
 ``billiard``
 ------------
@@ -1029,7 +1029,7 @@ Distributed Celery Instance manager.
 
 :git: https://github.com/celery/cyme
 :PyPI: http://pypi.python.org/pypi/cyme
-:docs: http://cyme.readthedocs.org/
+:docs: https://cyme.readthedocs.io/
 
 
 Deprecated

docs/userguide/monitoring.rst

@@ -313,7 +313,7 @@ Flower has many more features than are detailed here, including
 authorization options. Check out the `official documentation`_ for more
 information.
 
-.. _official documentation: http://flower.readthedocs.org/en/latest/
+.. _official documentation: https://flower.readthedocs.io/en/latest/
 
 
 .. _monitoring-celeryev: