Add latest changes from gitlab-org/gitlab@master

5 files changed, 6 insertions, 7 deletions

diff --git a/doc/security/password_length_limits.md b/doc/security/password_length_limits.md
index 235730eb825..c00fd78c4d3 100644
--- a/doc/security/password_length_limits.md
+++ b/doc/security/password_length_limits.md
@@ -49,7 +49,7 @@ From GitLab 12.6, the minimum password length set in this configuration file wil
 The user password length is set to a minimum of 8 characters by default.
 To change that using GitLab UI:
 
-In the Admin area under **Settings** (`/admin/application_settings`), go to section **Sign-up Restrictions**.
+In **Admin Area > Settings** (`/admin/application_settings`), go to the section **Sign-up restrictions**.
 
 [Minimum password length settings](../user/admin_area/img/minimum_password_length_settings_v12_6.png)
 
diff --git a/doc/security/ssh_keys_restrictions.md b/doc/security/ssh_keys_restrictions.md
index 4c60daf77f4..176b09168c4 100644
--- a/doc/security/ssh_keys_restrictions.md
+++ b/doc/security/ssh_keys_restrictions.md
@@ -17,8 +17,8 @@ algorithms.
 GitLab allows you to restrict the allowed SSH key technology as well as specify
 the minimum key length for each technology.
 
-In the Admin area under **Settings** (`/admin/application_settings`), look for
-the "Visibility and Access Controls" area:
+In **Admin Area > Settings** (`/admin/application_settings`), expand the
+**Visibility and access controls** section:
 
 ![SSH keys restriction admin settings](img/ssh_keys_restrictions_settings.png)
 
diff --git a/doc/security/two_factor_authentication.md b/doc/security/two_factor_authentication.md
index defc4669e69..39f92f95ba1 100644
--- a/doc/security/two_factor_authentication.md
+++ b/doc/security/two_factor_authentication.md
@@ -25,7 +25,7 @@ won't be able to leave the 2FA configuration area at `/profile/two_factor_auth`.
 
 To enable 2FA for all users:
 
-1. Navigate to **Admin area > Settings > General** (`/admin/application_settings`).
+1. Navigate to **Admin Area > Settings > General** (`/admin/application_settings`).
 1. Expand the **Sign-in restrictions** section, where you can configure both.
 
 If you want 2FA enforcement to take effect on next login, change the grace
diff --git a/doc/security/user_email_confirmation.md b/doc/security/user_email_confirmation.md
index 7ba50acbb06..3abfbe96a59 100644
--- a/doc/security/user_email_confirmation.md
+++ b/doc/security/user_email_confirmation.md
@@ -8,7 +8,7 @@ GitLab can be configured to require confirmation of a user's email address when
 the user signs up. When this setting is enabled, the user is unable to sign in until
 they confirm their email address.
 
-In the Admin area under **Settings** (`/admin/application_settings`), go to section
+In **Admin Area > Settings** (`/admin/application_settings`), go to the section
 **Sign-up Restrictions** and look for the **Send confirmation email on sign-up** option.
 
 <!-- ## Troubleshooting
diff --git a/doc/security/webhooks.md b/doc/security/webhooks.md
index d7baf786906..8570228ee96 100644
--- a/doc/security/webhooks.md
+++ b/doc/security/webhooks.md
@@ -40,8 +40,7 @@ to `127.0.0.1`, `::1` and `0.0.0.0`, as well as IPv4 `10.0.0.0/8`, `172.16.0.0/1
 
 This behavior can be overridden by enabling the option *"Allow requests to the
 local network from web hooks and services"* in the *"Outbound requests"* section
-inside the Admin area under **Settings**
-(`/admin/application_settings/network`):
+inside the **Admin Area > Settings** (`/admin/application_settings/network`):
 
 ![Outbound requests admin settings](img/outbound_requests_section_v12_2.png)