Skip to content

Commit

Permalink
Some typo and language fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
runeh committed Jul 1, 2010
1 parent fd1a5d4 commit ce8c7cd
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 21 deletions.
2 changes: 1 addition & 1 deletion FAQ
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ by default is a pet peeve for many. You should use a test runner that either

For example the test runner that celery is using:

http://bit.ly/NVKep
http://github.com/ask/celery/blob/f90491fe0194aa472b5aecdefe5cc83289e65e69/celery/tests/runners.py

To use this test runner, add the following to your ``settings.py``:

Expand Down
12 changes: 6 additions & 6 deletions docs/cookbook/unit-testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
Testing with Django
-------------------

The problem that you'll first run in to when trying to write a test that runs a
task is that Django's test runner doesn't use the same database that your celery
The first problem you'll run in to when trying to write a test that runs a
task is that Django's test runner doesn't use the same database as your celery
daemon is using. If you're using the database backend, this means that your
tombstones won't show up in your test database and you won't be able to check
on your tasks to get the return value or check the status.
tombstones won't show up in your test database and you won't be able to
get the return value or check the status of your tasks.

There are two ways to get around this. You can either take advantage of
``CELERY_ALWAYS_EAGER = True`` to skip the daemon, or you can avoid testing
Expand All @@ -36,7 +36,7 @@ To enable the test runner, set the following settings:
TEST_RUNNER = 'celery.contrib.test_runner.run_tests'
Then we can write our actually test in a ``tests.py`` somewhere:
Then we can put the tests in a ``tests.py`` somewhere:

.. code-block:: python
Expand All @@ -55,4 +55,4 @@ Then we can write our actually test in a ``tests.py`` somewhere:
This test assumes that you put your example ``add`` task in ``maypp.tasks``
so of course adjust the import for wherever you actually put the class.
so adjust the import for wherever you put the class.
8 changes: 4 additions & 4 deletions docs/getting-started/first-steps-with-django.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Configuring your Django project to use Celery
=============================================

You only need three simple steps to use celery with your Django project.
You need three simple steps to use celery with your Django project.

1. Add ``djcelery`` to ``INSTALLED_APPS``.

Expand All @@ -22,7 +22,7 @@ You only need three simple steps to use celery with your Django project.
BROKER_PASSWORD = "guest"
BROKER_VHOST = "/"

Note that we use the guest account here, for production use you probably
Note that we use the guest account here. For production use you probably
want to set up a custom account and virtual host for your instance.

That's it.
Expand Down Expand Up @@ -52,7 +52,7 @@ see what's going on without consulting the logfile::
$ python manage.py celeryd -l info

However, in production you probably want to run the worker in the
background as a daemon. To do this you need to use to tools provided by your
background as a daemon. To do this you need to use the tools provided by your
platform. See `Running Celery as a daemon`_.

.. _`Running Celery as a Daemon`:
Expand Down Expand Up @@ -101,7 +101,7 @@ At this point, the task has been sent to the message broker. The message
broker will hold on to the task until a celery worker server has successfully
picked it up.

*Note:* If everything is just hanging when you execute ``delay``, please check
*Note:* If everything is just hanging when you execute ``delay``, check
that RabbitMQ is running, and that the user/password has access to the virtual
host you configured earlier.

Expand Down
17 changes: 9 additions & 8 deletions docs/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ for applications listed in ``INSTALLED_APPS``, and more.
It is focused on real-time operation, but supports scheduling as well.

The execution units, called tasks, are executed concurrently on a single or
more worker servers. Tasks can execute asynchronously (in the background) or synchronously
(wait until ready).
more worker servers. Tasks can execute asynchronously (in the background) or
synchronously (wait until ready).

Celery is already used in production to process millions of tasks a day.

Expand Down Expand Up @@ -50,8 +50,8 @@ To enable ``django-celery`` for your project you need to add ``djcelery`` to

INSTALLED_APPS += ("djcelery", )

Everything works the same as described in the `Celery User Manual`_, except you need
to invoke the programs through ``manage.py``:
Everything works the same as described in the `Celery User Manual`_, except you
need to invoke the programs through ``manage.py``:

===================================== =====================================
**Program** **Replace with**
Expand All @@ -62,10 +62,11 @@ to invoke the programs through ``manage.py``:
``celeryev`` ``python manage.py celeryev``
===================================== =====================================

and instead of storing configuration values in ``celeryconfig.py``, you should use
your Django projects ``settings.py`` module.
The other main difference is that configuration values are stored in
your Django projects' ``settings.py`` module rather than in
``celeryconfig.py``.

If you're getting started for the first time you should read
If you're trying celery for the first time you should start by reading
`Getting started with django-celery`_

Documentation
Expand Down Expand Up @@ -111,7 +112,7 @@ You can install it by doing the following,::
Using the development version
------------------------------

You can clone the repository by doing the following::
You can clone the git repository by doing the following::

$ git clone git://github.com/ask/django-celery.git

Expand Down
4 changes: 2 additions & 2 deletions docs/reference/djcelery.models.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ Django Models - celery.models

.. data:: TASK_STATUSES_CHOICES

Django choice tuple of possible task statuses, for usage in model/form
fields ``choices`` argument.
Django tuple of possible values for the task statuses, for usage in
model/form fields ``choices`` argument.

.. class:: TaskMeta

Expand Down

0 comments on commit ce8c7cd

Please sign in to comment.