Author: buildbot
Date: Tue Jun 12 19:15:54 2012
New Revision: 821491

Log:
Staging update by buildbot for wave

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 19:15:54 2012
@@ -1 +1 @@
-1349407
+1349479

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 19:15:54 2012
@@ -25,14 +25,18 @@
   <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 style="float: left;" id="header-logo">
+          <img src="/wave/images/OpenWaveLogo.png"/>
+        </div>
+        <div id="header-title">
+        <img id="incubator-logo" 
src="http://incubator.apache.org/images/apache-incubator-logo.png"/>
+          <span style="position: relative; top: 25%; padding-left: 
10px;">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>
@@ -66,7 +70,7 @@
 <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
-implementation of the Wave Federation protocol, to enable federated
+implementation of the Wave Federation Protocol, to enable federated
 collaboration systems, such as multiple interoperable WIAB instances.<br />
 </p>
 <ul>
@@ -80,24 +84,24 @@ collaboration systems, such as multiple 
 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>
-<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.
+<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 an 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>
 <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>
+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 copies on 10 different user 
accounts).
+The WFP is built upon XMPP, itself an 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>
 <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
-Allthough Googles own server was never released as Open Source itself, they 
did release “FedOne” was a reference implementation of it. It was open 
source, and allowed people to both run and federate their own wave servers 
together. It did not connect to Googles main “wave.google.com” server, but 
did connect to a special “sandbox” server allowing testing of the protocol, 
server and clients.
-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>
+This front end of Google Wave is what most people came to think of as the Wave 
project, but it is important to understand this was just one possible interface 
- and the underlying Wave Federation Protocol, and servers that supported it, 
were in many ways the more revolutionary part of the project.</p>
+<h3 id="fedone">FedOne</h3>
+<p>Allthough Googles own server was never released as Open Source itself, they 
did release “FedOne” as a reference implementation of it. It was open 
source, and allowed people to both run and federate their own wave servers 
together. It did not connect to Googles main “wave.google.com” server, but 
did connect to a special “sandbox” server allowing testing of the protocol, 
server and clients.
+At the time of writing there are 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 uses and technical innovation, 
however bugs in early versions combined with 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>
 <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.
+Apache Wave's 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 style="clear: both;"></div>

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 19:15:54 
2012
@@ -4,7 +4,7 @@ body {
   font-size: 11pt;
   margin: 0;
   background: url(/wave/images/body_bg.jpg) repeat;
-  padding: 10px;
+  padding: 10px 0px;
 }
 
 #wrapper {
@@ -14,18 +14,33 @@ body {
 }
 
 #header {
-  background: #2485B3;
-  color: #FFF;
-  font-size: 24pt;
+
   border-bottom: 1px solid #7C7D7E;
 }
 
 #header-logo {
   vertical-align: middle;
+  float: left;
+  width: 160px;
+  background: white;
 }
 
+#header-title {
+  padding-left: 10px;
+  background: #2485B3;
+  color: #FFF;
+  font-size: 24pt;
+  height: 120px;
+}
+
+#incubator-logo {
+  width: 125px;
+  float: right;
+}
+
+
 #main {
-  background: #FFF;
+  background: #FAFAFA;
   color: black;
   padding: 0px; 
 }
@@ -36,12 +51,12 @@ a {
 }
 
 a:visited {
- color: #369;
+  color: #369;
 }
 
 a:hover {
- color: #ddf;
- background-color: #6badff;
+  color: #ddf;
+  background-color: #6badff;
 }
 
 h1,h2,h3,h4,h5,h6 {
@@ -49,9 +64,11 @@ h1,h2,h3,h4,h5,h6 {
 }
 
 #content {
-  margin-right: 200px;
+  background: #FFF;
+  margin-left: 160px;
   padding: 10px;
   text-align: justify;
+  border-left: 1px solid #73ace5;
 }
 
 #content h1,h2,h3,h4,h5,h6 {
@@ -77,15 +94,14 @@ h1,h2,h3,h4,h5,h6 {
 }
 
 #navigation {
