From 2aebc688c6a81b1baef01791e1cf3c9907c7c3ee Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Tue, 02 May 2017 05:07:55 +0200
Subject: [PATCH] line length fixes in whatsnew-1.9

---
 docs/whatsnew-1.9.rst |   11 ++++-------
 CHANGES.txt           |    2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 70a2ff9..85931d7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -98,7 +98,7 @@
 - Pyramid currently depends on ``plaster_pastedeploy`` to simplify the
   transition to ``plaster`` by maintaining integrated support for INI files.
   This dependency on ``plaster_pastedeploy`` should be considered subject to
-  Pyramid's deprecation policy and is subject to removal in the future.
+  Pyramid's deprecation policy and may be removed in the future.
   Applications should depend on the appropriate plaster binding to satisfy
   their needs.
 
diff --git a/docs/whatsnew-1.9.rst b/docs/whatsnew-1.9.rst
index e57ed25..5f9e0e0 100644
--- a/docs/whatsnew-1.9.rst
+++ b/docs/whatsnew-1.9.rst
@@ -38,18 +38,15 @@
 Deprecations
 ------------
 
-- Pyramid currently depends on ``plaster_pastedeploy`` to simplify the transition to ``plaster`` by maintaining integrated support for INI files. This dependency on ``plaster_pastedeploy`` should be considered subject to Pyramid's deprecation policy and is subject to removal in the future. Applications should depend on the appropriate plaster binding to satisfy their needs.
+- Pyramid currently depends on ``plaster_pastedeploy`` to simplify the transition to ``plaster`` by maintaining integrated support for INI files. This dependency on ``plaster_pastedeploy`` should be considered subject to Pyramid's deprecation policy and may be removed in the future. Applications should depend on the appropriate plaster binding to satisfy their needs.
 
 - Retrieving CSRF token from the session has been deprecated in favor of equivalent methods in the :mod:`pyramid.csrf` module. The CSRF methods (``ISession.get_csrf_token`` and ``ISession.new_csrf_token``) are no longer required on the :class:`pyramid.interfaces.ISession` interface except when using the default :class:`pyramid.csrf.LegacySessionCSRFStoragePolicy`.
 
-  Also, ``pyramid.session.check_csrf_token`` is now located at
-  :func:`pyramid.csrf.check_csrf_token`.
+  Also, ``pyramid.session.check_csrf_token`` is now located at :func:`pyramid.csrf.check_csrf_token`.
 
-  See https://github.com/Pylons/pyramid/pull/2854 and
-  https://github.com/Pylons/pyramid/pull/3019
+  See https://github.com/Pylons/pyramid/pull/2854 and https://github.com/Pylons/pyramid/pull/3019
 
 Documentation Enhancements
 --------------------------
 
-- Added the :term:`execution policy` to the routing diagram in
-  :ref:`router_chapter`. See https://github.com/Pylons/pyramid/pull/2993
+- Added the :term:`execution policy` to the routing diagram in :ref:`router_chapter`. See https://github.com/Pylons/pyramid/pull/2993

--
Gitblit v1.9.3