You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bu...@apache.org on 2014/05/04 19:29:34 UTC

svn commit: r908015 [14/19] - in /websites/staging/accumulo/trunk/content: ./ 1.4/examples/ 1.4/user_manual/ 1.5/examples/ css/ downloads/ example/ fonts/ governance/ images/ js/ release_notes/ user_manual_1.3-incubating/ user_manual_1.3-incubating/exa...

Modified: websites/staging/accumulo/trunk/content/mailing_list.html
==============================================================================
--- websites/staging/accumulo/trunk/content/mailing_list.html (original)
+++ websites/staging/accumulo/trunk/content/mailing_list.html Sun May  4 17:29:31 2014
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
 <head>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,12 +17,24 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link href="/css/bootstrap.min.css" rel="stylesheet">
+  <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+    <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+  <![endif]-->
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+  <script src="/js/bootstrap.min.js"></script>
   <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
   <title>Apache Accumulo Mailing Lists</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
   <script type="text/javascript">
-
+/*
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', 'UA-21103458-6']);
     _gaq.push(['_setDomainName', 'apache.org']);
@@ -34,112 +46,186 @@
       ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
-
+*/
   </script>
 
 
 </head>
 
 <body>
-  <div id="banner">&nbsp;
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="container-fluid">
+  <div class="navbar-header">
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <a class="navbar-brand" href="/index.html">Accumulo</a>
   </div>
-
-  <div id="navigation">
-  <h1 id="project">Project</h1>
-<ul>
-<li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
-<li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/source.html">Source &amp; Guide</a></li>
-<li><a href="/git.html">Git WIP</a></li>
-<li><a href="/contrib.html">Contrib Projects</a></li>
-<li><a href="/releasing.html">Making Releases</a></li>
-<li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
-<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
-</ul>
-<h1 id="documentation">Documentation</h1>
-<ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers &amp; Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
-</ul>
-<h1 id="asf-links">ASF links</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-<li><a href="http://www.apache.org/security/">Security</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
-</ul>
+  <div class="collapse navbar-collapse" id="navbar-items">
+  <ul class="nav navbar-nav">
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Project <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_index"><a href="/index.html">Home</a></li>
+<li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+<li id="nav_features"><a href="/notable_features.html">Features</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Community <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_getinvolved"><a href="/get_involved.html">Get Involved</a></li>
+<li id="nav_mailinglists"><a href="/mailing_list.html">Mailing Lists</a></li>
+<li id="nav_people"><a href="/people.html">People</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Governance</li>
+<li id="nav_bylaws"><a href="/bylaws.html">Bylaws</a></li>
+<li id="nav_consensusbuilding"><a href="/governance/consensusBuilding.html">Consensus Building</a></li>
+<li id="nav_lazyconsensus"><a href="/governance/lazyConsensus.html">Lazy Consensus</a></li>
+<li id="nav_releasing"><a href="/governance/releasing.html">Releasing</a></li>
+<li id="nav_voting"><a href="/governance/voting.html">Voting</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Development <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_source"><a href="/source.html">Source &amp; Guide</a></li>
+<li id="nav_git"><a href="/git.html">Git WIP</a></li>
+<li id="nav_contrib"><a href="/contrib.html">Contrib Projects</a></li>
+<li id="nav_releasing"><a href="/releasing.html">Making Releases</a></li>
+<li><a href="https://issues.apache.org/jira/browse/accumulo"><i class="fa fa-external-link"></i> Issues</a></li>
+<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/"><i class="fa fa-external-link"></i> Builds</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Documentation <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<!-- <li>Manual <a href="http://accumulo.apache.org/1.4/user_manual">1.4</a> / <a href="http://accumulo.apache.org/1.5/accumulo_user_manual.html">1.5</a></li> -->
+<li class="dropdown-header">Manual</li>
+<li><a href="/1.4/user_manual">1.4</a></li>
+<li><a href="/1.5/accumulo_user_manual.html">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Javadoc</li>
+<li><a href="/1.4/apidocs">1.4</a></li>
+<li><a href="/1.5/apidocs">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Examples</li>
+<li id="nav_examples_1_4"><a href="/1.4/examples">1.4</a></li>
+<li id="nav_examples_1_5"><a href="/1.5/examples">1.5</a></li>
+<li class="divider"></li>
+<li id="nav_screenshots"><a href="/screenshots.html">Screenshots</a></li>
+<li id="nav_papers"><a href="/papers.html">Papers &amp; Other Links</a></li>
+<li id="nav_glossary"><a href="/glossary.html">Glossary</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        ASF Links <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li><a href="http://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link"></i> Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/"><i class="fa fa-external-link"></i> Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link"></i> Thanks</a></li>
+</ul>
+</li>
+</ul>
+
+<form method="GET" action="http://search-hadoop.com/" class="navbar-form navbar-right" role="search">
+  <div class="form-group">
+    <input type="text" name="q" class="form-control" placeholder="Search"/>
+    <input type="hidden" name="fc_project" value="Accumulo"/>
+  </div>
+  <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+</form>
   </div>
 
+</div>
+</nav>
+
+
+<div class="container-fluid">
+<div class="row">
+  <div class="col-md-2" id="sidebar">
+  <div style="text-align: center">
+    <a href="/index.html"><img id="logo" alt="Apache Accumulo &trade;" class="img-responsive" src="/images/accumulo-logo.png"/></a>
+    <br>
+Latest 1.5 release: <strong>1.5.1</strong><br>
+Latest 1.4 release: <strong>1.4.5</strong><br>
+    <br>
+    <a id="download-button-sidebar" class="btn btn-success btn-block" href="/downloads/" role="button">Download</a>
+  </div>
+    <hr>
+<table class="table" id="sociallinks">
+<tr><td><img src="/images/Twitter_logo_blue.png" style="height: 1em"></td><td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td></tr>
+<tr><td><img src="/images/InBug-16px_0.png"></td><td><a href="https://www.linkedin.com/groups/Apache-Accumulo-Professionals-4554913">Apache Accumulo Professionals</a></td></tr>
+<tr><td><img src="/images/GitHub-Mark-32px.png" style="height: 1em"></td><td><a href="https://github.com/apache/accumulo">apache / accumulo</a></td></tr>
+<tr><td><span class="glyphicon glyphicon-comment"></span></td><td><a href="irc://chat.freenode.net/accumulo">#accumulo @ freenode</a></td></tr>
+</table>
+<hr>
+<a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit-2014.png"></a>
+  </div>
+  <div class="col-md-8 col-md-offset-1">
+<!--
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo &trade;" src="/images/accumulo-logo.png"/>
   </div>
+-->
 
   <div id="content">
+
     <h1 class="title">Apache Accumulo Mailing Lists</h1>
