diff --git a/doc/repmgr-standby-follow.xml b/doc/repmgr-standby-follow.xml
index b0f4a6b6..cca1e2e1 100644
--- a/doc/repmgr-standby-follow.xml
+++ b/doc/repmgr-standby-follow.xml
@@ -171,7 +171,7 @@
       be possible to follow the new upstream node, and &repmgr; will emit an error
       message like this:
       <programlisting>
-ERROR: this node cannot attach to follow target node 3
+ERROR: this node cannot attach to follow target node &quot;node3&quot; (ID 3)
 DETAIL: follow target server's timeline 2 forked off current database system timeline 1 before current recovery point 0/6108880</programlisting>
     </para>
     <para>
diff --git a/doc/repmgrd-configuration.xml b/doc/repmgrd-configuration.xml
index 62dc5bf5..30379936 100644
--- a/doc/repmgrd-configuration.xml
+++ b/doc/repmgrd-configuration.xml
@@ -222,6 +222,17 @@
               Normally <option>promote_command</option> is set as &repmgr;'s
               <command><link linkend="repmgr-standby-promote">repmgr standby promote</link></command> command.
             </para>
+
+            <note>
+              <para>
+                When invoking <command>repmgr standby promote</command> (either directly via
+                the <option>promote_command</option>, or in a script called
+                via <option>promote_command</option>), <option>--siblings-follow</option>
+                <emphasis>must not</emphasis> be included as a
+                command line option for <command>repmgr standby promote</command>.
+              </para>
+            </note>
+
             <para>
               It is also possible to provide a shell script to e.g. perform user-defined tasks
               before promoting the current node. In this case the script <emphasis>must</emphasis>