Merge branch '3.0'

celery/beat.py

@@ -342,10 +342,12 @@ class PersistentScheduler(Scheduler):
         else:
             if '__version__' not in self._store:
                 self._store.clear()   # remove schedule at 2.2.2 upgrade.
+            if 'utc' not in self._store:
+                self._store.clear()   # remove schedule at 3.0.1 upgrade.
         entries = self._store.setdefault('entries', {})
         self.merge_inplace(self.app.conf.CELERYBEAT_SCHEDULE)
         self.install_default_entries(self.schedule)
-        self._store['__version__'] = __version__
+        self._store.update(__version__=__version__, utc=True)
         self.sync()
         debug('Current schedule:\n' + '\n'.join(repr(entry)
                                     for entry in entries.itervalues()))

docs/getting-started/introduction.rst

@@ -153,9 +153,9 @@ Features
 
         - **Monitoring**
 
-            The stream of monitoring events emitted by the worker are used
-            by built-in and external tools to tell you what your cluster
-            is doing in real-time.
+            A stream of monitoring events is emitted by workers and
+            is used by built-in and external tools to tell you what
+            your cluster is doing -- in real-time.
 
             :ref:`Read more… <guide-monitoring>`.
 

docs/userguide/concurrency/eventlet.rst

@@ -40,9 +40,9 @@ Enabling Eventlet
 =================
 
 You can enable the Eventlet pool by using the ``-P`` option to
-:program:`celeryd`::
+:program:`celery worker`::
 
-    $ celeryd -P eventlet -c 1000
+    $ celery worker -P eventlet -c 1000
 
 .. _eventlet-examples: