diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-26 14:56:37 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-26 14:56:37 -0500 |
| commit | 50e89abccc9c23949fb7cdd928a865712c34aa75 (patch) | |
| tree | 15e86ddf434dad1efeeb0a5f329513bcf54268b3 | |
| parent | 6772a25160b0c996ae6e7baa012199b606407db4 (diff) | |
| parent | 602ac1bd027f0f78b1164f0180a9b74771bbbb3c (diff) | |
| download | pyramid-50e89abccc9c23949fb7cdd928a865712c34aa75.tar.gz pyramid-50e89abccc9c23949fb7cdd928a865712c34aa75.tar.bz2 pyramid-50e89abccc9c23949fb7cdd928a865712c34aa75.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | pyramid/view.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pyramid/view.py b/pyramid/view.py index 13d5cfe7b..f7d4d8945 100644 --- a/pyramid/view.py +++ b/pyramid/view.py @@ -156,11 +156,12 @@ class view_config(object): backwards compatibility purposes, as the name :class:`pyramid.view.bfg_view`. - The following arguments are supported as arguments to + The following arguments are supported to :class:`pyramid.view.view_config`: ``context``, ``permission``, ``name``, ``request_type``, ``route_name``, ``request_method``, ``request_param``, ``containment``, ``xhr``, ``accept``, ``header``, ``path_info``, - ``custom_predicates``, ``decorator``, ``mapper``, and ``http_cache``. + ``custom_predicates``, ``decorator``, ``mapper``, ``http_cache``, + and ``match_param``. The meanings of these arguments are the same as the arguments passed to :meth:`pyramid.config.Configurator.add_view`. |