Merge branch 'kpaizee-license-ctrt-edits-3' into 'master'

Clean up upload steps for license page

See merge request gitlab-org/gitlab!78043

doc/subscriptions/self_managed/index.md

@@ -254,7 +254,7 @@ To subscribe to GitLab through a GitLab self-managed installation:
 
 1. Go to the [Customers Portal](https://customers.gitlab.com/) and purchase a GitLab self-managed plan.
 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).
+   which must be [uploaded to your GitLab instance](../../user/admin_area/license.md#upload-your-license).
 
 NOTE:
 If you're purchasing a subscription for an existing **Free** GitLab self-managed
@@ -373,7 +373,7 @@ To add seats to a subscription:
 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.
+- A new license. [Upload this license](../../user/admin_area/license.md#upload-your-license) to your instance to use it.
 
 ### Renew a subscription
 
@@ -394,7 +394,7 @@ You can hover your mouse on the **Renew** button to see the date when it will be
 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.
 1. Review your renewal details and complete the payment process.
 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.
+1. [Upload](../../user/admin_area/license.md#upload-your-license) your new license to your instance.
 
 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.
 
@@ -416,7 +416,7 @@ The following is emailed to you:
   [**View invoices**](https://customers.gitlab.com/receipts).
 - A new license.
 
-[Upload the new license](../../user/admin_area/license.md#uploading-your-license) to your instance.
+[Upload the new license](../../user/admin_area/license.md#upload-your-license) to your instance.
 The new tier takes effect when the new license is uploaded.
 
 ## Subscription expiry

doc/user/admin_area/license.md

@@ -42,38 +42,30 @@ To activate your instance with an activation code:
 1. Read and accept the terms of service.
 1. Select **Activate**.
 
-## Activate GitLab EE with a License File
+## Activate GitLab EE with a license file
 
-If you receive a license file from GitLab (for example a new trial), you can upload it by signing into your GitLab instance as an administrator or adding it during installation. The license is a base64-encoded ASCII text file with a `.gitlab-license` extension.
+If you receive a license file from GitLab (for example, for a trial), you can
+upload it to your instance or add it during installation. The license file is
+a base64-encoded ASCII text file with a `.gitlab-license` extension.
 
-## Uploading your license
+## Upload your license
 
-The first time you visit your GitLab EE installation signed in as an administrator,
-you should see a note urging you to upload a license with a link that takes you
-to the **Upload license** page.
+The first time you sign in to your GitLab instance, a note with a
+link to the **Upload license** page should be displayed.
 
-Otherwise, to manually go to the **Upload license** page:
+Otherwise, to upload your license:
 
-1. Sign in to your GitLab self-managed instance.
-1. From the top menu, select the Admin Area **{admin}**.
+1. Sign in to GitLab as an administrator.
+1. On the top bar, select **Menu > Admin**.
 1. On the left sidebar, select **Settings**.
-1. In the **License file** section, select **Upload a license**.
-
-   - *If you've received a `.gitlab-license` file:*
-     1. Download the license file to your local machine.
-     1. Select **Upload `.gitlab-license` file**.
-     1. Select **Choose file** and select the license file.
-        In this example the license file is named `GitLab.gitlab-license`.
-     1. Select the **Terms of Service** checkbox.
-     1. Select **Upload License**.
-
-     ![Upload license](img/license_upload_v13_12.png)
-
-   - *If you've received your license as plain text:*
-     1. Select **Enter license key**.
-     1. Copy the license and paste it into the **License key** field.
-     1. Select the **Terms of Service** checkbox.
-     1. Select **Upload License**.
+1. In the **License file** area, select **Upload a license**.
+1. Upload a license:
+   - For a file, select **Upload `.gitlab-license` file**, **Choose file**, and
+     select the license file from your local machine.
+   - For plain text, select **Enter license key** and paste the contents in
+     **License key**.
+1. Select the **Terms of Service** checkbox.
+1. Select **Upload License**.
 
 ## Add your license during installation
 
@@ -110,7 +102,7 @@ and issue creation. Your instance becomes read-only and
 an expiration message displays to all administrators. You have a 14-day grace period
 before this occurs.
 
-To resume functionality, [upload a new license](#uploading-your-license).
+To resume functionality, [upload a new license](#upload-your-license).
 
 To go back to Free features, [delete all expired licenses](#remove-a-license-file).