From 527a5f7fee9f05ce143c5dd5d5fdff7880d75f1c Mon Sep 17 00:00:00 2001
From: Ian Barwick <ian@2ndquadrant.com>
Date: Tue, 24 Jul 2018 09:54:06 +0900
Subject: [PATCH] doc: update release notes and upgrade instructions

---
 doc/appendix-release-notes.sgml | 28 ++++++++++++++++++++++++----
 doc/upgrading-repmgr.sgml       | 18 ++++++++++++------
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/doc/appendix-release-notes.sgml b/doc/appendix-release-notes.sgml
index 9628458b..6f39b651 100644
--- a/doc/appendix-release-notes.sgml
+++ b/doc/appendix-release-notes.sgml
@@ -23,14 +23,34 @@
       behaviour and some additional configuration parameters.
     </para>
     <para>
-      &repmgr; 4.1.0 introduces changes to the &repmgr; extension schema, meaning
-      <command>ALTER EXTENSION repmgr UPGRADE</command> must be executed after
-      installing the new version.
+      This release can be installed as a simple package upgrade from repmgr 4.0 ~ 4.0.6.
+      The following post-upgrade steps must be carried out:
+
+       <itemizedlist>
+          <listitem>
+            <para>
+              <application>repmgrd</application> (if running) must be restarted.
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              Execute <command>ALTER EXTENSION repmgr UPGRADE</command>
+              on the primary server in the database where &repmgr; is installed.
+            </para>
+          </listitem>
+       </itemizedlist>
+
+       A restart of the PostgreSQL server is <emphasis>not</emphasis> required
+       for this release.
     </para>
+    <para>
+       See <xref linkend="upgrading-repmgr-extension"> for more details.
+    </para>
+
     <para>
       Configuration changes are backwards-compatible and no changes to
       <filename>repmgr.conf</filename> are required. However users should
-      review changes listed below.
+      review the changes listed below.
     </para>
 
     <sect2>
diff --git a/doc/upgrading-repmgr.sgml b/doc/upgrading-repmgr.sgml
index 0208db09..74b4eb0e 100644
--- a/doc/upgrading-repmgr.sgml
+++ b/doc/upgrading-repmgr.sgml
@@ -29,8 +29,18 @@
       </listitem>
       <listitem>
         <simpara>
-          In the database where the &repmgr; extension is installed, execute
-          <command>ALTER EXTENSION repmgr UPDATE</command>.
+          <application>repmgrd</application> (if running) must be restarted.
+        </simpara>
+      </listitem>
+      <listitem>
+        <simpara>
+          For major releases, e.g. from <literal>4.0.x</literal> to <literal>4.1</literal>,
+          execute <command>ALTER EXTENSION repmgr UPDATE</command>
+          on the primary node in the database where the &repmgr; extension is installed.
+        </simpara>
+        <simpara>
+          This will update the extension metadata and, if necessary, apply
+          changes to the &repmgr; extension objects.
         </simpara>
       </listitem>
     </orderedlist>
@@ -41,10 +51,6 @@
     release as they may contain upgrade instructions particular to individual versions.
   </para>
 
-  <para>
-    If the <application>repmgrd</application> daemon is in use, we recommend stopping it
-    before upgrading &repmgr;.
-  </para>
   <para>
     Note that it may be necessary to restart the PostgreSQL server if the upgrade contains
     changes to the shared object file used by <application>repmgrd</application>; check the