summaryrefslogtreecommitdiff
path: root/docs/narr/environment.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-04-23 12:10:16 -0400
committerChris McDonough <chrism@plope.com>2013-04-23 12:10:16 -0400
commit47b8cf7e9b578464b533383083f7135271db0f9e (patch)
tree724c40d50f21773b6585ab7d9731b8bf7a93a71c /docs/narr/environment.rst
parent2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb (diff)
parentdcaabcb87ca584c289efe70a604db0502838df3d (diff)
downloadpyramid-47b8cf7e9b578464b533383083f7135271db0f9e.tar.gz
pyramid-47b8cf7e9b578464b533383083f7135271db0f9e.tar.bz2
pyramid-47b8cf7e9b578464b533383083f7135271db0f9e.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