diff --git a/doc/configuration-file-optional-settings.xml b/doc/configuration-file-optional-settings.xml
index 0a2d5689..67d7aed9 100644
--- a/doc/configuration-file-optional-settings.xml
+++ b/doc/configuration-file-optional-settings.xml
@@ -7,6 +7,14 @@
     <secondary>optional settings</secondary>
   </indexterm>
 
+  <note>
+    <simpara>
+      This section documents a subset of optional configuration settings; for a full
+      for a full and annotated view of all configuration options see the
+      see the <ulink url="https://raw.githubusercontent.com/EnterpriseDB/repmgr/master/repmgr.conf.sample">sample repmgr.conf file</ulink>
+    </simpara>
+  </note>
+
   <variablelist>
 
 
@@ -133,4 +141,12 @@ ssh_options='-q -o ConnectTimeout=10'</programlisting>
     </varlistentry>
 
   </variablelist>
+
+  <tip>
+    <simpara>
+      See the <ulink url="https://raw.githubusercontent.com/EnterpriseDB/repmgr/master/repmgr.conf.sample">sample repmgr.conf file</ulink>
+      for a full and annotated view of all configuration options.
+    </simpara>
+  </tip>
+
 </sect1>
diff --git a/doc/configuration-file-required-settings.xml b/doc/configuration-file-required-settings.xml
index b4858ce5..69d5111f 100644
--- a/doc/configuration-file-required-settings.xml
+++ b/doc/configuration-file-required-settings.xml
@@ -96,6 +96,9 @@
   </variablelist>
  </para>
 
+ <para>
+   See <xref linkend="configuration-file-optional-settings"/> for further configuration options.
+ </para>
 
 
 </sect1>