Add latest changes from gitlab-org/gitlab@master

2 files changed, 40 insertions, 5 deletions

diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index 346fce734af..07197d457fb 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -300,13 +300,13 @@ For air-gapped or closed network customers, the existing [true-up model](#users-
 
 To renew for more users than are currently active in your GitLab.com system, contact our sales team via `renewals@gitlab.com` for assistance as this can't be done in the Customers Portal.
 
-To change the [GitLab tier](https://about.gitlab.com/pricing/), select **Upgrade** under your subscription on the [My Account](https://customers.gitlab.com/subscriptions) page.
+For details on upgrading your subscription tier, see [Upgrade your GitLab.com subscription tier](#upgrade-your-gitlabcom-subscription-tier).
 
 #### Automatic renewal
 
 To view or change automatic subscription renewal (at the same tier as the previous period), log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in), and:
 
-- If you see a **Resume subscription** button, your subscription was cancelled previously. Click it to resume automatic renewal.
+- If you see a **Resume subscription** button, your subscription was canceled previously. Click it to resume automatic renewal.
 - If you see **Cancel subscription**, your subscription is set to automatically renew at the end of the subscription period. Click it to cancel automatic renewal.
 
 With automatic renewal enabled, the subscription will automatically renew on the expiration date and there will be no gap in available service.
@@ -337,6 +337,41 @@ We recommend following these steps during renewal:
 
 An invoice will be generated for the renewal and available for viewing or download in the [Payment History](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.
 
+## Upgrade your subscription tier
+
+The process for upgrading differs depending on whether you're a GitLab.com or self-managed customer.
+
+### Upgrade your GitLab.com subscription tier
+
+To upgrade your [GitLab tier](https://about.gitlab.com/pricing/):
+
+1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in).
+1. Select **Upgrade** under your subscription on the [My Account](https://customers.gitlab.com/subscriptions) page.
+1. Select the desired upgrade.
+1. Confirm the active form of payment, or add a new form of payment.
+1. Check the **I accept the Privacy Policy and Terms of Service** checkbox.
+1. Select **Confirm purchase**.
+
+When the purchase has been processed, you receive confirmation of your new subscription tier.
+
+### Upgrade your self-managed subscription tier
+
+To upgrade your [GitLab tier](https://about.gitlab.com/pricing/), contact our sales team as this
+can't be done in the Customers Portal. You can either send an email to `renewals@gitlab.com`, or
+complete the [**Contact Sales**](https://about.gitlab.com/sales/) form. Include in your message
+details of which subscription you want to upgrade, and the desired tier.
+
+After messaging the sales team, the workflow is as follows:
+
+1. Receive a reply from the sales team, asking for confirmation of the upgrade.
+1. Reply to the sales team, confirming details of the upgrade.
+1. Receive a quote from the sales team.
+1. Sign and return the quote.
+1. Receive the new license.
+1. Upload the new license. For details, see [Uploading your license](../user/admin_area/license.md#uploading-your-license).
+
+The new subscription tier is active when the license file 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).
diff --git a/doc/user/project/clusters/serverless/aws.md b/doc/user/project/clusters/serverless/aws.md
index cb35e598803..4c36c1fa4ed 100644
--- a/doc/user/project/clusters/serverless/aws.md
+++ b/doc/user/project/clusters/serverless/aws.md
@@ -379,7 +379,7 @@ control to AWS Lambda, API Gateway, CloudFormation, and IAM resources.
 ### Crafting the `.gitlab-ci.yml` file
 
 In a [`.gitlab-ci.yml`](../../../../ci/yaml/README.md) file in the root of your project,
-add the following and replace <S3_bucket_name> with the name of the S3 bucket where you
+add the following and replace `<S3_bucket_name>` with the name of the S3 bucket where you
 want to store your package:
 
 ```yaml
@@ -468,8 +468,8 @@ First, test the function.
 
 SAM provides a default event in `events/event.json` that includes a message body of:
 
-```json
-{\“message\”: \“hello world\”}
+```plaintext
+{\"message\": \"hello world\"}
 ```
 
 If you pass that event into the `HelloWorldFunction`, it should respond with the same