accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [21/32] accumulo git commit: Jekyll build from gh-pages:43f42b9
Date Thu, 26 May 2016 23:04:56 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1bf6c22/1.6/examples/mapred.html
----------------------------------------------------------------------
diff --git a/1.6/examples/mapred.html b/1.6/examples/mapred.html
index e6050bc..35bff6d 100644
--- a/1.6/examples/mapred.html
+++ b/1.6/examples/mapred.html
@@ -68,8 +68,9 @@
   }
 </script>
 </head>
-<body>
-<nav class="navbar navbar-default navbar-fixed-top">
+<body style="padding-top: 100px">
+
+  <nav class="navbar navbar-default navbar-fixed-top">
   <div class="container-fluid">
     <div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
@@ -78,17 +79,32 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="/">Accumulo</a>
+      <a href="/"><img id="nav-logo" alt="Apache Accumulo" class="img-responsive" src="/images/accumulo-logo.png" width="200"/></a>
     </div>
     <div class="collapse navbar-collapse" id="navbar-items">
       <ul class="nav navbar-nav">
+        <li class="nav-link"><a href="/downloads">Download</a></li>
         <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Project<span class="caret"></span></a>
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li id="nav_index"><a href="/">Home</a></li>
-          <li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+          <li class="dropdown-header">1.7.1 Release (Latest)</li>
+          <li id="nav_rn_171"><a href="/release_notes/1.7.1">Release Notes</a></li>
+          <li><a href="/1.7/accumulo_user_manual">User Manual</a></li>
+          <li><a href="/1.7/apidocs">Javadoc</a></li>
+          <li id="nav_examples_17"><a href="/1.7/examples">Examples</a></li>
+          <li class="divider"></li>
+          <li class="dropdown-header">1.6.5 Release</li>
+          <li id="nav_rn_165"><a href="/release_notes/1.6.5">Release Notes</a></li>
+          <li><a href="/1.6/accumulo_user_manual">User Manual</a></li>
+          <li><a href="/1.6/apidocs">Javadoc</a></li>
+          <li id="nav_examples_16"><a href="/1.6/examples">Examples</a></li>
+          <li class="divider"></li>
           <li id="nav_features"><a href="/notable_features">Features</a></li>
-          <li><a href="https://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+          <li id="nav_rn"><a href="/release_notes">Release Notes Archive</a></li>
+          <li id="old_documentation"><a href="/old_documentation">Documentation Archive</a></li>
+          <li id="nav_screenshots"><a href="/screenshots">Screenshots</a></li>
+          <li id="nav_papers"><a href="/papers">Papers &amp; Presentations</a></li>
+          <li id="nav_glossary"><a href="/glossary">Glossary</a></li>
         </ul>
         </li>
         <li class="dropdown">
@@ -97,7 +113,7 @@
           <li id="nav_getinvolved"><a href="/get_involved">Get Involved</a></li>
           <li id="nav_mailinglists"><a href="/mailing_list">Mailing Lists</a></li>
           <li id="nav_people"><a href="/people">People</a></li>
-          <li id="nav_blog"><a href="https://blogs.apache.org/accumulo"><i class="fa fa-external-link"></i> Blog</a></li>
+          <li id="nav_blog"><a href="https://blogs.apache.org/accumulo">Blog <i class="fa fa-external-link"></i></a></li>
           <li id="nav_projects"><a href="/projects">Community Projects</a></li>
           <li class="divider"></li>
           <li class="dropdown-header">Governance</li>
@@ -111,6 +127,11 @@
         <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">Development<span class="caret"></span></a>
         <ul class="dropdown-menu">
+          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO">Issue Tracker <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://github.com/apache/accumulo/pulls">Pull Requests <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://builds.apache.org/view/A/view/Accumulo">Jenkins Builds <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://travis-ci.org/apache/accumulo">TravisCI Builds <i class="fa fa-external-link"></i></a></li>
+          <li class="divider"></li>
           <li class="dropdown-header">Guides</li>
           <li id="nav_source"><a href="/source">Source &amp; Guide</a></li>
           <li id="nav_git"><a href="/git">Git Workflow</a></li>
@@ -119,118 +140,39 @@
           <li id="nav_rb"><a href="/rb">Review Board</a></li>
           <li id="nav_releasing"><a href="/releasing">Making Releases</a></li>
           <li id="nav_verify_release"><a href="/verifying_releases">Verifying Releases</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Issues</li>
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO"><i class="fa fa-external-link"></i> JIRA</a></li>
-          <li><a href="https://github.com/apache/accumulo/issues"><i class="fa fa-external-link"></i> GitHub</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Builds</li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo"><i class="fa fa-external-link"></i> Jenkins</a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo"><i class="fa fa-external-link"></i> Travis CI</a></li>
-        </ul>
-        </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li class="dropdown-header">Release Notes</li>
-          <li id="nav_rn_171"><a href="/release_notes/1.7.1">1.7.1</a></li>
-          <li id="nav_rn_165"><a href="/release_notes/1.6.5">1.6.5</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Manual</li>
-          <li><a href="/1.7/accumulo_user_manual">1.7</a></li>
-          <li><a href="/1.6/accumulo_user_manual">1.6</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Javadoc</li>
-          <li><a href="/1.7/apidocs">1.7</a></li>
-          <li><a href="/1.6/apidocs">1.6</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Examples</li>
-          <li id="nav_examples_17"><a href="/1.7/examples">1.7</a></li>
-          <li id="nav_examples_16"><a href="/1.6/examples">1.6</a></li>
-          <li class="divider"></li>
-          <li id="nav_rn"><a href="/release_notes">Release Notes Archive</a></li>
-          <li id="old_documentation"><a href="/old_documentation">Docs for Older Verisons</a></li>
-          <li id="nav_screenshots"><a href="/screenshots">Screenshots</a></li>
-          <li id="nav_papers"><a href="/papers">Papers &amp; Presentations</a></li>
-          <li id="nav_glossary"><a href="/glossary">Glossary</a></li>
         </ul>
         </li>
+      </ul>
+      <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">ASF Links<span class="caret"></span></a>
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Apache Software Foundation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="https://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
-          <li><a href="https://www.apache.org/foundation/sponsorship"><i class="fa fa-external-link"></i> Sponsorship</a></li>
-          <li><a href="https://www.apache.org/security"><i class="fa fa-external-link"></i> Security</a></li>
-          <li><a href="https://www.apache.org/foundation/thanks"><i class="fa fa-external-link"></i> Thanks</a></li>
-          <li><a href="https://www.apache.org/foundation/policies/conduct"><i class="fa fa-external-link"></i> Code of Conduct</a></li>
+          <li><a href="https://www.apache.org">Apache Homepage <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/licenses/LICENSE-2.0">License <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/sponsorship">Sponsorship <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/security">Security <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/thanks">Thanks <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct <i class="fa fa-external-link"></i></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="/"><img id="logo" alt="Apache Accumulo &trade;" class="img-responsive" src="/images/accumulo-logo.png"/></a>
-        <br />
-        Latest 1.7 release: <strong>1.7.1</strong><br />
-        Latest 1.6 release: <strong>1.6.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">
-  <tbody>
-    <tr>
-      <td><img src="/images/Twitter_logo_blue.png" alt="Twitter" style="height: 1em" /></td>
-      <td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td>
-    </tr>
-    <tr>
-      <td><img src="/images/InBug-16px_0.png" alt="Linked in" /></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" alt="GitHub" 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>
-    <tr>
-      <td><img src="/favicon.png" alt="Blog" width="16" /></td>
-      <td><a href="https://blogs.apache.org/accumulo">Apache Accumulo Blog</a></td>
-    </tr>
-  </tbody>
-</table>
-
-
-
-      <hr>
-      <a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit.png"></a>
-    </div>
-    <div class="col-md-8 col-md-offset-1">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-12">
 
