Merge branch 'toofishes/doc-updates'

docs/configuration.rst

@@ -240,7 +240,7 @@ Example configuration
 .. code-block:: python
 
     CELERY_RESULT_BACKEND = "amqp"
-    CELERY_AMQP_TASK_RESULT_EXPIRES = 18000  # 5 hours.
+    CELERY_TASK_RESULT_EXPIRES = 18000  # 5 hours.
 
 .. _conf-cache-result-backend:
 

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

@@ -160,7 +160,7 @@ you can configure::
     #: We want the results to expire in 5 minutes, note that this requires
     #: RabbitMQ version 2.1.1 or higher, so please comment out if you have
     #: an earlier version.
-    CELERY_AMQP_TASK_RESULT_EXPIRES = 300
+    CELERY_TASK_RESULT_EXPIRES = 300
 
 To read more about result backends please see :ref:`task-result-backends`.
 

docs/userguide/tasks.rst

@@ -528,7 +528,7 @@ backend:
   control.  If you're running RabbitMQ 2.1.1 or higher you can take advantage
   of the ``x-expires`` argument to queues, which will expire queues after a
   certain time limit after they are unused.  The queue expiry can be set (in
-  seconds) by the :setting:`CELERY_AMQP_TASK_RESULT_EXPIRES` setting (not
+  seconds) by the :setting:`CELERY_TASK_RESULT_EXPIRES` setting (not
   enabled by default).
 
 For a list of options supported by the AMQP result backend, please see

docs/userguide/tasksets.rst

@@ -246,10 +246,12 @@ Example implementation:
 
 This is used by all result backends except Redis, which increments a
 counter after each task in the header, then applying the callback when the
-counter exceeds the number of tasks in the set.
+counter exceeds the number of tasks in the set. *Note:* chords do not properly
+work with Redis before version 2.2; you will need to upgrade to at least 2.2 to
+use them.
 
 The Redis approach is a much better solution, but not easily implemented
-in other backends (suggestions welcome!)
+in other backends (suggestions welcome!).
 
 
 .. note::