-    <h3 id="users">Users</h3>
-<ul>
-<li><a href="mailto:user-subscribe@accumulo.apache.org">Subscribe</a></li>
-<li><a href="mailto:user@accumulo.apache.org">Post</a></li>
-<li><a href="mailto:user-unsubscribe@accumulo.apache.org">Unsubscribe</a></li>
-<li><a href="http://mail-archives.apache.org/mod_mbox/accumulo-user">Archive</a></li>
-</ul>
-<h3 id="developers">Developers</h3>
-<p>This list is for anyone interested in contributing or following development activities.
-It is recommended that you also subscribe to the JIRA notifications list.</p>
-<ul>
-<li><a href="mailto:dev-subscribe@accumulo.apache.org">Subscribe</a></li>
-<li><a href="mailto:dev@accumulo.apache.org">Post</a></li>
-<li><a href="mailto:dev-unsubscribe@accumulo.apache.org">Unsubscribe</a></li>
-<li><a href="http://mail-archives.apache.org/mod_mbox/accumulo-dev">Archive</a></li>
-</ul>
-<h3 id="commits">Commits</h3>
-<p>This list is for following svn commits.</p>
-<ul>
-<li><a href="mailto:commits-subscribe@accumulo.apache.org">Subscribe</a></li>
-<li><a href="mailto:commits-unsubscribe@accumulo.apache.org">Unsubscribe</a></li>
-<li><a href="http://mail-archives.apache.org/mod_mbox/accumulo-commits">Archive</a></li>
-</ul>
-<h3 id="notifications">Notifications</h3>
-<p>This list is for following JIRA notifications.</p>
-<ul>
-<li><a href="mailto:notifications-subscribe@accumulo.apache.org">Subscribe</a></li>
-<li><a href="mailto:notifications-unsubscribe@accumulo.apache.org">Unsubscribe</a></li>
-<li><a href="http://mail-archives.apache.org/mod_mbox/accumulo-notifications">Archive</a></li>
-</ul>
-<h3 id="irc">IRC</h3>
-<p>Apache Accumulo developers and community members hang out in the #accumulo channel on irc.freenode.net.</p>
+
+    <h3 id="user-wzxhzdk0wzxhzdk1wzxhzdk2-subscribewzxhzdk3-wzxhzdk4wzxhzdk5wzxhzdk6-postwzxhzdk7-wzxhzdk8wzxhzdk9wzxhzdk10-unsubscribewzxhzdk11">User <a href="mailto:user-subscribe@accumulo.apache.org" class="btn btn-success btn-xs"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a href="mailto:user@accumulo.apache.org" class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-envelope"></span> Post</a> <a href="mailto:user-unsubscribe@accumulo.apache.org" class="btn btn-warning btn-xs"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></h3>
+<p><strong><a href="http://mail-archives.apache.org/mod_mbox/accumulo-user">user@accumulo.apache.org</a></strong> is for general user questions, help, and
+announcements.</p>
+<h3 id="dev-wzxhzdk12wzxhzdk13wzxhzdk14-subscribewzxhzdk15-wzxhzdk16wzxhzdk17wzxhzdk18-postwzxhzdk19-wzxhzdk20wzxhzdk21wzxhzdk22-unsubscribewzxhzdk23">Dev <a href="mailto:dev-subscribe@accumulo.apache.org" class="btn btn-success btn-xs"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a href="mailto:dev@accumulo.apache.org" class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-envelope"></span> Post</a> <a href="mailto:dev-unsubscribe@accumulo.apache.org" class="btn btn-warning btn-xs"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></h3>
+<p><strong><a href="http://mail-archives.apache.org/mod_mbox/accumulo-dev">dev@accumulo.apache.org</a></strong> is for anyone interested in contributing or following development activities. It is recommended that you also subscribe to notifications@accumulo.apache.org.</p>
+<h3 id="commits-wzxhzdk24wzxhzdk25wzxhzdk26-subscribewzxhzdk27-wzxhzdk28wzxhzdk29wzxhzdk30-unsubscribewzxhzdk31">Commits <a href="mailto:commits-subscribe@accumulo.apache.org" class="btn btn-success btn-xs"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a href="mailto:commits-unsubscribe@accumulo.apache.org" class="btn btn-warning btn-xs"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></h3>
+<p><strong><a href="http://mail-archives.apache.org/mod_mbox/accumulo-commits">commits@accumulo.apache.org</a></strong> is for following commits.</p>
+<h3 id="notifications-wzxhzdk32wzxhzdk33wzxhzdk34-subscribewzxhzdk35-wzxhzdk36wzxhzdk37wzxhzdk38-unsubscribewzxhzdk39">Notifications <a href="mailto:notifications-subscribe@accumulo.apache.org" class="btn btn-success btn-xs"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a href="mailto:notifications-unsubscribe@accumulo.apache.org" class="btn btn-warning btn-xs"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></h3>
+<p><strong><a href="http://mail-archives.apache.org/mod_mbox/accumulo-notifications">notifications@accumulo.apache.org</a></strong> is for following JIRA notifications.</p>
   </div>
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100">
     </a>
     <div class="copyright">
       <p>
-        Copyright &copy; 2011-2013 The Apache Software Foundation, Licensed under
+        Copyright &copy; 2011-2014 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 Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-        <br />
-        project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.
+        project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.<br />
+        Site created with <a href="http://getbootstrap.com/">Bootstrap</a> including icons from <a href="http://glyphicons.com/">GLYPHICONS</a> and <a href="http://fontawesome.io/">Font Awesome</a>.
       </p>
     </div> 
   </div>
+  </div>
+
+</div>
+</div>
+
+<script type="text/javascript">
+
+$("#nav_mailinglists").addClass("active");
 
+</script>
 </body>
 </html>

Modified: websites/staging/accumulo/trunk/content/notable_features.html
==============================================================================
--- websites/staging/accumulo/trunk/content/notable_features.html (original)
+++ websites/staging/accumulo/trunk/content/notable_features.html Sun May  4 17:29:31 2014
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
 <head>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,12 +17,24 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link href="/css/bootstrap.min.css" rel="stylesheet">
+  <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+    <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+  <![endif]-->
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+  <script src="/js/bootstrap.min.js"></script>
   <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
   <title>Apache Accumulo Notable Features</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
   <script type="text/javascript">
-
+/*
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', 'UA-21103458-6']);
     _gaq.push(['_setDomainName', 'apache.org']);
@@ -34,63 +46,152 @@
       ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
-
+*/
   </script>
 
 
 </head>
 
 <body>
-  <div id="banner">&nbsp;
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="container-fluid">
+  <div class="navbar-header">
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <a class="navbar-brand" href="/index.html">Accumulo</a>
   </div>
+  <div class="collapse navbar-collapse" id="navbar-items">
+  <ul class="nav navbar-nav">
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Project <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_index"><a href="/index.html">Home</a></li>
+<li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+<li id="nav_features"><a href="/notable_features.html">Features</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+</ul>
+</li>
 
-  <div id="navigation">
-  <h1 id="project">Project</h1>
-<ul>
-<li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
-<li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Community <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_getinvolved"><a href="/get_involved.html">Get Involved</a></li>
+<li id="nav_mailinglists"><a href="/mailing_list.html">Mailing Lists</a></li>
+<li id="nav_people"><a href="/people.html">People</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Governance</li>
+<li id="nav_bylaws"><a href="/bylaws.html">Bylaws</a></li>
+<li id="nav_consensusbuilding"><a href="/governance/consensusBuilding.html">Consensus Building</a></li>
+<li id="nav_lazyconsensus"><a href="/governance/lazyConsensus.html">Lazy Consensus</a></li>
+<li id="nav_releasing"><a href="/governance/releasing.html">Releasing</a></li>
+<li id="nav_voting"><a href="/governance/voting.html">Voting</a></li>
 </ul>
-<h1 id="community">Community</h1>
-<ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Development <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_source"><a href="/source.html">Source &amp; Guide</a></li>
+<li id="nav_git"><a href="/git.html">Git WIP</a></li>
+<li id="nav_contrib"><a href="/contrib.html">Contrib Projects</a></li>
+<li id="nav_releasing"><a href="/releasing.html">Making Releases</a></li>
+<li><a href="https://issues.apache.org/jira/browse/accumulo"><i class="fa fa-external-link"></i> Issues</a></li>
+<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/"><i class="fa fa-external-link"></i> Builds</a></li>
 </ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/source.html">Source &amp; Guide</a></li>
-<li><a href="/git.html">Git WIP</a></li>
-<li><a href="/contrib.html">Contrib Projects</a></li>
-<li><a href="/releasing.html">Making Releases</a></li>
-<li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
-<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Documentation <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<!-- <li>Manual <a href="http://accumulo.apache.org/1.4/user_manual">1.4</a> / <a href="http://accumulo.apache.org/1.5/accumulo_user_manual.html">1.5</a></li> -->
+<li class="dropdown-header">Manual</li>
+<li><a href="/1.4/user_manual">1.4</a></li>
+<li><a href="/1.5/accumulo_user_manual.html">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Javadoc</li>
+<li><a href="/1.4/apidocs">1.4</a></li>
+<li><a href="/1.5/apidocs">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Examples</li>
+<li id="nav_examples_1_4"><a href="/1.4/examples">1.4</a></li>
+<li id="nav_examples_1_5"><a href="/1.5/examples">1.5</a></li>
+<li class="divider"></li>
+<li id="nav_screenshots"><a href="/screenshots.html">Screenshots</a></li>
+<li id="nav_papers"><a href="/papers.html">Papers &amp; Other Links</a></li>
+<li id="nav_glossary"><a href="/glossary.html">Glossary</a></li>
 </ul>