-      <div id="non-canonical" style="display: none; background-color: #F0E68C; padding-left: 1em;">
-        Visit the official site at: <a href="https://accumulo.apache.org">https://accumulo.apache.org</a>
-      </div>
-      <div id="content">
-        
-        <h1 class="title">MapReduce Example</h1>
-        
-        <p>This example uses mapreduce and accumulo to compute word counts for a set of
+        <div id="non-canonical" style="display: none; background-color: #F0E68C; padding-left: 1em;">
+          Visit the official site at: <a href="https://accumulo.apache.org">https://accumulo.apache.org</a>
+        </div>
+        <div id="content">
+          
+          <h1 class="title">MapReduce Example</h1>
+          
+          <p>This example uses mapreduce and accumulo to compute word counts for a set of
 documents. This is accomplished using a map-only mapreduce job and a
 accumulo table with combiners.</p>
 
@@ -381,18 +323,14 @@ stored in a file that the map-reduce job pulled into the distributed cache.
 (If you ran either of these on the same table right after the
 WordCount example, then the resulting counts should just double.)</p>
 
-      </div>
+        </div>
 
-      
+        
 <footer>
 
   <p><a href="https://www.apache.org"><img src="/images/feather-small.gif" alt="Apache Software Foundation" id="asf-logo" height="100" /></a></p>
 
-  <p>Copyright © 2011-2016 The Apache Software
-Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
-Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
-logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+  <p>Copyright © 2011-2016 The Apache Software Foundation. Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 
   <p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
 <a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
@@ -400,10 +338,8 @@ logo are trademarks of the <a href="https://www.apache.org">Apache Software Foun
 </footer>
 
 
+      </div>
     </div>
-
   </div>
-</div>
-
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1bf6c22/1.6/examples/maxmutation.html
----------------------------------------------------------------------
diff --git a/1.6/examples/maxmutation.html b/1.6/examples/maxmutation.html
index c617e18..af1ac64 100644
--- a/1.6/examples/maxmutation.html
+++ b/1.6/examples/maxmutation.html
@@ -68,8 +68,9 @@
   }
 </script>
 </head>
-<body>
-<nav class="navbar navbar-default navbar-fixed-top">
+<body style="padding-top: 100px">
+
+  <nav class="navbar navbar-default navbar-fixed-top">
   <div class="container-fluid">
     <div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
@@ -78,17 +79,32 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="/">Accumulo</a>
+      <a href="/"><img id="nav-logo" alt="Apache Accumulo" class="img-responsive" src="/images/accumulo-logo.png" width="200"/></a>
     </div>
     <div class="collapse navbar-collapse" id="navbar-items">
       <ul class="nav navbar-nav">
+        <li class="nav-link"><a href="/downloads">Download</a></li>
         <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Project<span class="caret"></span></a>
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li id="nav_index"><a href="/">Home</a></li>
-          <li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+          <li class="dropdown-header">1.7.1 Release (Latest)</li>
+          <li id="nav_rn_171"><a href="/release_notes/1.7.1">Release Notes</a></li>
+          <li><a href="/1.7/accumulo_user_manual">User Manual</a></li>
+          <li><a href="/1.7/apidocs">Javadoc</a></li>
+          <li id="nav_examples_17"><a href="/1.7/examples">Examples</a></li>
+          <li class="divider"></li>
+          <li class="dropdown-header">1.6.5 Release</li>
+          <li id="nav_rn_165"><a href="/release_notes/1.6.5">Release Notes</a></li>
+          <li><a href="/1.6/accumulo_user_manual">User Manual</a></li>
+          <li><a href="/1.6/apidocs">Javadoc</a></li>
+          <li id="nav_examples_16"><a href="/1.6/examples">Examples</a></li>
+          <li class="divider"></li>
           <li id="nav_features"><a href="/notable_features">Features</a></li>
-          <li><a href="https://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+          <li id="nav_rn"><a href="/release_notes">Release Notes Archive</a></li>
+          <li id="old_documentation"><a href="/old_documentation">Documentation Archive</a></li>
+          <li id="nav_screenshots"><a href="/screenshots">Screenshots</a></li>
+          <li id="nav_papers"><a href="/papers">Papers &amp; Presentations</a></li>
+          <li id="nav_glossary"><a href="/glossary">Glossary</a></li>
         </ul>
         </li>
         <li class="dropdown">
@@ -97,7 +113,7 @@
           <li id="nav_getinvolved"><a href="/get_involved">Get Involved</a></li>
           <li id="nav_mailinglists"><a href="/mailing_list">Mailing Lists</a></li>
           <li id="nav_people"><a href="/people">People</a></li>
-          <li id="nav_blog"><a href="https://blogs.apache.org/accumulo"><i class="fa fa-external-link"></i> Blog</a></li>
+          <li id="nav_blog"><a href="https://blogs.apache.org/accumulo">Blog <i class="fa fa-external-link"></i></a></li>
           <li id="nav_projects"><a href="/projects">Community Projects</a></li>
           <li class="divider"></li>
           <li class="dropdown-header">Governance</li>
@@ -111,6 +127,11 @@
         <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">Development<span class="caret"></span></a>
         <ul class="dropdown-menu">
+          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO">Issue Tracker <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://github.com/apache/accumulo/pulls">Pull Requests <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://builds.apache.org/view/A/view/Accumulo">Jenkins Builds <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://travis-ci.org/apache/accumulo">TravisCI Builds <i class="fa fa-external-link"></i></a></li>
+          <li class="divider"></li>
           <li class="dropdown-header">Guides</li>
           <li id="nav_source"><a href="/source">Source &amp; Guide</a></li>
           <li id="nav_git"><a href="/git">Git Workflow</a></li>
@@ -119,118 +140,39 @@
           <li id="nav_rb"><a href="/rb">Review Board</a></li>
           <li id="nav_releasing"><a href="/releasing">Making Releases</a></li>
           <li id="nav_verify_release"><a href="/verifying_releases">Verifying Releases</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Issues</li>
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO"><i class="fa fa-external-link"></i> JIRA</a></li>
-          <li><a href="https://github.com/apache/accumulo/issues"><i class="fa fa-external-link"></i> GitHub</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Builds</li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo"><i class="fa fa-external-link"></i> Jenkins</a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo"><i class="fa fa-external-link"></i> Travis CI</a></li>
-        </ul>
-        </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li class="dropdown-header">Release Notes</li>
-          <li id="nav_rn_171"><a href="/release_notes/1.7.1">1.7.1</a></li>
-          <li id="nav_rn_165"><a href="/release_notes/1.6.5">1.6.5</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Manual</li>
-          <li><a href="/1.7/accumulo_user_manual">1.7</a></li>
-          <li><a href="/1.6/accumulo_user_manual">1.6</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Javadoc</li>
-          <li><a href="/1.7/apidocs">1.7</a></li>
-          <li><a href="/1.6/apidocs">1.6</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Examples</li>
-          <li id="nav_examples_17"><a href="/1.7/examples">1.7</a></li>
-          <li id="nav_examples_16"><a href="/1.6/examples">1.6</a></li>
-          <li class="divider"></li>
-          <li id="nav_rn"><a href="/release_notes">Release Notes Archive</a></li>
-          <li id="old_documentation"><a href="/old_documentation">Docs for Older Verisons</a></li>
-          <li id="nav_screenshots"><a href="/screenshots">Screenshots</a></li>
-          <li id="nav_papers"><a href="/papers">Papers &amp; Presentations</a></li>
-          <li id="nav_glossary"><a href="/glossary">Glossary</a></li>
         </ul>
         </li>
