Add latest changes from gitlab-org/gitlab@master

5 files changed, 16 insertions, 8 deletions

diff --git a/doc/api/users.md b/doc/api/users.md
index 19c25236f55..5652b3440c0 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -39,7 +39,10 @@ GET /users
 ]
 ```
 
-You can also search for users by name, username, or public email by using `?search=`. For example. `/users?search=John`.
+You can also use `?search=` to search for users by name, username, or public email. For example, `/users?search=John`. When you search for a:
+
+- Public email, you must use the full email address to get an exact match. 
+- Name or username, you do not have to get an exact match because this is a fuzzy search.
 
 In addition, you can lookup users by username:
 
@@ -240,6 +243,11 @@ the `group_saml` provider option and `provisioned_by_group_id` parameter:
 ]
 ```
 
+You can also use `?search=` to search for users by name, username, or email. For example, `/users?search=John`. When you search for a:
+
+- Email, you must use the full email address to get an exact match. As an administrator, you can search for both public and private email addresses.
+- Name or username, you do not have to get an exact match because this is a fuzzy search.
+
 You can lookup users by external UID and provider:
 
 ```plaintext
diff --git a/doc/topics/git/feature_branch_development.md b/doc/topics/git/feature_branch_development.md
index de9f9980811..d53c8eae835 100644
--- a/doc/topics/git/feature_branch_development.md
+++ b/doc/topics/git/feature_branch_development.md
@@ -77,7 +77,7 @@ In this case, the feature branch would be `release-X-Y`. Assuming the `release-X
 
 1. After you select **Create merge request**, an option to **Change branches** displays. Select that option.
 
-1. In the **New Merge Request** screen, you can now select the **Source** and **Target** branches.
+1. In the **New merge request** screen, you can now select the **Source** and **Target** branches.
 In the screenshot shown,
 we have selected `test-branch` as the source, and `release-13-0` as the target.
 
@@ -87,14 +87,14 @@ we have selected `test-branch` as the source, and `release-13-0` as the target.
    You should see an entry similar to:
 
    ```plaintext
-   New Merge Request
+   New merge request
 
    From test-branch into release-13-0
    ```
 
    An entry like this confirms your merge request's destination.
 
-1. Make any additional changes in the **New Merge Request** screen, and select **Submit merge request**.
+1. Make any additional changes in the **New merge request** screen, and select **Create merge request**.
 1. In the new merge request, look for **Request to merge**. An entry similar to this displays:
 
    ```plaintext
diff --git a/doc/user/application_security/vulnerability_report/index.md b/doc/user/application_security/vulnerability_report/index.md
index 2b78dde4f63..dd919889b4d 100644
--- a/doc/user/application_security/vulnerability_report/index.md
+++ b/doc/user/application_security/vulnerability_report/index.md
@@ -260,7 +260,7 @@ To add a new vulnerability finding from your project level Vulnerability Report
 
 1. On the top bar, select **Main menu > Projects** and find your project.
 1. On the left sidebar, select **Security & Compliance > Vulnerability Report**.
-1. Select **Submit Vulnerability**.
+1. Select **Submit vulnerability**.
 1. Complete the fields and submit the form.
 
 You will be brought to the newly created vulnerability's detail page. Manually created records appear in the
diff --git a/doc/user/project/merge_requests/creating_merge_requests.md b/doc/user/project/merge_requests/creating_merge_requests.md
index df11d5a1d8d..eae4db2d4f7 100644
--- a/doc/user/project/merge_requests/creating_merge_requests.md
+++ b/doc/user/project/merge_requests/creating_merge_requests.md
@@ -102,7 +102,7 @@ You can create a merge request from your fork to contribute back to the main pro
    change the default target branch (which can be useful if you are working in a
    forked project).
 1. Select **Compare branches and continue**.
-1. Select **Submit merge request**.
+1. Select **Create merge request**.
 
 After your work is merged, if you don't intend to
 make any other contributions to the upstream project, you can unlink your
diff --git a/doc/user/workspace/index.md b/doc/user/workspace/index.md
index 5bcd96cd4a5..c18a21e875b 100644
--- a/doc/user/workspace/index.md
+++ b/doc/user/workspace/index.md
@@ -26,12 +26,12 @@ everything you do as a GitLab administrator, including:
 Our goal is to reach feature parity between SaaS and self-managed installations, with all
 [Admin Area settings](/ee/user/admin_area/settings/index.md) moving to either:
 
-- Groups. Available in the Workspace, top-level group namespaces, and subgroups.
+- Groups. Available in the Workspace, top-level groups, and subgroups.
 - Hardware Controls. For functionality that does not apply to groups, Hardware Controls are only
   applicable to self-managed installations. There is one Hardware Controls section per installation.
 
 To learn about the current state of workspace development,
-see [epic 4257](https://gitlab.com/groups/gitlab-org/-/epics/4257).
+see [epic 9265](https://gitlab.com/groups/gitlab-org/-/epics/9265).
 
 <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
 For a video introduction to the new hierarchy concept for groups and projects for epics, see