accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mwa...@apache.org
Subject [08/11] accumulo-website git commit: Jekyll build from master:a71056c
Date Wed, 14 Dec 2016 14:34:15 GMT
http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/contributor/lazyConsensus.html
----------------------------------------------------------------------
diff --git a/contributor/lazyConsensus.html b/contributor/lazyConsensus.html
new file mode 100644
index 0000000..266bd46
--- /dev/null
+++ b/contributor/lazyConsensus.html
@@ -0,0 +1,214 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    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="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/paper/bootstrap.min.css" rel="stylesheet" integrity="sha384-awusxf8AUojygHf2+joICySzB780jVvQaVCAt1clU3QsyAitLGul28Qxb2r1e5g+" crossorigin="anonymous">
+<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
+<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.css">
+<link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+
+<title>Lazy Consensus</title>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+<script type="text/javascript" src="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.js"></script>
+<script>
+  // show location of canonical site if not currently on the canonical site
+  $(function() {
+    var host = window.location.host;
+    if (typeof host !== 'undefined' && host !== 'accumulo.apache.org') {
+      $('#non-canonical').show();
+    }
+  });
+
+  $(function() {
+    // decorate section headers with anchors
+    return $("h2, h3, h4, h5, h6").each(function(i, el) {
+      var $el, icon, id;
+      $el = $(el);
+      id = $el.attr('id');
+      icon = '<i class="fa fa-link"></i>';
+      if (id) {
+        return $el.append($("<a />").addClass("header-link").attr("href", "#" + id).html(icon));
+      }
+    });
+  });
+  
+  // configure Google Analytics
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  if (ga.hasOwnProperty('loaded') && ga.loaded === true) {
+    ga('create', 'UA-50934829-1', 'apache.org');
+    ga('send', 'pageview');
+  }
+</script>
+
+</head>
+<body style="padding-top: 100px">
+
+  <nav class="navbar navbar-default navbar-fixed-top">
+  <div class="container">
+    <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 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="#">Releases<span class="caret"></span></a>
+        <ul class="dropdown-menu">
+          <li><a href="/release/accumulo-1.8.0/">1.8.0 (Latest)</a></li>
+          <li><a href="/release/accumulo-1.7.2/">1.7.2</a></li>
+          <li><a href="/release/accumulo-1.6.6/">1.6.6</a></li>
+          <li><a href="/release/">Archive</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><a href="/1.8/accumulo_user_manual.html">User Manual (1.8)</a></li>
+          <li><a href="/1.8/apidocs">Javadocs (1.8)</a></li>
+          <li><a href="/1.8/examples">Examples (1.8)</a></li>
+          <li><a href="/features">Features</a></li>
+          <li><a href="/glossary">Glossary</a></li>
+          <li><a href="/external-docs">External Docs</a></li>
+          <li><a href="/docs-archive/">Archive</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><a href="/get_involved">Get Involved</a></li>
+          <li><a href="/mailing_list">Mailing Lists</a></li>
+          <li><a href="/people">People</a></li>
+          <li><a href="/related-projects">Related Projects</a></li>
+          <li><a href="/contributor/">Contributor Guide</a></li>
+        </ul>
+        </li>
+      </ul>
+      <ul class="nav navbar-nav navbar-right">
+        <li class="dropdown">
+        <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">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>
+    </div>
+  </div>
+</nav>
+
+
+  <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">Lazy Consensus</h1>
+          
+          <p>The concept of “Lazy Consensus” is very important in our project. Lazy
+Consensus means that when you are convinced that you know what the community
+would like to see happen you can simply assume that you already have consensus
+and get on with the work. You don’t have to insist people discuss and/or
+approve your plan, and you certainly don’t need to call a vote to get approval.
+You just assume you have the community’s support unless someone says otherwise.</p>
+
+<p>We have a time machine (Subversion), this means that as long as you commit 
+(or submit patches) early and often the community has plenty of opportunity 
+to indicate disapproval. If you believe the community will support your action
+you can operate on lazy consensus as long as you are prepared to roll back 
+any work should a valid objection is raised.</p>
+
+<h2 id="avoiding-unnecessary-discussion">Avoiding Unnecessary Discussion</h2>
+
+<p>The key thing about lazy consensus is that it’s easier for people to agree,
+by doing nothing, than it is to object, which requires an
+alternative to be proposed. This has two effects, firstly people are less 
+likely to object for the sake of it and secondly it cuts down on the amount 
+of unnecessary mail traffic and discussion.</p>
+
+<p>Lazy consensus means we can avoid waiting for a community based decision 
+before proceeding. However, it does require everyone who cares for the health
+of the project to watch what is happening, as it is happening. Objecting too 
+far down the road will cause upset, but objecting (or asking for clarification 
+of intent) early is likely to be greeted with relief that someone is watching
+and cares.</p>
+
+<h2 id="stating-lazy-consensus">Stating Lazy Consensus</h2>
+
+<p>Sometimes a member of the community will believe a specific action is the correct 
+one for the community but are not sure enough to proceed with the work under the 
+lazy consensus model. In these circumstances they can state Lazy Consensus is in 
+operation.</p>
+
+<p>What this means is that they make a proposal and state that they will start 
+implementing it in 72 hours unless someone objects. 72 hours is chosen because
+it accounts for different timezones and non-apache commitments.</p>
+
+<p>In this approach the original proposal is not insisting that there is a discussion
+around their proposal, nor are they requesting that the community explicitly 
+supports their actions. However, this differs from assuming lazy consensus 
+since it allows space and time to <a href="/contributor/consensusBuilding">express support or objections</a> and corrections to 
+the proposal before work begins.</p>
+
+<h2 id="silence-is-consent">Silence is consent</h2>
+
+<p>People may choose to indicate their support for the actions taken with a +1 
+mail - quick and easy to read and reassuring for the implementer. However, 
+remember, in a lazy consensus world silence is the equivalent to support. This
+can take some time to get used to.</p>
+
+
+        </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>.</p>
+
+</footer>
+
+
+      </div>
+    </div>
+  </div>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/contributor/making-release.html
----------------------------------------------------------------------
diff --git a/contributor/making-release.html b/contributor/making-release.html
new file mode 100644
index 0000000..62a04a3
--- /dev/null
+++ b/contributor/making-release.html
@@ -0,0 +1,321 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    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="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/paper/bootstrap.min.css" rel="stylesheet" integrity="sha384-awusxf8AUojygHf2+joICySzB780jVvQaVCAt1clU3QsyAitLGul28Qxb2r1e5g+" crossorigin="anonymous">
+<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
+<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.css">
+<link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+
+<title>Making a Release</title>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+<script type="text/javascript" src="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.js"></script>
+<script>
+  // show location of canonical site if not currently on the canonical site
+  $(function() {
+    var host = window.location.host;
+    if (typeof host !== 'undefined' && host !== 'accumulo.apache.org') {
+      $('#non-canonical').show();
+    }
+  });
+
+  $(function() {
+    // decorate section headers with anchors
+    return $("h2, h3, h4, h5, h6").each(function(i, el) {
+      var $el, icon, id;
+      $el = $(el);
+      id = $el.attr('id');
+      icon = '<i class="fa fa-link"></i>';
+      if (id) {
+        return $el.append($("<a />").addClass("header-link").attr("href", "#" + id).html(icon));
+      }
+    });
+  });
+  
+  // configure Google Analytics
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  if (ga.hasOwnProperty('loaded') && ga.loaded === true) {
+    ga('create', 'UA-50934829-1', 'apache.org');
+    ga('send', 'pageview');
+  }
+</script>
+
+</head>
+<body style="padding-top: 100px">
+
+  <nav class="navbar navbar-default navbar-fixed-top">
+  <div class="container">
+    <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 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="#">Releases<span class="caret"></span></a>
+        <ul class="dropdown-menu">
+          <li><a href="/release/accumulo-1.8.0/">1.8.0 (Latest)</a></li>
+          <li><a href="/release/accumulo-1.7.2/">1.7.2</a></li>
+          <li><a href="/release/accumulo-1.6.6/">1.6.6</a></li>
+          <li><a href="/release/">Archive</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><a href="/1.8/accumulo_user_manual.html">User Manual (1.8)</a></li>
+          <li><a href="/1.8/apidocs">Javadocs (1.8)</a></li>
+          <li><a href="/1.8/examples">Examples (1.8)</a></li>
+          <li><a href="/features">Features</a></li>
+          <li><a href="/glossary">Glossary</a></li>
+          <li><a href="/external-docs">External Docs</a></li>
+          <li><a href="/docs-archive/">Archive</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><a href="/get_involved">Get Involved</a></li>
+          <li><a href="/mailing_list">Mailing Lists</a></li>
+          <li><a href="/people">People</a></li>
+          <li><a href="/related-projects">Related Projects</a></li>
+          <li><a href="/contributor/">Contributor Guide</a></li>
+        </ul>
+        </li>
+      </ul>
+      <ul class="nav navbar-nav navbar-right">
+        <li class="dropdown">
+        <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">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>
+    </div>
+  </div>
+</nav>
+
+
+  <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">Making a Release</h1>
+          
+          <p>This is a guide for the creation of a release of Apache Accumulo.</p>
+
+<h2 id="setup">Setup</h2>
+
+<p>There are number of things that are required before attempting to build a release.</p>
+
+<ol>
+  <li>Use gpg-agent, and be sure to increase the gpg-agent cache timeout (via .gnupg/gpg-agent.conf) to ensure that the agent doesn’t require re-authentication mid-build, as it will cause things to fail. For example, you can add <code class="highlighter-rouge">default-cache-ttl 6000</code> to increase the timeout from the default of 10 minutes to over an hour. If you do not have a GPG key, reference the very thorough <a href="https://www.apache.org/dev/release-signing">ASF release signing documentation</a>.</li>
+  <li>Ensure that you’re using the correct major release of Java (check javadoc too).</li>
+  <li>Ensure that you’re building Apache Accumulo with a username that has the same name as your Apache ID (this is due to
+the maven-release-plugin and staging the release candidate).</li>
+  <li>Update the CHANGES file so that it’s in sync with Jira (manual process).</li>
+  <li>Ensure that you have a texlive distribution installed so you are able to build the documentation.</li>
+  <li>Have a clean workspace before starting.</li>
+</ol>
+
+<p>Given all of this, it’s recommended that you only attempt making a release from a GNU/Linux machine.</p>
+
+<h2 id="create-the-candidate">Create the candidate</h2>
+
+<p><strong>TL;DR</strong></p>
+
+<ul>
+  <li><code class="highlighter-rouge">./assemble/build.sh --create-release-candidate</code> to make the release candidate</li>
+  <li><code class="highlighter-rouge">git tag $version $version-rcN</code> to create an RC tag from the actual tag</li>
+  <li><code class="highlighter-rouge">git tag -d $version</code> make sure you don’t accidentally push a “release” tag</li>
+  <li><code class="highlighter-rouge">git push origin $version-rcN</code> push the RC tag</li>
+  <li><code class="highlighter-rouge">git checkout -b $version-rcN-branch</code> save off the branch from the Maven release plugin</li>
+  <li><strong>VOTE</strong></li>
+  <li><em>If vote fails</em>, fix the original branch and start over.</li>
+  <li><em>If vote passes</em>, <code class="highlighter-rouge">git merge $version-rcN-branch</code> back into the original branch you released from.</li>
+  <li><code class="highlighter-rouge">git tag -s $version-rcN $version</code> make a GPG-signed tag</li>
+  <li><code class="highlighter-rouge">git push origin $version</code> push the signed tag.</li>
+</ul>
+
+<p><strong>Long-winded explanation</strong></p>
+
+<p>You should use the provided script assemble/build.sh to create the release candidate. This script is
+desirable as it activates all necessary maven profiles in addition to verifying that certain preconditions
+are met, like RPM signing availablilty and the ability to sign files using GPG. The –test option can 
+be used as a dry run for creating a release candidate. The –create-release-candidate option should be 
+used to create the actual release candidate.</p>
+
+<p>When invoking build.sh with the –create-release-candidate option, the majority of the work will be performed
+by the maven-release-plugin, invoking <em>release:clean</em>, <em>release:prepare</em>, and <em>release:perform</em>. These will
+guide you through choosing the correct versions. The default options provided should be what you choose.
+It is highly recommended that an ‘RC’ suffix is <em>not</em> appended to the release version the plugin prompts
+you for, as that will result in that version string being placed into the poms, which then would require 
+voting to occur on artifacts that cannot be directly promoted. After the build.sh script finishes (this will 
+likely take at least 15 minutes, even on recent hardware), your current branch will be on the “next” version 
+that you provided to the release plugin.</p>
+
+<p>One unwanted side-effect of this approach is that after creating this branch, but <em>before invoking release:perform</em>,
+you must edit the release.properties to add the <em>-rcN</em> suffix to the value of scm.tag. Otherwise, the release
+plugin will complain that it cannot find the branch for the release. With a successful invocation of <em>mvn release:perform</em>,
+a staging repository will be made for you on the <a href="https://repository.apache.org">ASF Nexus server</a> which you can log into with your ASF 
+credentials.</p>
+
+<p>After you log into Nexus, click on <em>Staging Repositories</em> in the <em>Build Promotion</em> toolbar on the left side of
+the screen. Assuming your build went according to plan, you should have a new staging repository made for
+you. At this point, you should inspect the artifacts that were staged to ensure that they are as you expect
+them to be. When you’re ready to present those artifacts for voting, you need to close that repository which
+will make it publicly available for other members to inspect.</p>
+
+<h2 id="vote">Vote</h2>
+
+<p>At this point, you should have a closed repository that’s ready to vote on. Send a message to <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">the dev
+list</a> and get the ball rolling. Developers should test and verify the
+release candidate on their own. Accumulo has a guide for <a href="/contributor/verifying-release">verifying releases</a>.</p>
+
+<p>Lazy consensus is not sufficient for a release; at least 3 +1 votes from PMC members are required. All
+checksums and signatures need to be verified before any voter can +1 it. Voting shall last 72 hours. Voters
+SHOULD include with their vote details on the tests from the testing section they have successfully run.
+If given, said details for each test MUST include: the number of worker nodes in the cluster, the operating system
+and version, the Hadoop version, and the Zookeeper version.  For testing done on a version other than the release
+candidate that is deemed relevant, include the commit hash. All such gathered testing information will be included
+in the release notes.</p>
+
+<p>If the vote ultimately fails, you delete the staged repository, clean up the branch you created (or wait
+until the release ultimately passes if you choose), and fix what needs fixing.</p>
+
+<p>If the vote passes, follow the steps below.</p>
+
+<h2 id="promote-the-artifacts">Promote the artifacts</h2>
+
+<p>Promote that staged repository using Nexus which you can do with the click of a button. This will trigger
+a process to get the release out to all of the mirrors.</p>
+
+<h2 id="create-the-final-git-tag">Create the final Git tag</h2>
+
+<p>The Git repository should also contain a tag which refers to the final commit which made up a release. This tag
+should also be signed with your GPG key. To ensure proper retention on release (stemming from ASF policy
+requirements), This final tag <em>must</em> being with “rel/”. For example, a release of 1.7.0 should have a corresponding
+tag name of “rel/1.7.0”.</p>
+
+<h2 id="copy-artifacts-to-distapacheorg">Copy artifacts to dist.apache.org</h2>
+
+<p>An SVN server is running at https://dist.apache.org/repos/dist/release/accumulo. You need to upload the release
+tarballs, the GPG signatures and checksum files to the correct directory (based on the release number). If you
+are releasing a bug-fix release, be sure to delete the previous release in the same line (e.g. if you release
+1.6.2, remove 1.6.1). The old tarballs removed from dist.apache.org will still be preserved in archive.apache.org
+automatically.</p>
+
+<h2 id="update-projectsapacheorg">Update projects.apache.org</h2>
+
+<p>Fill out the <a href="https://reporter.apache.org/addrelease?accumulo">add release</a> form to update the projects website.</p>
+
+<h2 id="update-the-website">Update the Website</h2>
+
+<p>After a successful vote, this website needs to be updated with the new artifacts.</p>
+
+<ul>
+  <li>Copy Accumulo User Manual (HTML version exists in &gt;=1.7.0)</li>
+  <li>Update downloads page</li>
+  <li>Create a post in <code class="highlighter-rouge">_posts/release/</code> containing release notes (ensure notes contain link to JIRA changes for that version)</li>
+  <li>Remove previous bug-fix release (if applicable)</li>
+  <li>Update doap_Accumulo.rdf</li>
+</ul>
+
+<h3 id="javadocs">Javadocs</h3>
+
+<p>Javadocs are easy to update. Using the latest JDK7 or later (at least JDK 7u21
+to avoid known <a href="https://www.kb.cert.org/vuls/id/225657">vulnerabilities</a>), follow these steps:</p>
+
+<ol>
+  <li>Unpack the source release tarball and change to its root directory, or checkout the SCM tag for the release</li>
+  <li>Build the javadocs with <code class="highlighter-rouge">mvn clean package javadoc:aggregate -DskipTests -Paggregate-javadocs</code></li>
+  <li>Take note that the javadocs you will need to copy are the entire contents of <code class="highlighter-rouge">./target/site/apidocs/</code></li>
+  <li>In a different directory, checkout the <code class="highlighter-rouge">master</code> branch of the accumulo-website repo</li>
+  <li>Remove any existing apidocs from the appropriate version folder (e.g. 1.6/apidocs for a 1.6.x release)</li>
+  <li>Copy the entire contents of the new apidocs directory (identified in step 3) to the destination in the website branch (e.g. to 1.6/apidocs)</li>
+  <li>Continue updating the site content, as needed</li>
+  <li>Commit the changes</li>
+  <li>Update the site using jekyll with <code class="highlighter-rouge">./_devtools/git-hooks/post-commit</code> (if you don’t have the commit hook already configured)</li>
+  <li>Don’t forget to push both the <code class="highlighter-rouge">master</code> and <code class="highlighter-rouge">asf-site</code> branches back to the accumulo-website repo</li>
+  <li>Verify that javadocs have been updated on the production site (e.g. https://accumulo.apache.org/1.6/apidocs/)</li>
+</ol>
+
+<h2 id="update-accumulo-examples">Update Accumulo Examples</h2>
+
+<p>After the release has been made, the Accumulo version used by <a href="https://github.com/apache/accumulo-examples">Accumulo Examples</a> should be updated
+if this is the latest release of Accumulo.</p>
+
+<ul>
+  <li>Update the <code class="highlighter-rouge">accumulo.version</code> property in <code class="highlighter-rouge">pom.xml</code> of accumulo-examples</li>
+  <li>Run <code class="highlighter-rouge">mvn clean verify</code> to confirm that nothing breaks</li>
+  <li>Run one of the examples for additinal testing.</li>
+</ul>
+
+<h2 id="references">References</h2>
+
+<p>Some good references that explain a few things:</p>
+
+<ul>
+  <li><a href="https://mail-archives.apache.org/mod_mbox/accumulo-dev/201305.mbox/raw/%3CCAL5zq9bH8y0FyjXmmfXhWPj8axosn9dZ7%2Bu-R1DK4Y-WM1YoWg%40mail.gmail.com%3E">Christopher talks about making releases</a></li>
+  <li><a href="https://www.apache.org/dev/publishing-maven-artifacts">Publishing Maven Artifacts</a></li>
+  <li><a href="https://www.apache.org/dev/release-publishing">Publishing Releases</a></li>
+</ul>
+
+
+        </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>.</p>
+
+</footer>
+
+
+      </div>
+    </div>
+  </div>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/contributor/rb.html
----------------------------------------------------------------------
diff --git a/contributor/rb.html b/contributor/rb.html
index 855f311..4584be1 100644
--- a/contributor/rb.html
+++ b/contributor/rb.html
@@ -97,8 +97,8 @@
           <li><a href="/1.8/apidocs">Javadocs (1.8)</a></li>
           <li><a href="/1.8/examples">Examples (1.8)</a></li>
           <li><a href="/features">Features</a></li>
-          <li><a href="/papers">Papers &amp; Presentations</a></li>
           <li><a href="/glossary">Glossary</a></li>
+          <li><a href="/external-docs">External Docs</a></li>
           <li><a href="/docs-archive/">Archive</a></li>
         </ul>
         </li>
@@ -108,9 +108,8 @@
           <li><a href="/get_involved">Get Involved</a></li>
           <li><a href="/mailing_list">Mailing Lists</a></li>
           <li><a href="/people">People</a></li>
-          <li><a href="/projects">Related Projects</a></li>
+          <li><a href="/related-projects">Related Projects</a></li>
           <li><a href="/contributor/">Contributor Guide</a></li>
-          <li><a href="/governance/">Governance</a></li>
         </ul>
         </li>
       </ul>
@@ -146,7 +145,7 @@
           <p>The Apache Software Foundation provides an <a href="https://reviews.apache.org">instance</a> of
 <a href="https://www.reviewboard.org">Review Board</a> (RB) for projects to use in code reviews. Here is how RB can
 be used to support development in the context of the
-<a href="/governance/bylaws">Apache Accumulo bylaws</a>.</p>
+<a href="/contributor/bylaws">Apache Accumulo bylaws</a>.</p>
 
 <p>Contributors to Accumulo are encouraged to use RB for non-trivial patches and
 any time feedback is desired. No one is required to use RB, but its ready
@@ -165,7 +164,7 @@ benefit from additional attention. RB can be used to conduct such code reviews.<
 <h3 id="consensus-approval-after-a-code-change-veto">Consensus Approval after a Code Change Veto</h3>
 
 <p>Code changes are approved by lazy approval, with consensus approval following
-a veto (see the <a href="/governance/bylaws#actions">Actions</a> section of the bylaws). RB can be used
+a veto (see the <a href="/contributor/bylaws#actions">Actions</a> section of the bylaws). RB can be used
 to coordinate a consensus approval vote by providing a convenient view of the
 code change under consideration. The vote itself must still be held on the
 developer mailing list.</p>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/contributor/releasing.html
----------------------------------------------------------------------
diff --git a/contributor/releasing.html b/contributor/releasing.html
index 3bfe408..8ebc7ad 100644
--- a/contributor/releasing.html
+++ b/contributor/releasing.html
@@ -1,303 +1,10 @@
 <!DOCTYPE html>
-<html lang="en">
-<head>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
+<html lang="en-US">
 <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="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/paper/bootstrap.min.css" rel="stylesheet" integrity="sha384-awusxf8AUojygHf2+joICySzB780jVvQaVCAt1clU3QsyAitLGul28Qxb2r1e5g+" crossorigin="anonymous">
-<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
-<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.css">
-<link href="/css/accumulo.css" rel="stylesheet" type="text/css">
-
-<title>Making a Release</title>
-
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.js"></script>
-<script>
-  // show location of canonical site if not currently on the canonical site
-  $(function() {
-    var host = window.location.host;
-    if (typeof host !== 'undefined' && host !== 'accumulo.apache.org') {
-      $('#non-canonical').show();
-    }
-  });
-
-  $(function() {
-    // decorate section headers with anchors
-    return $("h2, h3, h4, h5, h6").each(function(i, el) {
-      var $el, icon, id;
-      $el = $(el);
-      id = $el.attr('id');
-      icon = '<i class="fa fa-link"></i>';
-      if (id) {
-        return $el.append($("<a />").addClass("header-link").attr("href", "#" + id).html(icon));
-      }
-    });
-  });
-  
-  // configure Google Analytics
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  if (ga.hasOwnProperty('loaded') && ga.loaded === true) {
-    ga('create', 'UA-50934829-1', 'apache.org');
-    ga('send', 'pageview');
-  }
-</script>
-
-</head>
-<body style="padding-top: 100px">
-
-  <nav class="navbar navbar-default navbar-fixed-top">
-  <div class="container">
-    <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 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="#">Releases<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="/release/accumulo-1.8.0/">1.8.0 (Latest)</a></li>
-          <li><a href="/release/accumulo-1.7.2/">1.7.2</a></li>
-          <li><a href="/release/accumulo-1.6.6/">1.6.6</a></li>
-          <li><a href="/release/">Archive</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><a href="/1.8/accumulo_user_manual.html">User Manual (1.8)</a></li>
-          <li><a href="/1.8/apidocs">Javadocs (1.8)</a></li>
-          <li><a href="/1.8/examples">Examples (1.8)</a></li>
-          <li><a href="/features">Features</a></li>
-          <li><a href="/papers">Papers &amp; Presentations</a></li>
-          <li><a href="/glossary">Glossary</a></li>
-          <li><a href="/docs-archive/">Archive</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><a href="/get_involved">Get Involved</a></li>
-          <li><a href="/mailing_list">Mailing Lists</a></li>
-          <li><a href="/people">People</a></li>
-          <li><a href="/projects">Related Projects</a></li>
-          <li><a href="/contributor/">Contributor Guide</a></li>
-          <li><a href="/governance/">Governance</a></li>
-        </ul>
-        </li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li class="dropdown">
-        <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">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>
-    </div>
-  </div>
-</nav>
-
-
-  <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">Making a Release</h1>
-          
-          <p>This is a guide for the creation of a release of Apache Accumulo.</p>
-
-<h2 id="setup">Setup</h2>
-
-<p>There are number of things that are required before attempting to build a release.</p>
-
-<ol>
-  <li>Use gpg-agent, and be sure to increase the gpg-agent cache timeout (via .gnupg/gpg-agent.conf) to ensure that the agent doesn’t require re-authentication mid-build, as it will cause things to fail. For example, you can add <code class="highlighter-rouge">default-cache-ttl 6000</code> to increase the timeout from the default of 10 minutes to over an hour. If you do not have a GPG key, reference the very thorough <a href="https://www.apache.org/dev/release-signing">ASF release signing documentation</a>.</li>
-  <li>Ensure that you’re using the correct major release of Java (check javadoc too).</li>
-  <li>Ensure that you’re building Apache Accumulo with a username that has the same name as your Apache ID (this is due to
-the maven-release-plugin and staging the release candidate).</li>
-  <li>Update the CHANGES file so that it’s in sync with Jira (manual process).</li>
-  <li>Ensure that you have a texlive distribution installed so you are able to build the documentation.</li>
-  <li>Have a clean workspace before starting.</li>
-</ol>
-
-<p>Given all of this, it’s recommended that you only attempt making a release from a GNU/Linux machine.</p>
-
-<h2 id="create-the-candidate">Create the candidate</h2>
-
-<p><strong>TL;DR</strong></p>
-
-<ul>
-  <li><code class="highlighter-rouge">./assemble/build.sh --create-release-candidate</code> to make the release candidate</li>
-  <li><code class="highlighter-rouge">git tag $version $version-rcN</code> to create an RC tag from the actual tag</li>
-  <li><code class="highlighter-rouge">git tag -d $version</code> make sure you don’t accidentally push a “release” tag</li>
-  <li><code class="highlighter-rouge">git push origin $version-rcN</code> push the RC tag</li>
-  <li><code class="highlighter-rouge">git checkout -b $version-rcN-branch</code> save off the branch from the Maven release plugin</li>
-  <li><strong>VOTE</strong></li>
-  <li><em>If vote fails</em>, fix the original branch and start over.</li>
-  <li><em>If vote passes</em>, <code class="highlighter-rouge">git merge $version-rcN-branch</code> back into the original branch you released from.</li>
-  <li><code class="highlighter-rouge">git tag -s $version-rcN $version</code> make a GPG-signed tag</li>
-  <li><code class="highlighter-rouge">git push origin $version</code> push the signed tag.</li>
-</ul>
-
-<p><strong>Long-winded explanation</strong></p>
-
-<p>You should use the provided script assemble/build.sh to create the release candidate. This script is
-desirable as it activates all necessary maven profiles in addition to verifying that certain preconditions
-are met, like RPM signing availablilty and the ability to sign files using GPG. The –test option can 
-be used as a dry run for creating a release candidate. The –create-release-candidate option should be 
-used to create the actual release candidate.</p>
-
-<p>When invoking build.sh with the –create-release-candidate option, the majority of the work will be performed
-by the maven-release-plugin, invoking <em>release:clean</em>, <em>release:prepare</em>, and <em>release:perform</em>. These will
-guide you through choosing the correct versions. The default options provided should be what you choose.
-It is highly recommended that an ‘RC’ suffix is <em>not</em> appended to the release version the plugin prompts
-you for, as that will result in that version string being placed into the poms, which then would require 
-voting to occur on artifacts that cannot be directly promoted. After the build.sh script finishes (this will 
-likely take at least 15 minutes, even on recent hardware), your current branch will be on the “next” version 
-that you provided to the release plugin.</p>
-
-<p>One unwanted side-effect of this approach is that after creating this branch, but <em>before invoking release:perform</em>,
-you must edit the release.properties to add the <em>-rcN</em> suffix to the value of scm.tag. Otherwise, the release
-plugin will complain that it cannot find the branch for the release. With a successful invocation of <em>mvn release:perform</em>,
-a staging repository will be made for you on the <a href="https://repository.apache.org">ASF Nexus server</a> which you can log into with your ASF 
-credentials.</p>
-
-<p>After you log into Nexus, click on <em>Staging Repositories</em> in the <em>Build Promotion</em> toolbar on the left side of
-the screen. Assuming your build went according to plan, you should have a new staging repository made for
-you. At this point, you should inspect the artifacts that were staged to ensure that they are as you expect
-them to be. When you’re ready to present those artifacts for voting, you need to close that repository which
-will make it publicly available for other members to inspect.</p>
-
-<h2 id="vote">Vote</h2>
-
-<p>At this point, you should have a closed repository that’s ready to vote on. Send a message to <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">the dev
-list</a> and get the ball rolling. If the vote ultimately fails, you delete
-the staged repository, clean up the branch you created (or wait until the release ultimately passes if you
-choose), and fix what needs fixing.</p>
-
-<p>If the vote passes, huzzah, you’re almost done.</p>
-
-<h2 id="promote-the-artifacts">Promote the artifacts</h2>
-
-<p>Promote that staged repository using Nexus which you can do with the click of a button. This will trigger
-a process to get the release out to all of the mirrors.</p>
-
-<h2 id="create-the-final-git-tag">Create the final Git tag</h2>
-
-<p>The Git repository should also contain a tag which refers to the final commit which made up a release. This tag
-should also be signed with your GPG key. To ensure proper retention on release (stemming from ASF policy
-requirements), This final tag <em>must</em> being with “rel/”. For example, a release of 1.7.0 should have a corresponding
-tag name of “rel/1.7.0”.</p>
-
-<h2 id="copy-artifacts-to-distapacheorg">Copy artifacts to dist.apache.org</h2>
-
-<p>An SVN server is running at https://dist.apache.org/repos/dist/release/accumulo. You need to upload the release
-tarballs, the GPG signatures and checksum files to the correct directory (based on the release number). If you
-are releasing a bug-fix release, be sure to delete the previous release in the same line (e.g. if you release
-1.6.2, remove 1.6.1). The old tarballs removed from dist.apache.org will still be preserved in archive.apache.org
-automatically.</p>
-
-<h2 id="update-projectsapacheorg">Update projects.apache.org</h2>
-
-<p>Fill out the <a href="https://reporter.apache.org/addrelease?accumulo">add release</a> form to update the projects website.</p>
-
-<h2 id="update-the-website">Update the Website</h2>
-
-<p>After a successful vote, this website needs to be updated with the new artifacts.</p>
-
-<ul>
-  <li>Copy Accumulo User Manual (HTML version exists in &gt;=1.7.0)</li>
-  <li>Update downloads page</li>
-  <li>Create release notes (ensure notes contain link to JIRA changes for that version)</li>
-  <li>Remove previous bug-fix release (if applicable)</li>
-  <li>Update examples README files</li>
-  <li>Update doap_Accumulo.rdf</li>
-</ul>
-
-<h3 id="javadocs">Javadocs</h3>
-
-<p>Javadocs are easy to update. Using the latest JDK7 or later (at least JDK 7u21
-to avoid known <a href="https://www.kb.cert.org/vuls/id/225657">vulnerabilities</a>), follow these steps:</p>
-
-<ol>
-  <li>Unpack the source release tarball and change to its root directory, or checkout the SCM tag for the release</li>
-  <li>Build the javadocs with <code class="highlighter-rouge">mvn clean package javadoc:aggregate -DskipTests -Paggregate-javadocs</code></li>
-  <li>Take note that the javadocs you will need to copy are the entire contents of <code class="highlighter-rouge">./target/site/apidocs/</code></li>
-  <li>In a different directory, checkout the <code class="highlighter-rouge">master</code> branch of the accumulo-website repo</li>
-  <li>Remove any existing apidocs from the appropriate version folder (e.g. 1.6/apidocs for a 1.6.x release)</li>
-  <li>Copy the entire contents of the new apidocs directory (identified in step 3) to the destination in the website branch (e.g. to 1.6/apidocs)</li>
-  <li>Continue updating the site content, as needed</li>
-  <li>Commit the changes</li>
-  <li>Update the site using jekyll with <code class="highlighter-rouge">./_devtools/git-hooks/post-commit</code> (if you don’t have the commit hook already configured)</li>
-  <li>Don’t forget to push both the <code class="highlighter-rouge">master</code> and <code class="highlighter-rouge">asf-site</code> branches back to the accumulo-website repo</li>
-  <li>Verify that javadocs have been updated on the production site (e.g. https://accumulo.apache.org/1.6/apidocs/)</li>
-</ol>
-
-<h2 id="references">References</h2>
-
-<p>Some good references that explain a few things:</p>
-
-<ul>
-  <li><a href="https://mail-archives.apache.org/mod_mbox/accumulo-dev/201305.mbox/raw/%3CCAL5zq9bH8y0FyjXmmfXhWPj8axosn9dZ7%2Bu-R1DK4Y-WM1YoWg%40mail.gmail.com%3E">Christopher talks about making releases</a></li>
-  <li><a href="https://www.apache.org/dev/publishing-maven-artifacts">Publishing Maven Artifacts</a></li>
-  <li><a href="https://www.apache.org/dev/release-publishing">Publishing Releases</a></li>
-  <li><a href="/governance/releasing">Accumulo Release Guide</a></li>
-</ul>
-
-
-        </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>.</p>
-
-</footer>
-
-
-      </div>
-    </div>
-  </div>
-</body>
+<title>Redirecting…</title>
+<link rel="canonical" href="https://accumulo.apache.org/contributor/making-release.html">
+<meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/contributor/making-release.html">
+<h1>Redirecting…</h1>
+<a href="https://accumulo.apache.org/contributor/making-release.html">Click here if you are not redirected.</a>
+<script>location="https://accumulo.apache.org/contributor/making-release.html"</script>
 </html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/contributor/source.html
----------------------------------------------------------------------
diff --git a/contributor/source.html b/contributor/source.html
index 7223aaa..4ed4ada 100644
--- a/contributor/source.html
+++ b/contributor/source.html
@@ -97,8 +97,8 @@
           <li><a href="/1.8/apidocs">Javadocs (1.8)</a></li>
           <li><a href="/1.8/examples">Examples (1.8)</a></li>
           <li><a href="/features">Features</a></li>
-          <li><a href="/papers">Papers &amp; Presentations</a></li>
           <li><a href="/glossary">Glossary</a></li>
+          <li><a href="/external-docs">External Docs</a></li>
           <li><a href="/docs-archive/">Archive</a></li>
         </ul>
         </li>
@@ -108,9 +108,8 @@
           <li><a href="/get_involved">Get Involved</a></li>
           <li><a href="/mailing_list">Mailing Lists</a></li>
           <li><a href="/people">People</a></li>
-          <li><a href="/projects">Related Projects</a></li>
+          <li><a href="/related-projects">Related Projects</a></li>
           <li><a href="/contributor/">Contributor Guide</a></li>
-          <li><a href="/governance/">Governance</a></li>
         </ul>
         </li>
       </ul>
@@ -394,10 +393,6 @@ nothing to commit (working directory clean)
   <li>Formatter <a href="https://code.google.com/p/eclipse-code-formatter-intellij-plugin">plugin</a> that uses eclipse code style xml.</li>
 </ul>
 
-<h3 id="release-guide">Release Guide</h3>
-
-<p>Accumulo’s release guide can be found <a href="/governance/releasing">here</a>.</p>
-
 
         </div>
 

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/contributor/verifying-release.html
----------------------------------------------------------------------
diff --git a/contributor/verifying-release.html b/contributor/verifying-release.html
new file mode 100644
index 0000000..b065055
--- /dev/null
+++ b/contributor/verifying-release.html
@@ -0,0 +1,310 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    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="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/paper/bootstrap.min.css" rel="stylesheet" integrity="sha384-awusxf8AUojygHf2+joICySzB780jVvQaVCAt1clU3QsyAitLGul28Qxb2r1e5g+" crossorigin="anonymous">
+<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
+<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.css">
+<link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+
+<title>Verifying a Release</title>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+<script type="text/javascript" src="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.js"></script>
+<script>
+  // show location of canonical site if not currently on the canonical site
+  $(function() {
+    var host = window.location.host;
+    if (typeof host !== 'undefined' && host !== 'accumulo.apache.org') {
+      $('#non-canonical').show();
+    }
+  });
+
+  $(function() {
+    // decorate section headers with anchors
+    return $("h2, h3, h4, h5, h6").each(function(i, el) {
+      var $el, icon, id;
+      $el = $(el);
+      id = $el.attr('id');
+      icon = '<i class="fa fa-link"></i>';
+      if (id) {
+        return $el.append($("<a />").addClass("header-link").attr("href", "#" + id).html(icon));
+      }
+    });
+  });
+  
+  // configure Google Analytics
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  if (ga.hasOwnProperty('loaded') && ga.loaded === true) {
+    ga('create', 'UA-50934829-1', 'apache.org');
+    ga('send', 'pageview');
+  }
+</script>
+
+</head>
+<body style="padding-top: 100px">
+
+  <nav class="navbar navbar-default navbar-fixed-top">
+  <div class="container">
+    <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 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="#">Releases<span class="caret"></span></a>
+        <ul class="dropdown-menu">
+          <li><a href="/release/accumulo-1.8.0/">1.8.0 (Latest)</a></li>
+          <li><a href="/release/accumulo-1.7.2/">1.7.2</a></li>
+          <li><a href="/release/accumulo-1.6.6/">1.6.6</a></li>
+          <li><a href="/release/">Archive</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><a href="/1.8/accumulo_user_manual.html">User Manual (1.8)</a></li>
+          <li><a href="/1.8/apidocs">Javadocs (1.8)</a></li>
+          <li><a href="/1.8/examples">Examples (1.8)</a></li>
+          <li><a href="/features">Features</a></li>
+          <li><a href="/glossary">Glossary</a></li>
+          <li><a href="/external-docs">External Docs</a></li>
+          <li><a href="/docs-archive/">Archive</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><a href="/get_involved">Get Involved</a></li>
+          <li><a href="/mailing_list">Mailing Lists</a></li>
+          <li><a href="/people">People</a></li>
+          <li><a href="/related-projects">Related Projects</a></li>
+          <li><a href="/contributor/">Contributor Guide</a></li>
+        </ul>
+        </li>
+      </ul>
+      <ul class="nav navbar-nav navbar-right">
+        <li class="dropdown">
+        <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">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>
+    </div>
+  </div>
+</nav>
+
+
+  <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">Verifying a Release</h1>
+          
+          <p>This is a guide for the verification of a release candidate of Apache Accumulo. These steps are meant to encapsulate
+the requirements of the PMC set forth by the Foundation itself.</p>
+
+<p>The information here is meant to be an application of Foundation policy. When in doubt or conflict, any Foundation-level
+trumps anything written here.</p>
+
+<h2 id="versioning">Versioning</h2>
+
+<p>Accumulo has adopted <a href="/contributor/versioning">Semantic Versioning</a> and follows their rules and guidelines.</p>
+
+<h2 id="testing-basics">Testing basics</h2>
+
+<p>Each release of Accumulo should be tested by the community to verify correctness.</p>
+
+<p>Below are some suggested tests that can be run (feel free to run your own custom tests too):</p>
+
+<ul>
+  <li>
+    <p>Run Accumulo’s unit and integration tests using the following command:</p>
+
+    <div class="highlighter-rouge"><pre class="highlight"><code>  $ mvn verify
+</code></pre>
+    </div>
+  </li>
+  <li>
+    <p>Build the <a href="https://github.com/apache/accumulo-examples">Accumulo Examples</a> repo using the release candidate by updating the <code class="highlighter-rouge">accumulo.version</code>
+property in the <code class="highlighter-rouge">pom.xml</code> and using the staging repo. Also, run the unit/integration tests using <code class="highlighter-rouge">mvn verify</code>.</p>
+  </li>
+  <li>
+    <p>Run Accumulo’s distributed tests (i.e RandomWalk, ContinuousIngest, etc). Information on these tests can
+be found in their respective directories, <code class="highlighter-rouge">test/system/randomwalk</code> and <code class="highlighter-rouge">test/system/continuous</code>, which
+include instructions on how to run the tests. These tests are intended to be run for days on end while
+injecting faults into the system. These are the tests that truly verify the correctness of Accumulo on
+real systems.</p>
+  </li>
+</ul>
+
+<h2 id="project-testing-goals">Project testing goals</h2>
+
+<p>While contributors do not need perform all tests, there should a minimum amount of testing done by the project as whole before a release is made.</p>
+
+<p>Testing for an Accumulo release includes a few steps that a developer may take without a Hadoop cluster and several that require a working cluster. For minor releases, 
+the tests which run on a Hadoop cluster are recommended to be completed but are not required. Running even a reduced set of tests against real hardware is always encouraged
+even if the full test suite (in breadth of nodes or duration) is not executed. If PMC members do not believe adequate testing was performed for the sake of making the proposed
+release, the release should be vetoed via the normal voting process. New major releases are expected to run a full test suite.</p>
+
+<h3 id="stand-alone">Stand alone</h3>
+
+<p>The following steps can be taken without having an underlying cluster. They SHOULD be handled with each Hadoop profile available for a given release version. To activate an alternative profile specify e.g. “-Dhadoop.profile=2” for the Hadoop 2 profile on the Maven commandline. Some older versions of Accumulo referred to Hadoop profiles diferently; see the README that came with said versions for details on building against different Hadoop versions.</p>
+
+<ol>
+  <li>All JUnit tests must pass.  This should be a requirement of any patch so it should never be an issue of the codebase.
+    - Use “mvn package” to run against the default profile of a particular release
+    - Use “mvn -Dhadoop.profile=2 package” to test against the Hadoop 2 profile on e.g. 1.4 or 1.5
+    - Use “mvn -Dhadoop.profile=1 package” to test against the Hadoop 1 profile on e.g. 1.6 or later
+    <ul>
+      <li>Analyze output of static analysis tools like Findbugs and PMD.</li>
+      <li>For versions 1.6 and later, all functional tests must pass via the Maven failsafe plugin.
+        <ul>
+          <li>Use “mvn verify” to run against the default profile of a particular release</li>
+          <li>Use “mvn -Dhadoop.profile=1 verify” to run the functional tests against the Hadoop 1 profile</li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+</ol>
+
+<h3 id="cluster-based">Cluster based</h3>
+
+<p>The following tests require a Hadoop cluster running a minimum of HDFS, MapReduce, and ZooKeeper. The cluster MAY have any number of worker nodes; it can even be a single node in pseudo-distributed mode. A cluster with multiple tablet servers SHOULD be used so that more of the code base will be exercised. For the purposes of release testing, you should note the number of nodes and versions used. See the Releasing section for more details.</p>
+
+<ol>
+  <li>For versions prior to 1.6, all functional tests must complete successfully.
+    - See $ACCUMULO_HOME/test/system/auto/README for details on running the functional tests.
+    <ul>
+      <li>Two 24-hour periods of the LongClean module of the RandomWalk test need to be run successfully. One of them must use agitation and the other should not.
+        <ul>
+          <li>See $ACCUMULO_HOME/test/system/randomwalk/README for details on running the LongClean module.</li>
+        </ul>
+      </li>
+      <li>Two 24-hour periods of the continuous ingest test must be validated successfully. One test period must use agitation and the other should not.
+        <ul>
+          <li>See $ACCUMULO_HOME/test/system/continuous/README for details on running and verifying the continuous ingest test.</li>
+        </ul>
+      </li>
+      <li>Two 72-hour periods of continuous ingest must run. One test period must use agitation and the other should not. No validation is necessary but the cluster should be checked to ensure it is still functional.</li>
+    </ul>
+  </li>
+</ol>
+
+<h2 id="foundation-level-requirements">Foundation Level Requirements</h2>
+
+<p>The ASF requires that all artifacts in a release are cryptographically signed and distributed with hashes.</p>
+
+<p>OpenPGP is an asymmetric encryption scheme which lends itself well to the globally distributed nature of Apache.
+Verification of a release artifact can be done using the signature and the release-maker’s public key. Hashes
+can be verified using the appropriate command (e.g. <code class="highlighter-rouge">sha1sum</code>, <code class="highlighter-rouge">md5sum</code>).</p>
+
+<p>An Apache release must contain a source-only artifact. This is the official release artifact. While a release of
+an Apache project can contain other artifacts that do contain binary files. These non-source artifacts are for
+user convenience only, but still must adhere to the same licensing rules.</p>
+
+<p>PMC members should take steps to verify that the source-only artifact does not contain any binary files. There is
+some leeway in this rule. For example, test-only binary artifacts (such as test files or jars) are acceptable as long
+as they are only used for testing the software and not running it.</p>
+
+<p>The following are the aforementioned Foundation-level documents provided for reference:</p>
+
+<ul>
+  <li><a href="https://www.apache.org/dev/apply-license">Applying the Apache Software License</a></li>
+  <li><a href="https://www.apache.org/legal/src-headers">Legal’s license application guidelines</a></li>
+  <li><a href="https://www.apache.org/legal/resolved">Common legal-discuss mailing list questions/resolutions</a></li>
+  <li><a href="https://www.apache.org/legal">ASF Legal Affairs Page</a></li>
+</ul>
+
+<h2 id="apache-software-license-application">Apache Software License Application</h2>
+
+<p>Application of the Apache Software License v2 consists of the following steps on each artifact in a release. It’s
+important to remember that for artifacts that contain other artifacts (e.g. a tarball that contains JAR files or
+an RPM which contains JAR files), both the tarball, RPM and JAR files are subject to the following roles.</p>
+
+<p>The difficulty in verifying each artifact is that, often times, each artifact requires a different LICENSE and NOTICE
+file. For example, the Accumulo binary tarball must contain appropriate LICENSE and NOTICE files considering the bundled
+jar files in <code class="highlighter-rouge">lib/</code>. The Accumulo source tarball would not contain these same contents in the LICENSE and NOTICE files
+as it does not contain those same JARs.</p>
+
+<h3 id="license-file">LICENSE file</h3>
+
+<p>The LICENSE file should be present at the top-level of the artifact. This file should be explicitly named <code class="highlighter-rouge">LICENSE</code>,
+however <code class="highlighter-rouge">LICENSE.txt</code> is acceptable but not preferred. This file contains the text of the Apache Software License 
+at the top of the file. At the bottom of the file, all other open source licenses <em>contained in the given
+artifact</em> must be listed at the bottom of the LICENSE file. Contained components that are licensed with the ASL themselves
+do not need to be included in this file. It is common to see inclusions in file such as the MIT License of 3-clause
+BSD License.</p>
+
+<h3 id="notice-file">NOTICE file</h3>
+
+<p>The NOTICE file should be present at the top-level of the artifact beside the LICENSE file. This file should be explicitly
+name <code class="highlighter-rouge">NOTICE</code>, while <code class="highlighter-rouge">NOTICE.txt</code> is also acceptable but not preferred. This file contains the copyright notice for
+the artifact being released. As a reminder, the copyright is held by the Apache Software Foundation, not the individual
+project.</p>
+
+<p>The second purpose this file serves is to distribute third-party notices from dependent software. Specifically, other code
+which is licensed with the ASLv2 may also contain a NOTICE file. If such an artifact which contains a NOTICE file is
+contained in artifact being verified for releases, the contents of the contained artifact’s NOTICE file should be appended
+to this artifact’s NOTICE file. For example, Accumulo bundles the Apache Thrift libthrift JAR file which also have its
+own NOTICE file. The contents of the Apache Thrift NOTICE file should be included within Accumulo’s NOTICE file.</p>
+
+
+        </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>.</p>
+
+</footer>
+
+
+      </div>
+    </div>
+  </div>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/contributor/verifying_releases.html
----------------------------------------------------------------------
diff --git a/contributor/verifying_releases.html b/contributor/verifying_releases.html
deleted file mode 100644
index e9d61cf..0000000
--- a/contributor/verifying_releases.html
+++ /dev/null
@@ -1,249 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    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="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/paper/bootstrap.min.css" rel="stylesheet" integrity="sha384-awusxf8AUojygHf2+joICySzB780jVvQaVCAt1clU3QsyAitLGul28Qxb2r1e5g+" crossorigin="anonymous">
-<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
-<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.css">
-<link href="/css/accumulo.css" rel="stylesheet" type="text/css">
-
-<title>Verifying a Release</title>
-
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.js"></script>
-<script>
-  // show location of canonical site if not currently on the canonical site
-  $(function() {
-    var host = window.location.host;
-    if (typeof host !== 'undefined' && host !== 'accumulo.apache.org') {
-      $('#non-canonical').show();
-    }
-  });
-
-  $(function() {
-    // decorate section headers with anchors
-    return $("h2, h3, h4, h5, h6").each(function(i, el) {
-      var $el, icon, id;
-      $el = $(el);
-      id = $el.attr('id');
-      icon = '<i class="fa fa-link"></i>';
-      if (id) {
-        return $el.append($("<a />").addClass("header-link").attr("href", "#" + id).html(icon));
-      }
-    });
-  });
-  
-  // configure Google Analytics
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  if (ga.hasOwnProperty('loaded') && ga.loaded === true) {
-    ga('create', 'UA-50934829-1', 'apache.org');
-    ga('send', 'pageview');
-  }
-</script>
-
-</head>
-<body style="padding-top: 100px">
-
-  <nav class="navbar navbar-default navbar-fixed-top">
-  <div class="container">
-    <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 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="#">Releases<span class="caret"></span></a>
-        <ul class="dropdown-menu">
-          <li><a href="/release/accumulo-1.8.0/">1.8.0 (Latest)</a></li>
-          <li><a href="/release/accumulo-1.7.2/">1.7.2</a></li>
-          <li><a href="/release/accumulo-1.6.6/">1.6.6</a></li>
-          <li><a href="/release/">Archive</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><a href="/1.8/accumulo_user_manual.html">User Manual (1.8)</a></li>
-          <li><a href="/1.8/apidocs">Javadocs (1.8)</a></li>
-          <li><a href="/1.8/examples">Examples (1.8)</a></li>
-          <li><a href="/features">Features</a></li>
-          <li><a href="/papers">Papers &amp; Presentations</a></li>
-          <li><a href="/glossary">Glossary</a></li>
-          <li><a href="/docs-archive/">Archive</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><a href="/get_involved">Get Involved</a></li>
-          <li><a href="/mailing_list">Mailing Lists</a></li>
-          <li><a href="/people">People</a></li>
-          <li><a href="/projects">Related Projects</a></li>
-          <li><a href="/contributor/">Contributor Guide</a></li>
-          <li><a href="/governance/">Governance</a></li>
-        </ul>
-        </li>
-      </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li class="dropdown">
-        <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">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>
-    </div>
-  </div>
-</nav>
-
-
-  <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">Verifying a Release</h1>
-          
-          <p>This is a guide for the verification of a release candidate of Apache Accumulo. These steps are meant to encapsulate
-the requirements of the PMC set forth by the Foundation itself.</p>
-
-<p>The information here is meant to be an application of Foundation policy. When in doubt or conflict, any Foundation-level
-trumps anything written here.</p>
-
-<p>Verification of a release candidate can be broken down into three categories.</p>
-
-<h2 id="accumulo-correctness">Accumulo Correctness</h2>
-
-<p>Testing a distributed database is, arguably, the easiest of these requirements.</p>
-
-<p>Accumulo contains unit and integration tests which can be automatically run via Maven. These tests can be invoked
-by issues the following commands:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>$ mvn verify
-</code></pre>
-</div>
-
-<p>Additionally, Accumulo contains multiple distributed tests, most notably the RandomWalk and ContinuousIngest tests.
-Information on these tests can be found in their respective directories, <code class="highlighter-rouge">test/system/randomwalk</code> and
- <code class="highlighter-rouge">test/system/continuous</code>, which include instructions on how to run the tests. These tests are intended to be run
-for days on end while injecting faults into the system. These are the tests that truly verify the correctness of
-Accumulo on real systems.</p>
-
-<p>More information on these tests, and the requirements in running them for a given release, can be found on the
-<a href="/governance/releasing#testing">governance page on releasing</a></p>
-
-<h2 id="foundation-level-requirements">Foundation Level Requirements</h2>
-
-<p>The ASF requires that all artifacts in a release are cryptographically signed and distributed with hashes.</p>
-
-<p>OpenPGP is an asymmetric encryption scheme which lends itself well to the globally distributed nature of Apache.
-Verification of a release artifact can be done using the signature and the release-maker’s public key. Hashes
-can be verified using the appropriate command (e.g. <code class="highlighter-rouge">sha1sum</code>, <code class="highlighter-rouge">md5sum</code>).</p>
-
-<p>An Apache release must contain a source-only artifact. This is the official release artifact. While a release of
-an Apache project can contain other artifacts that do contain binary files. These non-source artifacts are for
-user convenience only, but still must adhere to the same licensing rules.</p>
-
-<p>PMC members should take steps to verify that the source-only artifact does not contain any binary files. There is
-some leeway in this rule. For example, test-only binary artifacts (such as test files or jars) are acceptable as long
-as they are only used for testing the software and not running it.</p>
-
-<p>The following are the aforementioned Foundation-level documents provided for reference:</p>
-
-<ul>
-  <li><a href="https://www.apache.org/dev/apply-license">Applying the Apache Software License</a></li>
-  <li><a href="https://www.apache.org/legal/src-headers">Legal’s license application guidelines</a></li>
-  <li><a href="https://www.apache.org/legal/resolved">Common legal-discuss mailing list questions/resolutions</a></li>
-  <li><a href="https://www.apache.org/legal">ASF Legal Affairs Page</a></li>
-</ul>
-
-<h2 id="apache-software-license-application">Apache Software License Application</h2>
-
-<p>Application of the Apache Software License v2 consists of the following steps on each artifact in a release. It’s
-important to remember that for artifacts that contain other artifacts (e.g. a tarball that contains JAR files or
-an RPM which contains JAR files), both the tarball, RPM and JAR files are subject to the following roles.</p>
-
-<p>The difficulty in verifying each artifact is that, often times, each artifact requires a different LICENSE and NOTICE
-file. For example, the Accumulo binary tarball must contain appropriate LICENSE and NOTICE files considering the bundled
-jar files in <code class="highlighter-rouge">lib/</code>. The Accumulo source tarball would not contain these same contents in the LICENSE and NOTICE files
-as it does not contain those same JARs.</p>
-
-<h3 id="license-file">LICENSE file</h3>
-
-<p>The LICENSE file should be present at the top-level of the artifact. This file should be explicitly named <code class="highlighter-rouge">LICENSE</code>,
-however <code class="highlighter-rouge">LICENSE.txt</code> is acceptable but not preferred. This file contains the text of the Apache Software License 
-at the top of the file. At the bottom of the file, all other open source licenses <em>contained in the given
-artifact</em> must be listed at the bottom of the LICENSE file. Contained components that are licensed with the ASL themselves
-do not need to be included in this file. It is common to see inclusions in file such as the MIT License of 3-clause
-BSD License.</p>
-
-<h3 id="notice-file">NOTICE file</h3>
-
-<p>The NOTICE file should be present at the top-level of the artifact beside the LICENSE file. This file should be explicitly
-name <code class="highlighter-rouge">NOTICE</code>, while <code class="highlighter-rouge">NOTICE.txt</code> is also acceptable but not preferred. This file contains the copyright notice for
-the artifact being released. As a reminder, the copyright is held by the Apache Software Foundation, not the individual
-project.</p>
-
-<p>The second purpose this file serves is to distribute third-party notices from dependent software. Specifically, other code
-which is licensed with the ASLv2 may also contain a NOTICE file. If such an artifact which contains a NOTICE file is
-contained in artifact being verified for releases, the contents of the contained artifact’s NOTICE file should be appended
-to this artifact’s NOTICE file. For example, Accumulo bundles the Apache Thrift libthrift JAR file which also have its
-own NOTICE file. The contents of the Apache Thrift NOTICE file should be included within Accumulo’s NOTICE file.</p>
-
-
-        </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>.</p>
-
-</footer>
-
-
-      </div>
-    </div>
-  </div>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/contributor/versioning.html
----------------------------------------------------------------------
diff --git a/contributor/versioning.html b/contributor/versioning.html
index e28caba..4c6da78 100644
--- a/contributor/versioning.html
+++ b/contributor/versioning.html
@@ -97,8 +97,8 @@
           <li><a href="/1.8/apidocs">Javadocs (1.8)</a></li>
           <li><a href="/1.8/examples">Examples (1.8)</a></li>
           <li><a href="/features">Features</a></li>
-          <li><a href="/papers">Papers &amp; Presentations</a></li>
           <li><a href="/glossary">Glossary</a></li>
+          <li><a href="/external-docs">External Docs</a></li>
           <li><a href="/docs-archive/">Archive</a></li>
         </ul>
         </li>
@@ -108,9 +108,8 @@
           <li><a href="/get_involved">Get Involved</a></li>
           <li><a href="/mailing_list">Mailing Lists</a></li>
           <li><a href="/people">People</a></li>
-          <li><a href="/projects">Related Projects</a></li>
+          <li><a href="/related-projects">Related Projects</a></li>
           <li><a href="/contributor/">Contributor Guide</a></li>
-          <li><a href="/governance/">Governance</a></li>
         </ul>
         </li>
       </ul>


Mime
View raw message