diff --git a/doc/repmgr-standby-promote.sgml b/doc/repmgr-standby-promote.sgml
index 513a7e73..5868b00d 100644
--- a/doc/repmgr-standby-promote.sgml
+++ b/doc/repmgr-standby-promote.sgml
@@ -32,6 +32,7 @@
       check the promotion every <varname>promote_check_interval</varname> seconds (default: 1 second).
       Both values can be defined in <filename>repmgr.conf</filename>.
     </para>
+
   </refsect1>
 
   <refsect1>
diff --git a/doc/repmgr-standby-switchover.sgml b/doc/repmgr-standby-switchover.sgml
index a063d421..74954f20 100644
--- a/doc/repmgr-standby-switchover.sgml
+++ b/doc/repmgr-standby-switchover.sgml
@@ -12,6 +12,7 @@
     <refpurpose>promote a standby to primary and demote the existing primary to a standby</refpurpose>
   </refnamediv>
 
+
   <refsect1>
     <title>Description</title>
 
@@ -39,6 +40,14 @@
       For more details on performing a switchover, including preparation and configuration,
       see section <xref linkend="performing-switchover">.
     </para>
+
+    <note>
+      <para>
+        <application>repmgrd</application> should not be active on any nodes while a switchover is being
+        executed. This restriction may be lifted in a later version.
+      </para>
+    </note>
+
   </refsect1>
 
   <refsect1>
@@ -173,8 +182,8 @@
     </para>
     <important>
       <para>
-        <application>repmgrd</application> should not be active on any nodes while a switchover is being
-        executed. This restriction may be lifted in a later version.
+        <application>repmgrd</application> must be shut down on all nodes while a switchover is being
+        executed. This restriction will be removed in a future &repmgr; version.
       </para>
     </important>
     <para>
diff --git a/doc/switchover.sgml b/doc/switchover.sgml
index 4ec055a8..dbd32e98 100644
--- a/doc/switchover.sgml
+++ b/doc/switchover.sgml
@@ -140,10 +140,12 @@
     manually with <command>repmgr node check --archive-ready</command>.
    </para>
 
-   <para>
-    Ensure that <application>repmgrd</application> is *not* running anywhere to prevent it unintentionally
-    promoting a node.
-   </para>
+   <note>
+     <para>
+       Ensure that <application>repmgrd</application> is *not* running anywhere to prevent it unintentionally
+       promoting a node. This restriction will be removed in a future &repmgr; version.
+     </para>
+   </note>
 
    <para>
     Finally, consider executing <command>repmgr standby switchover</command> with the