You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by qu...@apache.org on 2013/01/30 02:44:36 UTC
svn commit: r1440241 - in /flex/site/trunk:
content/v2/about-licensing.cmsPage content/v2/about-people.cmsPage
content/v2/community-getinvolved.cmsPage templates/flex-v2-header.html
Author: quetwo
Date: Wed Jan 30 01:44:36 2013
New Revision: 1440241
URL: http://svn.apache.org/viewvc?rev=1440241&view=rev
Log:
updating v2 site based on suggestions from licensing.
Modified:
flex/site/trunk/content/v2/about-licensing.cmsPage
flex/site/trunk/content/v2/about-people.cmsPage
flex/site/trunk/content/v2/community-getinvolved.cmsPage
flex/site/trunk/templates/flex-v2-header.html
Modified: flex/site/trunk/content/v2/about-licensing.cmsPage
URL: http://svn.apache.org/viewvc/flex/site/trunk/content/v2/about-licensing.cmsPage?rev=1440241&r1=1440240&r2=1440241&view=diff
==============================================================================
--- flex/site/trunk/content/v2/about-licensing.cmsPage (original)
+++ flex/site/trunk/content/v2/about-licensing.cmsPage Wed Jan 30 01:44:36 2013
@@ -198,14 +198,14 @@ identification within third-party archiv
limitations under the License.
-<div class="headline"><h4>Apache Flex Trademarks</h4></div>
+<div class="headline"><h4>Apache Flex® Trademarks</h4></div>
The Apache Software Foundation holds trademarks on behalf of its
-projects. For the Apache Flex project these trademarks include
-the names Apache Flex and Flex, as well as the
+projects. For the Apache Flex® project these trademarks include
+the names Apache Flex® and Flex®, as well as the
graphical logo. Use of these marks is prohibited without explicit
permission from the ASF.
-However, the Apache Flex project is happy to work with 3rd
+However, the Apache Flex® project is happy to work with 3rd
parties who desire to use these trademarks in ways that are beneficial
to the project, which do not imply endorsement by ASF, and which are
fully in conformance with Apache policies.
Modified: flex/site/trunk/content/v2/about-people.cmsPage
URL: http://svn.apache.org/viewvc/flex/site/trunk/content/v2/about-people.cmsPage?rev=1440241&r1=1440240&r2=1440241&view=diff
==============================================================================
--- flex/site/trunk/content/v2/about-people.cmsPage (original)
+++ flex/site/trunk/content/v2/about-people.cmsPage Wed Jan 30 01:44:36 2013
@@ -2,18 +2,18 @@ Title: The Apache Flex Team
<!-- Standard Structure -->
<div class="span8">
-<div class="headline"><h4>The Apache Team</h4></div>
+<div class="headline"><h4>The Apache Flex® Team</h4></div>
<p>Apache Flex is updated and maintained by a large group of individuals. Find them on the mailing lists and elsewhere talking about Flex. If you are looking for support, please contact us on the mailing lists or open a ticket in our bug tracking system (JIRA).
</div>
<div class="span4">
-<div class="headline "><h4>Contribute to Apache Flex!</h4></div>
+<div class="headline "><h4>Contribute to Apache Flex®!</h4></div>
<!-- Large Notice -->
<div class="well">
<h2>We need you!</h2>
<p>Apache Flex is a project run by professionals and volunteers alike. If you would like to help the project including contributing code, documentation, training or marketing, we are always looking for help.</p>
-<button type="button" class="btn btn-inverse">Find out more</button>
+<a href="community-getinvolved.html" class="btn btn-inverse">Find out more</a>
</div>
</div>
Modified: flex/site/trunk/content/v2/community-getinvolved.cmsPage
URL: http://svn.apache.org/viewvc/flex/site/trunk/content/v2/community-getinvolved.cmsPage?rev=1440241&r1=1440240&r2=1440241&view=diff
==============================================================================
--- flex/site/trunk/content/v2/community-getinvolved.cmsPage (original)
+++ flex/site/trunk/content/v2/community-getinvolved.cmsPage Wed Jan 30 01:44:36 2013
@@ -44,7 +44,7 @@ for you. More information is available
8. Sit back and bask in the glory that you helped make Flex better!
<div class="headline"><h4>Contributing Code</h4></div>
-Due to legal reasons, only a select group of people have access to update or contribute code directly to the project.
+Due to legal reasons, only people who have been elected as committers have access to update or contribute code directly to the project.
We at Apache take the legality of code seriously, and nothing would be worse than somebody contributing code that
they don't own and a 3rd party having a legal claim to our framework.
Modified: flex/site/trunk/templates/flex-v2-header.html
URL: http://svn.apache.org/viewvc/flex/site/trunk/templates/flex-v2-header.html?rev=1440241&r1=1440240&r2=1440241&view=diff
==============================================================================
--- flex/site/trunk/templates/flex-v2-header.html (original)
+++ flex/site/trunk/templates/flex-v2-header.html Wed Jan 30 01:44:36 2013
@@ -112,10 +112,10 @@
</ul>
</li>
- <li><a href="#">The Apache Foundation</a>
+ <li><a href="#">About Apache</a>
<ul>
- <li><a href="http://www.apache.org">Apache Website <i class="icon-share icon-white"></i></a></li>
+ <li><a href="http://www.apache.org">The Apache Software Foundation Website <i class="icon-share icon-white"></i></a></li>
<li><a href="http://www.apache.org/foundation/contributing.html">Donations <i class="icon-share icon-white"></i></a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship <i class="icon-share icon-white"></i></a></li>
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks <i class="icon-share icon-white"></i></a></li>