summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJkrzy <cakheil@gmail.com>2017-08-30 06:25:51 -0400
committerTim Graham <timograham@gmail.com>2017-08-30 06:25:51 -0400
commitda3a5cee4f06ed801c6fb42bd8995428ff0b28bf (patch)
tree87f2ee11d9119ab5191ddfbd3e7f28a9601c58ef /docs
parent9e2bf65d6a5dc3b53db84f4839652f0d154349ee (diff)
Fixed #28548 -- Replaced 'middlewares' with 'middleware' in docs.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/flatpages.txt2
-rw-r--r--docs/ref/request-response.txt2
-rw-r--r--docs/spelling_wordlist1
-rw-r--r--docs/topics/i18n/translation.txt2
4 files changed, 3 insertions, 4 deletions
diff --git a/docs/ref/contrib/flatpages.txt b/docs/ref/contrib/flatpages.txt
index 0e801a9a71..4dcd4b9a5a 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 e0c39ebab5..9eafd1b10a 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -1006,7 +1006,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 ed3570657b..5efec10714 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -401,7 +401,6 @@ metre
MiB
micrometre
middleware
-middlewares
migrationname
millimetre
Minification
diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt
index bcdf3324f8..4875419b6b 100644
--- a/docs/topics/i18n/translation.txt
+++ b/docs/topics/i18n/translation.txt
@@ -1944,7 +1944,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