Merge branch 'master' of github.com:celery/celery

CONTRIBUTING.rst

@@ -586,7 +586,7 @@ To not return a negative exit code when this command fails use
 the ``flakes`` target instead:
 ::
 
-    $ make flakes§
+    $ make flakes
 
 API reference
 ~~~~~~~~~~~~~

celery/app/task.py

@@ -571,10 +571,12 @@ class Task(object):
         :keyword countdown: Time in seconds to delay the retry for.
         :keyword eta: Explicit time and date to run the retry at
                       (must be a :class:`~datetime.datetime` instance).
-        :keyword max_retries: If set, overrides the default retry limit.
-            A value of :const:`None`, means "use the default", so if you want
-            infinite retries you would have to set the :attr:`max_retries`
-            attribute of the task to :const:`None` first.
+        :keyword max_retries: If set, overrides the default retry limit for
+            this execution. Changes to this parameter do not propagate to
+            subsequent task retry attempts. A value of :const:`None`, means
+            "use the default", so if you want infinite retries you would
+            have to set the :attr:`max_retries` attribute of the task to
+            :const:`None` first.
         :keyword time_limit: If set, overrides the default time limit.
         :keyword soft_time_limit: If set, overrides the default soft
                                   time limit.

docs/configuration.rst

@@ -1261,6 +1261,20 @@ 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.
 
+More than broker URL, of the same transport, can also be specified.
+The broker URLs can be passed in as a single string that is semicolon delimited::
+
+    BROKER_URL = 'transport://userid:password@hostname:port//;transport://userid:password@hostname:port//'
+
+Or as a list::
+
+    BROKER_URL = [
+        'transport://userid:password@localhost:port//',
+        'transport://userid:password@hostname:port//'
+    ]
+
+The brokers will then be used in the :setting:`BROKER_FAILOVER_STRATEGY`.
+
 See :ref:`kombu:connection-urls` in the Kombu documentation for more
 information.
 

docs/userguide/routing.rst

@@ -585,7 +585,7 @@ copies of tasks to all workers connected to it:
 
     CELERY_ROUTES = {'tasks.reload_cache': {'queue': 'broadcast_tasks'}}
 
-Now the ``tasks.reload_tasks`` task will be sent to every
+Now the ``tasks.reload_cache`` task will be sent to every
 worker consuming from this queue.
 
 .. admonition:: Broadcast & Results