diff options
| author | Tim Graham <timograham@gmail.com> | 2015-12-31 14:29:52 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-12-31 14:29:52 -0500 |
| commit | 98839e906632dfe77c6f6906d61d62868a0541dc (patch) | |
| tree | 804209f1a293883401d714c0afdf75b3e43da93e /docs | |
| parent | 16411b8400ad08f90c236bb2e18f65c655f903f8 (diff) | |
Removed British/Austrialian word: whilist.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/topics/conditional-view-processing.txt | 2 | ||||
| -rw-r--r-- | docs/topics/db/models.txt | 4 | ||||
| -rw-r--r-- | docs/topics/db/transactions.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/topics/conditional-view-processing.txt b/docs/topics/conditional-view-processing.txt index ed319474fa..1af587c225 100644 --- a/docs/topics/conditional-view-processing.txt +++ b/docs/topics/conditional-view-processing.txt @@ -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: diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt index bb41dc6f6f..08ea426690 100644 --- a/docs/topics/db/models.txt +++ b/docs/topics/db/models.txt @@ -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 diff --git a/docs/topics/db/transactions.txt b/docs/topics/db/transactions.txt index 8c2474d527..05a1771d74 100644 --- a/docs/topics/db/transactions.txt +++ b/docs/topics/db/transactions.txt @@ -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. |
