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/config.rst | |
| 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/config.rst')
| -rw-r--r-- | docs/api/config.rst | 6 |
1 files changed, 3 insertions, 3 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 |