summaryrefslogtreecommitdiff
path: root/docs/api/config.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-02-22 19:28:58 -0500
committerChris McDonough <chrism@plope.com>2012-02-22 19:28:58 -0500
commit6d0bce1dabce486cd6a6bc1fa7668ca863c0656a (patch)
tree18f0c2d4c7cee39e8938d6c77b4e0792761382bd /docs/api/config.rst
parentbb40d09a0241b9e19cdc86186a7abd30d4d491d3 (diff)
parente9b51b719db22e3e41e3b22c584f40b20971aa98 (diff)
downloadpyramid-6d0bce1dabce486cd6a6bc1fa7668ca863c0656a.tar.gz
pyramid-6d0bce1dabce486cd6a6bc1fa7668ca863c0656a.tar.bz2
pyramid-6d0bce1dabce486cd6a6bc1fa7668ca863c0656a.zip
Merge branch '1.3-branch'
Diffstat (limited to 'docs/api/config.rst')
-rw-r--r--docs/api/config.rst12
1 files changed, 5 insertions, 7 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst
index b76fed9cb..cd58e74d3 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -24,8 +24,8 @@
.. automethod:: add_route
.. automethod:: add_static_view(name, path, cache_max_age=3600, permission=NO_PERMISSION_REQUIRED)
.. automethod:: add_view
- .. automethod:: set_forbidden_view
- .. automethod:: set_notfound_view
+ .. automethod:: add_notfound_view
+ .. automethod:: add_forbidden_view
:methodcategory:`Adding an Event Subscriber`
@@ -76,18 +76,18 @@
.. automethod:: action
.. automethod:: add_directive
.. automethod:: with_package
+ .. automethod:: derive_view
:methodcategory:`Utility Methods`
.. automethod:: absolute_asset_spec
- .. automethod:: derive_view
.. automethod:: maybe_dotted
- .. automethod:: setup_registry
:methodcategory:`ZCA-Related APIs`
.. automethod:: hook_zca
.. automethod:: unhook_zca
+ .. automethod:: setup_registry
:methodcategory:`Testing Helper APIs`
@@ -112,9 +112,7 @@
The :term:`introspector` related to this configuration. It is an
instance implementing the :class:`pyramid.interfaces.IIntrospector`
- interface. If the Configurator constructor was supplied with an
- ``introspector`` argument, this attribute will be that value.
- Otherwise, it will be an instance of a default introspector type.
+ interface.
.. note::