diff options
| author | Chris McDonough <chrism@plope.com> | 2015-04-03 16:18:01 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-04-03 16:18:01 -0400 |
| commit | ebb588e5b86920b00d10319e1ded681dd3109222 (patch) | |
| tree | 9efe59281dbc0b20b9a94b69ee0a18bcb124aa93 | |
| parent | a7d77fdecaa120f4e095d271b687e3bb628e8696 (diff) | |
| parent | 45ddb5a5b744aebeac6004e9dba1c03d5bc8c50f (diff) | |
| download | pyramid-ebb588e5b86920b00d10319e1ded681dd3109222.tar.gz pyramid-ebb588e5b86920b00d10319e1ded681dd3109222.tar.bz2 pyramid-ebb588e5b86920b00d10319e1ded681dd3109222.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | README.rst | 6 | ||||
| m--------- | docs/_themes | 0 | ||||
| -rw-r--r-- | docs/narr/viewconfig.rst | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/README.rst b/README.rst index adf7eea5e..6de42ea40 100644 --- a/README.rst +++ b/README.rst @@ -6,7 +6,11 @@ Pyramid .. image:: https://readthedocs.org/projects/pyramid/badge/?version=master :target: http://docs.pylonsproject.org/projects/pyramid/en/master/ - :alt: Documentation Status + :alt: Master Documentation Status + +.. image:: https://readthedocs.org/projects/pyramid/badge/?version=latest + :target: http://docs.pylonsproject.org/projects/pyramid/en/latest/ + :alt: Latest Documentation Status Pyramid is a small, fast, down-to-earth, open source Python web framework. It makes real-world web application development and diff --git a/docs/_themes b/docs/_themes -Subproject b14bf8c2a0d95ae8e3d38d07ad3721370ae6f3f +Subproject 382cba80fbd6a7424818d17ec63ca520e485f10 diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst index a0feef8d7..d5203c6ba 100644 --- a/docs/narr/viewconfig.rst +++ b/docs/narr/viewconfig.rst @@ -325,7 +325,7 @@ configured view. ``match_param`` This param may be either a single string of the format "key=value" or a - dict of key/value pairs. + tuple containing one or more of these strings. This argument ensures that the view will only be called when the :term:`request` has key/value pairs in its :term:`matchdict` that equal @@ -334,8 +334,8 @@ configured view. hand side of the expression (``edit``) for the view to "match" the current request. - If the ``match_param`` is a dict, every key/value pair must match for the - predicate to pass. + If the ``match_param`` is a tuple, every key/value pair must match + for the predicate to pass. If ``match_param`` is not supplied, the view will be invoked without consideration of the keys and values in ``request.matchdict``. |