Add latest changes from gitlab-org/gitlab@master

7 files changed, 6 insertions, 5 deletions

diff --git a/doc/administration/monitoring/performance/grafana_configuration.md b/doc/administration/monitoring/performance/grafana_configuration.md
index 5f3882918a8..9047a572fd2 100644
--- a/doc/administration/monitoring/performance/grafana_configuration.md
+++ b/doc/administration/monitoring/performance/grafana_configuration.md
@@ -113,14 +113,14 @@ repository for more information on this process.
 
 If you have set up Grafana, you can enable a link to access it easily from the sidebar:
 
-1. Go to the admin area under **Settings > Metrics and profiling**
-   and expand "Metrics - Grafana".
+1. Go to the **Admin Area > Settings > Metrics and profiling**.
+1. Expand **Metrics - Grafana**.
 1. Check the "Enable access to Grafana" checkbox.
 1. If Grafana is enabled through Omnibus GitLab and on the same server,
    leave "Grafana URL" unchanged. In any other case, enter the full URL
    path of the Grafana instance.
 1. Click **Save changes**.
-1. The new link will be available in the admin area under **Monitoring > Metrics Dashboard**.
+1. The new link will be available in the **Admin Area > Monitoring > Metrics Dashboard**.
 
 ## Security Update
 
diff --git a/doc/administration/monitoring/performance/img/performance_bar.png b/doc/administration/monitoring/performance/img/performance_bar.png
index d206d5a4268..be06e0b2f94 100644
--- a/doc/administration/monitoring/performance/img/performance_bar.png
+++ b/doc/administration/monitoring/performance/img/performance_bar.png
diff --git a/doc/administration/monitoring/performance/img/performance_bar_frontend.png b/doc/administration/monitoring/performance/img/performance_bar_frontend.png
index 489f855fe33..32a241e032b 100644
--- a/doc/administration/monitoring/performance/img/performance_bar_frontend.png
+++ b/doc/administration/monitoring/performance/img/performance_bar_frontend.png
diff --git a/doc/administration/monitoring/performance/img/performance_bar_gitaly_threshold.png b/doc/administration/monitoring/performance/img/performance_bar_gitaly_threshold.png
index d4bf5c69ffa..4e42d904cdf 100644
--- a/doc/administration/monitoring/performance/img/performance_bar_gitaly_threshold.png
+++ b/doc/administration/monitoring/performance/img/performance_bar_gitaly_threshold.png
diff --git a/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning.png b/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning.png
index 966549554a4..74711387ffe 100644
--- a/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning.png
+++ b/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning.png
diff --git a/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning_expanded.png b/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning_expanded.png
index 3362186bb48..36553f513e1 100644
--- a/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning_expanded.png
+++ b/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning_expanded.png
diff --git a/doc/administration/monitoring/performance/performance_bar.md b/doc/administration/monitoring/performance/performance_bar.md
index 98c611ea140..fe4c29fbb01 100644
--- a/doc/administration/monitoring/performance/performance_bar.md
+++ b/doc/administration/monitoring/performance/performance_bar.md
@@ -52,8 +52,9 @@ And requests with warnings are indicated in the request selector with a
 ## Enable the Performance Bar via the Admin panel
 
 GitLab Performance Bar is disabled by default. To enable it for a given group,
-navigate to the Admin area in **Settings > Metrics and Profiling > Profiling - Performance bar**
-(`admin/application_settings/metrics_and_profiling`).
+navigate to **Admin Area > Settings > Metrics and profiling**
+(`admin/application_settings/metrics_and_profiling`), and expand the section
+**Profiling - Performance bar**.
 
 The only required setting you need to set is the full path of the group that
 will be allowed to display the Performance Bar.