Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 13 insertions, 1 deletions

diff --git a/doc/administration/geo/disaster_recovery/index.md b/doc/administration/geo/disaster_recovery/index.md
index 5876a8c36e6..1e9b430834c 100644
--- a/doc/administration/geo/disaster_recovery/index.md
+++ b/doc/administration/geo/disaster_recovery/index.md
@@ -133,6 +133,12 @@ Note the following when promoting a secondary:
    ```
 
 1. Promote the **secondary** node to the **primary** node.
+   DANGER: **Warning:**
+   In GitLab 13.2 and 13.3, promoting a secondary node to a primary while the
+   secondary is paused fails. Do not pause replication before promoting a
+   secondary. If the node is paused, be sure to resume before promoting. This
+   issue has been fixed in GitLab 13.4 and later.
+
    CAUTION: **Caution:**
    If the secondary node [has been paused](../../geo/index.md#pausing-and-resuming-replication), this performs
    a point-in-time recovery to the last known state.
@@ -167,8 +173,14 @@ conjunction with multiple servers, as it can only
 perform changes on a **secondary** with only a single machine. Instead, you must
 do this manually.
 
+DANGER: **Warning:**
+In GitLab 13.2 and 13.3, promoting a secondary node to a primary while the
+secondary is paused fails. Do not pause replication before promoting a
+secondary. If the node is paused, be sure to resume before promoting. This
+issue has been fixed in GitLab 13.4 and later.
+
 CAUTION: **Caution:**
-If the secondary node [has been paused](../../geo/index.md#pausing-and-resuming-replication), this performs
+   If the secondary node [has been paused](../../geo/index.md#pausing-and-resuming-replication), this performs
 a point-in-time recovery to the last known state.
 Data that was created on the primary while the secondary was paused will be lost.