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

celery/task/schedules.py

@@ -33,7 +33,7 @@ class schedule(object):
 class crontab_parser(object):
     """Parser for crontab expressions. Any expression of the form 'groups' (see
     BNF grammar below) is accepted and expanded to a set of numbers.  These
-    numbers represent the units of time that the crontab needs to run on.
+    numbers represent the units of time that the crontab needs to run on::
 
         digit   :: '0'..'9'
         dow     :: 'a'..'z'

docs/getting-started/periodic-tasks.rst

@@ -11,8 +11,8 @@ Here's an example of a periodic task:
     from datetime import timedelta
 
     @periodic_task(run_every=timedelta(seconds=30))
-    def every_30_seconds(\*\*kwargs):
-        logger = self.get_logger(\*\*kwargs)
+    def every_30_seconds(**kwargs):
+        logger = self.get_logger(**kwargs)
         logger.info("Running periodic task!")
 
 If you want a little more control over when the task is executed, for example,
@@ -25,8 +25,8 @@ type:
     from celery.decorators import periodic_task
 
     @periodic_task(run_every=crontab(hour=7, minute=30, day_of_week=1))
-    def every_monday_morning(\*\*kwargs):
-        logger = self.get_logger(\*\*kwargs)
+    def every_monday_morning(**kwargs):
+        logger = self.get_logger(**kwargs)
         logger.info("Execute every Monday at 7:30AM.")
 
 The syntax of these crontab expressions is very flexible.  Some examples: