diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-19 10:02:21 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-19 10:02:21 -0500 |
| commit | b6b99c90efb438d8e0cc523c84f63707f8a28c69 (patch) | |
| tree | ad43264bfc61c2b6b36306515abf517908ee2e7c /docs | |
| parent | 97d7195cfd6f7022b7515df180c97180855fe217 (diff) | |
| parent | f546c3f4aa6e1796dbf6ae2bca05ed779cbe6b67 (diff) | |
| download | pyramid-b6b99c90efb438d8e0cc523c84f63707f8a28c69.tar.gz pyramid-b6b99c90efb438d8e0cc523c84f63707f8a28c69.tar.bz2 pyramid-b6b99c90efb438d8e0cc523c84f63707f8a28c69.zip | |
Merge branch 'jahmad-resource_location'
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/narr/firstapp.rst | 2 | ||||
| -rw-r--r-- | docs/narr/router.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/firstapp.rst b/docs/narr/firstapp.rst index 8f166a403..88c8b5228 100644 --- a/docs/narr/firstapp.rst +++ b/docs/narr/firstapp.rst @@ -10,7 +10,7 @@ more detail how it works. .. note:: If you're a "theory-first" kind of person, you might choose to read - :ref:`contextfinding_chapter` and :ref:`views_chapter` before diving into + :ref:`resourcelocation_chapter` and :ref:`views_chapter` before diving into the code that follows, but it's not necessary if -- like many programmers -- you're willing to "go with the flow". diff --git a/docs/narr/router.rst b/docs/narr/router.rst index b106d02db..d3d5bd370 100644 --- a/docs/narr/router.rst +++ b/docs/narr/router.rst @@ -133,6 +133,6 @@ processing? This is a very high-level overview that leaves out various details. For more detail about subsystems invoked by the :app:`Pyramid` router such as traversal, URL dispatch, views, and event processing, see -:ref:`contextfinding_chapter`, :ref:`views_chapter`, and +:ref:`resourcelocation_chapter`, :ref:`views_chapter`, and :ref:`events_chapter`. |