fix some cross-references

6 files changed, 18 insertions, 17 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
diff --git a/docs/whatsnew-1.1.rst b/docs/whatsnew-1.1.rst
index f33fc94ba..25ae54f32 100644
--- a/docs/whatsnew-1.1.rst
+++ b/docs/whatsnew-1.1.rst
@@ -43,7 +43,7 @@ The major feature additions in Pyramid 1.1 are:
 
   The object passed to a view callable as ``request`` is an instance of
   :class:`pyramid.request.Request`. ``request.response`` is an instance of
-  the class :class:`pyramid.request.Response`.  View callables that are
+  the class :class:`pyramid.response.Response`.  View callables that are
   configured with a :term:`renderer` will return this response object to the
   Pyramid router.  Therefore, code in a renderer-using view callable can set
   response attributes such as ``request.response.content_type`` (before they
@@ -289,7 +289,7 @@ Minor Feature Additions
   when you want the static view to behave like the older deprecated version.
 
 - A new api function :func:`pyramid.scripting.prepare` has been added.  It is
-  a lower-level analogue of :func:`pyramid.paster.boostrap` that accepts a
+  a lower-level analogue of :func:`pyramid.paster.bootstrap` that accepts a
   request and a registry instead of a config file argument, and is used for
   the same purpose:
 
@@ -313,7 +313,7 @@ Minor Feature Additions
 
 - New API attribute :attr:`pyramid.config.global_registries` is an iterable
   object that contains references to every Pyramid registry loaded into the
-  current process via :meth:`pyramid.config.Configurator.make_app`.  It also
+  current process via :meth:`pyramid.config.Configurator.make_wsgi_app`.  It also
   has a ``last`` attribute containing the last registry loaded.  This is used
   by the scripting machinery, and is available for introspection.
 
diff --git a/docs/whatsnew-1.2.rst b/docs/whatsnew-1.2.rst
index ea56cf52d..c5a83a441 100644
--- a/docs/whatsnew-1.2.rst
+++ b/docs/whatsnew-1.2.rst
@@ -160,7 +160,7 @@ Minor Feature Additions
   a value of ``edit``.
 
 - Support an ``onerror`` keyword argument to
-  :meth:`pyramid.config.Configurator.scan``.  This argument is passed to
+  :meth:`pyramid.config.Configurator.scan`.  This argument is passed to
   :meth:`venusian.Scanner.scan` to influence error behavior when an exception
   is raised during scanning.
 
diff --git a/docs/whatsnew-1.4.rst b/docs/whatsnew-1.4.rst
index f725615f3..505b9d798 100644
--- a/docs/whatsnew-1.4.rst
+++ b/docs/whatsnew-1.4.rst
@@ -184,11 +184,12 @@ Minor Feature Additions
   returns the policy object it creates.
 
 - The DummySecurityPolicy created by
-  :meth:`pyramid.config.testing_securitypolicy` now sets a ``forgotten`` value 
-  on the policy (the value ``True``) when its ``forget`` method is called.
+  :meth:`pyramid.config.Configurator.testing_securitypolicy` now sets a
+  ``forgotten`` value  on the policy (the value ``True``) when its ``forget``
+  method is called.
 
 - The DummySecurityPolicy created by
-  :meth:`pyramid.config.testing_securitypolicy` now sets a
+  :meth:`pyramid.config.Configurator.testing_securitypolicy` now sets a
   ``remembered`` value on the policy, which is the value of the ``principal``
   argument it's called with when its ``remember`` method is called.
 
@@ -301,7 +302,7 @@ Backwards Incompatibilities
     :meth:`pyramid.config.Configurator.testing_add_subscriber` instead.
 
   * ``registerTemplateRenderer`` (aka ``registerDummyRenderer``), use
-    :meth:`pyramid.config.Configurator.testing_add_template` instead.
+    :meth:`pyramid.config.Configurator.testing_add_renderer` instead.
 
   * ``registerView``, use :meth:`pyramid.config.Configurator.add_view` instead.