summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/api/config.rst1
-rw-r--r--docs/whatsnew-1.10.rst4
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst
index b2cd53a68..eda0012ba 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -61,6 +61,7 @@
:methodcategory:`Hooking Pyramid Behavior`
+ .. automethod:: add_accept_view_order
.. automethod:: add_renderer
.. automethod:: add_resource_url_adapter
.. automethod:: add_response_adapter
diff --git a/docs/whatsnew-1.10.rst b/docs/whatsnew-1.10.rst
index 2cba4b5d4..68a434493 100644
--- a/docs/whatsnew-1.10.rst
+++ b/docs/whatsnew-1.10.rst
@@ -26,7 +26,7 @@ Feature Additions
See https://github.com/Pylons/pyramid/pull/3326
- Added :class:`pyramid.session.JSONSerializer`.
- See "Upcoming Changes to ISession in Pyramid 2.0" in the "Sessions" chapter of the documentation for more information about this feature.
+ See :ref:`pickle_session_deprecation` for more information about this feature.
See https://github.com/Pylons/pyramid/pull/3353
- Modify the builtin session implementations to support ``SameSite`` options on cookies and set the default to ``'Lax'``.
@@ -69,7 +69,7 @@ Feature Additions
Deprecations
------------
-- The :class:`pyramid.intefaces.ISession` interface will move to require JSON-serializable objects in :app:`Pyramid` 2.0. See "Upcoming Changes to ISession in Pyramid 2.0" in the "Sessions" chapter of the documentation for more information about this change.
+- The :class:`pyramid.interfaces.ISession` interface will move to require JSON-serializable objects in :app:`Pyramid` 2.0. See :ref:`pickle_session_deprecation` for more information about this change.
See https://github.com/Pylons/pyramid/pull/3353
- The :func:`pyramid.session.signed_serialize` and :func:`pyramid.session.signed_deserialize` functions will be removed in :app:`Pyramid` 2.0, along with the removal of :func:`pyramid.session.UnencryptedCookieSessionFactoryConfig` which was deprecated in :app:`Pyramid` 1.5.