summaryrefslogtreecommitdiff
path: root/docs/narr/muchadoabouttraversal.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-10 20:20:05 -0400
committerChris McDonough <chrism@plope.com>2011-08-10 20:20:05 -0400
commit995466c6bc0da04f50d2db83af653362a0dadd6f (patch)
treee5e57108a3d751d9e02cbf06ad5eca8902f4a100 /docs/narr/muchadoabouttraversal.rst
parent9a8ba2f09fe3791febbfec2ac383c091aacfbf5b (diff)
parent3e3fcdf1376218a4fa6dcffec4f27a41c63d1675 (diff)
downloadpyramid-995466c6bc0da04f50d2db83af653362a0dadd6f.tar.gz
pyramid-995466c6bc0da04f50d2db83af653362a0dadd6f.tar.bz2
pyramid-995466c6bc0da04f50d2db83af653362a0dadd6f.zip
fix merge conflicts
Diffstat (limited to 'docs/narr/muchadoabouttraversal.rst')
-rw-r--r--docs/narr/muchadoabouttraversal.rst15
1 files changed, 12 insertions, 3 deletions
diff --git a/docs/narr/muchadoabouttraversal.rst b/docs/narr/muchadoabouttraversal.rst
index a4709ef18..6ad33c1ce 100644
--- a/docs/narr/muchadoabouttraversal.rst
+++ b/docs/narr/muchadoabouttraversal.rst
@@ -39,6 +39,9 @@ web developer so you know when you might want to use them. :term:`Traversal`
is actually a straightforward metaphor easily comprehended by anyone who's
ever used a run-of-the-mill file system with folders and files.
+.. index::
+ single: URL dispatch
+
URL Dispatch
------------
@@ -100,12 +103,12 @@ from this process to the client as the final result. The server
configuration specified which files would trigger some dynamic code, with the
default case being to just serve the static file.
+.. index::
+ single: traversal
+
Traversal (aka Resource Location)
---------------------------------
-.. index::
- single: traversal overview
-
Believe it or not, if you understand how serving files from a file system
works, you understand traversal. And if you understand that a server might do
something different based on what type of file a given request specifies,
@@ -141,6 +144,9 @@ generated anywhere along the way, :app:`Pyramid` will return 404. (This
isn't precisely true, as you'll see when we learn about view lookup below,
but the basic idea holds.)
+.. index::
+ single: resource
+
What Is a "Resource"?
---------------------
@@ -194,6 +200,9 @@ system. Traversal is in fact a superset of file system lookup.
.. note:: See the chapter entitled :ref:`resources_chapter` for a more
technical overview of resources.
+.. index::
+ single: view lookup
+
View Lookup
-----------