summaryrefslogtreecommitdiff
path: root/docs/narr/environment.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-05-21 15:32:01 -0400
committerChris McDonough <chrism@plope.com>2013-05-21 15:32:01 -0400
commit1f0106e2debcfc82e17c55385ce9a01985ae458c (patch)
treed51720ba9314c23d0a7e9f5d7a6e9d7f238bf24b /docs/narr/environment.rst
parentd64fa6136d0dec6717b273362de548d8f3bf47e8 (diff)
parentd037a9d47b6dd8fe6da88c6a6e26ceefcfe00fc9 (diff)
downloadpyramid-1f0106e2debcfc82e17c55385ce9a01985ae458c.tar.gz
pyramid-1f0106e2debcfc82e17c55385ce9a01985ae458c.tar.bz2
pyramid-1f0106e2debcfc82e17c55385ce9a01985ae458c.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/environment.rst')
-rw-r--r--docs/narr/environment.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/environment.rst b/docs/narr/environment.rst
index e059acc4e..f0c0c18fe 100644
--- a/docs/narr/environment.rst
+++ b/docs/narr/environment.rst
@@ -302,7 +302,7 @@ Ideally, you won't need to use the ``pyramid.tweens`` setting at all. Tweens
are generally ordered and included "implicitly" when an add-on package which
registers a tween is "included". Packages are included when you name a
``pyramid.includes`` setting in your configuration or when you call
-:meth:`pyramid.config.Configuration.include`.
+:meth:`pyramid.config.Configurator.include`.
Authors of included add-ons provide "implicit" tween configuration ordering
hints to Pyramid when their packages are included. However, the implicit