diff options
| author | Ben Bangert <ben@groovie.org> | 2010-10-29 11:14:41 -0700 |
|---|---|---|
| committer | Ben Bangert <ben@groovie.org> | 2010-10-29 11:14:41 -0700 |
| commit | 17e70c8db9140c0b4062f46ef5eb4527d678b793 (patch) | |
| tree | 38b6b8de2a57db4debec477bc4fda27db82c4c5a /docs/api | |
| parent | d39e99e1f6f06a02a275a8a30f154e0f292d7dff (diff) | |
| parent | 5038994ea9e053b16fca74ea8fa022871e630883 (diff) | |
| download | pyramid-17e70c8db9140c0b4062f46ef5eb4527d678b793.tar.gz pyramid-17e70c8db9140c0b4062f46ef5eb4527d678b793.tar.bz2 pyramid-17e70c8db9140c0b4062f46ef5eb4527d678b793.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/personality.rst | 9 | ||||
| -rw-r--r-- | docs/api/request.rst | 5 | ||||
| -rw-r--r-- | docs/api/view.rst | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/docs/api/personality.rst b/docs/api/personality.rst new file mode 100644 index 000000000..7eb964e76 --- /dev/null +++ b/docs/api/personality.rst @@ -0,0 +1,9 @@ +.. _personality_module: + +:mod:`pyramid.personality.pylons` +--------------------------------- + +.. module:: pyramid.personality.pylons + +.. function:: renderer_globals_factory_config + diff --git a/docs/api/request.rst b/docs/api/request.rst index 9e851ba8d..97b164428 100644 --- a/docs/api/request.rst +++ b/docs/api/request.rst @@ -93,3 +93,8 @@ ``request.session`` attribute will cause a :class:`pyramid.exceptions.ConfigurationError` to be raised. + .. attribute:: tmpl_context + + The template context for Pylons-style applications. + + diff --git a/docs/api/view.rst b/docs/api/view.rst index 5e884656c..0057cca4a 100644 --- a/docs/api/view.rst +++ b/docs/api/view.rst @@ -13,7 +13,7 @@ .. autofunction:: is_response - .. autoclass:: bfg_view + .. autoclass:: view_config :members: .. autoclass:: static |