+      </ul>
+      <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">ASF Links<span class="caret"></span></a>
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Apache Software Foundation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="https://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
-          <li><a href="https://www.apache.org/foundation/sponsorship"><i class="fa fa-external-link"></i> Sponsorship</a></li>
-          <li><a href="https://www.apache.org/security"><i class="fa fa-external-link"></i> Security</a></li>
-          <li><a href="https://www.apache.org/foundation/thanks"><i class="fa fa-external-link"></i> Thanks</a></li>
-          <li><a href="https://www.apache.org/foundation/policies/conduct"><i class="fa fa-external-link"></i> Code of Conduct</a></li>
+          <li><a href="https://www.apache.org">Apache Homepage <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/licenses/LICENSE-2.0">License <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/sponsorship">Sponsorship <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/security">Security <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/thanks">Thanks <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct <i class="fa fa-external-link"></i></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="/"><img id="logo" alt="Apache Accumulo &trade;" class="img-responsive" src="/images/accumulo-logo.png"/></a>
-        <br />
-        Latest 1.7 release: <strong>1.7.1</strong><br />
-        Latest 1.6 release: <strong>1.6.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">
-  <tbody>
-    <tr>
-      <td><img src="/images/Twitter_logo_blue.png" alt="Twitter" style="height: 1em" /></td>
-      <td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td>
-    </tr>
-    <tr>
-      <td><img src="/images/InBug-16px_0.png" alt="Linked in" /></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" alt="GitHub" 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>
-    <tr>
-      <td><img src="/favicon.png" alt="Blog" width="16" /></td>
-      <td><a href="https://blogs.apache.org/accumulo">Apache Accumulo Blog</a></td>
-    </tr>
-  </tbody>
-</table>
+  <div class="container">
+    <div class="row">
+      <div class="col-md-12">
 
-
-
-      <hr>
-      <a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit.png"></a>
-    </div>
-    <div class="col-md-8 col-md-offset-1">
-
-      <div id="non-canonical" style="display: none; background-color: #F0E68C; padding-left: 1em;">
-        Visit the official site at: <a href="https://accumulo.apache.org">https://accumulo.apache.org</a>
-      </div>
-      <div id="content">
-        
-        <h1 class="title">MaxMutation Constraints Example</h1>
-        
-        <p>This an example of how to limit the size of mutations that will be accepted into
+        <div id="non-canonical" style="display: none; background-color: #F0E68C; padding-left: 1em;">
+          Visit the official site at: <a href="https://accumulo.apache.org">https://accumulo.apache.org</a>
+        </div>
+        <div id="content">
+          
+          <h1 class="title">MaxMutation Constraints Example</h1>
+          
+          <p>This an example of how to limit the size of mutations that will be accepted into
 a table. Under the default configuration, accumulo does not provide a limitation
 on the size of mutations that can be ingested. Poorly behaved writers might
 inadvertently create mutations so large, that they cause the tablet servers to
@@ -263,18 +205,14 @@ ERROR : Constraint violates : ConstraintViolationSummary(constrainClass:org.apac
 </div>
 
 
-      </div>
+        </div>
 
-      
+        
 <footer>
 
   <p><a href="https://www.apache.org"><img src="/images/feather-small.gif" alt="Apache Software Foundation" id="asf-logo" height="100" /></a></p>
 
-  <p>Copyright © 2011-2016 The Apache Software
-Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
-Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
-logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+  <p>Copyright © 2011-2016 The Apache Software Foundation. Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 
   <p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
 <a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
@@ -282,10 +220,8 @@ logo are trademarks of the <a href="https://www.apache.org">Apache Software Foun
 </footer>
 
 
+      </div>
     </div>
-
   </div>
-</div>
-
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1bf6c22/1.6/examples/regex.html
----------------------------------------------------------------------
diff --git a/1.6/examples/regex.html b/1.6/examples/regex.html
index 71b0779..236df41 100644
--- a/1.6/examples/regex.html
+++ b/1.6/examples/regex.html
@@ -68,8 +68,9 @@
   }
 </script>
 </head>
-<body>
-<nav class="navbar navbar-default navbar-fixed-top">
+<body style="padding-top: 100px">
+
+  <nav class="navbar navbar-default navbar-fixed-top">
   <div class="container-fluid">
     <div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
@@ -78,17 +79,32 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="/">Accumulo</a>
+      <a href="/"><img id="nav-logo" alt="Apache Accumulo" class="img-responsive" src="/images/accumulo-logo.png" width="200"/></a>
     </div>
     <div class="collapse navbar-collapse" id="navbar-items">
       <ul class="nav navbar-nav">
+        <li class="nav-link"><a href="/downloads">Download</a></li>
         <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Project<span class="caret"></span></a>
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li id="nav_index"><a href="/">Home</a></li>
-          <li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+          <li class="dropdown-header">1.7.1 Release (Latest)</li>
+          <li id="nav_rn_171"><a href="/release_notes/1.7.1">Release Notes</a></li>
+          <li><a href="/1.7/accumulo_user_manual">User Manual</a></li>
+          <li><a href="/1.7/apidocs">Javadoc</a></li>
+          <li id="nav_examples_17"><a href="/1.7/examples">Examples</a></li>
+          <li class="divider"></li>
+          <li class="dropdown-header">1.6.5 Release</li>
+          <li id="nav_rn_165"><a href="/release_notes/1.6.5">Release Notes</a></li>
+          <li><a href="/1.6/accumulo_user_manual">User Manual</a></li>
+          <li><a href="/1.6/apidocs">Javadoc</a></li>
+          <li id="nav_examples_16"><a href="/1.6/examples">Examples</a></li>
+          <li class="divider"></li>
           <li id="nav_features"><a href="/notable_features">Features</a></li>
-          <li><a href="https://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+          <li id="nav_rn"><a href="/release_notes">Release Notes Archive</a></li>
+          <li id="old_documentation"><a href="/old_documentation">Documentation Archive</a></li>
+          <li id="nav_screenshots"><a href="/screenshots">Screenshots</a></li>
+          <li id="nav_papers"><a href="/papers">Papers &amp; Presentations</a></li>
+          <li id="nav_glossary"><a href="/glossary">Glossary</a></li>
         </ul>
         </li>
         <li class="dropdown">
