aboutsummaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2010-04-07 10:58:49 +0000
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2010-04-07 10:58:49 +0000
commit0f11ed5886ce797d816177f5a915a22d85dd7400 (patch)
treecb652ecb8a5e0a0b7f2760929ca82fb605d32ac4 /doc/src
parent370f770c15a4c08094298685887d8a512267c369 (diff)
downloadpostgresql-0f11ed5886ce797d816177f5a915a22d85dd7400.tar.gz
postgresql-0f11ed5886ce797d816177f5a915a22d85dd7400.zip
Allow quotes to be escaped in recovery.conf, by doubling them. This patch
also makes the parsing a little bit stricter, rejecting garbage after the parameter value and values with missing ending quotes, for example.
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/recovery-config.sgml10
1 files changed, 9 insertions, 1 deletions
diff --git a/doc/src/sgml/recovery-config.sgml b/doc/src/sgml/recovery-config.sgml
index 3a6a31cb53d..85d3b7eb3fb 100644
--- a/doc/src/sgml/recovery-config.sgml
+++ b/doc/src/sgml/recovery-config.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/recovery-config.sgml,v 2.3 2010/03/18 09:17:18 heikki Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/recovery-config.sgml,v 2.4 2010/04/07 10:58:49 heikki Exp $ -->
<chapter Id="recovery-config">
<title>Recovery Configuration</title>
@@ -18,6 +18,14 @@
be changed once recovery has begun.
</para>
+ <para>
+ Settings in <filename>recovery.conf</> are specified in the format
+ <literal>name = 'value'</>. One parameter is specified per line.
+ Hash marks (<literal>#</literal>) designate the rest of the
+ line as a comment. To embed a single quote in a parameter
+ value, write two quotes (<literal>''</>).
+ </para>
+
<sect1 id="archive-recovery-settings">
<title>Archive recovery settings</title>