You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bu...@apache.org on 2013/01/08 05:40:07 UTC

svn commit: r845434 - in /websites/staging/flex/trunk: cgi-bin/ content/ content/v2/

Author: buildbot
Date: Tue Jan  8 04:40:07 2013
New Revision: 845434

Log:
Staging update by buildbot for flex

Added:
    websites/staging/flex/trunk/content/v2/about-assets.html
    websites/staging/flex/trunk/content/v2/about-history.html
    websites/staging/flex/trunk/content/v2/about-licensing.html
    websites/staging/flex/trunk/content/v2/about-whatis.html
Removed:
    websites/staging/flex/trunk/content/v2/about.html
Modified:
    websites/staging/flex/trunk/cgi-bin/   (props changed)
    websites/staging/flex/trunk/content/   (props changed)
    websites/staging/flex/trunk/content/v2/about-people.html
    websites/staging/flex/trunk/content/v2/index.html

Propchange: websites/staging/flex/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jan  8 04:40:07 2013
@@ -1 +1 @@
-1430136
+1430138

Propchange: websites/staging/flex/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jan  8 04:40:07 2013
@@ -1 +1 @@
-1430136
+1430138

Added: websites/staging/flex/trunk/content/v2/about-assets.html
==============================================================================
--- websites/staging/flex/trunk/content/v2/about-assets.html (added)
+++ websites/staging/flex/trunk/content/v2/about-assets.html Tue Jan  8 04:40:07 2013
@@ -0,0 +1,92 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link href="/css/flex.css" rel="stylesheet" type="text/css">
+
+<title>Logos and Assets
</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+</head>
+
+<body>
+  <div id="bannera">
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/images/flex.png"/></div>
+    <div id="bannerright">
+      <a title="An Apache Project" href="http://www.apache.org"><img id="asf-logo" alt="An Apache Project" src="http://apache.org/images/feather-small.gif"/></a>
+    </div>
+    <div id="bannercenter">&nbsp;</div>
+  </div>
+  <div id="topbara">
+    
+    <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo&nbsp;<a href="/v2/">v2</a></div>
+  </div>
+  <div id="clear"></div>
+  <div id="leftnav"><h1 id="general">General</h1>
+<ul>
+<li><a href="/index.html">About</a></li>
+<li><a href="/license.html">License</a></li>
+<li><a href="/trademarks.html">Trademarks</a></li>
+<li><a href="/news.html">News Archive</a></li>
+</ul>
+<h1 id="distribution">Distribution</h1>
+<ul>
+<li><a href="/download.html">Download the SDK</a></li>
+<li><a href="/installer.html">Download the Installer</a></li>
+<li><a href="/about-binaries.html">About Binaries</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="/get-involved.html">Get Involved</a></li>
+<li><a href="/team.html">Team</a></li>
+<li><a href="http://blogs.apache.org/flex">Blog</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/FLEX/Apache+Flex+Wiki">Project Wiki</a></li>
+<li><a href="/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/logoassets.html">Logo and Assets</a></li>
+<li><a href="/utilities.html">Utilities</a></li>
+<li><a href="/timeline.html">Timeline</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<li><a href="/source.html">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/FLEX">Jira</a></li>
+<li><a href="/developer-faqs.html">Developer FAQs</a></li>
+</ul>
+<h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
+<ul>
+<li><a href="http://www.apache.org/">Website</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+</ul></div>
+  
+  <div id="content">
+    <h1 class="title">Logos and Assets
</h1>
+    
+<div class="headline"><h4>Logo</h4></div>
+<p>The Apache Flex Project has the following official logo:</p>
+<img src="http://flex.apache.org/images/flex.png" />
+
+<p>The logo is available in the following formats :</p>
+<ul class="arrow_list">
+    <li><a href="https://issues.apache.org/jira/secure/attachment/12513945/apache_flex_eps.zip">EPS (3.25 MB Download)</a></li>
+    <li><a href="https://issues.apache.org/jira/secure/attachment/12513946/apache_flex_jpg.zip">JPG (1.10 MB Download)</a></li>
+    <li><a href="https://issues.apache.org/jira/secure/attachment/12513947/apache_flex_png.zip">PNG (385 KB Download)</a></li>
+</ul>
+<p>You can see the JIRA ticket where these logos were submitted at : <a href="https://issues.apache.org/jira/browse/FLEX-33093">FLEX-33093</a></p>
+<p>A special thanks to Adrian Knopik of <a href="http://www.fusecollective.com" rel="nofollow">Fuse Collective</a>, for creating it and Tomasz Maciąg for submitting it. </p>
+
+<div class="headline"><h4>Other Assets</h4></div>
+<p>All other assets are available in our SVN.  Apache Logos, Marks, etc. are available from the <a href="http://www.apache.org/foundation/press/kit/">Foundation Press Kit Website</a></p>
+  </div>
+
+  <div id="footera">
+    <div id="copyrighta">
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="/license.html">Apache License, Version 2.0</a>
+	<br />Apache Flex, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Added: websites/staging/flex/trunk/content/v2/about-history.html
==============================================================================
--- websites/staging/flex/trunk/content/v2/about-history.html (added)
+++ websites/staging/flex/trunk/content/v2/about-history.html Tue Jan  8 04:40:07 2013
@@ -0,0 +1,198 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link href="/css/flex.css" rel="stylesheet" type="text/css">
+
+<title>Project History
</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+</head>
+
+<body>
+  <div id="bannera">
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/images/flex.png"/></div>
+    <div id="bannerright">
+      <a title="An Apache Project" href="http://www.apache.org"><img id="asf-logo" alt="An Apache Project" src="http://apache.org/images/feather-small.gif"/></a>
+    </div>
+    <div id="bannercenter">&nbsp;</div>
+  </div>
+  <div id="topbara">
+    
+    <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo&nbsp;<a href="/v2/">v2</a></div>
+  </div>
+  <div id="clear"></div>
+  <div id="leftnav"><h1 id="general">General</h1>
+<ul>
+<li><a href="/index.html">About</a></li>
+<li><a href="/license.html">License</a></li>
+<li><a href="/trademarks.html">Trademarks</a></li>
+<li><a href="/news.html">News Archive</a></li>
+</ul>
+<h1 id="distribution">Distribution</h1>
+<ul>
+<li><a href="/download.html">Download the SDK</a></li>
+<li><a href="/installer.html">Download the Installer</a></li>
+<li><a href="/about-binaries.html">About Binaries</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="/get-involved.html">Get Involved</a></li>
+<li><a href="/team.html">Team</a></li>
+<li><a href="http://blogs.apache.org/flex">Blog</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/FLEX/Apache+Flex+Wiki">Project Wiki</a></li>
+<li><a href="/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/logoassets.html">Logo and Assets</a></li>
+<li><a href="/utilities.html">Utilities</a></li>
+<li><a href="/timeline.html">Timeline</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<li><a href="/source.html">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/FLEX">Jira</a></li>
+<li><a href="/developer-faqs.html">Developer FAQs</a></li>
+</ul>
+<h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
+<ul>
+<li><a href="http://www.apache.org/">Website</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+</ul></div>
+  
+  <div id="content">
+    <h1 class="title">Project History
</h1>
+    
+<div class="headline"><h4>Our History</h4></div>
+
+The goal of this page is to document the history of the Apache Flex, starting with Adobe
+deciding to donate it to the Apache Software Foundation (ASF), incubation and Apache Flex becoming a top level project.
+
+It might be useful for other similar projects, or any incubating project, as an example of the steps involved in
+an Apache incubation.
+
+See [http://incubator.apache.org](http://incubator.apache.org) for the official Incubator documentation, and
+in particular the [incubation process description](http://incubator.apache.org/incubation/Process_Description.html) page.
+
+#### 2011: Adobe decides to contribute Flex to the ASF
+
+The decision is made within Adobe to incubate Flex at the ASF. Work starts on the incubation proposal, on explaining
+internally what this means, on the legal/IP clearance steps required to donate the code and on recruiting
+initial committers who will help get the project started.
+
+#### December 12, 2011: Flex Summit
+
+The [Flex Summit](http://tv.adobe.com/show/flex-community-summit-december-2011) is organized to make
+the Flex community aware of the upcoming changes, and to allow initial Flex committers to sign up and network.
+
+Among the available videos, these two provide interesting insights on how Apache projects work, by Roy Fielding,
+one of the ASF's founders:
+
+- [What it means to be an Apache project, part 1](http://tv.adobe.com/watch/flex-community-summit-december-2011/what-it-means-to-be-an-apache-project-part-1/)
+- [What it means to be an Apache project, part 2](http://tv.adobe.com/watch/flex-community-summit-december-2011/what-it-means-to-be-an-apache-project-part-2/)
+
+The following blog posts provide other views on the event, and show that it was useful for the Flex community
+and for the upcoming Apache Flex project:
+
+- [Flex given to the Apache Software Foundation – round-up and opportunities](http://www.flex-tutorial.fr/2011/12/17/flex-given-to-the-apache-software-foundation-round-up-and-opportunities)
+- [Huge Adobe Partnership to Open Source Flex with Apache Software Foundation …](http://www.adamflater.net/2011/12/14/apache-flex-beginning/)
+
+#### December 20, 2011: Incubation proposal submitted
+
+The [Incubation proposal](http://wiki.apache.org/incubator/FlexProposal) is submitted
+and [discussed](http://mail-archives.apache.org/mod_mbox/incubator-general/201112.mbox/%3CCB14DCA2.3885F%25aharui%40adobe.com%3E) on the incubator-general mailing list, followed after a few days (once the
+discussion dies down) by the Incubator PMC vote mentioned below.
+
+The list of incubation mentors is completed during the proposal's discussion phase, after asking for volunteers
+when submitting the proposal.
+
+A few initial committers are also added during the discussion phase.
+
+#### December 22, 2011: Vote for Anne and Dave as incubator PMC members
+
+Project mentors need to be members of the Incubator PMC, ASF members just need to ask to get this membership.
+
+Committers who are not (yet) Apache members need to be voted in by the Incubator PMC, which is done
+around December 22 for Anne and Dave.
+
+#### December 27, 2011: [VOTE] Flex to join the Apache Incubator
+
+The [Incubator PMC vote](http://markmail.org/message/puo2rtrvby65lb3m)
+lasts at least 72 hours, after which whoever started it
+[tallies it](http://mail-archives.apache.org/mod_mbox/incubator-general/201112.mbox/%3CCAEWfVJmMq390Hinafg%2Bjik8VqboYG1ixe_gnz5O2bV5q5mtKPw%40mail.gmail.com%3E).
+the vote for Flex passes on December 30th.
+
+#### Late December 2011: Basic infrastructure is created
+
+See for example the
+[INFRA-4260](https://issues.apache.org/jira/browse/INFRA-4260) (create mailing lists)
+and
+[INFRA-4262](https://issues.apache.org/jira/browse/INFRA-4262) (create JIRA instance)
+issues.
+
+Flex is added to the Incubator's [reporting schedule](http://wiki.apache.org/incubator/ReportingSchedule).
+
+The [Flex incubation status page](http://incubator.apache.org/projects/flex.html) is created.
+
+People are invited to subscribe to the new Apache Flex [mailing lists](/flex/mailing-lists.html)
+
+Those lists are added to [flex.markmail.org](http://flex.markmail.org) for convenience, using the markmail feedback form.
+
+Discussions and consensus building start, including clarifications about the role of the PPMC, committers
+and community, whether to create roadmaps or just let things evolve organically, etc.
+
+#### Late 2011 and early 2012: User accounts
+
+Mentors request creation of Apache accounts for the initial committers listed in the
+[incubation proposal](http://wiki.apache.org/incubator/FlexProposal), after asking people which Apache ID
+they would like, avoiding collisions with [existing IDs](http://people.apache.org/committer-index.html).
+
+Initial committers, who are also PPMC members, are invited to subscribe to the Flex private mailing list
+(which is used for discussions about people, new committers etc. and as little as possible besides that) and
+made aware of the [Apache guide for new committers](http://www.apache.org/dev/new-committers-guide.html).
+
+Flex committers are granted write access to the [subversion repository](http://svn.apache.org/repos/asf/incubator/flex/)
+and [JIRA issue tracker](https://issues.apache.org/jira/browse/FLEX) and can start actual coding work.
+
+#### January 17, 2012: Software grant received
+
+Adobe's [software grant](http://www.apache.org/licenses/software-grant.txt) is received by the ASF's
+secretary, the Flex code can now be imported into Apache Flex's code repository.
+
+#### February 22, 2012: First committer voted in
+
+Justin Mclean is the first Flex committer (besides the initial committers listed in the incubation proposal) to
+be voted in, after a short discussion and a vote on the Flex private
+mailing list, as per the [incubator's instructions](http://incubator.apache.org/guides/ppmc.html).
+
+#### March 27, 2012: MXMLC donation announced
+
+The legal/IP clearance work for that module is done on the Adobe side, that code is ready to be donated.
+
+#### August 30, 2012: Falcon legalities completed
+
+Apache recorded Adobe's donation documents for the source code to the next-generaton Falcon compiler.
+
+#### September 10, 2012: Falcon code committed
+
+The source code for the Falcon compiler was committed to Apache's Subversion repository.
+
+#### December 19, 2012: Apache Flex becomes a top level Apache Software Foundation project
+
+Apache Flex is voted in as a top level project at the December board meeting of the Apache Software Foundation.
+
+#### December 27, 2012: Apache Flex 4.9 released
+
+After seven release candidates Apache Flex 4.9 is released as the first release after becoming an Apache Software Foundation top level project.
+  </div>
+
+  <div id="footera">
+    <div id="copyrighta">
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="/license.html">Apache License, Version 2.0</a>
+	<br />Apache Flex, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Added: websites/staging/flex/trunk/content/v2/about-licensing.html
==============================================================================
--- websites/staging/flex/trunk/content/v2/about-licensing.html (added)
+++ websites/staging/flex/trunk/content/v2/about-licensing.html Tue Jan  8 04:40:07 2013
@@ -0,0 +1,322 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<link href="/css/flex.css" rel="stylesheet" type="text/css">
+
+<title>Licensing and Trademarks
</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+</head>
+
+<body>
+  <div id="bannera">
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/images/flex.png"/></div>
+    <div id="bannerright">
+      <a title="An Apache Project" href="http://www.apache.org"><img id="asf-logo" alt="An Apache Project" src="http://apache.org/images/feather-small.gif"/></a>
+    </div>
+    <div id="bannercenter">&nbsp;</div>
+  </div>
+  <div id="topbara">
+    
+    <div id="breadcrumbsa"><a href="/">home</a>&nbsp;&raquo&nbsp;<a href="/v2/">v2</a></div>
+  </div>
+  <div id="clear"></div>
+  <div id="leftnav"><h1 id="general">General</h1>
+<ul>
+<li><a href="/index.html">About</a></li>
+<li><a href="/license.html">License</a></li>
+<li><a href="/trademarks.html">Trademarks</a></li>
+<li><a href="/news.html">News Archive</a></li>
+</ul>
+<h1 id="distribution">Distribution</h1>
+<ul>
+<li><a href="/download.html">Download the SDK</a></li>
+<li><a href="/installer.html">Download the Installer</a></li>
+<li><a href="/about-binaries.html">About Binaries</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="/get-involved.html">Get Involved</a></li>
+<li><a href="/team.html">Team</a></li>
+<li><a href="http://blogs.apache.org/flex">Blog</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/FLEX/Apache+Flex+Wiki">Project Wiki</a></li>
+<li><a href="/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/logoassets.html">Logo and Assets</a></li>
+<li><a href="/utilities.html">Utilities</a></li>
+<li><a href="/timeline.html">Timeline</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<li><a href="/source.html">Source Code</a></li>
+<li><a href="https://issues.apache.org/jira/browse/FLEX">Jira</a></li>
+<li><a href="/developer-faqs.html">Developer FAQs</a></li>
+</ul>
+<h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
+<ul>
+<li><a href="http://www.apache.org/">Website</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+</ul></div>
+  
+  <div id="content">
+    <h1 class="title">Licensing and Trademarks
</h1>
+    
+<div class="headline"><h4>Licensing</h4></div>
+
+Apache License<br/>Version 2.0, January 2004<br/>
+[http://www.apache.org/licenses/](http://www.apache.org/licenses/)
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+**<a name="definitions">1. Definitions</a>**.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the
+copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other
+entities that control, are controlled by, or are under common control with
+that entity. For the purposes of this definition, "control" means (i) the
+power, direct or indirect, to cause the direction or management of such
+entity, whether by contract or otherwise, or (ii) ownership of fifty
+percent (50%) or more of the outstanding shares, or (iii) beneficial
+ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation source,
+and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation
+or translation of a Source form, including but not limited to compiled
+object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form,
+made available under the License, as indicated by a copyright notice that
+is included in or attached to the work (an example is provided in the
+Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form,
+that is based on (or derived from) the Work and for which the editorial
+revisions, annotations, elaborations, or other modifications represent, as
+a whole, an original work of authorship. For the purposes of this License,
+Derivative Works shall not include works that remain separable from, or
+merely link (or bind by name) to the interfaces of, the Work and Derivative
+Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original
+version of the Work and any modifications or additions to that Work or
+Derivative Works thereof, that is intentionally submitted to Licensor for
+inclusion in the Work by the copyright owner or by an individual or Legal
+Entity authorized to submit on behalf of the copyright owner. For the
+purposes of this definition, "submitted" means any form of electronic,
+verbal, or written communication sent to the Licensor or its
+representatives, including but not limited to communication on electronic
+mailing lists, source code control systems, and issue tracking systems that
+are managed by, or on behalf of, the Licensor for the purpose of discussing
+and improving the Work, but excluding communication that is conspicuously
+marked or otherwise designated in writing by the copyright owner as "Not a
+Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on
+behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+**<a name="copyright">2. Grant of Copyright License</a>**. Subject to the
+terms and conditions of this License, each Contributor hereby grants to You
+a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of, publicly
+display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+**<a name="patent">3. Grant of Patent License</a>**. Subject to the terms
+and conditions of this License, each Contributor hereby grants to You a
+perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made, use,
+offer to sell, sell, import, and otherwise transfer the Work, where such
+license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by
+combination of their Contribution(s) with the Work to which such
+Contribution(s) was submitted. If You institute patent litigation against
+any entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that the Work or a Contribution incorporated within the Work constitutes
+direct or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate as of the
+date such litigation is filed.
+
+**<a name="redistribution">4. Redistribution</a>**. You may reproduce and
+distribute copies of the Work or Derivative Works thereof in any medium,
+with or without modifications, and in Source or Object form, provided that
+You meet the following conditions:
+
+1. You must give any other recipients of the Work or Derivative Works a
+copy of this License; and
+
+1. You must cause any modified files to carry prominent notices stating
+that You changed the files; and
+
+1. You must retain, in the Source form of any Derivative Works that You
+distribute, all copyright, patent, trademark, and attribution notices from
+the Source form of the Work, excluding those notices that do not pertain to
+any part of the Derivative Works; and
+
+1. If the Work includes a "NOTICE" text file as part of its distribution,
+then any Derivative Works that You distribute must include a readable copy
+of the attribution notices contained within such NOTICE file, excluding
+those notices that do not pertain to any part of the Derivative Works, in
+at least one of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or documentation,
+if provided along with the Derivative Works; or, within a display generated
+by the Derivative Works, if and wherever such third-party notices normally
+appear. The contents of the NOTICE file are for informational purposes only
+and do not modify the License. You may add Your own attribution notices
+within Derivative Works that You distribute, alongside or as an addendum to
+the NOTICE text from the Work, provided that such additional attribution
+notices cannot be construed as modifying the License.
+You may add Your own copyright statement to Your modifications and may
+provide additional or different license terms and conditions for use,
+reproduction, or distribution of Your modifications, or for any such
+Derivative Works as a whole, provided Your use, reproduction, and
+distribution of the Work otherwise complies with the conditions stated in
+this License.
+
+**<a name="contributions">5. Submission of Contributions</a>**. Unless You
+explicitly state otherwise, any Contribution intentionally submitted for
+inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the
+terms of any separate license agreement you may have executed with Licensor
+regarding such Contributions.
+
+**<a name="trademarks">6. Trademarks</a>**. This License does not grant
+permission to use the trade names, trademarks, service marks, or product
+names of the Licensor, except as required for reasonable and customary use
+in describing the origin of the Work and reproducing the content of the
+NOTICE file.
+
+**<a name="no-warranty">7. Disclaimer of Warranty</a>**. Unless required by
+applicable law or agreed to in writing, Licensor provides the Work (and
+each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
+without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You
+are solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise
+of permissions under this License.
+
+**<a name="no-liability">8. Limitation of Liability</a>**. In no event and
+under no legal theory, whether in tort (including negligence), contract, or
+otherwise, unless required by applicable law (such as deliberate and
+grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a result
+of this License or out of the use or inability to use the Work (including
+but not limited to damages for loss of goodwill, work stoppage, computer
+failure or malfunction, or any and all other commercial damages or losses),
+even if such Contributor has been advised of the possibility of such
+damages.
+
+**<a name="additional">9. Accepting Warranty or Additional Liability</a>**.
+While redistributing the Work or Derivative Works thereof, You may choose
+to offer, and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this License.
+However, in accepting such obligations, You may act only on Your own behalf
+and on Your sole responsibility, not on behalf of any other Contributor,
+and only if You agree to indemnify, defend, and hold each Contributor
+harmless for any liability incurred by, or claims asserted against, such
+Contributor by reason of your accepting any such warranty or additional
+liability.
+
+END OF TERMS AND CONDITIONS
+
+# APPENDIX: How to apply the Apache License to your work # {#apply}
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included
+on the same "printed page" as the copyright notice for easier
+identification within third-party archives.
+
+:::text
+        Copyright [yyyy] [name of copyright owner]
+
+        Licensed under the Apache License, Version 2.0 (the "License");
+        you may not use this file except in compliance with the License.
+        You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+
+
+<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
+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
+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.
+
+To request such permission, follow these steps:
+
+1. First familiarize yourself with the [Apache Trademark Policy] [1].
+Many of the common cases are already addressed there.  And some uses
+of ASF marks ("nominative use") are automatically allowed.
+
+1. Email a proposal to [private@flex.apache.org] [2].  In the
+proposal, please include:
+
+1. Name and contact information of the company, organization or person
+requesting the permission
+
+1. A list of what ASF controlled marks you wish to use
+
+1. A description of how these marks would be used.  Give supporting
+detail, along with context  If you are requesting use of the logo, for
+example, provide a prototype of how the logo would appear in the
+context of the overall design.
+
+1. Any other information you think would be useful, e.g., any impeding deadlines
+
+1. On receipt of the proposal, the Apache Flex PPMC will review
+and decide whether or not to recommend approval.
+
+1. If the PMC recommends approval, then they will forward their
+recommendation, along with your proposal and any follow up
+communications, to the Apache V.P. of Brand Management for final
+approval.
+
+1. We will then notify you of the outcome.
+
+
+[1]: http://www.apache.org/foundation/marks/
+[2]: mailto:private@flex.apache.org?subject=Trademark
+
+  </div>
+
+  <div id="footera">
+    <div id="copyrighta">
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="/license.html">Apache License, Version 2.0</a>
+	<br />Apache Flex, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Modified: websites/staging/flex/trunk/content/v2/about-people.html
==============================================================================
--- websites/staging/flex/trunk/content/v2/about-people.html (original)
+++ websites/staging/flex/trunk/content/v2/about-people.html Tue Jan  8 04:40:07 2013
@@ -75,11 +75,11 @@
                 <li><a href="#">About Flex</a>
                     <ul>
 
-                        <li><a href="about.html">What is Flex?</a></li>
-                        <li><a href="about.html">License &amp; Trademarks</a></li>
+                        <li><a href="about-whatis.html">What is Flex?</a></li>
+                        <li><a href="about-licensing.html">License &amp; Trademarks</a></li>
                         <li><a href="about-people.html">The Team</a></li>
-                        <li><a href="about.html">Project History</a></li>
-                        <li><a href="about.html">Logo and Assets</a></li>
+                        <li><a href="about-history.html">Project History</a></li>
+                        <li><a href="about-assets.html">Logo and Assets</a></li>
                     </ul>
                 </li>
                 <li><a href="#">Community</a>
@@ -255,15 +255,14 @@
 
 </div>
 
-<p></div>
-<div class="row-fluid margintop">
 <!-- About -->
+
 <div class="span3">
 <img src="images/staff-3.jpg" alt="" class="img-circle"/>
 <div class="staff"><h5>Greg Reddin </h5> <span>Project Mentor</span><span><i class="icon-tag"></i> greddin</span></div>
-<div class="team-about"><p>Consectetur dolor ipsum quiam dolor adipisci velit, aenean at lorem vel est posuere feugiat sed quia noneas numquasa mode tempora incidunt ipsum.</p></div></p>
-<!-- Social Icons -->
+<div class="team-about"><p>Consectetur dolor ipsum quiam dolor adipisci velit, aenean at lorem vel est posuere feugiat sed quia noneas numquasa mode tempora incidunt ipsum.</p></div>
 
+<!-- Social Icons -->
 <ul class="social-icons ">
 <li class="facebook"><a href="#">Facebook</a></li>
 <li class="linkedin"><a href="#">LinkedIn</a></li>
@@ -273,7 +272,7 @@
 </div>
 
 <p></div>
-<!-- 960 Container End --></p>
+<!-- Mentors section End --></p>
 <div class="row-fluid">
 <div class="headline marginbottom"><h4>Apache Flex Contributors</h4></div>
 </div>
@@ -346,15 +345,14 @@
 
 </div>
 
-<p></div>
-<div class="row-fluid margintop">
 <!-- About -->
+
 <div class="span3">
 <img src="images/staff-1.jpg" alt="" class="img-circle"/>
 <div class="staff"><h5>Chuck Mastrandrea</h5> <span><i class="icon-tag"></i> cmastrandrea</span></div>
-<div class="team-about"><p>Consectetur dolor ipsum quiam dolor adipisci velit, aenean at lorem vel est posuere feugiat sed quia noneas numquasa mode tempora incidunt ipsum.</p></div></p>
-<!-- Social Icons -->
+<div class="team-about"><p>Consectetur dolor ipsum quiam dolor adipisci velit, aenean at lorem vel est posuere feugiat sed quia noneas numquasa mode tempora incidunt ipsum.</p></div>
 
+<!-- Social Icons -->
 <ul class="social-icons ">
 <li class="facebook"><a href="#">Facebook</a></li>
 <li class="linkedin"><a href="#">LinkedIn</a></li>

Added: websites/staging/flex/trunk/content/v2/about-whatis.html
==============================================================================
--- websites/staging/flex/trunk/content/v2/about-whatis.html (added)
+++ websites/staging/flex/trunk/content/v2/about-whatis.html Tue Jan  8 04:40:07 2013
@@ -0,0 +1,282 @@
+<!DOCTYPE html>
+<!--[if IE 7 ]><html class="ie ie7" lang="en"><![endif]-->
+<!--[if IE 8 ]><html class="ie ie8" lang="en"><![endif]-->
+<!--[if (gte IE 9)|!(IE)]><!--><html lang="en"><!--<![endif]-->
+
+<head>
+
+    <meta charset="utf-8">
+    <title>Apache Flex® - About Apache Flex</title>
+
+    <!-- For Mobiles  -->
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link href='http://fonts.googleapis.com/css?family=Carrois+Gothic' rel='stylesheet' type='text/css'>
+    <!-- CSS -->
+    <link rel="stylesheet" type="text/css" href="css/bootstrap.css">
+    <link rel="stylesheet" type="text/css" href="css/fixed-width.css" id="layout">
+    <link rel="stylesheet" type="text/css" href="css/style.css">
+
+    <!-- Java Script  -->
+    <script src="js/jquery.js"></script>
+    <script src="js/custom.js"></script>
+    <script src="js/selectnav.js"></script>
+    <script src="js/flexslider.js"></script>
+    <script src="js/twitter.js"></script>
+    <script src="js/fancybox.js"></script>
+    <script src="js/isotope.js"></script>
+    <script src="js/bootstrap.js"></script>
+
+
+</head>
+<body>
+
+<!-- Wrapper Start -->
+<div id="wrapper" class="container-fluid">
+
+
+    <!-- Header -->
+
+
+    <div class="ie-dropdown-fix" >
+
+        <!-- Header -->
+        <div class="row-fluid" id="header">
+
+            <!-- Logo -->
+            <div class="span5">
+
+                <a href="#"><img src="images/logo_01_fullcolor-sm.png" alt="Apache Flex" title="Apache Flex" /></a>
+
+            </div>
+
+            <!-- Social / Contact -->
+            <div class="span3 pull-right">
+
+                <!-- Social Icons -->
+                <ul class="social-icons">
+                    <li class="facebook"><a href="https://www.facebook.com/pages/Apache-Flex/174249699342648">Facebook</a></li>
+                    <li class="twitter"><a href="http://twitter.com/ApacheFlex">Twitter</a></li>
+                    <li class="linkedin"><a href="http://www.linkedin.com/groups/Apache-Flex-Developers-4296888">LinkedIn</a></li>
+                </ul>
+
+                <!-- Apache Logo -->
+                <a href="http://www.apache.org" id="contact-top"><img src="http://www.apache.org/images/feather-small.gif" title="An Apache Project" alt="An Apache Project" /> </a>
+            </div>
+
+        </div>
+        <!-- Header / End -->
+
+        <!-- Navigation -->
+        <div id="navigation" class="margintop">
+            <ul id="nav">
+
+                <li><a href="index.html">Home</a></li>
+
+                <li><a href="#">About Flex</a>
+                    <ul>
+
+                        <li><a href="about-whatis.html">What is Flex?</a></li>
+                        <li><a href="about-licensing.html">License &amp; Trademarks</a></li>
+                        <li><a href="about-people.html">The Team</a></li>
+                        <li><a href="about-history.html">Project History</a></li>
+                        <li><a href="about-assets.html">Logo and Assets</a></li>
+                    </ul>
+                </li>
+                <li><a href="#">Community</a>
+                    <ul>
+
+                        <li><a href="about.html">How to get involved</a></li>
+                        <li><a href="about.html">Mailing Lists</a></li>
+                        <li><a href="about.html">Wiki</a></li>
+                        <li><a href="about.html">Blog</a></li>
+                    </ul>
+                </li>
+
+                <li><a href="#">Development</a>
+                    <ul>
+                        <li><a href="about.html">Source Code</a></li>
+                        <li><a href="about.html">Bug-Tracker</a></li>
+                        <li><a href="about.html">Developer FAQ</a></li>
+                    </ul>
+                </li>
+
+                <li><a href="#">Documentation</a>
+                    <ul>
+
+                        <li><a href="about.html">Getting Started</a></li>
+                        <li><a href="about.html">Videos</a></li>
+                        <li><a href="about.html">ASDocs</a></li>
+
+                    </ul>
+                </li>
+
+                <li><a href="#">The Apache Foundation</a>
+                    <ul>
+
+                        <li><a href="http://www.apache.org">Apache Website</a></li>
+                        <li><a href="http://www.apache.org/foundation/contributing.html">Donations</a></li>
+                        <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+                        <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+                    </ul>
+                </li>
+
+                <li><a href="#" class="download">Download</a>
+                    <ul>
+
+                        <li><a href="about.html">Download the SDK Installer (For Application Developers)</a></li>
+                        <li><a href="about.html">Download the SDK Binaries (For SDK Developers)</a></li>
+                        <li><a href="about.html">Download the SDK Source Code (For SDK Developers)</a></li>
+                        <li><a href="about.html">Download Utilities</a></li>
+                    </ul>
+                </li>
+            </ul>
+
+        </div>
+        <div class="nav-shadow"></div>
+        <div class="clear"></div>
+
+    </div>
+    <!-- Navigation / End -->
+
+
+    <!-- Content -->
+
+    
+    <div class="row-fluid">
+
+
+        <!-- Page Title -->
+        <div id="page-title">
+            <h2>About Apache Flex</h2>
+        </div>
+        <!-- Page Title / End -->
+
+
+    </div>
+    
+
+    <div class="row-fluid">
+
+
+
+<!-- Home Page Exception -->
+
+
+<!-- Standard Structure -->
+
+<div class="span8">
+    <div class="headline"><h4>What does it do?</h4></div>
+    Flex is a powerful, open source application framework that allows you to easily build mobile applications for iOS, Android™, and BlackBerry® Tablet OS devices, as well as traditional applications for browser and desktop using the same programming model, tool, and codebase.
+
+    <div class="headline"><h4>Enterprise-class programming model</h4></div>
+    Use constructs like strong typing, inheritance, and interfaces to program more efficiently. Extensive mobile and traditional components help speed development. Flex applications can access device capabilities such as GPS, accelerometer, camera, and local database.
+    Cross-platform and native experience
+    Create applications that run consistently across Android, BlackBerry Tablet OS, and iOS devices, as well as inside the browser and on traditional desktop computers. Although cross platform, with Flex you get an uncompromised native experience on each platform.
+    <div class="headline"><h4>End-to-end tooling</h4></div>
+    Build Flex applications more easily using Adobe Flash Builder, PowerFlasher FDT, Flash Develop or JetBrains IntelliJ. Productivity features in most IDEs include on-device debugging and mobile simulators for testing across screen sizes and resolutions.  You can even use our commnand-line tooling with your favorite text editor!
+    <div class="headline"><h4>Server integration</h4></div>
+    Integrate with all major back ends including Java™, Spring, Hibernate, PHP, Ruby, .NET, Adobe ColdFusion®, and SAP using industry standards such as REST, SOAP, JSON, JMS, and AMF.
+</div>
+
+<div class="span4">
+    <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 contibuting code, documentation, training or marketing, we are always looking for help.</p>
+        <button type="button" class="btn btn-inverse">Find out more</button>
+    </div>
+
+</div>
+
+<!-- Standard Structure End -->
+
+<p></div>
+<div class="row-fluid">
+    <div class="headline marginbottom"><h4>How it works</h4></div>
+    <p>some more text about how flex is compiled from AS3 / MXML into a finished project.<img src="images/howFlexWorks.png" alt="HowFlexWorks"></p>
+</div></p>
+<!-- 960 Container End -->
+
+<!-- Home Page Exception -->
+
+
+
+
+</div>
+<!-- Wrapper / End -->
+
+
+<!-- Footer -->
+
+<!-- Footer Top -->
+<div id="footer" class="container-fluid paddingbottom" >
+
+
+    <div class="row-fluid">
+
+        <!-- About -->
+        <div class="span3">
+            <div class="footer-headline"><h4>About Us</h4></div>
+            <p>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® applications.</p>
+        </div>
+
+        <!-- Subscribe  -->
+        <div class="span3">
+            <div class="footer-headline"><h4>Subscribe</h4></div>
+            <p>We have two mailing lists, one for SDK developers, and one SDK users.</p>
+            <p>Developers, send an email to <br>
+                dev-subscribe@flex.apache.org
+            </p>
+            <p>Users, send an email to <br>
+                users-subscribe@flex.apache.org
+            </p>
+        </div>
+
+        <!-- Photo Stream -->
+        <div class="span3">
+            <div class="footer-headline"><h4>Latest Releases</h4></div>
+            <p>Apache Flex SDK : 4.9.0 (Dec 2012)<br />
+                SDK Installer : 1.0.9 (Oct 2012)<br />
+                BlazeDS : 4.6.0 (Jan 2012)<br />
+                Flex Mavenizer : 4.9.0 (Jan 2013)</p>
+        </div>
+
+        <!-- Latest Tweets -->
+        <div class="span3">
+            <div class="footer-headline"><h4>Latest Tweets</h4></div>
+            <ul id="twitter"></ul>
+            <script type="text/javascript">
+                jQuery(document).ready(function($){
+                    $.getJSON('http://api.twitter.com/1/statuses/user_timeline/apacheflex.json?count=2&amp;callback=?', function(tweets){
+                        $("#twitter").html(tz_format_twitter(tweets));
+                    }); });
+            </script>
+            <div class="clear"></div>
+        </div>
+
+    </div>
+
+</div>
+<!-- Footer / Bottom -->
+<div id="footer" class="container-fluid" style="background: #111;">
+    <div class="row-fluid">
+        <div class="span12">
+            <div id="footer-bottom">
+                Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0 <br>
+                Apache Flex, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+
+                <div id="scroll-top-top"><a href="#" title="Go to Top"></a></div>
+            </div>
+        </div>
+    </div>
+
+</div>
+
+<!-- Footer / End -->
+
+
+</body>
+
+</html>
\ No newline at end of file

Modified: websites/staging/flex/trunk/content/v2/index.html
==============================================================================
--- websites/staging/flex/trunk/content/v2/index.html (original)
+++ websites/staging/flex/trunk/content/v2/index.html Tue Jan  8 04:40:07 2013
@@ -75,11 +75,11 @@
                 <li><a href="#">About Flex</a>
                     <ul>
 
-                        <li><a href="about.html">What is Flex?</a></li>
-                        <li><a href="about.html">License &amp; Trademarks</a></li>
+                        <li><a href="about-whatis.html">What is Flex?</a></li>
+                        <li><a href="about-licensing.html">License &amp; Trademarks</a></li>
                         <li><a href="about-people.html">The Team</a></li>
-                        <li><a href="about.html">Project History</a></li>
-                        <li><a href="about.html">Logo and Assets</a></li>
+                        <li><a href="about-history.html">Project History</a></li>
+                        <li><a href="about-assets.html">Logo and Assets</a></li>
                     </ul>
                 </li>
                 <li><a href="#">Community</a>