Author: buildbot
Date: Tue Jun 12 15:59:10 2012
New Revision: 821452

Log:
Staging update by buildbot for wave

Added:
    websites/staging/wave/trunk/content/wave/images/
    websites/staging/wave/trunk/content/wave/images/OpenWaveLogo.png   (with 
props)
    websites/staging/wave/trunk/content/wave/images/body_bg.jpg   (with props)
    websites/staging/wave/trunk/content/wave/images/wiab_screenshot.jpg   (with 
props)
Modified:
    websites/staging/wave/trunk/content/   (props changed)
    websites/staging/wave/trunk/content/wave/about.html
    websites/staging/wave/trunk/content/wave/css/wave.css
    websites/staging/wave/trunk/content/wave/demo-servers.html
    websites/staging/wave/trunk/content/wave/get-involved.html
    
websites/staging/wave/trunk/content/wave/getting-started/building-wave-in-a-box.html
    websites/staging/wave/trunk/content/wave/getting-started/setting-up.html
    websites/staging/wave/trunk/content/wave/index.html
    websites/staging/wave/trunk/content/wave/mailing-lists.html
    websites/staging/wave/trunk/content/wave/people.html
    websites/staging/wave/trunk/content/wave/source-code.html

Propchange: websites/staging/wave/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 12 15:59:10 2012
@@ -1 +1 @@
-1342474
+1349407

Modified: websites/staging/wave/trunk/content/wave/about.html
==============================================================================
--- websites/staging/wave/trunk/content/wave/about.html (original)
+++ websites/staging/wave/trunk/content/wave/about.html Tue Jun 12 15:59:10 2012
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <html>
-<head>
+  <head>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,15 +18,22 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-
   <link href="/wave/css/wave.css" rel="stylesheet" type="text/css">
-  <title>Apache Wave - About Apache Wave</title>
+  <title>Apache Wave - Welcome to Apache Wave (incubating)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="navigation"> 
-  <h1 id="general">General</h1>
+  </head>
+  <body>
+    <div id="wrapper">
+      <div id="header" style="vertical-align: middle">
+        <img style="float: left;" id="header-logo" 
src="/wave/images/OpenWaveLogo.png"/>
+        <div style="margin-left: 154px; padding-left: 10px; dvertical-align: 
middle; height: 120px;">
+          <span style="position: relative; top: 25%">Apache Wave 
(Incubating)</span>
+        </div>
+        <div style="clear:both;"></div>
+      </div>
+      <div id="main">
+        <div id="navigation">
+        <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">Home</a></li>
 <li><a href="about.html">About</a></li>
@@ -46,18 +53,16 @@
 <li><a href="https://cwiki.apache.org/WAVE/";>Wiki</a></li>
 <li><a href="demo-servers.html">Demo Servers</a></li>
 </ul>
-<h1 id="apache_foundation">Apache Foundation</h1>
+<h1 id="apache-foundation">Apache Foundation</h1>
 <ul>
 <li><a href="http://www.apache.org";>Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsor</a></li>
 <li><a href="http://www.apache.org/security/";>Security</a></li>
 </ul>
-  </div>
-  
-  <div id="content">
-    <h1 class="title">About Apache Wave</h1>
-    <h1 id="overview">Overview</h1>
+        </div>
+        <div id="content">
+        <h1 id="overview">Overview</h1>
 <p>Wave a real-time communication and collaboration tool. Wave in a Box
 (WIAB) is a server that hosts and federates waves, supports extensive
 APIs, and provides a rich web client. This project also includes an
@@ -74,15 +79,15 @@ collaboration systems, such as multiple 
 <p>One of the fundamentally technologies that enables the Wave Protocol to 
work is the idea of “<a 
href="http://en.wikipedia.org/wiki/Operational_transformation";>Operational 
Transformations</a>” Essentially a method to keep document changes in sync 
while spread over a network, invented by C. Ellis and S. Gibbs.
 While it is not the intention of this document to explain how OT works, or its 
full history, you can read a good technical explanation <a 
href="http://www.codecommit.com/blog/java/understanding-and-applying-operational-transformation";>here</a>;<br
 />
 </p>
-<h3 id="google_wave_2009">Google Wave (2009)</h3>
+<h3 id="google-wave-2009">Google Wave (2009)</h3>
 <p>Originally unveiled at a <a 
href="http://en.wikipedia.org/wiki/Google_I/O";>Google I/O</a> conference in May 
2009, Google Wave was Google's attempt to create integrated messaging system 
allowing real-time sharing of messages between selective groups of people. It 
communicated using the open “Wave Federation Protocol” with the intention 
that it could one day replace email, with many companies hosting their owns 
servers and exchanging messages with each-other seamlessly.
 This being a distinct advantage over other systems to selective share 
information, which almost all require the people communicating to hold accounts 
with the same company's server. (eg, Facebook, Google Plus)
 Google Wave was technically composed of 3 main parts, much of which was open 
source;</p>
-<h3 id="the_wave_federation_protocol">The Wave Federation Protocol</h3>
+<h3 id="the-wave-federation-protocol">The Wave Federation Protocol</h3>
 <p>The server to server protocol by which the messages were exchanged. Only 
the changes necessary to reproduce the new document were exchanged - making it 
somewhat more efficient then email for larger documents. (especially as 
traditional email systems keep a copy of each reply inline below with each new 
post, duplicating the total storage required by the servers many times).
 The other important difference when comparing WFP to traditional communication 
systems is that the user is granted access to the information- the messages 
arnt literally sent between users. (ie, a message “sent” to 10 users still 
only has one copy - as apposed to 10 different copys on 10 different user 
accounts).
 The WFP is built upon XMPP, itself a already well established protocol. It 