@@ -97,7 +113,7 @@
           <li id="nav_getinvolved"><a href="/get_involved">Get Involved</a></li>
           <li id="nav_mailinglists"><a href="/mailing_list">Mailing Lists</a></li>
           <li id="nav_people"><a href="/people">People</a></li>
-          <li id="nav_blog"><a href="https://blogs.apache.org/accumulo"><i class="fa fa-external-link"></i> Blog</a></li>
+          <li id="nav_blog"><a href="https://blogs.apache.org/accumulo">Blog <i class="fa fa-external-link"></i></a></li>
           <li id="nav_projects"><a href="/projects">Community Projects</a></li>
           <li class="divider"></li>
           <li class="dropdown-header">Governance</li>
@@ -111,6 +127,11 @@
         <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">Development<span class="caret"></span></a>
         <ul class="dropdown-menu">
+          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO">Issue Tracker <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://github.com/apache/accumulo/pulls">Pull Requests <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://builds.apache.org/view/A/view/Accumulo">Jenkins Builds <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://travis-ci.org/apache/accumulo">TravisCI Builds <i class="fa fa-external-link"></i></a></li>
+          <li class="divider"></li>
           <li class="dropdown-header">Guides</li>
           <li id="nav_source"><a href="/source">Source &amp; Guide</a></li>
           <li id="nav_git"><a href="/git">Git Workflow</a></li>
@@ -119,118 +140,39 @@
           <li id="nav_rb"><a href="/rb">Review Board</a></li>
           <li id="nav_releasing"><a href="/releasing">Making Releases</a></li>
           <li id="nav_verify_release"><a href="/verifying_releases">Verifying Releases</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Issues</li>
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO"><i class="fa fa-external-link"></i> JIRA</a></li>
-          <li><a href="https://github.com/apache/accumulo/issues"><i class="fa fa-external-link"></i> GitHub</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Builds</li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo"><i class="fa fa-external-link"></i> Jenkins</a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo"><i class="fa fa-external-link"></i> Travis CI</a></li>
-        </ul>
-        </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li class="dropdown-header">Release Notes</li>
-          <li id="nav_rn_171"><a href="/release_notes/1.7.1">1.7.1</a></li>
-          <li id="nav_rn_165"><a href="/release_notes/1.6.5">1.6.5</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Manual</li>
-          <li><a href="/1.7/accumulo_user_manual">1.7</a></li>
-          <li><a href="/1.6/accumulo_user_manual">1.6</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Javadoc</li>
-          <li><a href="/1.7/apidocs">1.7</a></li>
-          <li><a href="/1.6/apidocs">1.6</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Examples</li>
-          <li id="nav_examples_17"><a href="/1.7/examples">1.7</a></li>
-          <li id="nav_examples_16"><a href="/1.6/examples">1.6</a></li>
-          <li class="divider"></li>
-          <li id="nav_rn"><a href="/release_notes">Release Notes Archive</a></li>
-          <li id="old_documentation"><a href="/old_documentation">Docs for Older Verisons</a></li>
-          <li id="nav_screenshots"><a href="/screenshots">Screenshots</a></li>
-          <li id="nav_papers"><a href="/papers">Papers &amp; Presentations</a></li>
-          <li id="nav_glossary"><a href="/glossary">Glossary</a></li>
         </ul>
         </li>
+      </ul>
+      <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">ASF Links<span class="caret"></span></a>
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Apache Software Foundation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="https://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
-          <li><a href="https://www.apache.org/foundation/sponsorship"><i class="fa fa-external-link"></i> Sponsorship</a></li>
-          <li><a href="https://www.apache.org/security"><i class="fa fa-external-link"></i> Security</a></li>
-          <li><a href="https://www.apache.org/foundation/thanks"><i class="fa fa-external-link"></i> Thanks</a></li>
-          <li><a href="https://www.apache.org/foundation/policies/conduct"><i class="fa fa-external-link"></i> Code of Conduct</a></li>
+          <li><a href="https://www.apache.org">Apache Homepage <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/licenses/LICENSE-2.0">License <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/sponsorship">Sponsorship <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/security">Security <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/thanks">Thanks <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct <i class="fa fa-external-link"></i></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="/"><img id="logo" alt="Apache Accumulo &trade;" class="img-responsive" src="/images/accumulo-logo.png"/></a>
-        <br />
-        Latest 1.7 release: <strong>1.7.1</strong><br />
-        Latest 1.6 release: <strong>1.6.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">
-  <tbody>
-    <tr>
-      <td><img src="/images/Twitter_logo_blue.png" alt="Twitter" style="height: 1em" /></td>
-      <td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td>
-    </tr>
-    <tr>
-      <td><img src="/images/InBug-16px_0.png" alt="Linked in" /></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" alt="GitHub" 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>
-    <tr>
-      <td><img src="/favicon.png" alt="Blog" width="16" /></td>
-      <td><a href="https://blogs.apache.org/accumulo">Apache Accumulo Blog</a></td>
-    </tr>
-  </tbody>
-</table>
+  <div class="container">
+    <div class="row">
+      <div class="col-md-12">
 
-
-
-      <hr>
-      <a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit.png"></a>
-    </div>
-    <div class="col-md-8 col-md-offset-1">
-
-      <div id="non-canonical" style="display: none; background-color: #F0E68C; padding-left: 1em;">
-        Visit the official site at: <a href="https://accumulo.apache.org">https://accumulo.apache.org</a>
-      </div>
-      <div id="content">
-        
-        <h1 class="title">Regex Example</h1>
-        
-        <p>This example uses mapreduce and accumulo to find items using regular expressions.
+        <div id="non-canonical" style="display: none; background-color: #F0E68C; padding-left: 1em;">
+          Visit the official site at: <a href="https://accumulo.apache.org">https://accumulo.apache.org</a>
+        </div>
+        <div id="content">
+          
+          <h1 class="title">Regex Example</h1>
+          
+          <p>This example uses mapreduce and accumulo to find items using regular expressions.
 This is accomplished using a map-only mapreduce job and a scan-time iterator.</p>
 
 <p>To run this example you will need some data in a table. The following will
@@ -274,18 +216,14 @@ dogrow dogcf:dogcq [] 1357844987994 false    dogvalue
 </code></pre>
 </div>
 
-      </div>
+        </div>
 
-      
+        
 <footer>
 
   <p><a href="https://www.apache.org"><img src="/images/feather-small.gif" alt="Apache Software Foundation" id="asf-logo" height="100" /></a></p>
 
-  <p>Copyright © 2011-2016 The Apache Software
-Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
-Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
-logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+  <p>Copyright © 2011-2016 The Apache Software Foundation. Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 
   <p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
 <a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
@@ -293,10 +231,8 @@ logo are trademarks of the <a href="https://www.apache.org">Apache Software Foun
 </footer>
 
 
+      </div>
     </div>
-
   </div>
-</div>
-
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1bf6c22/1.6/examples/reservations.html
----------------------------------------------------------------------
diff --git a/1.6/examples/reservations.html b/1.6/examples/reservations.html
index 9310091..cb0c7fd 100644
--- a/1.6/examples/reservations.html
+++ b/1.6/examples/reservations.html
@@ -68,8 +68,9 @@
   }
 </script>
 </head>