-<h1 id="documentation">Documentation</h1>
-<ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers &amp; Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        ASF Links <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li><a href="http://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link"></i> Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/"><i class="fa fa-external-link"></i> Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link"></i> Thanks</a></li>
 </ul>
-<h1 id="asf-links">ASF links</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-<li><a href="http://www.apache.org/security/">Security</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+</li>
 </ul>
+
+<form method="GET" action="http://search-hadoop.com/" class="navbar-form navbar-right" role="search">
+  <div class="form-group">
+    <input type="text" name="q" class="form-control" placeholder="Search"/>
+    <input type="hidden" name="fc_project" value="Accumulo"/>
+  </div>
+  <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+</form>
   </div>
 
+</div>
+</nav>
+
+
+<div class="container-fluid">
+<div class="row">
+  <div class="col-md-2" id="sidebar">
+  <div style="text-align: center">
+    <a href="/index.html"><img id="logo" alt="Apache Accumulo &trade;" class="img-responsive" src="/images/accumulo-logo.png"/></a>
+    <br>
+Latest 1.5 release: <strong>1.5.1</strong><br>
+Latest 1.4 release: <strong>1.4.5</strong><br>
+    <br>
+    <a id="download-button-sidebar" class="btn btn-success btn-block" href="/downloads/" role="button">Download</a>
+  </div>
+    <hr>
+<table class="table" id="sociallinks">
+<tr><td><img src="/images/Twitter_logo_blue.png" style="height: 1em"></td><td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td></tr>
+<tr><td><img src="/images/InBug-16px_0.png"></td><td><a href="https://www.linkedin.com/groups/Apache-Accumulo-Professionals-4554913">Apache Accumulo Professionals</a></td></tr>
+<tr><td><img src="/images/GitHub-Mark-32px.png" style="height: 1em"></td><td><a href="https://github.com/apache/accumulo">apache / accumulo</a></td></tr>
+<tr><td><span class="glyphicon glyphicon-comment"></span></td><td><a href="irc://chat.freenode.net/accumulo">#accumulo @ freenode</a></td></tr>
+</table>
+<hr>
+<a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit-2014.png"></a>
+  </div>
+  <div class="col-md-8 col-md-offset-1">
+<!--
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo &trade;" src="/images/accumulo-logo.png"/>
   </div>
+-->
 
   <div id="content">
+
     <h1 class="title">Apache Accumulo Notable Features</h1>
+
     <h2 id="categories">Categories</h2>
 <ul>
 <li><a href="#design">Table Design and Configuration</a></li>
@@ -149,7 +250,7 @@ and sends this back to the tablet server
 to adjust the timestamps they issue. So logical time ensures ordering is
 always correct and master authoritative time tries to ensure that timestamps
 are meaningful.</p>
-<h3 id="logical-time-for-bulk-import-14">Logical Time for bulk import (1.4)</h3>
+<h3 id="logical-time-for-bulk-import-wzxhzdk414wzxhzdk5">Logical Time for bulk import <span class="label label-default">1.4</span></h3>
 <p>Logical time as described above works with streaming (batch) ingest, where the
 tablet server assigns the timestamp.  Logical time is also important for bulk
 imported data, for which the client code may be choosing a timestamp.  Accumulo
@@ -161,7 +262,7 @@ system that created the file for bulk im
 file is imported, but whenever it is read by scans or compactions. At import, a
 time is obtained and always used by the specialized system iterator to set that
 time.</p>
-<h3 id="fate-14">FATE (1.4)</h3>
+<h3 id="fate-wzxhzdk614wzxhzdk7">FATE <span class="label label-default">1.4</span></h3>
 <p>Fault Tolerant Executor. A framework for executing operations in a fault
 tolerant manner. In the previous release, if the master process died in the
 middle of creating a table it could leave the system in an inconsistent state.
@@ -176,7 +277,7 @@ Zookeeper to synchronize operations acro
 <p>Stores its metadata in an Accumulo table and Zookeeper.</p>
 <h3 id="isolation">Isolation</h3>
 <p>Scans will not see data inserted into a row after the scan of that row begins.</p>
-<h2 id="performance-wzxhzdk4wzxhzdk5">Performance <a id="performance"></a></h2>
+<h2 id="performance-wzxhzdk8wzxhzdk9">Performance <a id="performance"></a></h2>
 <h3 id="relative-encoding">Relative encoding</h3>
 <p>If consecutive keys have identical portions (row, colf, colq, or colvis), there
 is a flag to indicate that a portion is the same as that of the previous key.
@@ -198,7 +299,7 @@ does not activate for short scans.</p>
 <h3 id="caching">Caching</h3>
 <p>Recently scanned data is cached into memory.  There are separate caches for
 indexes and data.  Caching can be turned on and off for individual tables.</p>
-<h3 id="multi-level-rfile-index-14">Multi-level RFile Index (1.4)</h3>
+<h3 id="multi-level-rfile-index-wzxhzdk1014wzxhzdk11">Multi-level RFile Index <span class="label label-default">1.4</span></h3>
 <p>RFiles store an index of the last key in each block. For large files the index
 can become quite large. When the index is large a lot of memory is consumed and
 files take a long time to open. To avoid this problem, RFiles in 1.4 have a
@@ -207,7 +308,7 @@ blocks. The entire index never has to be
 written. When an index block exceeds the configurable size threshold, its
 written out between data blocks. The size of index blocks is configurable on a
 per table basis.</p>
-<h3 id="binary-search-in-rfile-blocks-15">Binary search in RFile blocks (1.5)</h3>
+<h3 id="binary-search-in-rfile-blocks-wzxhzdk1215wzxhzdk13">Binary search in RFile blocks <span class="label label-default">1.5</span></h3>
 <p>RFile uses its index to locate a block of key values.  Once it reaches a block 
 it performs a linear scan to find a key on interest.  Starting with 1.5, Accumulo
 will generate indexes of cached blocks in an adaptive manner.  Accumulo indexes 
@@ -215,11 +316,11 @@ the blocks that are read most frequently
 small index is generated.  As a block is read more, larger indexes are generated 
 making future seeks faster. This strategy allows Accumulo to dynamically respond 
 to read patterns without precomputing block indexes when RFiles are written.</p>
-<h2 id="testing-wzxhzdk6wzxhzdk7">Testing <a id="testing"></a></h2>
+<h2 id="testing-wzxhzdk14wzxhzdk15">Testing <a id="testing"></a></h2>
 <h3 id="mock">Mock</h3>
 <p>The Accumulo client API has a mock implementation that is useful writing unit
 test against Accumulo. Mock Accumulo is in memory and in process.</p>
-<h3 id="mini-accumulo-cluster-15-144">Mini Accumulo Cluster (1.5 &amp; 1.4.4)</h3>
+<h3 id="mini-accumulo-cluster-wzxhzdk1615wzxhzdk17-wzxhzdk18144wzxhzdk19">Mini Accumulo Cluster <span class="label label-default">1.5</span> <span class="label label-default">1.4.4</span></h3>
 <p>Mini Accumulo cluster is a set of utility code that makes it easy to spin up 
 a local Accumulo instance running against the local filesystem.  Mini Accumulo
 is slower than Mock Accumulo, but its behavior mirrors a real Accumulo 
@@ -250,7 +351,7 @@ of the test graphs have a concept of cor
 Other tests have no concept of data correctness and have the simple goal of
 crashing Accumulo. Many obscure bugs have been uncovered by this testing
 framework and subsequently corrected.</p>
-<h2 id="client-api-wzxhzdk8wzxhzdk9">Client API <a id="client"></a></h2>
+<h2 id="client-api-wzxhzdk20wzxhzdk21">Client API <a id="client"></a></h2>
 <h3 id="batch-scanner"><a href="/1.4/user_manual/Writing_Accumulo_Clients.html">Batch Scanner</a></h3>
 <p>Takes a list of Ranges, batches them to the appropriate tablet servers, and
 returns data as it is received (i.e. not in sorted order).</p>
