switch to readthedocs.io

Author: thijstriemstra

README.rst

@@ -29,18 +29,18 @@ Or checkout the source code from Github_::
   pip install -e .
 
 The dependency ``python-video-converter`` is not available on PyPi and needs to be installed
-manually::
+manually. This installs a fork of ``python-video-converter`` that supports ffmpeg 2.x and newer::
 
   pip install -e git+https://github.com/thijstriemstra/python-video-converter.git#egg=python-video-converter
 
 
 Documentation
 -------------
 
-Documentation can be found on `readthedocs.org`_.
+Documentation can be found on `readthedocs.io`_.
 
 
 .. _pip: https://pypi.python.org/pypi/pip
 .. _PyPi: https://pypi.python.org/pypi/django-encode
-.. _readthedocs.org: https://django-encode.readthedocs.org/en/latest
+.. _readthedocs.io: https://django-encode.readthedocs.io/en/latest
 .. _Github: https://github.com/collab-project/django-encode

doc/conf.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright Collab 2012-2015.
+# Copyright Collab 2012-2016.
 #
 # Documentation build configuration file for encode project.
 #
@@ -20,7 +20,7 @@
 
 # Setup Django
 import django
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "encode.tests.settings")
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'encode.tests.settings')
 
 
 # -- General configuration -----------------------------------------------------
@@ -262,7 +262,7 @@
 # Configuration for intersphinx.
 intersphinx_mapping = {
     'python': ('https://docs.python.org/2/', None),
-    'django': ('https://django.readthedocs.org/en/latest/', None),
-    'sphinx': ('https://sphinx.readthedocs.org/en/latest/', None),
-    'celery': ('https://celery.readthedocs.org/en/latest/', None),
+    'django': ('https://django.readthedocs.io/en/latest/', None),
+    'sphinx': ('https://sphinx.readthedocs.io/en/latest/', None),
+    'celery': ('https://celery.readthedocs.io/en/latest/', None),
 }