diff --git a/doc/repmgr-standby-switchover.sgml b/doc/repmgr-standby-switchover.sgml
index 3e1fcf41..485c6e10 100644
--- a/doc/repmgr-standby-switchover.sgml
+++ b/doc/repmgr-standby-switchover.sgml
@@ -35,6 +35,10 @@
         a successful switchover.
       </para>
     </note>
+    <para>
+      For more details on performing a switchover, including preparation and configuration,
+      see section <xref linkend="performing-switchover">.
+    </para>
   </refsect1>
 
   <refsect1>
diff --git a/doc/switchover.sgml b/doc/switchover.sgml
index 02f926b7..4ec055a8 100644
--- a/doc/switchover.sgml
+++ b/doc/switchover.sgml
@@ -100,7 +100,11 @@
      <para>
        If the <option>service_*_command</option> options aren't defined, &repmgr; will
        fall back to using <application>pg_ctl</application> to stop/start/restart
-       PostgreSQL, which may not work properly.
+       PostgreSQL, which may not work properly, particularly when executed on a remote
+       server.
+     </para>
+     <para>
+       For more details, see <xref linkend="configuration-service-commands">.
      </para>
    </important>
 
@@ -117,6 +121,7 @@
     </simpara>
    </note>
 
+
    <para>
     Check that access from applications is minimalized or preferably blocked
     completely, so applications are not unexpectedly interrupted.