Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-10-17 21:10:11 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-10-17 21:10:11 +0300
commit5cbf24858edb03505b16474e3b7b41a49b677ff6 (patch)
tree21999fbb911fe2410cf498b3ed668d202dc90098 /doc/development/documentation/styleguide
parent673a1a02e97181a5f2d94cd0b116ebb4dba3d875 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/documentation/styleguide')
-rw-r--r--doc/development/documentation/styleguide/word_list.md22
1 files changed, 18 insertions, 4 deletions
diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md
index 7dc633a3092..860bc8790e2 100644
--- a/doc/development/documentation/styleguide/word_list.md
+++ b/doc/development/documentation/styleguide/word_list.md
@@ -674,6 +674,10 @@ Do not make **GitLab** possessive (GitLab's). This guidance follows [GitLab Trad
## GitLab Dedicated
+Use **GitLab Dedicated** to refer to the product offering. It refers to a GitLab instance that's hosted and managed by GitLab for customers.
+
+GitLab Dedicated can be referred to as a single-tenant SaaS service.
+
Do not use **Dedicated** by itself. Always use **GitLab Dedicated**.
## GitLab Duo
@@ -740,16 +744,16 @@ See also:
## GitLab SaaS
-**GitLab SaaS** refers to the product license that provides access to GitLab.com. It does not refer to the
-GitLab instance managed by GitLab itself.
+Use **GitLab SaaS** to refer to the product offering.
+It does not refer to the GitLab instance, which is [GitLab.com](#gitlabcom).
## GitLab self-managed
-Use **GitLab self-managed** to refer to the product license for GitLab instances managed by customers themselves.
+Use **GitLab self-managed** to refer to the product offering. It refers to a GitLab instance managed by customers themselves.
## GitLab.com
-**GitLab.com** refers to the GitLab instance managed by GitLab itself.
+Use **GitLab.com** to refer to the URL. GitLab.com is the instance that's managed by GitLab.
## guide
@@ -1132,6 +1136,16 @@ Instead of:
- Note that you can change the settings.
+## offerings
+
+The current product offerings are:
+
+- [GitLab SaaS](#gitlab-saas)
+- [GitLab self-managed](#gitlab-self-managed)
+- [GitLab Dedicated](#gitlab-dedicated)
+
+The [tier badges](index.md#available-product-tier-badges) reflect these offerings.
+
## older
Do not use **older** when talking about version numbers.