-  border: 1px solid #73ace5;
+  
   font-size: 85%;
   color: #003;
-  float: right;
+  float: left;
   padding: 8px;
-  width: 160px;
-  background: white;
-  margin: 10px;
-
+  width: 144px;
+  background: #FAFAFA;
+  height: 100%;
 }
 
 #navigation img {
@@ -145,3 +161,16 @@ dt {
   display: inline;
   float: left;
 }
+
+.disclaimer {
+  border-top: 1px solid gray;
+  font-size: 85%;
+  padding-top: 5px;
+}
+
+.code {
+  border: 1px dashed black;
+  background: #EEEEEE;
+  font-family: Courier, monospace;
+  padding: 2px;
+}
\ No newline at end of file

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 
19:15:54 2012
@@ -25,14 +25,18 @@
   <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 style="float: left;" id="header-logo">
+          <img src="/wave/images/OpenWaveLogo.png"/>
+        </div>
+        <div id="header-title">
+        <img id="incubator-logo" 
src="http://incubator.apache.org/images/apache-incubator-logo.png"/>
+          <span style="position: relative; top: 25%; padding-left: 
10px;">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>
@@ -66,7 +70,7 @@
 <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>
+the latest code.  As such there might be bleeding edge functionality with 
varying degrees of stability.</p>
 <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>

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 
19:15:54 2012
@@ -25,14 +25,18 @@
   <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 style="float: left;" id="header-logo">
+          <img src="/wave/images/OpenWaveLogo.png"/>
+        </div>
+        <div id="header-title">
+        <img id="incubator-logo" 
src="http://incubator.apache.org/images/apache-incubator-logo.png"/>
+          <span style="position: relative; top: 25%; padding-left: 
10px;">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>
@@ -62,13 +66,13 @@
 </ul>
         </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
+        <h1 id="getting-involved">Getting Involved</h1>
+<p>Thank you 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>
+<p>The first step in getting involved is to join the <a 
href="mailing-lists.html">Wave Developer mailing list</a>.<br />
+It is here where we discuss the code, design the protocols, plan for the 
future and
+consider the health of the community.  There are many ways to get involved 
including:</p>
 <ul>
 <li>Code Development</li>
 <li>Documentation</li>

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 19:15:54 2012
@@ -25,14 +25,18 @@
   <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 style="float: left;" id="header-logo">
+          <img src="/wave/images/OpenWaveLogo.png"/>
+        </div>
+        <div id="header-title">
+        <img id="incubator-logo" 
src="http://incubator.apache.org/images/apache-incubator-logo.png"/>
+          <span style="position: relative; top: 25%; padding-left: 
10px;">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>

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 19:15:54 2012
@@ -25,14 +25,18 @@
   <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 style="float: left;" id="header-logo">
+          <img src="/wave/images/OpenWaveLogo.png"/>
+        </div>
+        <div id="header-title">
+        <img id="incubator-logo" 
src="http://incubator.apache.org/images/apache-incubator-logo.png"/>
+          <span style="position: relative; top: 25%; padding-left: 
10px;">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>

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 19:15:54 2012
@@ -25,14 +25,18 @@
   <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 style="float: left;" id="header-logo">
+          <img src="/wave/images/OpenWaveLogo.png"/>
+        </div>
+        <div id="header-title">
+        <img id="incubator-logo" 
src="http://incubator.apache.org/images/apache-incubator-logo.png"/>
+          <span style="position: relative; top: 25%; padding-left: 
10px;">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>
@@ -63,14 +67,14 @@
         </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
+<p>Wave is a 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>
+and collaborative document editing in to one seamless environment.  Wave 
provides a lively and
+responsive environment that promotes more fluid and dynamic collaboration 
between users.
+The addition of Robots and Gagets allow the Wave platform to provide 
intelligence, integration, and
+customizability 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
+WiaB aims to be both a reference implementation 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;">
@@ -78,20 +82,19 @@ project grows we hope to expand our focu
 </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>
