diff options
| author | Chris McDonough <chrism@plope.com> | 2012-08-07 00:33:53 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-08-07 00:33:53 -0400 |
| commit | c3a9a10324b991a42040760a04c5fb3fc5c9c864 (patch) | |
| tree | 11787501669cee587f8b0a7c33024fb62d397e81 /docs/api | |
| parent | 92b64cca2994774987cbce88cef89e9f71366185 (diff) | |
| parent | 735abf49f936cedc845907516a3922cdffa83665 (diff) | |
| download | pyramid-c3a9a10324b991a42040760a04c5fb3fc5c9c864.tar.gz pyramid-c3a9a10324b991a42040760a04c5fb3fc5c9c864.tar.bz2 pyramid-c3a9a10324b991a42040760a04c5fb3fc5c9c864.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/registry.rst | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index cd58e74d3..bc9e067b1 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -66,6 +66,8 @@ .. automethod:: add_response_adapter .. automethod:: add_traverser .. automethod:: add_tween + .. automethod:: add_route_predicate + .. automethod:: add_view_predicate .. automethod:: set_request_factory .. automethod:: set_root_factory .. automethod:: set_session_factory diff --git a/docs/api/registry.rst b/docs/api/registry.rst index e62e2ba6f..1d5d52248 100644 --- a/docs/api/registry.rst +++ b/docs/api/registry.rst @@ -38,3 +38,17 @@ This class is new as of :app:`Pyramid` 1.3. +.. autoclass:: Deferred + + This class is new as of :app:`Pyramid` 1.4. + +.. autofunction:: undefer + + This function is new as of :app:`Pyramid` 1.4. + +.. autoclass:: predvalseq + + This class is new as of :app:`Pyramid` 1.4. + + + |