summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-12-05 14:27:18 +0100
committerGitHub <noreply@github.com>2016-12-05 14:27:18 +0100
commit0ce9dcbc0e14872558d6ad7aeb6c4e224e289756 (patch)
tree6cbbd7e978c02564ce89a825bf3e783eddb4211b
parenta72d9fe183301ddf084aa15d765002532a316efb (diff)
parent20544a61679f2c8d69ff50d667768f3303623102 (diff)
downloadtrollius-git-0ce9dcbc0e14872558d6ad7aeb6c4e224e289756.tar.gz
Merge pull request #11 from adamchainz/readthedocs.io
Convert readthedocs link for their .org -> .io migration for hosted projects
-rw-r--r--README.rst2
-rw-r--r--doc/asyncio.rst2
-rw-r--r--doc/changelog.rst2
-rw-r--r--doc/index.rst2
-rw-r--r--doc/install.rst2
-rw-r--r--doc/libraries.rst6
6 files changed, 8 insertions, 8 deletions
diff --git a/README.rst b/README.rst
index a1bf495..50caa73 100644
--- a/README.rst
+++ b/README.rst
@@ -32,7 +32,7 @@ Python 2.6-3.5. It has been tested on Windows, Linux, Mac OS X, FreeBSD and
OpenIndiana.
* `Asyncio documentation <http://docs.python.org/dev/library/asyncio.html>`_
-* `Trollius documentation <http://trollius.readthedocs.org/>`_
+* `Trollius documentation <https://trollius.readthedocs.io/>`_
* `Trollius project in the Python Cheeseshop (PyPI)
<https://pypi.python.org/pypi/trollius>`_
* `Trollius project at Github <https://github.com/haypo/trollius>`_
diff --git a/doc/asyncio.rst b/doc/asyncio.rst
index dd4cef3..2c37935 100644
--- a/doc/asyncio.rst
+++ b/doc/asyncio.rst
@@ -168,7 +168,7 @@ This option is used by the following projects which work on Trollius and asyncio
module if available, or import ``trollius``.
* `Tornado <http://www.tornadoweb.org/>`_ supports asyncio and Trollius since
Tornado 3.2: `tornado.platform.asyncio — Bridge between asyncio and Tornado
- <http://tornado.readthedocs.org/en/latest/asyncio.html>`_. It tries to import
+ <https://tornado.readthedocs.io/en/latest/asyncio.html>`_. It tries to import
asyncio or fallback on importing trollius.
Another option is to provide functions returning ``Future`` objects, so the
diff --git a/doc/changelog.rst b/doc/changelog.rst
index d4750cf..8c54c96 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -580,7 +580,7 @@ Other changes:
Trollius changes:
* Add a new Sphinx documentation:
- http://trollius.readthedocs.org/
+ https://trollius.readthedocs.io/
* tox: pass posargs to nosetests. Patch contributed by Ian Wienand.
* Fix support of Python 3.2 and add py32 to tox.ini
* Merge with Tulip 0.4.1
diff --git a/doc/index.rst b/doc/index.rst
index afc5167..1ea3d97 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -42,7 +42,7 @@ on Python 2. Trollius works on Python 2.7, 3.3 and 3.4. It has been tested on
Windows, Linux, Mac OS X, FreeBSD and OpenIndiana.
* `Asyncio documentation <http://docs.python.org/dev/library/asyncio.html>`_
-* `Trollius documentation <http://trollius.readthedocs.org/>`_ (this document)
+* `Trollius documentation <https://trollius.readthedocs.io/>`_ (this document)
* `Trollius project in the Python Cheeseshop (PyPI)
<https://pypi.python.org/pypi/trollius>`_ (download wheel packages and
tarballs)
diff --git a/doc/install.rst b/doc/install.rst
index d67aa59..d9e65cc 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -91,7 +91,7 @@ Build manually Trollius on Windows
On Windows, if you cannot use precompiled wheel packages, an extension module
must be compiled: the ``_overlapped`` module (source code: ``overlapped.c``).
Read `Compile Python extensions on Windows
-<http://haypo-notes.readthedocs.org/python.html#compile-python-extensions-on-windows>`_
+<https://haypo-notes.readthedocs.io/python.html#compile-python-extensions-on-windows>`_
to prepare your environment to build the Python extension. Then build the
extension using::
diff --git a/doc/libraries.rst b/doc/libraries.rst
index 0793914..9abc3c0 100644
--- a/doc/libraries.rst
+++ b/doc/libraries.rst
@@ -10,7 +10,7 @@ Trollius Libraries
Libraries compatible with asyncio and trollius
==============================================
-* `aioeventlet <https://aioeventlet.readthedocs.org/>`_: asyncio API
+* `aioeventlet <https://aioeventlet.readthedocs.io/>`_: asyncio API
implemented on top of eventlet
* `aiogevent <https://pypi.python.org/pypi/aiogevent>`_: asyncio API
implemented on top of gevent
@@ -24,12 +24,12 @@ Libraries compatible with asyncio and trollius
module if available, or import ``trollius``.
* `Tornado <http://www.tornadoweb.org/>`_ supports asyncio and Trollius since
Tornado 3.2: `tornado.platform.asyncio — Bridge between asyncio and Tornado
- <http://tornado.readthedocs.org/en/latest/asyncio.html>`_. It tries to import
+ <https://tornado.readthedocs.io/en/latest/asyncio.html>`_. It tries to import
asyncio or fallback on importing trollius.
Specific Ports
==============
* `trollius-redis <https://github.com/benjolitz/trollius-redis>`_:
- A port of `asyncio-redis <http://asyncio-redis.readthedocs.org/>`_ to
+ A port of `asyncio-redis <https://asyncio-redis.readthedocs.io/>`_ to
trollius