From a1ef920e27ba6ab3602aaf6d6751d8628fac1af8 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 7 Aug 2017 17:42:47 -0400 Subject: Remove uses of "slave" in replication contexts This affects mostly code comments, some documentation, and tests. Official APIs already used "standby". --- doc/src/sgml/high-availability.sgml | 2 +- doc/src/sgml/ref/pgupgrade.sgml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/src') diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml index 138bdf2a75..a4494a3494 100644 --- a/doc/src/sgml/high-availability.sgml +++ b/doc/src/sgml/high-availability.sgml @@ -40,7 +40,7 @@ server to modify the data. Servers that can modify data are called read/write, master or primary servers. Servers that track changes in the master are called standby - or slave servers. A standby server that cannot be connected + or secondary servers. A standby server that cannot be connected to until it is promoted to a master server is called a warm standby server, and one that can accept connections and serves read-only queries is called a hot standby server. diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml index ac7ec9f23c..d44431803b 100644 --- a/doc/src/sgml/ref/pgupgrade.sgml +++ b/doc/src/sgml/ref/pgupgrade.sgml @@ -483,7 +483,7 @@ pg_upgrade.exe From a directory that is above the old and new database cluster - directories, run this for each slave: + directories, run this for each standby: rsync --archive --delete --hard-links --size-only old_pgdata new_pgdata remote_dir @@ -517,7 +517,7 @@ rsync --archive --delete --hard-links --size-only old_pgdata new_pgdata remote_d Configure the servers for log shipping. (You do not need to run pg_start_backup() and pg_stop_backup() - or take a file system backup as the slaves are still synchronized + or take a file system backup as the standbys are still synchronized with the master.) -- cgit v1.2.3