summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-03 00:10:51 -0500
committerChris McDonough <chrism@plope.com>2011-01-03 00:10:51 -0500
commit1977829f09ec0ce4ead4ed804a3705c2c01c5c74 (patch)
tree7c2ce4e0d07c7f158076f45f356d8c90ee9a22bb /docs
parent57dfcc7fc921db2dd1ad7fb702682718a4cdd3dd (diff)
parente874b2b4fb9ca973eed1f019162c917750088f58 (diff)
downloadpyramid-1977829f09ec0ce4ead4ed804a3705c2c01c5c74.tar.gz
pyramid-1977829f09ec0ce4ead4ed804a3705c2c01c5c74.tar.bz2
pyramid-1977829f09ec0ce4ead4ed804a3705c2c01c5c74.zip
Merge branch 'master' of https://github.com/jahmad/pyramid into jahmad-master
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst2
-rw-r--r--docs/zcml/handler.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 4d0c53d60..5deb9f5c6 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -834,7 +834,7 @@ Glossary
:meth:`pyramid.config.Configurator.add_route` and
:meth:`pyramid.config.Configurator.add_view` to make it more
convenient to register a collection of views as a single class when
- using :term:`url dispatch`. See also :ref:`handlers_chapter`.
+ using :term:`url dispatch`. See also :ref:`views_chapter`.
Deployment settings
Deployment settings are settings passed to the :term:`Configurator` as a
diff --git a/docs/zcml/handler.rst b/docs/zcml/handler.rst
index 01d442ab6..64aac7e78 100644
--- a/docs/zcml/handler.rst
+++ b/docs/zcml/handler.rst
@@ -155,4 +155,4 @@ You can also add a :term:`route configuration` via:
See Also
~~~~~~~~
-See also :ref:`handlers_chapter`.
+See also :ref:`views_chapter`.