Merge remote-tracking branch 'upstream/master'

jazzband · Jun 22, 2016 · db499c2 · db499c2
2 parents 1a86ba0 + 42e9f4c
commit db499c2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/README.rst b/README.rst
@@ -15,7 +15,7 @@ django-queued-storage
 
 .. image:: https://readthedocs.org/projects/django-queued-storage/badge/?version=latest&style=flat
    :alt: ReadTheDocs
-   :target: http://django-queued-storage.readthedocs.org/en/latest/
+   :target: https://django-queued-storage.readthedocs.io/en/latest/
 
 .. image:: https://img.shields.io/pypi/l/django-queued-storage.svg
    :alt: License BSD

diff --git a/docs/conf.py b/docs/conf.py
@@ -225,9 +225,9 @@
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
-    'python': ('http://python.readthedocs.org/en/v2.7.2/', None),
-    'django': ('http://django.readthedocs.org/en/latest/', None),
-    'celery': ('http://celery.readthedocs.org/en/latest/', None),
+    'python': ('https://python.readthedocs.io/en/v2.7.2/', None),
+    'django': ('https://django.readthedocs.io/en/latest/', None),
+    'celery': ('https://celery.readthedocs.io/en/latest/', None),
 }
 
 autodoc_member_order = 'bysource'
diff --git a/queued_storage/backends.py b/queued_storage/backends.py
@@ -368,7 +368,7 @@ class QueuedS3BotoStorage(QueuedFileSystemStorage):
     """
     A custom :class:`~queued_storage.backends.QueuedFileSystemStorage`
     subclass which uses the ``S3BotoStorage`` storage of the
-    `django-storages <http://django-storages.readthedocs.org/>`_ app as
+    `django-storages <https://django-storages.readthedocs.io/>`_ app as
     the remote storage.
     """
     def __init__(self, remote='storages.backends.s3boto.S3BotoStorage', *args, **kwargs):
@@ -379,7 +379,7 @@ class QueuedCouchDBStorage(QueuedFileSystemStorage):
     """
     A custom :class:`~queued_storage.backends.QueuedFileSystemStorage`
     subclass which uses the ``CouchDBStorage`` storage of the
-    `django-storages <http://django-storages.readthedocs.org/>`_ app as
+    `django-storages <https://django-storages.readthedocs.io/>`_ app as
     the remote storage.
     """
     def __init__(self, remote='storages.backends.couchdb.CouchDBStorage', *args, **kwargs):
@@ -390,7 +390,7 @@ class QueuedDatabaseStorage(QueuedFileSystemStorage):
     """
     A custom :class:`~queued_storage.backends.QueuedFileSystemStorage`
     subclass which uses the ``DatabaseStorage`` storage of the
-    `django-storages <http://django-storages.readthedocs.org/>`_ app as
+    `django-storages <https://django-storages.readthedocs.io/>`_ app as
     the remote storage.
     """
     def __init__(self, remote='storages.backends.database.DatabaseStorage', *args, **kwargs):
@@ -401,7 +401,7 @@ class QueuedFTPStorage(QueuedFileSystemStorage):
     """
     A custom :class:`~queued_storage.backends.QueuedFileSystemStorage`
     subclass which uses the ``FTPStorage`` storage of the
-    `django-storages <http://django-storages.readthedocs.org/>`_ app as
+    `django-storages <https://django-storages.readthedocs.io/>`_ app as
     the remote storage.
     """
     def __init__(self, remote='storages.backends.ftp.FTPStorage', *args, **kwargs):
@@ -412,7 +412,7 @@ class QueuedMogileFSStorage(QueuedFileSystemStorage):
     """
     A custom :class:`~queued_storage.backends.QueuedFileSystemStorage`
     subclass which uses the ``MogileFSStorage`` storage of the
-    `django-storages <http://django-storages.readthedocs.org/>`_ app as
+    `django-storages <https://django-storages.readthedocs.io/>`_ app as
     the remote storage.
     """
     def __init__(self, remote='storages.backends.mogile.MogileFSStorage', *args, **kwargs):
@@ -423,7 +423,7 @@ class QueuedGridFSStorage(QueuedFileSystemStorage):
     """
     A custom :class:`~queued_storage.backends.QueuedFileSystemStorage`
     subclass which uses the ``GridFSStorage`` storage of the
-    `django-storages <http://django-storages.readthedocs.org/>`_ app as
+    `django-storages <https://django-storages.readthedocs.io/>`_ app as
     the remote storage.
     """
     def __init__(self, remote='storages.backends.mongodb.GridFSStorage', *args, **kwargs):
@@ -434,7 +434,7 @@ class QueuedCloudFilesStorage(QueuedFileSystemStorage):
     """
     A custom :class:`~queued_storage.backends.QueuedFileSystemStorage`
     subclass which uses the ``CloudFilesStorage`` storage of the
-    `django-storages <http://django-storages.readthedocs.org/>`_ app as
+    `django-storages <https://django-storages.readthedocs.io/>`_ app as
     the remote storage.
     """
     def __init__(self, remote='storages.backends.mosso.CloudFilesStorage', *args, **kwargs):
@@ -445,7 +445,7 @@ class QueuedSFTPStorage(QueuedFileSystemStorage):
     """
     A custom :class:`~queued_storage.backends.QueuedFileSystemStorage`
     subclass which uses the ``SFTPStorage`` storage of the
-    `django-storages <http://django-storages.readthedocs.org/>`_ app as
+    `django-storages <https://django-storages.readthedocs.io/>`_ app as
     the remote storage.
     """
     def __init__(self, remote='storages.backends.sftpstorage.SFTPStorage', *args, **kwargs):