From 427a082f7db22d4432f491aa7ee3a18a62a20d29 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 23 Apr 2020 21:09:31 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../img/license_compliance_pipeline_tab_v12_3.png    | Bin 16435 -> 0 bytes
 .../img/license_compliance_pipeline_tab_v13_0.png    | Bin 0 -> 95140 bytes
 doc/user/compliance/license_compliance/index.md      |   2 +-
 doc/user/project/file_lock.md                        |   6 +++---
 doc/user/project/issues/index.md                     |   5 +++++
 doc/user/project/labels.md                           |  19 ++++++++++++-------
 6 files changed, 21 insertions(+), 11 deletions(-)
 delete mode 100644 doc/user/compliance/license_compliance/img/license_compliance_pipeline_tab_v12_3.png
 create mode 100644 doc/user/compliance/license_compliance/img/license_compliance_pipeline_tab_v13_0.png

(limited to 'doc/user')

diff --git a/doc/user/compliance/license_compliance/img/license_compliance_pipeline_tab_v12_3.png b/doc/user/compliance/license_compliance/img/license_compliance_pipeline_tab_v12_3.png
deleted file mode 100644
index fd519d63b3e..00000000000
Binary files a/doc/user/compliance/license_compliance/img/license_compliance_pipeline_tab_v12_3.png and /dev/null differ
diff --git a/doc/user/compliance/license_compliance/img/license_compliance_pipeline_tab_v13_0.png b/doc/user/compliance/license_compliance/img/license_compliance_pipeline_tab_v13_0.png
new file mode 100644
index 00000000000..5dc46dbf979
Binary files /dev/null and b/doc/user/compliance/license_compliance/img/license_compliance_pipeline_tab_v13_0.png differ
diff --git a/doc/user/compliance/license_compliance/index.md b/doc/user/compliance/license_compliance/index.md
index f9b5a1e8d3c..22b0dfb2293 100644
--- a/doc/user/compliance/license_compliance/index.md
+++ b/doc/user/compliance/license_compliance/index.md
@@ -432,7 +432,7 @@ From your project's left sidebar, navigate to **CI/CD > Pipelines** and click on
 pipeline ID that has a `license_management` job to see the Licenses tab with the listed
 licenses (if any).
 
-![License Compliance Pipeline Tab](img/license_compliance_pipeline_tab_v12_3.png)
+![License Compliance Pipeline Tab](img/license_compliance_pipeline_tab_v13_0.png)
 
 <!-- ## Troubleshooting
 
diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md
index d5f35051e9a..b5350515c30 100644
--- a/doc/user/project/file_lock.md
+++ b/doc/user/project/file_lock.md
@@ -2,9 +2,9 @@
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/440) in [GitLab Premium](https://about.gitlab.com/pricing/) 8.9.
 
-File Locking helps you avoid merge conflicts and better manage your binary files.
-Lock any file or directory, make your changes, and then unlock it so another
-member of the team can edit it.
+Working with multiple people on the same file can be a risk. Conflicts when merging a non-text file are hard to overcome and will require a lot of manual work to resolve. File Locking helps you avoid these merge conflicts and better manage your binary files.
+
+With File Locaking, you can lock any file or directory, make your changes, and then unlock it so another member of the team can edit it.
 
 ## Overview
 
diff --git a/doc/user/project/issues/index.md b/doc/user/project/issues/index.md
index 55e9967a370..bc297d5891d 100644
--- a/doc/user/project/issues/index.md
+++ b/doc/user/project/issues/index.md
@@ -28,6 +28,11 @@ you can also view all the issues collectively at the group level.
 
 See also [Always start a discussion with an issue](https://about.gitlab.com/blog/2016/03/03/start-with-an-issue/).
 
+<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
+To learn how GitLab's Strategic Marketing department uses GitLab issues with [labels](../labels.md) and
+[issue boards](../issue_board.md), see the video on
+[Managing Commitments with Issues](https://www.youtube.com/watch?v=cuIHNintg1o&t=3).
+
 ## Parts of an issue
 
 Issues contain a variety of content and metadata, enabling a large range of flexibility
diff --git a/doc/user/project/labels.md b/doc/user/project/labels.md
index 618ef9cfc47..f3b59147d5b 100644
--- a/doc/user/project/labels.md
+++ b/doc/user/project/labels.md
@@ -2,13 +2,18 @@
 
 ## Overview
 
-Labels allow you to categorize epics, issues, and merge requests using descriptive titles like
-`bug`, `feature request`, or `docs`, as well as customizable colors. They allow you to quickly
-and dynamically filter and manage epics, issues, and merge requests, and are a key
-part of [issue boards](issue_board.md).
-
-You can use labels to help [search](../search/index.md#issues-and-merge-requests) in
-lists of issues, merge requests, and epics, as well as [search in issue boards](../search/index.md#issue-boards).
+As your count of issues, merge requests, and epics grows in GitLab, it's more and more challenging
+to keep track of those items. Especially as your organization grows from just a few people to
+hundreds or thousands. This is where labels come in. They help you organize and tag your work
+so you can track and find the work items you're interested in.
+
+Labels are a key part of [issue boards](issue_board.md). With labels you can:
+
+- Categorize epics, issues, and merge requests using colors and descriptive titles like
+`bug`, `feature request`, or `docs`.
+- Dynamically filter and manage epics, issues, and merge requests.
+- [Search lists of issues, merge requests, and epics](../search/index.md#issues-and-merge-requests),
+  as well as [issue boards](../search/index.md#issue-boards).
 
 ## Project labels and group labels
 
-- 
cgit v1.2.1