diff --git a/doc/configuration-file.xml b/doc/configuration-file.xml
index fd748701..a919aa86 100644
--- a/doc/configuration-file.xml
+++ b/doc/configuration-file.xml
@@ -74,6 +74,12 @@ data_directory = /var/lib/pgsql/11/data</programlisting>
             </simpara>
           </listitem>
 
+          <listitem>
+            <simpara>
+              <xref linkend="configuration-file-optional-settings"/>
+            </simpara>
+          </listitem>
+
           <listitem>
             <simpara>
               <xref linkend="configuration-file-log-settings"/>
diff --git a/doc/configuration.xml b/doc/configuration.xml
index 7f7398c4..e173bf58 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -305,6 +305,7 @@
 
   &configuration-file;
   &configuration-file-required-settings;
+  &configuration-file-optional-settings;
   &configuration-file-log-settings;
   &configuration-file-service-commands;
 
diff --git a/doc/filelist.xml b/doc/filelist.xml
index 38bba263..e3952a6f 100644
--- a/doc/filelist.xml
+++ b/doc/filelist.xml
@@ -18,6 +18,7 @@
 <!ENTITY configuration      SYSTEM "configuration.xml">
 <!ENTITY configuration-file      SYSTEM "configuration-file.xml">
 <!ENTITY configuration-file-required-settings      SYSTEM "configuration-file-required-settings.xml">
+<!ENTITY configuration-file-optional-settings      SYSTEM "configuration-file-optional-settings.xml">
 <!ENTITY configuration-file-log-settings      SYSTEM "configuration-file-log-settings.xml">
 <!ENTITY configuration-file-service-commands   SYSTEM "configuration-file-service-commands.xml">
 <!ENTITY cloning-standbys  SYSTEM "cloning-standbys.xml">
diff --git a/repmgr.conf.sample b/repmgr.conf.sample
index 28511cac..9f3087b2 100644
--- a/repmgr.conf.sample
+++ b/repmgr.conf.sample
@@ -67,16 +67,16 @@
 # Replication settings
 #------------------------------------------------------------------------------
 
-#replication_user='repmgr'	 # User to make replication connections with, if not set defaults
-				 # to the user defined in "conninfo".
+#replication_user='repmgr'	 # User to make replication connections with, if not set
+				 #  defaults to the user defined in "conninfo".
 
-#replication_type=physical	 # Must be one of 'physical' or 'bdr'.
+#replication_type=physical	 # Must be one of "physical" or "bdr".
 				 # NOTE: "bdr" can only be used with BDR 2.x
 
-#location=default		 # arbitrary string defining the location of the node; this
-				 # is used during failover to check visibilty of the
-				 # current primary node. See the 'repmgrd' documentation
-				 # in README.md for further details.
+#location=default		 # An arbitrary string defining the location of the node; this
+				 # is used during failover to check visibility of the
+				 # current primary node. For further details see:
+                                 #   https://repmgr.org/docs/current/repmgrd-network-split.html
 
 #use_replication_slots=no	 # whether to use physical replication slots
 				 # NOTE: when using replication slots,