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

celery/app/task.py

@@ -565,6 +565,7 @@ class Task(object):
         S = self.subtask_from_request(
             request, args, kwargs,
             countdown=countdown, eta=eta, retries=retries,
+            **options
         )
 
         if max_retries is not None and retries > max_retries:

docs/getting-started/first-steps-with-celery.rst

@@ -259,7 +259,7 @@ In case the task raised an exception, :meth:`~@AsyncResult.get` will
 re-raise the exception, but you can override this by specifying
 the ``propagate`` argument::
 
-    >>> result.get(propagate=True)
+    >>> result.get(propagate=False)
 
 
 If the task raised an exception you can also gain access to the

docs/getting-started/next-steps.rst

@@ -175,7 +175,7 @@ or stop it:
 
 .. code-block:: bash
 
-    $ celery multi stop -w1 -A proj -l info
+    $ celery multi stop w1 -A proj -l info
 
 The ``stop`` command is asynchronous so it will not wait for the
 worker to shutdown.  You will probably want to use the ``stopwait`` command
@@ -183,7 +183,7 @@ instead which will ensure all currently executing tasks is completed:
 
 .. code-block:: bash
 
-    $ celery multi stopwait -w1 -A proj -l info
+    $ celery multi stopwait w1 -A proj -l info
 
 .. note::