You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by bu...@apache.org on 2012/01/27 08:17:51 UTC

svn commit: r803392 - in /websites/staging/ace/trunk/content: ./ get-involved/

Author: buildbot
Date: Fri Jan 27 07:17:50 2012
New Revision: 803392

Log:
Staging update by buildbot for ace

Modified:
    websites/staging/ace/trunk/content/apache.html
    websites/staging/ace/trunk/content/dev-doc.html
    websites/staging/ace/trunk/content/downloads.html
    websites/staging/ace/trunk/content/get-involved.html
    websites/staging/ace/trunk/content/get-involved/issue-tracking.html
    websites/staging/ace/trunk/content/get-involved/mailing-lists.html
    websites/staging/ace/trunk/content/get-involved/project-team.html
    websites/staging/ace/trunk/content/get-involved/source-code.html
    websites/staging/ace/trunk/content/index.html
    websites/staging/ace/trunk/content/news.html
    websites/staging/ace/trunk/content/on-the-web.html
    websites/staging/ace/trunk/content/sitemap.html
    websites/staging/ace/trunk/content/user-doc.html
    websites/staging/ace/trunk/content/wiki.html

Modified: websites/staging/ace/trunk/content/apache.html
==============================================================================
--- websites/staging/ace/trunk/content/apache.html (original)
+++ websites/staging/ace/trunk/content/apache.html Fri Jan 27 07:17:50 2012
@@ -16,14 +16,11 @@
   </head>
 
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Apache</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="#">Apache ACE</a>
+          <ul>
 <li><a href="/index.html">Home</a><ul>
 <li><a href="/news.html">News</a></li>
 <li><a href="/on-the-web.html">On the web</a></li>
@@ -66,21 +63,18 @@
 </ul>
 </li>
 </ul>
-        <p><a href="/">Home</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+        </div>
       </div>
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="apache">Apache</h1>
-<p>Placeholder page.</p></div></div>
-      <div class="clear"></div>
     </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 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 class="container">
+      <h1>Apache</h1>
+      <p><a href="/">Home</a></p>
+      <div class="clear"></div>
+      <div id="content"><h1 id="apache">Apache</h1>
+<p>Placeholder page.</p></div>
+      <footer>
+        <p>Copyright &#169; 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>
+      </footer>
     </div>
   </body>
 </html>

Modified: websites/staging/ace/trunk/content/dev-doc.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc.html (original)
+++ websites/staging/ace/trunk/content/dev-doc.html Fri Jan 27 07:17:50 2012
@@ -16,14 +16,11 @@
   </head>
 
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Developer Documentation</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="#">Apache ACE</a>
+          <ul>
 <li><a href="/index.html">Home</a><ul>
 <li><a href="/news.html">News</a></li>
 <li><a href="/on-the-web.html">On the web</a></li>
@@ -66,21 +63,18 @@
 </ul>
 </li>
 </ul>
-        <p><a href="/">Home</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+        </div>
       </div>
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="developer_documentation">Developer Documentation</h1>
-<p>Placeholder page.</p></div></div>
-      <div class="clear"></div>
     </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 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 class="container">
+      <h1>Developer Documentation</h1>
+      <p><a href="/">Home</a></p>
+      <div class="clear"></div>
+      <div id="content"><h1 id="developer_documentation">Developer Documentation</h1>
+<p>Placeholder page.</p></div>
+      <footer>
+        <p>Copyright &#169; 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>
+      </footer>
     </div>
   </body>
 </html>

Modified: websites/staging/ace/trunk/content/downloads.html
==============================================================================
--- websites/staging/ace/trunk/content/downloads.html (original)
+++ websites/staging/ace/trunk/content/downloads.html Fri Jan 27 07:17:50 2012
@@ -16,14 +16,11 @@
   </head>
 
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Downloads</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="#">Apache ACE</a>
+          <ul>
 <li><a href="/index.html">Home</a><ul>
 <li><a href="/news.html">News</a></li>
 <li><a href="/on-the-web.html">On the web</a></li>
@@ -66,21 +63,18 @@
 </ul>
 </li>
 </ul>
-        <p><a href="/">Home</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+        </div>
       </div>
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="downloads">Downloads</h1>
-<p>Placeholder page.</p></div></div>
-      <div class="clear"></div>
     </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 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 class="container">