uses Operational Transformations to keep in realtime sync with other servers 
hosted elsewhere.</p>
-<h3 id="+google_wave+_client">“Google Wave” (client)</h3>
+<h3 id="google-wave-client">“Google Wave” (client)</h3>
 <p>The client end of Google Wave was a web based interface to connect to a 
Wave server. It was built using aspects of HTML5, a new version of Google GWT, 
as well as relatively new technologies such as WebSockets. A combination of 
these things produced a pretty impressive...but sadly initially unstable, end 
client for the users to work with.
 This front end of Google Wave is what most people came to think of as the Wave 
project, but its important to understand this was just one possible interface - 
and the underlyeing Wave Federation Protocol, and server’s that supported it, 
were in many ways the more revolutionary part of the project.
 FedOne
@@ -90,22 +95,21 @@ Allthough Googles own server was never r
 At the time of writing there is still a few amateur FedOne servers in 
operation, although many have switched to Wave In a Box, which is the new 
Apache lead server based on its code.
 Google Wave received much praise for potential use’s and technical 
innovation, however bugs in early versions combined with a many people not 
quite understanding the advantages also lead to much criticism. Google Wave was 
never advertised much by Google beyond their own blog, which possibly also 
contributed to it not catching on as well as they had hoped.</p>
 <p>Google stopped developing Wave On August 4, 2010, citing slow uptake 
amongst users as the reason.</p>
-<h3 id="apache_wave_2010">Apache Wave (2010)</h3>
+<h3 id="apache-wave-2010">Apache Wave (2010)</h3>
 <p>After Google announced they were going to stop developing Wave, it was 
handed over to the  Apache Software Foundation, with the intention of 
continuing to develop it into a usable protocol with easy to implement servers 
- hopefully sparking a whole ecosystem of wave based clients and servers all 
using the WFP protocol.
 Apache Waves main focus has been developing the Wave-In-A-Box project, 
designed to be a wave server that is relatively easy to install and run. While 
it is based on the FedOne source code released by Google, there has since been 
a lot of development.
 The WIAB has a working webclient, an example of which can be found at <a 
href="http://waveinabox.net";>http://waveinabox.net</a>.</p>
-  </div>
-  
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2010 The Apache Software Foundation, Licensed under 
+        </div>
+        <div style="clear: both;"></div>
+      </div>
+      <div id="footer">
+        <div class="copyright">
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
         the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
         <br />
         Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
-      </p>
+        </div>
+      </div>
     </div>
-  </div>
-  
-</body>
+  </body>
 </html>

Modified: websites/staging/wave/trunk/content/wave/css/wave.css
==============================================================================
--- websites/staging/wave/trunk/content/wave/css/wave.css (original)
+++ websites/staging/wave/trunk/content/wave/css/wave.css Tue Jun 12 15:59:10 
2012
@@ -3,6 +3,31 @@ body {
   font-family: Arial,Helvetica,sans-serif;
   font-size: 11pt;
   margin: 0;
+  background: url(/wave/images/body_bg.jpg) repeat;
+  padding: 10px;
+}
+
+#wrapper {
+  width: 950px;
+  margin: auto;
+  border: 1px solid #7C7D7E;
+}
+
+#header {
+  background: #2485B3;
+  color: #FFF;
+  font-size: 24pt;
+  border-bottom: 1px solid #7C7D7E;
+}
+
+#header-logo {
+  vertical-align: middle;
+}
+
+#main {
+  background: #FFF;
+  color: black;
+  padding: 0px; 
 }
 
 a {
@@ -24,26 +49,20 @@ h1,h2,h3,h4,h5,h6 {
 }
 
 #content {
- margin-top: 15px;
- margin-left: 200px;
- margin-right: 200px;
- padding: 0 8px 40px;
- color: black;
- background: white;
+  margin-right: 200px;
+  padding: 10px;
+  text-align: justify;
 }
 
 #content h1,h2,h3,h4,h5,h6 {
-  color: #955500;
-  border-bottom: 1px solid #73ace5;
+  color: black;
   font-weight: normal;
-  margin: 10px 0 15px;
-  padding: 5px 0;
 }
 
 #content h1 {
-  font-size: 18pt;
-  border: 1px solid #73ace5;
-  padding: 15px;
+  font: normal 3em "Lucida Grande", Geneva, Verdana, Arial, Helvetica, 
sans-serif;
+  color: #333;
+  font-size: 24pt;
 }
 
 #content h2 {
@@ -61,12 +80,12 @@ h1,h2,h3,h4,h5,h6 {
   border: 1px solid #73ace5;
   font-size: 85%;
   color: #003;
-  float: left;
+  float: right;
   padding: 8px;
   width: 160px;
   background: white;
-  margin-left: 10px;
-  margin-right: 10px;
+  margin: 10px;
+
 }
 
 #navigation img {
@@ -112,15 +131,11 @@ h1,h2,h3,h4,h5,h6 {
 }
 
 #footer {
-  margin-top: 15px;
-  margin-left: 200px;
-  margin-right: 200px;
-  border: 1px solid #73ace5;
-
+  border-top: 1px solid #7C7D7E;
   background-color:#b0b0b0;
-  color:#336;
+  color:#000;
   font-size: 80%;
-  padding: 0 8px;
+  padding: 8px;
 }
 
 /* definition lists */

Modified: websites/staging/wave/trunk/content/wave/demo-servers.html
==============================================================================
--- websites/staging/wave/trunk/content/wave/demo-servers.html (original)
+++ websites/staging/wave/trunk/content/wave/demo-servers.html Tue Jun 12 
15:59:10 2012
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <html>
-<head>
+  <head>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,15 +18,22 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-
   <link href="/wave/css/wave.css" rel="stylesheet" type="text/css">
-  <title>Apache Wave - Wave Servers</title>
+  <title>Apache Wave - Welcome to Apache Wave (incubating)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="navigation"> 
-  <h1 id="general">General</h1>
+  </head>
+  <body>
+    <div id="wrapper">
+      <div id="header" style="vertical-align: middle">
+        <img style="float: left;" id="header-logo" 
src="/wave/images/OpenWaveLogo.png"/>
+        <div style="margin-left: 154px; padding-left: 10px; dvertical-align: 
middle; height: 120px;">
+          <span style="position: relative; top: 25%">Apache Wave 
(Incubating)</span>
+        </div>
+        <div style="clear:both;"></div>
+      </div>
+      <div id="main">
+        <div id="navigation">
+        <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">Home</a></li>
 <li><a href="about.html">About</a></li>
@@ -46,39 +53,36 @@
 <li><a href="https://cwiki.apache.org/WAVE/";>Wiki</a></li>
 <li><a href="demo-servers.html">Demo Servers</a></li>
 </ul>
-<h1 id="apache_foundation">Apache Foundation</h1>
+<h1 id="apache-foundation">Apache Foundation</h1>
 <ul>
 <li><a href="http://www.apache.org";>Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsor</a></li>
 <li><a href="http://www.apache.org/security/";>Security</a></li>
 </ul>
-  </div>
-  
-  <div id="content">
-    <h1 class="title">Wave Servers</h1>
-    <p>Several members of the Apache Wave community have graciously set up 
Wave in a Box servers to show the
+        </div>
+        <div id="content">
+        <h1 id="demo-servers">Demo Servers</h1>
+<p>Several members of the Apache Wave community have graciously set up Wave in 
a Box servers to show the
 progress of the project and to allow the internet at large to experience wave. 
 Please keep in mind that these
 servers are maintained in people spare time.  Also note that we try to keep 
them fairly up to date and running
 the latest code.  As such there might be bleeding edge functionality with 
varying degree's of stability.</p>
-<h2 id="demo_wave_in_a_box_servers">Demo Wave in a Box Servers</h2>
+<h2 id="demo-wave-in-a-box-servers">Demo Wave in a Box Servers</h2>
 <ul>
 <li><a href="http://waveinabox.net";>http://waveinabox.net</a></li>
-<li><a 
href="http://collaborynth.com.au:9898";>http://collaborynth.com.au:9898</a></li>
-<li><a 
href="http://demo.wave-in-a-box.org";>http://demo.wave-in-a-box.org</a></li>
+<li><a href="http://wave.macfadden.org";>http://wave.macfadden.org</a></li>
 </ul>
-  </div>
-  
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2010 The Apache Software Foundation, Licensed under 
+        </div>
+        <div style="clear: both;"></div>
+      </div>
+      <div id="footer">
+        <div class="copyright">
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
         the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
         <br />
         Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
-      </p>
+        </div>
+      </div>
     </div>
-  </div>
-  
-</body>
+  </body>
 </html>

Modified: websites/staging/wave/trunk/content/wave/get-involved.html
==============================================================================
--- websites/staging/wave/trunk/content/wave/get-involved.html (original)
+++ websites/staging/wave/trunk/content/wave/get-involved.html Tue Jun 12 
15:59:10 2012
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <html>
-<head>
+  <head>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,15 +18,22 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-
   <link href="/wave/css/wave.css" rel="stylesheet" type="text/css">
-  <title>Apache Wave - Get Involved</title>
+  <title>Apache Wave - Welcome to Apache Wave (incubating)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="navigation"> 
-  <h1 id="general">General</h1>
+  </head>
+  <body>
+    <div id="wrapper">
+      <div id="header" style="vertical-align: middle">
+        <img style="float: left;" id="header-logo" 
src="/wave/images/OpenWaveLogo.png"/>
+        <div style="margin-left: 154px; padding-left: 10px; dvertical-align: 
middle; height: 120px;">
+          <span style="position: relative; top: 25%">Apache Wave 
(Incubating)</span>
+        </div>
+        <div style="clear:both;"></div>
+      </div>
+      <div id="main">
+        <div id="navigation">
+        <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">Home</a></li>
 <li><a href="about.html">About</a></li>
@@ -46,39 +53,57 @@
 <li><a href="https://cwiki.apache.org/WAVE/";>Wiki</a></li>
 <li><a href="demo-servers.html">Demo Servers</a></li>
 </ul>
-<h1 id="apache_foundation">Apache Foundation</h1>
+<h1 id="apache-foundation">Apache Foundation</h1>
 <ul>
 <li><a href="http://www.apache.org";>Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsor</a></li>
 <li><a href="http://www.apache.org/security/";>Security</a></li>
 </ul>
-  </div>
-  
-  <div id="content">
-    <h1 class="title">Get Involved</h1>
-    <p>Thanks for your interest in Apache Wave. </p>
-<p>We encourage discussions of the code, protocols, and documentation on the
-<a href="mailing-lists.html">Wave Developer mailing list</a>.</p>
-<p>We welcome patches to the code. If you're looking for something to work on, 
check the starter projects wiki. 
-When your patch is ready, put it on the Review Board at <a 
href="https://reviews.apache.org/dashboard/";>https://reviews.apache.org/dashboard/</a>
 and request code review.<br />
