diff --git a/doc/cloning-standbys.sgml b/doc/cloning-standbys.sgml
index a30add59..7b95dbf9 100644
--- a/doc/cloning-standbys.sgml
+++ b/doc/cloning-standbys.sgml
@@ -1,7 +1,5 @@
 <chapter id="cloning-standbys" xreflabel="cloning standbys">
  <title>Cloning standbys</title>
- <para>
- </para>
 
  <sect1 id="cloning-from-barman" xreflabel="Cloning from Barman">
    <indexterm>
diff --git a/doc/event-notifications.sgml b/doc/event-notifications.sgml
index c95c6fe0..11bed7de 100644
--- a/doc/event-notifications.sgml
+++ b/doc/event-notifications.sgml
@@ -1,4 +1,9 @@
 <chapter id="event-notifications" xreflabel="event notifications">
+
+ <indexterm>
+   <primary>event notifications</primary>
+ </indexterm>
+
  <title>Event Notifications</title>
  <para>
   Each time &repmgr; or <application>repmgrd</application> perform a significant event, a record
diff --git a/doc/install-requirements.sgml b/doc/install-requirements.sgml
index b36942ab..5ac88f9e 100644
--- a/doc/install-requirements.sgml
+++ b/doc/install-requirements.sgml
@@ -1,4 +1,10 @@
 <sect1 id="install-requirements" xreflabel="installation requirements">
+
+  <indexterm>
+   <primary>installation</primary>
+   <secondary>requirements</secondary>
+  </indexterm>
+
   <title>Requirements for installing repmgr</title>
   <para>
     repmgr is developed and tested on Linux and OS X, but should work on any
diff --git a/doc/promoting-standby.sgml b/doc/promoting-standby.sgml
index 95cf1158..5822f255 100644
--- a/doc/promoting-standby.sgml
+++ b/doc/promoting-standby.sgml
@@ -1,4 +1,8 @@
 <chapter id="promoting-standby" xreflabel="Promoting a standby">
+ <indexterm>
+   <primary>promoting a standby</primary>
+   <seealso>repmgr standby promote</seealso>
+ </indexterm>
  <title>Promoting a standby server with repmgr</title>
  <para>
    If a primary server fails or needs to be removed from the replication cluster,
diff --git a/doc/repmgr-node-rejoin.sgml b/doc/repmgr-node-rejoin.sgml
index cd7e1e24..6c4b8450 100644
--- a/doc/repmgr-node-rejoin.sgml
+++ b/doc/repmgr-node-rejoin.sgml
@@ -1,7 +1,9 @@
 <chapter id="repmgr-node-rejoin" xreflabel="repmgr node rejoin">
+
   <indexterm>
     <primary>repmgr node rejoin</primary>
   </indexterm>
+
   <title>repmgr node rejoin</title>
   <para>
    Enables a dormant (stopped) node to be rejoined to the replication cluster.
@@ -29,7 +31,7 @@
       <application>pg_rewind</application>.
       <programlisting>
         rm -f /var/lib/pgsql/data/recovery.conf
-        postgres --single -D /var/lib/pgsql/data/ < /dev/null
+        postgres --single -D /var/lib/pgsql/data/ &lt; /dev/null</programlisting>
     </para>
   </tip>
   <para>
diff --git a/doc/repmgrd-automatic-failover.sgml b/doc/repmgrd-automatic-failover.sgml
index e3ccfdc2..ee3556eb 100644
--- a/doc/repmgrd-automatic-failover.sgml
+++ b/doc/repmgrd-automatic-failover.sgml
@@ -1,4 +1,9 @@
 <chapter id="repmgrd-automatic-failover" xreflabel="Automatic failover with repmgrd">
+ <indexterm>
+   <primary>repmgrd</primary>
+   <secondary>automatic failover</secondary>
+ </indexterm>
+
  <title>Automatic failover with repmgrd</title>
 
  <para>
diff --git a/doc/repmgrd-cascading-replication.sgml b/doc/repmgrd-cascading-replication.sgml
index b2c0cdf2..dfa8809b 100644
--- a/doc/repmgrd-cascading-replication.sgml
+++ b/doc/repmgrd-cascading-replication.sgml
@@ -1,4 +1,9 @@
 <chapter id="repmgrd-cascading-replication">
+ <indexterm>
+   <primary>repmgrd</primary>
+   <secondary>cascading replication</secondary>
+ </indexterm>
+
  <title>repmgrd and cascading replication</title>
  <para>
   Cascading replication - where a standby can connect to an upstream node and not
diff --git a/doc/repmgrd-configuration.sgml b/doc/repmgrd-configuration.sgml
index b520a3d8..d4377bd1 100644
--- a/doc/repmgrd-configuration.sgml
+++ b/doc/repmgrd-configuration.sgml
@@ -1,4 +1,10 @@
 <chapter id="repmgrd-configuration">
+
+ <indexterm>
+   <primary>repmgrd</primary>
+   <secondary>configuration</secondary>
+ </indexterm>
+
  <title>repmgrd configuration</title>
  <para>
   To use <application>repmgrd</application>, its associated function library must be
diff --git a/doc/repmgrd-degraded-monitoring.sgml b/doc/repmgrd-degraded-monitoring.sgml
index 3b9f784f..b2f3ac71 100644
--- a/doc/repmgrd-degraded-monitoring.sgml
+++ b/doc/repmgrd-degraded-monitoring.sgml
@@ -1,4 +1,9 @@
 <chapter id="repmgrd-degraded-monitoring">
+ <indexterm>
+   <primary>repmgrd</primary>
+   <secondary>degraded monitoring</secondary>
+ </indexterm>
+
  <title>"degraded monitoring" mode</title>
  <para>
   In certain circumstances, <application>repmgrd</application> is not able to fulfill its primary mission
diff --git a/doc/repmgrd-monitoring.sgml b/doc/repmgrd-monitoring.sgml
index 7b3ff6ce..f2ad9d57 100644
--- a/doc/repmgrd-monitoring.sgml
+++ b/doc/repmgrd-monitoring.sgml
@@ -1,4 +1,9 @@
 <chapter id="repmgrd-monitoring">
+ <indexterm>
+   <primary>repmgrd</primary>
+   <secondary>monitoring</secondary>
+ </indexterm>
+
  <title>Monitoring with repmgrd</title>
  <para>
   When `repmgrd` is running with the option <literal>monitoring_history=true</literal>,
diff --git a/doc/repmgrd-network-split.sgml b/doc/repmgrd-network-split.sgml
index 923ec598..6dd5eebe 100644
--- a/doc/repmgrd-network-split.sgml
+++ b/doc/repmgrd-network-split.sgml
@@ -1,4 +1,9 @@
 <chapter id="repmgrd-network-split">
+ <indexterm>
+   <primary>repmgrd</primary>
+   <secondary>network splits</secondary>
+ </indexterm>
+
  <title>Handling network splits with repmgrd</title>
  <para>
   A common pattern for replication cluster setups is to spread servers over