@@ -268,13 +369,13 @@ flexibility in resource allocation.  The
 could be different from the Accumulo nodes.</p>
 <h3 id="map-reduce"><a href="/1.4/user_manual/Writing_Accumulo_Clients.html">Map Reduce</a></h3>
 <p>Accumulo can be a source and/or sink for map reduce jobs.</p>
-<h3 id="thrift-proxy-15-144">Thrift Proxy (1.5 &amp; 1.4.4)</h3>
+<h3 id="thrift-proxy-wzxhzdk2215wzxhzdk23-wzxhzdk24144wzxhzdk25">Thrift Proxy <span class="label label-default">1.5</span> <span class="label label-default">1.4.4</span></h3>
 <p>The Accumulo client code contains a lot of complexity.  For example, the 
 client code locates tablets, retries in the case of failures, and supports 
 concurrent reading and writing.  All of this is written in Java.  The thrift
 proxy wraps the Accumulo client API with thrift, making this API easily
 available to other languages like Python, Ruby, C++, etc.</p>
-<h2 id="extensible-behaviors-wzxhzdk10wzxhzdk11">Extensible Behaviors <a id="behaviors"></a></h2>
+<h2 id="extensible-behaviors-wzxhzdk26wzxhzdk27">Extensible Behaviors <a id="behaviors"></a></h2>
 <h3 id="pluggable-balancer">Pluggable balancer</h3>
 <p>Users can provide a balancer plugin that decides how to distribute tablets
 across a table.  These plugins can be provided on a per table basis.  This is
@@ -294,7 +395,7 @@ period.</p>
 <h3 id="pluggable-logger-assignment-strategy">Pluggable logger assignment strategy</h3>
 <p>The plugin that decided which loggers should be assigned to which tablet
 servers is configurable.</p>
-<h2 id="general-administration-wzxhzdk12wzxhzdk13">General Administration <a id="admin"></a></h2>
+<h2 id="general-administration-wzxhzdk28wzxhzdk29">General Administration <a id="admin"></a></h2>
 <h3 id="monitor-page">Monitor page</h3>
 <p>A simple web server provides basic information about the system health and
 performance.  It displays table sizes, ingest and query statistics, server
@@ -316,7 +417,7 @@ effect until server processes are restar
 <h3 id="table-renaming">Table renaming</h3>
 <p>Tables can be renamed easily because Accumulo uses internal table IDs and
 stores mappings between names and IDs in Zookeeper.</p>
-<h2 id="internal-data-management-wzxhzdk14wzxhzdk15">Internal Data Management <a id="internal_dm"></a></h2>
+<h2 id="internal-data-management-wzxhzdk30wzxhzdk31">Internal Data Management <a id="internal_dm"></a></h2>
 <h3 id="locality-groups">Locality groups</h3>
 <p>Groups columns within a single file. There is a default locality group so that
 not all columns need be specified. The locality groups can be restructured
@@ -333,7 +434,7 @@ only if all files are larger than a conf
 multiplied by the largest file size.  If this cannot be done with all the
 files, the largest file is removed from consideration, and the remaining files
 are considered for compaction.  This is done until there are no files to merge.</p>
-<h3 id="merging-minor-compaction-14">Merging Minor Compaction (1.4)</h3>
+<h3 id="merging-minor-compaction-wzxhzdk3214wzxhzdk33">Merging Minor Compaction <span class="label label-default">1.4</span></h3>
 <p>When a max number of files per tablet is reached, minor compactions will merge
 data from the in-memory map with the smallest file instead of creating new
 files.  This throttles ingest.  In previous releases new files were just created
@@ -341,11 +442,11 @@ even if major compactions were falling b
 was growing.  Without this feature, ingest performance can roughly continue at a
 constant rate, even as scan performance decreases because tablets have too many
 files.</p>
-<h3 id="loading-jars-using-vfs-15">Loading jars using VFS (1.5)</h3>
+<h3 id="loading-jars-using-vfs-wzxhzdk3415wzxhzdk35">Loading jars using VFS <span class="label label-default">1.5</span></h3>
 <p>User written iterators are a useful way to manipulate data in data in Accumulo. 
 Before 1.5., users had to copy their iterators to each tablet server.  Starting 
 with 1.5 Accumulo can load iterators from HDFS using Apache commons VFS.</p>
-<h2 id="on-demand-data-management-wzxhzdk16wzxhzdk17">On-demand Data Management <a id="ondemand_dm"></a></h2>
+<h2 id="on-demand-data-management-wzxhzdk36wzxhzdk37">On-demand Data Management <a id="ondemand_dm"></a></h2>
 <h3 id="compactions">Compactions</h3>
 <p>Ability to force tablets to compact to one file. Even tablets with one file are
 compacted.  This is useful for improving query performance, permanently
@@ -357,22 +458,22 @@ that compaction event.</p>
 <p>Arbitrary split points can be added to an online table at any point in time.
 This is useful for increasing ingest performance on a new table. It can also be
 used to accommodate new data patterns in an existing table.</p>
-<h3 id="tablet-merging-14">Tablet Merging (1.4)</h3>
+<h3 id="tablet-merging-wzxhzdk3814wzxhzdk39">Tablet Merging <span class="label label-default">1.4</span></h3>
 <p>Tablet merging is a new feature. Merging of tablets can be requested in the
 shell; Accumulo does not merge tablets automatically. In 1.5, the METADATA tablets 
 can be merged.</p>
-<h3 id="table-cloning-14">Table Cloning (1.4)</h3>
+<h3 id="table-cloning-wzxhzdk4014wzxhzdk41">Table Cloning <span class="label label-default">1.4</span></h3>
 <p>Allows users to quickly create a new table that references an existing table's
 data and copies its configuration. A cloned table and its source table can be
 mutated independently. Testing was the motivating reason behind this new
 feature. For example to test a new filtering iterator, clone the table, add the
 filter to the clone, and force a major compaction.</p>
-<h3 id="importexport-table-15">Import/Export Table (1.5)</h3>
+<h3 id="importexport-table-wzxhzdk4215wzxhzdk43">Import/Export Table <span class="label label-default">1.5</span></h3>
 <p>An offline tables metadata and files can easily be copied to another cluster and 
 imported.</p>
-<h3 id="compact-range-14">Compact Range (1.4)</h3>
+<h3 id="compact-range-wzxhzdk4414wzxhzdk45">Compact Range <span class="label label-default">1.4</span></h3>
 <p>Compact each tablet that falls within a row range down to a single file.  </p>
-<h3 id="delete-range-14">Delete Range (1.4)</h3>
+<h3 id="delete-range-wzxhzdk4614wzxhzdk47">Delete Range <span class="label label-default">1.4</span></h3>
 <p>Added an operation to efficiently delete a range of rows from a table. Tablets
 that fall completely within a range are simply dropped. Tablets overlapping the
 beginning and end of the range are split, compacted, and then merged.  </p>
@@ -380,19 +481,27 @@ beginning and end of the range are split
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100">
     </a>
     <div class="copyright">
       <p>
-        Copyright &copy; 2011-2013 The Apache Software Foundation, Licensed under
+        Copyright &copy; 2011-2014 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 Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-        <br />
-        project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.
+        project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.<br />
+        Site created with <a href="http://getbootstrap.com/">Bootstrap</a> including icons from <a href="http://glyphicons.com/">GLYPHICONS</a> and <a href="http://fontawesome.io/">Font Awesome</a>.
       </p>
     </div> 
   </div>
+  </div>
+
+</div>
+</div>
+
+<script type="text/javascript">
+
+$("#nav_features").addClass("active");
 
+</script>
 </body>
 </html>

Modified: websites/staging/accumulo/trunk/content/papers.html
==============================================================================
--- websites/staging/accumulo/trunk/content/papers.html (original)
+++ websites/staging/accumulo/trunk/content/papers.html Sun May  4 17:29:31 2014
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
 <head>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,12 +17,24 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link href="/css/bootstrap.min.css" rel="stylesheet">
+  <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+    <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+  <![endif]-->
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+  <script src="/js/bootstrap.min.js"></script>
   <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
   <title>Apache Accumulo Related Links</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
   <script type="text/javascript">
