summaryrefslogtreecommitdiff
path: root/docs/zcml
diff options
context:
space:
mode:
authorCasey Duncan <casey.duncan@gmail.com>2010-11-22 17:12:13 -0700
committerCasey Duncan <casey.duncan@gmail.com>2010-11-22 17:12:13 -0700
commit51bed35bfb3bb862034514da257a348e33d53860 (patch)
tree2f4a770510c71872cb42dc943f5a0fae7fdb03c9 /docs/zcml
parent18fc334f0fb0b3f8925f415031a87016ce574320 (diff)
parenteba45fd998b68d72b6e11f5b0bfa86d0ab17ee43 (diff)
downloadpyramid-51bed35bfb3bb862034514da257a348e33d53860.tar.gz
pyramid-51bed35bfb3bb862034514da257a348e33d53860.tar.bz2
pyramid-51bed35bfb3bb862034514da257a348e33d53860.zip
Merge https://github.com/Pylons/pyramid
Diffstat (limited to 'docs/zcml')
-rw-r--r--docs/zcml/route.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/zcml/route.rst b/docs/zcml/route.rst
index ed849e3c1..c3bec72df 100644
--- a/docs/zcml/route.rst
+++ b/docs/zcml/route.rst
@@ -10,7 +10,7 @@ Attributes
~~~~~~~~~~
``pattern``
- The pattern of the route e.g. ``ideas/:idea``. This attribute is
+ The pattern of the route e.g. ``ideas/{idea}``. This attribute is
required. See :ref:`route_pattern_syntax` for information
about the syntax of route patterns.
@@ -51,9 +51,9 @@ Attributes
The syntax of the ``traverse`` argument is the same as it is for
``pattern``. For example, if the ``pattern`` provided to the
- ``route`` directive is ``articles/:article/edit``, and the
+ ``route`` directive is ``articles/{article}/edit``, and the
``traverse`` argument provided to the ``route`` directive is
- ``/:article``, when a request comes in that causes the route to
+ ``/{article}``, when a request comes in that causes the route to
match in such a way that the ``article`` match value is '1' (when
the request URI is ``/articles/1/edit``), the traversal path will be
generated as ``/1``. This means that the root object's