summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMatthew Wilkes <git@matthewwilkes.name>2017-04-26 15:41:47 +0100
committerMatthew Wilkes <git@matthewwilkes.name>2017-04-26 15:41:47 +0100
commit2ded2fc216b4caaf0d97813413943e0838b6eaaa (patch)
tree8415cff663233b8b886e13865947c2b8b4263a58 /docs
parent7c0f098641fda4207ea6fa50c58b289926038697 (diff)
downloadpyramid-2ded2fc216b4caaf0d97813413943e0838b6eaaa.tar.gz
pyramid-2ded2fc216b4caaf0d97813413943e0838b6eaaa.tar.bz2
pyramid-2ded2fc216b4caaf0d97813413943e0838b6eaaa.zip
Apply drafting changes to documentation.
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst5
-rw-r--r--docs/narr/security.rst4
-rw-r--r--docs/narr/sessions.rst4
3 files changed, 9 insertions, 4 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 0a46fac3b..0cf96f488 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -891,6 +891,11 @@ Glossary
:meth:`pyramid.config.Configurator.set_session_factory` for more
information.
+ CSRF storage policy
+ A utility that implements :class:`pyramid.interfaces.ICSRFStoragePolicy`
+ which is responsible for allocating CSRF tokens to a user and verifying
+ that a provided token is acceptable.
+
Mako
`Mako <http://www.makotemplates.org/>`_ is a template language
which refines the familiar ideas of componentized layout and inheritance
diff --git a/docs/narr/security.rst b/docs/narr/security.rst
index e67f7b98c..86e5c1ef4 100644
--- a/docs/narr/security.rst
+++ b/docs/narr/security.rst
@@ -766,6 +766,10 @@ a secret across two different subsystems might drop the security of signing to
zero. Keys should not be re-used across different contexts where an attacker
has the possibility of providing a chosen plaintext.
+.. index::
+ single: preventing cross-site request forgery attacks
+ single: cross-site request forgery attacks, prevention
+
Preventing Cross-Site Request Forgery Attacks
---------------------------------------------
diff --git a/docs/narr/sessions.rst b/docs/narr/sessions.rst
index 86fe2a139..7e2469d54 100644
--- a/docs/narr/sessions.rst
+++ b/docs/narr/sessions.rst
@@ -315,7 +315,3 @@ flash storage.
['info message']
>>> request.session.peek_flash()
[]
-
-.. index::
- single: preventing cross-site request forgery attacks
- single: cross-site request forgery attacks, prevention