Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 4 deletions

diff --git a/doc/administration/high_availability/README.md b/doc/administration/high_availability/README.md
index d1d7af9f02e..56f375e7bbe 100644
--- a/doc/administration/high_availability/README.md
+++ b/doc/administration/high_availability/README.md
@@ -202,7 +202,9 @@ These reference architecture examples rely on the general rule that approximatel
 
 - **Supported Users (approximate):** 10,000
 - **RPS:** 200 requests per second
-- **Known Issues:** While validating the reference architecture, slow endpoints were discovered and are being investigated. [gitlab-org/gitlab-ce/issues/64335](https://gitlab.com/gitlab-org/gitlab-ce/issues/64335)
+- **Known Issues:** While validating the reference architecture, slow API endpoints
+  were discovered. For details, see the related issues list in
+  [this issue](https://gitlab.com/gitlab-org/gitlab-foss/issues/64335).
 
 The Support and Quality teams built, performance tested, and validated an
 environment that supports about 10,000 users. The specifications below are a
@@ -225,7 +227,7 @@ NOTE: **Note:** The specifications here were performance tested against a specif
 - **Supported Users (approximate):** 25,000
 - **RPS:** 500 requests per second
 - **Status:** Work-in-progress
-- **Related Issues:** [gitlab-org/quality/performance/issues/57](https://gitlab.com/gitlab-org/quality/performance/issues/57)
+- **Related Issue:** See the [related issue](https://gitlab.com/gitlab-org/quality/performance/issues/57) for more information.
 
 The Support and Quality teams are in the process of building and performance testing
 an environment that will support about 25,000 users. The specifications below
@@ -240,7 +242,7 @@ TBD: Add specs
 - **Supported Users (approximate):** 50,000
 - **RPS:** 1,000 requests per second
 - **Status:** Work-in-progress
-- **Related Issues:** [gitlab-org/quality/performance/issues/66](https://gitlab.com/gitlab-org/quality/performance/issues/66)
+- **Related Issue:** See the [related issue](https://gitlab.com/gitlab-org/quality/performance/issues/66) for more information.
 
 The Support and Quality teams are in the process of building and performance testing
 an environment that will support about 50,000 users. The specifications below
diff --git a/doc/administration/high_availability/database.md b/doc/administration/high_availability/database.md
index 61f5c775125..ea97ada6e2f 100644
--- a/doc/administration/high_availability/database.md
+++ b/doc/administration/high_availability/database.md
@@ -708,7 +708,7 @@ After deploying the configuration follow these steps:
 This example uses 3 PostgreSQL servers, and 1 application node.
 
 It differs from the [recommended setup](#example-recommended-setup) by moving the Consul servers into the same servers we use for PostgreSQL.
-The trade-off is between reducing server counts, against the increased operational complexity of needing to deal with postgres [failover](#failover-procedure) and [restore](#restore-procedure) procedures in addition to [Consul outage recovery](consul.md#outage-recovery) on the same set of machines.
+The trade-off is between reducing server counts, against the increased operational complexity of needing to deal with PostgreSQL [failover](#failover-procedure) and [restore](#restore-procedure) procedures in addition to [Consul outage recovery](consul.md#outage-recovery) on the same set of machines.
 
 In this example we start with all servers on the same 10.6.0.0/16 private network range, they can connect to each freely other on those addresses.