diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-18 03:33:35 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-18 03:33:35 -0500 |
| commit | 92c3e502494714884b7a051721c9b322027369a1 (patch) | |
| tree | 3cd5a871ff5b13cf48be0fec45b9f13c8d451341 /docs/api | |
| parent | 515d0f977f21bf28602505b859f64f10dd2f5f59 (diff) | |
| download | pyramid-92c3e502494714884b7a051721c9b322027369a1.tar.gz pyramid-92c3e502494714884b7a051721c9b322027369a1.tar.bz2 pyramid-92c3e502494714884b7a051721c9b322027369a1.zip | |
resource -> asset
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/config.rst | 2 | ||||
| -rw-r--r-- | docs/api/request.rst | 2 | ||||
| -rw-r--r-- | docs/api/traversal.rst | 6 | ||||
| -rw-r--r-- | docs/api/url.rst | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index 64dc4d0dd..4b23f3e8e 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -78,7 +78,7 @@ .. automethod:: testing_securitypolicy - .. automethod:: testing_models + .. automethod:: testing_resources .. automethod:: testing_add_subscriber diff --git a/docs/api/request.rst b/docs/api/request.rst index acd66ccf8..13b434a51 100644 --- a/docs/api/request.rst +++ b/docs/api/request.rst @@ -26,7 +26,7 @@ .. attribute:: root The :term:`root` object will be available as the ``root`` - attribute of the :term:`request` object. It will be the model + attribute of the :term:`request` object. It will be the resource object at which traversal started (the root). See :ref:`traversal_chapter` for information about root objects. diff --git a/docs/api/traversal.rst b/docs/api/traversal.rst index b89691847..cd4765e04 100644 --- a/docs/api/traversal.rst +++ b/docs/api/traversal.rst @@ -7,13 +7,13 @@ .. autofunction:: find_interface - .. autofunction:: find_model + .. autofunction:: find_resource .. autofunction:: find_root - .. autofunction:: model_path + .. autofunction:: resource_path - .. autofunction:: model_path_tuple + .. autofunction:: resource_path_tuple .. autofunction:: quote_path_segment diff --git a/docs/api/url.rst b/docs/api/url.rst index 8c702a3fb..1aa3082b7 100644 --- a/docs/api/url.rst +++ b/docs/api/url.rst @@ -5,7 +5,7 @@ .. automodule:: pyramid.url - .. autofunction:: pyramid.url.model_url(context, request, *elements, query=None, anchor=None) + .. autofunction:: pyramid.url.resource_url(context, request, *elements, query=None, anchor=None) .. autofunction:: route_url |