summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-26 09:09:53 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-26 09:09:53 +0000
commitbbede1e22c4dd615042a3e9c0d7e24afc83ca377 (patch)
tree3126821f7bea0509a1f6daaa0f6d592248d13e7e /doc
parentf8bb64721a58ed2fa5a8dceb3743c99fb379ea57 (diff)
downloadgitlab-ce-bbede1e22c4dd615042a3e9c0d7e24afc83ca377.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r--doc/api/group_clusters.md5
-rw-r--r--doc/subscriptions/gitlab_com/index.md4
-rw-r--r--doc/subscriptions/index.md4
-rw-r--r--doc/subscriptions/self_managed/index.md4
4 files changed, 11 insertions, 6 deletions
diff --git a/doc/api/group_clusters.md b/doc/api/group_clusters.md
index 7f85379474f..88c35329733 100644
--- a/doc/api/group_clusters.md
+++ b/doc/api/group_clusters.md
@@ -8,6 +8,11 @@ info: To determine the technical writer assigned to the Stage/Group associated w
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/30213) in GitLab 12.1.
+Similar to [project-level](../user/project/clusters/index.md) and
+[instance-level](../user/instance/clusters/index.md) Kubernetes clusters,
+group-level Kubernetes clusters allow you to connect a Kubernetes cluster to
+your group, enabling you to use the same cluster across multiple projects.
+
Users need at least [Maintainer](../user/permissions.md) access for the group to use these endpoints.
## List group clusters
diff --git a/doc/subscriptions/gitlab_com/index.md b/doc/subscriptions/gitlab_com/index.md
index 09fe6e90e19..881f311313d 100644
--- a/doc/subscriptions/gitlab_com/index.md
+++ b/doc/subscriptions/gitlab_com/index.md
@@ -301,9 +301,9 @@ Be aware that:
be deducted from your Additional Minutes quota immediately after your purchase of additional
minutes.
-## Customers portal
+## Customers Portal
-GitLab provides a [customer portal](../index.md#customers-portal) where you can
+GitLab provides the [Customers Portal](../index.md#customers-portal) where you can
manage your subscriptions and your account details.
## Contact Support
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index c4214d3565d..a6116296641 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -77,7 +77,7 @@ With the [Customers Portal](https://customers.gitlab.com/) you can:
- [Change your payment method](#change-your-payment-method)
- [Change the linked account](#change-the-linked-account)
- [Change the associated namespace](#change-the-associated-namespace)
-- [Change customers portal account password](#change-customer-portal-account-password)
+- [Change customers portal account password](#change-customers-portal-account-password)
### Change your personal details
@@ -154,7 +154,7 @@ With a linked GitLab.com account:
Subscription charges are calculated based on the total number of users in a group, including its subgroups and nested projects. If the total number of users exceeds the number of seats in your subscription, your account is charged for the additional users.
-### Change customer portal account password
+### Change Customers Portal account password
To change the password for this customers portal account:
diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md
index 01cd2c331f3..d541413606e 100644
--- a/doc/subscriptions/self_managed/index.md
+++ b/doc/subscriptions/self_managed/index.md
@@ -315,9 +315,9 @@ only.
However, if you remove the license, you immediately revert to Core
features, and the instance become read / write again.
-## Customers portal
+## Customers Portal
-GitLab provides a [customer portal](../index.md#customers-portal) where you can
+GitLab provides the [Customers Portal](../index.md#customers-portal) where you can
manage your subscriptions and your account details.
## Contact Support