diff --git a/HISTORY b/HISTORY
index d5039b8c..c34e9f05 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3,6 +3,7 @@
           server and logging output is not explicitly redirected (Ian)
         repmgr: improve switchover log messages and exit code when old primary could
           not be shut down cleanly (Ian)
+        repmgr: add --dry-run mode to "repmgr standby follow"; GitHub #368 (Ian)
 
 4.0.2   2018-01-18
         repmgr: add missing -W option to getopt_long() invocation; GitHub #350 (Ian)
diff --git a/doc/repmgr-standby-follow.sgml b/doc/repmgr-standby-follow.sgml
index 2c6104ad..1bee915b 100644
--- a/doc/repmgr-standby-follow.sgml
+++ b/doc/repmgr-standby-follow.sgml
@@ -58,6 +58,14 @@
           <para>
             Check prerequisites but don't actually follow a new standby.
           </para>
+          <important>
+            <para>
+              This does not guarantee the standby can follow the primary; in
+              particular, whether the primary and standby timelines have diverged,
+              can currently only be determined by actually attempting to
+              attach the standby to the primary.
+            </para>
+          </important>
         </listitem>
       </varlistentry>