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

CONTRIBUTORS.txt

@@ -211,3 +211,4 @@ Komu Wairagu, 2016/04/03
 Joe Sanford, 2016/04/11
 Takeshi Kanemoto, 2016/04/22
 Arthur Vuillard, 2016/04/22
+Colin McIntosh, 2016/04/26

docs/configuration.rst

@@ -1581,7 +1581,7 @@ default is ``amqp``, which uses ``librabbitmq`` by default or falls back to
 ``couchdb``.
 It can also be a fully qualified path to your own transport implementation.
 
-More than broker URL, of the same transport, can also be specified.
+More than one broker URL, of the same transport, can also be specified.
 The broker URLs can be passed in as a single string that is semicolon delimited::
 
     broker_url = 'transport://userid:password@hostname:port//;transport://userid:password@hostname:port//'

docs/userguide/canvas.rst

@@ -656,7 +656,7 @@ The :class:`~celery.group` function takes a list of signatures:
     (proj.tasks.add(2, 2), proj.tasks.add(4, 4))
 
 If you **call** the group, the tasks will be applied
-one after one in the current process, and a :class:`~celery.result.GroupResult`
+one after another in the current process, and a :class:`~celery.result.GroupResult`
 instance is returned which can be used to keep track of the results,
 or tell how many tasks are ready and so on: