Merge pull request #34657 from brendandburns/cncf

Automatic merge from submit-queue

Update usage guidelines to reflect the donation to CNCF

@sarahnovotny @jbeda
This commit is contained in:
Kubernetes Submit Queue 2016-10-14 14:50:24 -07:00 committed by GitHub
commit c88b883193

View File

@ -6,7 +6,8 @@ follow these basic guidelines.
You may display, modify, or use the Kubernetes logo only in connection with You may display, modify, or use the Kubernetes logo only in connection with
compliant implementations of Kubernetes and related uses in the following ways. compliant implementations of Kubernetes and related uses in the following ways.
A compliant implementation is an implementation of the unmodified Google A compliant implementation is an implementation of the unmodified Cloud Native
Compute Foundation (CNCF)
version of Kubernetes found at https://github.com/kubernetes/kubernetes and version of Kubernetes found at https://github.com/kubernetes/kubernetes and
compatible branches thereof, together with published specifications, APIs and compatible branches thereof, together with published specifications, APIs and
operational patterns.  Acceptable related uses include display, modification, operational patterns.  Acceptable related uses include display, modification,
@ -16,13 +17,10 @@ implementation, your Kubernetes-compatible product, or in collateral,
presentations, and marketing materials relating to compliant implementations of presentations, and marketing materials relating to compliant implementations of
Kubernetes. Kubernetes.
Use of the Kubernetes logo or other Google brands in ways not expressly covered All other uses of this logo are covered by the Linux Foundation trademark
by this document is not allowed without prior written consent from Google -- guidelines found [here](https://linuxfoundation.org/trademark-usage).
see Google's [Guidelines for Third Party Use of Google Brand Features](http://www.google.com/intl/en/permissions/guidelines.html)
for more information.
## Links to logo images ## Links to logo images
Logo: Logo:
* [SVG format](https://github.com/kubernetes/kubernetes/raw/master/logo/logo.svg) * [SVG format](https://github.com/kubernetes/kubernetes/raw/master/logo/logo.svg)
* [PNG format](https://github.com/kubernetes/kubernetes/raw/master/logo/logo.png) * [PNG format](https://github.com/kubernetes/kubernetes/raw/master/logo/logo.png)