diff options
| author | Andres Freund <andres@anarazel.de> | 2020-06-15 10:12:58 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2020-07-08 13:03:32 -0700 |
| commit | 9e101cf60612f4be4f855d7393531900c2986a55 (patch) | |
| tree | 098e2f7d753441658fe86446750126bbb5c4a52e /doc/src/sgml/ref | |
| parent | e07633646a22734e85d7fc58a66855f747128e6b (diff) | |
| download | postgresql-9e101cf60612f4be4f855d7393531900c2986a55.tar.gz postgresql-9e101cf60612f4be4f855d7393531900c2986a55.zip | |
docs: 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
Diffstat (limited to 'doc/src/sgml/ref')
| -rw-r--r-- | doc/src/sgml/ref/pg_basebackup.sgml | 10 | ||||
| -rw-r--r-- | doc/src/sgml/ref/pg_rewind.sgml | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml index db480be674a..e2a01be895d 100644 --- a/doc/src/sgml/ref/pg_basebackup.sgml +++ b/doc/src/sgml/ref/pg_basebackup.sgml @@ -65,11 +65,11 @@ PostgreSQL documentation <para> <application>pg_basebackup</application> can make a base backup from - not only the master but also the standby. To take a backup from the standby, + not only the primary but also the standby. To take a backup from the standby, set up the standby so that it can accept replication connections (that is, set <varname>max_wal_senders</varname> and <xref linkend="guc-hot-standby"/>, and configure <link linkend="auth-pg-hba-conf">host-based authentication</link>). - You will also need to enable <xref linkend="guc-full-page-writes"/> on the master. + You will also need to enable <xref linkend="guc-full-page-writes"/> on the primary. </para> <para> @@ -89,13 +89,13 @@ PostgreSQL documentation </listitem> <listitem> <para> - If the standby is promoted to the master during online backup, the backup fails. + If the standby is promoted to the primary during online backup, the backup fails. </para> </listitem> <listitem> <para> All WAL records required for the backup must contain sufficient full-page writes, - which requires you to enable <varname>full_page_writes</varname> on the master and + which requires you to enable <varname>full_page_writes</varname> on the primary and not to use a tool like <application>pg_compresslog</application> as <varname>archive_command</varname> to remove full-page writes from WAL files. </para> @@ -328,7 +328,7 @@ PostgreSQL documentation it will use up two connections configured by the <xref linkend="guc-max-wal-senders"/> parameter. As long as the client can keep up with write-ahead log received, using this mode - requires no extra write-ahead logs to be saved on the master. + requires no extra write-ahead logs to be saved on the primary. </para> <para> When tar format mode is used, the write-ahead log files will be diff --git a/doc/src/sgml/ref/pg_rewind.sgml b/doc/src/sgml/ref/pg_rewind.sgml index 9ae1bf3ab6e..440eed7d4b7 100644 --- a/doc/src/sgml/ref/pg_rewind.sgml +++ b/doc/src/sgml/ref/pg_rewind.sgml @@ -43,8 +43,8 @@ PostgreSQL documentation <para> <application>pg_rewind</application> is a tool for synchronizing a PostgreSQL cluster with another copy of the same cluster, after the clusters' timelines have - diverged. A typical scenario is to bring an old master server back online - after failover as a standby that follows the new master. + diverged. A typical scenario is to bring an old primary server back online + after failover as a standby that follows the new primary. </para> <para> |