-
+/*
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', 'UA-21103458-6']);
     _gaq.push(['_setDomainName', 'apache.org']);
@@ -34,63 +46,152 @@
       ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
-
+*/
   </script>
 
 
 </head>
 
 <body>
-  <div id="banner">&nbsp;
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="container-fluid">
+  <div class="navbar-header">
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <a class="navbar-brand" href="/index.html">Accumulo</a>
   </div>
+  <div class="collapse navbar-collapse" id="navbar-items">
+  <ul class="nav navbar-nav">
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Project <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_index"><a href="/index.html">Home</a></li>
+<li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+<li id="nav_features"><a href="/notable_features.html">Features</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+</ul>
+</li>
 
-  <div id="navigation">
-  <h1 id="project">Project</h1>
-<ul>
-<li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
-<li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Community <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_getinvolved"><a href="/get_involved.html">Get Involved</a></li>
+<li id="nav_mailinglists"><a href="/mailing_list.html">Mailing Lists</a></li>
+<li id="nav_people"><a href="/people.html">People</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Governance</li>
+<li id="nav_bylaws"><a href="/bylaws.html">Bylaws</a></li>
+<li id="nav_consensusbuilding"><a href="/governance/consensusBuilding.html">Consensus Building</a></li>
+<li id="nav_lazyconsensus"><a href="/governance/lazyConsensus.html">Lazy Consensus</a></li>
+<li id="nav_releasing"><a href="/governance/releasing.html">Releasing</a></li>
+<li id="nav_voting"><a href="/governance/voting.html">Voting</a></li>
 </ul>
-<h1 id="community">Community</h1>
-<ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Development <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_source"><a href="/source.html">Source &amp; Guide</a></li>
+<li id="nav_git"><a href="/git.html">Git WIP</a></li>
+<li id="nav_contrib"><a href="/contrib.html">Contrib Projects</a></li>
+<li id="nav_releasing"><a href="/releasing.html">Making Releases</a></li>
+<li><a href="https://issues.apache.org/jira/browse/accumulo"><i class="fa fa-external-link"></i> Issues</a></li>
+<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/"><i class="fa fa-external-link"></i> Builds</a></li>
 </ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/source.html">Source &amp; Guide</a></li>
-<li><a href="/git.html">Git WIP</a></li>
-<li><a href="/contrib.html">Contrib Projects</a></li>
-<li><a href="/releasing.html">Making Releases</a></li>
-<li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
-<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Documentation <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<!-- <li>Manual <a href="http://accumulo.apache.org/1.4/user_manual">1.4</a> / <a href="http://accumulo.apache.org/1.5/accumulo_user_manual.html">1.5</a></li> -->
+<li class="dropdown-header">Manual</li>
+<li><a href="/1.4/user_manual">1.4</a></li>
+<li><a href="/1.5/accumulo_user_manual.html">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Javadoc</li>
+<li><a href="/1.4/apidocs">1.4</a></li>
+<li><a href="/1.5/apidocs">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Examples</li>
+<li id="nav_examples_1_4"><a href="/1.4/examples">1.4</a></li>
+<li id="nav_examples_1_5"><a href="/1.5/examples">1.5</a></li>
+<li class="divider"></li>
+<li id="nav_screenshots"><a href="/screenshots.html">Screenshots</a></li>
+<li id="nav_papers"><a href="/papers.html">Papers &amp; Other Links</a></li>
+<li id="nav_glossary"><a href="/glossary.html">Glossary</a></li>
 </ul>
-<h1 id="documentation">Documentation</h1>
-<ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers &amp; Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        ASF Links <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li><a href="http://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link"></i> Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/"><i class="fa fa-external-link"></i> Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link"></i> Thanks</a></li>
 </ul>
-<h1 id="asf-links">ASF links</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-<li><a href="http://www.apache.org/security/">Security</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+</li>
 </ul>
+
+<form method="GET" action="http://search-hadoop.com/" class="navbar-form navbar-right" role="search">
+  <div class="form-group">
+    <input type="text" name="q" class="form-control" placeholder="Search"/>
+    <input type="hidden" name="fc_project" value="Accumulo"/>
   </div>
+  <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+</form>
+  </div>
+
+</div>
+</nav>
 
+
+<div class="container-fluid">
+<div class="row">
+  <div class="col-md-2" id="sidebar">
+  <div style="text-align: center">
+    <a href="/index.html"><img id="logo" alt="Apache Accumulo &trade;" class="img-responsive" src="/images/accumulo-logo.png"/></a>
+    <br>
+Latest 1.5 release: <strong>1.5.1</strong><br>
+Latest 1.4 release: <strong>1.4.5</strong><br>
+    <br>
+    <a id="download-button-sidebar" class="btn btn-success btn-block" href="/downloads/" role="button">Download</a>
+  </div>
+    <hr>
+<table class="table" id="sociallinks">
+<tr><td><img src="/images/Twitter_logo_blue.png" style="height: 1em"></td><td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td></tr>
+<tr><td><img src="/images/InBug-16px_0.png"></td><td><a href="https://www.linkedin.com/groups/Apache-Accumulo-Professionals-4554913">Apache Accumulo Professionals</a></td></tr>
+<tr><td><img src="/images/GitHub-Mark-32px.png" style="height: 1em"></td><td><a href="https://github.com/apache/accumulo">apache / accumulo</a></td></tr>
+<tr><td><span class="glyphicon glyphicon-comment"></span></td><td><a href="irc://chat.freenode.net/accumulo">#accumulo @ freenode</a></td></tr>
+</table>
+<hr>
+<a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit-2014.png"></a>
+  </div>
+  <div class="col-md-8 col-md-offset-1">
+<!--
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo &trade;" src="/images/accumulo-logo.png"/>
   </div>
+-->
 
   <div id="content">
+
     <h1 class="title">Apache Accumulo Related Links</h1>
+
     <h2 id="applications">Applications</h2>
 <ul>
 <li><a href="http://trendulo.com/">Trendulo: Twitter trend analysis using Apache Accumulo</a> (<a href="https://github.com/jaredwinick/Trendulo">github code</a>)</li>
@@ -164,19 +265,27 @@
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100">
     </a>
     <div class="copyright">
       <p>
-        Copyright &copy; 2011-2013 The Apache Software Foundation, Licensed under
+        Copyright &copy; 2011-2014 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 Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-        <br />
-        project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.
+        project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.<br />
+        Site created with <a href="http://getbootstrap.com/">Bootstrap</a> including icons from <a href="http://glyphicons.com/">GLYPHICONS</a> and <a href="http://fontawesome.io/">Font Awesome</a>.
       </p>
     </div> 
   </div>
+  </div>
+
+</div>
+</div>
+
+<script type="text/javascript">
+
+$("#nav_papers").addClass("active");
 
+</script>
 </body>
 </html>

Modified: websites/staging/accumulo/trunk/content/people.html
==============================================================================
--- websites/staging/accumulo/trunk/content/people.html (original)
+++ websites/staging/accumulo/trunk/content/people.html Sun May  4 17:29:31 2014
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
 <head>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,12 +17,24 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link href="/css/bootstrap.min.css" rel="stylesheet">
+  <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+    <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+  <![endif]-->
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+  <script src="/js/bootstrap.min.js"></script>
   <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
   <title>Apache Accumulo Contributors</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
   <script type="text/javascript">
-
+/*
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', 'UA-21103458-6']);
     _gaq.push(['_setDomainName', 'apache.org']);
@@ -34,90 +46,152 @@
       ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
-
+*/
   </script>
 
 
 </head>
 
 <body>
-  <div id="banner">&nbsp;
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="container-fluid">
+  <div class="navbar-header">
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <a class="navbar-brand" href="/index.html">Accumulo</a>
   </div>
