Add latest changes from gitlab-org/gitlab@master

7 files changed, 24 insertions, 25 deletions

diff --git a/doc/user/group/img/add_new_members_v13_6.png b/doc/user/group/img/add_new_members_v13_6.png
deleted file mode 100644
index 4255eeb72c7..00000000000
--- a/doc/user/group/img/add_new_members_v13_6.png
+++ /dev/null
diff --git a/doc/user/group/img/add_new_members_v13_7.png b/doc/user/group/img/add_new_members_v13_7.png
new file mode 100644
index 00000000000..7e06bdf8fd1
--- /dev/null
+++ b/doc/user/group/img/add_new_members_v13_7.png
diff --git a/doc/user/group/img/manual_permissions_v13_6.png b/doc/user/group/img/manual_permissions_v13_6.png
deleted file mode 100644
index 6d26061b049..00000000000
--- a/doc/user/group/img/manual_permissions_v13_6.png
+++ /dev/null
diff --git a/doc/user/group/img/manual_permissions_v13_7.png b/doc/user/group/img/manual_permissions_v13_7.png
new file mode 100644
index 00000000000..fcea0121915
--- /dev/null
+++ b/doc/user/group/img/manual_permissions_v13_7.png
diff --git a/doc/user/group/index.md b/doc/user/group/index.md
index 998e39fa62c..b09fb1aae86 100644
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -130,7 +130,7 @@ give a user access to all projects in the group with one action.
 
 Add members to a group by navigating to the group's dashboard and clicking **Members**.
 
-![add members to group](img/add_new_members_v13_6.png)
+![add members to group](img/add_new_members_v13_7.png)
 
 Select the [permission level](../permissions.md#permissions), and add the new member. You can also set the expiring date for that user; this is the date on which they will no longer have access to your group.
 
@@ -377,7 +377,7 @@ In GitLab [8.15](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/822) and
 1. Select the pencil icon in the row for the user you are editing.
 1. Select the brown `Edit permissions` button in the modal.
 
-![Setting manual permissions](img/manual_permissions_v13_6.png)
+![Setting manual permissions](img/manual_permissions_v13_7.png)
 
 Now you will be able to edit the user's permissions from the **Members** page.
 
diff --git a/doc/user/project/issues/associate_zoom_meeting.md b/doc/user/project/issues/associate_zoom_meeting.md
index 9c4e6fd9acb..d81fe19c5b9 100644
--- a/doc/user/project/issues/associate_zoom_meeting.md
+++ b/doc/user/project/issues/associate_zoom_meeting.md
@@ -10,13 +10,13 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 In order to communicate synchronously for incidents management,
 GitLab allows to associate a Zoom meeting with an issue.
-Once you start a Zoom call for a fire-fight, you need a way to
-associate the conference call with an issue, so that your team
-members can join swiftly without requesting a link.
+After you start a Zoom call for a fire-fight, you need a way to
+associate the conference call with an issue. This is so that your
+team members can join swiftly without requesting a link.
 
-## Adding a zoom meeting to an issue
+## Adding a Zoom meeting to an issue
 
-To associate a zoom meeting with an issue, you can use GitLab's
+To associate a Zoom meeting with an issue, you can use GitLab
 [quick actions](../quick_actions.md#quick-actions-for-issues-merge-requests-and-epics).
 
 In an issue, leave a comment using the `/zoom` quick action followed by a valid Zoom link:
@@ -26,23 +26,23 @@ In an issue, leave a comment using the `/zoom` quick action followed by a valid
 ```
 
 If the Zoom meeting URL is valid and you have at least [Reporter permissions](../../permissions.md),
-a system alert will notify you that the addition of the meeting URL was successful.
-The issue's description will be automatically edited to include the Zoom link, and a button will
-appear right under the issue's title.
+a system alert notifies you of its successful addition.
+The issue's description is automatically edited to include the Zoom link, and a button
+appears right under the issue's title.
 
 ![Link Zoom Call in Issue](img/zoom-quickaction-button.png)
 
 You are only allowed to attach a single Zoom meeting to an issue. If you attempt
-to add a second Zoom meeting using the `/zoom` quick action, it won't work, you
+to add a second Zoom meeting using the `/zoom` quick action, it doesn't work. You
 need to [remove it](#removing-an-existing-zoom-meeting-from-an-issue) first.
 
 ## Removing an existing Zoom meeting from an issue
 
-Similarly to adding a zoom meeting, you can remove it with a quick action:
+Similarly to adding a Zoom meeting, you can remove it with a quick action:
 
 ```shell
 /remove_zoom
 ```
 
 If you have at least [Reporter permissions](../../permissions.md),
-a system alert will notify you that the meeting URL was successfully removed.
+a system alert notifies you that the meeting URL was successfully removed.
diff --git a/doc/user/project/new_ci_build_permissions_model.md b/doc/user/project/new_ci_build_permissions_model.md
index 3af651628e8..fd7c58f12b9 100644
--- a/doc/user/project/new_ci_build_permissions_model.md
+++ b/doc/user/project/new_ci_build_permissions_model.md
@@ -203,18 +203,17 @@ To properly configure submodules with GitLab CI/CD, read the
 With the update permission model we also extended the support for accessing
 Container Registries for private projects.
 
-> **Notes:**
->
-> - GitLab Runner versions prior to 1.8 don't incorporate the introduced changes
->   for permissions. This makes the `image:` directive not work with private
->   projects automatically and it needs to be configured manually on the GitLab Runner host
->   with a predefined account (for example administrator's personal account with
->   access token created explicitly for this purpose). This issue is resolved with
->   latest changes in GitLab Runner 1.8 which receives GitLab credentials with
->   build data.
-> - Starting from GitLab 8.12, if you have [2FA](../profile/account/two_factor_authentication.md) enabled in your account, you need
->   to pass a [personal access token](../profile/personal_access_tokens.md) instead of your password in order to
->   login to GitLab's Container Registry.
+GitLab Runner versions prior to 1.8 don't incorporate the introduced changes
+for permissions. This makes the `image:` directive not work with private
+projects automatically and it needs to be configured manually on the GitLab Runner host
+with a predefined account (for example administrator's personal account with
+access token created explicitly for this purpose). This issue is resolved with
+latest changes in GitLab Runner 1.8 which receives GitLab credentials with
+build data.
+
+Starting from GitLab 8.12, if you have [2FA](../profile/account/two_factor_authentication.md) enabled in your account, you need
+to pass a [personal access token](../profile/personal_access_tokens.md) instead of your password in order to
+login to the Container Registry.
 
 Your jobs can access all container images that you would normally have access
 to. The only implication is that you can push to the Container Registry of the