From 23f7af17a2cb734b02f8f6339fc3d2d86c9acdf5 Mon Sep 17 00:00:00 2001
From: Ian Barwick <ian@2ndquadrant.com>
Date: Fri, 20 Oct 2017 11:30:36 +0900
Subject: [PATCH] Note Barman configuration file parameter changes

---
 doc/appendix-release-notes.sgml |  4 ++++
 doc/upgrading-repmgr.sgml       | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/doc/appendix-release-notes.sgml b/doc/appendix-release-notes.sgml
index 9df361de..06777744 100644
--- a/doc/appendix-release-notes.sgml
+++ b/doc/appendix-release-notes.sgml
@@ -145,6 +145,10 @@
          <simpara><varname>name</varname> is now <varname>node_name</varname></simpara>
        </listitem>
 
+       <listitem>
+         <simpara><varname>barman_server</varname> is now <varname>barman_host</varname></simpara>
+       </listitem>
+
        <listitem>
          <simpara><varname>master_reponse_timeout</varname> is now
            <varname>async_query_timeout</varname> (to better indicate its purpose)
diff --git a/doc/upgrading-repmgr.sgml b/doc/upgrading-repmgr.sgml
index 1f18c5cc..3a6fdec1 100644
--- a/doc/upgrading-repmgr.sgml
+++ b/doc/upgrading-repmgr.sgml
@@ -122,6 +122,10 @@
         <entry><varname>logfile</varname></entry>
         <entry><varname>log_file</varname></entry>
        </row>
+       <row>
+        <entry><varname>barman_server</varname></entry>
+        <entry><varname>barman_host</varname></entry>
+       </row>
        <row>
         <entry><varname>master_reponse_timeout</varname></entry>
         <entry><varname>async_query_timeout</varname></entry>
@@ -129,6 +133,16 @@
       </tbody>
      </tgroup>
     </table>
+    <note>
+      <para>
+        From &repmgr; 4, <literal>barman_server</literal> refers
+        to the server configured in Barman (in &repmgr; 3, the deprecated
+        <literal>cluster</literal> parameter was used for this);
+        the physical Barman hostname is configured with
+        <literal>barman_host</literal> (see <xref linkend="cloning-from-barman-prerequisites">
+          for details).
+      </para>
+    </note>
     <para>
      Following parameters have been removed:
      <itemizedlist spacing="compact" mark="bullet">