Merge branch 'master' of github.com:KeepSafe/aiohttp

aio-libs · Jun 2, 2016 · 67c7bbf · 67c7bbf
2 parents 5b8ae7d + be9a084
commit 67c7bbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/README.rst b/README.rst
@@ -103,7 +103,7 @@ shoud be replaced by::
 Documentation
 -------------
 
-http://aiohttp.readthedocs.org/
+https://aiohttp.readthedocs.io/
 
 Discussion list
 ---------------

diff --git a/docs/conf.py b/docs/conf.py
@@ -69,11 +69,11 @@
 intersphinx_mapping = {
     'python': ('http://docs.python.org/3', None),
     'multidict':
-        ('http://multidict.readthedocs.org/en/stable/', None),
+        ('https://multidict.readthedocs.io/en/stable/', None),
     'aiohttpjinja2':
-        ('http://aiohttp-jinja2.readthedocs.org/en/stable/', None),
+        ('https://aiohttp-jinja2.readthedocs.io/en/stable/', None),
     'aiohttpsession':
-        ('http://aiohttp-session.readthedocs.org/en/stable/', None)}
+        ('https://aiohttp-session.readthedocs.io/en/stable/', None)}
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']