Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

4 files changed, 30 insertions, 22 deletions

diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md
index d26acd50189..23e5bf2d143 100644
--- a/doc/user/profile/account/two_factor_authentication.md
+++ b/doc/user/profile/account/two_factor_authentication.md
@@ -5,7 +5,7 @@ group: Access
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Two-factor authentication
+# Two-factor authentication **(FREE)**
 
 Two-factor authentication (2FA) provides an additional level of security to your
 GitLab account. After being enabled, in addition to supplying your username and
diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md
index 5bcfafa7196..4e4cdf5dc36 100644
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
@@ -76,6 +76,9 @@ The following is hidden from your user profile page (`https://gitlab.example.com
 - Date when account was created
 - Tabs for activity, groups, contributed projects, personal projects, starred projects, snippets
 
+NOTE:
+Making your user profile page private does not hide your public resources from the REST or GraphQL APIs.
+
 ## Add external accounts to your user profile page
 
 You can add links to certain other external accounts you might have, like Skype and Twitter.
@@ -106,7 +109,8 @@ To show private contributions:
 
 ## Set your current status
 
-> Introduced in GitLab 11.2.
+> - Introduced in GitLab 11.2.
+> - [Improved](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56649) in GitLab 13.10.
 
 You can provide a custom status message for your user profile along with an emoji that describes it.
 This may be helpful when you are out of office or otherwise not available.
@@ -119,6 +123,7 @@ To set your current status:
 1. Select **Set status** or, if you have already set a status, **Edit status**.
 1. Set the desired emoji and status message. Status messages must be plain text and 100 characters or less.
    They can also contain emoji codes like, `I'm on vacation :palm_tree:`.
+1. Select a value from the **Clear status after** dropdown.
 1. Select **Set status**. Alternatively, you can select **Remove status** to remove your user status entirely.
 
 You can also set your current status by [using the API](../../api/users.md#user-status).
diff --git a/doc/user/profile/notifications.md b/doc/user/profile/notifications.md
index 4f28558cca6..4d890e249e7 100644
--- a/doc/user/profile/notifications.md
+++ b/doc/user/profile/notifications.md
@@ -5,12 +5,15 @@ group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# GitLab Notification Emails
+# GitLab Notification Emails **(FREE)**
 
 GitLab Notifications allow you to stay informed about what's happening in GitLab. With notifications
 enabled, you can receive updates about activity in issues, merge requests, epics, and designs.
 Notifications are sent via email.
 
+For the tool that enables GitLab administrators to send messages to users, read
+[Email from GitLab](../../tools/email.md).
+
 ## Receiving notifications
 
 You receive notifications for one of the following reasons:
@@ -50,16 +53,16 @@ These notification settings apply only to you. They do not affect the notificati
 
 ## Global notification settings
 
-Your **Global notification settings** are the default settings unless you select different values for a project or a group.
+Your **Global notification settings** are the default settings unless you select
+different values for a project or a group.
 
-- Notification email
-  - This is the email address your notifications are sent to.
-- Global notification level
-  - This is the default [notification level](#notification-levels) which applies to all your notifications.
-- Receive product marketing emails
-  - Check this checkbox if you want to receive periodic emails related to GitLab features.
-- Receive notifications about your own activity.
-  - Check this checkbox if you want to receive notification about your own activity. Default: Not checked.
+- **Notification email**: The email address your notifications are sent to.
+- **Global notification level**: The default [notification level](#notification-levels)
+  which applies to all your notifications.
+- **Receive product marketing emails**: Select this check box to receive periodic
+  emails about GitLab features.
+- **Receive notifications about your own activity**: Select this check box to receive
+  notifications about your own activity. Not selected by default.
 
 ### Notification scope
 
@@ -67,16 +70,16 @@ You can tune the scope of your notifications by selecting different notification
 
 Notification scope is applied in order of precedence (highest to lowest):
 
-- Project
-  - For each project, you can select a notification level. Your project setting overrides the group setting.
-- Group
-  - For each group, you can select a notification level. Your group setting overrides your default setting.
-- Global (default)
-  - Your global, or _default_, notification level applies if you have not selected a notification level for the project or group in which the activity occurred.
+- **Project**: For each project, you can select a notification level. Your project
+  setting overrides the group setting.
+- **Group**: For each group, you can select a notification level. Your group setting
+  overrides your default setting.
+- **Global (default)**: Your global, or _default_, notification level applies if you
+  have not selected a notification level for the project or group in which the activity occurred.
 
 #### Project notifications
 
-You can select a notification level for each project. This can be useful if you need to closely monitor activity in select projects.
+You can select a notification level for each project to help you closely monitor activity in select projects.
 
 ![notification settings](img/notification_project_settings_v12_8.png)
 
diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md
index 78900e145b7..540724f9185 100644
--- a/doc/user/profile/preferences.md
+++ b/doc/user/profile/preferences.md
@@ -51,7 +51,7 @@ See the epic for:
 - A list of known issues.
 - Our planned direction and next steps.
 
-If you find an issue that isn’t listed, please leave a comment on the epic or create a
+If you find an issue that isn't listed, please leave a comment on the epic or create a
 new issue.
 
 Dark mode is available as a navigation theme, for MVC and compatibility reasons. In
@@ -124,7 +124,7 @@ You can include the following options for your default dashboard view:
 ### Group overview content
 
 The **Group overview content** dropdown allows you to choose what information is
-displayed on a group’s home page.
+displayed on a group's home page.
 
 You can choose between 2 options:
 
@@ -134,7 +134,7 @@ You can choose between 2 options:
 ### Project overview content
 
 The **Project overview content** setting allows you to choose what content you want to
-see on a project’s home page.
+see on a project's home page.
 
 ### Tab width