Add latest changes from gitlab-org/gitlab@master

10 files changed, 44 insertions, 32 deletions

diff --git a/doc/user/admin_area/license_file.md b/doc/user/admin_area/license_file.md
index 01d2c31dd10..13807d53fea 100644
--- a/doc/user/admin_area/license_file.md
+++ b/doc/user/admin_area/license_file.md
@@ -42,7 +42,7 @@ export GITLAB_ACTIVATION_CODE=your_activation_code
 
 If you have a license, you can also import it when you install GitLab.
 
-- **For installations from source**
+- For self-compiled installations:
   - Place the `Gitlab.gitlab-license` file in the `config/` directory.
   - To specify a custom location and filename for the license, set the
     `GITLAB_LICENSE_FILE` environment variable with the path to the file:
@@ -51,7 +51,7 @@ If you have a license, you can also import it when you install GitLab.
     export GITLAB_LICENSE_FILE="/path/to/license/file"
     ```
 
-- **For Omnibus package**
+- For Linux package installations:
   - Place the `Gitlab.gitlab-license` file in the `/etc/gitlab/` directory.
   - To specify a custom location and filename for the license, add this entry to `gitlab.rb`:
 
diff --git a/doc/user/admin_area/settings/account_and_limit_settings.md b/doc/user/admin_area/settings/account_and_limit_settings.md
index 5c730375f98..f0fe55f25c9 100644
--- a/doc/user/admin_area/settings/account_and_limit_settings.md
+++ b/doc/user/admin_area/settings/account_and_limit_settings.md
@@ -352,7 +352,7 @@ error, the [max attachment size](#max-attachment-size)
 is probably larger than the web server's allowed value.
 
 To increase the max attachment size to 200 MB in a
-[Omnibus GitLab](https://docs.gitlab.com/omnibus/) install, you may need to
+[Linux package](https://docs.gitlab.com/omnibus/) install, you may need to
 add the line below to `/etc/gitlab/gitlab.rb` before increasing the max attachment size:
 
 ```ruby
diff --git a/doc/user/admin_area/settings/external_authorization.md b/doc/user/admin_area/settings/external_authorization.md
index 072873ba7f6..2e62670fa00 100644
--- a/doc/user/admin_area/settings/external_authorization.md
+++ b/doc/user/admin_area/settings/external_authorization.md
@@ -32,12 +32,12 @@ authorization service.
 
 Whenever access is granted or denied this is logged in a log file called
 `external-policy-access-control.log`. Read more about the logs GitLab keeps in