-You can submit the patch either for the Wave SVN repo (wave) or the Wave Git 
mirror repo (wave-git).<br />
-Right now we are in the process of migrating documentation from
+        </div>
+        <div id="content">
+        <h1 id="getting-invovled">Getting Invovled</h1>
+<p>Thanks for your interest in Apache Wave.  We are only as strong as our 
community and we always
+welcome contribution from new participants.</p>
+<h2 id="basics">Basics</h2>
+<p>The first step in getting involved to to joing the <a 
href="mailing-lists.html">Wave Developer mailing list</a>.<br />
+It is here where we discuss the code, protocols design, plans for the future, 
and the health of the 
+community.  There are many ways to get involved including:</p>
+<ul>
+<li>Code Development</li>
+<li>Documentation</li>
+<li>Requriements Discussion</li>
+<li>User Feedback</li>
+<li>Design</li>
+<li>Helping with the web site.</li>
+<li>Etc...</li>
+</ul>
+<h2 id="coding">Coding</h2>
+<p>We welcome patches to the code. If you're looking for something to work 
on:</p>
+<ul>
+<li>Check out our open issues in the <a 
href="https://issues.apache.org/jira/browse/WAVE";>Issue Tracker</a>.</li>
+<li>If you want to work on something not listed here, go ahead.  You can even 
add an issue if you like.</li>
+<li>If you need help, don't hesitate to ask for it on the mailing list.</li>
+<li>When your patch is ready, put it on the Review Board at <a 
href="https://reviews.apache.org/dashboard/";>https://reviews.apache.org/dashboard/</a>
 and request code review.<br />
+</li>
+<li>You can submit the patch either for the Wave SVN repo (wave) or the Wave 
Git mirror repo (wave-git).</li>
+</ul>
+<h2 id="documentation">Documentation</h2>
+<p>Right now we are in the process of migrating documentation from
 <a href="http://www.waveprotocol.org/";>waveprotocol.org</a> and the
 <a href="http://code.google.com/p/wave-protocol/";>wave-protocol Google Code 
site</a> to this website and
 our wiki. All help is welcome.</p>
-  </div>
-  
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2010 The Apache Software Foundation, Licensed under 
+        </div>
+        <div style="clear: both;"></div>
+      </div>
+      <div id="footer">
+        <div class="copyright">
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
         the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
         <br />
         Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
-      </p>
+        </div>
+      </div>
     </div>
-  </div>
-  
-</body>
+  </body>
 </html>

Modified: 
websites/staging/wave/trunk/content/wave/getting-started/building-wave-in-a-box.html
==============================================================================
--- 
websites/staging/wave/trunk/content/wave/getting-started/building-wave-in-a-box.html
 (original)
+++ 
websites/staging/wave/trunk/content/wave/getting-started/building-wave-in-a-box.html
 Tue Jun 12 15:59:10 2012
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <html>
-<head>
+  <head>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,15 +18,22 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-
   <link href="/wave/css/wave.css" rel="stylesheet" type="text/css">
-  <title>Apache Wave - Building Wave In A Box</title>
+  <title>Apache Wave - Welcome to Apache Wave (incubating)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="navigation"> 
-  <h1 id="general">General</h1>
+  </head>
+  <body>
+    <div id="wrapper">
+      <div id="header" style="vertical-align: middle">
+        <img style="float: left;" id="header-logo" 
src="/wave/images/OpenWaveLogo.png"/>
+        <div style="margin-left: 154px; padding-left: 10px; dvertical-align: 
middle; height: 120px;">
+          <span style="position: relative; top: 25%">Apache Wave 
(Incubating)</span>
+        </div>
+        <div style="clear:both;"></div>
+      </div>
+      <div id="main">
+        <div id="navigation">
+        <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">Home</a></li>
 <li><a href="about.html">About</a></li>
@@ -46,23 +53,21 @@
 <li><a href="https://cwiki.apache.org/WAVE/";>Wiki</a></li>
 <li><a href="demo-servers.html">Demo Servers</a></li>
 </ul>
-<h1 id="apache_foundation">Apache Foundation</h1>
+<h1 id="apache-foundation">Apache Foundation</h1>
 <ul>
 <li><a href="http://www.apache.org";>Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsor</a></li>
 <li><a href="http://www.apache.org/security/";>Security</a></li>
 </ul>
-  </div>
-  
-  <div id="content">
-    <h1 class="title">Building Wave In A Box</h1>
-    <p>Now that you have your build environment setup, we can move onto 
actually building the Wave In A Box source.</p>
+        </div>
+        <div id="content">
+        <p>Now that you have your build environment setup, we can move onto 
actually building the Wave In A Box source.</p>
 <h1 id="windows">Windows</h1>
 <p>Once you have the source and all of the tools installed, open up a Command 
shell and do the following:</p>
 <blockquote>
-<p>set JAVA_HOME=c:Program FilesJavajdk[YOUR_VERSION]
-set ANT=c:Program Fileswinantbinant
+<p>set JAVA_HOME=c:\Program Files\Java\jdk[YOUR_VERSION]
+set ANT=c:\Program Files\winant\bin\ant
 cd [THE_FULL_PATH_TO]wave-protocol
 ANT</p>
 </blockquote>
@@ -82,25 +87,24 @@ ANT</p>
 <blockquote>
 <p>$: ant clean; ant</p>
 </blockquote>
-<h1 id="end_result">End Result</h1>
+<h1 id="end-result">End Result</h1>
 <p>At the end of the build process you should have the following files in the 
dist directory under the wave-protocol directory:</p>
 <ul>
 <li>waveinabox-client-console-0.3.jar</li>
 <li>waveinabox-server-0.3.jar</li>
 </ul>
 <p>If you don't then go back and check the build process, something probably 
broke</p>
-  </div>
-  
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2010 The Apache Software Foundation, Licensed under 
+        </div>
+        <div style="clear: both;"></div>
+      </div>
+      <div id="footer">
+        <div class="copyright">
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
         the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
         <br />
         Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
