From 5e7bbb528638c0f6d585bab107ec7a19e3a39deb Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Sun, 14 Jun 2020 14:05:18 -0700 Subject: code: replace 'master' with 'primary' where appropriate. Also changed "in the primary" to "on the primary", and added a few "the" before "primary". Author: Andres Freund Reviewed-By: David Steele Discussion: https://postgr.es/m/20200615182235.x7lch5n6kcjq4aue@alap3.anarazel.de --- src/backend/utils/misc/postgresql.conf.sample | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/backend/utils/misc/postgresql.conf.sample') diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 0d98e546a6b..e430e33c7b4 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -284,7 +284,7 @@ # - Sending Servers - -# Set these on the master and on any standby that will send replication data. +# Set these on the primary and on any standby that will send replication data. #max_wal_senders = 10 # max number of walsender processes # (change requires restart) @@ -297,7 +297,7 @@ #track_commit_timestamp = off # collect timestamp of transaction commit # (change requires restart) -# - Master Server - +# - Primary Server - # These settings are ignored on a standby server. @@ -309,7 +309,7 @@ # - Standby Servers - -# These settings are ignored on a master server. +# These settings are ignored on a primary server. #primary_conninfo = '' # connection string to sending server #primary_slot_name = '' # replication slot on sending server @@ -329,7 +329,7 @@ #hot_standby_feedback = off # send info from standby to prevent # query conflicts #wal_receiver_timeout = 60s # time that receiver waits for - # communication from master + # communication from primary # in milliseconds; 0 disables #wal_retrieve_retry_interval = 5s # time to wait before retrying to # retrieve WAL after a failed attempt -- cgit v1.2.3