Add latest changes from gitlab-org/gitlab@master

5 files changed, 26 insertions, 20 deletions

diff --git a/doc/user/project/code_intelligence.md b/doc/user/project/code_intelligence.md
index d5f9c225cde..3fec38a61a0 100644
--- a/doc/user/project/code_intelligence.md
+++ b/doc/user/project/code_intelligence.md
@@ -43,7 +43,7 @@ code_navigation:
 
 The generated LSIF file size may be limited by
 the [artifact application limits (`ci_max_artifact_size_lsif`)](../../administration/instance_limits.md#maximum-file-size-per-type-of-artifact),
-default to 100MB (configurable by an instance administrator).
+default to 100 MB (configurable by an instance administrator).
 
 After the job succeeds, code intelligence data can be viewed while browsing the code:
 
diff --git a/doc/user/project/highlighting.md b/doc/user/project/highlighting.md
index 22ff234ac81..fbb6d1b329d 100644
--- a/doc/user/project/highlighting.md
+++ b/doc/user/project/highlighting.md
@@ -11,7 +11,7 @@ GitLab provides syntax highlighting on all files through [Highlight.js](https://
 [Rouge](https://rubygems.org/gems/rouge) Ruby gem. It attempts to guess what language
 to use based on the file extension, which most of the time is sufficient.
 
-The paths here are Git's built-in [`.gitattributes` interface](https://git-scm.com/docs/gitattributes).
+The paths here use the [`.gitattributes` interface](https://git-scm.com/docs/gitattributes) in Git.
 
 NOTE:
 The [Web IDE](web_ide/index.md) and [Snippets](../snippets.md) use [Monaco Editor](https://microsoft.github.io/monaco-editor/)
diff --git a/doc/user/project/members/index.md b/doc/user/project/members/index.md
index bc133c831e9..7c6e7afb3bc 100644
--- a/doc/user/project/members/index.md
+++ b/doc/user/project/members/index.md
@@ -47,7 +47,7 @@ flowchart RL
 > - Modal window [enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/247208) in GitLab 14.8.
 > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/352526) in GitLab 14.9. [Feature flag `invite_members_group_modal`](https://gitlab.com/gitlab-org/gitlab/-/issues/352526) removed.
 
-Add users to a project so they become members and have permission
+Add users to a project so they become direct members and have permission
 to perform actions.
 
 Prerequisite:
@@ -98,13 +98,13 @@ The Owner [role](../../permissions.md#project-members-permissions) can be added
 > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/352526) in GitLab 14.9. [Feature flag `invite_members_group_modal`](https://gitlab.com/gitlab-org/gitlab/-/issues/352526) removed.
 
 When you add a group to a project, every group member (direct or inherited) gets access to the project.
-Each user's access is based on:
+Each member's access is based on the:
 
-- The role they're assigned in the group.
-- The maximum role you choose when you invite the group.
+- Role they're assigned in the group.
+- Maximum role you choose when you invite the group.
 
-If a user has a group role with fewer permissions than the maximum project role, the user keeps the permissions of their group role.
-For example, if you add a user with the Guest role to a project with a maximum role of Maintainer, the user has only the permissions of the Guest role.
+If a group member has a role in the group with fewer permissions than the maximum project role, the member keeps the permissions of their group role.
+For example, if you add a member with the Guest role to a project with a maximum role of Maintainer, the member has only the permissions of the Guest role in the project.
 
 Prerequisites:
 
@@ -128,10 +128,10 @@ The **Members** tab shows:
 - Members who are directly assigned to the project.
 - If the project was created in a group [namespace](../../namespace/index.md), members of that group.
 
-## Import users from another project
+## Import members from another project
 
-You can import another project's users to your own project. Users
-retain the same permissions as the project you import them from.
+You can import another project's members to your own project.
+Imported project members retain the same permissions as the project you import them from.
 
 Prerequisite:
 
@@ -171,13 +171,14 @@ If a user is a:
 
 ## Remove a member from a project
 
-If a user is a direct member of a project, you can remove them.
-If membership is inherited from a parent group, then the member can be removed only from the parent
-group itself.
+If a user is:
+
+- A direct member of a project, you can remove them directly from the project.
+- An inherited member from a parent group, you can only remove them from the parent group itself.
 
 Prerequisites:
 
-- To remove direct members with the:
+- To remove direct members that have the:
   - Maintainer, Developer, Reporter, or Guest role, you must have the Maintainer role.
   - Owner role, you must have the Owner role.
 - Optional. Unassign the member from all issues and merge requests that
@@ -191,7 +192,7 @@ To remove a member from a project:
 1. Optional. In the confirmation box, select the
    **Also unassign this user from related issues and merge requests** checkbox.
 1. To prevent leaks of sensitive information from private projects, verify the
-   user has not forked the private repository or created webhooks. Existing forks continue to receive
+   member has not forked the private repository or created webhooks. Existing forks continue to receive
    changes from the upstream project, and webhooks continue to receive updates. You may also want to configure your project
    to prevent projects in a group
    [from being forked outside their group](../../group/access_and_permissions.md#prevent-project-forking-outside-group).
diff --git a/doc/user/project/repository/reducing_the_repo_size_using_git.md b/doc/user/project/repository/reducing_the_repo_size_using_git.md
index a8a79591e9e..cf7d4f44aad 100644
--- a/doc/user/project/repository/reducing_the_repo_size_using_git.md
+++ b/doc/user/project/repository/reducing_the_repo_size_using_git.md
@@ -110,7 +110,7 @@ To purge files from a GitLab repository:
    for more examples and the complete documentation.
 
 1. Because you are trying to remove internal refs,
-   you'll later rely on `commit-map` files produced by each run
+   you need the `commit-map` files produced by each run
    to tell you which internal refs to remove.
    Every `git filter-repo` run creates a new `commit-map`,
    and overwrites the `commit-map` from the previous run.
@@ -174,7 +174,7 @@ To clean up a repository:
 1. Upload a list of objects. For example, a `commit-map` file created by `git filter-repo` which is located in the
    `filter-repo` directory.
 
-   If your `commit-map` file is larger than about 250KB or 3000 lines, the file can be split and uploaded piece by piece:
+   If your `commit-map` file is larger than about 250 KB or 3000 lines, the file can be split and uploaded piece by piece:
 
    ```shell
    split -l 3000 filter-repo/commit-map filter-repo/commit-map-
diff --git a/doc/user/project/service_desk.md b/doc/user/project/service_desk.md
index 9d86780e6f4..14f82c7c68c 100644
--- a/doc/user/project/service_desk.md
+++ b/doc/user/project/service_desk.md
@@ -378,10 +378,15 @@ attachments are sent as part of the email. In other cases, the email contains li
 
 #### Privacy considerations
 
+> [Changed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108901) the minimum required role to view the creator's and participant's email in GitLab 15.9.
+
 Service Desk issues are confidential, but the project owner can
 [make an issue public](issues/confidential_issues.md#modify-issue-confidentiality).
-When a Service Desk issue becomes public, the issue creator's email address is disclosed
-to everyone who can view the project.
+When a Service Desk issue becomes public, the issue creator's and participants' email addresses are
+visible to signed-in users with at least the Reporter role for the project.
+
+In GitLab 15.8 and earlier, when a Service Desk issue becomes public, the issue creator's email
+address is disclosed to everyone who can view the project.
 
 ### Support Bot user