Add latest changes from gitlab-org/gitlab@15-6-stable-ee

4 files changed, 36 insertions, 6 deletions

diff --git a/doc/operations/incident_management/linked_resources.md b/doc/operations/incident_management/linked_resources.md
index a7be867608b..40b2bbdc757 100644
--- a/doc/operations/incident_management/linked_resources.md
+++ b/doc/operations/incident_management/linked_resources.md
@@ -63,7 +63,7 @@ You can also submit a short description with the link.
 The description shows instead of the URL in the **Linked resources** section of the incident:
 
 ```plaintext
-/link https://example.link.us/j/123456789, multiple alerts firing
+/link https://example.link.us/j/123456789 multiple alerts firing
 ```
 
 ### Link Zoom meetings from an incident **(PREMIUM)**
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index d9cacb6395d..1e791662a45 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -173,7 +173,7 @@ If you don't see this action on the right sidebar, your project or instance migh
 > - [Renamed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87403) from "confidential comments" to "internal notes" in GitLab 15.0.
 > - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87383) in GitLab 15.0.
 > - [Feature flag `confidential_notes`](https://gitlab.com/gitlab-org/gitlab/-/issues/362712) removed in GitLab 15.2.
-> - [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/363045) permissions in GitLab 15.5 to at least the Reporter role. In GitLab 15.4 and earlier, issue or epic authors and assignees could also read and create internal notes.
+> - [Changed](https://gitlab.com/gitlab-org/gitlab/-/issues/363045) permissions in GitLab 15.6 to at least the Reporter role. In GitLab 15.5 and earlier, issue or epic authors and assignees could also read and create internal notes.
 
 You can add an internal note **to an issue or an epic**. It's then visible only to project members who have at least the Reporter role.
 
diff --git a/doc/user/group/import/index.md b/doc/user/group/import/index.md
index 6dcc01242c2..49515dd8a11 100644
--- a/doc/user/group/import/index.md
+++ b/doc/user/group/import/index.md
@@ -9,14 +9,14 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/249160) in GitLab 13.7 for group resources [with a flag](../../feature_flags.md) named `bulk_import`. Disabled by default.
 > - Group items [enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/338985) in GitLab 14.3.
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/267945) in GitLab 14.4 for project resources [with a flag](../../feature_flags.md) named `bulk_import_projects`. Disabled by default.
+> - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/339941) in GitLab 15.6.
 
 FLAG:
 On self-managed GitLab, by default [migrating group items](#migrated-group-items) is available. To hide the
 feature, ask an administrator to [disable the feature flag](../../../administration/feature_flags.md) named `bulk_import`.
 On self-managed GitLab, by default [migrating project items](#migrated-project-items) is not available. To show
 this feature, ask an administrator to [enable the feature flag](../../../administration/feature_flags.md) named
-`bulk_import_projects`. On GitLab.com, migrating group resources is available but migrating project resources is not
-available.
+`bulk_import_projects`. On GitLab.com, migration of both groups and projects is available.
 
 Users with the Owner role on a top-level group can use GitLab Migration to migrate the group to:
 
@@ -116,10 +116,11 @@ Any other items are **not** migrated.
 
 ## Migrated project items
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/267945) in GitLab 14.4 [with a flag](../../feature_flags.md) named `bulk_import_projects`. Disabled by default.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/267945) in GitLab 14.4 [with a flag](../../feature_flags.md) named `bulk_import_projects`. Disabled by default.
+> - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/339941) in GitLab 15.6.
 
 FLAG:
-On self-managed GitLab, migrating project resources are not available by default. To make them available, ask an administrator to [enable the feature flag](../../../administration/feature_flags.md) named `bulk_import_projects`. On GitLab.com, migrating project resources are not available.
+On self-managed GitLab, migrating project resources are not available by default. To make them available, ask an administrator to [enable the feature flag](../../../administration/feature_flags.md) named `bulk_import_projects`. On GitLab.com, migration of project resources is available.
 
 The [`import_export.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/import_export/project/import_export.yml)
 file for projects lists many of the items migrated when migrating projects using group migration. View this file in the branch
diff --git a/doc/user/tasks.md b/doc/user/tasks.md
index 5c9290e57cb..5fed887ca74 100644
--- a/doc/user/tasks.md
+++ b/doc/user/tasks.md
@@ -41,6 +41,10 @@ View tasks in issues, in the **Tasks** section.
 You can also [filter the list of issues](project/issues/managing_issues.md#filter-the-list-of-issues)
 for `Type = task`.
 
+If you select a task from an issue, it opens in a modal window.
+If you select a task to open in a new browser tab, or select it from the issue list,
+the task opens in a full-page view.
+
 ## Create a task
 
 Prerequisites:
@@ -85,6 +89,31 @@ To edit a task:
    select **Save**.
 1. Select the close icon (**{close}**).
 
+### Using the rich text editor
+
+> - Rich text editing in the modal view [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/363007) in GitLab 15.6 [with a flag](../administration/feature_flags.md) named `work_items_mvc`. Disabled by default.
+> - Rich text editing in the full page view [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104533) in GitLab 15.7.
+
+FLAG:
+On self-managed GitLab, by default the rich text feature is not available. To make it available per group, ask an
+administrator
+to [enable the feature flag](../administration/feature_flags.md) named `work_items_mvc`. On GitLab.com, this feature
+is not available. The feature is not ready for production use.
+
+Use a rich text editor to edit a task's description.
+
+Prerequisites:
+
+- You must have at least the Reporter role for the project.
+
+To edit the description of a task:
+
+1. In the **Tasks** section, select the title of the task you want to edit.
+   The task window opens.
+1. Next to **Description**, select the edit icon (**{pencil}**). The description text box appears.
+1. Above the text box, select **Rich text**.
+1. Make your changes, and select **Save**.
+
 ## Remove a task from an issue
 
 Prerequisites: