diff --git a/content/about/trademark.html b/content/about/trademark.html index 45818f0fb1..f0820aab5a 100644 --- a/content/about/trademark.html +++ b/content/about/trademark.html @@ -131,10 +131,14 @@

2.3 Prohibited usages of the Marks

In addition, you may not use any of the Marks as a syllable in a new word or as part of a portmanteau (e.g., "Gitalicious", "Gitpedia") used as a - mark for a third-party product or service without Conservancy's written - permission. For the avoidance of doubt, this provision applies even to - third-party marks that use the Marks as a syllable or as part of a - portmanteau to refer to a product or service's use of Git code.

+ mark for a third-party product or service. For the avoidance of doubt, this + provision applies even to third-party marks that use the Marks as a syllable + or as part of a portmanteau to refer to a product or service's use of Git + code.

+ +

Please be aware that GitHub and GitLab are exceptions to this Policy + because they are subject to explicit licensing arrangements that pre-date, and + thus take precedence, over this Policy.

2.4 Limitations to this Policy

@@ -147,10 +151,9 @@

2.4 Limitations to this Policy

2.5 Use of the Marks in merchandising

-

You may not create and/or sell merchandise bearing any of the Marks - without Conservancy's express written permission. If you are interested - in using creating and/or selling merchandise bearing any of the the Marks, - please send proofs of your designs to us at +

You may not create and/or sell merchandise bearing any of the Marks. If + you are interested in using creating and/or selling merchandise bearing any of + the Marks, please send proofs of your designs to us at TRADEMARK@SFCONSERVANCY.ORG.