diff options
| author | Peter Eisentraut | 2017-08-07 21:42:47 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2017-08-11 02:55:41 +0000 |
| commit | a1ef920e27ba6ab3602aaf6d6751d8628fac1af8 (patch) | |
| tree | 51485b2898ae4b01b2e71ad5e40a7d3b02d75f91 /doc/src | |
| parent | d6391b03b3025372620925e5746e65c288a1e371 (diff) | |
Remove uses of "slave" in replication contexts
This affects mostly code comments, some documentation, and tests.
Official APIs already used "standby".
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/high-availability.sgml | 2 | ||||
| -rw-r--r-- | doc/src/sgml/ref/pgupgrade.sgml | 4 |
2 files changed, 3 insertions, 3 deletions
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, <firstterm>master</> or <firstterm>primary</> servers. Servers that track changes in the master are called <firstterm>standby</> - or <firstterm>slave</> servers. A standby server that cannot be connected + or <firstterm>secondary</> servers. A standby server that cannot be connected to until it is promoted to a master server is called a <firstterm>warm standby</> server, and one that can accept connections and serves read-only queries is called a <firstterm>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 <para> From a directory that is above the old and new database cluster - directories, run this for each slave: + directories, run this for each standby: <programlisting> 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 <para> Configure the servers for log shipping. (You do not need to run <function>pg_start_backup()</> and <function>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.) </para> </step> |