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

docs/faq.rst

@@ -139,7 +139,7 @@ performance.
 But please note that the default configuration isn't optimized for time nor
 space, see the :ref:`guide-optimizing` guide for more information.
 
-.. _faq-serializion-is-a-choice:
+.. _faq-serialization-is-a-choice:
 
 Is Celery dependent on pickle?
 ------------------------------

docs/userguide/calling.rst

@@ -304,7 +304,7 @@ Connection Error Handling
 =========================
 
 When you send a task and the message transport connection is lost, or
-the connection cannot be iniated, an :exc:`~kombu.exceptions.OperationalError`
+the connection cannot be initiated, an :exc:`~kombu.exceptions.OperationalError`
 error will be raised:
 
 .. code-block:: pycon