Return-Path: 
 <commits-return-349-apmail-zest-commits-archive=zest.apache.org@zest.apache.org>
X-Original-To: apmail-zest-commits-archive@minotaur.apache.org
Delivered-To: apmail-zest-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 55884183B5
	for <apmail-zest-commits-archive@minotaur.apache.org>;
 Sun, 14 Jun 2015 00:02:24 +0000 (UTC)
Received: (qmail 7691 invoked by uid 500); 14 Jun 2015 00:02:24 -0000
Delivered-To: apmail-zest-commits-archive@zest.apache.org
Received: (qmail 7671 invoked by uid 500); 14 Jun 2015 00:02:24 -0000
Mailing-List: contact commits-help@zest.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@zest.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@zest.apache.org>
List-Post: <mailto:commits@zest.apache.org>
List-Id: <commits.zest.apache.org>
Reply-To: dev@zest.apache.org
Delivered-To: mailing list commits@zest.apache.org
Received: (qmail 7662 invoked by uid 99); 14 Jun 2015 00:02:24 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Jun 2015 00:02:24 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 D1724AC0553
	for <commits@zest.apache.org>; Sun, 14 Jun 2015 00:02:23 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1685346 - /zest/site/src/community/licensing_faq.html
Date: Sun, 14 Jun 2015 00:02:23 -0000
To: commits@zest.apache.org
From: niclas@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150614000223.D1724AC0553@hades.apache.org>

Author: niclas
Date: Sun Jun 14 00:02:23 2015
New Revision: 1685346

URL: http://svn.apache.org/r1685346
Log:
Aligning the trademarks question with the ASF policies and link to branding.

Modified:
    zest/site/src/community/licensing_faq.html

Modified: zest/site/src/community/licensing_faq.html
URL: http://svn.apache.org/viewvc/zest/site/src/community/licensing_faq.html?rev=1685346&r1=1685345&r2=1685346&view=diff
==============================================================================
--- zest/site/src/community/licensing_faq.html (original)
+++ zest/site/src/community/licensing_faq.html Sun Jun 14 00:02:23 2015
@@ -32,8 +32,7 @@ layout: default
             "Qi4j experts" or that we conduct "Advanced Qi4j training"?
             </dt>
             <dd>
-                <strong>A</strong>: Yes, the "fair use" license to the Qi4j trademarks allows third-party to use the Qi4j marks in
-                such manner. If in doubt, contact the Qi4j Community.
+                <strong>A</strong>: The Apache Software Foundation has a unified <a href="http://www.apache.org/foundation/marks/">trademarks and branding policy</a>, which covers this question. This is somewhat more strict than the pre-ASF policy in the Qi4j project, and if you have any doubts, please contact the Apache Zest project for clarification. The intent of the Project Management Committee is to lean towards "permissible" rather than "exclusionary", as long as credit is given where credit is due. <strong>Also</strong> be aware that all references to "Qi4j" MUST be together with "Apache Zest", such as "Apache Zest Qi4j" or "Qi4j subproject at Apache Zest". 
             </dd>
         </dl>