diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/faq/admin.txt | 2 | ||||
| -rw-r--r-- | docs/ref/checks.txt | 8 | ||||
| -rw-r--r-- | docs/ref/request-response.txt | 6 | ||||
| -rw-r--r-- | docs/ref/templates/api.txt | 2 | ||||
| -rw-r--r-- | docs/ref/utils.txt | 2 | ||||
| -rw-r--r-- | docs/releases/0.96.txt | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/docs/faq/admin.txt b/docs/faq/admin.txt index 26ad08374f..f1c6f61eba 100644 --- a/docs/faq/admin.txt +++ b/docs/faq/admin.txt @@ -62,7 +62,7 @@ Some objects aren't appearing in the admin. Inconsistent row counts may be caused by missing foreign key values or a foreign key field incorrectly set to :attr:`null=False <django.db.models.Field.null>`. If you have a record with a -:class:`~django.db.models.ForeignKey` pointing to a non-existent object and +:class:`~django.db.models.ForeignKey` pointing to a nonexistent object and that foreign key is included is :attr:`~django.contrib.admin.ModelAdmin.list_display`, the record will not be shown in the admin changelist because the Django model is declaring an diff --git a/docs/ref/checks.txt b/docs/ref/checks.txt index 35c0bd6987..d71219f5be 100644 --- a/docs/ref/checks.txt +++ b/docs/ref/checks.txt @@ -281,13 +281,13 @@ Models * **models.E010**: ``unique_together`` must be a list or tuple. * **models.E011**: All ``unique_together`` elements must be lists or tuples. * **models.E012**: ``index_together/unique_together`` refers to the - non-existent field ``<field name>``. + nonexistent field ``<field name>``. * **models.E013**: ``index_together/unique_together`` refers to a ``ManyToManyField`` ``<field name>``, but ``ManyToManyField``\s are not supported for that option. * **models.E014**: ``ordering`` must be a tuple or list (even if you want to order by only one field). -* **models.E015**: ``ordering`` refers to the non-existent field +* **models.E015**: ``ordering`` refers to the nonexistent field ``<field name>``. * **models.E016**: ``index_together/unique_together`` refers to field ``<field_name>`` which is not local to model ``<model>``. @@ -659,9 +659,9 @@ The following checks are performed when a model contains a :class:`~django.contrib.contenttypes.fields.GenericRelation`: * **contenttypes.E001**: The ``GenericForeignKey`` object ID references the - non-existent field ``<field>``. + nonexistent field ``<field>``. * **contenttypes.E002**: The ``GenericForeignKey`` content type references the - non-existent field ``<field>``. + nonexistent field ``<field>``. * **contenttypes.E003**: ``<field>`` is not a ``ForeignKey``. * **contenttypes.E004**: ``<field>`` is not a ``ForeignKey`` to ``contenttypes.ContentType``. diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt index 2d564d1954..6de18234c4 100644 --- a/docs/ref/request-response.txt +++ b/docs/ref/request-response.txt @@ -323,10 +323,10 @@ Methods 'Tony' >>> request.get_signed_cookie('name', salt='name-salt') 'Tony' # assuming cookie was set using the same salt - >>> request.get_signed_cookie('non-existing-cookie') + >>> request.get_signed_cookie('nonexistent-cookie') ... - KeyError: 'non-existing-cookie' - >>> request.get_signed_cookie('non-existing-cookie', False) + KeyError: 'nonexistent-cookie' + >>> request.get_signed_cookie('nonexistent-cookie', False) False >>> request.get_signed_cookie('cookie-that-was-tampered-with') ... diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt index afa43f7abd..c4f250e667 100644 --- a/docs/ref/templates/api.txt +++ b/docs/ref/templates/api.txt @@ -381,7 +381,7 @@ replaced with the name of the invalid variable. idea to turn it on as a 'development default'. Many templates, including those in the Admin site, rely upon the silence - of the template system when a non-existent variable is encountered. If you + of the template system when a nonexistent variable is encountered. If you assign a value other than ``''`` to ``string_if_invalid``, you will experience rendering problems with these templates and sites. diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt index 1e37d28ca8..c9ab5e3975 100644 --- a/docs/ref/utils.txt +++ b/docs/ref/utils.txt @@ -984,7 +984,7 @@ appropriate entities. ``value`` aware during a DST transition such that the time never occurred (when entering into DST). Setting ``is_dst`` to ``True`` or ``False`` will avoid the exception by moving the hour backwards or forwards by 1 - respectively. For example, ``is_dst=True`` would change a non-existent + respectively. For example, ``is_dst=True`` would change a nonexistent time of 2:30 to 1:30 and ``is_dst=False`` would change the time to 3:30. .. function:: make_naive(value, timezone=None) diff --git a/docs/releases/0.96.txt b/docs/releases/0.96.txt index bbec1c3eaf..21267910c7 100644 --- a/docs/releases/0.96.txt +++ b/docs/releases/0.96.txt @@ -65,7 +65,7 @@ The effect of this change is that running ``manage.py reset`` and similar commands against an existing database may generate SQL with the new form of constraint name, while the database itself contains constraints named in the old form; this will cause the database server -to raise an error message about modifying non-existent constraints. +to raise an error message about modifying nonexistent constraints. If you need to work around this, there are two methods available: |