merge 0.9.8 start

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index b35d40b8e387c494766a3b2ab9d49a9ee4deb55c..3ec09076bcfd0e0a3484529b48e25f94628f23b8 100644 (file)
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -10,6 +10,9 @@
     .. include:: changelog_07.rst
         :start-line: 5
 
+.. changelog::
+    :version: 0.9.8
+
 .. changelog::
     :version: 0.9.7
     :released: July 22, 2014
@@ -359,12 +362,10 @@
         In this situation, a many-to-one relationship set to None, or
         in some cases a scalar attribute set to None, may not be detected
         as a net change in value, and therefore the UPDATE would not reset
-        what was on the previous row.
-
-        The fix here takes on a different form in 1.0.0 vs. 0.9.5.
-        In 1.0.0, the issue is ultimately resolved by :ticket:`3061`,
-        which reverts the more patchwork version of the fix as it exists
-        in 0.9.5.
+        what was on the previous row.   This is due to some as-yet
+        unresovled side effects of the way attribute history works in terms
+        of implicitly assuming None isn't really a "change" for a previously
+        un-set attribute.  See also :ticket:`3061`.
 
         .. note::