summaryrefslogtreecommitdiff
path: root/docs/api/config.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2016-06-01 17:13:27 -0400
committerChris McDonough <chrism@plope.com>2016-06-01 17:13:27 -0400
commit3e9a737500e79a6a919ce53db9557c75d874b84c (patch)
treeef674c176ab29b9dede8a8fa70c3a18a26edde44 /docs/api/config.rst
parentb5f065906f75efdcc9f80d4f0b8b4092e92b41c0 (diff)
parent382f93e2bfec5563587e306fda3fd34759314300 (diff)
downloadpyramid-3e9a737500e79a6a919ce53db9557c75d874b84c.tar.gz
pyramid-3e9a737500e79a6a919ce53db9557c75d874b84c.tar.bz2
pyramid-3e9a737500e79a6a919ce53db9557c75d874b84c.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/api/config.rst')
-rw-r--r--docs/api/config.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst
index e083dbc68..ab3ff0fe1 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -35,6 +35,7 @@
.. automethod:: set_authentication_policy
.. automethod:: set_authorization_policy
+ .. automethod:: set_default_csrf_options
.. automethod:: set_default_permission
.. automethod:: add_permission
@@ -65,6 +66,7 @@
.. automethod:: add_traverser
.. automethod:: add_tween
.. automethod:: add_route_predicate
+ .. automethod:: add_subscriber_predicate
.. automethod:: add_view_predicate
.. automethod:: add_view_deriver
.. automethod:: set_request_factory