diff options
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/applications.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/admin/actions.txt | 2 | ||||
| -rw-r--r-- | docs/ref/contrib/index.txt | 2 | ||||
| -rw-r--r-- | docs/ref/databases.txt | 2 | ||||
| -rw-r--r-- | docs/ref/django-admin.txt | 2 | ||||
| -rw-r--r-- | docs/ref/models/expressions.txt | 4 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 2 | ||||
| -rw-r--r-- | docs/ref/template-response.txt | 2 | ||||
| -rw-r--r-- | docs/ref/utils.txt | 2 | ||||
| -rw-r--r-- | docs/ref/validators.txt | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/docs/ref/applications.txt b/docs/ref/applications.txt index 2c66ae0e68..af387ac884 100644 --- a/docs/ref/applications.txt +++ b/docs/ref/applications.txt @@ -311,7 +311,7 @@ Methods once by Django. But in some corner cases, particularly in tests which are fiddling with installed applications, ``ready`` might be called more than once. In that case, either write idempotent methods, or put a flag - on your ``AppConfig`` classes to prevent re-running code which should + on your ``AppConfig`` classes to prevent rerunning code which should be executed exactly one time. .. _namespace package: diff --git a/docs/ref/contrib/admin/actions.txt b/docs/ref/contrib/admin/actions.txt index da60bc3bbe..56e8d7feae 100644 --- a/docs/ref/contrib/admin/actions.txt +++ b/docs/ref/contrib/admin/actions.txt @@ -312,7 +312,7 @@ Disabling a site-wide action Once you've done the above, that action will no longer be available site-wide. - If, however, you need to re-enable a globally-disabled action for one + If, however, you need to reenable a globally-disabled action for one particular model, list it explicitly in your ``ModelAdmin.actions`` list:: # Globally disable delete selected diff --git a/docs/ref/contrib/index.txt b/docs/ref/contrib/index.txt index 8a9a90e5e8..517c9ef418 100644 --- a/docs/ref/contrib/index.txt +++ b/docs/ref/contrib/index.txt @@ -15,7 +15,7 @@ those packages have. For most of these add-ons -- specifically, the add-ons that include either models or template tags -- you'll need to add the package name (e.g., ``'django.contrib.redirects'``) to your :setting:`INSTALLED_APPS` setting - and re-run ``manage.py migrate``. + and rerun ``manage.py migrate``. .. toctree:: :maxdepth: 1 diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 1129be600c..009cce6f97 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -30,7 +30,7 @@ General notes Persistent connections ---------------------- -Persistent connections avoid the overhead of re-establishing a connection to +Persistent connections avoid the overhead of reestablishing a connection to the database in each request. They're controlled by the :setting:`CONN_MAX_AGE` parameter which defines the maximum lifetime of a connection. It can be set independently for each database. diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index fc1f6b7257..1b487c1e18 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -377,7 +377,7 @@ For example, to output the data as a compressed JSON file:: Removes all data from the database and re-executes any post-synchronization handlers. The table of which migrations have been applied is not cleared. -If you would rather start from an empty database and re-run all migrations, you +If you would rather start from an empty database and rerun all migrations, you should drop and recreate the database and then run :djadmin:`migrate` instead. .. django-admin-option:: --noinput, --no-input diff --git a/docs/ref/models/expressions.txt b/docs/ref/models/expressions.txt index 60c4c87dcd..b3702116d7 100644 --- a/docs/ref/models/expressions.txt +++ b/docs/ref/models/expressions.txt @@ -972,7 +972,7 @@ calling the appropriate methods on the wrapped expression. .. method:: resolve_expression(query=None, allow_joins=True, reuse=None, summarize=False, for_save=False) - Provides the chance to do any pre-processing or validation of + Provides the chance to do any preprocessing or validation of the expression before it's added to the query. ``resolve_expression()`` must also be called on any nested expressions. A ``copy()`` of ``self`` should be returned with any necessary transformations. @@ -1091,7 +1091,7 @@ We do some basic validation on the parameters, including requiring at least ``output_field`` here so that Django knows what kind of model field to assign the eventual result to. -Now we implement the pre-processing and validation. Since we do not have +Now we implement the preprocessing and validation. Since we do not have any of our own validation at this point, we delegate to the nested expressions:: diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index ae1b15eab0..d91e0d5ef5 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -643,7 +643,7 @@ Default: ``False`` If set to ``True``, existing :ref:`persistent database connections <persistent-database-connections>` will be health checked before they are reused in each request performing database access. If the health check fails, -the connection will be re-established without failing the request when the +the connection will be reestablished without failing the request when the connection is no longer usable but the database server is ready to accept and serve new connections (e.g. after database server restart closing existing connections). diff --git a/docs/ref/template-response.txt b/docs/ref/template-response.txt index 1babb220f7..abbc12742b 100644 --- a/docs/ref/template-response.txt +++ b/docs/ref/template-response.txt @@ -217,7 +217,7 @@ subsequent rendering calls do not change the response content. However, when ``response.content`` is explicitly assigned, the change is always applied. If you want to force the content to be -re-rendered, you can re-evaluate the rendered content, and assign +re-rendered, you can reevaluate the rendered content, and assign the content of the response manually:: # Set up a rendered TemplateResponse diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt index a2be25f168..7712015929 100644 --- a/docs/ref/utils.txt +++ b/docs/ref/utils.txt @@ -601,7 +601,7 @@ escaping HTML. .. function:: conditional_escape(text) - Similar to ``escape()``, except that it doesn't operate on pre-escaped + Similar to ``escape()``, except that it doesn't operate on preescaped strings, so it will not double escape. .. function:: format_html(format_string, *args, **kwargs) diff --git a/docs/ref/validators.txt b/docs/ref/validators.txt index 4230738a2b..5fe1384bd8 100644 --- a/docs/ref/validators.txt +++ b/docs/ref/validators.txt @@ -10,7 +10,7 @@ Writing validators A validator is a callable that takes a value and raises a :exc:`~django.core.exceptions.ValidationError` if it doesn't meet some -criteria. Validators can be useful for re-using validation logic between +criteria. Validators can be useful for reusing validation logic between different types of fields. For example, here's a validator that only allows even numbers:: |