summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-07-18 03:01:17 -0400
committerChris McDonough <chrism@plope.com>2011-07-18 03:01:17 -0400
commita7c6f13c3499d8453e2248104032e843780bfffd (patch)
treef7f12c93f504171f08f358413341792710f81fca
parent40c643e07e1a5eeb48e86070cd0ffbd998899669 (diff)
parentd313525a3eb10db14fc5f6596f24260580bbef41 (diff)
downloadpyramid-a7c6f13c3499d8453e2248104032e843780bfffd.tar.gz
pyramid-a7c6f13c3499d8453e2248104032e843780bfffd.tar.bz2
pyramid-a7c6f13c3499d8453e2248104032e843780bfffd.zip
Merge branch 'master' of github.com:Pylons/pyramid
-rw-r--r--pyramid/url.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pyramid/url.py b/pyramid/url.py
index 2a6fda89a..548d5e9d9 100644
--- a/pyramid/url.py
+++ b/pyramid/url.py
@@ -404,7 +404,7 @@ def current_route_url(request, *elements, **kw):
``/foo/1``.
If the 'current route' has the route pattern ``/foo/{page}`` and the
- current current url path is ``/foo/1``, the matchdict will be
+ current url path is ``/foo/1``, the matchdict will be
``{'page':'1'}``. The result of ``current_route_url(request, page='2')``
in this situation will be ``/foo/2``.