Update back-branch release notes for the last few commits.

OpenSSL error queue fix no longer needs to be documented under 9.6.

diff --git a/doc/src/sgml/release-9.5.sgml b/doc/src/sgml/release-9.5.sgml
index 98aef4f9fe2f0638c54c5d075e2178ec2a2c12d6..d4a49cc3802cc62c9130fb6d0d61ed1271e09abd 100644 (file)
--- a/doc/src/sgml/release-9.5.sgml
+++ b/doc/src/sgml/release-9.5.sgml
@@ -35,6 +35,31 @@
 
     <listitem>
 <!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [7c7d4fdda] 2016-04-08 14:11:56 -0400
+Branch: REL9_5_STABLE [a3c17b2af] 2016-05-06 23:47:42 -0400
+Branch: REL9_4_STABLE [e3b14de9f] 2016-05-07 00:10:31 -0400
+Branch: REL9_3_STABLE [a9d8644de] 2016-05-07 00:10:17 -0400
+Branch: REL9_2_STABLE [e3a493ac0] 2016-05-07 00:05:39 -0400
+Branch: REL9_1_STABLE [9b676fd49] 2016-05-07 00:09:37 -0400
+-->
+     <para>
+      Clear the OpenSSL error queue before OpenSSL calls, rather than
+      assuming it's clear already; and make sure we leave it clear
+      (Peter Geoghegan, Dave Vitek, Peter Eisentraut)
+     </para>
+
+     <para>
+      This avoids problems when there are multiple connections using
+      OpenSSL within a single process and not all the code involved
+      follows the same rules for when to clear the error queue.
+      While the problem is worse for <application>libpq</>, it's
+      possible for it to arise within the server as well.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
 Author: Tom Lane <tgl@sss.pgh.pa.us>
 Branch: master [80f66a9ad] 2016-04-21 20:05:58 -0400
 Branch: REL9_5_STABLE [94c685a7c] 2016-04-21 20:05:58 -0400
@@ -286,6 +311,29 @@ Branch: REL9_1_STABLE [3ef1f3a3e] 2016-04-13 18:57:52 -0400
 
     <listitem>
 <!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [1a2c17f8e] 2016-05-06 22:05:56 -0400
+Branch: REL9_5_STABLE [196870f2f] 2016-05-06 22:05:51 -0400
+Branch: REL9_4_STABLE [e1aecebc0] 2016-05-06 22:05:51 -0400
+Branch: REL9_3_STABLE [e1d88f983] 2016-05-06 22:05:51 -0400
+-->
+     <para>
+      Fix <application>pg_upgrade</> to not fail when new-cluster TOAST rules
+      differ from old (Tom Lane)
+     </para>
+
+     <para>
+      <application>pg_upgrade</> had special-case code to handle the
+      situation where the new <productname>PostgreSQL</> version thinks that
+      a table should have a TOAST table while the old version did not.  That
+      code was broken, so remove it; there seems no reason to believe that we
+      can't get along fine without a TOAST table if that was okay according
+      to the old version's rules.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
 Author: Noah Misch <noah@leadboat.com>
 Branch: master [213c7df03] 2016-04-26 21:53:58 -0400
 Branch: REL9_5_STABLE [f9989482d] 2016-04-26 21:54:07 -0400

diff --git a/doc/src/sgml/release-9.6.sgml b/doc/src/sgml/release-9.6.sgml
index 9b224109ca12b123f43831eb54c02e0265c24e4e..5592812d1242b55472a768dabf9ffc7b7c5ddcff 100644 (file)
--- a/doc/src/sgml/release-9.6.sgml
+++ b/doc/src/sgml/release-9.6.sgml
@@ -1167,26 +1167,6 @@ XXX this is pending backpatch, may need to remove
        </para>
       </listitem>
 
-      <listitem>
-<!--
-XXX this is pending backpatch, may need to remove
-2016-04-08 [7c7d4fdda] Distrust external OpenSSL clients; clear err queue
--->
-       <para>
-        Clear the OpenSSL error queue before OpenSSL calls, rather than
-        assuming it's clear already; and make sure we leave it clear
-        (Peter Geoghegan, Dave Vitek, Peter Eisentraut)
-       </para>
-
-       <para>
-        This avoids problems when there are multiple connections using
-        OpenSSL within a single process and not all the code involved
-        follows the same rules for when to clear the error queue.
-        While the problem is worse for <application>libpq</>, it's
-        possible for it to arise within the server as well.
-       </para>
-      </listitem>
-
      </itemizedlist>
 
     </sect4>