diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index 03b18ebc0..d85f0a898 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -109,6 +109,18 @@
 
             <release-doc-list>
                 <release-improvement-list>
+                    <release-item>
+                        <github-issue id="2062"/>
+                        <github-pull-request id="2069"/>
+
+                        <release-item-contributor-list>
+                            <release-item-contributor id="david.steele"/>
+                            <release-item-reviewer id="stefan.fercot"/>
+                        </release-item-contributor-list>
+
+                        <p>Add warning about using recovery <br-option>type=none</br-option>.</p>
+                    </release-item>
+
                     <release-item>
                         <release-item-contributor-list>
                             <release-item-contributor id="david.steele"/>
diff --git a/src/build/help/help.xml b/src/build/help/help.xml
index dddee3691..52c2b7b28 100644
--- a/src/build/help/help.xml
+++ b/src/build/help/help.xml
@@ -2370,6 +2370,8 @@
                                 <list-item><id>none</id> - no <file>recovery.conf</file> file is written so <postgres/> will attempt to achieve consistency using WAL segments present in <path>pg_xlog</path>/<path>pg_wal</path>. Provide the required WAL segments or use the <setting>archive-copy</setting> setting to include them with the backup.</list-item>
                             </list>
 
+                            <admonition type="warning">Recovery <br-option>type=none</br-option> should be avoided because the timeline will not be incremented at the end of recovery. This can lead to, for example, <postgres/> attempting to archive duplicate WAL, which will be rejected, and may cause the disk to fill up and result in a <postgres/> panic. In addition, tools like <id>pg_rewind</id> may not work correctly or may cause corruption.</admonition>
+
                             <p>Note that the default restore <br-option>type</br-option> for offline backups is <id>none</id> since Point-in-Time-Recovery is not possible if <setting>wal_level=minimal</setting>. If <br-option>type</br-option> is set explicitly then it will be honored since Point-in-Time-Recovery is possible from offline backups as long as <setting>wal_level > minimal</setting>.</p>
                         </text>