diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-18 15:53:49 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-18 15:53:49 -0500 |
| commit | 738a2b5f3eb44da7036a31005144e5252827ac38 (patch) | |
| tree | 80e10d2ae215b2e0e1f248354b6c9a5e11406cd5 /docs/api | |
| parent | aa6c4267b330a5665dcb7c98d75fe21f8eeececb (diff) | |
| parent | 70119302324e5bf5627344f90c62ef31b6e43005 (diff) | |
| download | pyramid-738a2b5f3eb44da7036a31005144e5252827ac38.tar.gz pyramid-738a2b5f3eb44da7036a31005144e5252827ac38.tar.bz2 pyramid-738a2b5f3eb44da7036a31005144e5252827ac38.zip | |
Merge branch 'model2resource'
Conflicts:
docs/narr/views.rst
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/config.rst | 6 | ||||
| -rw-r--r-- | docs/api/request.rst | 2 | ||||
| -rw-r--r-- | docs/api/testing.rst | 4 | ||||
| -rw-r--r-- | docs/api/traversal.rst | 6 | ||||
| -rw-r--r-- | docs/api/url.rst | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index 64dc4d0dd..fd8e1042d 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -32,7 +32,7 @@ .. automethod:: maybe_dotted - .. automethod:: absolute_resource_spec + .. automethod:: absolute_asset_spec .. automethod:: setup_registry(settings=None, root_factory=None, authentication_policy=None, renderers=DEFAULT_RENDERERS, debug_logger=None, locale_negotiator=None, request_factory=None, renderer_globals_factory=None) @@ -58,7 +58,7 @@ .. automethod:: make_wsgi_app() - .. automethod:: override_resource(to_override, override_with) + .. automethod:: override_asset(to_override, override_with) .. automethod:: scan(package=None, categories=None) @@ -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/testing.rst b/docs/api/testing.rst index fc4b76cc7..fdcdadee8 100644 --- a/docs/api/testing.rst +++ b/docs/api/testing.rst @@ -7,7 +7,7 @@ .. autofunction:: registerDummySecurityPolicy - .. autofunction:: registerModels + .. autofunction:: registerResources .. autofunction:: registerEventListener @@ -31,7 +31,7 @@ .. autofunction:: cleanUp - .. autoclass:: DummyModel + .. autoclass:: DummyResource :members: .. autoclass:: DummyRequest 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 |