Add latest changes from gitlab-org/gitlab@master

10 files changed, 6 insertions, 6 deletions

diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md
index 2d827f53fcf..cf160f59040 100644
--- a/doc/integration/elasticsearch.md
+++ b/doc/integration/elasticsearch.md
@@ -40,7 +40,7 @@ NOTE: **Note:**
 **For a single node Elasticsearch cluster the functional cluster health status will be yellow** (will never be green) because the primary shard is allocated but replicas can not be as there is no other node to which Elasticsearch can assign a replica.
 
 Once the data is added to the database or repository and [Elasticsearch is
-enabled in the admin area](#enabling-elasticsearch) the search index will be
+enabled in the Admin Area](#enabling-elasticsearch) the search index will be
 updated automatically.
 
 ## Elasticsearch repository indexer
@@ -201,7 +201,7 @@ To backfill existing data, you can use one of the methods below to index it in b
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/15390) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.3.
 
-To index via the admin area:
+To index via the Admin Area:
 
 1. [Configure your Elasticsearch host and port](#enabling-elasticsearch).
 1. Create empty indexes using one of the following commands:
diff --git a/doc/integration/img/authorize_vault_with_gitlab_v12_6.png b/doc/integration/img/authorize_vault_with_gitlab_v12_6.png
index dc5bc954cd7..2c9810bc9e8 100644
--- a/doc/integration/img/authorize_vault_with_gitlab_v12_6.png
+++ b/doc/integration/img/authorize_vault_with_gitlab_v12_6.png
diff --git a/doc/integration/img/gitlab_oauth_vault_v12_6.png b/doc/integration/img/gitlab_oauth_vault_v12_6.png
index f952abc2c6d..08fc56c8ec9 100644
--- a/doc/integration/img/gitlab_oauth_vault_v12_6.png
+++ b/doc/integration/img/gitlab_oauth_vault_v12_6.png
diff --git a/doc/integration/img/sign_into_vault_with_gitlab_v12_6.png b/doc/integration/img/sign_into_vault_with_gitlab_v12_6.png
index 8afa2c6aabd..474473e334d 100644
--- a/doc/integration/img/sign_into_vault_with_gitlab_v12_6.png
+++ b/doc/integration/img/sign_into_vault_with_gitlab_v12_6.png
diff --git a/doc/integration/img/signed_into_vault_via_oidc_v12_6.png b/doc/integration/img/signed_into_vault_via_oidc_v12_6.png
index 0ad81ef40e6..0a7f86ff5f0 100644
--- a/doc/integration/img/signed_into_vault_via_oidc_v12_6.png
+++ b/doc/integration/img/signed_into_vault_via_oidc_v12_6.png
diff --git a/doc/integration/img/sourcegraph_admin_v12_5.png b/doc/integration/img/sourcegraph_admin_v12_5.png
index 23e38f56619..54511541c87 100644
--- a/doc/integration/img/sourcegraph_admin_v12_5.png
+++ b/doc/integration/img/sourcegraph_admin_v12_5.png
diff --git a/doc/integration/img/sourcegraph_demo_v12_5.png b/doc/integration/img/sourcegraph_demo_v12_5.png
index c70448c0a8a..35a2e2a89e3 100644
--- a/doc/integration/img/sourcegraph_demo_v12_5.png
+++ b/doc/integration/img/sourcegraph_demo_v12_5.png
diff --git a/doc/integration/img/sourcegraph_popover_v12_5.png b/doc/integration/img/sourcegraph_popover_v12_5.png
index 878d6143646..62fa48129b2 100644
--- a/doc/integration/img/sourcegraph_popover_v12_5.png
+++ b/doc/integration/img/sourcegraph_popover_v12_5.png
diff --git a/doc/integration/img/sourcegraph_user_preferences_v12_5.png b/doc/integration/img/sourcegraph_user_preferences_v12_5.png
index 2c0e138e296..7b7f8945431 100644
--- a/doc/integration/img/sourcegraph_user_preferences_v12_5.png
+++ b/doc/integration/img/sourcegraph_user_preferences_v12_5.png
diff --git a/doc/integration/oauth_provider.md b/doc/integration/oauth_provider.md
index 36b4836e6b3..6c9b272f35b 100644
--- a/doc/integration/oauth_provider.md
+++ b/doc/integration/oauth_provider.md
@@ -26,7 +26,7 @@ The 'GitLab Importer' feature is also using the OAuth protocol to give access
 to repositories without sharing user credentials to your GitLab.com account.
 
 GitLab supports two ways of adding a new OAuth2 application to an instance. You
-can either add an application as a regular user or add it in the admin area.
+can either add an application as a regular user or add it in the Admin Area.
 What this means is that GitLab can actually have instance-wide and a user-wide
 applications. There is no difference between them except for the different
 permission levels they are set (user/admin). The default callback URL is
@@ -51,14 +51,14 @@ connects to GitLab.
 
 ![OAuth application ID and secret](img/oauth_provider_application_id_secret.png)
 
-## OAuth applications in the admin area
+## OAuth applications in the Admin Area
 
 To create an application that does not belong to a certain user, you can create
-it from the admin area.
+it from the Admin Area.
 
 ![OAuth admin_applications](img/oauth_provider_admin_application.png)
 
-You're also able to mark an application as _trusted_ when creating it through the admin area. By doing that,
+You're also able to mark an application as _trusted_ when creating it through the Admin Area. By doing that,
 the user authorization step is automatically skipped for this application.
 
 ## Authorized applications