Browse Source

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

Ask Solem 11 years ago
parent
commit
6ea03f1084
2 changed files with 2 additions and 1 deletions
  1. 1 0
      CONTRIBUTORS.txt
  2. 1 1
      docs/userguide/tasks.rst

+ 1 - 0
CONTRIBUTORS.txt

@@ -139,3 +139,4 @@ Dong Weiming, 2013/06/27
 Oleg Anashkin, 2013/06/27
 Ross Lawley, 2013/07/05
 Alain Masiero, 2013/08/07
+Adrien Guinet, 2013/08/14

+ 1 - 1
docs/userguide/tasks.rst

@@ -1214,7 +1214,7 @@ First, an author creates an article and saves it, then the author
 clicks on a button that initiates the abbreviation task::
 
     >>> article = Article.objects.get(id=102)
-    >>> expand_abbreviations.delay(model_object)
+    >>> expand_abbreviations.delay(article)
 
 Now, the queue is very busy, so the task won't be run for another 2 minutes.
 In the meantime another author makes changes to the article, so