-      </p>
+        </div>
+      </div>
     </div>
-  </div>
-  
-</body>
+  </body>
 </html>

Modified: 
websites/staging/wave/trunk/content/wave/getting-started/setting-up.html
==============================================================================
--- websites/staging/wave/trunk/content/wave/getting-started/setting-up.html 
(original)
+++ websites/staging/wave/trunk/content/wave/getting-started/setting-up.html 
Tue Jun 12 15:59:10 2012
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <html>
-<head>
+  <head>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,15 +18,22 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-
   <link href="/wave/css/wave.css" rel="stylesheet" type="text/css">
-  <title>Apache Wave - Setting Up</title>
+  <title>Apache Wave - Welcome to Apache Wave (incubating)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="navigation"> 
-  <h1 id="general">General</h1>
+  </head>
+  <body>
+    <div id="wrapper">
+      <div id="header" style="vertical-align: middle">
+        <img style="float: left;" id="header-logo" 
src="/wave/images/OpenWaveLogo.png"/>
+        <div style="margin-left: 154px; padding-left: 10px; dvertical-align: 
middle; height: 120px;">
+          <span style="position: relative; top: 25%">Apache Wave 
(Incubating)</span>
+        </div>
+        <div style="clear:both;"></div>
+      </div>
+      <div id="main">
+        <div id="navigation">
+        <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">Home</a></li>
 <li><a href="about.html">About</a></li>
@@ -46,18 +53,16 @@
 <li><a href="https://cwiki.apache.org/WAVE/";>Wiki</a></li>
 <li><a href="demo-servers.html">Demo Servers</a></li>
 </ul>
-<h1 id="apache_foundation">Apache Foundation</h1>
+<h1 id="apache-foundation">Apache Foundation</h1>
 <ul>
 <li><a href="http://www.apache.org";>Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsor</a></li>
 <li><a href="http://www.apache.org/security/";>Security</a></li>
 </ul>
-  </div>
-  
-  <div id="content">
-    <h1 class="title">Setting Up</h1>
-    <p>Before we can start exploring Wave In A Box we need to setup our 
development environment. For this we need to fill the following 
requirements:</p>
+        </div>
+        <div id="content">
+        <p>Before we can start exploring Wave In A Box we need to setup our 
development environment. For this we need to fill the following 
requirements:</p>
 <ul>
 <li>Java JDK - Either Sun/Oracle JDK or Open JDK both appear to work</li>
 <li>ANT Build tool</li>
@@ -74,31 +79,31 @@
 </ul>
 <h1 id="windows">Windows</h1>
 <p>While Windows isn't the native development platform for WIAB (most 
development has been done either on Linux or OSX) it is possible to build and 
run the server. Before we can do this however we need to do a bit more work in 
setting up the build environment.</p>
-<h2 id="create_development_home">Create Development Home</h2>
+<h2 id="create-development-home">Create Development Home</h2>
 <p>Create a directory called wave-devel. Under this directory create a 
directory called dependencies. This will be where you download your build tools 
and requirements too.</p>
-<h2 id="java_jdk">Java JDK</h2>
+<h2 id="java-jdk">Java JDK</h2>
 <p>First things first, we need to get the latest version of the Java JDK 
