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

docs/configuration.rst

@@ -396,6 +396,9 @@ Using multiple memcached servers:
 
 The "memory" backend stores the cache in memory only:
 
+.. code-block:: python
+
+    CELERY_RESULT_BACKEND = 'cache'
     CELERY_CACHE_BACKEND = 'memory'
 
 CELERY_CACHE_BACKEND_OPTIONS

docs/userguide/canvas.rst

@@ -162,7 +162,7 @@ You can also clone signatures to create derivatives:
     proj.tasks.add(2)
 
     >>> s.clone(args=(4,), kwargs={'debug': True})
-    proj.tasks.add(2, 4, debug=True)
+    proj.tasks.add(4, 2, debug=True)
 
 Immutability
 ------------

docs/userguide/monitoring.rst

@@ -511,7 +511,7 @@ Here is an example camera, dumping the snapshot to screen:
                 return
             print('Workers: {0}'.format(pformat(state.workers, indent=4)))
             print('Tasks: {0}'.format(pformat(state.tasks, indent=4)))
-            print('Total: {0.event_count} events, %s {0.task_count}'.format(
+            print('Total: {0.event_count} events, {0.task_count} tasks'.format(
                 state))
 
 See the API reference for :mod:`celery.events.state` to read more

docs/userguide/periodic-tasks.rst

@@ -131,6 +131,9 @@ Example: Run the `tasks.add` task every 30 seconds.
     please see :ref:`celerytut-configuration`.  You can either
     set these options on your app directly or you can keep
     a separate module for configuration.
+    
+    If you want to use a single item tuple for `args`, don't forget
+    that the constructor is a comma and not a pair of parentheses.
 
 Using a :class:`~datetime.timedelta` for the schedule means the task will
 be sent in 30 second intervals (the first task will be sent 30 seconds

docs/userguide/tasks.rst

@@ -1259,9 +1259,6 @@ Handlers
 
     The return value of this handler is ignored.
 
-on_retry
-~~~~~~~~
-
 .. _task-how-they-work:
 
 How it works