summaryrefslogtreecommitdiff
path: root/docs/narr/urldispatch.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-24 03:56:48 -0400
committerChris McDonough <chrism@plope.com>2011-09-24 03:56:48 -0400
commit4937d9e5280fff849b346dcf6c1833ef6fe95119 (patch)
tree69fe13b7853a3da419b03a7987e92e43753b65b5 /docs/narr/urldispatch.rst
parentbfb71c175bb5de7a0c22599979d269d92f12ed27 (diff)
parent9a784a4c94946872c493627e4295a26a3e608439 (diff)
downloadpyramid-4937d9e5280fff849b346dcf6c1833ef6fe95119.tar.gz
pyramid-4937d9e5280fff849b346dcf6c1833ef6fe95119.tar.bz2
pyramid-4937d9e5280fff849b346dcf6c1833ef6fe95119.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/urldispatch.rst')
-rw-r--r--docs/narr/urldispatch.rst12
1 files changed, 9 insertions, 3 deletions
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index a6e46515f..9d5229c70 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -353,7 +353,9 @@ process. Examples of route predicate arguments are ``pattern``, ``xhr``, and
Other arguments are ``name`` and ``factory``. These arguments represent
neither predicates nor view configuration information.
-.. warning:: Some arguments are view-configuration related arguments, such as
+.. warning::
+
+ Some arguments are view-configuration related arguments, such as
``view_renderer``. These only have an effect when the route configuration
names a ``view`` and these arguments have been deprecated as of
:app:`Pyramid` 1.1.
@@ -646,7 +648,9 @@ other non-``name`` and non-``pattern`` arguments to
exception to this rule is use of the ``pregenerator`` argument, which is not
ignored when ``static`` is ``True``.
-.. note:: the ``static`` argument to
+.. note::
+
+ the ``static`` argument to
:meth:`~pyramid.config.Configurator.add_route` is new as of :app:`Pyramid`
1.1.
@@ -1098,7 +1102,9 @@ permission. Obviously you can do more generic things than inspect the routes
match dict to see if the ``article`` argument matches a particular string;
our sample ``Article`` factory class is not very ambitious.
-.. note:: See :ref:`security_chapter` for more information about
+.. note::
+
+ See :ref:`security_chapter` for more information about
:app:`Pyramid` security and ACLs.
.. index::