Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding a trademarks page #534

Merged
merged 1 commit into from
Dec 23, 2021
Merged
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
* Added [**FDC3 Workbench**](https://fdc3.finos.org/toolbox/fdc3-workbench/), an FDC3 API developer application ([#457](https://github.com/finos/FDC3/pull/457))
* Added advice on how to `broadcast` complex context types, composed of other types, so that other apps can listen for both the complex type and simpler constituent types ([#464](https://github.com/finos/FDC3/pull/464))
* `IntentResolution` now requires the name of the intent raised to included, allowing it to be used to determine the intent raised via `fdc3.raiseIntentForContext()`. ([#507](https://github.com/finos/FDC3/pull/507))
* A Trademarks page was added to acknowledge trademarks used within the Standard not owned by FINOS or the Linux Foundation ([#534](https://github.com/finos/FDC3/pull/534))

### Changed
* Consolidated `Listener` documentation with other types ([#404](https://github.com/finos/FDC3/pull/404))
Expand Down
22 changes: 22 additions & 0 deletions docs/trademarks.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
title: Trademarks
---

The trademarks, logos, and service marks not owned on behalf of FDC3 and FINOS and that are displayed on the Site are the registered and unregistered marks of their respective owners. No rights are granted by the FDC3 or FINOS to use such marks, whether by implication, estoppel, or otherwise.

Trademarks used within this site and the FDC3 Standard include, but are not limited to:
- Autobahn is a registered trademark of DEUTSCHE BANK AG, LONDON
- Chromium is a trademark of Google LLC
- Cosaic is a registered trademark of ChartIQ, Inc.
- Eikon is a registered trademark of Refinitiv
- FDC3 is a registered trademark and brand of The Linux Foundation
- Excel is a Microsoft Corporation product name
- Finsemble is a registered trademark and product name of ChartIQ, Inc.
- Glue42 is a trademark of Tick42
- Java is a registered trademark of Oracle America, Inc.
- JavaScript is a registered trademark of Oracle America, Inc.
- .NET is a trademark of Microsoft Corporation
- npm is a trademark of npm, Inc.
- OpenFin is a registered trademark of OpenFin Inc.
- Outlook is a registered trademark of Microsoft Corporation
- Python is a registered trademark of the Python Software Foundation
4 changes: 4 additions & 0 deletions website/core/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ class Footer extends React.Component {
rel="noreferrer noopener">
Google Groups
</a>
<a
href="/docs/next/trademarks">
Trademarks
</a>
{/* <a href={this.pageUrl('users.html', this.props.language)}>
User Showcase
</a> */}
Expand Down