summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-27 22:02:43 -0500
committerChris McDonough <chrism@plope.com>2011-01-27 22:02:43 -0500
commita47e1921af0f49454c084d2480949b53fd1f3717 (patch)
tree923447fd80280ec2e821576835163496300c41dd
parent483a362102dd727d1bbf80e9279fb317678ae879 (diff)
downloadpyramid-a47e1921af0f49454c084d2480949b53fd1f3717.tar.gz
pyramid-a47e1921af0f49454c084d2480949b53fd1f3717.tar.bz2
pyramid-a47e1921af0f49454c084d2480949b53fd1f3717.zip
fix dangling references
-rw-r--r--docs/narr/security.rst2
-rw-r--r--docs/narr/urldispatch.rst6
-rw-r--r--pyramid/config.py15
3 files changed, 11 insertions, 12 deletions
diff --git a/docs/narr/security.rst b/docs/narr/security.rst
index 8b3427675..61948650e 100644
--- a/docs/narr/security.rst
+++ b/docs/narr/security.rst
@@ -97,7 +97,7 @@ For example:
authorization_policy=authorization_policy)
.. note:: the ``authentication_policy`` and ``authorization_policy``
- arguments may also be passed to the Configurator as :ref:`dotted
+ arguments may also be passed to the Configurator as :term:`dotted
Python name` values, each representing the dotted name path to a
suitable implementation global defined at Python module scope.
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index 2a00697b4..224523a49 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -95,7 +95,7 @@ Route Configuration That Names a View Callable
When a route configuration declaration names a ``view`` attribute, the value
of the attribute will reference a :term:`view callable`. This view callable
will be invoked when the route matches. A view callable, as described in
-:ref:`view_chapter`, is developer-supplied code that "does stuff" as the
+:ref:`views_chapter`, is developer-supplied code that "does stuff" as the
result of a request. For more information about how to create view
callables, see :ref:`views_chapter`.
@@ -492,7 +492,7 @@ neither predicates nor view configuration information.
``pattern``
The path of the route e.g. ``ideas/{idea}``. This argument is required.
- See :ref:`route_path_pattern_syntax` for information about the syntax of
+ See :ref:`route_pattern_syntax` for information about the syntax of
route paths. If the path doesn't match the current URL, route matching
continues.
@@ -1271,7 +1271,7 @@ Displaying All Application Routes
You can use the ``paster proutes`` command in a terminal window to print a
summary of routes related to your application. Much like the ``paster
-pshell`` command (see :ref:`interactive shell`), the ``paster proutes``
+pshell`` command (see :ref:`interactive_shell`), the ``paster proutes``
command accepts two arguments. The first argument to ``proutes`` is the path
to your application's ``.ini`` file. The second is the ``app`` section name
inside the ``.ini`` file which points to your application.
diff --git a/pyramid/config.py b/pyramid/config.py
index 28467caab..f24e0d1f5 100644
--- a/pyramid/config.py
+++ b/pyramid/config.py
@@ -203,14 +203,13 @@ class Configurator(object):
If ``request_factory`` is passed, it should be a :term:`request
factory` implementation or a :term:`dotted Python name` to same.
- See :ref:`custom_request_factory`. By default it is ``None``,
+ See :ref:`changing_the_request_factory`. By default it is ``None``,
which means use the default request factory.
- If ``renderer_globals_factory`` is passed, it should be a
- :term:`renderer globals` factory implementation or a :term:`dotted
- Python name` to same. See :ref:`custom_renderer_globals_factory`.
- By default, it is ``None``, which means use no renderer globals
- factory.
+ If ``renderer_globals_factory`` is passed, it should be a :term:`renderer
+ globals` factory implementation or a :term:`dotted Python name` to same.
+ See :ref:`adding_renderer_globals`. By default, it is ``None``, which
+ means use no renderer globals factory.
If ``default_permission`` is passed, it should be a
:term:`permission` string to be used as the default permission for
@@ -1504,7 +1503,7 @@ class Configurator(object):
pattern
The pattern of the route e.g. ``ideas/{idea}``. This
- argument is required. See :ref:`route_path_pattern_syntax`
+ argument is required. See :ref:`route_pattern_syntax`
for information about the syntax of route patterns. If the
pattern doesn't match the current URL, route matching
continues.
@@ -1792,7 +1791,7 @@ class Configurator(object):
an extremely advanced usage. By default, ``categories`` is ``None``
which will execute *all* Venusian decorator callbacks including
:app:`Pyramid`-related decorators such as
- :class:`pyramid.view.view_config`. See the :ref:`Venusian`
+ :class:`pyramid.view.view_config`. See the :term:`Venusian`
documentation for more information about limiting a scan by using an
explicit set of categories.
"""