Merge branch 'master' into events

celery/management/commands/celerybeat.py

@@ -9,9 +9,9 @@ from celery.bin.celerybeat import run_clockservice, OPTION_LIST
 
 
 class Command(BaseCommand):
-    """Run the celery daemon."""
+    """Run the celery periodic task scheduler."""
     option_list = BaseCommand.option_list + OPTION_LIST
-    help = 'Run the celery daemon'
+    help = 'Run the celery periodic task scheduler'
 
     def handle(self, *args, **options):
         """Handle the management command."""