Add latest changes from gitlab-org/gitlab@13-1-stable-ee

4 files changed, 51 insertions, 49 deletions

diff --git a/doc/user/group/epics/img/bulk_editing.png b/doc/user/group/epics/img/bulk_editing.png
deleted file mode 100644
index 85610bef83e..00000000000
--- a/doc/user/group/epics/img/bulk_editing.png
+++ /dev/null
diff --git a/doc/user/group/epics/img/issue_list_v13_1.png b/doc/user/group/epics/img/issue_list_v13_1.png
new file mode 100644
index 00000000000..f08f774e986
--- /dev/null
+++ b/doc/user/group/epics/img/issue_list_v13_1.png
diff --git a/doc/user/group/epics/index.md b/doc/user/group/epics/index.md
index d53acaf502a..85164292265 100644
--- a/doc/user/group/epics/index.md
+++ b/doc/user/group/epics/index.md
@@ -1,11 +1,14 @@
 ---
 type: reference, howto
+stage: Plan
+group: Portfolio Management
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
 ---
 
 # Epics **(PREMIUM)**
 
 > - Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.2.
-> - Single-level Epics [were moved](https://gitlab.com/gitlab-org/gitlab/issues/37081) to [GitLab Premium](https://about.gitlab.com/pricing/) in 12.8.
+> - Single-level Epics [were moved](https://gitlab.com/gitlab-org/gitlab/-/issues/37081) to [GitLab Premium](https://about.gitlab.com/pricing/) in 12.8.
 
 Epics let you manage your portfolio of projects more efficiently and with less
 effort by tracking groups of issues that share a theme, across projects and
@@ -25,7 +28,7 @@ milestones.
 To learn what you can do with an epic, see [Manage epics](manage_epics.md). Possible actions include:
 
 - [Create an epic](manage_epics.md#create-an-epic)
-- [Bulk-edit epics](manage_epics.md#bulk-edit-epics)
+- [Bulk-edit epics](../bulk_editing/index.md#bulk-edit-epics)
 - [Delete an epic](manage_epics.md#delete-an-epic)
 - [Close an epic](manage_epics.md#close-an-epic)
 - [Reopen a closed epic](manage_epics.md#reopen-a-closed-epic)
@@ -67,7 +70,7 @@ This feature comes with a feature flag enabled by default. For steps to disable
 
 ## Multi-level child epics **(ULTIMATE)**
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/8333) in GitLab Ultimate 11.7.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/8333) in GitLab Ultimate 11.7.
 
 Any epic that belongs to a group, or subgroup of the parent epic's group, is eligible to be added.
 New child epics appear at the top of the list of epics in the **Epics and Issues** tab.
@@ -86,11 +89,11 @@ To set a **Start date** and **Due date** for an epic, select one of the followin
 - **Fixed**: Enter a fixed value.
 - **From milestones**: Inherit a dynamic value from the milestones currently assigned to the epic's issues.
   Note that GitLab 12.5 replaced this option with **Inherited**.
-- **Inherited**: Inherit a dynamic value from the epic's issues, child epics, and milestones ([Introduced](https://gitlab.com/gitlab-org/gitlab/issues/7332) in GitLab 12.5 to replace **From milestones**).
+- **Inherited**: Inherit a dynamic value from the epic's issues, child epics, and milestones ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7332) in GitLab 12.5 to replace **From milestones**).
 
 ### From milestones
 
-> [Replaced](https://gitlab.com/gitlab-org/gitlab/issues/7332) in GitLab 12.5 by **Inherited**.
+> [Replaced](https://gitlab.com/gitlab-org/gitlab/-/issues/7332) in GitLab 12.5 by **Inherited**.
 
 If you select **From milestones** for the start date, GitLab will automatically set the date to be earliest
 start date across all milestones that are currently assigned to the issues that are added to the epic.
@@ -105,7 +108,7 @@ These are dynamic dates which are recalculated if any of the following occur:
 
 ### Inherited
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/7332) in GitLab 12.5 to replace **From milestones**.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7332) in GitLab 12.5 to replace **From milestones**.
 
 If you select:
 
@@ -127,7 +130,7 @@ then the parent epic's start date will reflect the change and this will propagat
 
 ## Roadmap in epics
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/7327) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.10.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7327) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.10.
 
 If your epic contains one or more [child epics](#multi-level-child-epics-ultimate) which
 have a [start or due date](#start-date-and-due-date), a
diff --git a/doc/user/group/epics/manage_epics.md b/doc/user/group/epics/manage_epics.md
index 50eb0c64f4b..26d5cb51e01 100644
--- a/doc/user/group/epics/manage_epics.md
+++ b/doc/user/group/epics/manage_epics.md
@@ -1,8 +1,11 @@
 ---
 type: howto
+stage: Plan
+group: Portfolio Management
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
 ---
 
-<!-- When adding a new section here, remember to mention it in index.md#manage-epics -->
+<!-- When adding a new h2 section here, remember to mention it in index.md#manage-epics -->
 
 # Manage epics **(PREMIUM)**
 
@@ -30,7 +33,8 @@ You will be taken to the new epic where can edit the following details:
 
 An epic's page contains the following tabs:
 
-- **Epics and Issues**: epics and issues added to this epic. Child epics, and their issues, are shown in a tree view.
+- **Epics and Issues**: epics and issues added to this epic. Child epics, and their issues, are
+  shown in a tree view.
   - Click the <kbd>></kbd> beside a parent epic to reveal the child epics and issues.
   - Hover over the total counts to see a breakdown of open and closed items.
 - **Roadmap**: a roadmap view of child epics which have start and due dates.
@@ -39,17 +43,8 @@ An epic's page contains the following tabs:
 
 ## Bulk-edit epics
 
-You can edit multiple epics at once. For example, to apply labels to multiple epics:
-
-1. Go to the Epics list.
-1. Click **Edit epics**.
-    - Checkboxes appear next to each epic.
-    - A sidebar on the right-hand side appears with an editable field for labels.
-1. Select the checkbox next to each epic to be edited.
-1. Select the labels you want.
-1. Click **Update all**.
-
-![bulk editing](img/bulk_editing.png)
+You can edit multiple epics at once. To learn how to do it, visit
+[Bulk editing issues, epics, and merge requests at the group level](../bulk_editing/index.md#bulk-edit-epics).
 
 ## Delete an epic
 
@@ -92,7 +87,7 @@ link in the issue sidebar.
 ## Search for an epic from epics list page
 
 > - Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.5.
-> - [Moved](https://gitlab.com/gitlab-org/gitlab/issues/37081) to the [Premium](https://about.gitlab.com/pricing/) tier in GitLab 12.8.
+> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/37081) to the [Premium](https://about.gitlab.com/pricing/) tier in GitLab 12.8.
 
 You can search for an epic from the list of epics using filtered search bar (similar to
 that of Issues and Merge Requests) based on following parameters:
@@ -134,8 +129,8 @@ confidential** checkbox.
 
 ### Enable Confidential Epics **(PREMIUM ONLY)**
 
-The Confidential Epics feature is under development and not ready for production use. It's deployed behind a
-feature flag that is **disabled by default**.
+The Confidential Epics feature is under development and not ready for production use.
+It's deployed behind a feature flag that is **disabled by default**.
 [GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md)
 can enable it for your instance.
 
@@ -175,14 +170,14 @@ To add an issue to an epic:
 1. Identify the issue to be added, using either of the following methods:
    - Paste the link of the issue.
    - Search for the desired issue by entering part of the issue's title, then selecting the desired
-     match (introduced in [GitLab 12.5](https://gitlab.com/gitlab-org/gitlab/issues/9126)).
+     match (introduced in [GitLab 12.5](https://gitlab.com/gitlab-org/gitlab/-/issues/9126)).
 
    If there are multiple issues to be added, press <kbd>Spacebar</kbd> and repeat this step.
 1. Click **Add**.
 
 #### Create an issue from an epic
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/5419) in GitLab 12.7.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/5419) in GitLab 12.7.
 
 Creating an issue from an epic enables you to maintain focus on the broader context of the epic
 while dividing work into smaller parts.
@@ -195,46 +190,49 @@ To create an issue from an epic:
 1. From the **Project** dropdown, select the project in which the issue should be created.
 1. Click **Create issue**.
 
+### Remove an issue from an epic
+
+You can remove issues from an epic when you're on the epic's details page.
+After you remove an issue from an epic, the issue will no longer be associated with this epic.
+
 To remove an issue from an epic:
 
-1. Click the <kbd>x</kbd> button in the epic's issue list.
-1. Click **Remove** in the **Remove issue** warning message.
+1. Click the **Remove** (**{close}**) button next to the issue you want to remove.
+   The **Remove issue** warning appears.
+1. Click **Remove**.
+
+![List of issues assigned to an epic](img/issue_list_v13_1.png)
 
 ### Reorder issues assigned to an epic
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/9367) in GitLab 12.5.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/9367) in GitLab 12.5.
 
-New issues are added to the top of their list in the **Epics and Issues** tab.
-You can reorder the list of issues. Issues and child epics cannot be intermingled.
+New issues appear at the top of the list in the **Epics and Issues** tab.
+You can reorder the list of issues by dragging them.
 
 To reorder issues assigned to an epic:
 
 1. Go to the **Epics and Issues** tab.
-1. Drag and drop issues into the desired order.
-
-To reorder child epics assigned to an epic:
-
-1. Go to the **Epics and Issues** tab.
-1. Drag and drop epics into the desired order.
+1. Drag issues into the desired order.
 
 ### Move issues between epics **(ULTIMATE)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/33039) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.0.
 
-New issues are added to the top of their list in the **Epics and Issues**
-tab. You can move issues from one epic to another. Issues and child epics cannot be intermingled.
+New issues appear at the top of the list in the **Epics and Issues**
+tab. You can move issues from one epic to another.
 
 To move an issue to another epic:
 
 1. Go to the **Epics and Issues** tab.
-1. Drag and drop issues into the desired parent epic.
+1. Drag issues into the desired parent epic.
 
 ### Promote an issue to an epic
 
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/3777) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.6.
-> - In [GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/issues/37081), it was moved to the Premium tier.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/3777) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.6.
+> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/37081) to [GitLab Premium](https://about.gitlab.com/pricing/) in 12.8.
 
-If you have [permissions](../../permissions.md) to close an issue and create an
+If you have the necessary [permissions](../../permissions.md) to close an issue and create an
 epic in the parent group, you can promote an issue to an epic with the `/promote`
 [quick action](../../project/quick_actions.md#quick-actions-for-issues-merge-requests-and-epics).
 Only issues from projects that are in groups can be promoted. When attempting to promote a confidential
@@ -263,7 +261,8 @@ To add a child epic to an epic:
 1. Click **Add an epic**.
 1. Identify the epic to be added, using either of the following methods:
    - Paste the link of the epic.
-   - Search for the desired issue by entering part of the epic's title, then selecting the desired match (introduced in [GitLab 12.5](https://gitlab.com/gitlab-org/gitlab/issues/9126)).
+   - Search for the desired issue by entering part of the epic's title, then selecting the desired
+     match (introduced in [GitLab 12.5](https://gitlab.com/gitlab-org/gitlab/-/issues/9126)).
 
    If there are multiple epics to be added, press <kbd>Spacebar</kbd> and repeat this step.
 1. Click **Add**.
@@ -272,7 +271,7 @@ To add a child epic to an epic:
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/33039) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.0.
 
-New child epics are added to the top of their list in the **Epics and Issues** tab.
+New child epics appear at the top of the list in the **Epics and Issues** tab.
 You can move child epics from one epic to another.
 When you add an epic that's already linked to a parent epic, the link to its current parent is removed.
 Issues and child epics cannot be intermingled.
@@ -280,19 +279,19 @@ Issues and child epics cannot be intermingled.
 To move child epics to another epic:
 
 1. Go to the **Epics and Issues** tab.
-1. Drag and drop epics into the desired parent epic.
+1. Drag epics into the desired parent epic.
 
 ### Reorder child epics assigned to an epic
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/9367) in GitLab 12.5.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/9367) in GitLab 12.5.
 
-New child epics are added to the top of their list in the **Epics and Issues** tab.
-You can reorder the list of child epics. Issues and child epics cannot be intermingled.
+New child epics appear at the top of the list in the **Epics and Issues** tab.
+You can reorder the list of child epics.
 
 To reorder child epics assigned to an epic:
 
 1. Go to the **Epics and Issues** tab.
-1. Drag and drop epics into the desired order.
+1. Drag epics into the desired order.
 
 ### Remove a child epic from a parent epic