+base, grow the community, provide better documentation, and make some software 
releases.  We are 
+currently driving towards our first stable release.  If you are interested in 
joining the
+comunnity please see 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>
-<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), 
+<div class="disclaimer">
+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 />
+the project has yet to be fully endorsed by the ASF.
+</div>
         </div>
         <div style="clear: both;"></div>
       </div>

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 
19:15:54 2012
@@ -25,14 +25,18 @@
   <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 style="float: left;" id="header-logo">
+          <img src="/wave/images/OpenWaveLogo.png"/>
+        </div>
+        <div id="header-title">
+        <img id="incubator-logo" 
src="http://incubator.apache.org/images/apache-incubator-logo.png"/>
+          <span style="position: relative; top: 25%; padding-left: 
10px;">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>
@@ -64,8 +68,8 @@
         <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 
+work together, discuss code and community issues, and collectively decide on 
plans for the futrue.
+Everyone is welcome to join the mailing lists 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

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 19:15:54 
2012
@@ -25,14 +25,18 @@
   <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 style="float: left;" id="header-logo">
+          <img src="/wave/images/OpenWaveLogo.png"/>
+        </div>
+        <div id="header-title">
+        <img id="incubator-logo" 
src="http://incubator.apache.org/images/apache-incubator-logo.png"/>
+          <span style="position: relative; top: 25%; padding-left: 
10px;">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>
@@ -62,7 +66,8 @@
 </ul>
         </div>
         <div id="content">
-        <p>The Apache Wave project, like all Apache Software Foundation 
projects, is community driven.  The community
+        <h1 id="people">People</h1>
+<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>

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 
19:15:54 2012
@@ -25,14 +25,18 @@
   <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 style="float: left;" id="header-logo">
+          <img src="/wave/images/OpenWaveLogo.png"/>
+        </div>
+        <div id="header-title">
+        <img id="incubator-logo" 
src="http://incubator.apache.org/images/apache-incubator-logo.png"/>
+          <span style="position: relative; top: 25%; padding-left: 
10px;">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>
@@ -62,21 +66,23 @@
 </ul>
         </div>
         <div id="content">
-        <p>Apache Wave uses the <a 
href="http://subversion.tigris.org/";>Subversion</a> revision control system.</p>
-<p></br></p>
+        <h1 id="source-code">Source Code</h1>
+<p>Apache Wave resided within the Apache Incubator's  <a 
href="http://subversion.tigris.org/";>Subversion</a> 
+repository.  Anyone is free to view and checkout the source code.  Only 
project memembers may
+commit directly to the reposiotyr, however feel free to submit a patch.  If 
accepted a committer
+can commit the code on you behalf.</p>
 <h2 id="apache-wave-svn-repository">Apache Wave SVN Repository</h2>
-<p>The repository is located at the following url:</p>
-<p><a 
href="https://svn.apache.org/repos/asf/incubator/wave/trunk";>https://svn.apache.org/repos/asf/incubator/wave/trunk/</a></p>
-<p><br/>
-<br/>
-To check out the source code issue the following command:</p>
-<p>svn co https://svn.apache.org/repos/asf/incubator/wave/trunk</p>
+<p>Repository URL: <a 
href="https://svn.apache.org/repos/asf/incubator/wave/trunk";>https://svn.apache.org/repos/asf/incubator/wave/trunk/</a></p>
+<p>To check out the source code issue the following command:
+<div class="code">
+svn co https://svn.apache.org/repos/asf/incubator/wave/trunk
+</div></p>
 <h2 id="apache-wave-git-mirror-read-only">Apache Wave Git Mirror (read 
only)</h2>
-<p>The mirror is located at:
-<a href="git://git.apache.org/wave.git">git://git.apache.org/wave.git</a></p>
-<p>To clone the source code issue the following command:<br />
+<p>Git Mirror URL: <a 
href="git://git.apache.org/wave.git">git://git.apache.org/wave.git</a></p>
+<p>To clone the source code issue the following command:
+<div class="code">
 git clone git://git.apache.org/wave.git wave
-<br/></p>
+</div></p>
 <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>


Reply via email to