summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-04-25 21:12:32 -0500
committerMichael Merickel <michael@merickel.org>2016-04-25 21:12:32 -0500
commitf2bc0e39cabb2f234ea622b2ebdd0b8eac5cea32 (patch)
tree38396f07061fcc8012698bd42ea895c789437990 /docs
parent0fdf616cebb439e5dff388ca3bd5cd0c3bdcfd1b (diff)
downloadpyramid-f2bc0e39cabb2f234ea622b2ebdd0b8eac5cea32.tar.gz
pyramid-f2bc0e39cabb2f234ea622b2ebdd0b8eac5cea32.tar.bz2
pyramid-f2bc0e39cabb2f234ea622b2ebdd0b8eac5cea32.zip
fix explanation of require_csrf
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/hooks.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index 150eca944..49ef29d3f 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -1647,8 +1647,9 @@ the user-defined :term:`view callable`:
``csrf_view``
Used to check the CSRF token provided in the request. This element is a
- no-op if both the ``require_csrf`` view option and the
- ``pyramid.require_default_csrf`` setting are disabled.
+ no-op if ``require_csrf`` view option is not ``True``. Note there will
+ always be a ``require_csrf`` option if a default value was assigned via
+ :meth:`pyramid.config.Configurator.set_default_csrf_options`.
``owrapped_view``