Merge branch '3.0'

Changelog

@@ -28,7 +28,49 @@ If you're looking for versions prior to 3.x you should see :ref:`history`.
 
 - Now depends on kombu 2.4.6
 
-.. _version-3.0.9:
+- Now depends on billiard 2.7.3.13
+
+    - Fixes crash at startup when using Django and pre-1.4 projects
+      (setup_environ).
+
+    - Hard time limits now sends the KILL signal shortly after TERM,
+      to terminate processes that have signal handlers blocked by C extensions.
+
+    - Billiard now installs even if the C extension cannot be built.
+
+        It's still recommended to build the C extension if you are using
+        a transport other than rabbitmq/redis (or use force_execv for some
+        other reason).
+
+    - Pool now sets a ``current_process().index`` attribute that can be used to create
+      as many log files as there are processes in the pool.
+
+- Worker: Fixed a bug where the request stack could be corrupted if
+  relative imports are used.
+
+    Problem usually manifested itself as an exception while trying to
+    send a failed task result (NoneType does not have id attribute).
+
+    Fix contributed by Sam Cooke.
+
+- ``subtask.clone`` now deepcopies options so that original subtask
+  is not modified when used in chains/groups etc.
+
+- Because of many bugs the fast local optimization has been disabled,
+  and can only be enabled by setting the :envvar:`USE_FAST_LOCALS` attribute.
+
+- Worker: Now sets a default socket timeout of 5 seconds at shutdown
+  so that broken socket reads do not hinder proper shutdown (Issue #975).
+
+- More fixes related to late eventlet/gevent patching.
+
+- Worker: Log messages when connection established and lost have been improved
+  so that they are more useful when used with the upcoming multiple broker
+  hostlist for failover that is coming in the next Kombu version.
+
+- The repr of a crontab schedule value of '0' should be '*'  (Issue #972).
+
+- gevent: Now supports hard time limits using ``gevent.Timeout`.
 
 3.0.9
 =====

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

@@ -120,17 +120,6 @@ use the help command:
 
     $ python manage.py celery help
 
-.. admonition:: Help, it's crashing!
-
-    If the worker crashes and spews out a lot of output when it starts
-    then you should try specifying the settings manually:
-
-    .. code-block:: bash
-
-        $ python manage.py celery worker --loglevel=info --settings=settings
-
-    This is usually happens when using older Django project layouts.
-
 Calling our task
 ================
 

docs/faq.rst

@@ -914,17 +914,3 @@ The `-B` / `--beat` option to celeryd doesn't work?
 ----------------------------------------------------------------
 **Answer**: That's right. Run `celerybeat` and `celeryd` as separate
 services instead.
-
-.. _faq-windows-django-settings:
-
-`django-celery` can't find settings?
---------------------------------------
-
-**Answer**: You need to specify the :option:`--settings` argument to
-:program:`manage.py`:
-
-.. code-block:: bash
-
-    $ python manage.py celeryd start --settings=settings
-
-See http://bit.ly/bo9RSw

docs/getting-started/first-steps-with-celery.rst

@@ -277,12 +277,13 @@ Configuration
 Celery, like a consumer appliance doesn't need much to be operated.
 It has an input and an output, where you must connect the input to a broker and maybe
 the output to a result backend if so wanted.  But if you look closely at the back
-there is a lid revealing lots of sliders, dials and buttons: this is the configuration.
+there's a lid revealing loads of sliders, dials and buttons: this is the configuration.
 
-The default configuration should be good enough for most uses, but there
-are many things to tweak so that Celery works just the way you want it to.
+The default configuration should be good enough for most uses, but there's
+many things to tweak so Celery works just the way you want it to.
 Reading about the options available is a good idea to get familiar with what
-can be configured, see the :ref:`configuration` reference.
+can be configured. You can read about the options in the the
+:ref:`configuration` reference.
 
 The configuration can be set on the app directly or by using a dedicated
 configuration module.