From 8f68344f9aa986fdc9392e78fa9a766d71133a7e Mon Sep 17 00:00:00 2001
From: Ian Barwick <ian@2ndquadrant.com>
Date: Thu, 8 Mar 2018 10:02:16 +0900
Subject: [PATCH] doc: update FAQ

Additional clarification for "repmgr standby clone --recovery-conf-only"
---
 doc/appendix-faq.sgml           | 23 ++++++++++++++---------
 doc/appendix-release-notes.sgml |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/doc/appendix-faq.sgml b/doc/appendix-faq.sgml
index 8d3581e0..cf7256a6 100644
--- a/doc/appendix-faq.sgml
+++ b/doc/appendix-faq.sgml
@@ -97,7 +97,7 @@
  <sect1 id="faq-repmgr" xreflabel="repmgr">
   <title><command>repmgr</command></title>
 
-  <sect2 id="faq-register-existing-node" xreflabel="">
+  <sect2 id="faq-register-existing-node" xreflabel="registering an existing node">
    <title>Can I register an existing PostgreSQL server with repmgr?</title>
    <para>
     Yes, any existing PostgreSQL server which is part of the same replication
@@ -105,6 +105,18 @@
     standby to have been cloned using &repmgr;.
    </para>
   </sect2>
+  <sect2 id="faq-repmgr-clone-other-source" >
+   <title>Can I use a standby not cloned by &repmgr; as a &repmgr; node?</title>
+
+   <para>
+     For a standby which has been manually cloned or recovered from an external
+     backup manager such as Barman, the command
+     <command><link linkend="repmgr-standby-clone">repmgr standby clone --recovery-conf-only</link></command>
+     can be used to create the correct <filename>recovery.conf</filename> file for
+     use with &repmgr; (and will create a replication slot if required). Once this has been done,
+     <link linkend="repmgr-standby-register">register the node</link> as usual.
+   </para>
+  </sect2>
 
   <sect2 id="faq-repmgr-failed-primary-standby" xreflabel="Reintegrate a failed primary as a standby">
    <title>How can a failed primary be re-added as a standby?</title>
@@ -203,14 +215,7 @@
    </para>
   </sect2>
 
-  <sect2 id="faq-repmgr-clone-other-source" >
-   <title>Can I use a standby not cloned by &repmgr; as a &repmgr; node?</title>
-   <para>
-     Yes - use <link linkend="repmgr-standby-create-recovery-conf">repmgr standby clone --recovery-conf-only</link> to create the node's
-     <filename>recovery.conf</filename> file, and
-     <link linkend="repmgr-standby-register">register the node</link> as usual.
-   </para>
-  </sect2>
+
 
 
  </sect1>
diff --git a/doc/appendix-release-notes.sgml b/doc/appendix-release-notes.sgml
index abfd70b5..aa8ce45f 100644
--- a/doc/appendix-release-notes.sgml
+++ b/doc/appendix-release-notes.sgml
@@ -38,7 +38,7 @@
 
           <listitem>
             <para>
-              add <command><link linkend="repmgr-standby-clone">repmgr standby clone</link> --recovery-conf-only</command>
+              add <command><link linkend="repmgr-standby-clone">repmgr standby clone --recovery-conf-only</link></command>
               option to enable integration of a standby cloned from another source into a &repmgr; cluster (GitHub #382)
             </para>
           </listitem>