summaryrefslogtreecommitdiff
path: root/src/port/quotes.c
diff options
context:
space:
mode:
authorPeter Eisentraut2018-11-25 15:31:16 +0000
committerPeter Eisentraut2018-11-25 15:33:40 +0000
commit2dedf4d9a899b36d1a8ed29be5efbd1b31a8fe85 (patch)
tree5564005e2fe623af69b01d56c9c72baf8ec68402 /src/port/quotes.c
parentab69ea9feeb9a02c6299b5c1b786005552343f22 (diff)
Integrate recovery.conf into postgresql.conf
recovery.conf settings are now set in postgresql.conf (or other GUC sources). Currently, all the affected settings are PGC_POSTMASTER; this could be refined in the future case by case. Recovery is now initiated by a file recovery.signal. Standby mode is initiated by a file standby.signal. The standby_mode setting is gone. If a recovery.conf file is found, an error is issued. The trigger_file setting has been renamed to promote_trigger_file as part of the move. The documentation chapter "Recovery Configuration" has been integrated into "Server Configuration". pg_basebackup -R now appends settings to postgresql.auto.conf and creates a standby.signal file. Author: Fujii Masao <[email protected]> Author: Simon Riggs <[email protected]> Author: Abhijit Menon-Sen <[email protected]> Author: Sergei Kornilov <[email protected]> Discussion: https://www.postgresql.org/message-id/flat/[email protected]/
Diffstat (limited to 'src/port/quotes.c')
-rw-r--r--src/port/quotes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/port/quotes.c b/src/port/quotes.c
index 29770c7a00e..94b63b9bb64 100644
--- a/src/port/quotes.c
+++ b/src/port/quotes.c
@@ -19,7 +19,7 @@
* Escape (by doubling) any single quotes or backslashes in given string
*
* Note: this is used to process postgresql.conf entries and to quote
- * string literals in pg_basebackup for creating recovery.conf.
+ * string literals in pg_basebackup for writing the recovery configuration.
* Since postgresql.conf strings are defined to treat backslashes as escapes,
* we have to double backslashes here.
*