-<body>
-<nav class="navbar navbar-default navbar-fixed-top">
+<body style="padding-top: 100px">
+
+  <nav class="navbar navbar-default navbar-fixed-top">
   <div class="container-fluid">
     <div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
@@ -78,17 +79,32 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="/">Accumulo</a>
+      <a href="/"><img id="nav-logo" alt="Apache Accumulo" class="img-responsive" src="/images/accumulo-logo.png" width="200"/></a>
     </div>
     <div class="collapse navbar-collapse" id="navbar-items">
       <ul class="nav navbar-nav">
+        <li class="nav-link"><a href="/downloads">Download</a></li>
         <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Project<span class="caret"></span></a>
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li id="nav_index"><a href="/">Home</a></li>
-          <li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+          <li class="dropdown-header">1.7.1 Release (Latest)</li>
+          <li id="nav_rn_171"><a href="/release_notes/1.7.1">Release Notes</a></li>
+          <li><a href="/1.7/accumulo_user_manual">User Manual</a></li>
+          <li><a href="/1.7/apidocs">Javadoc</a></li>
+          <li id="nav_examples_17"><a href="/1.7/examples">Examples</a></li>
+          <li class="divider"></li>
+          <li class="dropdown-header">1.6.5 Release</li>
+          <li id="nav_rn_165"><a href="/release_notes/1.6.5">Release Notes</a></li>
+          <li><a href="/1.6/accumulo_user_manual">User Manual</a></li>
+          <li><a href="/1.6/apidocs">Javadoc</a></li>
+          <li id="nav_examples_16"><a href="/1.6/examples">Examples</a></li>
+          <li class="divider"></li>
           <li id="nav_features"><a href="/notable_features">Features</a></li>
-          <li><a href="https://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+          <li id="nav_rn"><a href="/release_notes">Release Notes Archive</a></li>
+          <li id="old_documentation"><a href="/old_documentation">Documentation Archive</a></li>
+          <li id="nav_screenshots"><a href="/screenshots">Screenshots</a></li>
+          <li id="nav_papers"><a href="/papers">Papers &amp; Presentations</a></li>
+          <li id="nav_glossary"><a href="/glossary">Glossary</a></li>
         </ul>
         </li>
         <li class="dropdown">
@@ -97,7 +113,7 @@
           <li id="nav_getinvolved"><a href="/get_involved">Get Involved</a></li>
           <li id="nav_mailinglists"><a href="/mailing_list">Mailing Lists</a></li>
           <li id="nav_people"><a href="/people">People</a></li>
-          <li id="nav_blog"><a href="https://blogs.apache.org/accumulo"><i class="fa fa-external-link"></i> Blog</a></li>
+          <li id="nav_blog"><a href="https://blogs.apache.org/accumulo">Blog <i class="fa fa-external-link"></i></a></li>
           <li id="nav_projects"><a href="/projects">Community Projects</a></li>
           <li class="divider"></li>
           <li class="dropdown-header">Governance</li>
@@ -111,6 +127,11 @@
         <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">Development<span class="caret"></span></a>
         <ul class="dropdown-menu">
+          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO">Issue Tracker <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://github.com/apache/accumulo/pulls">Pull Requests <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://builds.apache.org/view/A/view/Accumulo">Jenkins Builds <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://travis-ci.org/apache/accumulo">TravisCI Builds <i class="fa fa-external-link"></i></a></li>
+          <li class="divider"></li>
           <li class="dropdown-header">Guides</li>
           <li id="nav_source"><a href="/source">Source &amp; Guide</a></li>
           <li id="nav_git"><a href="/git">Git Workflow</a></li>
@@ -119,118 +140,39 @@
           <li id="nav_rb"><a href="/rb">Review Board</a></li>
           <li id="nav_releasing"><a href="/releasing">Making Releases</a></li>
           <li id="nav_verify_release"><a href="/verifying_releases">Verifying Releases</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Issues</li>
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO"><i class="fa fa-external-link"></i> JIRA</a></li>
-          <li><a href="https://github.com/apache/accumulo/issues"><i class="fa fa-external-link"></i> GitHub</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Builds</li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo"><i class="fa fa-external-link"></i> Jenkins</a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo"><i class="fa fa-external-link"></i> Travis CI</a></li>
-        </ul>
-        </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li class="dropdown-header">Release Notes</li>
-          <li id="nav_rn_171"><a href="/release_notes/1.7.1">1.7.1</a></li>
-          <li id="nav_rn_165"><a href="/release_notes/1.6.5">1.6.5</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Manual</li>
-          <li><a href="/1.7/accumulo_user_manual">1.7</a></li>
-          <li><a href="/1.6/accumulo_user_manual">1.6</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Javadoc</li>
-          <li><a href="/1.7/apidocs">1.7</a></li>
-          <li><a href="/1.6/apidocs">1.6</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Examples</li>
-          <li id="nav_examples_17"><a href="/1.7/examples">1.7</a></li>
-          <li id="nav_examples_16"><a href="/1.6/examples">1.6</a></li>
-          <li class="divider"></li>
-          <li id="nav_rn"><a href="/release_notes">Release Notes Archive</a></li>
-          <li id="old_documentation"><a href="/old_documentation">Docs for Older Verisons</a></li>
-          <li id="nav_screenshots"><a href="/screenshots">Screenshots</a></li>
-          <li id="nav_papers"><a href="/papers">Papers &amp; Presentations</a></li>
-          <li id="nav_glossary"><a href="/glossary">Glossary</a></li>
         </ul>
         </li>
+      </ul>
+      <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">ASF Links<span class="caret"></span></a>
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Apache Software Foundation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="https://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
-          <li><a href="https://www.apache.org/foundation/sponsorship"><i class="fa fa-external-link"></i> Sponsorship</a></li>
-          <li><a href="https://www.apache.org/security"><i class="fa fa-external-link"></i> Security</a></li>
-          <li><a href="https://www.apache.org/foundation/thanks"><i class="fa fa-external-link"></i> Thanks</a></li>
-          <li><a href="https://www.apache.org/foundation/policies/conduct"><i class="fa fa-external-link"></i> Code of Conduct</a></li>
+          <li><a href="https://www.apache.org">Apache Homepage <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/licenses/LICENSE-2.0">License <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/sponsorship">Sponsorship <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/security">Security <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/thanks">Thanks <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct <i class="fa fa-external-link"></i></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="/"><img id="logo" alt="Apache Accumulo &trade;" class="img-responsive" src="/images/accumulo-logo.png"/></a>
-        <br />
-        Latest 1.7 release: <strong>1.7.1</strong><br />
-        Latest 1.6 release: <strong>1.6.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">
-  <tbody>
-    <tr>
-      <td><img src="/images/Twitter_logo_blue.png" alt="Twitter" style="height: 1em" /></td>
-      <td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td>
-    </tr>
-    <tr>
-      <td><img src="/images/InBug-16px_0.png" alt="Linked in" /></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" alt="GitHub" 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>
-    <tr>
-      <td><img src="/favicon.png" alt="Blog" width="16" /></td>
-      <td><a href="https://blogs.apache.org/accumulo">Apache Accumulo Blog</a></td>
-    </tr>
-  </tbody>
-</table>
+  <div class="container">
+    <div class="row">
+      <div class="col-md-12">
 
-
-
-      <hr>
-      <a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit.png"></a>
-    </div>
-    <div class="col-md-8 col-md-offset-1">
-
-      <div id="non-canonical" style="display: none; background-color: #F0E68C; padding-left: 1em;">
-        Visit the official site at: <a href="https://accumulo.apache.org">https://accumulo.apache.org</a>
-      </div>
-      <div id="content">
-        
-        <h1 class="title">Isolation Example</h1>
-        
-        <p>This example shows running a simple reservation system implemented using
+        <div id="non-canonical" style="display: none; background-color: #F0E68C; padding-left: 1em;">
+          Visit the official site at: <a href="https://accumulo.apache.org">https://accumulo.apache.org</a>
+        </div>
+        <div id="content">
+          
+          <h1 class="title">Isolation Example</h1>
+          
+          <p>This example shows running a simple reservation system implemented using
 conditional mutations. This system guarantees that only one concurrent user can
 reserve a resource. The example’s reserve command allows multiple users to be
 specified. When this is done, it creates a separate reservation thread for each
@@ -283,18 +225,14 @@ number must not have changed since the data was read. If it does change,
 the conditional mutation will fail and the example code will retry.</p>
 
 
-      </div>
+        </div>
 
-      
+        
 <footer>
 
   <p><a href="https://www.apache.org"><img src="/images/feather-small.gif" alt="Apache Software Foundation" id="asf-logo" height="100" /></a></p>
 
-  <p>Copyright © 2011-2016 The Apache Software
-Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
-Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
-logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+  <p>Copyright © 2011-2016 The Apache Software Foundation. Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 
   <p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
 <a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
@@ -302,10 +240,8 @@ logo are trademarks of the <a href="https://www.apache.org">Apache Software Foun
 </footer>
 
 
+      </div>
     </div>
-
   </div>
-</div>
-
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1bf6c22/1.6/examples/rowhash.html
----------------------------------------------------------------------
diff --git a/1.6/examples/rowhash.html b/1.6/examples/rowhash.html
index 3a6a697..0cffd1b 100644
--- a/1.6/examples/rowhash.html
+++ b/1.6/examples/rowhash.html
@@ -68,8 +68,9 @@
   }
 </script>
 </head>
-<body>
-<nav class="navbar navbar-default navbar-fixed-top">
+<body style="padding-top: 100px">
+
+  <nav class="navbar navbar-default navbar-fixed-top">
   <div class="container-fluid">
     <div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
@@ -78,17 +79,32 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="/">Accumulo</a>
+      <a href="/"><img id="nav-logo" alt="Apache Accumulo" class="img-responsive" src="/images/accumulo-logo.png" width="200"/></a>
     </div>
     <div class="collapse navbar-collapse" id="navbar-items">
       <ul class="nav navbar-nav">
+        <li class="nav-link"><a href="/downloads">Download</a></li>
         <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Project<span class="caret"></span></a>
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li id="nav_index"><a href="/">Home</a></li>
-          <li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+          <li class="dropdown-header">1.7.1 Release (Latest)</li>
+          <li id="nav_rn_171"><a href="/release_notes/1.7.1">Release Notes</a></li>
+          <li><a href="/1.7/accumulo_user_manual">User Manual</a></li>
+          <li><a href="/1.7/apidocs">Javadoc</a></li>
+          <li id="nav_examples_17"><a href="/1.7/examples">Examples</a></li>
+          <li class="divider"></li>
+          <li class="dropdown-header">1.6.5 Release</li>
+          <li id="nav_rn_165"><a href="/release_notes/1.6.5">Release Notes</a></li>
+          <li><a href="/1.6/accumulo_user_manual">User Manual</a></li>
+          <li><a href="/1.6/apidocs">Javadoc</a></li>
+          <li id="nav_examples_16"><a href="/1.6/examples">Examples</a></li>
+          <li class="divider"></li>
           <li id="nav_features"><a href="/notable_features">Features</a></li>
-          <li><a href="https://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+          <li id="nav_rn"><a href="/release_notes">Release Notes Archive</a></li>
+          <li id="old_documentation"><a href="/old_documentation">Documentation Archive</a></li>
+          <li id="nav_screenshots"><a href="/screenshots">Screenshots</a></li>
+          <li id="nav_papers"><a href="/papers">Papers &amp; Presentations</a></li>
+          <li id="nav_glossary"><a href="/glossary">Glossary</a></li>
         </ul>
         </li>
         <li class="dropdown">
@@ -97,7 +113,7 @@
           <li id="nav_getinvolved"><a href="/get_involved">Get Involved</a></li>
           <li id="nav_mailinglists"><a href="/mailing_list">Mailing Lists</a></li>
           <li id="nav_people"><a href="/people">People</a></li>
-          <li id="nav_blog"><a href="https://blogs.apache.org/accumulo"><i class="fa fa-external-link"></i> Blog</a></li>
+          <li id="nav_blog"><a href="https://blogs.apache.org/accumulo">Blog <i class="fa fa-external-link"></i></a></li>
           <li id="nav_projects"><a href="/projects">Community Projects</a></li>
           <li class="divider"></li>
           <li class="dropdown-header">Governance</li>
@@ -111,6 +127,11 @@
         <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">Development<span class="caret"></span></a>
         <ul class="dropdown-menu">
+          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO">Issue Tracker <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://github.com/apache/accumulo/pulls">Pull Requests <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://builds.apache.org/view/A/view/Accumulo">Jenkins Builds <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://travis-ci.org/apache/accumulo">TravisCI Builds <i class="fa fa-external-link"></i></a></li>
+          <li class="divider"></li>
           <li class="dropdown-header">Guides</li>
           <li id="nav_source"><a href="/source">Source &amp; Guide</a></li>
           <li id="nav_git"><a href="/git">Git Workflow</a></li>
@@ -119,118 +140,39 @@
           <li id="nav_rb"><a href="/rb">Review Board</a></li>
           <li id="nav_releasing"><a href="/releasing">Making Releases</a></li>
           <li id="nav_verify_release"><a href="/verifying_releases">Verifying Releases</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Issues</li>
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO"><i class="fa fa-external-link"></i> JIRA</a></li>
-          <li><a href="https://github.com/apache/accumulo/issues"><i class="fa fa-external-link"></i> GitHub</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Builds</li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo"><i class="fa fa-external-link"></i> Jenkins</a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo"><i class="fa fa-external-link"></i> Travis CI</a></li>
-        </ul>
-        </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li class="dropdown-header">Release Notes</li>
-          <li id="nav_rn_171"><a href="/release_notes/1.7.1">1.7.1</a></li>
-          <li id="nav_rn_165"><a href="/release_notes/1.6.5">1.6.5</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Manual</li>
-          <li><a href="/1.7/accumulo_user_manual">1.7</a></li>
-          <li><a href="/1.6/accumulo_user_manual">1.6</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Javadoc</li>
-          <li><a href="/1.7/apidocs">1.7</a></li>
-          <li><a href="/1.6/apidocs">1.6</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Examples</li>
-          <li id="nav_examples_17"><a href="/1.7/examples">1.7</a></li>
-          <li id="nav_examples_16"><a href="/1.6/examples">1.6</a></li>
-          <li class="divider"></li>
-          <li id="nav_rn"><a href="/release_notes">Release Notes Archive</a></li>
-          <li id="old_documentation"><a href="/old_documentation">Docs for Older Verisons</a></li>
-          <li id="nav_screenshots"><a href="/screenshots">Screenshots</a></li>
-          <li id="nav_papers"><a href="/papers">Papers &amp; Presentations</a></li>
-          <li id="nav_glossary"><a href="/glossary">Glossary</a></li>
         </ul>
         </li>
