Author: chipchilders
Date: Fri May 31 17:13:42 2013
New Revision: 1488316
URL: http://svn.apache.org/r1488316
Log:
Formatting fixes
Modified:
cloudstack/site/trunk/content/trademark-guidelines.mdtext
Modified: cloudstack/site/trunk/content/trademark-guidelines.mdtext
URL:
http://svn.apache.org/viewvc/cloudstack/site/trunk/content/trademark-guidelines.mdtext?rev=1488316&r1=1488315&r2=1488316&view=diff
==============================================================================
--- cloudstack/site/trunk/content/trademark-guidelines.mdtext (original)
+++ cloudstack/site/trunk/content/trademark-guidelines.mdtext Fri May 31
17:13:42 2013
@@ -41,12 +41,12 @@ cloud monkey logo are all trademarks and
The Apache CloudStack logo with the "TM" symbol present may be
downloaded here:
-[Apache CloudStack logo with "open source cloud computing" tagline (.ai
file)](http://svn.apache.org/repos/asf/cloudstack/media/ai/apache_cloudstack.ai)
-[Apache CloudStack logo without the tagline (.ai
file)](http://svn.apache.org/repos/asf/cloudstack/media/ai/apache_cloudstack_sans_tagline.ai)
-[Apache CloudStack logo with "open source cloud computing" tagline and the
Cloud Monkey (JPEG
file)](http://svn.apache.org/repos/asf/cloudstack/media/ai/apache_cloudstack_with_cloud_monkey.ai)
-[Apache CloudStack logo with "open source cloud computing" tagline (JPEG
file)](http://svn.apache.org/repos/asf/cloudstack/media/jpeg/apache_cloudstack.jpg)
-[Apache CloudStack logo without the tagline (JPEG
file)](http://svn.apache.org/repos/asf/cloudstack/media/jpeg/apache_cloudstack_sans_tagline.jpg)
-[Apache CloudStack logo with "open source cloud computing" tagline and the
Cloud Monkey (JPEG
file)](http://svn.apache.org/repos/asf/cloudstack/media/jpeg/apache_cloudstack_with_cloud_monkey.jpg)
+* [Apache CloudStack logo with "open source cloud computing" tagline (.ai
file)](http://svn.apache.org/repos/asf/cloudstack/media/ai/apache_cloudstack.ai)
+* [Apache CloudStack logo without the tagline (.ai
file)](http://svn.apache.org/repos/asf/cloudstack/media/ai/apache_cloudstack_sans_tagline.ai)
+* [Apache CloudStack logo with "open source cloud computing" tagline and the
Cloud Monkey (JPEG
file)](http://svn.apache.org/repos/asf/cloudstack/media/ai/apache_cloudstack_with_cloud_monkey.ai)
+* [Apache CloudStack logo with "open source cloud computing" tagline (JPEG
file)](http://svn.apache.org/repos/asf/cloudstack/media/jpeg/apache_cloudstack.jpg)
+* [Apache CloudStack logo without the tagline (JPEG
file)](http://svn.apache.org/repos/asf/cloudstack/media/jpeg/apache_cloudstack_sans_tagline.jpg)
+* [Apache CloudStack logo with "open source cloud computing" tagline and the
Cloud Monkey (JPEG
file)](http://svn.apache.org/repos/asf/cloudstack/media/jpeg/apache_cloudstack_with_cloud_monkey.jpg)
## Events
@@ -80,8 +80,7 @@ guidelines the additional guidelines for
* Membership on committees deciding content should be open to any
Committer.
-### Meetup groups, hackfests, barcamps, Birds of a Feather, and other
-small events.
+### Meetup groups, hackfests, barcamps, Birds of a Feather, and other small
events:
Local area user events are encouraged.
* Events which include the CloudStack name, should be styled: "Apache
@@ -109,6 +108,6 @@ In general:
> 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
+> [formal Trademark Policy](http://www.apache.org/foundation/marks/), and
> please realize that the use of Apache marks in third party domain
> names is generally not "nominative fair use."