diff --git a/doc/configuration.sgml b/doc/configuration.sgml
index 6bfa0f66..48817622 100644
--- a/doc/configuration.sgml
+++ b/doc/configuration.sgml
@@ -7,6 +7,11 @@
       <secondary>prerequisites</secondary>
     </indexterm>
 
+    <indexterm>
+      <primary>configuration</primary>
+      <secondary>ssh</secondary>
+    </indexterm>
+
     <title>Prerequisites for configuration</title>
     <para>
      Following software must be installed on both servers:
@@ -26,15 +31,36 @@
       At network level, connections between the PostgreSQL port (default: <literal>5432</literal>)
       must be possible between all nodes.
     </para>
+
     <para>
-      Optionally, if you want <application>repmgr</application> to copy PostgreSQL configuration
-      files which are located outside the data directory (as is the case with e.g.
-      <link linkend="packages-debian-ubuntu">Debian packages</link>)
-      when <link linkend="repmgr-standby-clone">cloning a standby</link>, or use &repmgr; to perform
-      <link linkend="preparing-for-switchover">switchovers</link>, passwordless SSH connections are required
-      between all nodes. Additionally, for copying files outide the data directory,
-      <application>rsync</application> must be installed.
+      Passwordless <command>SSH</command> connectivity between all servers in the replication cluster
+      is not required, but is necessary in the following cases:
+      <itemizedlist>
+        <listitem>
+          <simpara>if you need &repmgr; to copy configuration files from outside the PostgreSQL
+            data directory (as is the case with e.g. <link linkend="packages-debian-ubuntu">Debian packages</link>);
+            in this case <command>rsync</command> must also be installed on all servers.
+          </simpara>
+        </listitem>
+        <listitem>
+          <simpara>to perform <link linkend="performing-switchover">switchover operations</link></simpara>
+        </listitem>
+        <listitem>
+          <simpara>
+            when executing <command><link linkend="repmgr-cluster-matrix">repmgr cluster matrix</link></command>
+            and <command><link linkend="repmgr-cluster-crosscheck">repmgr cluster crosscheck</link></command>
+          </simpara>
+        </listitem>
+      </itemizedlist>
     </para>
+
+    <tip>
+      <simpara>
+        Consider setting <varname>ConnectTimeout</varname> to a low value in your SSH configuration.
+        This will make it faster to detect any SSH connection errors.
+      </simpara>
+    </tip>
+
   </sect1>
 
 
diff --git a/doc/install-requirements.sgml b/doc/install-requirements.sgml
index fa432f83..fac336df 100644
--- a/doc/install-requirements.sgml
+++ b/doc/install-requirements.sgml
@@ -13,7 +13,7 @@
   </para>
 
   <para>
-   From version 4.0, repmgr is compatible with all PostgreSQL versions from 9.3, including PostgreSQL 10.
+   From version 4.0, repmgr is compatible with all PostgreSQL versions from 9.3.
    Note that some &repmgr; functionality is not available in PostgreSQL 9.3 and PostgreSQL 9.4.
   </para>
 
@@ -31,7 +31,7 @@
   <para>
    &repmgr; must be installed on each server in the replication cluster.
    If installing repmgr from packages, the package version must match the PostgreSQL
-   version. If installing from source, repmgr must be compiled against the same
+   version. If installing from source, &repmgr; must be compiled against the same
    major version.
   </para>
 
@@ -42,32 +42,10 @@
   </para>
 
   <para>
-   Passwordless <command>ssh</command> connectivity between all servers in the replication cluster
-   is not required, but is necessary in the following cases:
-   <itemizedlist>
-     <listitem>
-       <simpara>if you need &repmgr; to copy configuration files from outside the PostgreSQL
-       data directory (in which case <command>rsync</command> is also required)</simpara>
-     </listitem>
-     <listitem>
-       <simpara>to perform <link linkend="performing-switchover">switchover operations</link></simpara>
-     </listitem>
-     <listitem>
-       <simpara>
-        when executing <command><link linkend="repmgr-cluster-matrix">repmgr cluster matrix</link></command>
-        and <command><link linkend="repmgr-cluster-crosscheck">repmgr cluster crosscheck</link></command>
-       </simpara>
-     </listitem>
-   </itemizedlist>
+    See also <link linkend="configuration-prerequisites">Prerequisites for configuration</link>
+    for information on networking requirements.
   </para>
 
-  <tip>
-    <simpara>
-      Consider setting <varname>ConnectTimeout</varname> to a low value in your SSH configuration.
-      This will make it faster to detect any SSH connection errors.
-    </simpara>
-  </tip>
-
   <tip>
    <simpara>
     We recommend using a session multiplexer utility such as <command>screen</command> or