+      <h1>Downloads</h1>
+      <p><a href="/">Home</a></p>
+      <div class="clear"></div>
+      <div id="content"><h1 id="downloads">Downloads</h1>
+<p>Placeholder page.</p></div>
+      <footer>
+        <p>Copyright &#169; 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>
+      </footer>
     </div>
   </body>
 </html>

Modified: websites/staging/ace/trunk/content/get-involved.html
==============================================================================
--- websites/staging/ace/trunk/content/get-involved.html (original)
+++ websites/staging/ace/trunk/content/get-involved.html Fri Jan 27 07:17:50 2012
@@ -16,14 +16,11 @@
   </head>
 
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Get Involved</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="#">Apache ACE</a>
+          <ul>
 <li><a href="/index.html">Home</a><ul>
 <li><a href="/news.html">News</a></li>
 <li><a href="/on-the-web.html">On the web</a></li>
@@ -66,21 +63,18 @@
 </ul>
 </li>
 </ul>
-        <p><a href="/">Home</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+        </div>
       </div>
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="get_involved">Get Involved</h1>
-<p>When you want to get involved in Apache ACE, probably the first thing to do is to subscribe to the <a href="/get-involved/mailing-lists.html">mailing lists</a>. You can learn how to check out the <a href="/get-involved/source-code.html">source code</a>, compile it yourself and maybe fix a bug or add a feature, both of which you can report in our <a href="/get-involved/issue-tracking.html">issue tracker</a>. Finally, we would like to <a href="/get-involved/project-team.html">introduce ourselves</a> here.</p></div></div>
-      <div class="clear"></div>
     </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 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 class="container">
+      <h1>Get Involved</h1>
+      <p><a href="/">Home</a></p>
+      <div class="clear"></div>
+      <div id="content"><h1 id="get_involved">Get Involved</h1>
+<p>When you want to get involved in Apache ACE, probably the first thing to do is to subscribe to the <a href="/get-involved/mailing-lists.html">mailing lists</a>. You can learn how to check out the <a href="/get-involved/source-code.html">source code</a>, compile it yourself and maybe fix a bug or add a feature, both of which you can report in our <a href="/get-involved/issue-tracking.html">issue tracker</a>. Finally, we would like to <a href="/get-involved/project-team.html">introduce ourselves</a> here.</p></div>
+      <footer>
+        <p>Copyright &#169; 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>
+      </footer>
     </div>
   </body>
 </html>

Modified: websites/staging/ace/trunk/content/get-involved/issue-tracking.html
==============================================================================
--- websites/staging/ace/trunk/content/get-involved/issue-tracking.html (original)
+++ websites/staging/ace/trunk/content/get-involved/issue-tracking.html Fri Jan 27 07:17:50 2012
@@ -16,14 +16,11 @@
   </head>
 
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Issue Tracking</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="#">Apache ACE</a>
+          <ul>
 <li><a href="/index.html">Home</a><ul>
 <li><a href="/news.html">News</a></li>
 <li><a href="/on-the-web.html">On the web</a></li>
@@ -66,23 +63,20 @@
 </ul>
 </li>
 </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/get-involved/">Get-involved</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+        </div>
       </div>
+    </div>
+    <div class="container">
+      <h1>Issue Tracking</h1>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/get-involved/">Get-involved</a></p>
       <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="issue_tracking">Issue Tracking</h1>
+      <div id="content"><h1 id="issue_tracking">Issue Tracking</h1>
 <ul>
 <li><a href="https://issues.apache.org/jira/browse/ace">JIRA</a></li>
-</ul></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 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>
+</ul></div>
+      <footer>
+        <p>Copyright &#169; 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>
+      </footer>
     </div>
   </body>
 </html>

Modified: websites/staging/ace/trunk/content/get-involved/mailing-lists.html
==============================================================================
--- websites/staging/ace/trunk/content/get-involved/mailing-lists.html (original)
+++ websites/staging/ace/trunk/content/get-involved/mailing-lists.html Fri Jan 27 07:17:50 2012
@@ -16,14 +16,11 @@
   </head>
 
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Mailing Lists</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="#">Apache ACE</a>
+          <ul>
 <li><a href="/index.html">Home</a><ul>
 <li><a href="/news.html">News</a></li>
 <li><a href="/on-the-web.html">On the web</a></li>
@@ -66,15 +63,14 @@
 </ul>
 </li>
 </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/get-involved/">Get-involved</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+        </div>
       </div>
+    </div>
+    <div class="container">
+      <h1>Mailing Lists</h1>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/get-involved/">Get-involved</a></p>
       <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="mailing_lists">Mailing Lists</h1>
