This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-website.git
The following commit(s) were added to refs/heads/asf-site by this push: new 794879d Automatic Site Publish by Jenkins 794879d is described below commit 794879d1178e06ba20dbf39be07e3fb61e6a7cd9 Author: jenkins <us...@infra.apache.org> AuthorDate: Thu Jun 13 03:43:22 2019 +0000 Automatic Site Publish by Jenkins --- community.html | 18 ++++---- documentation.html | 18 ++++---- downloads.html | 18 ++++---- events.html | 18 ++++---- feed.xml | 2 +- index.html | 18 ++++---- security.html | 18 ++++---- slack.html | 18 ++++---- security.html => trademarks.html | 94 ++++++++++++++++++++++++++++++---------- 9 files changed, 141 insertions(+), 81 deletions(-) diff --git a/community.html b/community.html index aa7beae..8ac9891 100644 --- a/community.html +++ b/community.html @@ -499,28 +499,29 @@ function addListenersToSections() <main class="footer-row"> <div> <div class="footer-row-text-links"> - <a class="" href="http://www.apache.org/">Apache Software Foundation</a> + <a class="" href="https://www.apache.org/">Apache Software Foundation</a> <a class="" href="https://apache.org/events/current-event">Events</a> - <a class="" href="http://www.apache.org/licenses/">License</a> + <a class="" href="https://www.apache.org/licenses/">License</a> <a class="" href="security.html">Security</a> - <a class="" href="http://www.apache.org/foundation/thanks.html">Thanks</a> - <a class="" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> + <a class="" href="https://www.apache.org/foundation/thanks.html">Thanks</a> + <a class="" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a> </div> </div> </main> <main class="footer-row"> <div> Apache OpenWhisk, OpenWhisk, Apache, the Apache feather logo, and - the Apache OpenWhisk project logo are either registered trademarks - or trademarks of The Apache Software Foundation - in the United States and other countries. - See guidance on use of Apache OpenWhisk trademarks. + the Apache OpenWhisk project logo are either registered + registered <a href="trademarks.html">trademarks</a> or + trademarks of The Apache Software Foundation in the United States and other countries. + See <a href="trademarks.html">guidance</a> on use of Apache OpenWhisk trademarks. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </div> </main> <main class="footer-row"> <div> + <em> Apache OpenWhisk is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further @@ -530,6 +531,7 @@ function addListenersToSections() reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. + </em> </div> </main> <main class="footer-row"> diff --git a/documentation.html b/documentation.html index 6f16efd..1276072 100644 --- a/documentation.html +++ b/documentation.html @@ -3342,28 +3342,29 @@ abcd.... locationUpdate <main class="footer-row"> <div> <div class="footer-row-text-links"> - <a class="" href="http://www.apache.org/">Apache Software Foundation</a> + <a class="" href="https://www.apache.org/">Apache Software Foundation</a> <a class="" href="https://apache.org/events/current-event">Events</a> - <a class="" href="http://www.apache.org/licenses/">License</a> + <a class="" href="https://www.apache.org/licenses/">License</a> <a class="" href="security.html">Security</a> - <a class="" href="http://www.apache.org/foundation/thanks.html">Thanks</a> - <a class="" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> + <a class="" href="https://www.apache.org/foundation/thanks.html">Thanks</a> + <a class="" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a> </div> </div> </main> <main class="footer-row"> <div> Apache OpenWhisk, OpenWhisk, Apache, the Apache feather logo, and - the Apache OpenWhisk project logo are either registered trademarks - or trademarks of The Apache Software Foundation - in the United States and other countries. - See guidance on use of Apache OpenWhisk trademarks. + the Apache OpenWhisk project logo are either registered + registered <a href="trademarks.html">trademarks</a> or + trademarks of The Apache Software Foundation in the United States and other countries. + See <a href="trademarks.html">guidance</a> on use of Apache OpenWhisk trademarks. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </div> </main> <main class="footer-row"> <div> + <em> Apache OpenWhisk is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further @@ -3373,6 +3374,7 @@ abcd.... locationUpdate reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. + </em> </div> </main> <main class="footer-row"> diff --git a/downloads.html b/downloads.html index 4f0d28d..af67354 100644 --- a/downloads.html +++ b/downloads.html @@ -691,28 +691,29 @@ function addListenersToSections() <main class="footer-row"> <div> <div class="footer-row-text-links"> - <a class="" href="http://www.apache.org/">Apache Software Foundation</a> + <a class="" href="https://www.apache.org/">Apache Software Foundation</a> <a class="" href="https://apache.org/events/current-event">Events</a> - <a class="" href="http://www.apache.org/licenses/">License</a> + <a class="" href="https://www.apache.org/licenses/">License</a> <a class="" href="security.html">Security</a> - <a class="" href="http://www.apache.org/foundation/thanks.html">Thanks</a> - <a class="" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> + <a class="" href="https://www.apache.org/foundation/thanks.html">Thanks</a> + <a class="" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a> </div> </div> </main> <main class="footer-row"> <div> Apache OpenWhisk, OpenWhisk, Apache, the Apache feather logo, and - the Apache OpenWhisk project logo are either registered trademarks - or trademarks of The Apache Software Foundation - in the United States and other countries. - See guidance on use of Apache OpenWhisk trademarks. + the Apache OpenWhisk project logo are either registered + registered <a href="trademarks.html">trademarks</a> or + trademarks of The Apache Software Foundation in the United States and other countries. + See <a href="trademarks.html">guidance</a> on use of Apache OpenWhisk trademarks. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </div> </main> <main class="footer-row"> <div> + <em> Apache OpenWhisk is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further @@ -722,6 +723,7 @@ function addListenersToSections() reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. + </em> </div> </main> <main class="footer-row"> diff --git a/events.html b/events.html index 1adfacd..45d2618 100644 --- a/events.html +++ b/events.html @@ -540,28 +540,29 @@ Monday-Thursday drop-in; Mandalay Bay North, South Seas E&F; Andreas Nauerz (IBM <main class="footer-row"> <div> <div class="footer-row-text-links"> - <a class="" href="http://www.apache.org/">Apache Software Foundation</a> + <a class="" href="https://www.apache.org/">Apache Software Foundation</a> <a class="" href="https://apache.org/events/current-event">Events</a> - <a class="" href="http://www.apache.org/licenses/">License</a> + <a class="" href="https://www.apache.org/licenses/">License</a> <a class="" href="security.html">Security</a> - <a class="" href="http://www.apache.org/foundation/thanks.html">Thanks</a> - <a class="" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> + <a class="" href="https://www.apache.org/foundation/thanks.html">Thanks</a> + <a class="" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a> </div> </div> </main> <main class="footer-row"> <div> Apache OpenWhisk, OpenWhisk, Apache, the Apache feather logo, and - the Apache OpenWhisk project logo are either registered trademarks - or trademarks of The Apache Software Foundation - in the United States and other countries. - See guidance on use of Apache OpenWhisk trademarks. + the Apache OpenWhisk project logo are either registered + registered <a href="trademarks.html">trademarks</a> or + trademarks of The Apache Software Foundation in the United States and other countries. + See <a href="trademarks.html">guidance</a> on use of Apache OpenWhisk trademarks. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </div> </main> <main class="footer-row"> <div> + <em> Apache OpenWhisk is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further @@ -571,6 +572,7 @@ Monday-Thursday drop-in; Mandalay Bay North, South Seas E&F; Andreas Nauerz (IBM reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. + </em> </div> </main> <main class="footer-row"> diff --git a/feed.xml b/feed.xml index 06a6aa1..7eaf868 100644 --- a/feed.xml +++ b/feed.xml @@ -1,2 +1,2 @@ -<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.3.0">Jekyll</generator><link href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" /><updated>2019-06-10T19:59:38+00:00</updated><id>/feed.xml</id><title type="html">Apache OpenWhisk is a serverless, open source cloud platform</title><subtitle>An open source platform for serverless, event-driven code at any [...] +<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom" ><generator uri="https://jekyllrb.com/" version="3.3.0">Jekyll</generator><link href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" /><updated>2019-06-13T03:43:18+00:00</updated><id>/feed.xml</id><title type="html">Apache OpenWhisk is a serverless, open source cloud platform</title><subtitle>An open source platform for serverless, event-driven code at any [...] </subtitle></feed> \ No newline at end of file diff --git a/index.html b/index.html index 6bcb4a3..4bff420 100644 --- a/index.html +++ b/index.html @@ -436,28 +436,29 @@ function addListenersToSections() <main class="footer-row"> <div> <div class="footer-row-text-links"> - <a class="" href="http://www.apache.org/">Apache Software Foundation</a> + <a class="" href="https://www.apache.org/">Apache Software Foundation</a> <a class="" href="https://apache.org/events/current-event">Events</a> - <a class="" href="http://www.apache.org/licenses/">License</a> + <a class="" href="https://www.apache.org/licenses/">License</a> <a class="" href="security.html">Security</a> - <a class="" href="http://www.apache.org/foundation/thanks.html">Thanks</a> - <a class="" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> + <a class="" href="https://www.apache.org/foundation/thanks.html">Thanks</a> + <a class="" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a> </div> </div> </main> <main class="footer-row"> <div> Apache OpenWhisk, OpenWhisk, Apache, the Apache feather logo, and - the Apache OpenWhisk project logo are either registered trademarks - or trademarks of The Apache Software Foundation - in the United States and other countries. - See guidance on use of Apache OpenWhisk trademarks. + the Apache OpenWhisk project logo are either registered + registered <a href="trademarks.html">trademarks</a> or + trademarks of The Apache Software Foundation in the United States and other countries. + See <a href="trademarks.html">guidance</a> on use of Apache OpenWhisk trademarks. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </div> </main> <main class="footer-row"> <div> + <em> Apache OpenWhisk is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further @@ -467,6 +468,7 @@ function addListenersToSections() reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. + </em> </div> </main> <main class="footer-row"> diff --git a/security.html b/security.html index e8cf1d7..31bb0c5 100644 --- a/security.html +++ b/security.html @@ -261,28 +261,29 @@ function addListenersToSections() <main class="footer-row"> <div> <div class="footer-row-text-links"> - <a class="" href="http://www.apache.org/">Apache Software Foundation</a> + <a class="" href="https://www.apache.org/">Apache Software Foundation</a> <a class="" href="https://apache.org/events/current-event">Events</a> - <a class="" href="http://www.apache.org/licenses/">License</a> + <a class="" href="https://www.apache.org/licenses/">License</a> <a class="" href="security.html">Security</a> - <a class="" href="http://www.apache.org/foundation/thanks.html">Thanks</a> - <a class="" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> + <a class="" href="https://www.apache.org/foundation/thanks.html">Thanks</a> + <a class="" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a> </div> </div> </main> <main class="footer-row"> <div> Apache OpenWhisk, OpenWhisk, Apache, the Apache feather logo, and - the Apache OpenWhisk project logo are either registered trademarks - or trademarks of The Apache Software Foundation - in the United States and other countries. - See guidance on use of Apache OpenWhisk trademarks. + the Apache OpenWhisk project logo are either registered + registered <a href="trademarks.html">trademarks</a> or + trademarks of The Apache Software Foundation in the United States and other countries. + See <a href="trademarks.html">guidance</a> on use of Apache OpenWhisk trademarks. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </div> </main> <main class="footer-row"> <div> + <em> Apache OpenWhisk is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further @@ -292,6 +293,7 @@ function addListenersToSections() reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. + </em> </div> </main> <main class="footer-row"> diff --git a/slack.html b/slack.html index e24c576..9f4e41a 100644 --- a/slack.html +++ b/slack.html @@ -300,28 +300,29 @@ function addListenersToSections() <main class="footer-row"> <div> <div class="footer-row-text-links"> - <a class="" href="http://www.apache.org/">Apache Software Foundation</a> + <a class="" href="https://www.apache.org/">Apache Software Foundation</a> <a class="" href="https://apache.org/events/current-event">Events</a> - <a class="" href="http://www.apache.org/licenses/">License</a> + <a class="" href="https://www.apache.org/licenses/">License</a> <a class="" href="security.html">Security</a> - <a class="" href="http://www.apache.org/foundation/thanks.html">Thanks</a> - <a class="" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> + <a class="" href="https://www.apache.org/foundation/thanks.html">Thanks</a> + <a class="" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a> </div> </div> </main> <main class="footer-row"> <div> Apache OpenWhisk, OpenWhisk, Apache, the Apache feather logo, and - the Apache OpenWhisk project logo are either registered trademarks - or trademarks of The Apache Software Foundation - in the United States and other countries. - See guidance on use of Apache OpenWhisk trademarks. + the Apache OpenWhisk project logo are either registered + registered <a href="trademarks.html">trademarks</a> or + trademarks of The Apache Software Foundation in the United States and other countries. + See <a href="trademarks.html">guidance</a> on use of Apache OpenWhisk trademarks. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </div> </main> <main class="footer-row"> <div> + <em> Apache OpenWhisk is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further @@ -331,6 +332,7 @@ function addListenersToSections() reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. + </em> </div> </main> <main class="footer-row"> diff --git a/security.html b/trademarks.html similarity index 70% copy from security.html copy to trademarks.html index e8cf1d7..81e660d 100644 --- a/security.html +++ b/trademarks.html @@ -20,7 +20,7 @@ <meta name="msapplication-config" content="/images/favicon/browserconfig.xml"> <meta name="theme-color" content="#ffffff"> - <title>Apache OpenWhisk Security</title> + <title>Apache OpenWhisk Trademark Guidelines</title> <link href="https://fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i,900,900i" rel="stylesheet"> <link rel="stylesheet" href="/css/main-v1.css?v=1.13"> <!-- Load Index, Menu & collapsible support --> @@ -205,33 +205,77 @@ function addListenersToSections() <!-- Community Index --> <div id="whiskIndex"> <ul> - <li><a href="#report">Security</a></li> - <li><a href="#report">Report a security vulnerability</a></li> + <li>Trademark Guidelines</li> </ul> </div> + <section id="whiskNodes"> <main class="doc"> <div class="content"> - <a class="indexable" id="downloads"></a> - <h2>Security</h2> - <div class="collapsible-content"> - <p>This page contains information on how to report a security vulnerability within the Apache OpenWhisk project.</p> - </div> + <a class="indexable" id="trademarks"></a> + <h2>Apache OpenWhisk Trademark Guidelines</h2> </div> </main> <main class="doc"> <div class="content"> - <a class="indexable" id="report"></a> - <h3>Report a security vulnerability</h3> - <div class="collapsible-content"> - <p>We encourage following the Apache <a href="http://www.apache.org/security/#reporting-a-vulnerability">Vulnerability Reporting</a> process for reporting suspected security vulnerabilities rather than disclosing them in a public forum.</p> - <p>In short, the person discovering the issue, the reporter, should notify the Apache Security team with details of the suspected vulnerability by sending an email to <a href="mailto:secur...@apache.org">secur...@apache.org</a>.</p> - <p>The Apache security team will notify the Apache OpenWhisk Project Management Committee (PMC) and work with them and the submitter to address the issue as described by the Apache <a href="https://www.apache.org/security/committers.html#vulnerability-handling">Vulnerability Handling</a> process.</p> - <p>Please note that this mailing list should only be used for reporting undisclosed security vulnerabilities for Apache OpenWhisk code or dependent libraries, runtimes and tooling. Bug reporting should be done by opening a GitHib Issue within the corresponding project repository where a bug is suspected.</p> - </div> + + <p>Apache OpenWhisk, OpenWhisk and the OpenWhisk logo are + <a href="https://www.apache.org/foundation/marks/">trademarks</a> + of the <a href="https://www.apache.org/">Apache Software Foundation (ASF)</a>. + The ASF is a 501(c)(3) nonprofit organization, and as such, needs to take + special care about how its trademarks are used by organizations. + In particular, ASF needs to ensure that its software products are clearly + distinguished from third-party products.</p> + + <p>If you would like to provide software, services, events, or other products + based on Apache OpenWhisk, please refer to the + <a href="https://www.apache.org/foundation/marks/">ASF trademark policy</a> + and <a href="https://www.apache.org/foundation/marks/faq/">FAQ</a>. + This page summarizes the key points of the policy, but please note that + the official policy always takes precedence.</p> + + <ul> + <li><strong>Software products,</strong> whether commercial or open source, are not allowed to use “OpenWhisk” in their name, except in the form “powered by Apache OpenWhisk" or “for Apache OpenWhisk” when following + <a href="https://www.apache.org/foundation/marks/faq/#products">these specific + guidelines</a>. + <ul> + <li>Names derived from “OpenWhisk” are also not allowed.</li> + <li>Company names may not include “OpenWhisk”.</li> + <li>Package identifiers (e.g., Maven coordinates) may include + “openwhisk”, but the full name used for the software package should + follow the naming policy above.</li> + </ul> + </li> + <li> + <p><strong>Written materials</strong> must refer to the project as “Apache OpenWhisk” in the first and most prominent mentions. Materials from software vendors or software-related service providers must follow + <a href="https://www.apache.org/foundation/marks/guide#howoften">stricter + guidelines</a>, including using the full project name “Apache OpenWhisk" in more + locations, and proper + <a href="https://www.apache.org/foundation/marks/faq/#attribution">trademark + attribution</a> on every page.</p> + </li> + <li> + <p><strong>Logos</strong> derived from the OpenWhisk logo are not allowed.</p> + </li> + <li> + <p><strong>Domain names</strong> containing “openwhisk” are not permitted without written permission from the Apache OpenWhisk PMC. To request permission, email + <a href="mailto:priv...@openwhisk.apache.org">priv...@openwhisk.apache.org</a> and CC + <a href="mailto:tradema...@apache.org">tradema...@apache.org</a>. + (<a href="https://www.apache.org/foundation/marks/domains.html">Details</a>)</p> + </li> + <li><strong>Events, books, and merchandise</strong> have their own guidelines. + Please refer to the + <a href="https://www.apache.org/foundation/marks/">ASF trademark policy</a> + and <a href="https://www.apache.org/foundation/marks/faq/">FAQ</a> for details.</li> + </ul> + + <p>We appreciate the community’s help in respecting these guidelines. + If you have any questions about the Apache trademark policy, please email + <a href="mailto:tradema...@apache.org">tradema...@apache.org</a>.</p> + </div> </main> </section> @@ -261,28 +305,29 @@ function addListenersToSections() <main class="footer-row"> <div> <div class="footer-row-text-links"> - <a class="" href="http://www.apache.org/">Apache Software Foundation</a> + <a class="" href="https://www.apache.org/">Apache Software Foundation</a> <a class="" href="https://apache.org/events/current-event">Events</a> - <a class="" href="http://www.apache.org/licenses/">License</a> + <a class="" href="https://www.apache.org/licenses/">License</a> <a class="" href="security.html">Security</a> - <a class="" href="http://www.apache.org/foundation/thanks.html">Thanks</a> - <a class="" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a> + <a class="" href="https://www.apache.org/foundation/thanks.html">Thanks</a> + <a class="" href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a> </div> </div> </main> <main class="footer-row"> <div> Apache OpenWhisk, OpenWhisk, Apache, the Apache feather logo, and - the Apache OpenWhisk project logo are either registered trademarks - or trademarks of The Apache Software Foundation - in the United States and other countries. - See guidance on use of Apache OpenWhisk trademarks. + the Apache OpenWhisk project logo are either registered + registered <a href="trademarks.html">trademarks</a> or + trademarks of The Apache Software Foundation in the United States and other countries. + See <a href="trademarks.html">guidance</a> on use of Apache OpenWhisk trademarks. All other marks mentioned may be trademarks or registered trademarks of their respective owners. </div> </main> <main class="footer-row"> <div> + <em> Apache OpenWhisk is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further @@ -292,6 +337,7 @@ function addListenersToSections() reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. + </em> </div> </main> <main class="footer-row">