summaryrefslogtreecommitdiff
path: root/docs/narr/csrf.rst
diff options
context:
space:
mode:
authorRob Miller <rob@mochimedia.com>2010-12-29 14:12:30 -0800
committerRob Miller <rob@mochimedia.com>2010-12-29 14:12:30 -0800
commit9c1d34a3de11286c98dce52592ef05a3c05046a5 (patch)
tree3b9d60fabfa876bdaba9debd477f85cd9cf926bf /docs/narr/csrf.rst
parent88231cc1b16f1f5a0983dba1dab9b401bbde0c00 (diff)
parent8739f576ed84bb48cec9c2d4b60e92878a273b1f (diff)
downloadpyramid-9c1d34a3de11286c98dce52592ef05a3c05046a5.tar.gz
pyramid-9c1d34a3de11286c98dce52592ef05a3c05046a5.tar.bz2
pyramid-9c1d34a3de11286c98dce52592ef05a3c05046a5.zip
Merge remote branch 'refs/remotes/upstream/viewderiver' into ra_view_decoration
Conflicts: CHANGES.txt pyramid/config.py
Diffstat (limited to 'docs/narr/csrf.rst')
-rw-r--r--docs/narr/csrf.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/csrf.rst b/docs/narr/csrf.rst
index 7586b0ed7..2f545fb4f 100644
--- a/docs/narr/csrf.rst
+++ b/docs/narr/csrf.rst
@@ -9,7 +9,7 @@ phenomenon whereby a user with an identity on your website might click on a
URL or button on another website which unwittingly redirects the user to your
application to perform some command that requires elevated privileges.
-You can avoid most of these attacks by making sure that a the correct *CSRF
+You can avoid most of these attacks by making sure that the correct *CSRF
token* has been set in an :app:`Pyramid` session object before performing any
actions in code which requires elevated privileges and is invoked via a form
post. To use CSRF token support, you must enable a :term:`session factory`