Merge branch 'master' into v31-lockfree-rate-limits

docs/faq.rst

@@ -423,19 +423,19 @@ Results
 How do I get the result of a task if I have the ID that points there?
 ----------------------------------------------------------------------
 
-**Answer**: Use `Task.AsyncResult`::
+**Answer**: Use `task.AsyncResult`::
 
-    >>> result = MyTask.AsyncResult(task_id)
+    >>> result = my_task.AsyncResult(task_id)
     >>> result.get()
 
-This will give you a :class:`~celery.result.BaseAsyncResult` instance
+This will give you a :class:`~celery.result.AsyncResult` instance
 using the tasks current result backend.
 
-If you need to specify a custom result backend you should use
-:class:`celery.result.BaseAsyncResult` directly::
+If you need to specify a custom result backend, or you want to use
+the current application's default backend you can use
+:class:`@Celery.AsyncResult`:
 
-    >>> from celery.result import BaseAsyncResult
-    >>> result = BaseAsyncResult(task_id, backend=...)
+    >>> result = app.AsyncResult(task_id)
     >>> result.get()
 
 .. _faq-security:

docs/getting-started/introduction.rst

@@ -25,12 +25,13 @@ A Celery system can consist of multiple workers and brokers, giving way
 to high availability and horizontal scaling.
 
 Celery is written in Python, but the protocol can be implemented in any
-language.  So far there's RCelery_ for the Ruby programming language, and a
-`PHP client`, but language interoperability can also be achieved
+language.  So far there's RCelery_ for the Ruby programming language,
+node-celery_ for Node.js and a `PHP client`_, but language interoperability can also be achieved
 by :ref:`using webhooks <guide-webhooks>`.
 
 .. _RCelery: http://leapfrogdevelopment.github.com/rcelery/
 .. _`PHP client`: https://github.com/gjedeer/celery-php
+.. _node-celery: https://github.com/mher/node-celery
 
 What do I need?
 ===============