diff options
| author | Chris McDonough <chrism@plope.com> | 2012-02-17 18:29:44 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-02-17 18:29:44 -0500 |
| commit | 222638ad3760692ac0ec5368db4baaee9272e818 (patch) | |
| tree | b8fc997119a2b470db290c8270241e8991eb797e /docs/api | |
| parent | cdb5f5a395c53e18a250651b6c9c3e0322b0dfe5 (diff) | |
| parent | 305d23f9e9dd095f4fdface116a2155bd86a453c (diff) | |
| download | pyramid-222638ad3760692ac0ec5368db4baaee9272e818.tar.gz pyramid-222638ad3760692ac0ec5368db4baaee9272e818.tar.bz2 pyramid-222638ad3760692ac0ec5368db4baaee9272e818.zip | |
Merge branch '1.3-branch'
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/config.rst | 2 | ||||
| -rw-r--r-- | docs/api/interfaces.rst | 4 | ||||
| -rw-r--r-- | docs/api/request.rst | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index d16930cc0..3fc2cfc44 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -94,6 +94,8 @@ .. automethod:: set_notfound_view + .. automethod:: add_traverser + .. automethod:: set_renderer_globals_factory(factory) .. attribute:: introspectable diff --git a/docs/api/interfaces.rst b/docs/api/interfaces.rst index 11cd8cf7e..1dea5fab0 100644 --- a/docs/api/interfaces.rst +++ b/docs/api/interfaces.rst @@ -79,3 +79,7 @@ Other Interfaces .. autointerface:: IAssetDescriptor :members: + + .. autointerface:: IResourceURL + :members: + diff --git a/docs/api/request.rst b/docs/api/request.rst index 1ab84e230..e1b233fbc 100644 --- a/docs/api/request.rst +++ b/docs/api/request.rst @@ -183,6 +183,8 @@ .. automethod:: resource_url + .. automethod:: resource_path + .. attribute:: response_* In Pyramid 1.0, you could set attributes on a |