Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions content/about/trademark.html
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,14 @@ <h4>2.3 Prohibited usages of the Marks</h4>

<p>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.</p>
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.</p>

<p>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.</p>

<h4>2.4 Limitations to this Policy</h4>

Expand All @@ -147,10 +151,9 @@ <h4>2.4 Limitations to this Policy</h4>

<h4>2.5 Use of the Marks in merchandising</h4>

<p>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
<p>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
<a href="mailto:[email protected]">[email protected]</a>.
</p>

Expand Down
Loading