summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt11
-rw-r--r--docs/api/config.rst1
-rw-r--r--docs/narr/advconfig.rst1
-rw-r--r--pyramid/config/factories.py7
4 files changed, 10 insertions, 10 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index b2f37355b..a9dd18985 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -108,9 +108,8 @@ Features
Deprecations
------------
-- The documentation for
- ``pyramid.config.Configurator.set_request_property`` has been removed.
- The method remains usable but the more featureful
- ``pyramid.config.Configurator.set_request_method`` should be used in its
- place. It has all of the same capabilities but can also extend the
- request object with methods.
+- The ``pyramid.config.Configurator.set_request_property`` has been
+ documentation-deprecated. The method remains usable but the more
+ featureful ``pyramid.config.Configurator.set_request_method`` should be
+ used in its place (it has all of the same capabilities but can also extend
+ the request object with methods).
diff --git a/docs/api/config.rst b/docs/api/config.rst
index 8dbe6de91..028a55d4b 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -41,6 +41,7 @@
:methodcategory:`Extending the Request Object`
.. automethod:: set_request_method
+ .. automethod:: set_request_property
:methodcategory:`Using I18N`
diff --git a/docs/narr/advconfig.rst b/docs/narr/advconfig.rst
index 0ad2fdc95..b1ea652d6 100644
--- a/docs/narr/advconfig.rst
+++ b/docs/narr/advconfig.rst
@@ -297,6 +297,7 @@ These are the methods of the configurator which provide conflict detection:
:meth:`~pyramid.config.Configurator.set_request_factory`,
:meth:`~pyramid.config.Configurator.set_session_factory`,
:meth:`~pyramid.config.Configurator.set_request_method`,
+:meth:`~pyramid.config.Configurator.set_request_property`,
:meth:`~pyramid.config.Configurator.set_root_factory`,
:meth:`~pyramid.config.Configurator.set_view_mapper`,
:meth:`~pyramid.config.Configurator.set_authentication_policy`,
diff --git a/pyramid/config/factories.py b/pyramid/config/factories.py
index e3637cbd2..e8043ed28 100644
--- a/pyramid/config/factories.py
+++ b/pyramid/config/factories.py
@@ -186,10 +186,9 @@ class FactoriesConfiguratorMixin(object):
.. warning::
- This method has been replaced by
- :meth:`pyramid.config.Configurator.set_request_method` in
- version :app:`Pyramid` version 1.4, more details can be found
- there.
+ This method has been deprecated as of Pyramid 1.4.
+ :meth:`pyramid.config.Configurator.set_request_method` should be
+ used instead.
.. versionadded:: 1.3
"""