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

celery/concurrency/base.py

@@ -77,7 +77,7 @@ class BasePool(object):
             soft_timeout=None, timeout=None, **compat):
         """Equivalent of the :func:`apply` built-in function.
 
-        Callbacks should optimally return as soon as possible ince
+        Callbacks should optimally return as soon as possible since
         otherwise the thread which handles the result will get blocked.
 
         """

docs/userguide/tasks.rst

@@ -584,7 +584,7 @@ STARTED
 ~~~~~~~
 
 Task has been started.
-Not reported by default, to enable please see :attr`Task.track_started`.
+Not reported by default, to enable please see :attr:`Task.track_started`.
 
 :metadata: `pid` and `hostname` of the worker process executing
            the task.