From: Robert Haas <rhaas@postgresql.org>
Date: Fri, 26 Jun 2015 18:20:29 +0000 (-0400)
Subject: release notes: Combine items for pg_upgrade and pg_upgrade_support moves.
X-Git-Url: http://git.postgresql.org/gitweb/-?a=commitdiff_plain;h=31c018ecda9f40fe80055d8ba95248c023593fb4;p=users%2Frhaas%2Fpostgres.git

release notes: Combine items for pg_upgrade and pg_upgrade_support moves.

Per suggestions from Amit Langote and Álvaro Herrera.
---

diff --git a/doc/src/sgml/release-9.5.sgml b/doc/src/sgml/release-9.5.sgml
index 4e2ea45dec..4086c6ba76 100644
--- a/doc/src/sgml/release-9.5.sgml
+++ b/doc/src/sgml/release-9.5.sgml
@@ -1690,6 +1690,12 @@
         Move <application>pg_upgrade</> from <filename>contrib</> to
         <filename>src/bin</> (Peter Eisentraut)
        </para>
+
+       <para>
+        In connection with this change, the functionality previously
+        provided by the <application>pg_upgrade_support</> module has been
+        moved into the core server.
+       </para>
       </listitem>
 
       <listitem>
@@ -1720,13 +1726,6 @@
        </para>
       </listitem>
 
-     <listitem>
-      <para>
-       Move <application>pg_upgrade_support</> code into backend and
-       remove the module (Peter Eisentraut)
-      </para>
-     </listitem>
-
      </itemizedlist>
 
     </sect4>