diff options
| author | Chris McDonough <chrism@plope.com> | 2012-02-07 20:18:47 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-02-07 20:18:47 -0500 |
| commit | 89eeb971cdc0d499015a39300ff8662b0f31f0e5 (patch) | |
| tree | 93b19aab92368cac99bf591f3bcea0107f7e17b3 /docs | |
| parent | f4952ee0d30eeb67976684d6422f5db05d9f5264 (diff) | |
| parent | 1ceae4adac7c050e955778c71b3680edb9a3cb8c (diff) | |
| download | pyramid-89eeb971cdc0d499015a39300ff8662b0f31f0e5.tar.gz pyramid-89eeb971cdc0d499015a39300ff8662b0f31f0e5.tar.bz2 pyramid-89eeb971cdc0d499015a39300ff8662b0f31f0e5.zip | |
Merge branch '1.3-branch' of github.com:Pylons/pyramid into 1.3-branch
Diffstat (limited to 'docs')
| -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 dfa4e629d..a7bf74786 100644 --- a/docs/narr/urldispatch.rst +++ b/docs/narr/urldispatch.rst @@ -340,7 +340,7 @@ The above pattern will match these URLs, generating the following matchdicts: .. code-block:: text - foo/1/2/ -> {'baz':u'1', 'bar':u'2', 'fizzle':()} + foo/1/2/ -> {'baz':u'1', 'bar':u'2', 'fizzle':u''} foo/abc/def/a/b/c -> {'baz':u'abc', 'bar':u'def', 'fizzle': u'a/b/c'} This occurs because the default regular expression for a marker is ``[^/]+`` |
