summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt4
-rw-r--r--docs/api/config.rst2
-rw-r--r--docs/narr/hooks.rst6
-rw-r--r--pyramid/config.py2
4 files changed, 10 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 8235f53a5..0bd19572a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,6 +21,10 @@ Documentation
- Render the function definitions for each exposed interface in
``pyramid.interfaces``.
+- Add missing docs reference to
+ ``pyramid.config.Configurator.set_view_mapper`` and refer to it within
+ Hooks chapter section named "Using a View Mapper".
+
Features
--------
diff --git a/docs/api/config.rst b/docs/api/config.rst
index 38f809c7e..2b9d7bcef 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -74,6 +74,8 @@
.. automethod:: set_renderer_globals_factory
+ .. automethod:: set_view_mapper
+
.. automethod:: testing_securitypolicy
.. automethod:: testing_resources
diff --git a/docs/narr/hooks.rst b/docs/narr/hooks.rst
index 227db2f0f..7e3fe0a5c 100644
--- a/docs/narr/hooks.rst
+++ b/docs/narr/hooks.rst
@@ -606,9 +606,9 @@ A user might make use of these framework components like so:
config.add_handler('two', '/{action}/{id}', MyController)
serve(config.make_wsgi_app())
-The :meth:`pyramid.config.Configurator.set_default_mapper` method can be used
-to set a *default* view mapper (overriding the superdefault view mapper used
-by Pyramid itself).
+The :meth:`pyramid.config.Configurator.set_view_mapper` method can be used to
+set a *default* view mapper (overriding the superdefault view mapper used by
+Pyramid itself).
A *single* view registration can use a view mapper by passing the mapper as
the ``mapper`` argument to :meth:`~pyramid.config.Configuration.add_view`.
diff --git a/pyramid/config.py b/pyramid/config.py
index 11a639286..f412f703d 100644
--- a/pyramid/config.py
+++ b/pyramid/config.py
@@ -2085,7 +2085,7 @@ class Configurator(object):
if you had passed a ``default_view_mapper`` argument to the
:class:`pyramid.config.Configurator` constructor.
- See also :ref:`using_an_alternate_view_mapper`.
+ See also :ref:`using_a_view_mapper`.
"""
mapper = self.maybe_dotted(mapper)
self.registry.registerUtility(mapper, IViewMapperFactory)