Author: buildbot
Date: Fri May 31 17:16:56 2013
New Revision: 863893
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:16:56 2013
@@ -1 +1 @@
-1488316
+1488317
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:16:56 2013
@@ -189,17 +189,13 @@ 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.
+<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>
<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>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>
</ul>
<h2 id="websites">Websites</h2>
<p>No additional guidelines are required above and beyond the
