Kaydet (Commit) 98839e90 authored tarafından Tim Graham's avatar Tim Graham

Removed British/Austrialian word: whilist.

üst 16411b84
......@@ -295,7 +295,7 @@ class SessionBase(object):
def cycle_key(self):
"""
Creates a new session key, whilst retaining the current session data.
Creates a new session key, while retaining the current session data.
"""
data = self._session_cache
key = self.session_key
......
......@@ -61,7 +61,7 @@ def condition(etag_func=None, last_modified_func=None):
The parameters are callables to compute the ETag and last modified time for
the requested resource, respectively. The callables are passed the same
parameters as the view itself. The Etag function should return a string (or
None if the resource doesn't exist), whilst the last_modified function
None if the resource doesn't exist), while the last_modified function
should return a datetime object (or None if the resource doesn't exist).
If both parameters are provided, all the preconditions must be met before
......
......@@ -184,7 +184,7 @@ Comparison with middleware conditional processing
You may notice that Django already provides simple and straightforward
conditional ``GET`` handling via the
:class:`django.middleware.http.ConditionalGetMiddleware` and
:class:`~django.middleware.common.CommonMiddleware`. Whilst certainly being
:class:`~django.middleware.common.CommonMiddleware`. While certainly being
easy to use and suitable for many situations, those pieces of middleware
functionality have limitations for advanced usage:
......
......@@ -928,7 +928,7 @@ model, since it is an abstract base class. It does not generate a database
table or have a manager, and cannot be instantiated or saved directly.
For many uses, this type of model inheritance will be exactly what you want.
It provides a way to factor out common information at the Python level, whilst
It provides a way to factor out common information at the Python level, while
still only creating one database table per child model at the database level.
``Meta`` inheritance
......@@ -1011,7 +1011,7 @@ Along with another app ``rare/models.py``::
pass
The reverse name of the ``common.ChildA.m2m`` field will be
``common_childa_related``, whilst the reverse name of the
``common_childa_related``, while the reverse name of the
``common.ChildB.m2m`` field will be ``common_childb_related``, and finally the
reverse name of the ``rare.ChildB.m2m`` field will be ``rare_childb_related``.
It is up to you how you use the ``'%(class)s'`` and ``'%(app_label)s`` portion
......
......@@ -601,7 +601,7 @@ Handling exceptions within PostgreSQL transactions
Inside a transaction, when a call to a PostgreSQL cursor raises an exception
(typically ``IntegrityError``), all subsequent SQL in the same transaction
will fail with the error "current transaction is aborted, queries ignored
until end of transaction block". Whilst simple use of ``save()`` is unlikely
until end of transaction block". While simple use of ``save()`` is unlikely
to raise an exception in PostgreSQL, there are more advanced usage patterns
which might, such as saving objects with unique fields, saving using the
force_insert/force_update flag, or invoking custom SQL.
......
......@@ -12,7 +12,7 @@ class SimpleTests(TestCase):
"""
The main test here is that the all the models can be created without
any database errors. We can also do some more simple insertion and
lookup tests whilst we're here to show that the second of models do
lookup tests while we're here to show that the second of models do
refer to the tables from the first set.
"""
# Insert some data into one set of models.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment