summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorEd Morley <emorley@mozilla.com>2016-07-28 17:30:16 +0100
committerTim Graham <timograham@gmail.com>2016-08-08 20:20:49 -0400
commit8c3bc5cd7801a307a0bc2969abebe7a6ca48d17f (patch)
tree4548b0bf9027e0291093eb741b856a4cfbf6d35f /docs/ref
parent004ba05bcaab9133bc2b7f943f6c3198da38dbc0 (diff)
Fixed docs to refer to HSTS includeSubdomains as a directive.
The spec refers to it as a 'directive' rather than a 'tag': https://tools.ietf.org/html/rfc6797#section-6.1.2
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/middleware.txt4
-rw-r--r--docs/ref/settings.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
index 371121c30e..cee18ea058 100644
--- a/docs/ref/middleware.txt
+++ b/docs/ref/middleware.txt
@@ -255,8 +255,8 @@ so that infrequent visitors will be protected (31536000 seconds, i.e. 1 year,
is common).
Additionally, if you set the :setting:`SECURE_HSTS_INCLUDE_SUBDOMAINS` setting
-to ``True``, ``SecurityMiddleware`` will add the ``includeSubDomains`` tag to
-the ``Strict-Transport-Security`` header. This is recommended (assuming all
+to ``True``, ``SecurityMiddleware`` will add the ``includeSubDomains`` directive
+to the ``Strict-Transport-Security`` header. This is recommended (assuming all
subdomains are served exclusively using HTTPS), otherwise your site may still
be vulnerable via an insecure connection to a subdomain.
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 225c22a84f..9e0d8b8d41 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2053,7 +2053,7 @@ already have it.
Default: ``False``
If ``True``, the :class:`~django.middleware.security.SecurityMiddleware` adds
-the ``includeSubDomains`` tag to the :ref:`http-strict-transport-security`
+the ``includeSubDomains`` directive to the :ref:`http-strict-transport-security`
header. It has no effect unless :setting:`SECURE_HSTS_SECONDS` is set to a
non-zero value.