From 887ec97e0743f758a0a2d2222cd1553b91f0908d Mon Sep 17 00:00:00 2001
From: Brad Nicholson <bradn@ca.ibm.com>
Date: Thu, 3 Oct 2019 06:58:52 -0400
Subject: [PATCH] Document maximum version for auto-stop option.

---
 doc/xml/reference.xml    |  2 ++
 doc/xml/release.xml      | 12 ++++++++++++
 src/config/define.auto.c |  2 ++
 3 files changed, 16 insertions(+)

diff --git a/doc/xml/reference.xml b/doc/xml/reference.xml
index fcb673262..329771201 100644
--- a/doc/xml/reference.xml
+++ b/doc/xml/reference.xml
@@ -606,6 +606,8 @@
 
                         This feature relies on pg_is_in_backup() so only works on <postgres/> >= <id>9.3</id>.
 
+                        This feature is not supported for <postgres/> >= <id>9.6</id> since backups are run in non-exclusive mode.
+
                         The setting is disabled by default because it assumes that <backrest/> is the only process doing exclusive online backups.  It depends on an advisory lock that only <backrest/> sets so it may abort other processes that do exclusive online backups.  Note that <cmd>base_backup</cmd> and <cmd>pg_dump</cmd> are safe to use with this setting because they do not call <code>pg_start_backup()</code> so are not exclusive.</text>
 
                         <example>y</example>
diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index 86fc40111..4e8485d98 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -13,6 +13,18 @@
 
     <release-list>
         <release date="XXXX-XX-XX" version="2.19dev" title="UNDER DEVELOPMENT">
+            <release-doc-list>
+                <release-improvement-list>
+                    <release-item>
+                        <release-item-contributor-list>
+                            <release-item-contributor id="brad.nicholson"/>
+                        </release-item-contributor-list>
+
+                        <p>Document maximum version for <br-option>auto-stop</br-option> option.</p>
+                    </release-item>
+                </release-improvement-list>
+            </release-doc-list>
+
         </release>
 
         <release date="2019-10-01" version="2.18" title="PostgreSQL 12 Support">
diff --git a/src/config/define.auto.c b/src/config/define.auto.c
index 6ac2002ea..c14ff7aa8 100644
--- a/src/config/define.auto.c
+++ b/src/config/define.auto.c
@@ -4382,6 +4382,8 @@ static ConfigDefineOptionData configDefineOptionData[] = CFGDEFDATA_OPTION_LIST
             "\n"
             "This feature relies on pg_is_in_backup() so only works on PostgreSQL >= 9.3.\n"
             "\n"
+            "This feature is not supported for PostgreSQL >= 9.6 since backups are run in non-exclusive mode.\n"
+            "\n"
             "The setting is disabled by default because it assumes that pgBackRest is the only process doing exclusive online "
                 "backups. It depends on an advisory lock that only pgBackRest sets so it may abort other processes that do "
                 "exclusive online backups. Note that base_backup and pg_dump are safe to use with this setting because they do not "