+      <div id="content"><h1 id="mailing_lists">Mailing Lists</h1>
 <h2 id="usersaceapacheorg">users@ace.apache.org</h2>
 <p>This list is for people using Apache ACE. Please note that during incubation, we only had a developer list, which means that you might want to search the archives of the developer list below as well, when searching for answers.</p>
 <ul>
@@ -95,12 +91,10 @@
 <li><a href="mailto:commits-subscribe@ace.apache.org">subscribe</a></li>
 <li><a href="mailto:commits-unsubscribe@ace.apache.org">unsubscribe</a></li>
 <li><a href="http://mail-archives.apache.org/mod_mbox/ace-commits/">archive</a></li>
-</ul></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 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>
+</ul></div>
+      <footer>
+        <p>Copyright &#169; 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>
+      </footer>
     </div>
   </body>
 </html>

Modified: websites/staging/ace/trunk/content/get-involved/project-team.html
==============================================================================
--- websites/staging/ace/trunk/content/get-involved/project-team.html (original)
+++ websites/staging/ace/trunk/content/get-involved/project-team.html Fri Jan 27 07:17:50 2012
@@ -16,14 +16,11 @@
   </head>
 
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Project Team</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="#">Apache ACE</a>
+          <ul>
 <li><a href="/index.html">Home</a><ul>
 <li><a href="/news.html">News</a></li>
 <li><a href="/on-the-web.html">On the web</a></li>
@@ -66,15 +63,14 @@
 </ul>
 </li>
 </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/get-involved/">Get-involved</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+        </div>
       </div>
+    </div>
+    <div class="container">
+      <h1>Project Team</h1>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/get-involved/">Get-involved</a></p>
       <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="project_team">Project Team</h1>
+      <div id="content"><h1 id="project_team">Project Team</h1>
 <p>Here's the list of ACE committers and PMC members.</p>
 <p>See the <a href="http://www.apache.org/foundation/how-it-works.html#roles">Apache Roles</a> for more info about what these roles mean.</p>
 <table>
@@ -119,12 +115,10 @@
             <td>Toni Menzel</td>
             <td>PMC Member, Committer</td>
       </tr>
-</table></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 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>
+</table></div>
+      <footer>
+        <p>Copyright &#169; 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>
+      </footer>
     </div>
   </body>
 </html>

Modified: websites/staging/ace/trunk/content/get-involved/source-code.html
==============================================================================
--- websites/staging/ace/trunk/content/get-involved/source-code.html (original)
+++ websites/staging/ace/trunk/content/get-involved/source-code.html Fri Jan 27 07:17:50 2012
@@ -16,14 +16,11 @@
   </head>
 
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Source Code</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="#">Apache ACE</a>
+          <ul>
 <li><a href="/index.html">Home</a><ul>
 <li><a href="/news.html">News</a></li>
 <li><a href="/on-the-web.html">On the web</a></li>
@@ -66,22 +63,19 @@
 </ul>
 </li>
 </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/get-involved/">Get-involved</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+        </div>
       </div>
+    </div>
+    <div class="container">
+      <h1>Source Code</h1>
+      <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/get-involved/">Get-involved</a></p>
       <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="source_code">Source Code</h1>
+      <div id="content"><h1 id="source_code">Source Code</h1>
 <h2 id="subversion">Subversion</h2>
-<h2 id="git">Git</h2></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 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>
+<h2 id="git">Git</h2></div>
+      <footer>
+        <p>Copyright &#169; 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>
+      </footer>
     </div>
   </body>
 </html>

Modified: websites/staging/ace/trunk/content/index.html
==============================================================================
--- websites/staging/ace/trunk/content/index.html (original)
+++ websites/staging/ace/trunk/content/index.html Fri Jan 27 07:17:50 2012
@@ -16,14 +16,11 @@
   </head>
 
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Apache ACE</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="#">Apache ACE</a>
+          <ul>
 <li><a href="/index.html">Home</a><ul>
 <li><a href="/news.html">News</a></li>
 <li><a href="/on-the-web.html">On the web</a></li>
@@ -66,25 +63,22 @@
 </ul>
 </li>
 </ul>
-        <p><a href="/">Home</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+        </div>
       </div>
+    </div>
+    <div class="container">
+      <h1>Apache ACE</h1>
+      <p><a href="/">Home</a></p>
       <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="welcome_to_apache_ace">Welcome to Apache ACE</h1>
