Add latest changes from gitlab-org/gitlab@master

1 files changed, 38 insertions, 8 deletions

diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md
index e16dd2a53ce..31684398c4e 100644
--- a/doc/subscriptions/self_managed/index.md
+++ b/doc/subscriptions/self_managed/index.md
@@ -46,7 +46,7 @@ according to the [maximum number](#maximum-users) of users enabled during the su
 For instances that aren't offline or on a closed network, the maximum number of
 simultaneous users in the GitLab self-managed installation is checked each quarter.
 
-If an instance is unable to generate a quarterly usage report, the existing [true-up model](#users-over-license) is used.
+If an instance is unable to generate a quarterly usage report, the existing [true up model](#users-over-license) is used.
 Prorated charges are not possible without a quarterly usage report.
 
 ### View user totals
@@ -309,11 +309,10 @@ NOTES:
 
 ## Renew your subscription
 
-You can renew your subscription starting from 15 days before your subscription expires.
+You can renew your subscription starting from 15 days before your subscription expires. To renew your subscription:
 
-To renew your subscription,
-[prepare for renewal by reviewing your account](#prepare-for-renewal-by-reviewing-your-account),
-then [renew your GitLab self-managed subscription](#renew-a-subscription).
+1. [Prepare for renewal by reviewing your account.](#prepare-for-renewal-by-reviewing-your-account)
+1. [Renew your GitLab self-managed subscription.](#renew-subscription-manually)
 
 ### Prepare for renewal by reviewing your account
 
@@ -379,12 +378,11 @@ your instance immediately. If you're using a license file, you receive an update
 To add the seats, [add the license file](../../user/admin_area/license_file.md)
 to your instance.
 
-### Renew a subscription
+### Renew subscription manually
 
 Starting 30 days before a subscription expires, a banner with the expiry date displays for administrators in the GitLab user interface.
-You can renew your subscription starting from 15 days before your subscription expires.
 
-We recommend following these steps during renewal:
+You should follow these steps during renewal:
 
 1. Prior to the renewal date, prune any inactive or unwanted users by [blocking them](../../user/admin_area/moderate_users.md#block-a-user).
 1. Determine if you have a need for user growth in the upcoming subscription.
@@ -403,6 +401,38 @@ You can hover your mouse on the **Renew** button to see the date when it will be
 
 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.
 
+### Automatic subscription renewal
+
+When a subscription is set to auto-renew, it renews automatically on the
+expiration date without a gap in available service. Subscriptions purchased through Customers Portal are set to auto-renew by default.
+The number of user licenses is adjusted to fit the [number of billable users in your instance](#view-user-totals) at the time of renewal.
+Before auto-renewal you should [prepare for the renewal](#prepare-for-renewal-by-reviewing-your-account). To auto-renew your subscription,
+you must have enabled the [synchronization of subscription data](#sync-your-subscription-data-with-gitlab).
+
+You can view and download your renewal invoice on the Customers Portal
+[View invoices](https://customers.gitlab.com/receipts) page. If your account has a [saved credit card](../index.md#change-your-payment-method), the card is charged for the invoice amount. If we are unable to process a payment or the auto-renewal fails for any other reason, you have 14 days to renew your subscription, after which your GitLab tier is downgraded.
+
+#### Email notifications
+
+15 days before a subscription automatically renews, an email is sent with information about the renewal.
+
+- If your credit card is expired, the email tells you how to update it.
+- If you have any outstanding overages or subscription isn't able to auto-renew for any other reason, the email tells you to contact our Sales team or [renew in Customers Portal](#renew-subscription-manually).
+- If there are no issues, the email specifies the names and quantity of the products being renewed. The email also includes the total amount you owe. If your usage increases or decreases before renewal, this amount can change.
+
+#### Enable or disable automatic subscription renewal
+
+To view or change automatic subscription renewal (at the same tier as the
+previous period), sign in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in), and:
+
+- If a **Resume subscription** button is displayed, your subscription was canceled
+  previously. Select it to resume automatic renewal.
+- If a **Cancel subscription** button is displayed, your subscription is set to automatically
+  renew at the end of the subscription period. Select it to cancel automatic renewal.
+
+If you have difficulty during the renewal process, contact the
+[Support team](https://support.gitlab.com/hc/en-us/requests/new?ticket_form_id=360000071293) for assistance.
+
 ## Upgrade your subscription tier
 
 To upgrade your [GitLab tier](https://about.gitlab.com/pricing/):