Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 3 deletions

diff --git a/doc/administration/postgresql/replication_and_failover.md b/doc/administration/postgresql/replication_and_failover.md
index a1fc8c49ee3..38fb13f5a1f 100644
--- a/doc/administration/postgresql/replication_and_failover.md
+++ b/doc/administration/postgresql/replication_and_failover.md
@@ -875,10 +875,11 @@ patroni['remove_data_directory_on_diverged_timelines'] = false
 
 Patroni uses a Unix socket to manage the PostgreSQL instance. Therefore, a connection from the `local` socket must be trusted.
 
-Also, replicas use the replication user (`gitlab_replicator` by default) to communicate with the leader. For this user,
+Replicas use the replication user (`gitlab_replicator` by default) to communicate with the leader. For this user,
 you can choose between `trust` and `md5` authentication. If you set `postgresql['sql_replication_password']`,
-Patroni uses `md5` authentication, and otherwise falls back to `trust`. You must to specify the cluster CIDR in
-`postgresql['md5_auth_cidr_addresses']` or `postgresql['trust_auth_cidr_addresses']` respectively.
+Patroni uses `md5` authentication, and otherwise falls back to `trust`. 
+
+Based on the authentication you choose, you must specify the cluster CIDR in the `postgresql['md5_auth_cidr_addresses']` or `postgresql['trust_auth_cidr_addresses']` settings.
 
 ### Interacting with Patroni cluster