Add latest changes from gitlab-org/gitlab@master

3 files changed, 59 insertions, 23 deletions

diff --git a/doc/user/analytics/value_stream_analytics.md b/doc/user/analytics/value_stream_analytics.md
index 385cc39c0c0..c6fb2d8dd3f 100644
--- a/doc/user/analytics/value_stream_analytics.md
+++ b/doc/user/analytics/value_stream_analytics.md
@@ -153,36 +153,67 @@ A few notes:
 
 ## Customizable Value Stream Analytics
 
-The default stages are designed to work straight out of the box, but they might not be suitable for all teams. Different teams use different approaches to building software, so some teams might want to customize their Value Stream Analytics. From GitLab 12.9, users can hide default stages and create custom stages that align better to their development workflow.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/12196) in GitLab 12.9.
+
+The default stages are designed to work straight out of the box, but they might not be suitable for
+all teams. Different teams use different approaches to building software, so some teams might want
+to customize their Value Stream Analytics.
+
+GitLab allows users to hide default stages and create custom stages that align better to their
+development workflow.
 
 ### Adding a stage
 
-In the following example we're creating a new stage that measures and tracks issues from creation time until they are closed.
+In the following example we're creating a new stage that measures and tracks issues from creation
+time until they are closed.
 
-1. Navigate to your group page.
-1. Open Value Stream Analytics from the sidebar: **Analytics > Value Stream**
-1. Click the "Add a stage" button.
+1. Navigate to your group's **Analytics > Value Stream**.
+1. Click the **Add a stage** button.
 1. Fill in the new stage form:
-   - Name: Issue start to finish
-   - Start event: Issue created
-   - End event: Issue closed
-1. Click the "Add stage" button.
+   - Name: Issue start to finish.
+   - Start event: Issue created.
+   - End event: Issue closed.
+1. Click the **Add stage** button.
 
 ![New Value Stream Analytics Stage](img/new_vsm_stage_v12_9.png "Form for creating a new stage")
 
-The new stage is persisted and it will always show up on the value stream analytics page for your group. In case you want to alter or delete the stage you can easily do that for customized stages by hovering over the stage and clicking the three-dot icon that appears.
+The new stage is persisted and it will always show up on the Value Stream Analytics page for your
+group.
+
+If you want to alter or delete the stage, you can easily do that for customized stages by:
+
+1. Hovering over the stage.
+1. Clicking the vertical ellipsis (**{ellipsis_v}**) button that appears.
 
 ![Value Stream Analytics Stages](img/vsm_stage_list_v12_9.png)
 
-Creating a custom stage requires specifying two events, a start and an end. Be careful to choose a start event that occurs *before* your end event. For example, consider if a stage started when an issue is added to a board, and ended when the issue is created. This stage would not work because the end event has already happened when the start event occurs. To prevent such invalid stages, the form prohibits incompatible start and end events. After you select the start event, the stop event dropdown will only list the compatible events.
+Creating a custom stage requires specifying two events:
+
+- A start.
+- An end.
+
+Be careful to choose a start event that occurs *before* your end event. For example, consider a
+stage that:
 
-Note: The ability to re-order the stages is a [planned enhancement](https://gitlab.com/gitlab-org/gitlab/issues/196698).
+- Started when an issue is added to a board.
+- Ended when the issue is created.
+
+This stage would not work because the end event has already happened when the start event occurs.
+To prevent such invalid stages, the UI prohibits incompatible start and end events. After you select
+the start event, the stop event dropdown will only list the compatible events.
+
+NOTE: **Note:**
+The ability to re-order the stages is [planned](https://gitlab.com/gitlab-org/gitlab/issues/196698).
 
 ### Label based stages
 
-The pre-defined start and end events can cover many use cases involving both issues and merge requests. For supporting more complex workflows, we can use stages based on group labels. These events are based on labels being added/removed. In particular, [scoped labels](../project/labels.md#scoped-labels-premium) are useful for complex workflows.
+The pre-defined start and end events can cover many use cases involving both issues and merge requests.
 
-In this example we'd like to measure more accurate code review times. The workflow is the following:
+For supporting more complex workflows, use stages based on group labels. These events are based on
+labels being added or removed. In particular, [scoped labels](../project/labels.md#scoped-labels-premium)
+are useful for complex workflows.
+
+In this example, we'd like to measure more accurate code review times. The workflow is the following:
 
 - When the code review starts, the reviewer adds `workflow::code_review_start` label to the merge request.
 - When the code review is finished, the reviewer adds `workflow::code_review_complete` label to the merge request.
@@ -193,12 +224,17 @@ Creating a new stage called "Code Review":
 
 ### Hiding unused stages
 
-Sometimes certain default stages are not relevant to a team. In this case you can easily hide stages so they no longer appear in the list. First, add a custom stage to activate customizability. Then hover over the default stage you want to hide, click the three-dot icon that appears and select "Hide stage".
+Sometimes certain default stages are not relevant to a team. In this case, you can easily hide stages
+so they no longer appear in the list. To hide stages:
+
+1. Add a custom stage to activate customizability.
+1. Hover over the default stage you want to hide.
+1. Click the vertical ellipsis (**{ellipsis_v}**) button that appears and select **Hide stage**.
 
 To recover a default stage that was previously hidden:
 
-1. Click "Add a stage" button.
-1. In the top right corner open the "Recover hidden stage" dropdown.
+1. Click **Add a stage** button.
+1. In the top right corner open the **Recover hidden stage** dropdown.
 1. Select a stage.
 
 ## Days to completion chart
diff --git a/doc/user/group/roadmap/index.md b/doc/user/group/roadmap/index.md
index e603457b1a1..08f1e4af6b0 100644
--- a/doc/user/group/roadmap/index.md
+++ b/doc/user/group/roadmap/index.md
@@ -6,15 +6,15 @@ type: reference
 
 > - Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.5.
 > - In [GitLab 12.9](https://gitlab.com/gitlab-org/gitlab/issues/198062), Roadmaps were moved to the Premium tier.
+> - In [GitLab 12.9](https://gitlab.com/gitlab-org/gitlab/issues/5164) and later, the epic bars show their title, progress, and completed weight percentage.
 
 An Epic within a group containing **Start date** and/or **Due date**
 can be visualized in a form of a timeline (e.g. a Gantt chart). The Epics Roadmap page
 shows such a visualization for all the epics which are under a group and/or its subgroups.
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/5164) in GitLab 12.9.
-
 On the epic bars, you can see their title, progress, and completed weight percentage.
-When you hover over an epic bar, a popover appears with its title, start and due dates, and weight completed.
+When you hover over an epic bar, a popover appears with its title, start and due dates, and weight
+completed.
 
 ![roadmap view](img/roadmap_view_v12_9.png)
 
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md
index 66ea6684f5d..faeb4225a39 100644
--- a/doc/user/group/saml_sso/index.md
+++ b/doc/user/group/saml_sso/index.md
@@ -104,9 +104,9 @@ This feature is similar to the [Credentials inventory for self-managed instances
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/34648) in GitLab 12.9.
 
-Groups with enabled group-managed accounts can allow or disallow forking of projects outside of root group
-by using separate toggle. If forking is disallowed any project of given root group or its subgroups can be forked to
-a subgroup of the same root group only.
+Groups with group-managed accounts can disallow forking of projects to destinations outside the group.
+To do so, enable the "Prohibit outer forks" option in **Settings > SAML SSO**.
+When enabled, projects within the group can only be forked to other destinations within the group (including its subgroups).
 
 ##### Other restrictions for Group-managed accounts