Add latest changes from gitlab-org/gitlab@master

doc/administration/geo/replication/troubleshooting.md

@@ -701,3 +701,17 @@ See ["Foreign Data Wrapper (FDW) is not configured" error?](#foreign-data-wrappe
 This can be caused by orphaned records in the project registry. You can clear them
 [using a Rake task](../../../administration/raketasks/geo.md#remove-orphaned-project-registries).
+
+### Geo Admin Area returns 404 error for a secondary node
+
+Sometimes `sudo gitlab-rake gitlab:geo:check` indicates that the **secondary** node is
+healthy, but a 404 error for the **secondary** node is returned in the Geo Admin Area on
+the **primary** node.
+
+To resolve this issue:
+
+- Try restarting the **secondary** using `sudo gitlab-ctl restart`.
+- Check `/var/log/gitlab/gitlab-rails/geo.log` to see if the **secondary** node is
+  using IPv6 to send its status to the **primary** node. If it is, add an entry to
+  the **primary** node using IPv4 in the `/etc/hosts` file. Alternatively, you should
+  [enable IPv6 on the primary node](https://docs.gitlab.com/omnibus/settings/nginx.html#setting-the-nginx-listen-address-or-addresses).

doc/install/aws/index.md

@@ -362,7 +362,7 @@ Choose the AMI:
 You should choose an instance type based on your workload. Consult
 [the hardware requirements](../requirements.md#hardware-requirements) to choose
-one that fits your needs (at least `c4.xlarge`, which is enough to accommodate 100 users):
+one that fits your needs (at least `c5.xlarge`, which is enough to accommodate 100 users):
 1. Choose the your instance type.
 1. Click **Next: Configure Instance Details**.

doc/user/admin_area/settings/visibility_and_access_controls.md

@@ -38,7 +38,7 @@ To change the default project creation protection:
 For more details, see [Default project-creation level](../../group/index.md#default-project-creation-level).
-## Default project deletion protection
+## Default project deletion protection **(PREMIUM ONLY)**
 By default, a project can be deleted by anyone with the **Owner** role, either at the project or
 group level.