summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-08-08 15:11:14 +1000
committerEvan Read <eread@gitlab.com>2019-08-08 15:11:42 +1000
commitf666a65970f1b9be694b2f7d9d7f57ce90e90117 (patch)
tree637a396c8b5e8732bcf153aa50675ef81342c563
parent9726492606f3acc806424ab8774dd4bc13f5dc08 (diff)
downloadgitlab-ce-docs/refactor-subscription-page.tar.gz
Implement review commentsdocs/refactor-subscription-page
-rw-r--r--doc/README.md2
-rw-r--r--doc/subscriptions/index.md36
2 files changed, 19 insertions, 19 deletions
diff --git a/doc/README.md b/doc/README.md
index 7681d8ac4cb..ebfa45122cc 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -25,7 +25,7 @@ No matter how you use GitLab, we have documentation for you.
| [**User Documentation**](user/index.md)<br/>Discover features and concepts for GitLab users. | [**Administrator documentation**](administration/index.md)<br/>Everything GitLab self-managed administrators need to know. |
| [**Contributing to GitLab**](#contributing-to-gitlab)<br/>At GitLab, everyone can contribute! | [**New to Git and GitLab?**](#new-to-git-and-gitlab)<br/>We have resources to get you started. |
| [**Building an integration with GitLab?**](#building-an-integration-with-gitlab)<br/>Consult our automation and integration documentation. | [**Coming to GitLab from another platform?**](#coming-to-gitlab-from-another-platform)<br/>Consult our handy guides. |
-| [**Install GitLab**](https://about.gitlab.com/install/)<br/>Installation options for different platforms. | [**Subscribe to GitLab**](subscriptions/index.md)<br/>Get access to more features. |
+| [**Install GitLab**](https://about.gitlab.com/install/)<br/>Installation options for different platforms. | [**Customers**](subscriptions/index.md)<br/>Information for new and existing customers. |
| [**Update GitLab**](update/README.md)<br/>Update your GitLab self-managed instance to the latest version. | [**GitLab Releases**](https://about.gitlab.com/releases/)<br/>What's new in GitLab. |
## Popular Documentation
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index adf8d8cf69c..fc36b961b3f 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -2,14 +2,12 @@
type: index, reference
---
-# Subscriptions and accounts
+# Customers
-Welcome to GitLab!
+This section contains information for:
-This section contains information about:
-
-- Choosing [which GitLab](#which-gitlab) is right for you.
-- Managing [subscriptions](#managing-subscriptions).
+- New customers about choosing [which GitLab](#which-gitlab) is right for you.
+- Existing customers about [managing subscriptions](#managing-subscriptions).
Also see our [subscription FAQ](https://about.gitlab.com/pricing/licensing-faq/).
@@ -77,12 +75,15 @@ To subscribe to GitLab.com:
projects together allowing you to grant members access to several projects
at once. A group is not required if you plan on having projects inside a personal
namespace.
-1. Select the Starter, Premium, or Ultimated plan through the
+1. Create additional users and
+ [add them to the group](../user/group/index.md#add-users-to-a-group).
+1. Select the **Bronze**, **Silver**, or **Gold** GitLab.com plan through the
[GitLab Subscription Manager](https://customers.gitlab.com/).
1. Link your GitLab.com account with your GitLab Subscription Manager account.
Once signed into the GitLab Subscription Manager, if your account is not
already linked, you will prompted to link your account with a
**Link my GitLab Account** button.
+1. Associate the group with the subscription.
TIP: **Tip:**
You can also go to the [**My Account**](https://customers.gitlab.com/customers/edit)
@@ -115,13 +116,18 @@ To subscribe to GitLab through a self-managed installation:
1. [Install](https://about.gitlab.com/install/) GitLab.
1. Complete the installation with
[administration tasks](https://docs.gitlab.com/ee/administration/).
-1. Select the Bronze, Silver, or Gold GitLab.com plan through the
- [GitLab Subscription Manager](https://customers.gitlab.com/).
+1. Select the **Starter**, **Premium**, or **Ultimate** self-managed plan
+ through the [GitLab Subscription Manager](https://customers.gitlab.com/).
1. Apply your license file. After purchase, a license file is sent to the email
address associated to the GitLab Subscription Manager account,
which needs to be
[uploaded to your GitLab instance](../user/admin_area/license.md#uploading-your-license).
+TIP: **Tip:**
+If you are purchasing a subscription for an existing **Core** self-managed
+instance, ensure you are purchasing enough seats to
+[cover your users](../user/admin_area/index.md#administering-users).
+
## Managing subscriptions
You can view and manage subscriptions through our
@@ -135,6 +141,8 @@ view and manage:
- The subscriptions you have purchased.
- The number of seats associated with the subscription.
+- Retrieve copies of invoices.
+- Change the credit card on file.
For more information, please see our:
@@ -192,15 +200,7 @@ NOTE: **Note:**
Please note that you need to be a group owner to associate a group to your
subscription.
-#### Upgrade your subscription plan
-
-GitLab.com subscriptions can be upgraded directly through
-the [Subscriptions portal](https://customers.gitlab.com/subscriptions).
-
-The Subscriptions portal provides an **Upgrade** button below each GitLab.com
-subscription, which will lead you to a simple checkout process.
-
-#### Confirm or upgrade your subscription
+### Confirm or upgrade your subscription
To see the status of your GitLab.com subscription, you can click on the
**Billings** section of the relevant namespace: