From 777ca3c6feac4179b1ecec9cd50fd15ca8dbe6bb Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Mon, 24 Oct 2011 00:05:14 -0500 Subject: garden --- docs/narr/urldispatch.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst index c2414965c..35613ea1b 100644 --- a/docs/narr/urldispatch.rst +++ b/docs/narr/urldispatch.rst @@ -101,7 +101,7 @@ that references ``myroute`` as a ``route_name`` parameter: def myview(request): return Response('OK') -THe above combination of ``add_route`` and ``scan`` is completely equivalent +The above combination of ``add_route`` and ``scan`` is completely equivalent to using the previous combination of ``add_route`` and ``add_view``. .. index:: -- cgit v1.2.3 From 88bc1225e5f515e53a6f9d8413441581df191aca Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Mon, 24 Oct 2011 03:42:42 -0500 Subject: garden --- docs/narr/muchadoabouttraversal.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/narr/muchadoabouttraversal.rst b/docs/narr/muchadoabouttraversal.rst index a948e57cc..4a249ed0d 100644 --- a/docs/narr/muchadoabouttraversal.rst +++ b/docs/narr/muchadoabouttraversal.rst @@ -4,7 +4,9 @@ Much Ado About Traversal ======================== -.. note:: This chapter was adapted, with permission, from a blog post by `Rob +.. note:: + + This chapter was adapted, with permission, from a blog post by `Rob Miller `_, originally published at http://blog.nonsequitarian.org/2010/much-ado-about-traversal/ . -- cgit v1.2.3 From 1f8135d0ef11ea145952e8412241129318735e36 Mon Sep 17 00:00:00 2001 From: Atsushi Odagiri Date: Mon, 24 Oct 2011 06:17:54 -0700 Subject: fix for #321 --- pyramid/config/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyramid/config/views.py b/pyramid/config/views.py index 179d4065c..9b277dafb 100644 --- a/pyramid/config/views.py +++ b/pyramid/config/views.py @@ -481,7 +481,7 @@ class MultiView(object): if accept is None or '*' in accept: self.views.append((order, view, phash)) - self.views.sort() + self.views.sort(key=lambda x: x[0]) else: subset = self.media_views.setdefault(accept, []) subset.append((order, view, phash)) -- cgit v1.2.3 From e980bac6aa7715c11b8a618c7486fe9331251103 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Mon, 24 Oct 2011 09:42:02 -0500 Subject: garden --- docs/narr/i18n.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst index 631654d32..c5e6a9062 100644 --- a/docs/narr/i18n.rst +++ b/docs/narr/i18n.rst @@ -249,7 +249,7 @@ GNU gettext uses three types of files in the translation framework, The tools for working with :term:`gettext` translation files related to a :app:`Pyramid` application is :term:`Babel` and :term:`Lingua`. Lingua is a -Balel extension that provides support for scraping i18n references out of +Babel extension that provides support for scraping i18n references out of Python and Chameleon files. .. index:: -- cgit v1.2.3