Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

5 files changed, 13 insertions, 36 deletions

diff --git a/doc/subscriptions/bronze_starter.md b/doc/subscriptions/bronze_starter.md
index 7ca3a3ffade..17eafb7633e 100644
--- a/doc/subscriptions/bronze_starter.md
+++ b/doc/subscriptions/bronze_starter.md
@@ -21,7 +21,7 @@ the tiers are no longer mentioned in GitLab documentation:
 - [Code owners](../user/project/code_owners.md)
 - Description templates:
   - [Setting a default template for merge requests and issues](../user/project/description_templates.md#set-a-default-template-for-merge-requests-and-issues)
-- [Email from GitLab](../tools/email.md)
+- [Email from GitLab](../user/admin_area/email_from_gitlab.md)
 - Groups:
   - [Creating group memberships via CN](../user/group/index.md#create-group-links-via-cn)
   - [Group push rules](../user/group/index.md#group-push-rules)
diff --git a/doc/subscriptions/img/support-diagram.png b/doc/subscriptions/img/support-diagram.png
deleted file mode 100644
index 1628a62f19a..00000000000
--- a/doc/subscriptions/img/support-diagram.png
+++ /dev/null
diff --git a/doc/subscriptions/img/support_diagram_c.png b/doc/subscriptions/img/support_diagram_c.png
new file mode 100644
index 00000000000..a2fed80e912
--- /dev/null
+++ b/doc/subscriptions/img/support_diagram_c.png
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index 6c5543edb58..824fe0bacde 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -34,8 +34,8 @@ GitLab SaaS or GitLab self-managed:
   your own GitLab instance.
 
 On a GitLab self-managed instance, a GitLab subscription provides the same set of
-features for _all_ users. On GitLab SaaS, you can apply a subscription to either
-a group or a personal namespace.
+features for _all_ users. On GitLab SaaS, you can apply a subscription to a group
+namespace. You cannot apply a subscription to a personal namespace.
 
 NOTE:
 Subscriptions cannot be transferred between GitLab SaaS and GitLab self-managed.
@@ -256,12 +256,11 @@ Send all questions and requests related to the GitLab for Startups program to `s
 
 ### Support for Community Programs
 
-Because these Community Programs are free of cost, regular Priority Support is not included. However, it can be purchased at a 95% discount in some cases.
-If interested, email the relevant community program team: `education@gitlab.com`, `opensource@gitlab.com`, or `startups@gitlab.com`.
+Because these Community Programs are free of cost, regular Priority Support is not included.
 
 As a community member, you can follow this diagram to find support:
 
-![Support diagram](img/support-diagram.png)
+![Support diagram](img/support_diagram_c.png)
 
 ## Contact Support
 
diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md
index d38b56bb1f8..6765ca19518 100644
--- a/doc/subscriptions/self_managed/index.md
+++ b/doc/subscriptions/self_managed/index.md
@@ -126,31 +126,6 @@ Cloud licensing manages licenses for self-managed GitLab subscription plans. Clo
 - Activation: Unlock plan features and activate your self-managed instance by using an activation code.
 - License sync: Sync subscription data between your self-managed instance and GitLab.
 
-### What cloud licensing includes
-
-#### Auto-renewals
-
-For renewals that occur on or after 2021-08-01, your subscriptions will auto-renew.
-You have the option to manually cancel in the Customers Portal any time until thirty (30) days before renewal.
-
-#### Cloud licensing
-
-You can activate and manage your GitLab licenses by using the Customers Portal.
-This feature was formerly known as Seat Link.
-
-#### Operational data
-
-Service data helps GitLab improve the product experience and provide proactive support.
-Most data is categorized as optional and can be disabled. Data that is categorized as
-operational, like number of issues, pipelines, merge requests, and version, is not configurable.
-
-Please see our [service usage privacy page](https://about.gitlab.com/handbook/legal/privacy/services-usage-data/)
-for details on what information is collected.
-
-#### Quarterly subscription reconciliation
-
-See the [quarterly subscription reconciliation section](../quarterly_reconciliation.md) for more information.
-
 ### How cloud licensing works
 
 #### Add your license
@@ -173,6 +148,9 @@ This sync job runs daily around 3AM UTC. If the job fails, it is retried up to 1
 
 The daily job provides **only** the following information to the Customers Portal:
 
+- Company name
+- Licensee name
+- Licensee email
 - Date
 - Timestamp
 - License key
@@ -268,22 +246,22 @@ instance, ensure you're purchasing enough seats to
 If you are an administrator, you can view the status of your subscription:
 
 1. On the top bar, select **Menu > Admin**.
-1. On the left sidebar, select **License**.
+1. On the left sidebar, select **Subscription**.
 
-The **License** page includes the following details:
+The **Subscription** page includes the following details:
 
 - Licensee
 - Plan
 - When it was uploaded, started, and when it expires
 
-It also displays the following important statistics:
+It also displays the following information:
 
 | Field              | Description |
 |:-------------------|:------------|
 | Users in License   | The number of users you've paid for in the current license loaded on the system. The number does not change unless you [add seats](#add-seats-to-a-subscription) during your current subscription period. |
 | Billable users     | The daily count of billable users on your system. The count may change as you block or add users to your instance. |
 | Maximum users      | The highest number of billable users on your system during the term of the loaded license. |
-| Users over license | Calculated as `Maximum users` - `Users in License` for the current license term. This number incurs a retroactive charge that needs to be paid for at renewal. |
+| Users over license | Calculated as `Maximum users` - `Users in License` for the current license term. This number incurs a retroactive charge that must be paid before renewal. |
 
 ## Export your license usage
 
@@ -295,7 +273,7 @@ If you are an administrator, you can export your license usage into a CSV:
 1. On the left sidebar, select **Subscription**.
 1. In the top right, select **Export license usage file**.
 
-This file contains all the information GitLab needs to manually process quarterly reconciliations or renewals. If your instance is firewalled or air-gapped, you can provide GitLab with this information.
+This file contains the information GitLab uses to manually process quarterly reconciliations or renewals. If your instance is firewalled or air-gapped, you must provide GitLab with this information.
 
 The **License Usage** CSV includes the following details: