svn commit: r1370168 - /incubator/flex/site/trunk/content/flex/index.mdtext

[jm...@apache.org]

Author: jmclean
Date: Tue Aug  7 11:00:22 2012
New Revision: 1370168

URL: http://svn.apache.org/viewvc?rev=1370168&view=rev
Log:
Updated Flex description and added trademarks

Modified:
    incubator/flex/site/trunk/content/flex/index.mdtext

Modified: incubator/flex/site/trunk/content/flex/index.mdtext
URL: http://svn.apache.org/viewvc/incubator/flex/site/trunk/content/flex/index.mdtext?rev=1370168&r1=1370167&r2=1370168&view=diff
==============================================================================
--- incubator/flex/site/trunk/content/flex/index.mdtext (original)
+++ incubator/flex/site/trunk/content/flex/index.mdtext Tue Aug  7 11:00:22 2012
@@ -1,6 +1,6 @@
 Title: Apache Flex (Incubating)
 
-Apache Flex™ is an application framework for easily building Flash-based applications for mobile devices, the browser and desktop.
+Apache Flex™ is a highly productive, open source application framework for building and maintaining expressive web applications that deploy consistently on all major browsers, desktops and devices (including smartphones, tablets and tv). It provides a modern, standards-based language and programming model that supports common design patterns suitable for developers from many backgrounds. Flex applications can be deployed to the ubiquitous Adobe® Flash® Player in the browser, Adobe® AIR™ on desktop and mobile or to native Android™, IOS™, QNX®, Windows® or Mac® application.
 
 > **The Apache Flex™ team is proud to announce the release of [Apache Flex
 > 4.8.0-incubating][7].  This is the first release under the Incubator of the Apache Software Foundation and represents the initial donation
@@ -43,4 +43,15 @@ code themselves.
   [4]: http://www.flexunit.org/
   [5]: https://docs.google.com/presentation/pub?id=1SsVcr2SLkBJMXk1N6U3-HpxloSUUa4pBX-2f4GrRL5M
   [6]: http://www.360stack.com/blog/2012/06/announcing-360min/
-  [7]: download.html
\ No newline at end of file
+  [7]: download.html
+  
+<small>
+Apache and Apache Flex are either registered trademarks or trademarks of the Apache Software Foundation in the United States and/or other countries.
+Adobe, AIR and Flash Player are either registered trademarks or trademarks of Adobe Systems Incorporated in the United States and/or other countries.
+Android is a trademark of Google Inc.
+IOS is a trademark or registered trademark of Cisco in the U.S. and other countries and is used under license by Apple Inc.
+QNX is a registered trademark of QNX Software Systems Ltd.
+Windows is a registered trademark of Microsoft Corporation in the United States and other countries.
+Mac is a trademark of Apple Inc., registered in the U.S. and other countries.
+</small>
+  
\ No newline at end of file