diff options
| author | Chris McDonough <chrism@plope.com> | 2011-01-27 00:21:04 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-01-27 00:21:04 -0500 |
| commit | 0417a1142fa10739add621cb86275aea46baa51c (patch) | |
| tree | a582ae593847dcadab13d1a083b536cdda70e96f | |
| parent | 6ab71c68f61979891f696d68b124b378e477a76f (diff) | |
| parent | 2a17f520cb2e1428266dff5ff04a6f3a935e0296 (diff) | |
| download | pyramid-0417a1142fa10739add621cb86275aea46baa51c.tar.gz pyramid-0417a1142fa10739add621cb86275aea46baa51c.tar.bz2 pyramid-0417a1142fa10739add621cb86275aea46baa51c.zip | |
Merge branch 'michr-master'
| -rw-r--r-- | docs/narr/urldispatch.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst index 8b127924b..2a00697b4 100644 --- a/docs/narr/urldispatch.rst +++ b/docs/narr/urldispatch.rst @@ -84,7 +84,7 @@ example: .. versionchanged:: 1.0a4 Prior to 1.0a4, routes allow for a marker starting with a ``:``, for example ``/prefix/:one/:two``. This style is now deprecated - in favor or ``{}`` usage which allows for additional functionality. + in favor of ``{}`` usage which allows for additional functionality. .. index:: single: route configuration; view callable |