prep for 1.2a6

1 files changed, 15 insertions, 0 deletions

diff --git a/docs/whatsnew-1.2.rst b/docs/whatsnew-1.2.rst
index ba92e3542..8a64e2756 100644
--- a/docs/whatsnew-1.2.rst
+++ b/docs/whatsnew-1.2.rst
@@ -58,6 +58,9 @@ Scaffolding Changes
   error catching / email sending is now the domain of the ``pyramid_exclog``
   package (see https://docs.pylonsproject.org/projects/pyramid_exclog/dev/).
 
+- All scaffolds now send the ``cache_max_age`` parameter to the
+  ``add_static_view`` method.
+
 Minor Feature Additions
 -----------------------
 
@@ -237,6 +240,18 @@ Backwards Incompatibilities
   returns a route object.  This change was required to make route vs. view
   configuration processing work properly.
 
+Behavior Differences
+--------------------
+
+- An ETag header is no longer set when serving a static file.  A
+  Last-Modified header is set instead.
+
+- Static file serving no longer supports the ``wsgi.file_wrapper`` extension.
+
+- Instead of returning a ``403 Forbidden`` error when a static file is served
+  that cannot be accessed by the Pyramid process' user due to file
+  permissions, an IOError (or similar) will be raised.
+
 Documentation Enhancements
 --------------------------