Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

15 files changed, 116 insertions, 174 deletions

diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md
index 44bf97bdd42..d26acd50189 100644
--- a/doc/user/profile/account/two_factor_authentication.md
+++ b/doc/user/profile/account/two_factor_authentication.md
@@ -44,16 +44,18 @@ To enable 2FA:
 
 1. **In GitLab:**
    1. Sign in to your GitLab account.
-   1. Go to your [**User settings**](../index.md#user-settings).
+   1. Go to your [**User settings**](../index.md#access-your-user-settings).
    1. Go to **Account**.
    1. Select **Enable Two-factor Authentication**.
 1. **On your device (usually your phone):**
    1. Install a compatible application, like:
-      - [Authenticator](https://mattrubin.me/authenticator/): open source app for iOS devices.
-      - [andOTP](https://github.com/andOTP/andOTP): feature rich open source app for Android which supports PGP encrypted backups.
-      - [FreeOTP](https://freeotp.github.io/): open source app for Android.
-      - [Google Authenticator](https://support.google.com/accounts/answer/1066447?hl=en): proprietary app for iOS and Android.
-      - [SailOTP](https://openrepos.net/content/seiichiro0185/sailotp): open source app for SailFish OS.
+      - [Authy](https://authy.com/)
+      - [Duo Mobile](https://duo.com/product/multi-factor-authentication-mfa/duo-mobile-app)
+      - [LastPass](https://lastpass.com/auth/)
+      - [Authenticator](https://mattrubin.me/authenticator/)
+      - [andOTP](https://github.com/andOTP/andOTP)
+      - [Google Authenticator](https://support.google.com/accounts/answer/1066447?hl=en)
+      - [SailOTP](https://openrepos.net/content/seiichiro0185/sailotp)
    1. In the application, add a new entry in one of two ways:
       - Scan the code presented in GitLab with your device's camera to add the
         entry automatically.
@@ -159,7 +161,7 @@ have FortiToken configured in FortiToken Cloud.
 
 You'll also need a `client_id` and `client_secret` to configure FortiToken Cloud.
 To get these, see the `REST API Guide` at
-[`Fortinet Document Library`](https://docs.fortinet.com/document/fortitoken-cloud/20.4.d/rest-api).
+[`Fortinet Document Library`](https://docs.fortinet.com/document/fortitoken-cloud/latest/rest-api).
 
 First configure FortiToken Cloud in GitLab. On your GitLab server:
 
@@ -246,7 +248,7 @@ Search for `security.webauth.u2f` and double click on it to toggle to `true`.
 To set up 2FA with a U2F device:
 
 1. Sign in to your GitLab account.
-1. Go to your [**User settings**](../index.md#user-settings).
+1. Go to your [**User settings**](../index.md#access-your-user-settings).
 1. Go to **Account**.
 1. Click **Enable Two-Factor Authentication**.
 1. Connect your U2F device.
@@ -282,7 +284,7 @@ and the following mobile browsers:
 To set up 2FA with a WebAuthn compatible device:
 
 1. Sign in to your GitLab account.
-1. Go to your [**User settings**](../index.md#user-settings).
+1. Go to your [**User settings**](../index.md#access-your-user-settings).
 1. Go to **Account**.
 1. Select **Enable Two-Factor Authentication**.
 1. Plug in your WebAuthn device.
@@ -349,7 +351,7 @@ request and you're automatically signed in.
 If you ever need to disable 2FA:
 
 1. Sign in to your GitLab account.
-1. Go to your [**User settings**](../index.md#user-settings).
+1. Go to your [**User settings**](../index.md#access-your-user-settings).
 1. Go to **Account**.
 1. Click **Disable**, under **Two-Factor Authentication**.
 
@@ -443,7 +445,7 @@ To regenerate 2FA recovery codes, you need access to a desktop browser:
 
 1. Navigate to GitLab.
 1. Sign in to your GitLab account.
-1. Go to your [**User settings**](../index.md#user-settings).
+1. Go to your [**User settings**](../index.md#access-your-user-settings).
 1. Select **Account > Two-Factor Authentication (2FA)**.
 1. If you've already configured 2FA, click **Manage two-factor authentication**.
 1. In the **Register Two-Factor Authenticator** pane, click **Regenerate recovery codes**.
diff --git a/doc/user/profile/img/busy_indicator_note_header_v13_9.png b/doc/user/profile/img/busy_indicator_note_header_v13_9.png
new file mode 100644
index 00000000000..63301ebdc14
--- /dev/null
+++ b/doc/user/profile/img/busy_indicator_note_header_v13_9.png
diff --git a/doc/user/profile/img/busy_indicator_notes_v13_9.png b/doc/user/profile/img/busy_indicator_notes_v13_9.png
new file mode 100644
index 00000000000..2efe075c72b
--- /dev/null
+++ b/doc/user/profile/img/busy_indicator_notes_v13_9.png
diff --git a/doc/user/profile/img/busy_indicator_profile_page_v13_6.png b/doc/user/profile/img/busy_indicator_profile_page_v13_6.png
new file mode 100644
index 00000000000..c8e969f38db
--- /dev/null
+++ b/doc/user/profile/img/busy_indicator_profile_page_v13_6.png
diff --git a/doc/user/profile/img/busy_indicator_settings_menu_v13_6.png b/doc/user/profile/img/busy_indicator_settings_menu_v13_6.png
new file mode 100644
index 00000000000..711638541dd
--- /dev/null
+++ b/doc/user/profile/img/busy_indicator_settings_menu_v13_6.png
diff --git a/doc/user/profile/img/busy_indicator_sidebar_collapsed_v13_9.png b/doc/user/profile/img/busy_indicator_sidebar_collapsed_v13_9.png
new file mode 100644
index 00000000000..3dca88ec8cc
--- /dev/null
+++ b/doc/user/profile/img/busy_indicator_sidebar_collapsed_v13_9.png
diff --git a/doc/user/profile/img/busy_indicator_sidebar_v13_9.png b/doc/user/profile/img/busy_indicator_sidebar_v13_9.png
new file mode 100644
index 00000000000..83024b319bf
--- /dev/null
+++ b/doc/user/profile/img/busy_indicator_sidebar_v13_9.png
diff --git a/doc/user/profile/img/busy_indicator_user_popovers_v13_6.png b/doc/user/profile/img/busy_indicator_user_popovers_v13_6.png
new file mode 100644
index 00000000000..16fb0e6556b
--- /dev/null
+++ b/doc/user/profile/img/busy_indicator_user_popovers_v13_6.png
diff --git a/doc/user/profile/img/busy_status_indicator_v13_6.png b/doc/user/profile/img/busy_status_indicator_v13_6.png
deleted file mode 100644
index 291e0fab971..00000000000
--- a/doc/user/profile/img/busy_status_indicator_v13_6.png
+++ /dev/null
diff --git a/doc/user/profile/img/change_password_v13_0.png b/doc/user/profile/img/change_password_v13_0.png
deleted file mode 100644
index f63b32557ac..00000000000
--- a/doc/user/profile/img/change_password_v13_0.png
+++ /dev/null
diff --git a/doc/user/profile/img/profile_following_v13_9.png b/doc/user/profile/img/profile_following_v13_9.png
deleted file mode 100644
index 878dce83997..00000000000
--- a/doc/user/profile/img/profile_following_v13_9.png
+++ /dev/null
diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md
index d2cbf9e4acd..5bcfafa7196 100644
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
@@ -7,133 +7,61 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # User account
 
-Each GitLab account has a user profile, and settings. Your [profile](#user-profile)
-contains information about you, and your GitLab activity. Your [settings](#user-settings)
-allow you to customize some aspects of GitLab to suit yourself.
+Each GitLab account has a user profile, which contains information about you and your GitLab activity.
 
-## Creating users
+Your profile also includes settings, which you use to customize your GitLab experience.
 
-There are several ways to create users on GitLab. See the [creating users documentation](account/create_accounts.md) for more details.
-
-## Signing in
-
-There are several ways to sign into your GitLab account.
-See the [authentication topic](../../topics/authentication/index.md) for more details.
-
-### Unknown sign-in
-
-GitLab notifies you if a sign-in occurs that is from an unknown IP address or device.
-See [Unknown Sign-In Notification](unknown_sign_in_notification.md) for more details.
-
-## User profile
+## Access your user profile
 
 To access your profile:
 
 1. In the top-right corner, select your avatar.
 1. Select your name or username.
 
-On your profile page, you can see the following information:
-
-- Personal information
-- Activity stream: see your activity streamline and the history of your contributions
-- Groups: [groups](../group/index.md) you're a member of
-- Contributed projects: [projects](../project/index.md) you contributed to
-- Personal projects: your personal projects (respecting the project's visibility level)
-- Starred projects: projects you starred
-- Snippets: your personal code [snippets](../snippets.md#personal-snippets)
-- Followers: people following you
-- Following: people you are following
-
-Profile page with active Following view:
-
-![Follow users](img/profile_following_v13_9.png)
-
-## User settings
+## Access your user settings
 
 To access your user settings:
 
 1. In the top-right corner, select your avatar.
 1. Select **Edit profile**.
 
-From there, you can:
-
-- Update your personal information, including:
-  - Full name
-  - Primary email, public email, and commit email
-  - Social media handles
-  - Website URL
-  - Location
-  - Job title
-  - Bio
-- Change your [password](#changing-your-password)
-- Set a [custom status](#current-status) for your profile
-- Manage your [commit email](#commit-email) for your profile
-- Manage [2FA](account/two_factor_authentication.md)
-- Add details of [external accounts](#add-details-of-external-accounts).
-- Change your username and [delete your account](account/delete_account.md)
-- Manage applications that can
-  [use GitLab as an OAuth provider](../../integration/oauth_provider.md#introduction-to-oauth)
-- Manage [personal access tokens](personal_access_tokens.md) to access your account via API and authorized applications
-- Add and delete emails linked to your account
-- Choose which email to use for [notifications](notifications.md), web-based commits, and display on your public profile
-- Manage [SSH keys](../../ssh/README.md) to access your account via SSH
-- Manage your [preferences](preferences.md#syntax-highlighting-theme)
-  to customize your own GitLab experience
-- [View your active sessions](active_sessions.md) and revoke any of them if necessary
-- Access your audit events, a security log of important events involving your account
+## Change your password
 
-## Changing your password
+To change your password:
 
-1. Go to your [user settings](#user-settings).
+1. In the top-right corner, select your avatar.
+1. Select **Edit profile**.
 1. In the left sidebar, select **Password**.
-1. Enter your current password in the **Current password** field.
-1. Enter your desired new password twice, once in the **New password** field and
-   once in the **Password confirmation** field.
+1. In the **Current password** field, enter your current password.
+1. In the **New password** and **Password confirmation** field, enter your new password.
 1. Select **Save password**.
 
-If you don't know your current password, select the 'I forgot my password' link.
+If you don't know your current password, select the **I forgot my password** link.
+
+## Change your username
 
-![Change your password](img/change_password_v13_0.png)
+Your username has a unique [namespace](../group/index.md#namespaces),
+which is updated when you change your username. Before you change your username, read about
+[how redirects behave](../project/repository/index.md#redirects-when-changing-repository-paths).
+If you do not want to update the namespace, you can create a new user or group and transfer projects to it instead.
 
-## Changing your username
+Prerequisites:
 
-Your `username` is a unique [`namespace`](../group/index.md#namespaces)
-related to your user ID. Changing it can have unintended side effects, read
-[how redirects behave](../project/repository/index.md#redirects-when-changing-repository-paths)
-before proceeding.
+- Your namespace cannot contain a project with [Container Registry](../packages/container_registry/index.md) tags.
+- Your namespace cannot have a project that hosts [GitLab Pages](../project/pages/index.md). For more information,
+  see [this procedure in the GitLab Team Handbook](https://about.gitlab.com/handbook/tools-and-tips/#how-to-change-your-username-at-gitlabcom).
 
-To change your `username`:
+To change your username:
 
-1. Navigate to your [user settings](#user-settings).
+1. In the top-right corner, select your avatar.
+1. Select **Edit profile**.
 1. In the left sidebar, select **Account**.
-1. Enter a new username under **Change username**.
+1. In the **Change username** section, enter a new username as the path.
 1. Select **Update username**.
 
-WARNING:
-It is not possible to change your username if it contains a
-project with [Container Registry](../packages/container_registry/index.md) tags,
-because the project cannot be moved.
+## Make your user profile page private
 
-NOTE:
-If you want to retain ownership over the original namespace and
-protect the URL redirects, then instead of changing a group's path or renaming a
-username, you can create a new group and transfer projects to it.
-Alternatively, you can follow [this detailed procedure from the GitLab Team Handbook](https://about.gitlab.com/handbook/tools-and-tips/#how-to-change-your-username-at-gitlabcom)
-which also covers the case where you have projects hosted with
-[GitLab Pages](../project/pages/index.md).
-
-## Private profile
-
-The following information is hidden from the user profile page (`https://gitlab.example.com/username`) if this feature is enabled:
-
-- Atom feed
-- Date when account is created
-- Activity tab
-- Groups tab
-- Contributed projects tab
-- Personal projects tab
-- Starred projects tab
-- Snippets tab
+You can make your user profile visible to only you and GitLab administrators.
 
 To make your profile private:
 
@@ -142,11 +70,13 @@ To make your profile private:
 1. Select the **Private profile** checkbox.
 1. Select **Update profile settings**.
 
-NOTE:
-All your profile information can be seen by yourself and GitLab administrators even if
-the **Private profile** option is enabled.
+The following is hidden from your user profile page (`https://gitlab.example.com/username`):
 
-## Add details of external accounts
+- Atom feed
+- Date when account was created
+- Tabs for activity, groups, contributed projects, personal projects, starred projects, snippets
+
+## Add external accounts to your user profile page
 
 You can add links to certain other external accounts you might have, like Skype and Twitter.
 They can help other users connect with you on other platforms.
@@ -155,58 +85,47 @@ To add links to other accounts:
 
 1. In the top-right corner, select your avatar.
 1. Select **Edit profile**.
-1. Edit the desired fields for external accounts:
+1. In the **Main settings** section, add your information from:
    - Skype
    - LinkedIn
    - Twitter
 1. Select **Update profile settings**.
 
-## Private contributions
+## Show private contributions on your user profile page
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/14078) in GitLab 11.3.
 
-Enabling private contributions includes contributions to private projects, in the user contribution calendar graph and user recent activity.
+In the user contribution calendar graph and recent activity list, you can show contributions to private projects.
 
-To enable private contributions:
+To show private contributions:
 
 1. In the top-right corner, select your avatar.
 1. Select **Edit profile**.
-1. Select the **Private contributions** checkbox.
+1. In the **Main settings** section, select the **Include private contributions on my profile** checkbox.
 1. Select **Update profile settings**.
 
-## Current status
+## Set your current status
 
 > Introduced in GitLab 11.2.
 
 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.
-Other users can then take your status into consideration when responding to your issues or assigning work to you.
-Please be aware that your status is publicly visible even if your [profile is private](#private-profile).
 
-Status messages are restricted to 100 characters of plain text.
-They may however contain emoji codes such as `I'm on vacation :palm_tree:`.
+Your status is publicly visible even if your [profile is private](#make-your-user-profile-page-private).
 
 To set your current status:
 
 1. In the top-right corner, select your avatar.
-1. Select **Set status**, or **Edit status** if you have already set a status.
-1. Set the desired emoji and status message.
+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 **Set status**. Alternatively, you can select **Remove status** to remove your user status entirely.
 
-or
-
-1. In the top-right corner, select your avatar.
-1. Select your name or username.
-1. Select the Edit profile icon (**{pencil}**).
-1. Enter your status message in the **Your status** text field.
-1. Select Add status emoji icon (**{slight-smile}**), and select the desired emoji.
-1. Select **Update profile settings**.
-
-You can also set your current status [using the API](../../api/users.md#user-status).
+You can also set your current status by [using the API](../../api/users.md#user-status).
 
-If you previously selected the **Busy** checkbox, remember to deselect it when you become available again.
+If you select the **Busy** checkbox, remember to clear it when you become available again.
 
-## Busy status indicator
+## Set a busy status indicator
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/259649) in GitLab 13.6.
 > - It was [deployed behind a feature flag](../feature_flags.md), disabled by default.
@@ -217,21 +136,37 @@ If you previously selected the **Busy** checkbox, remember to deselect it when y
 
 To indicate to others that you are busy, you can set an indicator.
 
-![Busy status indicator](img/busy_status_indicator_v13_6.png)
-
 To set the busy status indicator, either:
 
 - Set it directly:
-
   1. In the top-right corner, select your avatar.
-  1. Select **Set status**, or **Edit status** if you have already set a status.
+  1. Select **Set status** or, if you have already set a status, **Edit status**.
   1. Select the **Busy** checkbox.
 
 - Set it on your profile:
-
   1. In the top-right corner, select your avatar.
   1. Select **Edit profile**.
-  1. Select the **Busy** checkbox.
+  1. In the **Current status** section, select the **Busy** checkbox.
+
+  The busy status is displayed in the user interface.
+
+  Username:
+
+  | Profile page | Settings menu | User popovers |
+  | --- | --- | --- |
+  | ![Busy status - profile page](img/busy_indicator_profile_page_v13_6.png) | ![Busy status - settings menu](img/busy_indicator_settings_menu_v13_6.png) | ![Busy status - user popovers](img/busy_indicator_user_popovers_v13_6.png) |
+
+  Issue and merge request sidebar:
+
+  | Sidebar| Collapsed sidebar |
+  | --- | --- |
+  | ![Busy status - sidebar](img/busy_indicator_sidebar_v13_9.png) | ![Busy status - sidebar collapsed](img/busy_indicator_sidebar_collapsed_v13_9.png) |
+
+  Notes:
+
+  | Notes | Note headers |
+  | --- | --- |
+  | ![Busy status - notes](img/busy_indicator_notes_v13_9.png) | ![Busy status - note header](img/busy_indicator_note_header_v13_9.png) |
 
 ### Disable busy status feature
 
@@ -250,7 +185,7 @@ To enable it:
 Feature.enable(:set_user_availability_status)
 ```
 
-## Commit email
+## Change the email displayed on your commits
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/21598) in GitLab 11.4.
 
@@ -262,29 +197,27 @@ To change your commit email:
 
 1. In the top-right corner, select your avatar.
 1. Select **Edit profile**.
-1. Select the **Commit email** dropdown.
-1. Select any of the verified emails.
+1. In the **Commit email** list, select an email address.
 1. Select **Update profile settings**.
 
-### Private commit email
+### Use an automatically-generated private commit email
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/22560) in GitLab 11.5.
 
-GitLab provides the user with an automatically generated private commit email option,
-which allows the user to keep their email information private.
+GitLab provides an automatically-generated private commit email address,
+so you can keep your email information private.
 
-To enable this option:
+To use a private commit email:
 
 1. In the top-right corner, select your avatar.
 1. Select **Edit profile**.
-1. Select the **Commit email** dropdown.
-1. Select **Use a private email** option.
+1. In the **Commit email** list, select the **Use a private email** option.
 1. Select **Update profile settings**.
 
-After this option is enabled, every Git-related action is performed using the private commit email.
+Every Git-related action uses the private commit email.
 
-To stay fully anonymous, you can also copy this private commit email
-and configure it on your local machine using the following command:
+To stay fully anonymous, you can also copy the private commit email
+and configure it on your local machine by using the following command:
 
 ```shell
 git config --global user.email <your email address>
@@ -294,16 +227,16 @@ git config --global user.email <your email address>
 
 ### Why do I keep getting signed out?
 
-When signing in to the main GitLab application, a `_gitlab_session` cookie is
-set. `_gitlab_session` is cleared client-side when you close your browser
-and expires after "Application settings -> Session duration (minutes)"/`session_expire_delay`
+When you sign in to the main GitLab application, a `_gitlab_session` cookie is
+set. When you close your browser, the cookie is cleared client-side
+and it expires after "Application settings > Session duration (minutes)"/`session_expire_delay`
 (defaults to `10080` minutes = 7 days) of no activity.
 
-When signing in to the main GitLab application, you can also check the
-**Remember me** option which sets the `remember_user_token`
-cookie (via [`devise`](https://github.com/heartcombo/devise)).
-`remember_user_token` expires after
-`config/initializers/devise.rb` -> `config.remember_for` (defaults to 2 weeks).
+When you sign in to the main GitLab application, you can also check the
+**Remember me** option. This sets the `remember_user_token`
+cookie via [`devise`](https://github.com/heartcombo/devise).
+The `remember_user_token` cookie expires after
+`config/initializers/devise.rb` -> `config.remember_for`. The default is 2 weeks.
 
 When the `_gitlab_session` expires or isn't available, GitLab uses the `remember_user_token`
 to get you a new `_gitlab_session` and keep you signed in through browser restarts.
@@ -339,3 +272,14 @@ The server continues to reset the TTL for that session, independent of whether 2
 If you close your browser and open it up again, the `remember_user_token` cookie allows your user to reauthenticate itself.
 
 Without the `config.extend_remember_period` flag, you would be forced to sign in again after two weeks.
+
+## Related topics
+
+- [Create users](account/create_accounts.md)
+- [Sign in to your GitLab account](../../topics/authentication/index.md)
+- [Receive emails for sign-ins from unknown IP addresses or devices](unknown_sign_in_notification.md)
+- Manage applications that can [use GitLab as an OAuth provider](../../integration/oauth_provider.md#introduction-to-oauth)
+- Manage [personal access tokens](personal_access_tokens.md) to access your account via API and authorized applications
+- Manage [SSH keys](../../ssh/README.md) to access your account via SSH
+- Change your [syntax highlighting theme](preferences.md#syntax-highlighting-theme)
+- [View your active sessions](active_sessions.md) and revoke any of them if necessary
diff --git a/doc/user/profile/notifications.md b/doc/user/profile/notifications.md
index 703154945db..4f28558cca6 100644
--- a/doc/user/profile/notifications.md
+++ b/doc/user/profile/notifications.md
@@ -206,7 +206,8 @@ epics:
 | Failed pipeline        | The author of the pipeline |
 | Fixed pipeline ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/24309) in GitLab 13.1.)    | The author of the pipeline. Enabled by default. |
 | Merge merge request    |         |
-| Merge when pipeline succeeds ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/211961) in GitLab 13.4) |     |
+| Merge when pipeline succeeds ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/211961) in GitLab 13.4) | Author, Participants, Watchers, Subscribers, and Custom notification level with this event selected. `Note:` Custom notification level is ignored for Author, Watchers and Subscribers   |
+| Merge request [marked as ready](../project/merge_requests/drafts.md) (introduced in [GitLab 13.10](https://gitlab.com/gitlab-org/gitlab/-/issues/15332)) | Watchers and participants |
 | New comment            | Participants, Watchers, Subscribers, and Custom notification level with this event selected, plus anyone mentioned by `@username` in the comment, with notification level "Mention" or higher |
 | New epic               |         |
 | New issue              |         |
diff --git a/doc/user/profile/personal_access_tokens.md b/doc/user/profile/personal_access_tokens.md
index 99db0c4b898..d32971a7618 100644
--- a/doc/user/profile/personal_access_tokens.md
+++ b/doc/user/profile/personal_access_tokens.md
@@ -21,7 +21,7 @@ Personal access tokens expire on the date you define, at midnight UTC.
 - GitLab runs a check at 01:00 AM UTC every day to identify personal access tokens that expire in under seven days. The owners of these tokens are notified by email.
 - GitLab runs a check at 02:00 AM UTC every day to identify personal access tokens that expired on the current date. The owners of these tokens are notified by email.
 - In GitLab Ultimate, administrators may [limit the lifetime of personal access tokens](../admin_area/settings/account_and_limit_settings.md#limiting-lifetime-of-personal-access-tokens).
-- In GitLab Ultimate, administrators may [toggle enforcement of personal access token expiry](../admin_area/settings/account_and_limit_settings.md#optional-enforcement-of-personal-access-token-expiry).
+- In GitLab Ultimate, administrators may [toggle enforcement of personal access token expiration](../admin_area/settings/account_and_limit_settings.md#optional-non-enforcement-of-personal-access-token-expiration).
 
 For examples of how you can use a personal access token to authenticate with the API, see the following section from our [API Docs](../../api/README.md#personalproject-access-tokens).
 
diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md
index 464edf13a7e..78900e145b7 100644
--- a/doc/user/profile/preferences.md
+++ b/doc/user/profile/preferences.md
@@ -58,12 +58,10 @@ Dark mode is available as a navigation theme, for MVC and compatibility reasons.
 the future, we plan to make it configurable in its own section along with support for
 [different navigation themes](https://gitlab.com/gitlab-org/gitlab/-/issues/219512).
 
-NOTE:
 Dark theme only works with the **Dark** syntax highlighting theme.
 
 ## Syntax highlighting theme
 
-NOTE:
 GitLab uses the [rouge Ruby library](http://rouge.jneen.net/ "Rouge website")
 for syntax highlighting outside of any Editor context. The WebIDE (like Snippets)
 uses [Monaco Editor](https://microsoft.github.io/monaco-editor/) and it's provided
@@ -88,11 +86,7 @@ The default syntax theme is White, and you can choose among 5 different themes:
 
 ![Profile preferences syntax highlighting themes](img/profile-preferences-syntax-themes.png)
 
-[Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2389) in 13.0, the theme
-you choose also applies to the [Web IDE](../project/web_ide/index.md)'s code editor and [Snippets](../snippets.md).
-The themes are available only in the Web IDE file editor, except for the [dark theme](https://gitlab.com/gitlab-org/gitlab/-/issues/209808) and
-the [Solarized dark theme](https://gitlab.com/gitlab-org/gitlab/-/issues/219228),
-which apply to the entire Web IDE screen.
+Introduced in GitLab 13.6, the themes [Solarized](https://gitlab.com/gitlab-org/gitlab/-/issues/221034) and [Monokai](https://gitlab.com/gitlab-org/gitlab/-/issues/221034) also apply to the [Web IDE](../project/web_ide/index.md) and [Snippets](../snippets.md).
 
 ## Behavior
 
@@ -114,12 +108,13 @@ select few, the amount of activity on the default Dashboard page can be
 overwhelming. Changing this setting allows you to redefine your default
 dashboard.
 
-You have 8 options here that you can use for your default dashboard view:
+You can include the following options for your default dashboard view:
 
 - Your projects (default)
 - Starred projects
 - Your projects' activity
 - Starred projects' activity
+- Followed Users' Activity
 - Your groups
 - Your [To-Do List](../todos.md)
 - Assigned Issues