svn commit: r794693 - in /websites/production/wave: ./ content/wave/index.html

[yurize]

Author: yurize
Date: Sun Aug 21 18:39:31 2011
New Revision: 794693

Log:
Publishing merge to wave site by yurize

Modified:
    websites/production/wave/   (props changed)
    websites/production/wave/content/wave/index.html

Propchange: websites/production/wave/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 21 18:39:31 2011
@@ -1 +1 @@
-/websites/staging/wave/trunk:785678-788110
+/websites/staging/wave/trunk:785678-794692

Modified: websites/production/wave/content/wave/index.html
==============================================================================
--- websites/production/wave/content/wave/index.html (original)
+++ websites/production/wave/content/wave/index.html Sun Aug 21 18:39:31 2011
@@ -57,7 +57,9 @@
   
   <div id="content">
     <h1 class="title">Welcome to Apache Wave (incubating)</h1>
-    <p>Welcome to Apache Wave, where Wave development happens at Apache.  Wave 
is a rich, distributed,
+    <div style="float: right"><img 
src="http://incubator.apache.org/images/apache-incubator-logo.png";></div>
+
+<p>Welcome to Apache Wave, where Wave development happens at Apache.  Wave is 
a rich, distributed,
 near-real-time collaboration platform, which allows users to work together in 
new and exciting
 ways.  The main sub project of Apache Wave is "Wave in a Box", a stand alone 
wave server and rich
 web client that can serve as a Wave reference implementation.  As the project 
grows we hope to
@@ -67,6 +69,7 @@ infrastructure and community to Apache. 
 working hard over the next few weeks to publish more content.</p>
 <p>Currently a lot of good information can still be found here:</p>
 <p><a href="http://www.waveprotocol.org/";>http://www.waveprotocol.org</a></p>
+<p>Disclaimer: Apache Wave is an effort undergoing incubation at The Apache 
Software Foundation (ASF). 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>
   </div>
   
   <div id="footer">