Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 40 insertions, 43 deletions

diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md
index a63c2830909..a4affff92e4 100644
--- a/doc/subscriptions/self_managed/index.md
+++ b/doc/subscriptions/self_managed/index.md
@@ -1,7 +1,7 @@
 ---
 stage: none
 group: unassigned
-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/#designated-technical-writers
+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
 type: index, reference
 ---
 
@@ -45,13 +45,6 @@ billable user, with the following exceptions:
 - Members with Guest permissions on an Ultimate subscription.
 - GitLab-created service accounts: `Ghost User` and bots (`Support Bot`, [`Project bot users`](../../user/project/settings/project_access_tokens.md#project-bot-users), and so on).
 
-### Users statistics
-
-To view a breakdown of the users within your instance, including active, billable,
-and blocked, go to **Admin Area > Overview > Dashboard** and select **Users statistics**
-in the **Users** section. For more details, see
-[Users statistics](../../user/admin_area/index.md#users-statistics).
-
 ### Tips for managing users and subscription seats
 
 Managing the number of users against the number of subscription seats can be a challenge:
@@ -69,6 +62,7 @@ GitLab has several features which can help you manage the number of users:
   option. **Available in GitLab 13.6 and later**.
 - [Disable new sign-ups](../../user/admin_area/settings/sign_up_restrictions.md), and instead manage new
   users manually.
+- View a breakdown of users by role in the [Users statistics](../../user/admin_area/index.md#users-statistics) page.
 
 ## Obtain a subscription
 
@@ -79,20 +73,32 @@ To subscribe to GitLab through a self-managed installation:
 1. After purchase, a license file is sent to the email address associated to the Customers Portal account,
    which must be [uploaded to your GitLab instance](../../user/admin_area/license.md#uploading-your-license).
 
-TIP: **Tip:**
+NOTE:
 If you're purchasing a subscription for an existing **Core** self-managed
 instance, ensure you're purchasing enough seats to
 [cover your users](../../user/admin_area/index.md#administering-users).
 
 ## View your subscription
 
-If you are an administrator, to view the status of your self-managed subscription,
-log in to the your GitLab instance and go to the **License** page:
+If you are an administrator, you can view the status of your subscription:
 
 1. Go to **Admin Area**.
 1. From the left-hand menu, select **License**.
 
-Read more about the [license admin area](../../user/admin_area/license.md).
+The **License** page includes the following details:
+
+- Licensee
+- Plan
+- When it was uploaded, started, and when it expires
+
+It also displays the following important statistics:
+
+| Field              | Description |
+|:-------------------|:------------|
+| Users in License   | The number of users you've paid for in the current license loaded on the system. This does not include the amount you've paid for `Users over license` during renewal. |
+| Billable users     | The daily count of billable users on your system. |
+| Maximum users      | The highest number of billable users on your system during the term of the loaded license. If this number exceeds your users in license count at any point, you incur users over license. |
+| Users over license | The number of users that exceed the `Users in License` for the current license term. Charges for this number of users are incurred at the next renewal. |
 
 ## Renew your subscription
 
@@ -109,16 +115,16 @@ log in and verify or update:
 - The invoice contact details on the **Account details** page.
 - The credit card on file on the **Payment Methods** page.
 
-TIP: **Tip:**
+NOTE:
 Contact our [support team](https://support.gitlab.com/hc/en-us/requests/new?ticket_form_id=360000071293)
 if you need assistance accessing the Customers Portal or if you need to change
 the contact person who manages your subscription.
 
 It's important to regularly review your user accounts, because:
 
-- A GitLab subscription is based on the number of users. You will pay more than
-  you should if you renew for too many users, while the renewal will fail if you
-  attempt to renew a subscription for too few users.
+- A GitLab subscription is based on the number of users. You pay more than you should if you renew
+  for too many users, while the renewal fails if you attempt to renew a subscription for too few
+  users.
 - Stale user accounts can be a security risk. A regular review helps reduce this risk.
 
 #### Users over License
@@ -129,6 +135,10 @@ count exceeds the number included in the subscription, known as the number of
 _users over license_, you must pay for the excess number of users either before
 renewal, or at the time of renewal. This is also known as the _true up_ process.
 
+To view the number of _Users over License_ go to the **Admin Area**.
+
+### Add users to a subscription
+
 Self-managed instances can add users to a subscription any time during the
 subscription period. The cost of additional users added during the subscription
 period is prorated from the date of purchase through the end of the subscription period.
@@ -140,10 +150,10 @@ To add users to a subscription:
 1. Select **Add more seats** on the relevant subscription card.
 1. Enter the number of additional users.
 1. Select **Proceed to checkout**.
-1. Review the **Subscription Upgrade Detail**. The system lists the total price for all users on the system and a credit for what you've already paid. You will only be charged for the net change.
+1. Review the **Subscription Upgrade Detail**. The system lists the total price for all users on the system and a credit for what you've already paid. You are only be charged for the net change.
 1. Select **Confirm Upgrade**.
 
-The following will be emailed to you:
+The following items are emailed to you:
 
 - A payment receipt. You can also access this information in the Customers Portal under [**View invoices**](https://customers.gitlab.com/receipts).
 - A new license. [Upload this license](../../user/admin_area/license.md#uploading-your-license) to your instance to use it.
@@ -158,29 +168,16 @@ We recommend following these steps during renewal:
 1. Determine if you have a need for user growth in the upcoming subscription.
 1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in) and select the **Renew** button beneath your existing subscription.
 
-   TIP: **Tip:**
+   NOTE:
    If you need to change your [GitLab tier](https://about.gitlab.com/pricing/), contact our sales team via `renewals@gitlab.com` for assistance as this can't be done in the Customers Portal.
 
-1. In the first box, enter the total number of user licenses you’ll need for the upcoming year. Be sure this number is at least **equal to, or greater than** the number of active users in the system at the time of performing the renewal.
+1. In the first box, enter the total number of user licenses you’ll need for the upcoming year. Be sure this number is at least **equal to, or greater than** the number of billable users in the system at the time of performing the renewal.
 1. Enter the number of [users over license](#users-over-license) in the second box for the user overage incurred in your previous subscription term.
-
-   TIP: **Tip:**
-   You can find the _users over license_ in your instance's **Admin** dashboard by clicking on the **Admin Area** in the top bar, or going to `/admin`.
-
-   The following table describes details of your admin dashboard and renewal terms:
-
-   | Field | Description |
-   |:------|:------------|
-   | Users in License | The number of users you've paid for in the current license loaded on the system. This does not include the amount you've paid for `Users over license` during renewal. |
-   | Active users | The daily count of active users on your system. |
-   | Maximum users | The highest number of active users on your system during the term of the loaded license. If this number exceeds your users in license count at any point, you incur users over license. |
-   | Users over license | The number of users that exceed the `Users in License` for the current license term. Charges for this number of users will be incurred at the next renewal. |
-
 1. Review your renewal details and complete the payment process.
-1. A license for the renewal term will be available for download on the [Manage Purchases](https://customers.gitlab.com/subscriptions) page on the relevant subscription card. Select **Copy license to clipboard** or **Download license** to get a copy.
+1. A license for the renewal term is available for download on the [Manage Purchases](https://customers.gitlab.com/subscriptions) page on the relevant subscription card. Select **Copy license to clipboard** or **Download license** to get a copy.
 1. [Upload](../../user/admin_area/license.md#uploading-your-license) your new license to your instance.
 
-An invoice will be generated for the renewal and available for viewing or download on the [View invoices](https://customers.gitlab.com/receipts) page. If you have difficulty during the renewal process, contact our [support team](https://support.gitlab.com/hc/en-us/requests/new?ticket_form_id=360000071293) for assistance.
+An invoice is generated for the renewal and available for viewing or download on the [View invoices](https://customers.gitlab.com/receipts) page. If you have difficulty during the renewal process, contact our [support team](https://support.gitlab.com/hc/en-us/requests/new?ticket_form_id=360000071293) for assistance.
 
 ### Seat Link
 
@@ -195,9 +192,9 @@ Seat Link provides **only** the following information to GitLab:
 - Date
 - License key
 - Historical maximum user count
-- Active users count
+- Billable users count
 
-For offline or closed network customers, the existing [true-up model](#users-over-license) will be used. Prorated charges are not possible without user count data.
+For offline or closed network customers, the existing [true-up model](#users-over-license) is used. Prorated charges are not possible without user count data.
 
 <details>
 <summary>Click here to view example content of a Seat Link POST request.</summary>
@@ -306,18 +303,18 @@ When your subscription or trial expires, GitLab does not delete your data, but i
 may become inaccessible, depending on the tier at expiry. Some features may not
 behave as expected if you're not prepared for the expiry. For example,
 [environment specific variables not being passed](https://gitlab.com/gitlab-org/gitlab/-/issues/24759).
-If you renew or upgrade, your data will again be accessible.
+If you renew or upgrade, your data is again accessible.
 
 For self-managed customers, there is a 14-day grace period when your features
-will continue to work as-is, after which the entire instance will become read
+continue to work as-is, after which the entire instance becomes read
 only.
 
-However, if you remove the license, you will immediately revert to Core
-features, and the instance will be read / write again.
+However, if you remove the license, you immediately revert to Core
+features, and the instance become read / write again.
 
-## Customers portal
+## Customers Portal
 
-GitLab provides a [customer portal](../index.md#customers-portal) where you can
+GitLab provides the [Customers Portal](../index.md#customers-portal) where you can
 manage your subscriptions and your account details.
 
 ## Contact Support