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

celery/bin/worker.py

@@ -30,6 +30,11 @@ The :program:`celery worker` command (previously known as ``celeryd``)
     Also run the `celery beat` periodic task scheduler.  Please note that
     there must only be one instance of this service.
 
+    .. note::
+
+        ``-B`` is meant to be used for development purposes. For production
+        environment, you need to start :program:`celery beat` separately.
+
 .. cmdoption:: -Q, --queues
 
     List of queues to enable for this worker, separated by comma.

docs/django/first-steps-with-django.rst

@@ -17,6 +17,11 @@ Using Celery with Django
     first and come back to this tutorial. When you have a working example you can
     continue to the :ref:`next-steps` guide.
 
+.. note::
+
+    Celery 4.0 supports Django 1.8 and newer versions. Please use Celery 3.1
+    for versions older than Django 1.8.
+
 To use Celery with your Django project you must first define
 an instance of the Celery library (called an "app")
 
@@ -135,7 +140,7 @@ concrete app instance:
 .. seealso::
 
     You can find the full source code for the Django example project at:
-    https://github.com/celery/celery/tree/3.1/examples/django/
+    https://github.com/celery/celery/tree/master/examples/django/
 
 .. admonition:: Relative Imports
 

docs/whatsnew-4.0.rst

@@ -124,6 +124,11 @@ concepts there's no alternative for in older versions.
 Celery 4.x will continue to work on Python 2.7, 3.4, 3.5; just as Celery 3.x
 still works on Python 2.6.
 
+Django support
+--------------
+
+Celery now supports Django 1.8 and newer versions.
+
 Removed features
 ----------------