+      <div id="content"><h1 id="welcome_to_apache_ace">Welcome to Apache ACE</h1>
 <p>Apache ACE is a software distribution framework that allows you to centrally manage and distribute software components, configuration data and other artifacts to target systems. It is built using OSGi and can be deployed in different topologies. The target systems are usually also OSGi based, but don't have to be.</p>
 <h1 id="background">Background</h1>
 <p>When assembling software out of reusable components, the task of deploying software onto an ever increasing number of targets is not trivial to solve. This becomes even harder when these targets require different components based on who's using them.</p>
 <p>Apache ACE allows you to group those components and assign them to a managed set of targets. This allows you to distribute updates and new components easily, while keeping a full history of what was installed where during what period. It also helps you setup an automated development, QA/testing, staging and production environment.</p>
-<p>If you want to learn more about how to use Apache ACE, go to the <a href="/user-doc.html">User Documentation</a> and start with <a href="/user-doc/introduction.html">A brief introduction</a>. If you are interested in <a href="/get-involved.html">becoming involved</a>, check out our <a href="#TODO">Mailing Lists</a> and finally, to gain a deeper understanding of the software, read the available <a href="/dev-doc.html">Developer Documentation</a> which explains how to build the software and the overall <a href="/dev-doc/software-architecture.html">Software Architecture</a>.</p></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 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>
+<p>If you want to learn more about how to use Apache ACE, go to the <a href="/user-doc.html">User Documentation</a> and start with <a href="/user-doc/introduction.html">A brief introduction</a>. If you are interested in <a href="/get-involved.html">becoming involved</a>, check out our <a href="#TODO">Mailing Lists</a> and finally, to gain a deeper understanding of the software, read the available <a href="/dev-doc.html">Developer Documentation</a> which explains how to build the software and the overall <a href="/dev-doc/software-architecture.html">Software Architecture</a>.</p></div>
+      <footer>
+        <p>Copyright &#169; 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>
+      </footer>
     </div>
   </body>
 </html>

Modified: websites/staging/ace/trunk/content/news.html
==============================================================================
--- websites/staging/ace/trunk/content/news.html (original)
+++ websites/staging/ace/trunk/content/news.html Fri Jan 27 07:17:50 2012
@@ -16,14 +16,11 @@
   </head>
 
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>News</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="#">Apache ACE</a>
+          <ul>
 <li><a href="/index.html">Home</a><ul>
 <li><a href="/news.html">News</a></li>
 <li><a href="/on-the-web.html">On the web</a></li>
@@ -66,24 +63,21 @@
 </ul>
 </li>
 </ul>
-        <p><a href="/">Home</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+        </div>
       </div>
+    </div>
+    <div class="container">
+      <h1>News</h1>
+      <p><a href="/">Home</a></p>
       <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="news">News</h1>
+      <div id="content"><h1 id="news">News</h1>
 <ul>
 <li>Apache ACE graduated as a TLP!</li>
 <li>Apache ACE version 0.8.1-incubator released! <a href="#TODO">Get it here</a>.</li>
-</ul></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 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>
+</ul></div>
+      <footer>
+        <p>Copyright &#169; 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>
+      </footer>
     </div>
   </body>
 </html>

Modified: websites/staging/ace/trunk/content/on-the-web.html
==============================================================================
--- websites/staging/ace/trunk/content/on-the-web.html (original)
+++ websites/staging/ace/trunk/content/on-the-web.html Fri Jan 27 07:17:50 2012
@@ -16,14 +16,11 @@
   </head>
 
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>On the web</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="#">Apache ACE</a>
+          <ul>
 <li><a href="/index.html">Home</a><ul>
 <li><a href="/news.html">News</a></li>
 <li><a href="/on-the-web.html">On the web</a></li>
@@ -66,21 +63,18 @@
 </ul>
 </li>
 </ul>
-        <p><a href="/">Home</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+        </div>
       </div>
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="on_the_web">On the web</h1>
-<p>Placeholder page.</p></div></div>
-      <div class="clear"></div>
     </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 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 class="container">
+      <h1>On the web</h1>
+      <p><a href="/">Home</a></p>
+      <div class="clear"></div>
+      <div id="content"><h1 id="on_the_web">On the web</h1>
+<p>Placeholder page.</p></div>
+      <footer>
+        <p>Copyright &#169; 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>
+      </footer>
     </div>
   </body>
 </html>

