svn commit: r863889 - in /websites/staging/cloudstack/trunk/content: ./ trademark-guidelines.html

[buildbot]

Author: buildbot
Date: Fri May 31 16:57:07 2013
New Revision: 863889

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 16:57:07 2013
@@ -1 +1 @@
-1488308
+1488310

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 16:57:07 2013
@@ -121,7 +121,8 @@
                 </ul>
             </div>
             <div class="span9">
-        <p> <p>Apache CloudStack, CloudStack, the CloudStack word design, the 
Apache 
+        <p> <h1 
id="trademark-guidelines-for-the-apache-cloudstack-project">Trademark 
Guidelines for the Apache CloudStack Project</h1>
+<p>Apache CloudStack, CloudStack, the CloudStack word design, the Apache 
 CloudStack word design, the cloud monkey logo, either separately or in 
 combination are hereinafter referred to as "CloudStack Trademarks" and 
 are trademarks or registered trademarks of the Apache Software 
@@ -140,16 +141,16 @@ brand management to the project's Projec
 this document should be taken as additive to the Apache Software 
 Foundation's trademark guideline. Nothing contained herein provides an 
 exception to those guidelines.</p>
-<h1 id="mark-usage">Mark usage</h1>
-<h2 id="wordmark">Wordmark</h2>
+<h2 id="mark-usage">Mark usage</h2>
+<h3 id="wordmark">Wordmark</h3>
 <p>The word 'CloudStack' and 'Apache CloudStack' is a registered trademark, 
 and should use the '&#174;' symbol. In places where that symbol is not 
 reasonably used it is acceptable to use '(R)' as an alternative.</p>
-<h2 id="other-cloudstack-marks">Other CloudStack marks</h2>
+<h3 id="other-cloudstack-marks">Other CloudStack marks</h3>
 <p>The CloudStack word design, the Apache CloudStack word design, and the 
 cloud monkey logo are all trademarks and should not appear without the 
 '&#8482;' symbol being present.</p>
-<h2 id="apache-cloudstack-logo-tm">Apache CloudStack Logo (TM)</h2>
+<h3 id="apache-cloudstack-logo-tm">Apache CloudStack Logo (TM)</h3>
 <p>The Apache CloudStack logo with the "TM" symbol present may be 
 downloaded here:</p>
 <p><a 
href="http://svn.apache.org/repos/asf/cloudstack/media/ai/apache_cloudstack.ai";>Apache
 CloudStack logo with "open source cloud computing" tagline (.ai file)</a>
@@ -158,13 +159,13 @@ downloaded here:</p>
 <a 
href="http://svn.apache.org/repos/asf/cloudstack/media/jpeg/apache_cloudstack.jpg";>Apache
 CloudStack logo with "open source cloud computing" tagline (JPEG file)</a>
 <a 
href="http://svn.apache.org/repos/asf/cloudstack/media/jpeg/apache_cloudstack_sans_tagline.jpg";>Apache
 CloudStack logo without the tagline (JPEG file)</a>
 <a 
href="http://svn.apache.org/repos/asf/cloudstack/media/jpeg/apache_cloudstack_with_cloud_monkey.jpg";>Apache
 CloudStack logo with "open source cloud computing" tagline and the Cloud 
Monkey (JPEG file)</a></p>
-<h1 id="events">Events</h1>
-<h2 id="exhibiting-at-events">Exhibiting at Events:</h2>
+<h2 id="events">Events</h2>
+<h3 id="exhibiting-at-events">Exhibiting at Events:</h3>
 <p>Apache CloudStack committers may, without prior approval, use the 
 CloudStack Trademarks to promote exhibits or sessions at events with the 
 aim to promote Apache CloudStack, though the general adherence to the 
 ASF's trademark guidelines is still required.</p>
-<h2 id="sponsoring-events">Sponsoring Events:</h2>
+<h3 id="sponsoring-events">Sponsoring Events:</h3>
 <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>
@@ -176,7 +177,7 @@ Approval is given by the PMC.</li>
 project provided marks used.</li>
 <li>At least one committer must be planning to represent the project.</li>
 </ul>
-<h2 id="cloudstack-specific-conferences">CloudStack Specific Conferences:</h2>
+<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>
 <ul>
@@ -184,7 +185,7 @@ guidelines the additional guidelines for
 <li>Membership on committees deciding content should be open to any 
 Committer.</li>
 </ul>
-<h2 id="meetup-groups-hackfests-barcamps-birds-of-a-feather-and-other">Meetup 
groups, hackfests, barcamps, Birds of a Feather, and other</h2>
+<h3 id="meetup-groups-hackfests-barcamps-birds-of-a-feather-and-other">Meetup 
groups, hackfests, barcamps, Birds of a Feather, and other</h3>
 <p>small events.</p>
 <p>Local area user events are encouraged.
 <em> Events which include the CloudStack name, should be styled: "Apache 
@@ -192,14 +193,14 @@ 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>
-<h1 id="non-software-goods">Non-software goods</h1>
+<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>
 </ul>
-<h1 id="websites">Websites</h1>
+<h2 id="websites">Websites</h2>
 <p>No additional guidelines are required above and beyond the 
 <a href="http://www.apache.org/foundation/marks/domains.html";>Third Party 
Domain Name Branding Policy</a>. 
 In general:</p>