diff options
| author | Chris McDonough <chrism@plope.com> | 2011-08-10 00:32:37 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-08-10 00:32:37 -0400 |
| commit | 5e1dab4a765e4753f53f56456070e938e55c620d (patch) | |
| tree | c4fda18a29ae158b967dc5639e71c321df5bc2e8 /docs/api | |
| parent | 7d75b9711290da353077d87323ba0ccc1c1918ab (diff) | |
| parent | 65de433df573eccdc9911f0675dcc342dfe1c8ca (diff) | |
| download | pyramid-5e1dab4a765e4753f53f56456070e938e55c620d.tar.gz pyramid-5e1dab4a765e4753f53f56456070e938e55c620d.tar.bz2 pyramid-5e1dab4a765e4753f53f56456070e938e55c620d.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/config.rst | 2 | ||||
| -rw-r--r-- | docs/api/security.rst | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index 1a9bb6ba4..30c541905 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -44,7 +44,7 @@ .. automethod:: add_route - .. automethod:: add_static_view(name, path, cache_max_age=3600, permission='__no_permission_required__') + .. automethod:: add_static_view(name, path, cache_max_age=3600, permission=NO_PERMISSION_REQUIRED) .. automethod:: add_settings diff --git a/docs/api/security.rst b/docs/api/security.rst index de249355d..8cd9e5dae 100644 --- a/docs/api/security.rst +++ b/docs/api/security.rst @@ -57,6 +57,8 @@ Constants last ACE in an ACL in systems that use an "inheriting" security policy, representing the concept "don't inherit any other ACEs". +.. attribute:: NO_PERMISSION_REQUIRED + Return Values ------------- |