git: 02a2c746a6 - main - Trademarks: Add Git, GitHub and GitLab

The branch main has been updated by salvadore:

URL: https://cgit.FreeBSD.org/doc/commit/?id=02a2c746a63591012e5a7a44f026c82c6ffc4a44

commit 02a2c746a63591012e5a7a44f026c82c6ffc4a44
Author:     Lorenzo Salvadore <salvadore@FreeBSD.org>
AuthorDate: 2023-03-05 18:55:51 +0000
Commit:     Lorenzo Salvadore <salvadore@FreeBSD.org>
CommitDate: 2023-03-05 19:28:42 +0000

    Trademarks: Add Git, GitHub and GitLab
    
    - Git: add the trademark line suggested by
      https://git-scm.com/about/trademark
    
    - GitLab: add the trademark line requested by
      https://about.gitlab.com/handbook/marketing/brand-and-product-marketing/brand/brand-activation/trademark-guidelines/
    
    - GitHub: it is a registered trademark according to the following links:
      https://github.com/logos
      https://docs.github.com/en/site-policy/github-terms/github-open-source-applications-terms-and-conditions#githubs-logos
      https://tmsearch.uspto.gov/bin/showfield?f=doc&state=4808:xvjz5y.2.4
    
    Apply the newly introduced trademarks to the Committer's guide. Also add
    a TM symbol immediately after the first reference to the GitLab Name as
    requested by
    https://about.gitlab.com/handbook/marketing/brand-and-product-marketing/brand/brand-activation/trademark-guidelines/
    
    Approved by:    doceng (carlavilla)
    Differential Revision: https://reviews.freebsd.org/D38916
---
 documentation/content/en/articles/committers-guide/_index.adoc | 4 ++--
 documentation/themes/beastie/i18n/en.toml                      | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index 17d6aed381..ef1091bc5a 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -4,7 +4,7 @@ authors:
   - author: The FreeBSD Documentation Project
 copyright: 1999-2022 The FreeBSD Documentation Project
 description: Introductory information for FreeBSD committers
-trademarks: ["freebsd", "coverity", "ibm", "intel", "general"]
+trademarks: ["freebsd", "coverity", "git", "github", "gitlab", "ibm", "intel", "general"]
 weight: 25
 tags: ["FreeBSD Committer's Guide", "Guide", "Community"]
 ---
@@ -1220,7 +1220,7 @@ Examine the tree against `merge_result` to make sure that you haven't missed del
 
 ==== Pushing the changes
 
-Once you are sure that you have a set of deltas you think is good, you can push it to a fork off GitHub or GitLab for others to review.
+Once you are sure that you have a set of deltas you think is good, you can push it to a fork off GitHub or GitLab(TM) for others to review.
 One nice thing about Git is that it allows you to publish rough drafts of your work for others to review.
 While Phabricator is good for content review, publishing the updated vendor branch and merge commits lets others check the details as they will eventually appear in the repository.
 
diff --git a/documentation/themes/beastie/i18n/en.toml b/documentation/themes/beastie/i18n/en.toml
index 69fe0caa60..8b345720b9 100644
--- a/documentation/themes/beastie/i18n/en.toml
+++ b/documentation/themes/beastie/i18n/en.toml
@@ -364,6 +364,15 @@ other = "Adobe, Acrobat, Acrobat Reader, Flash and PostScript are either registe
 [apple]
 other = "Apple, AirPort, FireWire, iMac, iPhone, iPad, Mac, Macintosh, Mac OS, Quicktime, and TrueType are trademarks of Apple Inc., registered in the U.S. and other countries."
 
+[git]
+other = "Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries."
+
+[github]
+other = "GitHub is a registered trademark of GitHub Inc."
+
+[gitlab]
+other = "GITLAB is a trademark of GitLab Inc. in the United States and other countries and regions."
+
 [intel]
 other = "Intel, Celeron, Centrino, Core, EtherExpress, i386, i486, Itanium, Pentium, and Xeon are trademarks or registered trademarks of Intel Corporation or its subsidiaries in the United States and other countries."