diff options
| author | Chris McDonough <chrism@plope.com> | 2011-09-24 03:56:48 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-09-24 03:56:48 -0400 |
| commit | 4937d9e5280fff849b346dcf6c1833ef6fe95119 (patch) | |
| tree | 69fe13b7853a3da419b03a7987e92e43753b65b5 /docs/narr/muchadoabouttraversal.rst | |
| parent | bfb71c175bb5de7a0c22599979d269d92f12ed27 (diff) | |
| parent | 9a784a4c94946872c493627e4295a26a3e608439 (diff) | |
| download | pyramid-4937d9e5280fff849b346dcf6c1833ef6fe95119.tar.gz pyramid-4937d9e5280fff849b346dcf6c1833ef6fe95119.tar.bz2 pyramid-4937d9e5280fff849b346dcf6c1833ef6fe95119.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/muchadoabouttraversal.rst')
| -rw-r--r-- | docs/narr/muchadoabouttraversal.rst | 4 |
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. |