+  <div class="collapse navbar-collapse" id="navbar-items">
+  <ul class="nav navbar-nav">
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Project <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_index"><a href="/index.html">Home</a></li>
+<li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+<li id="nav_features"><a href="/notable_features.html">Features</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Community <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_getinvolved"><a href="/get_involved.html">Get Involved</a></li>
+<li id="nav_mailinglists"><a href="/mailing_list.html">Mailing Lists</a></li>
+<li id="nav_people"><a href="/people.html">People</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Governance</li>
+<li id="nav_bylaws"><a href="/bylaws.html">Bylaws</a></li>
+<li id="nav_consensusbuilding"><a href="/governance/consensusBuilding.html">Consensus Building</a></li>
+<li id="nav_lazyconsensus"><a href="/governance/lazyConsensus.html">Lazy Consensus</a></li>
+<li id="nav_releasing"><a href="/governance/releasing.html">Releasing</a></li>
+<li id="nav_voting"><a href="/governance/voting.html">Voting</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Development <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_source"><a href="/source.html">Source &amp; Guide</a></li>
+<li id="nav_git"><a href="/git.html">Git WIP</a></li>
+<li id="nav_contrib"><a href="/contrib.html">Contrib Projects</a></li>
+<li id="nav_releasing"><a href="/releasing.html">Making Releases</a></li>
+<li><a href="https://issues.apache.org/jira/browse/accumulo"><i class="fa fa-external-link"></i> Issues</a></li>
+<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/"><i class="fa fa-external-link"></i> Builds</a></li>
+</ul>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Documentation <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<!-- <li>Manual <a href="http://accumulo.apache.org/1.4/user_manual">1.4</a> / <a href="http://accumulo.apache.org/1.5/accumulo_user_manual.html">1.5</a></li> -->
+<li class="dropdown-header">Manual</li>
+<li><a href="/1.4/user_manual">1.4</a></li>
+<li><a href="/1.5/accumulo_user_manual.html">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Javadoc</li>
+<li><a href="/1.4/apidocs">1.4</a></li>
+<li><a href="/1.5/apidocs">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Examples</li>
+<li id="nav_examples_1_4"><a href="/1.4/examples">1.4</a></li>
+<li id="nav_examples_1_5"><a href="/1.5/examples">1.5</a></li>
+<li class="divider"></li>
+<li id="nav_screenshots"><a href="/screenshots.html">Screenshots</a></li>
+<li id="nav_papers"><a href="/papers.html">Papers &amp; Other Links</a></li>
+<li id="nav_glossary"><a href="/glossary.html">Glossary</a></li>
+</ul>
+</li>
 
-  <div id="navigation">
-  <h1 id="project">Project</h1>
-<ul>
-<li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
-<li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
-</ul>
-<h1 id="community">Community</h1>
-<ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
-</ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/source.html">Source &amp; Guide</a></li>
-<li><a href="/git.html">Git WIP</a></li>
-<li><a href="/contrib.html">Contrib Projects</a></li>
-<li><a href="/releasing.html">Making Releases</a></li>
-<li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
-<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
-</ul>
-<h1 id="documentation">Documentation</h1>
-<ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers &amp; Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
-</ul>
-<h1 id="asf-links">ASF links</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-<li><a href="http://www.apache.org/security/">Security</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        ASF Links <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li><a href="http://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link"></i> Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/"><i class="fa fa-external-link"></i> Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link"></i> Thanks</a></li>
 </ul>
+</li>
+</ul>
+
+<form method="GET" action="http://search-hadoop.com/" class="navbar-form navbar-right" role="search">
+  <div class="form-group">
+    <input type="text" name="q" class="form-control" placeholder="Search"/>
+    <input type="hidden" name="fc_project" value="Accumulo"/>
+  </div>
+  <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+</form>
   </div>
 
+</div>
+</nav>
+
+
+<div class="container-fluid">
+<div class="row">
+  <div class="col-md-2" id="sidebar">
+  <div style="text-align: center">
+    <a href="/index.html"><img id="logo" alt="Apache Accumulo &trade;" class="img-responsive" src="/images/accumulo-logo.png"/></a>
+    <br>
+Latest 1.5 release: <strong>1.5.1</strong><br>
+Latest 1.4 release: <strong>1.4.5</strong><br>
+    <br>
+    <a id="download-button-sidebar" class="btn btn-success btn-block" href="/downloads/" role="button">Download</a>
+  </div>
+    <hr>
+<table class="table" id="sociallinks">
+<tr><td><img src="/images/Twitter_logo_blue.png" style="height: 1em"></td><td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td></tr>
+<tr><td><img src="/images/InBug-16px_0.png"></td><td><a href="https://www.linkedin.com/groups/Apache-Accumulo-Professionals-4554913">Apache Accumulo Professionals</a></td></tr>
+<tr><td><img src="/images/GitHub-Mark-32px.png" style="height: 1em"></td><td><a href="https://github.com/apache/accumulo">apache / accumulo</a></td></tr>
+<tr><td><span class="glyphicon glyphicon-comment"></span></td><td><a href="irc://chat.freenode.net/accumulo">#accumulo @ freenode</a></td></tr>
+</table>
+<hr>
+<a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit-2014.png"></a>
+  </div>
+  <div class="col-md-8 col-md-offset-1">
+<!--
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo &trade;" src="/images/accumulo-logo.png"/>
   </div>
+-->
 
   <div id="content">
-    <h1 class="title">Apache Accumulo Contributors</h1>
-    <style type="text/css">
-table {
-  width:100%;
-}
-table, td {
-  border-collapse: collapse;
-  border-top: 1px solid #ccc;
-  border-bottom: 1px solid #ccc;
-  padding: 5px;
-}
-th {
-  style: font-weight:bold;
-  text-align: left;
-  background: #FFFFFF;
-}
-tr:nth-child(2n){
-  background: #F0FFF0;
-}
-
-tr:nth-child(2n+1) {
-  background: #FFFFFF;
-}
-
-</style>
 
-<h2 id="pmc-and-committers">PMC and Committers</h2>
-<table>
+    <h2 id="pmc-and-committers">PMC and Committers</h2>
+<table class="table table-striped">
   <tr><th>username</th><th>name</th><th>organization</th><th>timezone</th></tr>
   <tr><td>acordova</td><td>Aaron Cordova</td><td><a href="http://www.koverse.com">Koverse</a></td><td></td></tr>
   <tr><td>afuchs</td><td>Adam Fuchs</td><td><a href=http://sqrrl.com/>sqrrl</a></td><td>ET (<a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5</a> / <a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4</a>)</td></tr>
