diff options
Diffstat (limited to 'doc/administration/package_information/licensing.md')
| -rw-r--r-- | doc/administration/package_information/licensing.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/package_information/licensing.md b/doc/administration/package_information/licensing.md index ece1597c521..bbc0e864e95 100644 --- a/doc/administration/package_information/licensing.md +++ b/doc/administration/package_information/licensing.md @@ -41,7 +41,7 @@ Starting with version 8.13, GitLab has placed an additional step into Omnibus GitLab. The `license_check` step calls `lib/gitlab/tasks/license_check.rake`, which checks the compiled `LICENSE` file against the current list of approved and questionable licenses as denoted in the -arrays at the top of the script. This script will output one of `Good`, +arrays at the top of the script. This script outputs one of `Good`, `Unknown` or `Check` for each piece of software that is a part of the Omnibus GitLab package. @@ -70,7 +70,7 @@ All trademarks, materials, documentation, and other intellectual property remain ### Trademark Requirements -Use of GitLab Trademarks must be in compliance with the standards set forth in [our guidelines](https://about.gitlab.com/handbook/marketing/corporate-marketing/brand-activation/trademark-guidelines/) (as updated from time to time). +Use of GitLab Trademarks must be in compliance with the standards set forth in [our guidelines](https://about.gitlab.com/handbook/marketing/brand-and-product-marketing/brand/brand-activation/trademark-guidelines/) (as updated from time to time). CHEF® and all Chef marks are owned by Progress Software Corporation and must be used in accordance with the [Progress Software Trademark Usage Policy](https://www.progress.com/legal/trademarks). When using a GitLab or 3rd party trademark in documentation, include the (R) symbol in the first instance, for example, "Chef(R) is used for configuring...." You may omit the symbol in subsequent instances. |