diff --git a/doc/appendix-release-notes.sgml b/doc/appendix-release-notes.sgml
index da3bcb90..51417eb2 100644
--- a/doc/appendix-release-notes.sgml
+++ b/doc/appendix-release-notes.sgml
@@ -227,7 +227,7 @@
           <listitem>
             <para>
               Various documentation improvements, with particular emphasis on
-              the importance of setting appropriate <link linkend="configuration-service-commands">service commands</link>
+              the importance of setting appropriate <link linkend="configuration-file-service-commands">service commands</link>
               instead of relying on <application>pg_ctl</application>.
             </para>
           </listitem>
diff --git a/doc/configuration-file-required-settings.sgml b/doc/configuration-file-required-settings.sgml
index 937b54b9..51cce424 100644
--- a/doc/configuration-file-required-settings.sgml
+++ b/doc/configuration-file-required-settings.sgml
@@ -1,10 +1,10 @@
-<sect1 id="configuration-file-settings" xreflabel="configuration file settings">
+<sect1 id="configuration-file-settings" xreflabel="required configuration file settings">
   <indexterm>
     <primary>repmgr.conf</primary>
-    <secondary>basic settings</secondary>
+    <secondary>required settings</secondary>
   </indexterm>
 
- <title>Basic configuration file settings</title>
+ <title>Required configuration file settings</title>
  <para>
    Each <filename>repmgr.conf</filename> file must contain the following parameters:
  </para>
diff --git a/doc/configuration-file-service-commands.sgml b/doc/configuration-file-service-commands.sgml
index e783d821..fee173d0 100644
--- a/doc/configuration-file-service-commands.sgml
+++ b/doc/configuration-file-service-commands.sgml
@@ -1,4 +1,4 @@
-<sect1 id="configuration-service-commands" xreflabel="service command settings">
+<sect1 id="configuration-file-service-commands" xreflabel="service command settings">
   <indexterm>
     <primary>repmgr.conf</primary>
     <secondary>service command settings</secondary>
diff --git a/doc/configuration.sgml b/doc/configuration.sgml
index 85e742b7..96426e65 100644
--- a/doc/configuration.sgml
+++ b/doc/configuration.sgml
@@ -2,16 +2,16 @@
   <title>repmgr configuration</title>
 
   &configuration-file;
-  &configuration-file-settings;
-  &configuration-service-commands;
+  &configuration-file-required-settings;
+  &configuration-file-service-commands;
 
-  <sect1 id="configuration-permissions" xreflabel="User permissions">
+  <sect1 id="configuration-permissions" xreflabel="Database user permissions">
     <indexterm>
       <primary>configuration</primary>
-      <secondary>user permissions</secondary>
+      <secondary>database user permissions</secondary>
     </indexterm>
 
-    <title>repmgr user permissions</title>
+    <title>repmgr database user permissions</title>
     <para>
       &repmgr; will create an extension database containing objects
       for administering &repmgr; metadata. The user defined in the <varname>conninfo</varname>
diff --git a/doc/filelist.sgml b/doc/filelist.sgml
index bf6ec0da..cd6d6a55 100644
--- a/doc/filelist.sgml
+++ b/doc/filelist.sgml
@@ -38,8 +38,8 @@
 <!ENTITY quickstart      SYSTEM "quickstart.sgml">
 <!ENTITY configuration      SYSTEM "configuration.sgml">
 <!ENTITY configuration-file      SYSTEM "configuration-file.sgml">
-<!ENTITY configuration-file-settings      SYSTEM "configuration-file-settings.sgml">
-<!ENTITY configuration-service-commands   SYSTEM "configuration-service-commands.sgml">
+<!ENTITY configuration-file-required-settings      SYSTEM "configuration-file-required-settings.sgml">
+<!ENTITY configuration-file-service-commands   SYSTEM "configuration-file-service-commands.sgml">
 <!ENTITY cloning-standbys  SYSTEM "cloning-standbys.sgml">
 <!ENTITY promoting-standby  SYSTEM "promoting-standby.sgml">
 <!ENTITY follow-new-primary  SYSTEM "follow-new-primary.sgml">
diff --git a/doc/install-packages.sgml b/doc/install-packages.sgml
index 6738b5f4..ec833ded 100644
--- a/doc/install-packages.sgml
+++ b/doc/install-packages.sgml
@@ -38,7 +38,7 @@
 
   <para>
     For more information on the package contents, including details of installation
-    paths and relevant <link linkend="configuration-service-commands">service commands</link>,
+    paths and relevant <link linkend="configuration-file-service-commands">service commands</link>,
     see the appendix section <xref linkend="packages-centos">.
   </para>
 
@@ -167,7 +167,7 @@ $ yum install repmgr10</programlisting>
   </para>
   <para>
     For more information on the package contents, including details of installation
-    paths and relevant <link linkend="configuration-service-commands">service commands</link>,
+    paths and relevant <link linkend="configuration-file-service-commands">service commands</link>,
     see the appendix section <xref linkend="packages-debian-ubuntu">.
   </para>
 
diff --git a/doc/quickstart.sgml b/doc/quickstart.sgml
index 6d2adb4f..070a48df 100644
--- a/doc/quickstart.sgml
+++ b/doc/quickstart.sgml
@@ -234,7 +234,7 @@
   <para>
    <filename>repmgr.conf</filename> should not be stored inside the PostgreSQL data directory,
    as it could be overwritten when setting up or reinitialising the PostgreSQL
-   server. See sections on <xref linkend="configuration-file"> and <xref linkend="configuration-file-settings">
+   server. See sections <xref linkend="configuration"> and <xref linkend="configuration-file">
    for further details about <filename>repmgr.conf</filename>.
   </para>
   <tip>
diff --git a/doc/repmgrd-configuration.sgml b/doc/repmgrd-configuration.sgml
index f1cd4c8c..750e49d3 100644
--- a/doc/repmgrd-configuration.sgml
+++ b/doc/repmgrd-configuration.sgml
@@ -112,7 +112,7 @@
         particularly on <application>systemd</application>-based systems.
       </para>
       <para>
-        For more details, see <xref linkend="configuration-service-commands">.
+        For more details, see <xref linkend="configuration-file-service-commands">.
       </para>
     </sect2>
 
diff --git a/doc/switchover.sgml b/doc/switchover.sgml
index dbd32e98..000d3e8c 100644
--- a/doc/switchover.sgml
+++ b/doc/switchover.sgml
@@ -104,7 +104,7 @@
        server.
      </para>
      <para>
-       For more details, see <xref linkend="configuration-service-commands">.
+       For more details, see <xref linkend="configuration-file-service-commands">.
      </para>
    </important>