Modified: websites/staging/ace/trunk/content/sitemap.html
==============================================================================
--- websites/staging/ace/trunk/content/sitemap.html (original)
+++ websites/staging/ace/trunk/content/sitemap.html Fri Jan 27 07:17:50 2012
@@ -16,14 +16,11 @@
   </head>
 
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Sitemap</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="#">Apache ACE</a>
+          <ul>
 <li><a href="/index.html">Home</a><ul>
 <li><a href="/news.html">News</a></li>
 <li><a href="/on-the-web.html">On the web</a></li>
@@ -66,15 +63,14 @@
 </ul>
 </li>
 </ul>
-        <p><a href="/">Home</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+        </div>
       </div>
+    </div>
+    <div class="container">
+      <h1>Sitemap</h1>
+      <p><a href="/">Home</a></p>
       <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><ul>
+      <div id="content"><ul>
 <li><a href="/apache.html">Apache</a></li>
 <li><a href="/dev-doc.html">Developer Documentation</a></li>
 <li><a href="/downloads.html">Downloads</a></li>
@@ -84,12 +80,10 @@
 <li><a href="/on-the-web.html">On the web</a></li>
 <li><a href="/user-doc.html">User Documentation</a></li>
 <li><a href="/wiki.html">Wiki</a></li>
-</ul></div></div>
-      <div class="clear"></div>
-    </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 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>
+</ul></div>
+      <footer>
+        <p>Copyright &#169; 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>
+      </footer>
     </div>
   </body>
 </html>

Modified: websites/staging/ace/trunk/content/user-doc.html
==============================================================================
--- websites/staging/ace/trunk/content/user-doc.html (original)
+++ websites/staging/ace/trunk/content/user-doc.html Fri Jan 27 07:17:50 2012
@@ -16,14 +16,11 @@
   </head>
 
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>User Documentation</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="#">Apache ACE</a>
+          <ul>
 <li><a href="/index.html">Home</a><ul>
 <li><a href="/news.html">News</a></li>
 <li><a href="/on-the-web.html">On the web</a></li>
@@ -66,21 +63,18 @@
 </ul>
 </li>
 </ul>
-        <p><a href="/">Home</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+        </div>
       </div>
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="user_documentation">User Documentation</h1>
-<p>Placeholder page.</p></div></div>
-      <div class="clear"></div>
     </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 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 class="container">
+      <h1>User Documentation</h1>
+      <p><a href="/">Home</a></p>
+      <div class="clear"></div>
+      <div id="content"><h1 id="user_documentation">User Documentation</h1>
+<p>Placeholder page.</p></div>
+      <footer>
+        <p>Copyright &#169; 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>
+      </footer>
     </div>
   </body>
 </html>

Modified: websites/staging/ace/trunk/content/wiki.html
==============================================================================
--- websites/staging/ace/trunk/content/wiki.html (original)
+++ websites/staging/ace/trunk/content/wiki.html Fri Jan 27 07:17:50 2012
@@ -16,14 +16,11 @@
   </head>
 
   <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="http://www.apache.org/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Wiki</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="#">Apache ACE</a>
+          <ul>
 <li><a href="/index.html">Home</a><ul>
 <li><a href="/news.html">News</a></li>
 <li><a href="/on-the-web.html">On the web</a></li>
@@ -66,21 +63,18 @@
 </ul>
 </li>
 </ul>
-        <p><a href="/">Home</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="*.apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
+        </div>
       </div>
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><h1 id="wiki">Wiki</h1>
-<p>Apache ACE uses Confluence as its wiki. You can take a look by following <a href="https://cwiki.apache.org/confluence/display/ACE/Index">this link</a>. The wiki is used for collaborating on documents. This includes <a href="/wiki/drafts.html">design documentation</a> and <a href="/wiki/board-reports.html">board reports</a>.</p></div></div>
-      <div class="clear"></div>
     </div>
-
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 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 class="container">
+      <h1>Wiki</h1>
+      <p><a href="/">Home</a></p>
+      <div class="clear"></div>
+      <div id="content"><h1 id="wiki">Wiki</h1>
+<p>Apache ACE uses Confluence as its wiki. You can take a look by following <a href="https://cwiki.apache.org/confluence/display/ACE/Index">this link</a>. The wiki is used for collaborating on documents. This includes <a href="/wiki/drafts.html">design documentation</a> and <a href="/wiki/board-reports.html">board reports</a>.</p></div>
+      <footer>
+        <p>Copyright &#169; 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>
+      </footer>
     </div>
   </body>
 </html>