Use intersphinx refs instead of hard links. Also closes #1085

Changelog

@@ -325,10 +325,7 @@ If you're looking for versions prior to 3.0.x you should go to :ref:`history`.
 
     - support for multiple connection URLs for failover.
 
-    - Read more in the `Kombu 2.5 changelog`_.
-
-    .. _`Kombu 2.5 changelog`:
-        http://kombu.readthedocs.org/en/latest/changelog.html#version-2-5-0
+    - Read more in the :ref:`Kombu 2.5 changelog <kombu:version-2.5.0>`.
 
 - Now depends on billiard 2.7.3.19
 
@@ -1008,17 +1005,14 @@ If you're looking for versions prior to 3.0.x you should go to :ref:`history`.
     - If the broker heartbeat is set to 10 seconds, the heartbeats will be
       monitored every 5 seconds (double the hertbeat rate).
 
-    See the `Kombu 2.3 changelog`_ for more information.
-
-.. _`Kombu 2.3 changelog`:
-    http://kombu.readthedocs.org/en/latest/changelog.html#version-2-3-0
+    See the :ref:`Kombu 2.3 changelog <kombu:version-2.3.0>` for more information.
 
 - Now supports RabbitMQ Consumer Cancel Notifications, using the ``pyamqp://``
   transport.
 
     This is essential when running RabbitMQ in a cluster.
 
-    See the `Kombu 2.3 changelog`_ for more information.
+    See the :ref:`Kombu 2.3 changelog <kombu:version-2.3.0>` for more information.
 
 - Delivery info is no longer passed directly through.
 

docs/conf.py

@@ -75,11 +75,11 @@ exclude_trees = ['.build']
 add_function_parentheses = True
 
 intersphinx_mapping = {
-        "http://docs.python.org/dev": None,
-        "http://kombu.readthedocs.org/en/latest/": None,
-        "http://django-celery.readthedocs.org/en/latest": None,
-        "http://cyme.readthedocs.org/en/latest": None,
-        "http://amqp.readthedocs.org/en/latest": None,
+    'python': ('http://docs.python.org/dev', None),
+    'kombu': ('http://kombu.readthedocs.org/en/latest/', None),
+    'djcelery': ('http://django-celery.readthedocs.org/en/latest', None),
+    'cyme': ('http://cyme.readthedocs.org/en/latest', None),
+    'amqp': ('http://amqp.readthedocs.org/en/latest', None),
 }
 
 # The name of the Pygments (syntax highlighting) style to use.

docs/configuration.rst

@@ -816,7 +816,8 @@ default is ``amqp``, which uses ``librabbitmq`` by default or falls back to
 ``couchdb``.
 It can also be a fully qualified path to your own transport implementation.
 
-See the Kombu documentation for more information about broker URLs.
+See :ref:`kombu:connection-urls` in the Kombu documentation for more
+information.
 
 .. setting:: BROKER_HEARTBEAT
 

docs/userguide/calling.rst

@@ -318,10 +318,7 @@ or for each individual task, or even per message.
 
 There's built-in support for :mod:`pickle`, `JSON`, `YAML`
 and `msgpack`, and you can also add your own custom serializers by registering
-them into the Kombu serializer registry (see `Kombu: Serialization of Data`_).
-
-.. _`Kombu: Serialization of Data`:
-    http://packages.python.org/kombu/introduction.html#serialization-of-data
+them into the Kombu serializer registry (see ref:`kombu:guide-serialization`).
 
 Each option has its advantages and disadvantages.
 

docs/userguide/routing.rst

@@ -7,11 +7,8 @@
 .. note::
 
     Alternate routing concepts like topic and fanout may not be
-    available for all transports, please consult the `transport comparison table`_.
-
-.. _`transport comparison table`:
-    http://kombu.readthedocs.org/en/latest/introduction.html#transport-comparison
-
+    available for all transports, please consult the
+    :ref:`transport comparison table <kombu:transport-comparison>`.
 
 .. contents::
     :local:

docs/whatsnew-2.5.rst

@@ -18,14 +18,13 @@ While this version is backward compatible with previous versions
 it is important that you read the following section.
 
 If you use Celery in combination with Django you must also
-read the `django-celery changelog`_ and upgrade to `django-celery 2.5`_.
+read the `django-celery changelog <djcelery:version-2.5.0>` and upgrade to `django-celery 2.5`_.
 
 This version is officially supported on CPython 2.5, 2.6, 2.7, 3.2 and 3.3,
 as well as PyPy and Jython.
 
 
 .. _`website`: http://celeryproject.org/
-.. _`django-celery changelog`: http://bit.ly/djcelery-25-changelog
 .. _`django-celery 2.5`: http://pypi.python.org/pypi/django-celery/
 
 .. contents::