summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2013-04-01 07:57:08 -0700
committerMichael Merickel <michael@merickel.org>2013-04-01 07:57:08 -0700
commit75a3d11316fa2ab98afd1d8ac68d2f672b7ac871 (patch)
tree756cb48b8bd607cdfbaa58fba884d31a7c857d7a /docs/narr
parent710c04d2260827a96e5061930bd3196a4a9aa912 (diff)
parent50218d2d443c8773af3f2312fd0df095f993d4a9 (diff)
downloadpyramid-75a3d11316fa2ab98afd1d8ac68d2f672b7ac871.tar.gz
pyramid-75a3d11316fa2ab98afd1d8ac68d2f672b7ac871.tar.bz2
pyramid-75a3d11316fa2ab98afd1d8ac68d2f672b7ac871.zip
Merge pull request #962 from tshepang/refs
fix some cross-references
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/traversal.rst14
-rw-r--r--docs/narr/views.rst2
-rw-r--r--docs/narr/zca.rst2
3 files changed, 9 insertions, 9 deletions
diff --git a/docs/narr/traversal.rst b/docs/narr/traversal.rst
index a2eac61de..2eb6ece13 100644
--- a/docs/narr/traversal.rst
+++ b/docs/narr/traversal.rst
@@ -359,13 +359,13 @@ when this request comes in that we're traversing the following resource tree:
Here's what happens:
-- :mod:`traversal` traverses the root, and attempts to find "foo", which it
+- :term:`traversal` traverses the root, and attempts to find "foo", which it
finds.
-- :mod:`traversal` traverses "foo", and attempts to find "bar", which it
+- :term:`traversal` traverses "foo", and attempts to find "bar", which it
finds.
-- :mod:`traversal` traverses "bar", and attempts to find "baz", which it does
+- :term:`traversal` traverses "bar", and attempts to find "baz", which it does
not find (the "bar" resource raises a :exc:`KeyError` when asked for
"baz").
@@ -410,16 +410,16 @@ However, for this tree:
The user asks for ``http://example.com/foo/bar/baz/biz/buz.txt``
-- :mod:`traversal` traverses "foo", and attempts to find "bar", which it
+- :term:`traversal` traverses "foo", and attempts to find "bar", which it
finds.
-- :mod:`traversal` traverses "bar", and attempts to find "baz", which it
+- :term:`traversal` traverses "bar", and attempts to find "baz", which it
finds.
-- :mod:`traversal` traverses "baz", and attempts to find "biz", which it
+- :term:`traversal` traverses "baz", and attempts to find "biz", which it
finds.
-- :mod:`traversal` traverses "biz", and attempts to find "buz.txt" which it
+- :term:`traversal` traverses "biz", and attempts to find "buz.txt" which it
does not find.
The fact that it does not find a resource related to "buz.txt" at this point
diff --git a/docs/narr/views.rst b/docs/narr/views.rst
index 5a7be15b0..b2dd549ce 100644
--- a/docs/narr/views.rst
+++ b/docs/narr/views.rst
@@ -39,7 +39,7 @@ object. A request object represents a :term:`WSGI` environment provided to
object contains everything your application needs to know about the specific
HTTP request being made.
-A view callable's ultimate responsibility is to create a :mod:`Pyramid`
+A view callable's ultimate responsibility is to create a :app:`Pyramid`
:term:`Response` object. This can be done by creating a :term:`Response`
object in the view callable code and returning it directly or by raising
special kinds of exceptions from within the body of a view callable.
diff --git a/docs/narr/zca.rst b/docs/narr/zca.rst
index 5499cf4a5..7e36ba030 100644
--- a/docs/narr/zca.rst
+++ b/docs/narr/zca.rst
@@ -44,7 +44,7 @@ framework implementation detail.
However, developers who are already used to writing :term:`Zope`
applications often still wish to use the ZCA while building a
-:app:`Pyramid` application; :mod:`pyramid` makes this possible.
+:app:`Pyramid` application; :app:`Pyramid` makes this possible.
.. index::
single: get_current_registry