From 4d4ee6a553dcde3a292ee2439c1fe5524fc66aa7 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Sat, 21 Mar 2015 02:51:16 -0700 Subject: update pylons sphinx theme on master branch, too --- docs/_themes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_themes b/docs/_themes index b14bf8c2a..02096489e 160000 --- a/docs/_themes +++ b/docs/_themes @@ -1 +1 @@ -Subproject commit b14bf8c2a0d95ae8e3d38d07ad3721370ae6f3f8 +Subproject commit 02096489e62ec6c4b3c64e2e6ee874fb79c6ba10 -- cgit v1.2.3 From c4fe07f2bd053d41859f2caf5ef93dd4819a60a4 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Wed, 25 Mar 2015 21:27:16 -0700 Subject: Add a badge and link for latest documentation to complement master --- README.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3 From 610b6edef76168e6a499871be10ba9ea5ea6aa6d Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Thu, 26 Mar 2015 11:54:30 -0500 Subject: fix out of date match_param docs --- docs/narr/viewconfig.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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``. -- cgit v1.2.3 From 594c252a58428433905dfc66e43c8d087c8bb51d Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Mon, 30 Mar 2015 02:35:15 -0700 Subject: remove italics from internal references --- docs/_themes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_themes b/docs/_themes index 02096489e..382cba80f 160000 --- a/docs/_themes +++ b/docs/_themes @@ -1 +1 @@ -Subproject commit 02096489e62ec6c4b3c64e2e6ee874fb79c6ba10 +Subproject commit 382cba80fbd6a7424818d17ec63ca520e485f108 -- cgit v1.2.3