Merge branch '3.1' of github.com:celery/celery into 3.1

celery/bin/events.py

@@ -57,14 +57,14 @@ class events(Command):
         celery events -d --app=proj
             dump events to screen.
         celery events -b amqp://
-        celery events -C <camera> [options]
+        celery events -c <camera> [options]
             run snapshot camera.
 
     Examples::
 
         celery events
         celery events -d
-        celery events -C mod.attr -F 1.0 --detach --maxrate=100/m -l info
+        celery events -c mod.attr -F 1.0 --detach --maxrate=100/m -l info
     """
     doc = __doc__
     supports_args = False

docs/userguide/remote-tasks.rst

@@ -39,7 +39,7 @@ if the execution was successful::
 
 or if there was an error::
 
-    {'status': 'failure': 'reason': 'Invalid moon alignment.'}
+    {'status': 'failure', 'reason': 'Invalid moon alignment.'}
 
 Enabling the HTTP task
 ----------------------

docs/userguide/tasks.rst

@@ -878,7 +878,7 @@ The task may raise :exc:`~@Ignore` to force the worker to ignore the
 task.  This means that no state will be recorded for the task, but the
 message is still acknowledged (removed from queue).
 
-This is can be used if you want to implement custom revoke-like
+This can be used if you want to implement custom revoke-like
 functionality, or manually store the result of a task.
 
 Example keeping revoked tasks in a Redis set: