accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r908015 [11/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
Added: websites/staging/accumulo/trunk/content/css/bootstrap.css.map
==============================================================================
--- websites/staging/accumulo/trunk/content/css/bootstrap.css.map (added)
+++ websites/staging/accumulo/trunk/content/css/bootstrap.css.map Sun May  4 17:29:31 2014
@@ -0,0 +1 @@

[... 3 lines stripped ...]
Added: websites/staging/accumulo/trunk/content/css/bootstrap.min.css
==============================================================================
--- websites/staging/accumulo/trunk/content/css/bootstrap.min.css (added)
+++ websites/staging/accumulo/trunk/content/css/bootstrap.min.css Sun May  4 17:29:31 2014
@@ -0,0 +1,7 @@
+/*!
+ * Bootstrap v3.1.1 (http://getbootstrap.com)
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+

[... 3 lines stripped ...]
Modified: websites/staging/accumulo/trunk/content/downloads/index.html
==============================================================================
--- websites/staging/accumulo/trunk/content/downloads/index.html (original)
+++ websites/staging/accumulo/trunk/content/downloads/index.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 Downloads</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,99 +46,213 @@
       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 Downloads</h1>
-    <h2 id="151-latest">1.5.1 (latest)</h2>
-<p>The most recent Apache Accumulo&trade; release is version 1.5.1.  See the <a href="/release_notes/1.5.1.html">release notes</a> and <a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=CHANGES;hb=3478f71ae888f8d73aaa93837319a6dbb4ba0c8a" title="1.5.1 CHANGES">CHANGES</a>.<br />
-Be sure to verify your downloads by these <a href="http://www.apache.org/info/verification.html" title="Verify">procedures</a> using these <a href="http://www.apache.org/dist/accumulo/KEYS" title="KEYS">KEYS</a>.<br />
-For convenience, <a href="http://www.apache.org/dist/accumulo/1.5.1/MD5SUM">MD5</a> and <a href="http://www.apache.org/dist/accumulo/1.5.1/SHA1SUM">SHA1</a> hashes are also available.</p>
-<h4 id="generic-binaries">Generic Binaries</h4>
-<ul>
-<li>accumulo-1.5.1-bin.tar.gz <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-bin.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-bin.tar.gz']);">mirrors</a> (<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-bin.tar.gz.asc">gpg signature</a>)</li>
-</ul>
-<h4 id="platform-binaries">Platform Binaries</h4>
-<ul>
-<li>accumulo-1.5.1-bin.rpm <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-bin.rpm onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-bin.rpm']);">mirrors</a> (<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-bin.rpm.asc">gpg signature</a>)</li>
-<li>accumulo-1.5.1-native.rpm <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-native.rpm onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-native.rpm']);">mirrors</a> (<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-native.rpm.asc">gpg signature</a>)</li>
-<li>accumulo-1.5.1-test.rpm <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-test.rpm onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-test.rpm']);">mirrors</a> (<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-test.rpm.asc">gpg signature</a>)</li>
-<li>accumulo-1.5.1-bin.deb <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-bin.deb onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-bin.deb']);">mirrors</a> (<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-bin.deb.asc">gpg signature</a>)</li>
-<li>accumulo-1.5.1-native.deb <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-native.deb onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-native.deb']);">mirrors</a> (<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-native.deb.asc">gpg signature</a>)</li>
-<li>accumulo-1.5.1-test.deb <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-test.deb onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-test.deb']);">mirrors</a> (<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-test.deb.asc">gpg signature</a>)</li>
-</ul>
-<h4 id="source">Source</h4>
-<ul>
-<li>accumulo-1.5.1-src.tar.gz <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-src.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-src.tar.gz']);">mirrors</a> (<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-src.tar.gz.asc">gpg signature</a>)</li>
-</ul>
-<h4 id="documentation">Documentation</h4>
+
+    <p>Be sure to verify your downloads by these <a href="http://www.apache.org/info/verification.html" title="Verify">procedures</a> using these <a href="http://www.apache.org/dist/accumulo/KEYS" title="KEYS">KEYS</a>.  </p>
+<h2 id="current-release">Current Release</h2>
+<h3 id="151-wzxhzdk2latestwzxhzdk3">1.5.1 <span class="label label-primary">latest</span></h3>
+<p>The most recent Apache Accumulo&trade; release is version 1.5.1.  See the <a href="/release_notes/1.5.1.html">release notes</a> and <a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=CHANGES;hb=3478f71ae888f8d73aaa93837319a6dbb4ba0c8a" title="1.5.1 CHANGES">CHANGES</a>.  </p>
+<p>For convenience, <a href="http://www.apache.org/dist/accumulo/1.5.1/MD5SUM">MD5</a> and <a href="http://www.apache.org/dist/accumulo/1.5.1/SHA1SUM">SHA1</a> hashes are also available.</p>
+<table class="table">
+<tr><th>Generic Binaries</th><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-bin.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-bin.tar.gz']);">accumulo-1.5.1-bin.tar.gz</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-bin.tar.gz.asc">ASC</a>
+</td></tr>
+<tr><th rowspan="6">Platform Binaries</th><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-bin.rpm onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-bin.rpm']);">accumulo-1.5.1-bin.rpm</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-bin.rpm.asc">ASC</a>
+</td></tr>
+<tr><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-native.rpm onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-native.rpm']);">accumulo-1.5.1-native.rpm</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-native.rpm.asc">ASC</a>
+</td></tr>
+<tr><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-test.rpm onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-test.rpm']);">accumulo-1.5.1-test.rpm</a></td></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-test.rpm.asc"asc>ASC</a>
+</td></tr>
+<tr><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-bin.deb onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-bin.deb']);">accumulo-1.5.1-bin.deb</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-bin.deb.asc">ASC</a>
+</td></tr>
+<tr><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-native.deb onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-native.deb']);">accumulo-1.5.1-native.deb</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-native.deb.asc">ASC</a>
+</td></tr>
+<tr><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-test.deb onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-test.deb']);">accumulo-1.5.1-test.deb</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-test.deb.asc">ASC</a>
+</td></tr>
+<tr><th>Source</th><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-src.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-src.tar.gz']);">accumulo-1.5.1-src.tar.gz</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-src.tar.gz.asc">ASC</a>
+</td></tr>
+</table>
+
+<h4 id="15-documentation">1.5 Documentation</h4>
 <ul>
 <li><a href=https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;hb=3478f71ae888f8d73aaa93837319a6dbb4ba0c8a onClick="javascript: _gaq.push(['_trackPageview', '/1.5/README']);">README</a></li>
-<li><a href=/1.5/accumulo_user_manual.pdf onClick="javascript: _gaq.push(['_trackPageview', '/1.5/accumulo_user_manual.pdf']);">pdf manual</a></li>
-<li><a href=/1.5/accumulo_user_manual.html onClick="javascript: _gaq.push(['_trackPageview', '/1.5/accumulo_user_manual.html']);">html manual</a></li>
-<li><a href=/1.5/apidocs onClick="javascript: _gaq.push(['_trackPageview', '/1.5/apidocs']);">javadoc</a></li>
+<li><a href=/1.5/accumulo_user_manual.pdf onClick="javascript: _gaq.push(['_trackPageview', '/1.5/accumulo_user_manual.pdf']);">PDF manual</a></li>
+<li><a href=/1.5/accumulo_user_manual.html onClick="javascript: _gaq.push(['_trackPageview', '/1.5/accumulo_user_manual.html']);">HTML manual</a></li>
+<li><a href=/1.5/apidocs onClick="javascript: _gaq.push(['_trackPageview', '/1.5/apidocs']);">Javadoc</a></li>
 <li><a href="/1.5/examples">examples</a></li>
 </ul>
-<h2 id="145-legacy">1.4.5 (legacy)</h2>
-<p>The most recent 1.4 release is 1.4.5.  See the <a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=CHANGES;hb=f7d87b6e407de6597b6c0ca60ca1b6a321faf237" title="1.4.5 Release Notes">Release Notes</a>.<br />
-Be sure to verify your downloads by these <a href="http://www.apache.org/info/verification.html" title="Verify">procedures</a> using these <a href="http://www.apache.org/dist/accumulo/KEYS" title="KEYS">KEYS</a>.</p>
+<h3 id="145-wzxhzdk5legacywzxhzdk6">1.4.5 <span class="label label-warning">legacy</span></h3>
+<p>The most recent 1.4 release is 1.4.5.  See the <a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=CHANGES;hb=f7d87b6e407de6597b6c0ca60ca1b6a321faf237" title="1.4.5 Release Notes">Release Notes</a>.  </p>
+<table class="table">
+<tr><th>Binaries</th><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.4.5-dist.tar.gz']);">accumulo-1.4.5-dist.tar.gz</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz.asc" title="1.4.5 dist asc">ASC</a>
+<a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz.md5" title="1.4.5 dist md5">MD5</a>
+<a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz.sha" title="1.4.5 dist sha">SHA</a>
+</td></tr>
+<tr><th>Source</th><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.4.5-src.tar.gz']);">accumulo-1.4.5-src.tar.gz</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz.asc" title="1.4.5 src asc">ASC</a>
+<a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz.md5" title="1.4.5 src md5">MD5</a>
+<a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz.sha" title="1.4.5 src sha">SHA</a>
+</td></tr>
+</table>
+
+<h4 id="14-documentation">1.4 Documentation</h4>
 <ul>
-<li>Download Binaries: accumulo-1.4.5-dist.tar.gz <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.4.5-dist.tar.gz']);">mirrors</a> (<a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz.asc" title="1.4.5 dist asc">asc</a>, <a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz.md5" title="1.4.5 dist md5">md5</a>, <a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz.sha" title="1.4.5 dist sha">sha</a>)</li>
-<li>Download Source: accumulo-1.4.5-src.tar.gz <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.4.5-src.tar.gz']);">mirrors</a> (<a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz.asc" title="1.4.5 src asc">asc</a>, <a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz.md5" title="1.4.5 src md5">md5</a>, <a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz.sha" title="1.4.5 src sha">sha</a>)</li>
-<li>Read Documentation: <a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;hb=f7d87b6e407de6597b6c0ca60ca1b6a321faf237" onClick="javascript: _gaq.push(['_trackPageview', '/1.4/README']);">README</a>, <a href="/1.4/user_manual">html manual</a>, <a href=/1.4/accumulo_user_manual.pdf onClick="javascript: _gaq.push(['_trackPageview', '/1.4/accumulo_user_manual.pdf']);">pdf manual</a>, <a href="/1.4/examples">examples</a></li>
+<li><a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;hb=f7d87b6e407de6597b6c0ca60ca1b6a321faf237" onClick="javascript: _gaq.push(['_trackPageview', '/1.4/README']);">README</a></li>
+<li><a href="/1.4/user_manual">html manual</a></li>
+<li><a href=/1.4/accumulo_user_manual.pdf onClick="javascript: _gaq.push(['_trackPageview', '/1.4/accumulo_user_manual.pdf']);">pdf manual</a></li>
+<li><a href="/1.4/examples">examples</a></li>
 </ul>
 <h2 id="older-releases">Older releases</h2>
 <p>Older releases can be found in the <a href="http://archive.apache.org/dist/accumulo/">archives</a>.</p>
@@ -134,19 +260,27 @@ Be sure to verify your downloads by thes
 
   <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_downloads").addClass("active");
 
+</script>
 </body>
 </html>

Modified: websites/staging/accumulo/trunk/content/example/wikisearch.html
==============================================================================
--- websites/staging/accumulo/trunk/content/example/wikisearch.html (original)
+++ websites/staging/accumulo/trunk/content/example/wikisearch.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>The wikipedia search example explained, with performance numbers.</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">The wikipedia search example explained, with performance numbers.</h1>
+
     <h2 id="apache-accumulo-query-performance">Apache Accumulo Query Performance</h2>
 <h2 id="sample-application">Sample Application</h2>
 <p>Starting with release 1.4, Accumulo includes an example web application that provides a flexible,  scalable search over the articles of Wikipedia, a widely available medium-sized corpus.</p>
@@ -457,19 +558,25 @@ The English wikipedia data was re-ingest
 
   <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>

Added: websites/staging/accumulo/trunk/content/fonts/glyphicons-halflings-regular.eot
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/accumulo/trunk/content/fonts/glyphicons-halflings-regular.eot
------------------------------------------------------------------------------
    svn:mime-type = application/vnd.ms-fontobject

Added: websites/staging/accumulo/trunk/content/fonts/glyphicons-halflings-regular.svg
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/accumulo/trunk/content/fonts/glyphicons-halflings-regular.svg
------------------------------------------------------------------------------
    svn:mime-type = image/svg+xml

Added: websites/staging/accumulo/trunk/content/fonts/glyphicons-halflings-regular.ttf
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/accumulo/trunk/content/fonts/glyphicons-halflings-regular.ttf
------------------------------------------------------------------------------
    svn:mime-type = application/x-font-ttf

Added: websites/staging/accumulo/trunk/content/fonts/glyphicons-halflings-regular.woff
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/accumulo/trunk/content/fonts/glyphicons-halflings-regular.woff
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: websites/staging/accumulo/trunk/content/get_involved.html
==============================================================================
--- websites/staging/accumulo/trunk/content/get_involved.html (original)
+++ websites/staging/accumulo/trunk/content/get_involved.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>Get Involved</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">Get Involved</h1>
+
     <p>You don't need to be a software developer to contribute to 
 Apache Accumulo&trade;. To be successful this project 
 requires a huge range of different skills, levels of involvement and degrees of 
@@ -153,19 +254,27 @@ to approve a release. </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_getinvolved").addClass("active");
 
+</script>
 </body>
 </html>

Modified: websites/staging/accumulo/trunk/content/git.html
==============================================================================
--- websites/staging/accumulo/trunk/content/git.html (original)
+++ websites/staging/accumulo/trunk/content/git.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 Git WIP</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,65 +46,153 @@
       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 Git WIP</h1>
-    <h1 id="git">Git</h1>
-<p><a href="http://git-scm.com">Git</a> is an open source, distributed version control system
+
+    <p><a href="http://git-scm.com">Git</a> is an open source, distributed version control system
 which has become very popular in large, complicated software projects due to
 its efficient handling of multiple, simultaneously and independently developed
 branches of source code.</p>
@@ -438,9 +538,9 @@ API.</p>
 <p>By convention, the branch containing the changes <code>z'</code> should be named
 <code>x.y.z'-SNAPSHOT</code>. The steps to take are as follows:</p>
 <ol>
-<li>Prepare the release candidate. <a href="http://accumulo.apache.org/governance/releasing.html">Release
-   Guide</a>, <a href="http://accumulo.apache.org/foobar">Maven
-   Instructions -- doesn't exist yet!</a></li>
+<li>Prepare the release candidate. <a href="/governance/releasing.html">Release
+   Guide</a>, <a href="/releasing.html">Maven
+   Instructions</a></li>
 <li>Create a tag of the release candidate from the <code>x.y.z'-SNAPSHOT</code> branch,
    named something like <code>x.y.z'-RC-N</code>.</li>
 <li>Test and Vote</li>
@@ -565,19 +665,27 @@ branch 1.6.1-SNAPSHOT 1.6.0</code></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_git").addClass("active");
 
+</script>
 </body>
 </html>

Modified: websites/staging/accumulo/trunk/content/glossary.html
==============================================================================
--- websites/staging/accumulo/trunk/content/glossary.html (original)
+++ websites/staging/accumulo/trunk/content/glossary.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 Glossary</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,107 +46,229 @@
       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 Glossary</h1>
-    <ul>
-<li><strong>authorizations</strong> - a set of strings associated with a user or with a particular scan that will be used to determine which key/value pairs are visible to the user.</li>
-<li><strong>cell</strong> - a set of key/value pairs whose keys differ only in timestamp.</li>
-<li><strong>column</strong> - the portion of the key that sorts after the row and is divided into family, qualifier, and visibility.</li>
-<li><strong>column family</strong> - the portion of the key that sorts second and controls locality groups, the row/column hybrid nature of accumulo.</li>
-<li><strong>column qualifier</strong> - the portion of the key that sorts third and provides additional key uniqueness.</li>
-<li><strong>column visibility</strong> - the portion of the key that sorts fourth and controls user access to individual key/value pairs. Visibilities are boolean AND (&amp;) and OR (|) combinations of authorization strings with parentheses required to determine ordering, e.g. (AB&amp;C)|DEF.</li>
-<li><strong>iterator</strong> - a mechanism for modifying tablet-local portions of the key/value space. Iterators are used for standard administrative tasks as well as for custom processing.</li>
-<li><strong>iterator priority</strong> - an iterator must be configured with a particular scope and priority.  When a tablet server enters that scope, it will instantiate iterators in priority order starting from the smallest priority and ending with the largest, and apply each to the data read before rewriting the data or sending the data to the user.</li>
-<li><strong>iterator scopes</strong> - the possible scopes for iterators are where the tablet server is already reading and/or writing data: minor compaction / flush time (<em>minc</em> scope), major compaction / file merging time (<em>majc</em> scope), and query time (<em>scan</em> scope)</li>
-<li><strong>gc</strong> - process that identifies temporary files in HDFS that are no longer needed by any process, and deletes them.</li>
-<li><strong>key</strong> - the key into the distributed sorted map which is accumulo.  The key is subdivided into row, column, and timestamp.  The column is further divided into  family, qualifier, and visibility.</li>
-<li><strong>locality group</strong> - a set of column families that will be grouped together on disk.  With no locality groups configured, data is stored on disk in row order.  If each column family were configured to be its own locality group, the data for each column would be stored separately, in row order.  Configuring sets of columns into locality groups is a compromise between the two approaches and will improve performance when multiple columns are accessed in the same scan.</li>
-<li><strong>log-structured merge-tree</strong> - the sorting / flushing / merging scheme on which BigTable's design is based.</li>
-<li><strong>logger</strong> - in 1.4 and older, process that accepts updates to tablet servers and writes them to local on-disk storage for redundancy. in 1.5 the functionality was subsumed by the tablet server and datanode with HDFS writes.</li>
-<li><strong>major compaction</strong> - merging multiple files into a single file.  If all of a tablet's files are merged into a single file, it is called a <em>full major compaction</em>.</li>
-<li><strong>master</strong> - process that detects and responds to tablet failures, balances load across tablet servers by assigning and migrating tablets when required, coordinates table operations, and handles tablet server logistics (startup, shutdown, recovery).</li>
-<li><strong>minor compaction</strong> - flushing data from memory to disk.  Usually this creates a new file for a tablet, but if the memory flushed is merge-sorted in with data from an existing file (replacing that file), it is called a <em>merging minor compaction</em>.</li>
-<li><strong>monitor</strong> - process that displays status and usage information for all Accumulo components.</li>
-<li><strong>permissions</strong> - administrative abilities that must be given to a user such as creating tables or users and changing permissions or configuration parameters.</li>
-<li><strong>row</strong> - the portion of the key that is controls atomicity.  Keys with the same row are guaranteed to remain on a single tablet hosted by a single tablet server, therefore multiple key/value pairs can be added to or removed from a row at the same time. The row is used for the primary sorting of the key.</li>
-<li><strong>scan</strong> - reading a range of key/value pairs.</li>
-<li><strong>tablet</strong> - a contiguous key range; the unit of work for a tablet server.</li>
-<li><strong>tablet servers</strong> - a set of servers that hosts reads and writes for tablets.  Each server hosts a distinct set of tablets at any given time, but the tablets may be hosted by different servers over time.</li>
-<li><strong>timestamp</strong> - the portion of the key that controls versioning. Otherwise identical keys with differing timestamps are considered to be versions of a single <em>cell</em>.  Accumulo can be configured to keep the <em>N</em> newest versions of each <em>cell</em>.  When a deletion entry is inserted, it deletes all earlier versions for its cell.</li>
-<li><strong>value</strong> - immutable bytes associated with a particular key.</li>
-</ul>
+
+    <dl>
+<dt>authorizations</dt>
+<dd>a set of strings associated with a user or with a particular scan that will be used to determine which key/value pairs are visible to the user.</dd>
+<dt>cell</dt>
+<dd>a set of key/value pairs whose keys differ only in timestamp.</dd>
+<dt>column</dt>
+<dd>the portion of the key that sorts after the row and is divided into family, qualifier, and visibility.</dd>
+<dt>column family</dt>
+<dd>the portion of the key that sorts second and controls locality groups, the row/column hybrid nature of accumulo.</dd>
+<dt>column qualifier</dt>
+<dd>the portion of the key that sorts third and provides additional key uniqueness.</dd>
+<dt>column visibility</dt>
+<dd>the portion of the key that sorts fourth and controls user access to individual key/value pairs. Visibilities are boolean AND (&) and OR (|) combinations of authorization strings with parentheses required to determine ordering, e.g. (AB&C)|DEF.</dd>
+<dt>iterator</dt>
+<dd>a mechanism for modifying tablet-local portions of the key/value space. Iterators are used for standard administrative tasks as well as for custom processing.</dd>
+<dt>iterator priority</dt>
+<dd>an iterator must be configured with a particular scope and priority.  When a tablet server enters that scope, it will instantiate iterators in priority order starting from the smallest priority and ending with the largest, and apply each to the data read before rewriting the data or sending the data to the user.</dd>
+<dt>iterator scopes</dt>
+<dd>the possible scopes for iterators are where the tablet server is already reading and/or writing data: minor compaction / flush time (<em>minc</em> scope), major compaction / file merging time (<em>majc</em> scope), and query time (<em>scan</em> scope).</dd>
+<dt>gc</dt>
+<dd>process that identifies temporary files in HDFS that are no longer needed by any process, and deletes them.</dd>
+<dt>key</dt>
+<dd>the key into the distributed sorted map which is accumulo.  The key is subdivided into row, column, and timestamp.  The column is further divided into  family, qualifier, and visibility.</dd>
+<dt>locality group</dt>
+<dd>a set of column families that will be grouped together on disk.  With no locality groups configured, data is stored on disk in row order.  If each column family were configured to be its own locality group, the data for each column would be stored separately, in row order.  Configuring sets of columns into locality groups is a compromise between the two approaches and will improve performance when multiple columns are accessed in the same scan.</dd>
+<dt>log-structured merge-tree</dt>
+<dd>the sorting / flushing / merging scheme on which BigTable's design is based.</dd>
+<dt>logger</dt>
+<dd>in 1.4 and older, process that accepts updates to tablet servers and writes them to local on-disk storage for redundancy. in 1.5 the functionality was subsumed by the tablet server and datanode with HDFS writes.</dd>
+<dt>major compaction</dt>
+<dd>merging multiple files into a single file.  If all of a tablet's files are merged into a single file, it is called a <em>full major compaction</em>.</dd>
+<dt>master</dt>
+<dd>process that detects and responds to tablet failures, balances load across tablet servers by assigning and migrating tablets when required, coordinates table operations, and handles tablet server logistics (startup, shutdown, recovery).</dd>
+<dt>minor compaction</dt>
+<dd>flushing data from memory to disk.  Usually this creates a new file for a tablet, but if the memory flushed is merge-sorted in with data from an existing file (replacing that file), it is called a <em>merging minor compaction</em>.</dd>
+<dt>monitor</dt>
+<dd>process that displays status and usage information for all Accumulo components.</dd>
+<dt>permissions</dt>
+<dd>administrative abilities that must be given to a user such as creating tables or users and changing permissions or configuration parameters.</dd>
+<dt>row</dt>
+<dd>the portion of the key that controls atomicity.  Keys with the same row are guaranteed to remain on a single tablet hosted by a single tablet server, therefore multiple key/value pairs can be added to or removed from a row at the same time. The row is used for the primary sorting of the key.</dd>
+<dt>scan</dt>
+<dd>reading a range of key/value pairs.</dd>
+<dt>tablet</dt>
+<dd>a contiguous key range; the unit of work for a tablet server.</dd>
+<dt>tablet servers</dt>
+<dd>a set of servers that hosts reads and writes for tablets.  Each server hosts a distinct set of tablets at any given time, but the tablets may be hosted by different servers over time.</dd>
+<dt>timestamp</dt>
+<dd>the portion of the key that controls versioning.  Otherwise identical keys with differing timestamps are considered to be versions of a single <em>cell</em>.  Accumulo can be configured to keep the <em>N</em> newest versions of each <em>cell</em>.  When a deletion entry is inserted, it deletes all earlier versions for its cell.</dd>
+<dt>value</dt>
+<dd>immutable bytes associated with a particular key.</dd>
+</dl>
   </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_glossary").addClass("active");
 
+</script>
 </body>
 </html>



Mime
View raw message