From nobody Sun Mar 05 19:28:36 2023 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVBZr5HTlz3tsGy for ; Sun, 5 Mar 2023 19:28:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVBZr4n8lz3qx7; Sun, 5 Mar 2023 19:28:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678044516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kXNrtpBnazkhCqn+qdazsu2Zqk5QghDMcdM+HxKNMEo=; b=oazdTR8nm4tkIurTYGGFjcq/DuhcKgKSTU1dfJ3jYLTfSZGnjc05mWACtmEooVS+kpfWj2 Md0K1F1E11uhxNXg2W70EsjiW0Tus5kP9tCeQuM0tT9qcDkezhyGUooGzn1nYlxjpacNkv ysNamgLoN1+yqJYT1owNcrSDdrHgEnVyZXCjqMDxe3AgIkoFfnXxu/9DK/+PuvMob0GkG+ n6Cc5YCLd9UnYYFGSvEbdSAhk87cdzS36yEFeCrMVrjXSCrs1pdC7Cu1Ti9NfaUZyBkap9 NrR81CIFUB0eHAydn9aDpZIjoinECFKWvhzin9XgPXQ0ByiI0xF6wcw7FELV7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678044516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kXNrtpBnazkhCqn+qdazsu2Zqk5QghDMcdM+HxKNMEo=; b=JDhZzL9wtSbp1pKQJCflYUqzssh8QPOEQ4mXmjYQ5RvnhM5ozPw48OWFTGnQhlrq+f6xGi xlnNBj0cjBSw7u+WJwbKtEgQYYUdPVhQqkMaVrJ6I9Rb2Ti0/wJcAMfFRLPY1eHRC1CBiT +C3k+DBYHaGbrAqOmEPiX6N5IsLcSgeFnlrBz/hc1uHEvycVp+ZlurLE4H3EBJr6FY38U7 688QkvoIHMq82j3TjL01ykEDkgqirlsOV/SUt/BOE5yqf007ja/KR7RmfFLHKb5tf4sIiI ZFrfLFij7Bwys8aT1cfTut5Q8gQHvdfUrJiqYL6HW2tDHaeyK+p5gh21gXMgzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678044516; a=rsa-sha256; cv=none; b=ovUB0Nq0Iar9cb+wnBjjQGGlPjn83oOZUfrgVIBhD7YsJjPrGIr/jatdkuS8ek9QJNkX4j fHlLgoplh+JnVeZn03RB0ebwwV3lzrej7fSvqSOFII8yNyPAn9/cpbkcv3rrQ4lkJ8AmT2 AVZvdQ5bIXj2NTJaC2itJymy4bP7puZCA+Ipg66W4aGqDKbCSLLFJyj+A5nJpx8D48SZ4T URG5AAdt3B8HLA+86kklj95oSYYhtwOdmrgilE0trx2xm33Zt1+saQFK8skF2ckzyje8N8 MzJQdF6ZXAC4yj+w374XzDS7Ag4+92j3Ml1+PK2mehZAeOxoUojqNzQ5cozxxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PVBZr3hVTzXyw; Sun, 5 Mar 2023 19:28:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 325JSa6G040647; Sun, 5 Mar 2023 19:28:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 325JSaGW040646; Sun, 5 Mar 2023 19:28:36 GMT (envelope-from git) Date: Sun, 5 Mar 2023 19:28:36 GMT Message-Id: <202303051928.325JSaGW040646@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Lorenzo Salvadore Subject: git: 02a2c746a6 - main - Trademarks: Add Git, GitHub and GitLab List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: salvadore X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02a2c746a63591012e5a7a44f026c82c6ffc4a44 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/doc/commit/?id=02a2c746a63591012e5a7a44f026c82c6ffc4a44 commit 02a2c746a63591012e5a7a44f026c82c6ffc4a44 Author: Lorenzo Salvadore AuthorDate: 2023-03-05 18:55:51 +0000 Commit: Lorenzo Salvadore 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."