+      </ul>
+      <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">ASF Links<span class="caret"></span></a>
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Apache Software Foundation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="https://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
-          <li><a href="https://www.apache.org/foundation/sponsorship"><i class="fa fa-external-link"></i> Sponsorship</a></li>
-          <li><a href="https://www.apache.org/security"><i class="fa fa-external-link"></i> Security</a></li>
-          <li><a href="https://www.apache.org/foundation/thanks"><i class="fa fa-external-link"></i> Thanks</a></li>
-          <li><a href="https://www.apache.org/foundation/policies/conduct"><i class="fa fa-external-link"></i> Code of Conduct</a></li>
+          <li><a href="https://www.apache.org">Apache Homepage <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/licenses/LICENSE-2.0">License <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/sponsorship">Sponsorship <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/security">Security <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/thanks">Thanks <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct <i class="fa fa-external-link"></i></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="/"><img id="logo" alt="Apache Accumulo &trade;" class="img-responsive" src="/images/accumulo-logo.png"/></a>
-        <br />
-        Latest 1.7 release: <strong>1.7.1</strong><br />
-        Latest 1.6 release: <strong>1.6.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">
-  <tbody>
-    <tr>
-      <td><img src="/images/Twitter_logo_blue.png" alt="Twitter" style="height: 1em" /></td>
-      <td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td>
-    </tr>
-    <tr>
-      <td><img src="/images/InBug-16px_0.png" alt="Linked in" /></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" alt="GitHub" 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>
-    <tr>
-      <td><img src="/favicon.png" alt="Blog" width="16" /></td>
-      <td><a href="https://blogs.apache.org/accumulo">Apache Accumulo Blog</a></td>
-    </tr>
-  </tbody>
-</table>
+  <div class="container">
+    <div class="row">
+      <div class="col-md-12">
 
-
-
-      <hr>
-      <a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit.png"></a>
-    </div>
-    <div class="col-md-8 col-md-offset-1">
-
-      <div id="non-canonical" style="display: none; background-color: #F0E68C; padding-left: 1em;">
-        Visit the official site at: <a href="https://accumulo.apache.org">https://accumulo.apache.org</a>
-      </div>
-      <div id="content">
-        
-        <h1 class="title">RowHash Example</h1>
-        
-        <p>This example shows a simple map/reduce job that reads from an accumulo table and
+        <div id="non-canonical" style="display: none; background-color: #F0E68C; padding-left: 1em;">
+          Visit the official site at: <a href="https://accumulo.apache.org">https://accumulo.apache.org</a>
+        </div>
+        <div id="content">
+          
+          <h1 class="title">RowHash Example</h1>
+          
+          <p>This example shows a simple map/reduce job that reads from an accumulo table and
 writes back into that table.</p>
 
 <p>To run this example you will need some data in a table. The following will
@@ -278,18 +220,14 @@ username@instance&gt;
 </div>
 
 
-      </div>
+        </div>
 
-      
+        
 <footer>
 
   <p><a href="https://www.apache.org"><img src="/images/feather-small.gif" alt="Apache Software Foundation" id="asf-logo" height="100" /></a></p>
 
-  <p>Copyright © 2011-2016 The Apache Software
-Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
-Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
-logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+  <p>Copyright © 2011-2016 The Apache Software Foundation. Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 
   <p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
 <a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
@@ -297,10 +235,8 @@ logo are trademarks of the <a href="https://www.apache.org">Apache Software Foun
 </footer>
 
 
+      </div>
     </div>
-
   </div>
-</div>
-
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1bf6c22/1.6/examples/shard.html
----------------------------------------------------------------------
diff --git a/1.6/examples/shard.html b/1.6/examples/shard.html
index a26bf64..e22d46f 100644
--- a/1.6/examples/shard.html
+++ b/1.6/examples/shard.html
@@ -68,8 +68,9 @@
   }
 </script>
 </head>
-<body>
-<nav class="navbar navbar-default navbar-fixed-top">
+<body style="padding-top: 100px">
+
+  <nav class="navbar navbar-default navbar-fixed-top">
   <div class="container-fluid">
     <div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
@@ -78,17 +79,32 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="/">Accumulo</a>
+      <a href="/"><img id="nav-logo" alt="Apache Accumulo" class="img-responsive" src="/images/accumulo-logo.png" width="200"/></a>
     </div>
     <div class="collapse navbar-collapse" id="navbar-items">
       <ul class="nav navbar-nav">
+        <li class="nav-link"><a href="/downloads">Download</a></li>
         <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Project<span class="caret"></span></a>
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li id="nav_index"><a href="/">Home</a></li>
-          <li id="nav_downloads"><a href="/downloads">Downloads</a></li>
+          <li class="dropdown-header">1.7.1 Release (Latest)</li>
+          <li id="nav_rn_171"><a href="/release_notes/1.7.1">Release Notes</a></li>
+          <li><a href="/1.7/accumulo_user_manual">User Manual</a></li>
+          <li><a href="/1.7/apidocs">Javadoc</a></li>
+          <li id="nav_examples_17"><a href="/1.7/examples">Examples</a></li>
+          <li class="divider"></li>
+          <li class="dropdown-header">1.6.5 Release</li>
+          <li id="nav_rn_165"><a href="/release_notes/1.6.5">Release Notes</a></li>
+          <li><a href="/1.6/accumulo_user_manual">User Manual</a></li>
+          <li><a href="/1.6/apidocs">Javadoc</a></li>
+          <li id="nav_examples_16"><a href="/1.6/examples">Examples</a></li>
+          <li class="divider"></li>
           <li id="nav_features"><a href="/notable_features">Features</a></li>
-          <li><a href="https://www.apache.org/licenses/LICENSE-2.0"><i class="fa fa-external-link"></i> License</a></li>
+          <li id="nav_rn"><a href="/release_notes">Release Notes Archive</a></li>
+          <li id="old_documentation"><a href="/old_documentation">Documentation Archive</a></li>
+          <li id="nav_screenshots"><a href="/screenshots">Screenshots</a></li>
+          <li id="nav_papers"><a href="/papers">Papers &amp; Presentations</a></li>
+          <li id="nav_glossary"><a href="/glossary">Glossary</a></li>
         </ul>
         </li>
         <li class="dropdown">
@@ -97,7 +113,7 @@
           <li id="nav_getinvolved"><a href="/get_involved">Get Involved</a></li>
           <li id="nav_mailinglists"><a href="/mailing_list">Mailing Lists</a></li>
           <li id="nav_people"><a href="/people">People</a></li>
-          <li id="nav_blog"><a href="https://blogs.apache.org/accumulo"><i class="fa fa-external-link"></i> Blog</a></li>
+          <li id="nav_blog"><a href="https://blogs.apache.org/accumulo">Blog <i class="fa fa-external-link"></i></a></li>
           <li id="nav_projects"><a href="/projects">Community Projects</a></li>
           <li class="divider"></li>
           <li class="dropdown-header">Governance</li>
