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/05 16:11:52 UTC

svn commit: r845130 - in /websites/staging/flex/trunk: cgi-bin/ content/ content/installerbadge/

Author: buildbot
Date: Sat Jan  5 15:11:52 2013
New Revision: 845130

Log:
Staging update by buildbot for flex

Modified:
    websites/staging/flex/trunk/cgi-bin/   (props changed)
    websites/staging/flex/trunk/content/   (props changed)
    websites/staging/flex/trunk/content/about-binaries.html
    websites/staging/flex/trunk/content/developer-faqs.html
    websites/staging/flex/trunk/content/download.html
    websites/staging/flex/trunk/content/get-involved.html
    websites/staging/flex/trunk/content/index.html
    websites/staging/flex/trunk/content/installer-disclaimer.html
    websites/staging/flex/trunk/content/installer.html
    websites/staging/flex/trunk/content/installerbadge/disclaimer.html
    websites/staging/flex/trunk/content/license.html
    websites/staging/flex/trunk/content/logo-contest.html
    websites/staging/flex/trunk/content/logoassets.html
    websites/staging/flex/trunk/content/mailing-lists.html
    websites/staging/flex/trunk/content/news.html
    websites/staging/flex/trunk/content/source.html
    websites/staging/flex/trunk/content/team.html
    websites/staging/flex/trunk/content/timeline.html
    websites/staging/flex/trunk/content/trademarks.html
    websites/staging/flex/trunk/content/utilities.html

Propchange: websites/staging/flex/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jan  5 15:11:52 2013
@@ -1 +1 @@
-1429226
+1429306

Propchange: websites/staging/flex/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Jan  5 15:11:52 2013
@@ -1 +1 @@
-1429226
+1429306

Modified: websites/staging/flex/trunk/content/about-binaries.html
==============================================================================
--- websites/staging/flex/trunk/content/about-binaries.html (original)
+++ websites/staging/flex/trunk/content/about-binaries.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>About Apache Flex Binaries</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -78,18 +78,10 @@
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/developer-faqs.html
==============================================================================
--- websites/staging/flex/trunk/content/developer-faqs.html (original)
+++ websites/staging/flex/trunk/content/developer-faqs.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>Developer FAQs</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -105,18 +105,10 @@ PPMC's private mailing list.</li>
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/download.html
==============================================================================
--- websites/staging/flex/trunk/content/download.html (original)
+++ websites/staging/flex/trunk/content/download.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>Download Apache Flex</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -156,18 +156,10 @@
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/get-involved.html
==============================================================================
--- websites/staging/flex/trunk/content/get-involved.html (original)
+++ websites/staging/flex/trunk/content/get-involved.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>Get Involved</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -86,18 +86,10 @@ as easy as possible for people to get in
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/index.html
==============================================================================
--- websites/staging/flex/trunk/content/index.html (original)
+++ websites/staging/flex/trunk/content/index.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>Apache Flex®</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -105,18 +105,10 @@
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/installer-disclaimer.html
==============================================================================
--- websites/staging/flex/trunk/content/installer-disclaimer.html (original)
+++ websites/staging/flex/trunk/content/installer-disclaimer.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>Apache Flex Installer Disclaimer</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -69,18 +69,10 @@
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/installer.html
==============================================================================
--- websites/staging/flex/trunk/content/installer.html (original)
+++ websites/staging/flex/trunk/content/installer.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>Apache Flex SDK Installer</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -92,18 +92,10 @@
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/installerbadge/disclaimer.html
==============================================================================
--- websites/staging/flex/trunk/content/installerbadge/disclaimer.html (original)
+++ websites/staging/flex/trunk/content/installerbadge/disclaimer.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>Apache Flex Installer Badge Disclaimer</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -70,18 +70,10 @@
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/license.html
==============================================================================
--- websites/staging/flex/trunk/content/license.html (original)
+++ websites/staging/flex/trunk/content/license.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>Apache License</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -244,18 +244,10 @@ identification within third-party archiv
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/logo-contest.html
==============================================================================
--- websites/staging/flex/trunk/content/logo-contest.html (original)
+++ websites/staging/flex/trunk/content/logo-contest.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>Apache Flex Re-branding Initiative</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -422,18 +422,10 @@ Apache Flex project according to the Apa
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/logoassets.html
==============================================================================
--- websites/staging/flex/trunk/content/logoassets.html (original)
+++ websites/staging/flex/trunk/content/logoassets.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>Apache Flex Logo and Assets</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -78,18 +78,10 @@
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/mailing-lists.html
==============================================================================
--- websites/staging/flex/trunk/content/mailing-lists.html (original)
+++ websites/staging/flex/trunk/content/mailing-lists.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>Mailing Lists</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -120,18 +120,10 @@ strictly for future version of Apache Fl
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/news.html
==============================================================================
--- websites/staging/flex/trunk/content/news.html (original)
+++ websites/staging/flex/trunk/content/news.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>Apache Flex -- News Archive</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -223,18 +223,10 @@
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/source.html
==============================================================================
--- websites/staging/flex/trunk/content/source.html (original)
+++ websites/staging/flex/trunk/content/source.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>Source Control</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -105,18 +105,10 @@
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/team.html
==============================================================================
--- websites/staging/flex/trunk/content/team.html (original)
+++ websites/staging/flex/trunk/content/team.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>The Apache Flex Team</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -129,18 +129,10 @@
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/timeline.html
==============================================================================
--- websites/staging/flex/trunk/content/timeline.html (original)
+++ websites/staging/flex/trunk/content/timeline.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>Apache Flex Incubation Timeline</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -147,18 +147,10 @@ mailing list, as per the <a href="http:/
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/trademarks.html
==============================================================================
--- websites/staging/flex/trunk/content/trademarks.html (original)
+++ websites/staging/flex/trunk/content/trademarks.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>Apache Flex Trademarks</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -120,18 +120,10 @@ approval.</p>
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>

Modified: websites/staging/flex/trunk/content/utilities.html
==============================================================================
--- websites/staging/flex/trunk/content/utilities.html (original)
+++ websites/staging/flex/trunk/content/utilities.html Sat Jan  5 15:11:52 2013
@@ -1,7 +1,7 @@
 <!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">
+<link href="/flex/css/flex.css" rel="stylesheet" type="text/css">
 
 <title>Apache Flex SDK Utilities</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,9 @@
 
 <body>
   <div id="bannera">
-    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex (Incubating)" src="/images/flex.png"/></div>
+    <div id="bannerleft"><img id="flex-logo" alt="Apache Flex" src="/flex/images/flex.png"/></div>
     <div id="bannerright">
-      <a title="Apache Incubator" href="http://incubator.apache.org"><img id="asf-logo" alt="Apache Incubator" src="/images/apache-incubator-logo.png"/></a>
+      <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>
@@ -114,18 +114,10 @@ The following utilities are available to
   </div>
 
   <div id="footera">
-    <div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
     <div id="copyrighta">
-      <p>
-	Apache Flex is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
-	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
-	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
-	yet to be fully endorsed by the ASF.</p>
-      <p>
-	<a href="/license.html">Copyright &amp; License</a>
-	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-	Other names appearing on the site may be trademarks of their respective owners.
+      <p>Copyright © 2012 The Apache Software Foundation, Licensed under the 
+	<a href="http://flex.apache.org/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>