-the [Omnibus GitLab documentation](https://docs.gitlab.com/omnibus/settings/logs.html).
+the [Linux package documentation](https://docs.gitlab.com/omnibus/settings/logs.html).
 
 When using TLS Authentication with a self signed certificate, the CA certificate
 needs to be trusted by the OpenSSL installation. When using GitLab installed
-using Omnibus, learn to install a custom CA in the
-[Omnibus GitLab documentation](https://docs.gitlab.com/omnibus/settings/ssl/index.html).
+using the Linux package, learn to install a custom CA in the
+[Linux package documentation](https://docs.gitlab.com/omnibus/settings/ssl/index.html).
 Alternatively, learn where to install custom certificates by using
 `openssl version -d`.
 
diff --git a/doc/user/admin_area/settings/user_and_ip_rate_limits.md b/doc/user/admin_area/settings/user_and_ip_rate_limits.md
index 9b8718fc336..4fc44c94b4a 100644
--- a/doc/user/admin_area/settings/user_and_ip_rate_limits.md
+++ b/doc/user/admin_area/settings/user_and_ip_rate_limits.md
@@ -131,7 +131,7 @@ GitLab. For example:
    - Set `Gitlab-Bypass-Rate-Limiting` to a value other than `1` on all requests that
      should be affected by rate limiting.
 1. Set the environment variable  `GITLAB_THROTTLE_BYPASS_HEADER`.
-   - For [Omnibus](https://docs.gitlab.com/omnibus/settings/environment-variables.html),
+   - For [Linux package installations](https://docs.gitlab.com/omnibus/settings/environment-variables.html),
      set `'GITLAB_THROTTLE_BYPASS_HEADER' => 'Gitlab-Bypass-Rate-Limiting'` in `gitlab_rails['env']`.
    - For source installations, set `export GITLAB_THROTTLE_BYPASS_HEADER=Gitlab-Bypass-Rate-Limiting`
      in `/etc/default/gitlab`.
@@ -163,7 +163,7 @@ the `GITLAB_THROTTLE_USER_ALLOWLIST` environment variable. If you want
 users 1, 53 and 217 to bypass the authenticated request rate limiter,
 the allowlist configuration would be `1,53,217`.
 
-- For [Omnibus](https://docs.gitlab.com/omnibus/settings/environment-variables.html),
+- For [Linux package installations](https://docs.gitlab.com/omnibus/settings/environment-variables.html),
   set `'GITLAB_THROTTLE_USER_ALLOWLIST' => '1,53,217'` in `gitlab_rails['env']`.
 - For source installations, set `export GITLAB_THROTTLE_USER_ALLOWLIST=1,53,217`
   in `/etc/default/gitlab`.
diff --git a/doc/user/clusters/agent/ci_cd_workflow.md b/doc/user/clusters/agent/ci_cd_workflow.md
index 7a3f09f50ca..effbd5be7ec 100644
--- a/doc/user/clusters/agent/ci_cd_workflow.md
+++ b/doc/user/clusters/agent/ci_cd_workflow.md
@@ -11,7 +11,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/5784) the `ci_access` attribute in GitLab 14.3.
 > - The ability to authorize groups was [introduced](https://gitlab.com/groups/gitlab-org/-/epics/5784) in GitLab 14.3.
 > - [Moved](https://gitlab.com/groups/gitlab-org/-/epics/6290) to GitLab Free in 14.5.
-> - Support for Omnibus installations was [introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5686) in GitLab 14.5.
+> - Support for Linux package installations was [introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5686) in GitLab 14.5.
 > - The ability to switch between certificate-based clusters and agents was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/335089) in GitLab 14.9. The certificate-based cluster context is always called `gitlab-deploy`.
 > - [Renamed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80508) from _CI/CD tunnel_ to _CI/CD workflow_ in GitLab 14.9.
 
diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md
index 2fa77878cb0..82d0bfb035a 100644
--- a/doc/user/gitlab_com/index.md
+++ b/doc/user/gitlab_com/index.md
@@ -468,7 +468,7 @@ and can't be configured on GitLab.com to expire. You can erase job logs
 
 ## GitLab.com at scale
 
-In addition to the GitLab Enterprise Edition Omnibus install, GitLab.com uses
+In addition to the GitLab Enterprise Edition Linux package install, GitLab.com uses
 the following applications and settings to achieve scale. All settings are
 publicly available, as [Kubernetes configuration](https://gitlab.com/gitlab-com/gl-infra/k8s-workloads/gitlab-com)
 or [Chef cookbooks](https://gitlab.com/gitlab-cookbooks).
diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md
index 8827e1e27c5..57852d3e6ac 100644
--- a/doc/user/profile/account/two_factor_authentication.md
+++ b/doc/user/profile/account/two_factor_authentication.md
@@ -108,7 +108,7 @@ Configure FortiAuthenticator in GitLab. On your GitLab server:
 
 1. Open the configuration file.
 
-   For Omnibus GitLab:
+   For Linux package installations:
 
    ```shell
    sudo editor /etc/gitlab/gitlab.rb
@@ -123,7 +123,7 @@ Configure FortiAuthenticator in GitLab. On your GitLab server:
 
 1. Add the provider configuration:
 
-   For Omnibus package:
+   For Linux package installations:
 
    ```ruby
    gitlab_rails['forti_authenticator_enabled'] = true
@@ -145,8 +145,8 @@ Configure FortiAuthenticator in GitLab. On your GitLab server:
    ```
 
 1. Save the configuration file.
-1. [Reconfigure](../../../administration/restart_gitlab.md#omnibus-gitlab-reconfigure) (Omnibus GitLab) or
-   [restart](../../../administration/restart_gitlab.md#installations-from-source) (GitLab installed from source).
+1. [Reconfigure](../../../administration/restart_gitlab.md#omnibus-gitlab-reconfigure) (Linux package) or
+   [restart](../../../administration/restart_gitlab.md#installations-from-source) (self-compiled installations).
 
 ### Enable one-time password using Duo
 
@@ -174,7 +174,7 @@ On your GitLab server:
 
 1. Open the configuration file.
 
-   For Omnibus GitLab:
+   For Linux package installations:
 
    ```shell
    sudo editor /etc/gitlab/gitlab.rb
@@ -189,7 +189,7 @@ On your GitLab server:
 
 1. Add the provider configuration:
 
-   For Omnibus package:
+   For Linux package installations:
 
    ```ruby
     gitlab_rails['duo_auth_enabled'] = false
@@ -209,7 +209,7 @@ On your GitLab server:
    ```
 
 1. Save the configuration file.
-1. For Omnibus GitLab, [reconfigure GitLab](../../../administration/restart_gitlab.md#omnibus-gitlab-reconfigure).
+1. For Linux package installations, [reconfigure GitLab](../../../administration/restart_gitlab.md#omnibus-gitlab-reconfigure).
    For installations from source, [restart GitLab](../../../administration/restart_gitlab.md#installations-from-source).
 
 ### Enable one-time password using FortiToken Cloud
@@ -233,7 +233,7 @@ Configure FortiToken Cloud in GitLab. On your GitLab server:
 
 1. Open the configuration file.
 
-   For Omnibus GitLab:
+   For Linux package installations:
 
    ```shell
    sudo editor /etc/gitlab/gitlab.rb
@@ -248,7 +248,7 @@ Configure FortiToken Cloud in GitLab. On your GitLab server:
 
 1. Add the provider configuration:
 
-   For Omnibus package:
+   For Linux package installations:
 
    ```ruby
    gitlab_rails['forti_token_cloud_enabled'] = true
@@ -266,8 +266,8 @@ Configure FortiToken Cloud in GitLab. On your GitLab server:
    ```
 
 1. Save the configuration file.
-1. [Reconfigure](../../../administration/restart_gitlab.md#omnibus-gitlab-reconfigure) (Omnibus GitLab) or
-   [restart](../../../administration/restart_gitlab.md#installations-from-source) (GitLab installed from source).
+1. [Reconfigure](../../../administration/restart_gitlab.md#omnibus-gitlab-reconfigure) (Linux package) or
+   [restart](../../../administration/restart_gitlab.md#installations-from-source) (self-compiled installations).
 
 ### Set up a WebAuthn device
 
diff --git a/doc/user/profile/user_passwords.md b/doc/user/profile/user_passwords.md
index eac3db3c71c..f8cbdd54e77 100644
--- a/doc/user/profile/user_passwords.md
+++ b/doc/user/profile/user_passwords.md
@@ -23,6 +23,8 @@ authorization provider, you do not need to choose a password. GitLab
 
 ## Change your password
 
+> Password reset emails sent to any verified email address [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/16311) in GitLab 16.1.
+
 You can change your password. GitLab enforces [password requirements](#password-requirements) when you choose your new
 password.
 
@@ -33,8 +35,17 @@ password.
 1. In the **New password** and **Password confirmation** text box, enter your new password.
 1. Select **Save password**.
 
-If you don't know your current password, select the **I forgot my password** link. A password reset email is sent to the
-account's **primary** email address.
+If you do not know your current password, select **I forgot my password**
+and complete the form. A password reset email is sent to the email address you
+enter into this form, provided that the email address is verified. If you enter an
+unverified email address into this form, no email is sent, and you see the following
+message:
+
+> "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+
+NOTE:
+Your account can have more than one verified email address, and any email address
+associated with your account can be verified.
 
 ## Password requirements
 
diff --git a/doc/user/project/integrations/mattermost_slash_commands.md b/doc/user/project/integrations/mattermost_slash_commands.md
index 3b5e4030487..4de334a0535 100644
--- a/doc/user/project/integrations/mattermost_slash_commands.md
+++ b/doc/user/project/integrations/mattermost_slash_commands.md
@@ -17,9 +17,9 @@ separately configured [Mattermost notifications](mattermost.md).
 GitLab provides different ways to configure Mattermost slash commands. For any of these options,
 you must have Mattermost [3.4 or later](https://mattermost.com/blog/category/platform/releases/).
 
-- **Omnibus GitLab installations**: Mattermost is bundled with
-  [Omnibus GitLab](https://docs.gitlab.com/omnibus/). To configure Mattermost for Omnibus GitLab,
-  read the [Omnibus GitLab Mattermost documentation](../../../integration/mattermost/index.md).
+- **Linux package installations**: Mattermost is bundled with
+  [Linux package](https://docs.gitlab.com/omnibus/). To configure Mattermost for Linux package
+  installations, read the [Linux package Mattermost documentation](../../../integration/mattermost/index.md).
 - **If Mattermost is installed on the same server as GitLab**, use the
   [automated configuration](#configure-automatically).
 - **For all other installations**, use the [manual configuration](#configure-manually).
@@ -133,7 +133,7 @@ The available slash commands for Mattermost are:
 ## Related topics
 
 - [Mattermost slash commands](https://developers.mattermost.com/integrate/slash-commands/)
-- [Omnibus GitLab Mattermost](../../../integration/mattermost/index.md)
+- [Linux package Mattermost](../../../integration/mattermost/index.md)
 
 ## Troubleshooting
 
diff --git a/doc/user/project/service_desk.md b/doc/user/project/service_desk.md
index 085f3305ddb..b777110d670 100644
--- a/doc/user/project/service_desk.md
+++ b/doc/user/project/service_desk.md
@@ -238,9 +238,10 @@ To configure a custom mailbox for Service Desk with IMAP, add the following snip
 
 NOTE:
 In GitLab 15.3 and later, Service Desk uses `webhook` (internal API call) by default instead of enqueuing a Sidekiq job.
-To use `webhook` on an Omnibus installation running GitLab 15.3, you must generate a secret file.
+To use `webhook` on a Linux package installation running GitLab 15.3, you must generate a secret file.
 For more information, see [merge request 5927](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5927).
-In GitLab 15.4, reconfiguring an Omnibus installation generates this secret file automatically, so no secret file configuration setting is needed.
+In GitLab 15.4, reconfiguring a Linux package installation generates this secret file automatically, so no
+secret file configuration setting is needed.
 For more information, see [issue 1462](https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1462).
 
 ```ruby
@@ -419,7 +420,7 @@ Service Desk can be configured to read Microsoft Exchange Online mailboxes with
 Graph API instead of IMAP. Set up an OAuth 2.0 application for Microsoft Graph
 [the same way as for incoming email](../../administration/incoming_email.md#microsoft-graph).
 
-- Example for Omnibus GitLab installations:
+- Example for Linux package installations:
 
   ```ruby
   gitlab_rails['service_desk_email_enabled'] = true
@@ -502,8 +503,8 @@ and the [common settings for `service_desk_email`](https://docs.gitlab.com/chart
 
 #### Linux package (Omnibus)
 
-In multi-node Linux package (Omnibus) environments, run `mail_room` only on one node. Run it either on a single
-`rails` node (for example, [Omnibus role](https://docs.gitlab.com/omnibus/roles/index.html) `application_role`)
+In multi-node Linux package installation environments, run `mail_room` only on one node. Run it either on a single
+`rails` node (for example, `application_role`)
 or completely separately.
 
 ##### Set up all nodes