summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2016-05-31 18:19:13 -0700
committerAsk Solem <ask@celeryproject.org>2016-05-31 18:19:13 -0700
commit95afc95601ab3c1492c415c7f7629b2662d6ff83 (patch)
treec2689cac10d5e96e319b683b3c6448814c7a5a46
parent80f5eae025eb3b89d4199aeb5efae31c724150b9 (diff)
parent79587603196888a3162fa8d4a69d0949cb505273 (diff)
downloadpy-amqp-95afc95601ab3c1492c415c7f7629b2662d6ff83.tar.gz
Merge branch 'master' of github.com:celery/py-amqp
-rw-r--r--README.rst4
-rw-r--r--docs/conf.py2
-rw-r--r--docs/includes/introduction.txt4
3 files changed, 5 insertions, 5 deletions
diff --git a/README.rst b/README.rst
index d9cef14..0a89e29 100644
--- a/README.rst
+++ b/README.rst
@@ -5,7 +5,7 @@
|build-status| |coverage| |bitdeli|
:Version: 2.0.0rc2
-:Web: http://amqp.readthedocs.org/
+:Web: https://amqp.readthedocs.io/
:Download: http://pypi.python.org/pypi/amqp/
:Source: http://github.com/celery/py-amqp/
:Keywords: amqp, rabbitmq
@@ -21,7 +21,7 @@ This library should be API compatible with `librabbitmq`_.
.. _amqplib: http://pypi.python.org/pypi/amqplib
.. _Celery: http://celeryproject.org/
-.. _kombu: http://kombu.readthedocs.org/
+.. _kombu: https://kombu.readthedocs.io/
.. _librabbitmq: http://pypi.python.org/pypi/librabbitmq
Differences from `amqplib`_
diff --git a/docs/conf.py b/docs/conf.py
index 73f0e52..07b1a6d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -9,7 +9,7 @@ globals().update(conf.build_config(
description='Python Promises',
version_dev='2.0',
version_stable='1.4',
- canonical_url='http://amqp.readthedocs.org',
+ canonical_url='https://amqp.readthedocs.io',
webdomain='celeryproject.org',
github_project='celery/py-amqp',
author='Ask Solem & contributors',
diff --git a/docs/includes/introduction.txt b/docs/includes/introduction.txt
index a1dc5a6..1ef8ffe 100644
--- a/docs/includes/introduction.txt
+++ b/docs/includes/introduction.txt
@@ -1,5 +1,5 @@
:Version: 2.0.0
-:Web: http://amqp.readthedocs.org/
+:Web: https://amqp.readthedocs.io/
:Download: http://pypi.python.org/pypi/amqp/
:Source: http://github.com/celery/py-amqp/
:Keywords: amqp, rabbitmq
@@ -15,7 +15,7 @@ This library should be API compatible with `librabbitmq`_.
.. _amqplib: http://pypi.python.org/pypi/amqplib
.. _Celery: http://celeryproject.org/
-.. _kombu: http://kombu.readthedocs.org/
+.. _kombu: https://kombu.readthedocs.io/
.. _librabbitmq: http://pypi.python.org/pypi/librabbitmq
Differences from `amqplib`_