summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-02-14 04:13:58 -0500
committerChris McDonough <chrism@plope.com>2012-02-14 04:13:58 -0500
commit9ed1e0ba957c36f6ae29c25ffeaa6c2c02f716a9 (patch)
treed5df37904835cfaac437acaf8d886fdb7c2072ce /docs/narr
parentc08f7656c1427cf5ebacf18356a5f55bd20ecfbd (diff)
parentaf24f7d5f69a74f9887ca6df622ef67c69075988 (diff)
downloadpyramid-9ed1e0ba957c36f6ae29c25ffeaa6c2c02f716a9.tar.gz
pyramid-9ed1e0ba957c36f6ae29c25ffeaa6c2c02f716a9.tar.bz2
pyramid-9ed1e0ba957c36f6ae29c25ffeaa6c2c02f716a9.zip
Merge branch 'wwitzel3-ww/415'
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/project.rst2
-rw-r--r--docs/narr/urldispatch.rst4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index ea0045ca7..d69f0cf13 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -98,7 +98,7 @@ Or on Windows:
.. code-block:: text
- $ Scripts\pcreate alchemy MyProject
+ $ Scripts\pcreate -s alchemy MyProject
Here's sample output from a run of ``pcreate`` on UNIX for a project we name
``MyProject``:
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index 6d9dfdd92..a7bf74786 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -340,8 +340,8 @@ 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/abc/def/a/b/c -> {'baz':u'abc', 'bar':u'def', 'fizzle': u'a/b/c')}
+ 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 ``[^/]+``
which will match everything up to the first ``/``, while ``{fizzle:.*}`` will