Add latest changes from gitlab-org/gitlab@master

6 files changed, 32 insertions, 10 deletions

diff --git a/doc/user/packages/dependency_proxy/index.md b/doc/user/packages/dependency_proxy/index.md
index b1064ac9844..c76b0a6810f 100644
--- a/doc/user/packages/dependency_proxy/index.md
+++ b/doc/user/packages/dependency_proxy/index.md
@@ -250,6 +250,10 @@ hub_docker_quota_check:
         TOKEN=$(curl "https://auth.docker.io/token?service=registry.docker.io&scope=repository:ratelimitpreview/test:pull" | jq --raw-output .token) && curl --head --header "Authorization: Bearer $TOKEN" "https://registry-1.docker.io/v2/ratelimitpreview/test/manifests/latest" 2>&1
 ```
 
+## Use the NPM Dependency Proxy for NPM packages
+
+For information on this, see [Dependency Proxy](../npm_registry/#dependency-proxy).
+
 ## Troubleshooting
 
 ### Dependency Proxy Connection Failure
diff --git a/doc/user/packages/npm_registry/index.md b/doc/user/packages/npm_registry/index.md
index 201aeaa993f..fe7e6a0ea46 100644
--- a/doc/user/packages/npm_registry/index.md
+++ b/doc/user/packages/npm_registry/index.md
@@ -601,3 +601,8 @@ The GitLab npm repository supports the following commands for the npm CLI (`npm`
 - `npm view`: Show package metadata.
 - `yarn add`: Install an npm package.
 - `yarn update`: Update your dependencies.
+
+## Dependency Proxy
+
+The NPM Dependency Proxy for NPM packages isn't available. For more information, see
+[this epic](https://gitlab.com/groups/gitlab-org/-/epics/3608).
diff --git a/doc/user/profile/notifications.md b/doc/user/profile/notifications.md
index 0a0411dc925..17b4251662e 100644
--- a/doc/user/profile/notifications.md
+++ b/doc/user/profile/notifications.md
@@ -143,7 +143,7 @@ For each project and group you can select one of the following levels:
 |:------------|:------------|
 | Global      | Your global settings apply. |
 | Watch       | Receive notifications for any activity. |
-| On mention  | Receive notifications when `@mentioned` in comments. |
+| On mention  | Receive notifications when [mentioned](../project/issues/issue_data_and_actions.md#mentions) in a comment. |
 | Participate | Receive notifications for threads you have participated in. |
 | Disabled    | Turns off notifications. |
 | Custom      | Receive notifications for custom selected events. |
@@ -278,7 +278,7 @@ The participants are:
 
 - Authors of the design (can be multiple people if different authors have uploaded different versions of the design).
 - Authors of comments on the design.
-- Anyone that is `@mentioned` in a comment on the design.
+- Anyone that is [mentioned](../project/issues/issue_data_and_actions.md#mentions) in a comment on the design.
 
 ## Opt out of all GitLab emails
 
diff --git a/doc/user/project/issues/issue_data_and_actions.md b/doc/user/project/issues/issue_data_and_actions.md
index 2ef12cd1240..78dc6805f2b 100644
--- a/doc/user/project/issues/issue_data_and_actions.md
+++ b/doc/user/project/issues/issue_data_and_actions.md
@@ -199,7 +199,7 @@ You can mention a user or a group present in your GitLab instance with `@usernam
 unless they have disabled all [notifications](#notifications) in their user settings.
 This is controlled in the [notification settings](../../profile/notifications.md).
 
-Mentions for yourself (the current logged in user) are highlighted
+Mentions for yourself (the user currently signed in) are highlighted
 in a different color, which allows you to quickly see which comments involve you.
 
 Avoid mentioning `@all` in issues and merge requests, as it sends an email notification
diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md
index 59773c625c5..160c2314ded 100644
--- a/doc/user/project/web_ide/index.md
+++ b/doc/user/project/web_ide/index.md
@@ -234,16 +234,29 @@ different branch.
 
 > - Markdown preview [introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/18059) in [GitLab Free](https://about.gitlab.com/pricing/) 10.7.
 > - Support for pasting images [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/22822) in [GitLab Free](https://about.gitlab.com/pricing/) 13.1.
+> - Side-by-side Markdown preview [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68274) in [GitLab Free](https://about.gitlab.com/pricing/) 14.3
 
-When you edit Markdown files in the Web IDE, you can preview your changes by
-clicking the **Preview Markdown** tab above the file editor. The Markdown preview
-supports [GitLab Flavored Markdown](../../markdown.md#gitlab-flavored-markdown).
+To edit Markdown files in the Web IDE:
 
-You can also upload any local images by pasting them directly in the Markdown file.
+1. Go to your repository, and navigate to the Markdown page you want to edit.
+1. Select **Edit in Web IDE**, and GitLab loads the page in a tab in the editor.
+1. Make your changes to the file. GitLab supports [GitLab Flavored Markdown](../../markdown.md#gitlab-flavored-markdown).
+1. When your changes are complete, select **Commit** in the left sidebar.
+1. Add a commit message, select the branch you want to commit to, and select **Commit**.
+
+When editing, you can upload local images by pasting them directly in the Markdown file.
 The image is uploaded to the same directory and is named `image.png` by default.
 If another file already exists with the same name, a numeric suffix is automatically
 added to the filename.
 
+There are two ways to preview Markdown content in the Web IDE: 
+
+1. At the top of the file's tab, select **Preview Markdown** to preview the formatting
+   in your file. You can't edit the file in this view.
+   1. To add more changes to the file, select **Edit**.
+1. Right-click or use the keyboard shortcut `Command/Control + Shift + P` and
+   select **Preview Markdown** to toggle a live Markdown preview panel.
+
 ## Live Preview
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/19764) in [GitLab Free](https://about.gitlab.com/pricing/) 11.2.
diff --git a/doc/user/todos.md b/doc/user/todos.md
index c367898cf59..f0601db0300 100644
--- a/doc/user/todos.md
+++ b/doc/user/todos.md
@@ -31,9 +31,9 @@ Many to-do items are created automatically.
 A to-do item is added to your To-Do List when:
 
 - An issue or merge request is assigned to you.
-- You're `@mentioned` in the description or comment of an issue, merge request,
-  or epic.
-- You are `@mentioned` in a comment on a commit or design.
+- You're [mentioned](project/issues/issue_data_and_actions.md#mentions) in the description or
+  comment of an issue, merge request, or epic.
+- You are mentioned in a comment on a commit or design.
 - The CI/CD pipeline for your merge request fails.
 - An open merge request cannot be merged due to conflict, and one of the
   following is true: