diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/howto/error-reporting.txt | 2 | ||||
| -rw-r--r-- | docs/internals/contributing/bugs-and-features.txt | 2 | ||||
| -rw-r--r-- | docs/ref/databases.txt | 2 | ||||
| -rw-r--r-- | docs/ref/models/fields.txt | 4 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.10.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.7.txt | 2 | ||||
| -rw-r--r-- | docs/spelling_wordlist | 1 | ||||
| -rw-r--r-- | docs/topics/http/middleware.txt | 2 | ||||
| -rw-r--r-- | docs/topics/performance.txt | 2 |
10 files changed, 10 insertions, 11 deletions
diff --git a/docs/howto/error-reporting.txt b/docs/howto/error-reporting.txt index a445514c98..9eed8f4def 100644 --- a/docs/howto/error-reporting.txt +++ b/docs/howto/error-reporting.txt @@ -74,7 +74,7 @@ behavior is from broken web bots too. before other middleware that intercepts 404 errors, such as :class:`~django.middleware.locale.LocaleMiddleware` or :class:`~django.contrib.flatpages.middleware.FlatpageFallbackMiddleware`. - Put it towards the top of your :setting:`MIDDLEWARE` setting. + Put it toward the top of your :setting:`MIDDLEWARE` setting. You can tell Django to stop reporting particular 404s by tweaking the :setting:`IGNORABLE_404_URLS` setting. It should be a list of compiled diff --git a/docs/internals/contributing/bugs-and-features.txt b/docs/internals/contributing/bugs-and-features.txt index 531c7fde04..188fb0ca0e 100644 --- a/docs/internals/contributing/bugs-and-features.txt +++ b/docs/internals/contributing/bugs-and-features.txt @@ -143,7 +143,7 @@ seriously. After a suitable voting period, if an obvious consensus arises we'll follow the votes. However, consensus is not always possible. If consensus cannot be reached, or -if the discussion towards a consensus fizzles out without a concrete decision, +if the discussion toward a consensus fizzles out without a concrete decision, the decision may be deferred to the :ref:`technical board <technical-board>`. Internally, the technical board will use the same voting mechanism. A diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index d3231f5583..7e55b98af9 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -528,7 +528,7 @@ Several other `MySQLdb connection options`_ may be useful, such as ``ssl``, Setting ``sql_mode`` ~~~~~~~~~~~~~~~~~~~~ -From MySQL 5.7 onwards, the default value of the ``sql_mode`` option contains +From MySQL 5.7 onward, the default value of the ``sql_mode`` option contains ``STRICT_TRANS_TABLES``. That option escalates warnings into errors when data are truncated upon insertion, so Django highly recommends activating a `strict mode`_ for MySQL to prevent data loss (either ``STRICT_TRANS_TABLES`` diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt index d7336d7001..1a3558ac17 100644 --- a/docs/ref/models/fields.txt +++ b/docs/ref/models/fields.txt @@ -1755,7 +1755,7 @@ The possible values for :attr:`~ForeignKey.on_delete` are found in a reference to the setting, not to the model directly. You only want to override this to be ``False`` if you are sure your - model should always point towards the swapped-in model - for example, + model should always point toward the swapped-in model - for example, if it is a profile model designed specifically for your custom user model. Setting it to ``False`` does not mean you can reference a swappable model @@ -1969,7 +1969,7 @@ that control how the relationship functions. a reference to the setting, not to the model directly. You only want to override this to be ``False`` if you are sure your - model should always point towards the swapped-in model - for example, + model should always point toward the swapped-in model - for example, if it is a profile model designed specifically for your custom user model. If in doubt, leave it to its default of ``True``. diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 47718a6838..cc58192bd4 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1227,7 +1227,7 @@ Default: ``False`` If set to ``True``, Django's exception handling of view functions (:data:`~django.conf.urls.handler500`, or the debug view if :setting:`DEBUG` is ``True``) and logging of 500 responses (:ref:`django-request-logger`) is -skipped and exceptions propagate upwards. +skipped and exceptions propagate upward. This can be useful for some test setups. It shouldn't be used on a live site unless you want your web server (instead of Django) to generate "Internal diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt index eaae87f6e4..d2f804b8c1 100644 --- a/docs/releases/1.10.txt +++ b/docs/releases/1.10.txt @@ -752,7 +752,7 @@ Maximum size of a request body and the number of GET/POST parameters is limited Two new settings help mitigate denial-of-service attacks via large requests: * :setting:`DATA_UPLOAD_MAX_MEMORY_SIZE` limits the size that a request body - may be. File uploads don't count towards this limit. + may be. File uploads don't count toward this limit. * :setting:`DATA_UPLOAD_MAX_NUMBER_FIELDS` limits the number of GET/POST parameters that are parsed. diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt index 2841294067..51d558b32b 100644 --- a/docs/releases/1.7.txt +++ b/docs/releases/1.7.txt @@ -1658,7 +1658,7 @@ deprecated language codes will be removed in Django 1.9. -------------------------------------------- The function ``memoize`` is deprecated and should be replaced by the -``functools.lru_cache`` decorator (available from Python 3.2 onwards). +``functools.lru_cache`` decorator (available from Python 3.2 onward). Django ships a backport of this decorator for older Python versions and it's available at ``django.utils.lru_cache.lru_cache``. The deprecated function will diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist index 657b2dd0c4..bd8785cf67 100644 --- a/docs/spelling_wordlist +++ b/docs/spelling_wordlist @@ -336,7 +336,6 @@ OAuth OGC OGR ons -onwards orderable Orléans orm diff --git a/docs/topics/http/middleware.txt b/docs/topics/http/middleware.txt index fa727aed75..275f739566 100644 --- a/docs/topics/http/middleware.txt +++ b/docs/topics/http/middleware.txt @@ -287,7 +287,7 @@ that exception; instead it will get an :class:`~django.http.HttpResponse` object with a :attr:`~django.http.HttpResponse.status_code` of 404. You can set :setting:`DEBUG_PROPAGATE_EXCEPTIONS` to ``True`` to skip this -conversion and propagate exceptions upwards. +conversion and propagate exceptions upward. .. _async-middleware: diff --git a/docs/topics/performance.txt b/docs/topics/performance.txt index e4c07f43bd..04554226c0 100644 --- a/docs/topics/performance.txt +++ b/docs/topics/performance.txt @@ -166,7 +166,7 @@ produce, or even an entire site. Implementing caching should not be regarded as an alternative to improving code that's performing poorly because it has been written badly. It's one of the -final steps towards producing well-performing code, not a shortcut. +final steps toward producing well-performing code, not a shortcut. :class:`~django.utils.functional.cached_property` ------------------------------------------------- |