summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Paquier2012-05-30 05:13:03 +0000
committerMichael Paquier2012-05-30 05:15:06 +0000
commitb646671c84bbd0070bcbe1bd5e1ba177bda153ea (patch)
treeaccedbd8b4c0d421ab3c13082b194b8453b2f69d
parent8c98163ed77abf61d2d07fcea6574ab5ec0d77f6 (diff)
Avoid index collate for recovery_target_barrier when generating documentation
recovery_target_barrier was defined twice, generating a warning when checking the documentation index unicity.
-rw-r--r--doc-xc/src/sgml/recovery-config.sgmlin27
1 files changed, 7 insertions, 20 deletions
diff --git a/doc-xc/src/sgml/recovery-config.sgmlin b/doc-xc/src/sgml/recovery-config.sgmlin
index 4a909ab037..f79b72c5b5 100644
--- a/doc-xc/src/sgml/recovery-config.sgmlin
+++ b/doc-xc/src/sgml/recovery-config.sgmlin
@@ -208,7 +208,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
At most one of <varname>recovery_target_time</>,
<xref linkend="recovery-target-name">,
<xref linkend="recovery-target-xid"> or
- <varname>recovery_target_barrier</> can be specified.
+ <xref linkend="recovery-target-barrier"> can be specified.
<!## end>
The default is to recover to the end of the WAL log.
The precise stopping point is also influenced by
@@ -240,7 +240,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
At most one of <varname>recovery_target_xid</>,
<xref linkend="recovery-target-name">,
<xref linkend="recovery-target-time"> or
- <varname>recovery_target_barrier</> can be specified.
+ <xref linkend="recovery-target-barrier"> can be specified.
The default is to recover to the end of the WAL log.
The precise stopping point is also influenced by
@@ -268,6 +268,11 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
The precise stopping point is also influenced by
<xref linkend="recovery-target-inclusive">.
</para>
+
+ <para>
+ A barrier ID, to which recovery will proceed, has to be specified with
+ <xref linkend="SQL-CREATEBARRIER">. Refer to this command for syntax details.
+ </para>
</listitem>
</varlistentry>
@@ -348,24 +353,6 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
</listitem>
</varlistentry>
-<!## XC>
- <varlistentry id="recover-target-barrier"
- xreflabel="recover_target_barrier">
- <term><varname>recovery_target_barrier</varname> (<type>string</type>)</term>
- <indexterm>
- <primary><varname>recovery_target_barrier</> recovery parameter</primary>
- </indexterm>
- <listitem>
-&xconly;
- <para>
- Specifies barrier ID to which recovery will proceed.
- See <xref linkend="SQL-CREATEBARRIER"> for syntax details of
- this command.
- </para>
- </listitem>
- </varlistentry>
-<!## end>
-
</variablelist>
</sect1>