summaryrefslogtreecommitdiff
path: root/docs/whatsnew-1.1.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/whatsnew-1.1.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/whatsnew-1.1.rst')
-rw-r--r--docs/whatsnew-1.1.rst9
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/whatsnew-1.1.rst b/docs/whatsnew-1.1.rst
index cc63017df..086c12ca2 100644
--- a/docs/whatsnew-1.1.rst
+++ b/docs/whatsnew-1.1.rst
@@ -540,11 +540,10 @@ Deprecations and Behavior Differences
within a static view returns the index.html properly. See also
https://github.com/Pylons/pyramid/issues/67.
-- Deprecated the
- :meth:`pyramid.config.Configurator.set_renderer_globals_factory` method and
- the ``renderer_globals`` Configurator constructor parameter. Users should
- convert code using this feature to use a BeforeRender event. See the section
- :ref:`beforerender_event` in the Hooks chapter.
+- Deprecated the ``pyramid.config.Configurator.set_renderer_globals_factory``
+ method and the ``renderer_globals`` Configurator constructor parameter.
+ Users should convert code using this feature to use a BeforeRender event. See
+ the section :ref:`beforerender_event` in the Hooks chapter.
- In Pyramid 1.0, the :class:`pyramid.events.subscriber` directive behaved
contrary to the documentation when passed more than one interface object to