From 1623740d841fde74dd492fef87d48f0100bdcce8 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 5 Nov 2018 16:07:06 -0500
Subject: [PATCH] Last-minute updates for release notes.

I removed the item about the pg_stat_statements change from
release-11.sgml, as part of a sweep to delete items already committed
in 11.0; but actually we'd best keep it to ensure that people who've
pg_upgraded their databases will take the requisite action.  Also make
said action more visible by making it into its own para.  Noted by
Jonathan Katz.
---
 doc/src/sgml/release-10.sgml |  9 +++------
 doc/src/sgml/release-11.sgml | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/doc/src/sgml/release-10.sgml b/doc/src/sgml/release-10.sgml
index c268ec2a0e..0c02ecbc4e 100644
--- a/doc/src/sgml/release-10.sgml
+++ b/doc/src/sgml/release-10.sgml
@@ -1036,12 +1036,6 @@ Branch: REL9_3_STABLE [9f3ade1a6] 2018-08-31 20:21:30 +0300
     </listitem>
 
     <listitem>
-<!--
-Author: Michael Paquier <michael@paquier.xyz>
-Branch: master [edb979766] 2018-09-25 09:55:44 +0900
-Branch: REL_11_STABLE Release: REL_11_0 [a3bb831ef] 2018-09-25 09:56:41 +0900
-Branch: REL_10_STABLE [90a1f9786] 2018-09-25 09:56:57 +0900
--->
      <para>
       In <filename>contrib/pg_stat_statements</filename>, disallow
       the <literal>pg_read_all_stats</literal> role from
@@ -1052,6 +1046,9 @@ Branch: REL_10_STABLE [90a1f9786] 2018-09-25 09:56:57 +0900
      <para>
       <literal>pg_read_all_stats</literal> is only meant to grant permission
       to read statistics, not to change them, so this grant was incorrect.
+     </para>
+
+     <para>
       To cause this change to take effect, run <literal>ALTER EXTENSION
       pg_stat_statements UPDATE</literal> in each database
       where <filename>pg_stat_statements</filename> has been installed.
diff --git a/doc/src/sgml/release-11.sgml b/doc/src/sgml/release-11.sgml
index 1862e8a335..f7ddcec120 100644
--- a/doc/src/sgml/release-11.sgml
+++ b/doc/src/sgml/release-11.sgml
@@ -301,6 +301,37 @@ Branch: REL_11_STABLE [cc7f27eae] 2018-10-19 22:45:07 +0900
 
     <listitem>
 <!--
+Author: Michael Paquier <michael@paquier.xyz>
+Branch: master [edb979766] 2018-09-25 09:55:44 +0900
+Branch: REL_11_STABLE Release: REL_11_0 [a3bb831ef] 2018-09-25 09:56:41 +0900
+Branch: REL_10_STABLE [90a1f9786] 2018-09-25 09:56:57 +0900
+-->
+     <para>
+      In <filename>contrib/pg_stat_statements</filename>, disallow
+      the <literal>pg_read_all_stats</literal> role from
+      executing <function>pg_stat_statements_reset()</function>
+      (Haribabu Kommi)
+     </para>
+
+     <para>
+      <literal>pg_read_all_stats</literal> is only meant to grant permission
+      to read statistics, not to change them, so this grant was incorrect.
+     </para>
+
+     <para>
+      To cause this change to take effect, run <literal>ALTER EXTENSION
+      pg_stat_statements UPDATE</literal> in each database
+      where <filename>pg_stat_statements</filename> has been installed.
+      (A database freshly created in 11.0 should not need this, but a
+      database upgraded from a previous release probably still contains
+      the old version of <filename>pg_stat_statements</filename>.  The
+      <literal>UPDATE</literal> command is harmless if the module was
+      already updated.)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
 Author: Tom Lane <tgl@sss.pgh.pa.us>
 Branch: master [1440c461f] 2018-11-02 18:54:00 -0400
 Branch: REL_11_STABLE [df1d749a7] 2018-11-02 18:54:00 -0400