summaryrefslogtreecommitdiff
path: root/docs/narr/traversal.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-08 00:17:29 -0500
committerChris McDonough <chrism@plope.com>2011-01-08 00:17:29 -0500
commit134c5cb12490ff357e5ee0917c42a87140249a04 (patch)
treeb606219aeb0ae605e3768852827269bf81bda51e /docs/narr/traversal.rst
parent14f863d9b5c323303155c79901f22c5d0e1dbe69 (diff)
parentf7f0dd818138f3a4284fe1614a66dc121c9da86c (diff)
downloadpyramid-134c5cb12490ff357e5ee0917c42a87140249a04.tar.gz
pyramid-134c5cb12490ff357e5ee0917c42a87140249a04.tar.bz2
pyramid-134c5cb12490ff357e5ee0917c42a87140249a04.zip
Merge branch 'caseman-master'
Diffstat (limited to 'docs/narr/traversal.rst')
-rw-r--r--docs/narr/traversal.rst19
1 files changed, 10 insertions, 9 deletions
diff --git a/docs/narr/traversal.rst b/docs/narr/traversal.rst
index 0b0bb1d3e..7c6280ba1 100644
--- a/docs/narr/traversal.rst
+++ b/docs/narr/traversal.rst
@@ -83,7 +83,7 @@ name` is the empty string (`''`).
The combination of the context resource and the :term:`view name` found
via traversal is used later in the same request by the :term:`view
lookup` subsystem to find a :term:`view callable`. How :app:`Pyramid`
-performs view lookup is explained within the :ref:`views_chapter`
+performs view lookup is explained within the :ref:`view_config_chapter`
chapter.
.. index::
@@ -217,13 +217,14 @@ We'll provide a description of the algorithm, a diagram of how the algorithm
works, and some example traversal scenarios that might help you understand
how the algorithm operates against a specific resource tree.
-We'll also talk a bit about :term:`view lookup`. The :ref:`views_chapter`
-chapter discusses :term:`view lookup` in detail, and it is the canonical
-source for information about views. Technically, :term:`view lookup` is a
-:app:`Pyramid` subsystem that is separated from traversal entirely. However,
-we'll describe the fundamental behavior of view lookup in the examples in the
-next few sections to give you an idea of how traversal and view lookup
-cooperate, because they are almost always used together.
+We'll also talk a bit about :term:`view lookup`. The
+:ref:`view_config_chapter` chapter discusses :term:`view lookup` in
+detail, and it is the canonical source for information about views.
+Technically, :term:`view lookup` is a :app:`Pyramid` subsystem that is
+separated from traversal entirely. However, we'll describe the
+fundamental behavior of view lookup in the examples in the next few
+sections to give you an idea of how traversal and view lookup cooperate,
+because they are almost always used together.
.. index::
single: view name
@@ -461,7 +462,7 @@ References
A tutorial showing how :term:`traversal` can be used within a :app:`Pyramid`
application exists in :ref:`bfg_wiki_tutorial`.
-See the :ref:`views_chapter` chapter for detailed information about
+See the :ref:`view_config_chapter` chapter for detailed information about
:term:`view lookup`.
The :mod:`pyramid.traversal` module contains API functions that deal with