Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

6 files changed, 83 insertions, 3 deletions

diff --git a/doc/subscriptions/bronze_starter.md b/doc/subscriptions/bronze_starter.md
index 17eafb7633e..aaa6447cb6c 100644
--- a/doc/subscriptions/bronze_starter.md
+++ b/doc/subscriptions/bronze_starter.md
@@ -65,7 +65,7 @@ the tiers are no longer mentioned in GitLab documentation:
 - Merge requests:
   - [Full code quality reports in the code quality tab](../user/project/merge_requests/code_quality.md#code-quality-reports)
   - [Merge request approvals](../user/project/merge_requests/approvals/index.md)
-  - [Multiple assignees](../user/project/merge_requests/getting_started.md#multiple-assignees)
+  - [Multiple assignees](../user/project/merge_requests/index.md#assign-multiple-users)
   - [Approval Rule information for Reviewers](../user/project/merge_requests/reviews/index.md#approval-rule-information-for-reviewers)
   - [Required Approvals](../user/project/merge_requests/approvals/index.md#required-approvals)
   - [Code Owners as eligible approvers](../user/project/merge_requests/approvals/rules.md#code-owners-as-eligible-approvers)
diff --git a/doc/subscriptions/gitlab_dedicated/index.md b/doc/subscriptions/gitlab_dedicated/index.md
new file mode 100644
index 00000000000..7c768d1b403
--- /dev/null
+++ b/doc/subscriptions/gitlab_dedicated/index.md
@@ -0,0 +1,79 @@
+---
+stage: Enablement
+group: Distribution
+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 Dedicated
+
+NOTE:
+GitLab Dedicated is currently in limited availability. Please [contact us](#contact-us) if you are interested.
+
+GitLab Dedicated is a fully isolated, single-tenant SaaS service that is:
+
+- Hosted and managed by GitLab, Inc.
+- Deployed in a region of choice on AWS.
+
+GitLab Dedicated enables you to offload the operational overhead of managing the DevOps Platform. It offers a high level of tenant isolation and deployment customization, ideal for enterprises in highly-regulated industries. By deploying your GitLab instance onto separate Cloud Infrastructure from other tenants, GitLab Dedicated helps you better meet your security and compliance requirements.
+
+## Available features
+
+- Authentication: Support for instance-level [SAML OmniAuth](../../integration/saml.md) functionality. GitLab Dedicated acts as the service provider, and you will need to provide the necessary [configuration](../../integration/saml.md#general-setup) in order for GitLab to communicate with your IdP. This will be provided during onboarding. SAML [request signing](../../integration/saml.md#request-signing-optional) is supported.
+- Networking:
+  - Public connectivity
+  - Optional. Private connectivity via [AWS PrivateLink](https://aws.amazon.com/privatelink/).
+    You can specify an AWS IAM Principal and preferred Availability Zones during onboarding to enable this functionality.
+- Upgrade strategy:
+  - Monthly upgrades tracking one release behind the latest (n-1), with the latest security release.
+  - Out of band security patches provided for high severity releases.
+- Backup strategy: regular backups taken and tested.
+- Choice of cloud region: upon onboarding, choose the cloud region where you want to deploy your instance. Some AWS regions have limited features and as a result, we are not able to deploy production instances to those regions. See below for the [full list of regions](#aws-regions-not-supported) not currently supported.
+- Security: Data encrypted at rest and in transit using latest encryption standards.
+- Application: Self-managed [Ultimate feature set](https://about.gitlab.com/pricing/self-managed/feature-comparison/) with the exception of the unsupported features [listed below](#features-not-available-at-launch).
+
+## Features not available at launch
+
+Features that are not available but we plan to support in the future:
+
+- LDAP, Smartcard, Kerberos authentication
+- Custom domain
+- Advanced Search
+- Pages
+- GitLab-managed runners
+- FortiAuthenticator/FortiToken 2FA
+- Reply-by email
+- Service desk
+
+Features that we do not plan to offer at all:
+
+- Mattermost
+- Server-side Git Hooks
+
+### AWS regions not supported
+
+The following AWS regions are not available at launch:
+
+- Jakarta (ap-southeast-3)
+- Bahrain (me-south-1)
+- Hong Kong (ap-east-1)
+- Cape Town (af-south-1)
+- Milan (eu-south-1)
+- Paris (eu-west-3)
+- GovCloud
+
+## Contact us
+
+Fill in the following form to contact us and learn more about this offering.
+
+<!-- markdownlint-disable -->
+
+<!-- NOTE: The following form only shows when the site is served under HTTPS,
+     so it will not appear when developing locally or in a review app.
+     See https://gitlab.com/gitlab-com/marketing/marketing-operations/-/issues/6238#note_923358643
+-->
+
+<script src="//page.gitlab.com/js/forms2/js/forms2.min.js"></script>
+<form id="mktoForm_3226"></form>
+<script>MktoForms2.loadForm("//page.gitlab.com", "194-VVC-221", 3226);</script>
+
+<!-- markdownlint-enable -->
diff --git a/doc/subscriptions/img/support_diagram_c.png b/doc/subscriptions/img/support_diagram_c.png
index a2fed80e912..e98baed8605 100644
--- a/doc/subscriptions/img/support_diagram_c.png
+++ b/doc/subscriptions/img/support_diagram_c.png
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index 824fe0bacde..58af5787f2b 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -30,6 +30,7 @@ GitLab SaaS or GitLab self-managed:
 - [GitLab SaaS](gitlab_com/index.md): The GitLab software-as-a-service offering.
   You don't need to install anything to use GitLab SaaS, you only need to
   [sign up](https://gitlab.com/users/sign_up) and start using GitLab straight away.
+- [GitLab Dedicated](gitlab_dedicated/index.md): a single-tenant SaaS service for highly regulated and large enterprises.
 - [GitLab self-managed](self_managed/index.md): Install, administer, and maintain
   your own GitLab instance.
 
diff --git a/doc/subscriptions/quarterly_reconciliation.md b/doc/subscriptions/quarterly_reconciliation.md
index 3398902da1b..78c844b897c 100644
--- a/doc/subscriptions/quarterly_reconciliation.md
+++ b/doc/subscriptions/quarterly_reconciliation.md
@@ -70,7 +70,7 @@ sent and subject to your terms.
 
 ### Self-managed instances
 
-Admins receive an email **six days after the reconciliation date**.
+Administrators receive an email **six days after the reconciliation date**.
 This email communicates the [overage seat quantity](self_managed/index.md#users-over-license)
 and expected invoice amount.
 
diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md
index 6765ca19518..ce49b5a9c05 100644
--- a/doc/subscriptions/self_managed/index.md
+++ b/doc/subscriptions/self_managed/index.md
@@ -425,7 +425,7 @@ an expiration message is displayed to all administrators.
 For GitLab self-managed instances, you have a 14-day grace period
 before this occurs.
 
-- To resume functionality, acticate a new license.
+- To resume functionality, activate a new license.
 - To fall back to Free features, delete the expired license.
 
 ## Contact Support