summaryrefslogtreecommitdiff
path: root/docs/api/config.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-09-20 14:10:05 -0400
committerChris McDonough <chrism@plope.com>2013-09-20 14:10:05 -0400
commitfaf334d94e8c7450962b6b0d18fe57cefd43f04a (patch)
treebac12a41585561e84b914ede37bcd83a62764fb9 /docs/api/config.rst
parent53e00ae36d969e8f8794549d66f9b1c6b92e0c60 (diff)
parent4d2fc0bbc58bc1948c73b2fcb3e0e1bdeee7a5d6 (diff)
downloadpyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.tar.gz
pyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.tar.bz2
pyramid-faf334d94e8c7450962b6b0d18fe57cefd43f04a.zip
Merge branch 'master' into 1.5-branch
Diffstat (limited to 'docs/api/config.rst')
-rw-r--r--docs/api/config.rst4
1 files changed, 0 insertions, 4 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst
index 1f65be9f1..48dd2f0b9 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -52,10 +52,6 @@
.. automethod:: override_asset(to_override, override_with)
- :methodcategory:`Setting Renderer Globals`
-
- .. automethod:: set_renderer_globals_factory(factory)
-
:methodcategory:`Getting and Adding Settings`
.. automethod:: add_settings