(without which we won't be able to do anything else). Visit the following 
link:</p>
 <p><a 
href="http://java.sun.com/javase/downloads/index.jsp";>http://java.sun.com/javase/downloads/index.jsp</a></p>
 <p>And select the most up to date version of the Java SE Development Kit (this 
will also include the Java Runtime Environment). Go through the process of 
downloading and installing the JDK.</p>
-<h2 id="ant_build_tool">ANT Build Tool</h2>
+<h2 id="ant-build-tool">ANT Build Tool</h2>
 <p>The WIAB project uses Apaches ANT Build process in place of say, GNU Make. 
While there are a number of ant implementations for Windows, I've found the 
following to be the easiest to use:</p>
 <p><a 
href="http://code.google.com/p/winant";>http://code.google.com/p/winant</a> </p>
-<h2 id="mercurial_distributed_source_control_package">Mercurial Distributed 
Source Control Package</h2>
+<h2 id="mercurial-distributed-source-control-package">Mercurial Distributed 
Source Control Package</h2>
 <p>For Windows I recommend the TortoiseHG project. It integrates with Explorer 
and is pretty easy to use. To get TortoiseHG visit the following site:</p>
 <p><a 
href="http://bitbucket.org/tortoisehg/stable/wiki/Home";>http://bitbucket.org/tortoisehg/stable/wiki/Home</a></p>
 <h2 id="eclipse">Eclipse</h2>
 <p>The IDE of choice for developing WIAB is IBM's Eclipse project. Eclipse is 
an open source, extendable Java based IDE. To get the latest version visit 
here:</p>
 <p><a 
href="http://www.eclipse.org/downloads/";>http://www.eclipse.org/downloads/</a></p>
 <p>And select "Eclipse IDE for Java Developers"</p>
-<h2 id="mongodb_optional">MongoDB (optional)</h2>
+<h2 id="mongodb-optional">MongoDB (optional)</h2>
 <p><a 
href="http://www.mongodb.org/downloads";>http://www.mongodb.org/downloads</a></p>
 <p>The easiest option is to download the 32 bit version, this will work on 
either 32bit or 64bit windows.</p>
 <p>Once it has been downloaded, unzip the package into the dependencies 
directory and rename it to mongodb.</p>
 <p>Before we can start the server we need to setup the data directories. Under 
the c drive create the following directories:</p>
-<p>c:data
-c:datadb</p>
-<p>To start the server browse to the mongodbbin directory and double click on 
the mongod.exe file.</p>
-<h2 id="wave_in_a_box_source">Wave In A Box Source</h2>
+<p>c:\data
+c:\data\db</p>
+<p>To start the server browse to the mongodb\bin directory and double click on 
the mongod.exe file.</p>
+<h2 id="wave-in-a-box-source">Wave In A Box Source</h2>
 <p>Finally the last step in setting up our build environment is the source 
itself. To obtain the WIAB source we do the following:</p>
 <ul>
 <li>Create a directory called Wave-Devel</li>
@@ -125,9 +130,9 @@ $: cd wave-development
 $: hg clone https://wave-protocol.googlecode.com/hg/ wave-protocol</p>
 </blockquote>
 <h1 id="macosx">MacOSX</h1>
-<h2 id="create_your_build_directory">Create your build directory</h2>
+<h2 id="create-your-build-directory">Create your build directory</h2>
 <p>Before we can do anything else, we need to create our development home. 
Create the wave-devel directory and under that the dependencies directory.</p>
-<h2 id="java_jdk_1">Java JDK</h2>
+<h2 id="java-jdk_1">Java JDK</h2>
 <p>Where Microsoft long abandoned the idea of a custom build of the Java JDK 
for their platform, Apple has persisted. This means that every OSX install 
should already have the JDK installed and ready to use.</p>
 <p>This also includes the ANT build tool.</p>
 <p>Note this practice will be discontinued in later versions of OSX.</p>
@@ -153,18 +158,17 @@ $: hg clone https://wave-protocol.google
 $: cd wave-development
 $: hg clone https://wave-protocol.googlecode.com/hg/ wave-protocol</p>
 </blockquote>
-  </div>
-  
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2010 The Apache Software Foundation, Licensed under 
+        </div>
+        <div style="clear: both;"></div>
+      </div>
+      <div id="footer">
+        <div class="copyright">
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
         the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
         <br />
         Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
-      </p>
+        </div>
+      </div>
     </div>
-  </div>
-  
-</body>
+  </body>
 </html>

Added: websites/staging/wave/trunk/content/wave/images/OpenWaveLogo.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/wave/trunk/content/wave/images/OpenWaveLogo.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/staging/wave/trunk/content/wave/images/body_bg.jpg
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/wave/trunk/content/wave/images/body_bg.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Added: websites/staging/wave/trunk/content/wave/images/wiab_screenshot.jpg
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/wave/trunk/content/wave/images/wiab_screenshot.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Modified: websites/staging/wave/trunk/content/wave/index.html
==============================================================================
--- websites/staging/wave/trunk/content/wave/index.html (original)
+++ websites/staging/wave/trunk/content/wave/index.html Tue Jun 12 15:59:10 2012
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <html>
-<head>
+  <head>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,15 +18,22 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-
   <link href="/wave/css/wave.css" rel="stylesheet" type="text/css">
   <title>Apache Wave - Welcome to Apache Wave (incubating)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="navigation"> 
-  <h1 id="general">General</h1>
+  </head>
+  <body>
+    <div id="wrapper">
+      <div id="header" style="vertical-align: middle">
+        <img style="float: left;" id="header-logo" 
src="/wave/images/OpenWaveLogo.png"/>
+        <div style="margin-left: 154px; padding-left: 10px; dvertical-align: 
middle; height: 120px;">
+          <span style="position: relative; top: 25%">Apache Wave 
(Incubating)</span>
+        </div>
+        <div style="clear:both;"></div>
+      </div>
+      <div id="main">
+        <div id="navigation">
+        <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">Home</a></li>
 <li><a href="about.html">About</a></li>
@@ -46,43 +53,56 @@
 <li><a href="https://cwiki.apache.org/WAVE/";>Wiki</a></li>
 <li><a href="demo-servers.html">Demo Servers</a></li>
 </ul>
-<h1 id="apache_foundation">Apache Foundation</h1>
+<h1 id="apache-foundation">Apache Foundation</h1>
 <ul>
 <li><a href="http://www.apache.org";>Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsor</a></li>
 <li><a href="http://www.apache.org/security/";>Security</a></li>
 </ul>
-  </div>
-  
-  <div id="content">
-    <h1 class="title">Welcome to Apache Wave (incubating)</h1>
-    <div style="float: right"><img 
src="http://incubator.apache.org/images/apache-incubator-logo.png";></div>
-
-<p>Disclaimer: Apache Wave is an effort undergoing incubation at The Apache 
Software Foundation (ASF), sponsored by the Apache Incubator PMC. 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>
-<hr />
-<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
-expand to offer other Wave related goodies as well.</p>
-<p>Wave has just recently entered incubation.  We are in the process of 
migrating the source code,
-infrastructure and community to Apache.  The project website has also just 
come to life.  We will be
-working hard over the next few weeks to publish more content.</p>
+        </div>
+        <div id="content">
+        <h1 id="welcome-to-apache-wave">Welcome to Apache Wave</h1>
+<p>Wave is ditributed, near-real-time, rich collaboration platform that allows 
uses to work together
+in new and exciting ways.  Wave allows for flexible modes of communication, 
blending chat, email
+and collabortative document editing in to one seemless environment.  Wave 
provides a lively and
+responsive environment that promotes more a fluid and dynamic collaboration 
between users.
+The addition of Robots, and Gagets allow the Wave platorm to provide 
intelligence, integration, and
+customizablilty to the users experience.</p>
+<p>Currently, the main focus of the Apache Wave project is the development of 
"Wave in a Box" (WiaB).
+WiaB aims to be both a reference impelemntation of the Wave platform as well 
as a set of reusable
+components that can serve as building blocks for developing other wave related 
products.  As the 
+project grows we hope to expand our focus to offer other Wave related goodies 
as well.</p>
+<div style="text-align: center;">
+<img src="/wave/images/wiab_screenshot.jpg">
+</div>
+
+<p>The wave project is still in its infancy.  To graduate from incubation we 
need to mature the code
+base, grow the community, provide better doumenation, and make some software 
releases.  We are 
+currently driving towards our first stable release.  If you are interested in 
joiing the
+comunnity please se the <a href="get-involved.html">Get Involved</a> page.</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>
-  </div>
-  
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2010 The Apache Software Foundation, Licensed under 
+<hr />
+<p><img src="http://incubator.apache.org/images/apache-incubator-logo.png";></p>
+<p>Disclaimer: Apache Wave is an effort undergoing incubation at The Apache 
Software Foundation (ASF), 
+sponsored by the Apache Incubator PMC. 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>
+<hr />
+        </div>
+        <div style="clear: both;"></div>
+      </div>
+      <div id="footer">
+        <div class="copyright">
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
         the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
         <br />
         Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
-      </p>
+        </div>
+      </div>
     </div>
-  </div>
-  
-</body>
+  </body>
 </html>

Modified: websites/staging/wave/trunk/content/wave/mailing-lists.html
==============================================================================
--- websites/staging/wave/trunk/content/wave/mailing-lists.html (original)
+++ websites/staging/wave/trunk/content/wave/mailing-lists.html Tue Jun 12 
15:59:10 2012
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <html>
-<head>
+  <head>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,15 +18,22 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-
   <link href="/wave/css/wave.css" rel="stylesheet" type="text/css">
-  <title>Apache Wave - Mailing Lists</title>
+  <title>Apache Wave - Welcome to Apache Wave (incubating)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="navigation"> 
-  <h1 id="general">General</h1>
+  </head>
+  <body>
+    <div id="wrapper">
+      <div id="header" style="vertical-align: middle">
+        <img style="float: left;" id="header-logo" 
src="/wave/images/OpenWaveLogo.png"/>
+        <div style="margin-left: 154px; padding-left: 10px; dvertical-align: 
middle; height: 120px;">
+          <span style="position: relative; top: 25%">Apache Wave 
(Incubating)</span>
+        </div>
+        <div style="clear:both;"></div>
+      </div>
+      <div id="main">
+        <div id="navigation">
+        <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">Home</a></li>
 <li><a href="about.html">About</a></li>
@@ -46,18 +53,21 @@
 <li><a href="https://cwiki.apache.org/WAVE/";>Wiki</a></li>
 <li><a href="demo-servers.html">Demo Servers</a></li>
 </ul>
-<h1 id="apache_foundation">Apache Foundation</h1>
+<h1 id="apache-foundation">Apache Foundation</h1>
 <ul>
 <li><a href="http://www.apache.org";>Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsor</a></li>
 <li><a href="http://www.apache.org/security/";>Security</a></li>
 </ul>
-  </div>
-  
-  <div id="content">
-    <h1 class="title">Mailing Lists</h1>
-    <h2 id="wave_developer_list">Wave Developer List</h2>
+        </div>
+        <div id="content">
+        <h1 id="mailing-lists">Mailing Lists</h1>
+<p>The mailing lists are the primary coordination mechanism for Apache 
Projects.  This is where we 
+work together, disucss code and community issues, and collectiely decide on 
plans for the futrue.
+Everyone is welcome to join the mailing lis and we highly encourage doing so 
if you are interested 
+in becoming part of the community.</p>
+<h2 id="wave-developer-list">Wave Developer List</h2>
 <p>The wave developer list is a place for contributors to discuss the ongoing 
development in the Apache Wave
 project.  This is where new ideas are explored and where questions regarding 
development should be asked.<br />
 This list is also where votes take place among the project committers to make 
decisions regarding the future
@@ -70,7 +80,7 @@ The Wave Developer mailing list address 
 <li><a href="mailto:[email protected]";>Post</a></li>
 <li><a 
href="http://mail-archives.apache.org/mod_mbox/incubator-wave-dev/";>Archives</a></li>
 </ul>
-<h2 id="wave_commits_list">Wave Commits List</h2>
+<h2 id="wave-commits-list">Wave Commits List</h2>
 <p>If you would like to be notified when changes are made to the wave source 
code, please subscribe to the Wave
 Commits List.  The Wave Commits mailing list address is : <a 
href="mailto:[email protected]";>[email protected]</a>.</p>
 <ul>
@@ -79,18 +89,17 @@ Commits List.  The Wave Commits mailing 
 <li><a href="mailto:[email protected]";>Post</a></li>
 <li><a 
href="http://mail-archives.apache.org/mod_mbox/incubator-wave-commits/";>Archives</a></li>
 </ul>
-  </div>
-  
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2010 The Apache Software Foundation, Licensed under 
+        </div>
+        <div style="clear: both;"></div>
+      </div>
+      <div id="footer">
+        <div class="copyright">
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
         the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
         <br />
         Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
-      </p>
+        </div>
+      </div>
     </div>
-  </div>
-  
-</body>
+  </body>
 </html>

Modified: websites/staging/wave/trunk/content/wave/people.html
==============================================================================
--- websites/staging/wave/trunk/content/wave/people.html (original)
+++ websites/staging/wave/trunk/content/wave/people.html Tue Jun 12 15:59:10 
2012
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <html>
-<head>
+  <head>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,15 +18,22 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-
   <link href="/wave/css/wave.css" rel="stylesheet" type="text/css">
-  <title>Apache Wave - Apache Wave - People</title>
+  <title>Apache Wave - Welcome to Apache Wave (incubating)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="navigation"> 
-  <h1 id="general">General</h1>
+  </head>
+  <body>
+    <div id="wrapper">
+      <div id="header" style="vertical-align: middle">
+        <img style="float: left;" id="header-logo" 
src="/wave/images/OpenWaveLogo.png"/>
+        <div style="margin-left: 154px; padding-left: 10px; dvertical-align: 
middle; height: 120px;">
+          <span style="position: relative; top: 25%">Apache Wave 
(Incubating)</span>
+        </div>
+        <div style="clear:both;"></div>
+      </div>
+      <div id="main">
+        <div id="navigation">
+        <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">Home</a></li>
 <li><a href="about.html">About</a></li>
@@ -46,22 +53,20 @@
 <li><a href="https://cwiki.apache.org/WAVE/";>Wiki</a></li>
 <li><a href="demo-servers.html">Demo Servers</a></li>
 </ul>
-<h1 id="apache_foundation">Apache Foundation</h1>
+<h1 id="apache-foundation">Apache Foundation</h1>
 <ul>
 <li><a href="http://www.apache.org";>Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsor</a></li>
 <li><a href="http://www.apache.org/security/";>Security</a></li>
 </ul>
-  </div>
-  
-  <div id="content">
-    <h1 class="title">Apache Wave - People</h1>
-    <p>The Apache Wave project, like all Apache Software Foundation projects, 
is community driven.  The community
+        </div>
+        <div id="content">
+        <p>The Apache Wave project, like all Apache Software Foundation 
projects, is community driven.  The community
 is made up of many dedicated and enthusiastic people from around the world who 
help support the
 development of wave in a variety of ways.  In addition to those listed here, 
many others also contribute to wave 
 through their participation in mailing lists, contributions of patches, or 
simply using wave.</p>
-<h2 id="incubator_mentors">Incubator Mentors</h2>
+<h2 id="incubator-mentors">Incubator Mentors</h2>
 <p>The following people are graciously helping see the wave project through 
the incubation process, hopefully 
 on its way to becoming a top level project.</p>
 <ul>
@@ -95,18 +100,17 @@ and please visit the <a href="get-involv
 <li><a href="mailto:[email protected]";>Lennard de Rijk</a></li>
 <li><a href="mailto:[email protected]";>Yuri Zelikov</a></li>
 </ul>
-  </div>
-  
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2010 The Apache Software Foundation, Licensed under 
+        </div>
+        <div style="clear: both;"></div>
+      </div>
+      <div id="footer">
+        <div class="copyright">
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
         the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
         <br />
         Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
-      </p>
+        </div>
+      </div>
     </div>
-  </div>
-  
-</body>
+  </body>
 </html>

Modified: websites/staging/wave/trunk/content/wave/source-code.html
==============================================================================
--- websites/staging/wave/trunk/content/wave/source-code.html (original)
+++ websites/staging/wave/trunk/content/wave/source-code.html Tue Jun 12 
15:59:10 2012
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
 <html>
-<head>
+  <head>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,15 +18,22 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-
   <link href="/wave/css/wave.css" rel="stylesheet" type="text/css">
-  <title>Apache Wave - Source Code</title>
+  <title>Apache Wave - Welcome to Apache Wave (incubating)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="navigation"> 
-  <h1 id="general">General</h1>
+  </head>
+  <body>
+    <div id="wrapper">
+      <div id="header" style="vertical-align: middle">
+        <img style="float: left;" id="header-logo" 
src="/wave/images/OpenWaveLogo.png"/>
+        <div style="margin-left: 154px; padding-left: 10px; dvertical-align: 
middle; height: 120px;">
+          <span style="position: relative; top: 25%">Apache Wave 
(Incubating)</span>
+        </div>
+        <div style="clear:both;"></div>
+      </div>
+      <div id="main">
+        <div id="navigation">
+        <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">Home</a></li>
 <li><a href="about.html">About</a></li>
@@ -53,11 +60,9 @@
 <li><a href="http://www.apache.org/foundation/sponsorship.html";>Become a 
Sponsor</a></li>
 <li><a href="http://www.apache.org/security/";>Security</a></li>
 </ul>
-  </div>
-  
-  <div id="content">
-    <h1 class="title">Source Code</h1>
-    <p>Apache Wave uses the <a 
href="http://subversion.tigris.org/";>Subversion</a> revision control system.</p>
+        </div>
+        <div id="content">
+        <p>Apache Wave uses the <a 
href="http://subversion.tigris.org/";>Subversion</a> revision control system.</p>
 <p></br></p>
 <h2 id="apache-wave-svn-repository">Apache Wave SVN Repository</h2>
 <p>The repository is located at the following url:</p>
@@ -75,18 +80,17 @@ git clone git://git.apache.org/wave.git 
 <h2 id="historical-google-code-repository">Historical Google Code 
Repository</h2>
 <p>Before moving to Apache, the wave source code was hosted at Google Code.  
The source remains there for historical reference.  This code base can be found 
here:</p>
 <p><a 
href="http://code.google.com/p/wave-protocol/";>http://code.google.com/p/wave-protocol/</a></p>
-  </div>
-  
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2010 The Apache Software Foundation, Licensed under 
+        </div>
+        <div style="clear: both;"></div>
+      </div>
+      <div id="footer">
+        <div class="copyright">
+        Copyright &copy; 2012 The Apache Software Foundation, Licensed under 
         the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache 
License, Version 2.0</a>.
         <br />
         Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
-      </p>
+        </div>
+      </div>
     </div>
-  </div>
-  
-</body>
+  </body>
 </html>


Reply via email to