accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r908015 [15/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...
Date Sun, 04 May 2014 17:29:34 GMT
Modified: websites/staging/accumulo/trunk/content/releasing.html
==============================================================================
--- websites/staging/accumulo/trunk/content/releasing.html (original)
+++ websites/staging/accumulo/trunk/content/releasing.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>Making a Release</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">Making a Release</h1>
+
     <p>This is a guide for the creation of a release of Apache Accumulo. </p>
 <h2 id="setup">Setup</h2>
 <p>There are number of things that are required before attempting to build a release.</p>
@@ -188,19 +289,27 @@ the javadocs.</p>
 
   <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_releasing").addClass("active");
 
+</script>
 </body>
 </html>

Modified: websites/staging/accumulo/trunk/content/screenshots.html
==============================================================================
--- websites/staging/accumulo/trunk/content/screenshots.html (original)
+++ websites/staging/accumulo/trunk/content/screenshots.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 Screenshots</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,67 +46,174 @@
       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>
 
-  <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="#">
+        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 Screenshots</h1>
-    <p>The following is a screenshot of the Apache Accumulo&trade; monitor overview web page.  Accumulo was running on an eleven node cluster.  The continuous ingest test suite was running to generate load.  Ten continuous ingest clients were running.</p>
-<p><img src=/images/overview2.png /></p>
-<p>The following screenshot shows the monitor master page.  This page gives information about individual tables within accumulo.  Continuous ingest is running against the table ci.</p>
-<p><img src=/images/master2.png /></p>
+
+    <div class="row">
+<div class="col-xs-3">
+The following is a screenshot of the Apache Accumulo&trade; monitor overview web page.  Accumulo was running on an eleven node cluster.  The continuous ingest test suite was running to generate load.  Ten continuous ingest clients were running.
+</div>
+<div class="col-xs-9">
+<a class="thumbnail" href="/images/overview2.png">
+<img src="/images/overview2.png" alt="monitor overview"/>
+</a>
+</div>
+</div>
+
+<div class="row">
+<div class="col-xs-3">
+The following screenshot shows the monitor master page.  This page gives information about individual tables within accumulo.  Continuous ingest is running against the table ci.
+</div>
+<div class="col-xs-9">
+<a class="thumbnail" href="/images/master2.png">
+<img src="/images/master2.png" alt="monitor master"/>
+</a>
+</div>
+</div>
+
 <p>The data generated by the continuous ingest test suite looks like the following.  The data is random, but forms many giant linked list.  Each ingest client continually generates linked list containing 25 million nodes.  In the shell session below a few scans are issued to start following the linked list that the first node in the table is part of.</p>
 <div class="codehilite"><pre><span class="n">root</span><span class="p">@</span><span class="n">test15</span> <span class="n">ci</span><span class="o">&gt;</span> <span class="n">scan</span> 
 000000000135<span class="n">fbbe</span> 074<span class="n">c</span><span class="p">:</span>569<span class="n">c</span> <span class="p">[]</span>    2<span class="n">db1de18</span><span class="o">-</span><span class="n">cd37</span><span class="o">-</span>407<span class="n">d</span><span class="o">-</span><span class="n">b060</span><span class="o">-</span>481<span class="n">a0a214c90</span><span class="p">:</span>000000002<span class="n">b2bcfe1</span><span class="p">:</span>2<span class="n">e15cb9f62fd22ab</span><span class="p">:</span><span class="n">fe6f84c7</span>
@@ -120,19 +239,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_screenshots").addClass("active");
 
+</script>
 </body>
 </html>

Modified: websites/staging/accumulo/trunk/content/source.html
==============================================================================
--- websites/staging/accumulo/trunk/content/source.html (original)
+++ websites/staging/accumulo/trunk/content/source.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 Source Code &amp; Developers Guide</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,80 +46,172 @@
       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 Source Code &amp; Developers Guide</h1>
-    <h2 id="source-code">Source Code</h2>
+
+    <div class="panel panel-default pull-right">
+<div class="panel-heading">Quick Links</div>
+<div class="list-group">
+<a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=summary" class="list-group-item"><i class="fa fa-external-link"></i> Accumulo source</a>
+<a href="https://builds.apache.org/job/Accumulo-Master/" class="list-group-item"><i class="fa fa-external-link"></i> Master build on Jenkins</a>
+<a href="https://issues.apache.org/jira/browse/accumulo" class="list-group-item"><i class="fa fa-external-link"></i> Accumulo JIRA</a>
+</div>
+</div>
+
+<h2 id="source-code">Source Code</h2>
+<h3 id="apache-accumulo">Apache Accumulo</h3>
 <p>Apache Accumulo&trade; source code is maintained using <a href="http://git-scm.com/">Git</a> version control 
 (<a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=summary">browse</a>|<a href="http://git-wip-us.apache.org/repos/asf/accumulo.git">checkout</a>).  It builds with <a href="http://maven.apache.org/">Apache Maven</a>.</p>
-<h2 id="website">Website</h2>
+<p>Instructions for configuring git are <a href="https://git-wip-us.apache.org/">here</a>.</p>
+<h3 id="contrib-projects">Contrib Projects</h3>
+<p>Accumulo has a number of <a href="contrib.html">contrib projects</a> that maintain their own code repositories and release schedules.</p>
+<h3 id="website">Website</h3>
 <p>Accumulo's web site is maintained with <a href="http://subversion.apache.org/">Apache Subversion</a> <a href="https://svn.apache.org/repos/asf/accumulo/site/">here</a> using Apache's <a href="http://www.apache.org/dev/cms.html">Content Management System</a>.
 Committers may edit the site by following <a href="http://www.apache.org/dev/cms.html#usage">these instructions</a>.  Non-committers should follow
 <a href="http://www.apache.org/dev/cmsref.html#non-committer">this FAQ entry</a>.</p>
-<h2 id="contribs">Contribs</h2>
-<p>Accumulo has a number of <a href="contrib.html">contrib projects</a> that maintain their own code repositories and release schedules. All build with <a href="http://maven.apache.org/">Apache Maven</a>.</p>
-<ul>
-<li>Instamo Archetype (<a href="https://git-wip-us.apache.org/repos/asf?p=accumulo-instamo-archetype.git;a=summary">browse</a>|<a href="https://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype.git">checkout</a>)</li>
-<li>Wikisearch Application (<a href="https://git-wip-us.apache.org/repos/asf?p=accumulo-wikisearch.git;a=summary">browse</a>|<a href="https://git-wip-us.apache.org/repos/asf/accumulo-wikisearch.git">checkout</a>)</li>
-<li>Apache Pig Support (<a href="https://git-wip-us.apache.org/repos/asf?p=accumulo-pig.git;a=summary">browse</a>|<a href="https://git-wip-us.apache.org/repos/asf/accumulo-pig.git">checkout</a>)</li>
-<li>BSP via Apache Hama (<a href="https://git-wip-us.apache.org/repos/asf?p=accumulo-bsp.git;a=summary">browse</a>|<a href="https://git-wip-us.apache.org/repos/asf/accumulo-bsp.git">checkout</a>)</li>
-</ul>
 <h2 id="developers-guide">Developer's Guide</h2>
-<h3 id="building-code">Building code</h3>
+<h3 id="building">Building</h3>
 <h4 id="installing-thrift">Installing Thrift</h4>
 <p>If you activate the 'thrift' Maven profile, the build of some modules will attempt to run the Apache Thrift command line to regenerate
 stubs. If you activate this profile and don't have Apache Thrift installed and in your path, you will see a warning and
@@ -120,7 +224,7 @@ need to install or modify the Thrift def
 </pre></div>
 
 
-<h4 id="building">Building</h4>
+<h4 id="running-a-build">Running a Build</h4>
 <p>To build the code:</p>
 <div class="codehilite"><pre><span class="n">mvn</span> <span class="n">package</span> <span class="o">-</span><span class="n">P</span> <span class="n">assemble</span>
 </pre></div>
@@ -130,58 +234,66 @@ need to install or modify the Thrift def
 <p>For older branches, "mvn package &amp;&amp; mvn assembly:single" may be required instead, and the tar will be built in the target directory.</p>
 <h3 id="continuous-integration">Continuous Integration</h3>
 <p>Accumulo uses <a href="http://jenkins-ci.org/">Jenkins</a> for automatic builds.</p>
-<p><img src="https://builds.apache.org/job/Accumulo-Master/lastBuild/buildStatus" width=18> <a href="https://builds.apache.org/job/Accumulo-Master/">Master</a></p>
-<p><img src="https://builds.apache.org/job/Accumulo-1.6/lastBuild/buildStatus" width=18> <a href="https://builds.apache.org/job/Accumulo-1.6/">1.6 Branch</a></p>
-<p><img src="https://builds.apache.org/job/Accumulo-1.5-Hadoop-2/lastBuild/buildStatus" width=18> <a href="https://builds.apache.org/job/Accumulo-1.5-Hadoop-2/">1.5 Branch (Hadoop 2)</a></p>
-<p><img src="https://builds.apache.org/job/Accumulo-1.5/lastBuild/buildStatus" width=18> <a href="https://builds.apache.org/job/Accumulo-1.5/">1.5 Branch (Hadoop 1)</a></p>
-<p><img src="https://builds.apache.org/job/Accumulo-1.4/lastBuild/buildStatus" width=18> <a href="https://builds.apache.org/job/Accumulo-1.4/">1.4 Branch</a></p>
+<p><img src="https://builds.apache.org/job/Accumulo-Master/lastBuild/buildStatus" style="height: 1.1em"> <a href="https://builds.apache.org/job/Accumulo-Master/">Master</a></p>
+<p><img src="https://builds.apache.org/job/Accumulo-1.6/lastBuild/buildStatus" style="height: 1.1em"> <a href="https://builds.apache.org/job/Accumulo-1.6/">1.6 Branch</a></p>
+<p><img src="https://builds.apache.org/job/Accumulo-1.5-Hadoop-2/lastBuild/buildStatus" style="height: 1.1em"> <a href="https://builds.apache.org/job/Accumulo-1.5-Hadoop-2/">1.5 Branch (Hadoop 2)</a></p>
+<p><img src="https://builds.apache.org/job/Accumulo-1.5/lastBuild/buildStatus" style="height: 1.1em"> <a href="https://builds.apache.org/job/Accumulo-1.5/">1.5 Branch (Hadoop 1)</a></p>
+<p><img src="https://builds.apache.org/job/Accumulo-1.4/lastBuild/buildStatus" style="height: 1.1em"> <a href="https://builds.apache.org/job/Accumulo-1.4/">1.4 Branch</a></p>
 <h3 id="issue-tracking">Issue Tracking</h3>
 <p>Accumulo <a href="https://issues.apache.org/jira/browse/accumulo">tracks issues</a> with <a href="http://www.atlassian.com/software/jira/overview">JIRA</a>.  Every commit should reference a JIRA ticket of the form ACCUMULO-#.</p>
 <h3 id="merging-practices">Merging Practices</h3>
-<p>Changes should be merged from earlier branches of Accumulo to later branches.  Ask the dev list for instructions.</p>
+<p>Changes should be merged from earlier branches of Accumulo to later branches.  Ask the <a href="mailto:dev@accumulo.apache.org">dev list</a> for instructions.</p>
 <h3 id="public-api">Public API</h3>
 <p>Refer to the README in the release you are using to see what packages are in the public API.</p>
 <p>Changes to non-private members of those classes are subject to additional scrutiny to minimize compatibility problems across Accumulo versions.</p>
 <h3 id="coding-practices">Coding Practices</h3>
-<ul>
-<li>License Header: Always add the current ASF license header as described in <a href="http://www.apache.org/legal/src-headers.html">ASF Source Header</a>.</li>
-<li>Trailing Whitespaces: Remove all trailing whitespaces. Eclipse users can use Source-&gt;Cleanup option to accomplish this.</li>
-<li>Indentation: Use 2 space indents and never use tabs!</li>
-<li>Line Wrapping: Use 160-column line width for Java code and Javadoc.</li>
-<li>Control Structure New Lines: Use a new line with single statement if/else blocks.</li>
-<li>Author Tags: Do not use Author Tags. The code is developed and owned by the community. </li>
-</ul>
-<h3 id="eclipse-configuration-tips">Eclipse Configuration Tips</h3>
+<table class="table">
+<tr><th>License Header</th><td>Always add the current ASF license header as described in <a href="http://www.apache.org/legal/src-headers.html">ASF Source Header</a>.</td></tr>
+<tr><th>Trailing Whitespaces</th><td>Remove all trailing whitespaces. Eclipse users can use Source&rarr;Cleanup option to accomplish this.</td></tr>
+<tr><th>Indentation</th><td>Use 2 space indents and never use tabs!
+<tr><th>Line Wrapping</th><td>Use 160-column line width for Java code and Javadoc.</td></tr>
+<tr><th>Control Structure New Lines</th><td>Use a new line with single statement if/else blocks.</td></tr>
+<tr><th>Author Tags</th><td>Do not use Author Tags. The code is developed and owned by the community.</td></tr>
+</table>
+
+<h3 id="ide-configuration-tips">IDE Configuration Tips</h3>
+<h4 id="eclipse">Eclipse</h4>
 <ul>
 <li>Download Eclipse <a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=tree;f=contrib;hb=HEAD">formatting and style guides for Accumulo</a>.</li>
 <li>Import Formatter: Preferences &gt; Java &gt; Code Style &gt;  Formatter and import the Eclipse-Accumulo-Codestyle.xml downloaded in the previous step. </li>
 <li>Import Template: Preferences &gt; Java &gt; Code Style &gt; Code Templates and import the Eclipse-Accumulo-Template.xml. Make sure to check the "Automatically add comments" box. This template adds the ASF header and so on for new code.</li>
 </ul>
-<h3 id="intellij-configuration-tips">Intellij Configuration Tips</h3>
+<h4 id="intellij">IntelliJ</h4>
 <ul>
 <li>Formatter <a href="https://code.google.com/p/eclipse-code-formatter-intellij-plugin/">plugin</a> that uses eclipse code style xml.</li>
 </ul>
-<h3 id="git">Git</h3>
-<p>Instructions for configuring git are <a href="https://git-wip-us.apache.org/">here</a>.</p>
 <h3 id="release-guide">Release Guide</h3>
 <p>Accumulo's release guide can be found <a href="governance/releasing.html">here</a>.</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_source").addClass("active");
 
+</script>
 </body>
 </html>

Modified: websites/staging/accumulo/trunk/content/user_manual_1.3-incubating/Accumulo_Design.html
==============================================================================
--- websites/staging/accumulo/trunk/content/user_manual_1.3-incubating/Accumulo_Design.html (original)
+++ websites/staging/accumulo/trunk/content/user_manual_1.3-incubating/Accumulo_Design.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 User Manual: Accumulo Design</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 User Manual: Accumulo Design</h1>
+
     <p><strong> Next:</strong> <a href="Accumulo_Shell.html">Accumulo Shell</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.3</a> <strong> Previous:</strong> <a href="Introduction.html">Introduction</a>   <strong> <a href="Contents.html">Contents</a></strong>   </p>
 <p><a id=CHILD_LINKS></a><strong>Subsections</strong></p>
 <ul>
@@ -143,19 +244,25 @@ http://master-address:50095/monitor. </p
 
   <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/user_manual_1.3-incubating/Accumulo_Shell.html
==============================================================================
--- websites/staging/accumulo/trunk/content/user_manual_1.3-incubating/Accumulo_Shell.html (original)
+++ websites/staging/accumulo/trunk/content/user_manual_1.3-incubating/Accumulo_Shell.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 User Manual: Accumulo Shell</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 User Manual: Accumulo Shell</h1>
+
     <p><strong> Next:</strong> <a href="Writing_Accumulo_Clients.html">Writing Accumulo Clients</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.3</a> <strong> Previous:</strong> <a href="Accumulo_Design.html">Accumulo Design</a>   <strong> <a href="Contents.html">Contents</a></strong>   </p>
 <p><a id=CHILD_LINKS></a><strong>Subsections</strong></p>
 <ul>
@@ -203,19 +304,25 @@
 
   <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/user_manual_1.3-incubating/Administration.html
==============================================================================
--- websites/staging/accumulo/trunk/content/user_manual_1.3-incubating/Administration.html (original)
+++ websites/staging/accumulo/trunk/content/user_manual_1.3-incubating/Administration.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 User Manual: Administration</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 User Manual: Administration</h1>
+
     <p><strong> Next:</strong> <a href="Shell_Commands.html">Shell Commands</a> <strong> Up:</strong> <a href="accumulo_user_manual.html">Apache Accumulo User Manual Version 1.3</a> <strong> Previous:</strong> <a href="Security.html">Security</a>   <strong> <a href="Contents.html">Contents</a></strong>   </p>
 <p><a id=CHILD_LINKS></a><strong>Subsections</strong></p>
 <ul>
@@ -195,19 +296,25 @@ $ACCUMULO/logs/. </p>
 
   <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>



Mime
View raw message