Author: buildbot
Date: Fri May 31 17:23:41 2013
New Revision: 863897
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:23:41 2013
@@ -1 +1 @@
-1488317
+1488325
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:23:41 2013
@@ -173,10 +173,8 @@ it frequently requires funds that the pr
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>
<ul>
-<li>Sponsorship discussed and approved on the cloudstack-marketing list.
-Approval is given by the PMC.</li>
-<li>Sponsorship must be provided with no additional affiliation - and only
-project provided marks used.</li>
+<li>Sponsorship discussed and approved on the cloudstack-marketing list.
Approval is given by the PMC.</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>
<h3 id="cloudstack-specific-conferences">CloudStack Specific Conferences:</h3>
@@ -184,14 +182,15 @@ project provided marks used.</li>
guidelines the additional guidelines for Apache CloudStack:</p>
<ul>
<li>Project approval from the PMC is needed.</li>
-<li>Membership on committees deciding content should be open to any
-Committer.</li>
+<li>Membership on committees deciding content should be open to any
Committer.</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.
-<em> Events which include the CloudStack name, should be styled: "Apache
CloudStack"
-</em> Annotation on the group's web presence should indicate that there is no
affiliation between the group and the project.
-* A link to the project's website should be present.</p>
+<p>Local area user events are encouraged.</p>
+<ul>
+<li>Events which include the CloudStack name, should be styled: "Apache
CloudStack"</li>
+<li>Annotation on the group's web presence should indicate that there is no
affiliation between the group and the project.</li>
+<li>A link to the project's website should be present.</li>
+</ul>
<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>
