Merge branch 'selhorn-subscription-expiry' into 'master'

Standardized expiration language

See merge request gitlab-org/gitlab!57064

doc/subscriptions/gitlab_com/index.md

@@ -237,12 +237,11 @@ To remove a billable user:
 
 ## Subscription expiry
 
-When your subscription or trial expires, GitLab does not delete your data, but
-it 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).
+When your subscription expires, you can continue to use GitLab for 14 days.
+On the 15th day, paid features are no longer available. You can
+continue to use free features.
 
-If you renew or upgrade, your data is accessible again.
+To resume paid feature functionality, purchase a new subscription.
 
 ## CI pipeline minutes
 

doc/subscriptions/self_managed/index.md

@@ -318,18 +318,15 @@ The new tier takes effect when the new license is uploaded.
 
 ## Subscription expiry
 
-When your subscription or trial expires, GitLab does not delete your data, but it
-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 is again accessible.
-
-For GitLab self-managed customers, there is a 14-day grace period when your features
-continue to work as-is, after which the entire instance becomes read
-only.
-
-However, if you remove the license, you immediately revert to Free
-features, and the instance become read / write again.
+When your license expires, GitLab locks down features, like Git pushes
+and issue creation. Then, your instance becomes read-only and
+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, upload a new license.
+- To fall back to Free features, delete the expired license.
 
 ## Contact Support
 

doc/user/admin_area/license.md

@@ -99,12 +99,15 @@ license, otherwise you miss all the paid features if your license expires.
 
 ## What happens when your license expires
 
-In case your license expires, GitLab locks down some features like Git pushes,
-and issue creation, and displays a message to all administrators to inform of the expired license.
+When your license expires, GitLab locks down features, like Git pushes
+and issue creation. Then, your instance becomes read-only and
+an expiration message is displayed to all administrators.
 
-To get back all the previous functionality, you must upload a new license.
-To fall back to having only the Free features active, you must delete the
-expired license(s).
+For GitLab self-managed instances, you have a 14-day grace period
+before this occurs.
+
+- To resume functionality, upload a new license.
+- To fall back to Free features, delete the expired license.
 
 ### Remove a license