Merge "c-free" branch to trunk.

1 files changed, 5 insertions, 9 deletions

diff --git a/repoze/bfg/template.py b/repoze/bfg/template.py
index 68a7f34d1..ad6d50a44 100644
--- a/repoze/bfg/template.py
+++ b/repoze/bfg/template.py
@@ -2,23 +2,19 @@
 # compatibility; there are no plans to make this module itself go
 # away, but the ``get_template``, ``render_template``, and
 # ``render_template_to_response`` APIs should be imported from
-# ``repoze.bfg.chameleon_zpt`` in the future for optimum correctness,
-# while the ``render_transform`` and ``render_transform_to_response``
-# APIs should be imported from ``repoze.bfg.xslt``.
+# ``repoze.bfg.chameleon_zpt`` in the future for optimum correctness.
+# Two other functions named ``render_transform`` and
+# ``render_transform_to_response`` APIs used to be here for XSLT
+# support; those no longer exist here; you need to install and use the
+# ``repoze.bfg.xslt`` package.
 from zope.deprecation import deprecated
 
 from repoze.bfg.chameleon_zpt import get_template
 from repoze.bfg.chameleon_zpt import render_template
 from repoze.bfg.chameleon_zpt import render_template_to_response
-from repoze.bfg.xslt import render_transform
-from repoze.bfg.xslt import render_transform_to_response
 
 for name in ('get_template', 'render_template', 'render_template_to_response'):
     deprecated(name,
                ('repoze.bfg.template.%s should now be imported as '
                 'repoze.bfg.chameleon_zpt.%s' % (name, name)))
 
-for name in ('render_transform', 'render_transform_to_response'):
-    deprecated(name,
-               ('repoze.bfg.template.%s should now be imported as '
-                'repoze.bfg.xslt.%s' % (name, name)))