@@ -111,6 +127,11 @@
         <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">Development<span class="caret"></span></a>
         <ul class="dropdown-menu">
+          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO">Issue Tracker <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://github.com/apache/accumulo/pulls">Pull Requests <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://builds.apache.org/view/A/view/Accumulo">Jenkins Builds <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://travis-ci.org/apache/accumulo">TravisCI Builds <i class="fa fa-external-link"></i></a></li>
+          <li class="divider"></li>
           <li class="dropdown-header">Guides</li>
           <li id="nav_source"><a href="/source">Source &amp; Guide</a></li>
           <li id="nav_git"><a href="/git">Git Workflow</a></li>
@@ -119,118 +140,39 @@
           <li id="nav_rb"><a href="/rb">Review Board</a></li>
           <li id="nav_releasing"><a href="/releasing">Making Releases</a></li>
           <li id="nav_verify_release"><a href="/verifying_releases">Verifying Releases</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Issues</li>
-          <li><a href="https://issues.apache.org/jira/browse/ACCUMULO"><i class="fa fa-external-link"></i> JIRA</a></li>
-          <li><a href="https://github.com/apache/accumulo/issues"><i class="fa fa-external-link"></i> GitHub</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Builds</li>
-          <li><a href="https://builds.apache.org/view/A/view/Accumulo"><i class="fa fa-external-link"></i> Jenkins</a></li>
-          <li><a href="https://travis-ci.org/apache/accumulo"><i class="fa fa-external-link"></i> Travis CI</a></li>
-        </ul>
-        </li>
-        <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li class="dropdown-header">Release Notes</li>
-          <li id="nav_rn_171"><a href="/release_notes/1.7.1">1.7.1</a></li>
-          <li id="nav_rn_165"><a href="/release_notes/1.6.5">1.6.5</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Manual</li>
-          <li><a href="/1.7/accumulo_user_manual">1.7</a></li>
-          <li><a href="/1.6/accumulo_user_manual">1.6</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Javadoc</li>
-          <li><a href="/1.7/apidocs">1.7</a></li>
-          <li><a href="/1.6/apidocs">1.6</a></li>
-          <li class="divider"></li>
-          <li class="dropdown-header">Examples</li>
-          <li id="nav_examples_17"><a href="/1.7/examples">1.7</a></li>
-          <li id="nav_examples_16"><a href="/1.6/examples">1.6</a></li>
-          <li class="divider"></li>
-          <li id="nav_rn"><a href="/release_notes">Release Notes Archive</a></li>
-          <li id="old_documentation"><a href="/old_documentation">Docs for Older Verisons</a></li>
-          <li id="nav_screenshots"><a href="/screenshots">Screenshots</a></li>
-          <li id="nav_papers"><a href="/papers">Papers &amp; Presentations</a></li>
-          <li id="nav_glossary"><a href="/glossary">Glossary</a></li>
         </ul>
         </li>
+      </ul>
+      <ul class="nav navbar-nav navbar-right">
         <li class="dropdown">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">ASF Links<span class="caret"></span></a>
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Apache Software Foundation<span class="caret"></span></a>
         <ul class="dropdown-menu">
-          <li><a href="https://www.apache.org"><i class="fa fa-external-link"></i> Apache Software Foundation</a></li>
-          <li><a href="https://www.apache.org/foundation/sponsorship"><i class="fa fa-external-link"></i> Sponsorship</a></li>
-          <li><a href="https://www.apache.org/security"><i class="fa fa-external-link"></i> Security</a></li>
-          <li><a href="https://www.apache.org/foundation/thanks"><i class="fa fa-external-link"></i> Thanks</a></li>
-          <li><a href="https://www.apache.org/foundation/policies/conduct"><i class="fa fa-external-link"></i> Code of Conduct</a></li>
+          <li><a href="https://www.apache.org">Apache Homepage <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/licenses/LICENSE-2.0">License <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/sponsorship">Sponsorship <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/security">Security <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/thanks">Thanks <i class="fa fa-external-link"></i></a></li>
+          <li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct <i class="fa fa-external-link"></i></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="/"><img id="logo" alt="Apache Accumulo &trade;" class="img-responsive" src="/images/accumulo-logo.png"/></a>
-        <br />
-        Latest 1.7 release: <strong>1.7.1</strong><br />
-        Latest 1.6 release: <strong>1.6.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">
-  <tbody>
-    <tr>
-      <td><img src="/images/Twitter_logo_blue.png" alt="Twitter" style="height: 1em" /></td>
-      <td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td>
-    </tr>
-    <tr>
-      <td><img src="/images/InBug-16px_0.png" alt="Linked in" /></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" alt="GitHub" 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>
-    <tr>
-      <td><img src="/favicon.png" alt="Blog" width="16" /></td>
-      <td><a href="https://blogs.apache.org/accumulo">Apache Accumulo Blog</a></td>
-    </tr>
-  </tbody>
-</table>
+  <div class="container">
+    <div class="row">
+      <div class="col-md-12">
 
-
-
-      <hr>
-      <a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit.png"></a>
-    </div>
-    <div class="col-md-8 col-md-offset-1">
-
-      <div id="non-canonical" style="display: none; background-color: #F0E68C; padding-left: 1em;">
-        Visit the official site at: <a href="https://accumulo.apache.org">https://accumulo.apache.org</a>
-      </div>
-      <div id="content">
-        
-        <h1 class="title">Shard Example</h1>
-        
-        <p>Accumulo has an iterator called the intersecting iterator which supports querying a term index that is partitioned by
+        <div id="non-canonical" style="display: none; background-color: #F0E68C; padding-left: 1em;">
+          Visit the official site at: <a href="https://accumulo.apache.org">https://accumulo.apache.org</a>
+        </div>
+        <div id="content">
+          
+          <h1 class="title">Shard Example</h1>
+          
+          <p>Accumulo has an iterator called the intersecting iterator which supports querying a term index that is partitioned by
 document, or “sharded”. This example shows how to use the intersecting iterator through these four programs:</p>
 
 <ul>
@@ -292,18 +234,14 @@ randomly selects one set of 5 terms and queries. It prints the number of matchin
 </code></pre>
 </div>
 
-      </div>
+        </div>
 
-      
+        
 <footer>
 
   <p><a href="https://www.apache.org"><img src="/images/feather-small.gif" alt="Apache Software Foundation" id="asf-logo" height="100" /></a></p>
 
-  <p>Copyright © 2011-2016 The Apache Software
-Foundation, Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>. Apache
-Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
-Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
-logo are trademarks of the <a href="https://www.apache.org">Apache Software Foundation</a>.</p>
+  <p>Copyright © 2011-2016 The Apache Software Foundation. Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 
   <p>Site created with <a href="https://getbootstrap.com">Bootstrap</a> including icons from
 <a href="https://glyphicons.com">GLYPHICONS</a> and <a href="http://fontawesome.io">Font Awesome</a>.</p>
@@ -311,10 +249,8 @@ logo are trademarks of the <a href="https://www.apache.org">Apache Software Foun
 </footer>
 
 
+      </div>
     </div>
-
   </div>
-</div>
-
 </body>
 </html>


Mime
View raw message