Author: buildbot
Date: Fri May 31 17:35:22 2013
New Revision: 863899
Log:
Staging update by buildbot for cloudstack
Modified:
websites/staging/cloudstack/trunk/content/ (props changed)
websites/staging/cloudstack/trunk/content/trademark-guidelines.html
Propchange: websites/staging/cloudstack/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May 31 17:35:22 2013
@@ -1 +1 @@
-1488325
+1488331
Modified: websites/staging/cloudstack/trunk/content/trademark-guidelines.html
==============================================================================
--- websites/staging/cloudstack/trunk/content/trademark-guidelines.html
(original)
+++ websites/staging/cloudstack/trunk/content/trademark-guidelines.html Fri May
31 17:35:22 2013
@@ -171,18 +171,23 @@ ASF's trademark guidelines is still requ
<p>Sponsoring events can provide good visibility for the project, however
it frequently requires funds that the project does not have access to.
Many outside organizations wish to provide this type of visibility.</p>
-<p>In addition to gaining the approval of ConCom the following is required:</p>
+<p>The following is required:</p>
<ul>
-<li>Sponsorship discussed and approved on the cloudstack-marketing list.
Approval is given by the PMC.</li>
+<li>Sponsorship discussed and approved on the <a
href="mailto:[email protected]";>[email protected]</a>
list.</li>
+<li>Requests for approval will be acknowledged by a member of the PMC,
forwarded to <a href="[email protected]">[email protected]</a>, and
approved automatically if no issues are raised 72 hours after
acknowledgement.</li>
<li>Sponsorship must be provided with no additional affiliation - and only
project provided marks used.</li>
<li>At least one committer must be planning to represent the project.</li>
</ul>
+<p>If desired by the funding organization, the sponsorship may be
+discussed on the <a
href="mailto:[email protected]";>[email protected]</a>
+list, which will follow the same process listed above.</p>
<h3 id="cloudstack-specific-conferences">CloudStack Specific Conferences:</h3>
-<p>In addition to seeking permission from ConCom and other general ASF
-guidelines the additional guidelines for Apache CloudStack:</p>
+<p>The following is required:</p>
<ul>
<li>Project approval from the PMC is needed.</li>
+<li>Requests for approval will be acknowledged by a member of the PMC,
forwarded to <a href="[email protected]">[email protected]</a>, and
approved automatically if no issues are raised 72 hours after
acknowledgement.</li>
<li>Membership on committees deciding content should be open to any
Committer.</li>
+<li>At least one committer must be planning to attend the event.</li>
</ul>
<h3
id="meetup-groups-hackfests-barcamps-birds-of-a-feather-and-other-small-events">Meetup
groups, hackfests, barcamps, Birds of a Feather, and other small events:</h3>
<p>Local area user events are encouraged.</p>
@@ -194,7 +199,7 @@ guidelines the additional guidelines for
<h2 id="non-software-goods">Non-software goods</h2>
<ul>
<li>Without explicit written permission, goods bearing any of the CloudStack
marks may not be sold.</li>
-<li>Designs for non-software goods require both PMC approval and approval from
trademarks@.</li>
+<li>Designs for non-software goods require both PMC approval and approval from
<a href="mailto:[email protected]";>[email protected]</a>.</li>
</ul>
<h2 id="websites">Websites</h2>
<p>No additional guidelines are required above and beyond the
