summaryrefslogtreecommitdiff
path: root/docs/narr/muchadoabouttraversal.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-24 00:19:15 -0700
committerChris McDonough <chrism@plope.com>2011-09-24 00:19:15 -0700
commit50242db18dcafe01c755e22d6d45310bc5f5f9f3 (patch)
treec57c9a9797e29027c027c4eb65ad4735ca7a6214 /docs/narr/muchadoabouttraversal.rst
parentacefa30d7f2329acd545ab479fb983d988972f05 (diff)
parent012b9762cd0b114b6afbf2d6356554b51706804a (diff)
downloadpyramid-50242db18dcafe01c755e22d6d45310bc5f5f9f3.tar.gz
pyramid-50242db18dcafe01c755e22d6d45310bc5f5f9f3.tar.bz2
pyramid-50242db18dcafe01c755e22d6d45310bc5f5f9f3.zip
Merge pull request #285 from michr/012b9762
fix up all the ..note and ..warnings.
Diffstat (limited to 'docs/narr/muchadoabouttraversal.rst')
-rw-r--r--docs/narr/muchadoabouttraversal.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/narr/muchadoabouttraversal.rst b/docs/narr/muchadoabouttraversal.rst
index 6ad33c1ce..a948e57cc 100644
--- a/docs/narr/muchadoabouttraversal.rst
+++ b/docs/narr/muchadoabouttraversal.rst
@@ -313,6 +313,8 @@ don't require it, great: stick with :term:`URL dispatch`. But if you're
using :app:`Pyramid` and you ever find that you *do* need to support one of
these use cases, you'll be glad you have traversal in your toolkit.
-.. note:: It is even possible to mix and match :term:`traversal` with
+.. note::
+
+ It is even possible to mix and match :term:`traversal` with
:term:`URL dispatch` in the same :app:`Pyramid` application. See the
:ref:`hybrid_chapter` chapter for details.