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

[buildbot]

Author: buildbot
Date: Fri May 31 17:14:00 2013
New Revision: 863892

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:14:00 2013
@@ -1 +1 @@
-1488310
+1488316

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:14:00 2013
@@ -153,12 +153,14 @@ cloud monkey logo are all trademarks and
 <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>
-<a 
href="http://svn.apache.org/repos/asf/cloudstack/media/ai/apache_cloudstack_sans_tagline.ai";>Apache
 CloudStack logo without the tagline (.ai file)</a>
-<a 
href="http://svn.apache.org/repos/asf/cloudstack/media/ai/apache_cloudstack_with_cloud_monkey.ai";>Apache
 CloudStack logo with "open source cloud computing" tagline and the Cloud 
Monkey (JPEG file)</a>
-<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>
+<ul>
+<li><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></li>
+<li><a 
href="http://svn.apache.org/repos/asf/cloudstack/media/ai/apache_cloudstack_sans_tagline.ai";>Apache
 CloudStack logo without the tagline (.ai file)</a></li>
+<li><a 
href="http://svn.apache.org/repos/asf/cloudstack/media/ai/apache_cloudstack_with_cloud_monkey.ai";>Apache
 CloudStack logo with "open source cloud computing" tagline and the Cloud 
Monkey (JPEG file)</a></li>
+<li><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></li>
+<li><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></li>
+<li><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></li>
+</ul>
 <h2 id="events">Events</h2>
 <h3 id="exhibiting-at-events">Exhibiting at Events:</h3>
 <p>Apache CloudStack committers may, without prior approval, use the 
@@ -185,8 +187,7 @@ guidelines the additional guidelines for
 <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">Meetup 
groups, hackfests, barcamps, Birds of a Feather, and other</h3>
-<p>small events.</p>
+<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"
@@ -211,7 +212,7 @@ about the source of software or services
 with products or services provided by the Apache Foo project or the 
 Apache Software Foundation as a whole. You should apply the 
 "likelihood of confusion" test described in our 
-[formal Trademark Policy|http://www.apache.org/foundation/marks/], and 
+<a href="http://www.apache.org/foundation/marks/";>formal Trademark Policy</a>, 
and 
 please realize that the use of Apache marks in third party domain 
 names is generally not "nominative fair use."</p>
 </blockquote> </p>