@@ -143,7 +217,7 @@ tr:nth-child(2n+1) {
 </table>
 
 <h2 id="contributors">Contributors</h2>
-<table>
+<table class="table table-striped">
   <tr><th>username</th><th>name</th><th>organization</th><th>timezone</th></tr>
   <tr><td></td><td>Aaron Glahe</td><td><a href=http://www.data-tactics.com/>Data Tatics</a></td><td>ET (<a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5</a> / <a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4</a>)</td></tr>
   <tr><td></td><td>Al Krinker</td><td></td><td>ET (<a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5</a> / <a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4</a>)</td></tr>
@@ -204,19 +278,27 @@ tr:nth-child(2n+1) {
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100">
     </a>
     <div class="copyright">
       <p>
-        Copyright &copy; 2011-2013 The Apache Software Foundation, Licensed under
+        Copyright &copy; 2011-2014 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 Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-        <br />
-        project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.
+        project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.<br />
+        Site created with <a href="http://getbootstrap.com/">Bootstrap</a> including icons from <a href="http://glyphicons.com/">GLYPHICONS</a> and <a href="http://fontawesome.io/">Font Awesome</a>.
       </p>
     </div> 
   </div>
+  </div>
+
+</div>
+</div>
+
+<script type="text/javascript">
+
+$("#nav_people").addClass("active");
 
+</script>
 </body>
 </html>

Modified: websites/staging/accumulo/trunk/content/release_notes/1.5.1.html
==============================================================================
--- websites/staging/accumulo/trunk/content/release_notes/1.5.1.html (original)
+++ websites/staging/accumulo/trunk/content/release_notes/1.5.1.html Sun May  4 17:29:31 2014
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
 <head>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,12 +17,24 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link href="/css/bootstrap.min.css" rel="stylesheet">
+  <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+    <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+  <![endif]-->
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+  <script src="/js/bootstrap.min.js"></script>
   <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
   <title>Apache Accumulo 1.5.1 Release Notes</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
   <script type="text/javascript">
-
+/*
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', 'UA-21103458-6']);
     _gaq.push(['_setDomainName', 'apache.org']);
@@ -34,63 +46,152 @@
       ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
-
+*/
   </script>
 
 
 </head>
 
 <body>
-  <div id="banner">&nbsp;
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="container-fluid">
+  <div class="navbar-header">
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <a class="navbar-brand" href="/index.html">Accumulo</a>
   </div>
+  <div class="collapse navbar-collapse" id="navbar-items">
+  <ul class="nav navbar-nav">
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Project <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_index"><a href="/index.html">Home</a></li>
+<li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+<li id="nav_features"><a href="/notable_features.html">Features</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+</ul>
+</li>
 
-  <div id="navigation">
-  <h1 id="project">Project</h1>
-<ul>
-<li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
-<li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Community <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_getinvolved"><a href="/get_involved.html">Get Involved</a></li>
+<li id="nav_mailinglists"><a href="/mailing_list.html">Mailing Lists</a></li>
+<li id="nav_people"><a href="/people.html">People</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Governance</li>
+<li id="nav_bylaws"><a href="/bylaws.html">Bylaws</a></li>
+<li id="nav_consensusbuilding"><a href="/governance/consensusBuilding.html">Consensus Building</a></li>
+<li id="nav_lazyconsensus"><a href="/governance/lazyConsensus.html">Lazy Consensus</a></li>
+<li id="nav_releasing"><a href="/governance/releasing.html">Releasing</a></li>
+<li id="nav_voting"><a href="/governance/voting.html">Voting</a></li>
 </ul>
-<h1 id="community">Community</h1>
-<ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Development <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_source"><a href="/source.html">Source &amp; Guide</a></li>
+<li id="nav_git"><a href="/git.html">Git WIP</a></li>
+<li id="nav_contrib"><a href="/contrib.html">Contrib Projects</a></li>
+<li id="nav_releasing"><a href="/releasing.html">Making Releases</a></li>
+<li><a href="https://issues.apache.org/jira/browse/accumulo"><i class="fa fa-external-link"></i> Issues</a></li>
+<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/"><i class="fa fa-external-link"></i> Builds</a></li>
 </ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/source.html">Source &amp; Guide</a></li>
-<li><a href="/git.html">Git WIP</a></li>
-<li><a href="/contrib.html">Contrib Projects</a></li>
-<li><a href="/releasing.html">Making Releases</a></li>
-<li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
-<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Documentation <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<!-- <li>Manual <a href="http://accumulo.apache.org/1.4/user_manual">1.4</a> / <a href="http://accumulo.apache.org/1.5/accumulo_user_manual.html">1.5</a></li> -->
+<li class="dropdown-header">Manual</li>
+<li><a href="/1.4/user_manual">1.4</a></li>
+<li><a href="/1.5/accumulo_user_manual.html">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Javadoc</li>
+<li><a href="/1.4/apidocs">1.4</a></li>
+<li><a href="/1.5/apidocs">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Examples</li>
+<li id="nav_examples_1_4"><a href="/1.4/examples">1.4</a></li>
+<li id="nav_examples_1_5"><a href="/1.5/examples">1.5</a></li>
+<li class="divider"></li>
+<li id="nav_screenshots"><a href="/screenshots.html">Screenshots</a></li>
+<li id="nav_papers"><a href="/papers.html">Papers &amp; Other Links</a></li>
+<li id="nav_glossary"><a href="/glossary.html">Glossary</a></li>
 </ul>
-<h1 id="documentation">Documentation</h1>
-<ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers &amp; Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        ASF Links <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li><a href="http://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link"></i> Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/"><i class="fa fa-external-link"></i> Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link"></i> Thanks</a></li>
 </ul>
-<h1 id="asf-links">ASF links</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-<li><a href="http://www.apache.org/security/">Security</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+</li>
 </ul>
+
+<form method="GET" action="http://search-hadoop.com/" class="navbar-form navbar-right" role="search">
+  <div class="form-group">
+    <input type="text" name="q" class="form-control" placeholder="Search"/>
+    <input type="hidden" name="fc_project" value="Accumulo"/>
   </div>
+  <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+</form>
+  </div>
+
+</div>
+</nav>
+
 
+<div class="container-fluid">
+<div class="row">
+  <div class="col-md-2" id="sidebar">
+  <div style="text-align: center">
+    <a href="/index.html"><img id="logo" alt="Apache Accumulo &trade;" class="img-responsive" src="/images/accumulo-logo.png"/></a>
+    <br>
+Latest 1.5 release: <strong>1.5.1</strong><br>
+Latest 1.4 release: <strong>1.4.5</strong><br>
+    <br>
+    <a id="download-button-sidebar" class="btn btn-success btn-block" href="/downloads/" role="button">Download</a>
+  </div>
+    <hr>
+<table class="table" id="sociallinks">
+<tr><td><img src="/images/Twitter_logo_blue.png" style="height: 1em"></td><td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td></tr>
+<tr><td><img src="/images/InBug-16px_0.png"></td><td><a href="https://www.linkedin.com/groups/Apache-Accumulo-Professionals-4554913">Apache Accumulo Professionals</a></td></tr>
+<tr><td><img src="/images/GitHub-Mark-32px.png" style="height: 1em"></td><td><a href="https://github.com/apache/accumulo">apache / accumulo</a></td></tr>
+<tr><td><span class="glyphicon glyphicon-comment"></span></td><td><a href="irc://chat.freenode.net/accumulo">#accumulo @ freenode</a></td></tr>
+</table>
+<hr>
+<a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit-2014.png"></a>
+  </div>
+  <div class="col-md-8 col-md-offset-1">
+<!--
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo &trade;" src="/images/accumulo-logo.png"/>
   </div>
+-->
 
   <div id="content">
+
     <h1 class="title">Apache Accumulo 1.5.1 Release Notes</h1>
+
     <p>Apache Accumulo 1.5.1 is a maintenance release on the 1.5 version branch.
 This release contains changes from over 200 issues, comprised of bug fixes
 (client side and server side), new test cases, and updated Hadoop support
@@ -267,19 +368,25 @@ and, in HDFS High-Availability instances
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100">
     </a>
     <div class="copyright">
       <p>
-        Copyright &copy; 2011-2013 The Apache Software Foundation, Licensed under
+        Copyright &copy; 2011-2014 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 Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-        <br />
-        project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.
+        project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.<br />
+        Site created with <a href="http://getbootstrap.com/">Bootstrap</a> including icons from <a href="http://glyphicons.com/">GLYPHICONS</a> and <a href="http://fontawesome.io/">Font Awesome</a>.
       </p>
     </div> 
   </div>
+  </div>
+
+</div>
+</div>
+
+<script type="text/javascript">
 
+</script>
 </body>
 </html>

Modified: websites/staging/accumulo/trunk/content/release_notes/1.6.0.html
==============================================================================
--- websites/staging/accumulo/trunk/content/release_notes/1.6.0.html (original)
+++ websites/staging/accumulo/trunk/content/release_notes/1.6.0.html Sun May  4 17:29:31 2014
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
 <head>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,12 +17,24 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link href="/css/bootstrap.min.css" rel="stylesheet">
+  <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+    <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+  <![endif]-->
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+  <script src="/js/bootstrap.min.js"></script>
   <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
   <title>Release Notes for Apache Accumulo 1.6.0</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
   <script type="text/javascript">
-
+/*
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', 'UA-21103458-6']);
     _gaq.push(['_setDomainName', 'apache.org']);
@@ -34,63 +46,152 @@
       ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
-
+*/
   </script>
 
 
 </head>
 
 <body>
-  <div id="banner">&nbsp;
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+<div class="container-fluid">
+  <div class="navbar-header">
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
+      <span class="sr-only">Toggle navigation</span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+      <span class="icon-bar"></span>
+    </button>
+    <a class="navbar-brand" href="/index.html">Accumulo</a>
   </div>
+  <div class="collapse navbar-collapse" id="navbar-items">
+  <ul class="nav navbar-nav">
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Project <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_index"><a href="/index.html">Home</a></li>
+<li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+<li id="nav_features"><a href="/notable_features.html">Features</a></li>
+<li><a href="http://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+</ul>
+</li>
 
-  <div id="navigation">
-  <h1 id="project">Project</h1>
-<ul>
-<li><a href="/">Home</a></li>
-<li><a href="/downloads">Downloads</a></li>
-<li><a href="/notable_features.html">Features</a></li>
-<li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li>
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Community <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_getinvolved"><a href="/get_involved.html">Get Involved</a></li>
+<li id="nav_mailinglists"><a href="/mailing_list.html">Mailing Lists</a></li>
+<li id="nav_people"><a href="/people.html">People</a></li>
+<li class="divider"></li>
+<li class="dropdown-header">Governance</li>
+<li id="nav_bylaws"><a href="/bylaws.html">Bylaws</a></li>
+<li id="nav_consensusbuilding"><a href="/governance/consensusBuilding.html">Consensus Building</a></li>
+<li id="nav_lazyconsensus"><a href="/governance/lazyConsensus.html">Lazy Consensus</a></li>
+<li id="nav_releasing"><a href="/governance/releasing.html">Releasing</a></li>
+<li id="nav_voting"><a href="/governance/voting.html">Voting</a></li>
 </ul>
-<h1 id="community">Community</h1>
-<ul>
-<li><a href="/get_involved.html">Get Involved</a></li>
-<li><a href="/mailing_list.html">Mailing Lists</a></li>
-<li><a href="/people.html">People</a></li>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Development <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li id="nav_source"><a href="/source.html">Source &amp; Guide</a></li>
+<li id="nav_git"><a href="/git.html">Git WIP</a></li>
+<li id="nav_contrib"><a href="/contrib.html">Contrib Projects</a></li>
+<li id="nav_releasing"><a href="/releasing.html">Making Releases</a></li>
+<li><a href="https://issues.apache.org/jira/browse/accumulo"><i class="fa fa-external-link"></i> Issues</a></li>
+<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/"><i class="fa fa-external-link"></i> Builds</a></li>
 </ul>
-<h1 id="development">Development</h1>
-<ul>
-<li><a href="/source.html">Source &amp; Guide</a></li>
-<li><a href="/git.html">Git WIP</a></li>
-<li><a href="/contrib.html">Contrib Projects</a></li>
-<li><a href="/releasing.html">Making Releases</a></li>
-<li><a href="https://issues.apache.org/jira/browse/accumulo">Issues</a></li>
-<li><a href="https://builds.apache.org/view/A-D/view/Accumulo/">Builds</a></li>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        Documentation <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<!-- <li>Manual <a href="http://accumulo.apache.org/1.4/user_manual">1.4</a> / <a href="http://accumulo.apache.org/1.5/accumulo_user_manual.html">1.5</a></li> -->
+<li class="dropdown-header">Manual</li>
+<li><a href="/1.4/user_manual">1.4</a></li>
+<li><a href="/1.5/accumulo_user_manual.html">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Javadoc</li>
+<li><a href="/1.4/apidocs">1.4</a></li>
+<li><a href="/1.5/apidocs">1.5</a></li>
+<li class="divider"</li>
+<li class="dropdown-header">Examples</li>
+<li id="nav_examples_1_4"><a href="/1.4/examples">1.4</a></li>
+<li id="nav_examples_1_5"><a href="/1.5/examples">1.5</a></li>
+<li class="divider"></li>
+<li id="nav_screenshots"><a href="/screenshots.html">Screenshots</a></li>
+<li id="nav_papers"><a href="/papers.html">Papers &amp; Other Links</a></li>
+<li id="nav_glossary"><a href="/glossary.html">Glossary</a></li>
 </ul>
-<h1 id="documentation">Documentation</h1>
-<ul>
-<li>Manual <a href="/1.4/user_manual">1.4</a> / <a href="/1.5/accumulo_user_manual.html">1.5</a></li>
-<li>Javadoc <a href="/1.4/apidocs">1.4</a> / <a href="/1.5/apidocs">1.5</a></li>
-<li>Examples <a href="/1.4/examples">1.4</a> / <a href="/1.5/examples">1.5</a></li>
-<li><a href="/screenshots.html">Screenshots</a></li>
-<li><a href="/papers.html">Papers &amp; Other Links</a></li>
-<li><a href="/glossary.html">Glossary</a></li>
+</li>
+
+    <li class="dropdown">
+      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        ASF Links <span class="caret"></span>
+      </a>
+<ul class="dropdown-menu">
+<li><a href="http://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html"><i class="fa fa-external-link"></i> Sponsorship</a></li>
+<li><a href="http://www.apache.org/security/"><i class="fa fa-external-link"></i> Security</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html"><i class="fa fa-external-link"></i> Thanks</a></li>
 </ul>
-<h1 id="asf-links">ASF links</h1>
-<ul>
-<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
-<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-<li><a href="http://www.apache.org/security/">Security</a></li>
-<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
+</li>
 </ul>
+
+<form method="GET" action="http://search-hadoop.com/" class="navbar-form navbar-right" role="search">
+  <div class="form-group">
+    <input type="text" name="q" class="form-control" placeholder="Search"/>
+    <input type="hidden" name="fc_project" value="Accumulo"/>
   </div>
+  <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+</form>
+  </div>
+
+</div>
+</nav>
+
 
+<div class="container-fluid">
+<div class="row">
+  <div class="col-md-2" id="sidebar">
+  <div style="text-align: center">
+    <a href="/index.html"><img id="logo" alt="Apache Accumulo &trade;" class="img-responsive" src="/images/accumulo-logo.png"/></a>
+    <br>
+Latest 1.5 release: <strong>1.5.1</strong><br>
+Latest 1.4 release: <strong>1.4.5</strong><br>
+    <br>
+    <a id="download-button-sidebar" class="btn btn-success btn-block" href="/downloads/" role="button">Download</a>
+  </div>
+    <hr>
+<table class="table" id="sociallinks">
+<tr><td><img src="/images/Twitter_logo_blue.png" style="height: 1em"></td><td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td></tr>
+<tr><td><img src="/images/InBug-16px_0.png"></td><td><a href="https://www.linkedin.com/groups/Apache-Accumulo-Professionals-4554913">Apache Accumulo Professionals</a></td></tr>
+<tr><td><img src="/images/GitHub-Mark-32px.png" style="height: 1em"></td><td><a href="https://github.com/apache/accumulo">apache / accumulo</a></td></tr>
+<tr><td><span class="glyphicon glyphicon-comment"></span></td><td><a href="irc://chat.freenode.net/accumulo">#accumulo @ freenode</a></td></tr>
+</table>
+<hr>
+<a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit-2014.png"></a>
+  </div>
+  <div class="col-md-8 col-md-offset-1">
+<!--
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo &trade;" src="/images/accumulo-logo.png"/>
   </div>
+-->
 
   <div id="content">
+
     <h1 class="title">Release Notes for Apache Accumulo 1.6.0</h1>
+
     <p><strong>DRAFT 1.6.0 RELEASE NOTES</strong></p>
 <p>Apache Accumulo 1.6.0 adds some major new features and fixes many bugs.  This release contains changes from 609 issues contributed by 36 contributors and committers.  </p>
 <p>Accumulo 1.6.0 runs on Hadoop 1, however Hadoop 2 with HA namenode is recommended for production systems.  In addition to HA, Hadoop 2 also offers better data durability guarantees, in the case when nodes lose power, than Hadoop 1.</p>
@@ -300,19 +401,25 @@ and, in HDFS High-Availability instances
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100">
     </a>
     <div class="copyright">
       <p>
-        Copyright &copy; 2011-2013 The Apache Software Foundation, Licensed under
+        Copyright &copy; 2011-2014 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 Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-        <br />
-        project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.
+        project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.<br />
+        Site created with <a href="http://getbootstrap.com/">Bootstrap</a> including icons from <a href="http://glyphicons.com/">GLYPHICONS</a> and <a href="http://fontawesome.io/">Font Awesome</a>.
       </p>
     </div> 
   </div>
+  </div>
+
+</div>
+</div>
+
+<script type="text/javascript">
 
+</script>
 </body>
 </html>