Merge branch 'eread/add-more-gitlab-terms-to-word-list' into 'master'

Add more GitLab terms to word list

See merge request gitlab-org/gitlab!66026

doc/api/index.md

@@ -492,7 +492,7 @@ curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab
 response. They have `rel` set to `prev`, `next`, `first`, or `last` and contain
 the relevant URL. Be sure to use these links instead of generating your own URLs.
 
-For GitLab SaaS users, [some pagination headers may not be returned](../user/gitlab_com/index.md#pagination-response-headers).
+For GitLab.com users, [some pagination headers may not be returned](../user/gitlab_com/index.md#pagination-response-headers).
 
 In the following cURL example, we limit the output to three items per page
 (`per_page=3`) and we request the second page (`page=2`) of [comments](notes.md)
@@ -836,7 +836,7 @@ languages. For a complete list, visit the [GitLab website](https://about.gitlab.
 For administrator documentation on rate limit settings, see
 [Rate limits](../security/rate_limits.md). To find the settings that are
 specifically used by GitLab.com, see
-[GitLab SaaS-specific rate limits](../user/gitlab_com/index.md#gitlab-saas-specific-rate-limits).
+[GitLab.com-specific rate limits](../user/gitlab_com/index.md#gitlabcom-specific-rate-limits).
 
 ## Content type
 

doc/development/documentation/styleguide/word_list.md

@@ -82,6 +82,19 @@ When possible, use present tense instead. For example, use `after you execute th
 
 Do not make possessive (GitLab's). This guidance follows [GitLab Brand Guidelines](https://about.gitlab.com/handbook/marketing/corporate-marketing/brand-activation/brand-guidelines/#trademark).
 
+### GitLab.com
+
+Refers to the GitLab instance managed by GitLab itself.
+
+### GitLab SaaS
+
+Refers to the product license that provides access to GitLab.com. Does not refer to the
+GitLab instance managed by GitLab itself.
+
+### GitLab self-managed
+
+Refers to the product license for GitLab instances managed by customers themselves.
+
 ## Guest
 
 When writing about the Guest role:

doc/development/packages.md

@@ -230,7 +230,7 @@ in your local development environment.
 #### File size limits
 
 Files uploaded to the GitLab Package Registry are [limited by format](../administration/instance_limits.md#package-registry-limits).
-On GitLab SaaS, these are typically set to 5GB to help prevent timeout issues and abuse.
+On GitLab.com, these are typically set to 5GB to help prevent timeout issues and abuse.
 
 When a new package type is added to the `Packages::Package` model, a size limit must be added
 similar to [this example](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52639/diffs#382f879fb09b0212e3cedd99e6c46e2083867216),
@@ -238,10 +238,10 @@ or the [related test](https://gitlab.com/gitlab-org/gitlab/-/blob/fe4ba437667813
 must be updated if file size limits do not apply. The only reason a size limit does not apply is if
 the package format does not upload and store package files.
 
-#### Rate Limits on GitLab SaaS
+#### Rate Limits on GitLab.com
 
 Package manager clients can make rapid requests that exceed the
-[GitLab SaaS standard API rate limits](../user/gitlab_com/index.md#gitlab-saas-specific-rate-limits).
+[GitLab.com standard API rate limits](../user/gitlab_com/index.md#gitlabcom-specific-rate-limits).
 This results in a `429 Too Many Requests` error.
 
 We have opened a set of paths to allow higher rate limits. Unless it is not possible,

doc/security/rate_limits.md

@@ -9,7 +9,7 @@ type: reference, howto
 
 NOTE:
 For GitLab.com, please see
-[GitLab SaaS-specific rate limits](../user/gitlab_com/index.md#gitlab-saas-specific-rate-limits).
+[GitLab.com-specific rate limits](../user/gitlab_com/index.md#gitlabcom-specific-rate-limits).
 
 Rate limiting is a common technique used to improve the security and durability
 of a web application.

doc/user/gitlab_com/index.md

@@ -4,15 +4,15 @@ group: unassigned
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# GitLab SaaS settings **(FREE SAAS)**
+# GitLab.com settings **(FREE SAAS)**
 
-This page contains information about the settings that are used on
-[GitLab SaaS](https://about.gitlab.com/pricing/).
+This page contains information about the settings that are used on GitLab.com, available to
+[GitLab SaaS](https://about.gitlab.com/pricing/) customers.
 
 ## SSH host keys fingerprints
 
-Below are the fingerprints for GitLab SaaS's SSH host keys. The first time you
-connect to a GitLab SaaS repository, one of these keys is displayed in the output.
+Below are the fingerprints for SSH host keys on GitLab.com. The first time you
+connect to a GitLab.com repository, one of these keys is displayed in the output.
 
 | Algorithm        | MD5 (deprecated) | SHA256  |
 |------------------|------------------|---------|
@@ -34,14 +34,14 @@ gitlab.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAA
 
 ## Mail configuration
 
-GitLab SaaS sends emails from the `mg.gitlab.com` domain by using [Mailgun](https://www.mailgun.com/),
+GitLab.com sends emails from the `mg.gitlab.com` domain by using [Mailgun](https://www.mailgun.com/),
 and has its own dedicated IP address (`192.237.158.143`).
 
 The IP address for `mg.gitlab.com` is subject to change at any time.
 
 ### Service Desk custom mailbox
 
-On GitLab SaaS, there's a mailbox configured for Service Desk with the email address:
+On GitLab.com, there's a mailbox configured for Service Desk with the email address:
 `contact-project+%{key}@incoming.gitlab.com`. To use this mailbox, configure the
 [custom suffix](../project/service_desk.md#configuring-a-custom-email-address-suffix) in project
 settings.
@@ -50,7 +50,7 @@ settings.
 
 [See our backup strategy](https://about.gitlab.com/handbook/engineering/infrastructure/production/#backups).
 
-To back up an entire project on GitLab SaaS, you can export it either:
+To back up an entire project on GitLab.com, you can export it either:
 
 - [Through the UI](../project/settings/import_export.md).
 - [Through the API](../../api/project_import_export.md#schedule-an-export). You
@@ -69,7 +69,7 @@ are included when cloning.
 
 ## Alternative SSH port
 
-GitLab SaaS can be reached by using a [different SSH port](https://about.gitlab.com/blog/2016/02/18/gitlab-dot-com-now-supports-an-alternate-git-plus-ssh-port/) for `git+ssh`.
+GitLab.com can be reached by using a [different SSH port](https://about.gitlab.com/blog/2016/02/18/gitlab-dot-com-now-supports-an-alternate-git-plus-ssh-port/) for `git+ssh`.
 
 | Setting    | Value               |
 |------------|---------------------|
@@ -91,7 +91,7 @@ Host gitlab.com
 
 Below are the settings for [GitLab Pages](https://about.gitlab.com/stages-devops-lifecycle/pages/).
 
-| Setting                   | GitLab SaaS            | Default                |
+| Setting                   | GitLab.com             | Default                |
 |---------------------------|------------------------|------------------------|
 | Domain name               | `gitlab.io`            | -                      |
 | IP address                | `35.185.44.232`        | -                      |
@@ -108,7 +108,7 @@ Below are the current settings regarding [GitLab CI/CD](../../ci/index.md).
 Any settings or feature limits not listed here are using the defaults listed in
 the related documentation.
 
-| Setting                             | GitLab SaaS | Default |
+| Setting                             | GitLab.com  | Default |
 |-------------------------------------|-------------|---------|
 | Artifacts maximum size (compressed) | 1 GB        | 100 MB  |
 | Artifacts [expiry time](../../ci/yaml/index.md#artifactsexpire_in)   | From June 22, 2020, deleted after 30 days unless otherwise specified (artifacts created before that date have no expiry).           | deleted after 30 days unless otherwise specified    |
@@ -122,13 +122,13 @@ the related documentation.
 
 ## Account and limit settings
 
-GitLab SaaS has the following [account limits](../admin_area/settings/account_and_limit_settings.md)
+GitLab.com has the following [account limits](../admin_area/settings/account_and_limit_settings.md)
 enabled. If a setting is not listed, it is set to the default value.
 
 If you are near or over the repository size limit, you can either
 [reduce your repository size with Git](../project/repository/reducing_the_repo_size_using_git.md) or [purchase additional storage](https://about.gitlab.com/pricing/licensing-faq/#can-i-buy-more-storage).
 
-| Setting                       | GitLab SaaS | Default |
+| Setting                       | GitLab.com  | Default |
 |-------------------------------|-------------|---------|
 | [Repository size including LFS](../admin_area/settings/account_and_limit_settings.md#repository-size-limit) | 10 GB       | Unlimited     |
 | Maximum import size           | 5 GB        | Unlimited ([Modified](https://gitlab.com/gitlab-org/gitlab/-/issues/251106) from 50MB to unlimited in GitLab 13.8.) |
@@ -141,11 +141,11 @@ this limit.
 
 ## IP range
 
-GitLab SaaS uses the IP ranges `34.74.90.64/28` and `34.74.226.0/24` for traffic from its Web/API
+GitLab.com uses the IP ranges `34.74.90.64/28` and `34.74.226.0/24` for traffic from its Web/API
 fleet. This whole range is solely allocated to GitLab. You can expect connections from webhooks or repository mirroring to come
 from those IPs and allow them.
 
-GitLab SaaS is fronted by Cloudflare. For incoming connections to GitLab SaaS, you might need to allow CIDR blocks of Cloudflare ([IPv4](https://www.cloudflare.com/ips-v4) and [IPv6](https://www.cloudflare.com/ips-v6)).
+GitLab.com is fronted by Cloudflare. For incoming connections to GitLab.com, you might need to allow CIDR blocks of Cloudflare ([IPv4](https://www.cloudflare.com/ips-v4) and [IPv6](https://www.cloudflare.com/ips-v6)).
 
 For outgoing connections from CI/CD runners, we are not providing static IP
 addresses. All GitLab runners are deployed into Google Cloud Platform (GCP). Any
@@ -156,7 +156,7 @@ IP-based firewall can be configured by looking up all
 
 Add these hostnames when you configure allow-lists in local HTTP(S) proxies,
 or other web-blocking software that governs end-user computers. Pages on
-GitLab SaaS load content from these hostnames:
+GitLab.com load content from these hostnames:
 
 - `gitlab.com`
 - `*.gitlab.com`
@@ -171,7 +171,7 @@ also load certain page content directly from common public CDN hostnames.
 
 The following limits apply for [Webhooks](../project/integrations/webhooks.md):
 
-| Setting              | GitLab SaaS | Default |
+| Setting              | GitLab.com  | Default |
 |----------------------|-------------|---------|
 | [Webhook rate limit](../../administration/instance_limits.md#webhook-rate-limit) | `120` calls per minute for GitLab Free, unlimited for GitLab Premium and GitLab Ultimate | Unlimited |
 | [Number of webhooks](../../administration/instance_limits.md#number-of-webhooks) | `100` per project, `50` per group | `100` per project, `50` per group |
@@ -179,16 +179,16 @@ The following limits apply for [Webhooks](../project/integrations/webhooks.md):
 
 ## Shared runners
 
-GitLab has shared runners on GitLab SaaS that you can use to run your CI jobs.
+GitLab has shared runners on GitLab.com that you can use to run your CI jobs.
 
 For more information, see [choosing a runner](../../ci/runners/index.md).
 
 ## Sidekiq
 
-GitLab SaaS runs [Sidekiq](https://sidekiq.org) with arguments `--timeout=4 --concurrency=4`
+GitLab.com runs [Sidekiq](https://sidekiq.org) with arguments `--timeout=4 --concurrency=4`
 and the following environment variables:
 
-| Setting                                | GitLab SaaS | Default   |
+| Setting                                | GitLab.com  | Default   |
 |----------------------------------------|-------------|-----------|
 | `SIDEKIQ_DAEMON_MEMORY_KILLER`         | -           | `1`       |
 | `SIDEKIQ_MEMORY_KILLER_MAX_RSS`        | `2000000`   | `2000000` |
@@ -204,14 +204,14 @@ nodes and Sidekiq export nodes.
 
 ## PostgreSQL
 
-GitLab SaaS being a fairly large installation of GitLab means we have changed
+GitLab.com being a fairly large installation of GitLab means we have changed
 various PostgreSQL settings to better suit our needs. For example, we use
 streaming replication and servers in hot-standby mode to balance queries across
 different database servers.
 
-The list of GitLab SaaS specific settings (and their defaults) is as follows:
+The list of GitLab.com specific settings (and their defaults) is as follows:
 
-| Setting                               | GitLab SaaS                                                         | Default                               |
+| Setting                               | GitLab.com                                                          | Default                               |
 |:--------------------------------------|:--------------------------------------------------------------------|:--------------------------------------|
 | `archive_command`                     | `/usr/bin/envdir /etc/wal-e.d/env /opt/wal-e/bin/wal-e wal-push %p` | empty                                 |
 | `archive_mode`                        | on                                                                  | off                                   |
@@ -249,9 +249,9 @@ for `shared_buffers` is quite high, and we are
 
 ## Puma
 
-GitLab SaaS uses the default of 60 seconds for [Puma request timeouts](https://docs.gitlab.com/omnibus/settings/puma.html#worker-timeout).
+GitLab.com uses the default of 60 seconds for [Puma request timeouts](https://docs.gitlab.com/omnibus/settings/puma.html#worker-timeout).
 
-## GitLab SaaS-specific rate limits
+## GitLab.com-specific rate limits
 
 NOTE:
 See [Rate limits](../../security/rate_limits.md) for administrator
@@ -262,7 +262,7 @@ code. The client should wait before attempting the request again. There
 are also informational headers with this response detailed in [rate
 limiting responses](#rate-limiting-responses).
 
-The following table describes the rate limits for GitLab SaaS, both before and
+The following table describes the rate limits for GitLab.com, both before and
 after the limits change in January, 2021:
 
 | Rate limit                                                                | Before 2021-01-18           | From 2021-01-18               | From 2021-02-12               |
@@ -289,7 +289,7 @@ For information on rate limiting responses, see:
 
 ### Protected paths throttle
 
-GitLab SaaS responds with HTTP status code `429` to POST requests at protected
+GitLab.com responds with HTTP status code `429` to POST requests at protected
 paths that exceed 10 requests per **minute** per IP address.
 
 See the source below for which paths are protected. This includes user creation,
@@ -302,20 +302,20 @@ See [Protected Paths](../admin_area/settings/protected_paths.md) for more detail
 
 ### IP blocks
 
-IP blocks can occur when GitLab SaaS receives unusual traffic from a single
+IP blocks can occur when GitLab.com receives unusual traffic from a single
 IP address that the system views as potentially malicious. This can be based on
 rate limit settings. After the unusual traffic ceases, the IP address is
 automatically released depending on the type of block, as described in a
 following section.
 
-If you receive a `403 Forbidden` error for all requests to GitLab SaaS,
+If you receive a `403 Forbidden` error for all requests to GitLab.com,
 check for any automated processes that may be triggering a block. For
 assistance, contact [GitLab Support](https://support.gitlab.com/hc/en-us)
 with details, such as the affected IP address.
 
 #### Git and container registry failed authentication ban
 
-GitLab SaaS responds with HTTP status code `403` for 1 hour, if 30 failed
+GitLab.com responds with HTTP status code `403` for 1 hour, if 30 failed
 authentication requests were received in a 3-minute period from a single IP address.
 
 This applies only to Git requests and container registry (`/jwt/auth`) requests
@@ -343,7 +343,7 @@ doesn't return the following headers:
 
 If created before GitLab 12.2 (July 2019), these items have the
 [Internal visibility](../../public_access/public_access.md#internal-projects)
-setting [disabled on GitLab SaaS](https://gitlab.com/gitlab-org/gitlab/-/issues/12388):
+setting [disabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/12388):
 
 - Projects
 - Groups
@@ -351,7 +351,7 @@ setting [disabled on GitLab SaaS](https://gitlab.com/gitlab-org/gitlab/-/issues/
 
 ### SSH maximum number of connections
 
-GitLab SaaS defines the maximum number of concurrent, unauthenticated SSH
+GitLab.com defines the maximum number of concurrent, unauthenticated SSH
 connections by using the [MaxStartups setting](http://man.openbsd.org/sshd_config.5#MaxStartups).
 If more than the maximum number of allowed connections occur concurrently, they
 are dropped and users get
@@ -367,9 +367,9 @@ for details.
 
 See [non-configurable limits](../../security/rate_limits.md#non-configurable-limits)
 for information on rate limits that are not configurable, and therefore also
-used on GitLab SaaS.
+used on GitLab.com.
 
-## GitLab SaaS logging
+## GitLab.com logging
 
 We use [Fluentd](https://gitlab.com/gitlab-com/runbooks/tree/master/logging/doc#fluentd)
 to parse our logs. Fluentd sends our logs to
@@ -387,13 +387,13 @@ You can view more information in our runbooks such as:
 ### Job logs
 
 By default, GitLab does not expire job logs. Job logs are retained indefinitely,
-and can't be configured on GitLab SaaS to expire. You can erase job logs
+and can't be configured on GitLab.com to expire. You can erase job logs
 [manually with the Jobs API](../../api/jobs.md#erase-a-job) or by
 [deleting a pipeline](../../ci/pipelines/index.md#delete-a-pipeline).
 
-## GitLab SaaS at scale
+## GitLab.com at scale
 
-In addition to the GitLab Enterprise Edition Omnibus install, GitLab SaaS uses
+In addition to the GitLab Enterprise Edition Omnibus install, GitLab.com uses
 the following applications and settings to achieve scale. All settings are
 publicly available at [chef cookbooks](https://gitlab.com/gitlab-cookbooks).