summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2013-01-29 09:00:22 -0800
committerTres Seaver <tseaver@palladion.com>2013-01-29 09:00:22 -0800
commite876ae40cf7eaaa3b1dd174280221d5cd9b2428a (patch)
tree359db3a88b3424be62e0419e4c91a673f0ae804f /docs
parent7bdedc367d82bc619a52413f1e5c444792d15e36 (diff)
parent479447a1ebc231096155290f918f563b884a3432 (diff)
downloadpyramid-e876ae40cf7eaaa3b1dd174280221d5cd9b2428a.tar.gz
pyramid-e876ae40cf7eaaa3b1dd174280221d5cd9b2428a.tar.bz2
pyramid-e876ae40cf7eaaa3b1dd174280221d5cd9b2428a.zip
Merge pull request #828 from tshepang/urldispatch
urldispatch: replace 'note' with the more correct 'versionadded' directive
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/urldispatch.rst9
1 files changed, 3 insertions, 6 deletions
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index ec97bf3b2..749a2d49a 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -758,11 +758,8 @@ 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
- :meth:`~pyramid.config.Configurator.add_route` is new as of :app:`Pyramid`
- 1.1.
+.. versionadded:: 1.1
+ the ``static`` argument to :meth:`~pyramid.config.Configurator.add_route`
.. index::
single: redirecting to slash-appended routes
@@ -906,7 +903,7 @@ routes configured in your application; for more information, see
Using a Route Prefix to Compose Applications
--------------------------------------------
-.. note:: This feature is new as of :app:`Pyramid` 1.2.
+.. versionadded:: 1.2
The :meth:`pyramid.config.Configurator.include` method allows configuration
statements to be included from separate files. See