diff options
| author | Jkrzy <cakheil@gmail.com> | 2017-08-30 06:25:51 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-08-30 06:26:04 -0400 |
| commit | 10b54c8782e41efbad805e1f982ca2116c78191a (patch) | |
| tree | b2ea39eceb6677fda09d3c501fb6bc4ec3f11ec2 | |
| parent | 3bb03df0fc642c48ff70cdd74572c31f135f9c08 (diff) | |
[1.11.x] Fixed #28548 -- Replaced 'middlewares' with 'middleware' in docs.
Backport of da3a5cee4f06ed801c6fb42bd8995428ff0b28bf from master
| -rw-r--r-- | docs/ref/contrib/flatpages.txt | 2 | ||||
| -rw-r--r-- | docs/ref/request-response.txt | 2 | ||||
| -rw-r--r-- | docs/spelling_wordlist | 1 | ||||
| -rw-r--r-- | docs/topics/i18n/translation.txt | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/docs/ref/contrib/flatpages.txt b/docs/ref/contrib/flatpages.txt index 33d408a2b8..0b66cbf359 100644 --- a/docs/ref/contrib/flatpages.txt +++ b/docs/ref/contrib/flatpages.txt @@ -147,7 +147,7 @@ can do all of the work. Note that the order of :setting:`MIDDLEWARE` matters. Generally, you can put :class:`~django.contrib.flatpages.middleware.FlatpageFallbackMiddleware` at the end of the list. This means it will run first when processing the response, and -ensures that any other response-processing middlewares see the real flatpage +ensures that any other response-processing middleware see the real flatpage response rather than the 404. For more on middleware, read the :doc:`middleware docs diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt index 9f41243c6f..8e9f0fcf02 100644 --- a/docs/ref/request-response.txt +++ b/docs/ref/request-response.txt @@ -1039,7 +1039,7 @@ with the following notable differences: :class:`StreamingHttpResponse` should only be used in situations where it is absolutely required that the whole content isn't iterated before transferring the data to the client. Because the content can't be accessed, many -middlewares can't function normally. For example the ``ETag`` and +middleware can't function normally. For example the ``ETag`` and ``Content-Length`` headers can't be generated for streaming responses. Attributes diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist index 61ef218f88..670d1de2d7 100644 --- a/docs/spelling_wordlist +++ b/docs/spelling_wordlist @@ -476,7 +476,6 @@ metre MiB micrometre middleware -middlewares migrationname millimetre Minification diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index 36d00a4136..e1dc6deb2b 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -2117,7 +2117,7 @@ To use ``LocaleMiddleware``, add ``'django.middleware.locale.LocaleMiddleware'`` to your :setting:`MIDDLEWARE` setting. Because middleware order matters, follow these guidelines: -* Make sure it's one of the first middlewares installed. +* Make sure it's one of the first middleware installed. * It should come after ``SessionMiddleware``, because ``LocaleMiddleware`` makes use of session data. And it should come before ``CommonMiddleware`` because ``CommonMiddleware`` needs an activated language in order |