summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2017-04-30 16:42:01 -0700
committerGitHub <noreply@github.com>2017-04-30 16:42:01 -0700
commitab04b7be473d0145d9f306583c4d529ee8abbe02 (patch)
tree78ea6c34dbb0de8f0bec7e5f207bf5085c6d2b88 /docs
parent80973f86368ee9bc8f7d8c87d32207cec83d9310 (diff)
parent69828b5aa35ed3cf19941a0771c82418a0733b7e (diff)
downloadpyramid-ab04b7be473d0145d9f306583c4d529ee8abbe02.tar.gz
pyramid-ab04b7be473d0145d9f306583c4d529ee8abbe02.tar.bz2
pyramid-ab04b7be473d0145d9f306583c4d529ee8abbe02.zip
Merge pull request #3020 from stevepiercy/master
standardize "non-standard"
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/security.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/security.rst b/docs/narr/security.rst
index ddf496b69..3a6bfa5e5 100644
--- a/docs/narr/security.rst
+++ b/docs/narr/security.rst
@@ -946,7 +946,7 @@ automatic CSRF checking will also check the referrer of the request to ensure
that it matches one of the trusted origins. By default the only trusted origin
is the current host, however additional origins may be configured by setting
``pyramid.csrf_trusted_origins`` to a list of domain names (and ports if they
-are non standard). If a host in the list of domains starts with a ``.`` then
+are non-standard). If a host in the list of domains starts with a ``.`` then
that will allow all subdomains as well as the domain without the ``.``.
If CSRF checks fail then a :class:`pyramid.exceptions.BadCSRFToken` or