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

CONTRIBUTORS.txt

@@ -49,3 +49,4 @@ Harm Verhagen, 2012/06/07
 Wes Winham, 2012/06/07
 David Cramer, 2012/06/07
 Steeve Morin, 2012/06/07
+Mher Movsisyan, 2012/06/08

README.rst

@@ -214,6 +214,9 @@ Features
     | Error Emails    | Can be configured to send emails to the            |
     |                 | administrators when tasks fails.                   |
     +-----------------+----------------------------------------------------+
+    | Message signing | Supports message signing. Messages are signed      |
+    |                 | using public-key cryptography.                     |
+    +-----------------+----------------------------------------------------+
 
 
 .. _`clustering`: http://www.rabbitmq.com/clustering.html

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

@@ -285,7 +285,7 @@ you can also imagine your sysadmin making simple changes to the configuration
 in the event of system trobule.
 
 You can tell your Celery instance to use a configuration module,
-by calling the :meth:`~@Celery.config_from_obj` method:
+by calling the :meth:`~@Celery.config_from_object` method:
 
 .. code-block:: python
 

docs/includes/introduction.txt

@@ -209,6 +209,9 @@ Features
     | Error Emails    | Can be configured to send emails to the            |
     |                 | administrators when tasks fails.                   |
     +-----------------+----------------------------------------------------+
+    | Message signing | Supports message signing. Messages are signed      |
+    |                 | using public-key cryptography.                     |
+    +-----------------+----------------------------------------------------+
 
 
 .. _`clustering`: http://www.rabbitmq.com/clustering.html