You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mw...@apache.org on 2016/12/14 14:34:08 UTC

[01/11] accumulo-website git commit: Several updates to website

Repository: accumulo-website
Updated Branches:
  refs/heads/asf-site fd82a85e9 -> fd45f7a21
  refs/heads/master b7e5e7b44 -> a71056ca8


http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/papers/index.md
----------------------------------------------------------------------
diff --git a/papers/index.md b/papers/index.md
deleted file mode 100644
index 074e224..0000000
--- a/papers/index.md
+++ /dev/null
@@ -1,112 +0,0 @@
----
-title: Related Links
----
-
-## Papers and Presentations
-
-{: #citationtable .table .table-bordered .table-striped style="width:100%;" }
-| Title                                                                                                                                                                                                | Links                      | Category     | Venue                                                          | Peer-Reviewed | Awards              |
-|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------|--------------|----------------------------------------------------------------|---------------|---------------------|
-| Prout, Andrew, et al. "Enabling On-Demand Database Computing with MIT SuperCloud Database Management System." IEEE HPEC 2015.                                                                        | [paper][p01]               | Architecture | IEEE HPEC 2015                                                 | Yes           |                     |
-| Hubbell, Matthew, et al. "Big Data Strategies for Data Center Infrastructure Management Using a 3D Gaming Platform." IEEE HPEC 2015.                                                                 | [paper][p02]               | Use Cases    | IEEE HPEC 2015                                                 | Yes           |                     |
-| Gadepally, Vijay, et al. "Computing on Masked Data to improve the Security of Big Data." IEEE HST 2015.                                                                                              | [paper][p03]               | Use Cases    | IEEE HST 2015                                                  | Yes           |                     |
-| Kepner, Jeremy, et al. "Associative Arrays: Unified Mathematics for Spreadsheets, Databases, Matrices, and Graphs." New England Database Summit 2015.                                                | [paper][p04]               | Use Cases    | New England Database Summit 2015                               | Yes           |                     |
-| Achieving 100,000,000 database inserts per second using Accumulo and D4M - Kepner et al IEEE HPEC 2014                                                                                               | [paper][p05]               | Performance  | IEEE HPEC 2014                                                 | Yes           |                     |
-| Evaluating Accumulo Performance for a Scalable Cyber Data Processing Pipeline - Sawyer et al IEEE HPEC 2014                                                                                          | [paper][p06]               | Performance  | IEEE HPEC 2014                                                 | Yes           |                     |
-| Understanding Query Performance in Accumulo - Sawyer et al IEEE HPEC 2013                                                                                                                            | [paper][p07]               | Performance  | IEEE HPEC 2013                                                 | Yes           |                     |
-| Benchmarking Apache Accumulo BigData Distributed Table Store Using Its Continuous Test Suite - Sen et al 2013 IEEE International Congress on Big Data.                                               | [paper][p08]               | Performance  | IEEE International Congress on Big Data 2013                   | Yes           |                     |
-| Benchmarking the Apache Accumulo Distributed Key-Value Store - Sen et al 2014 Updated version of the IEEE paper, including edits for clarity and additional results from benchmarking on Amazon EC2. | [paper][p09]               | Performance  | Online                                                         | No            |                     |
-| Computing on Masked Data: a High Performance Method for Improving Big Data Veracity - Kepner et al IEEE HPEC 2014                                                                                    | [paper][p10]               | Security     | IEEE HPEC 2014                                                 | Yes           |                     |
-| D4M 2.0 Schema: A General Purpose High Performance Schema for the Accumulo Database - Kepner et al IEEE HPEC 2013                                                                                    | [paper][p11] [slides][s11] | Architecture | IEEE HPEC 2013                                                 | Yes           |                     |
-| Genetic Sequence Matching Using D4M Big Data Approaches - Dodson et al IEEE HPEC 2014                                                                                                                |                            | Use Cases    | IEEE HPEC 2014                                                 | Yes           | Best Paper Finalist |
-| Big Data Dimensional Analysis - Gadepally et al IEEE HPEC 2014                                                                                                                                       |                            | Use Cases    | IEEE HPEC 2014                                                 | Yes           |                     |
-| LLSuperCloud: Sharing HPC systems for diverse rapid prototyping - Reuther et al IEEE HPEC 2013                                                                                                       | [paper][p12] [slides][s12] | Architecture | IEEE HPEC 2013                                                 | Yes           |                     |
-| Spatio-temporal indexing in non-relational distributed databases - Fox et al 2013 IEEE International Congress on Big Data                                                                            | [paper][p13]               | Use Cases    | IEEE International Congress on Big Data 2013                   | Yes           |                     |
-| Typograph: Multiscale spatial exploration of text documents - Endert, Alex, et al 2013 IEEE International Congress on Big Data                                                                       | [paper][p14]               | Use Cases    | IEEE International Congress on Big Data 2013                   | Yes           |                     |
-| UxV Data to the Cloud via Widgets - Charles et al 18th International Command & Control Research & Technology Symposium 2013                                                                  | [paper][p15]               | Use Cases    | Command & Control Research & Technology Symposium 2013 | Yes           |                     |
-| Driving Big Data With Big Compute - Byun et al IEEE HPEC 2012                                                                                                                                        | [paper][p16] [slides][s16] | Architecture | IEEE HPEC 2012                                                 | Yes           |                     |
-| Large Scale Network Situational Awareness Via 3D Gaming Technology - Hubbell et al IEEE HPEC 2012                                                                                                    | [paper][p17] [slides][s17] | Use Cases    | IEEE HPEC 2012                                                 | Yes           |                     |
-| Rya: a scalable RDF triple store for the clouds - Punnoose et al 1st International Workshop on Cloud Intelligence, ACM, 2012                                                                         | [paper][p18]               | Architecture | ACM International Workshop on Cloud Intelligence 2012          | Yes           |                     |
-| Dynamic distributed dimensional data model (D4M) database and computation system - Kepner et al ICASSP 2012                                                                                          | [paper][p19] [slides][s19] | Architecture | ICASSP 2012                                                    | Yes           |                     |
-| An NSA Big Graph experiment (Technical Report NSA-RD-2013-056002v1)                                                                                                                                  | [slides][s20]              | Performance  | Technical Report                                               | No            |                     |
-| Patil, Swapnil, et al. "YCSB++: benchmarking and performance debugging advanced features in scalable table stores." Proceedings of the 2nd ACM Symposium on Cloud Computing. ACM, 2011.              | [paper][p21] [slides][s21] | Performance  | ACM Symposium on Cloud Computing 2011                          | Yes           |                     |
-| Turner, Keith "Apache Accumulo 1.4 & 1.5 Features." February, 2012                                                                                                                               | [slides][s22]              | Architecture | Meetup                                                         | No            |                     |
-| Fuchs, Adam "Accumulo: Extensions to Google's Bigtable Design." March, 2012                                                                                                                          | [slides][s23]              | Architecture | Meetup                                                         | No            |                     |
-| Miner, Donald "An Introduction to Apache Accumulo - how it works, why it exists, and how it is used." August, 2014                                                                                   | [slides][s24]              | Architecture | Online                                                         | No            |                     |
-
-<script type="text/javascript">
-$(function() {
-$("#citationtable").dataTable();
-});
-</script>
-
-## Conferences and Meetups
- - Accumulo Summit:
-    - [Summit Website](http://accumulosummit.com)
-    - [2014 Accumulo Summit Slides](https://www.slideshare.net/AccumuloSummit)
- - IEEE HPEC
-    - [Conference Website](http://ieee-hpec.org/)
- - Strata + Hadoop World Meetup 24 Oct 2012
-    - [Accumulo standalone AMI](https://aws.amazon.com/amis/accumulo-standalone-20121019)
-    - [Large-scale web analytics with Accumulo (and Nutch/Gora, Pig, and Storm)](https://www.slideshare.net/jasontrost/accumulo-at-endgame)
-    - [Compaction and Splitting in Accumulo](https://www.slideshare.net/hortonworks/compaction-and-splitting-in-apache-accumulo)
-
-
-## Blog Posts and Writeups
- - [Codebits Blogs](http://affy.blogspot.com/search?q=accumulo&by-date=true)
-    - [Implement Word Count in Accumulo](http://affy.blogspot.com/2012/04/implement-word-count-in-accumulo.html)
-    - [Using Accumulo To Calculate Seven Day Rolling Average](http://affy.blogspot.com/2012/04/using-accumulo-to-calculate-seven-day.html)
- - [covert.io blogs](http://www.covert.io/)
-    - [Accumulo, Nutch, and Gora](http://www.covert.io/post/18414889381/accumulo-nutch-and-gora)
-    - [Accumulo and Pig](http://www.covert.io/post/18605091231/accumulo-and-pig)
- - [Accumulo on MapR](https://www.mapr.com/blog/accumulo-on-mapr) [More Accumulo on MapR](http://blog.stavi.sh/instructions-for-running-accumulo-on-mapr-m5)
- - [Accumulo on Ubuntu VirtualBox](https://gist.github.com/1535657)
- - [Accumulo on EC2](http://www.accumulodata.com/ec2.html)
-
-## Books
- - [Apache Accumulo for Developers (Packt Publishing)](https://www.packtpub.com/apache-accumulo-for-developers/book)
- - [Accumulo: Application Development, Table Design, and Best Practices (O'Reilly Media)](https://shop.oreilly.com/product/0636920032304.do)
-
-## Meetup Groups
- - [Accumulo Users Group - DC VA MD](https://www.meetup.com/Accumulo-Users-DC/)
- - [Search for more](https://www.meetup.com/find/?keywords=accumulo)
-
-## Reference
- - [Log-Structured Merge Tree](https://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.44.2782&rep=rep1&type=pdf)
- - [BigTable](https://research.google.com/archive/bigtable.html)
- - [GFS](https://research.google.com/archive/gfs.html)
- - [Chubby](https://research.google.com/archive/chubby.html)
- - [Dapper](https://research.google.com/pubs/pub36356.html)
- - [Bloom Filter](https://en.wikipedia.org/wiki/Bloom_filter)
-
-
-[p01]: https://arxiv.org/abs/1506.08506
-[p02]: https://arxiv.org/abs/1506.08505
-[p03]: https://arxiv.org/abs/1504.01287
-[p04]: https://arxiv.org/abs/1501.05709
-[p05]: https://arxiv.org/abs/1406.4923
-[p06]: https://arxiv.org/abs/1407.5661
-[p07]: http://ieee-hpec.org/2013/index_htm_files/28-2868615.pdf
-[p08]: https://sqrrl.com/media/Accumulo-Benchmark-10312013-1.pdf
-[p09]: accumulo-benchmarking-2.1.pdf
-[p10]: https://arxiv.org/abs/1406.5751
-[p11]: http://ieee-hpec.org/2013/index_htm_files/11-Kepner-D4Mschema-IEEE-HPEC.pdf
-[s11]: http://ieee-hpec.org/2013/index_htm_files/11_130716-D4Mschema.pdf
-[p12]: http://ieee-hpec.org/2013/index_htm_files/26-HPEC13_LLSuperCloud_Reuther_final.pdf
-[s12]: http://ieee-hpec.org/2013/index_htm_files/HPEC+2013+Reuther+SuperCloud+final.pdf
-[p13]: http://geomesa.github.io/assets/outreach/SpatioTemporalIndexing_IEEEcopyright.pdf
-[p14]: https://people.cs.vt.edu/aendert/Alex_Endert/Research_files/Typograph.pdf
-[p15]: http://www.dodccrp.org/events/18th_iccrts_2013/post_conference/papers/051.pdf
-[p16]: http://www.mit.edu/~kepner/pubs/ByunKepner_2012_BigData_Paper.pdf
-[s16]: http://ieee-hpec.org/2012/index_htm_files/42_ID18.pptx
-[p17]: http://ieee-hpec.org/2012/index_htm_files/HPEC12_Hubbell.pdf
-[s17]: http://ieee-hpec.org/2012/index_htm_files/31_ID20.pptx
-[p18]: https://sqrrl.com/media/Rya_CloudI20121.pdf
-[p19]: http://www.mit.edu/~kepner/pubs/Kepner_2012_D4M_Paper.pdf
-[s19]: http://www.mit.edu/~kepner/pubs/Kepner_2012_D4M_Slides.pdf
-[s20]: http://www.pdl.cmu.edu/SDI/2013/slides/big_graph_nsa_rd_2013_56002v1.pdf
-[p21]: http://www.pdl.cmu.edu/PDL-FTP/Storage/socc2011.pdf
-[s21]: http://www.cercs.gatech.edu/opencirrus/OCsummit11/presentations/patil.pdf
-[s22]: https://home.apache.org/~kturner/accumulo14_15.pdf
-[s23]: https://home.apache.org/~afuchs/slides/morgan_state_talk.pdf
-[s24]: https://www.slideshare.net/DonaldMiner/an-introduction-to-accumulo

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/people.md
----------------------------------------------------------------------
diff --git a/people.md b/people.md
deleted file mode 100644
index 88a359d..0000000
--- a/people.md
+++ /dev/null
@@ -1,181 +0,0 @@
----
-title: People
-skiph1fortitle: true
----
-
-## PMC and Committers
-
-{: .table .table-striped}
-| username      | name              | organization                           | timezone |
-|---------------|-------------------|----------------------------------------|----------|
-| acordova      | Aaron Cordova     | [Koverse][KOVERSE]                     |          |
-| afuchs        | Adam Fuchs        | [sqrrl][SQRRL]                         | [ET][ET] |
-| bhavanki      | Bill Havanki      | [Cloudera][CLOUDERA]                   | [ET][ET] |
-| billie        | Billie Rinaldi    | [Hortonworks][HORTONWORKS]             | [ET][ET] |
-| bimargulies   | Benson Margulies  | [Basis Technology Corp.][BASISTECH]    | [ET][ET] |
-| brianloss     | Brian Loss        | [Praxis Engineering][PRAXIS]           | [ET][ET] |
-| busbey        | Sean Busbey       | [Cloudera][CLOUDERA]                   | [CT][CT] |
-| cawaring      | Chris Waring      |                                        |          |
-| cjnolet       | Corey J. Nolet    | [Tetra Concepts LLC][TETRA]            | [ET][ET] |
-| ctubbsii      | Christopher Tubbs | [NSA][NSA]                             | [ET][ET] |
-| dhutchis      | Dylan Hutchison   | [University of Washington][UW]         | [PT][PT] |
-| dlmarion      | Dave Marion       | [Objective Solutions, Inc.][OBJECTIVE] | [ET][ET] |
-| drew          | Drew Farris       | [Booz Allen Hamilton][BOOZ]            | [ET][ET] |
-| ecn           | Eric Newton       | [SW Complete Inc.][SWC]                | [ET][ET] |
-| elserj        | Josh Elser        | [Hortonworks][HORTONWORKS]             | [ET][ET] |
-| etcoleman     | Ed Coleman        |                                        | [ET][ET] |
-| jtrost        | Jason Trost       | [Endgame][ENDGAME]                     |          |
-| kturner       | Keith Turner      | [Peterson Technologies][PETERSON]      | [ET][ET] |
-| mdrob         | Mike Drob         | [Cloudera][CLOUDERA]                   | [ET][ET] |
-| medined       | David Medinets    |                                        |          |
-| mjwall        | Michael Wall      | [Objective Solutions, Inc.][OBJECTIVE] | [ET][ET] |
-| mmiller       | Michael Miller    | [Centroid, LLC][CENTROID]              | [ET][ET] |
-| mwalch        | Mike Walch        | [Peterson Technologies][PETERSON]      | [ET][ET] |
-| phrocker      | Marc Parisi       | [WaveStrike LLC][WAVE]                 | [ET][ET] |
-| rweeks        | Russ Weeks        | [PHEMI][PHEMI]                         | [PT][PT] |
-| shickey       | Sean Hickey       |                                        | [PT][PT] |
-| ujustgotbilld | William Slacum    | [Miner &amp; Kasch][MINERKASCH]        | [ET][ET] |
-| vikrams       | Vikram Srivastava | [Cloudera][CLOUDERA]                   | [PT][PT] |
-| vines         | John Vines        | [sqrrl][SQRRL]                         | [ET][ET] |
-
-## Contributors
-
-{: .table .table-striped}
-| username    | name                | organization                                                      | timezone              |
-|-------------|---------------------|-------------------------------------------------------------------|-----------------------|
-|             | Aaron Glahe         | [Data Tactics][DATATACT]                                          | [ET][ET]              |
-|             | Adam J Shook        | [Datacatessen][DATACATESS]                                        | [ET][ET]              |
-|             | Al Krinker          |                                                                   | [ET][ET]              |
-|             | Alex Moundalexis    | [Cloudera][CLOUDERA]                                              | [ET][ET]              |
-|             | Andrew George Wells | [ClearEdgeIT][CLEAREDGE]                                          | [ET][ET]              |
-|             | Arshak Navruzyan    | [Argyle Data][ARGYLE]                                             |                       |
-|             | Ben Manes           |                                                                   | [PT][PT]              |
-|             | Bob Thorman         | [AT&amp;T][ATT]                                                   |                       |
-|             | Chris Bennight      |                                                                   |                       |
-|             | Chris McCubbin      | [sqrrl][SQRRL]                                                    | [ET][ET]              |
-|             | Christian Rohling   | [Endgame][ENDGAME]                                                | [ET][ET]              |
-|             | Damon Brown         | [Tetra Concepts LLC][TETRA]                                       | [ET][ET]              |
-|             | Dave Wang           | [Cloudera][CLOUDERA]                                              | [PT][PT]              |
-|             | David M. Lyle       |                                                                   |                       |
-|             | David Protzman      |                                                                   |                       |
-|             | Dennis Patrone      | [The Johns Hopkins University Applied Physics Laboratory][JHUAPL] | [ET][ET]              |
-| dimaspivak  | Dima Spivak         | [Cloudera][CLOUDERA]                                              |                       |
-|             | Ed Kohlwey          | [Booz Allen Hamilton][BOOZ]                                       |                       |
-| edwardyoon  | Edward Yoon         |                                                                   |                       |
-|             | Eugene Cheipesh     |                                                                   |                       |
-|             | Gary Singh          | [Sabre Engineering][SABRE]                                        | [ET][ET]              |
-|             | Hayden Marchant     |                                                                   |                       |
-|             | Hung Pham           | [Cloudera][CLOUDERA]                                              | [ET][ET]              |
-|             | Ivan Bella          | [Objective Solutions, Inc.][OBJECTIVE]                            | [ET][ET]              |
-|             | Jacob Meisler       | [Booz Allen Hamilton][BOOZ]                                       | [ET][ET]              |
-|             | James Fiori         | [Flywheel Data][FLYWHEEL]                                         | [ET][ET]              |
-| jaredwinick | Jared Winick        | [Koverse][KOVERSE]                                                | [MT][MT]              |
-|             | Jason Then          |                                                                   |                       |
-|             | Jay Shipper         |                                                                   |                       |
-| jfield      | Jeff Field          | [Cloudera][CLOUDERA]                                              | [ET][ET]              |
-|             | Jeffrey S. Schwartz |                                                                   |                       |
-|             | Jenna Huston        |                                                                   | [ET][ET]              |
-|             | Jerry He            | [IBM][IBM]                                                        | [PT][PT]              |
-|             | Jesse Yates         |                                                                   |                       |
-|             | Jessica Seastrom    | [Cloudera][CLOUDERA]                                              | [ET][ET]              |
-|             | Jim Klucar          | [Splyt][SPLYT]                                                    | [ET][ET]              |
-|             | Joe Skora           |                                                                   |                       |
-|             | John McNamee        |                                                                   |                       |
-|             | John Stoneham       |                                                                   | [ET][ET]              |
-| jmhsieh     | Jonathan M. Hsieh   | [Cloudera][CLOUDERA]                                              | [PT][PT]              |
-|             | Jonathan Park       | [sqrrl][SQRRL]                                                    | [ET][ET]              |
-|             | Kevin Faro          | [Tetra Concepts LLC][TETRA]                                       | [ET][ET]              |
-|             | Laura Peaslee       | [Objective Solutions, Inc.][OBJECTIVE]                            | [ET][ET]              |
-|             | Luis Tavarez        |                                                                   | [ET][ET]              |
-|             | Luke Brassard       | [sqrrl][SQRRL]                                                    | [ET][ET]              |
-|             | Mario Pastorelli    | [Teralytics AG][TERALYTICS]                                       | [CEST][CEST]          |
-|             | Matt Dailey         |                                                                   |                       |
-|             | Matthew Kirkley     |                                                                   |                       |
-|             | Max Jordan          |                                                                   |                       |
-|             | Michael Allen       | [sqrrl][SQRRL]                                                    | [ET][ET]              |
-|             | Michael Berman      | [sqrrl][SQRRL]                                                    | [ET][ET]              |
-|             | Miguel Pereira      | [SRA International, Inc][SRA]                                     | [ET][ET]              |
-|             | Mike Fagan          | [Arcus Research][ARCUS]                                           | [MT][MT]              |
-|             | Morgan Haskel       |                                                                   |                       |
-|             | Nguessan Kouame     |                                                                   |                       |
-|             | Oren Falkowitz      | [sqrrl][SQRRL]                                                    | [ET][ET]              |
-|             | Phil Eberhardt      | [sqrrl][SQRRL]                                                    | [ET][ET]              |
-|             | Philip Young        |                                                                   |                       |
-|             | Pushpinder Heer     | [Applied Technical Systems][ATSID]                                | [PT][PT]              |
-|             | Ravi Mutyala        | [Hortonworks][HORTONWORKS]                                        | [CT][CT]              |
-|             | Ryan Fishel         | [Cloudera][CLOUDERA]                                              |                       |
-|             | Ryan Leary          |                                                                   |                       |
-|             | Sapah Shah          |                                                                   |                       |
-|             | Scott Kuehn         |                                                                   |                       |
-|             | Shawn Walker        |                                                                   |                       |
-| stevel      | Steve Loughran      | [Hortonworks][HORTONWORKS]                                        | [GMT][GMT]/[BST][BST] |
-| supun       | Supun Kamburugamuva |                                                                   |                       |
-|             | Takahiko Saito      | [Hortonworks][HORTONWORKS]                                        | [PT][PT]              |
-|             | Ted Malaska         | [Cloudera][CLOUDERA]                                              |                       |
-| tedyu       | Ted Yu              | [Hortonworks][HORTONWORKS]                                        | [PT][PT]              |
-|             | Tim Halloran        |                                                                   |                       |
-|             | Tim Reardon         |                                                                   |                       |
-|             | Travis Pinney       |                                                                   |                       |
-|             | Trent Nadeau        | [Anthem Engineering LLC][ANTHEMENG]                               | [ET][ET]              |
-|             | Tristen Georgiou    | [PHEMI][PHEMI]                                                    | [PT][PT]              |
-|             | Vicky Kak           |                                                                   |                       |
-|             | Vincent Russell     |                                                                   |                       |
-|             | Volth               |                                                                   |                       |
-|             | Wil Selwood         | [Satellite Applications Catapult][SACAT]                          | [GMT][GMT]/[BST][BST] |
-
-## Organizations
-
-First off, thanks to our parent organization, the [Apache Software Foundation][ASF] and [all who sponsor][ASF_SPONSORS] them.
-
-Additionally, we would like to thank the following organizations for resources that they provide:
-
-  - ej-technologies for allowing us to use their [Java profiler][JPROFILER]
-  - YourKit for allowing us use of their [Java Profiler][YOURKIT]
-  - Coverity for running [static analysis][COVERITY]
-
-[ANTHEMENG]: http://www.anthemengineering.com
-[ARCUS]: http://www.arcus-research.com
-[ARGYLE]: http://www.argyledata.com
-[ATSID]: http://www.atsid.com
-[ATT]: http://www.att.com
-[BASISTECH]: http://www.basistech.com
-[BOOZ]: http://www.boozallen.com
-[CENTROID]: http://www.centroid-llc.com/
-[CLEAREDGE]: http://clearedgeit.com
-[CLOUDERA]: http://www.cloudera.com
-[DATATACT]: http://www.data-tactics.com
-[DATACATESS]: https://datacatessen.com/
-[ENDGAME]: http://www.endgame.com
-[FLYWHEEL]: http://flywheeldata.com
-[HORTONWORKS]: http://hortonworks.com
-[IBM]: http://www.ibm.com
-[JHUAPL]: http://www.jhuapl.edu
-[KOVERSE]: http://www.koverse.com
-[MINERKASCH]: http://minerkasch.com
-[NSA]: http://www.nsa.gov
-[OBJECTIVE]: http://www.objectivesolutions.com
-[PETERSON]: http://www.ptech-llc.com
-[PHEMI]: http://www.phemi.com
-[PRAXIS]: http://www.praxiseng.com
-[SABRE]: http://www.sabre-eng.com
-[SACAT]: https://sa.catapult.org.uk
-[SPLYT]: http://www.splyt.com
-[SQRRL]: http://sqrrl.com
-[SRA]: http://sra.com
-[SWC]: http://swcomplete.com
-[TERALYTICS]: http://www.teralytics.net/
-[TETRA]: http://www.tetraconcepts.com
-[UW]: http://www.uw.edu
-[WAVE]: http://www.wavestrike.com/
-[BST]: http://www.timeanddate.com/time/zones/bst
-[CT]: http://www.timeanddate.com/time/zones/ct
-[ET]: http://www.timeanddate.com/time/zones/et
-[GMT]: http://www.timeanddate.com/time/zones/gmt
-[MT]: http://www.timeanddate.com/time/zones/mt
-[PT]: http://www.timeanddate.com/time/zones/pt
-[CEST]: http://www.timeanddate.com/time/zones/cest
-[ASF]: https://www.apache.org
-[ASF_SPONSORS]: https://www.apache.org/foundation/sponsorship
-[JPROFILER]: https://www.ej-technologies.com/products/jprofiler/overview.html 
-[YOURKIT]: https://www.yourkit.com/java/profiler/features/
-[COVERITY]: https://scan.coverity.com/projects/accumulo

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/projects.md
----------------------------------------------------------------------
diff --git a/projects.md b/projects.md
deleted file mode 100644
index 598f678..0000000
--- a/projects.md
+++ /dev/null
@@ -1,90 +0,0 @@
----
-title: Related Projects
----
-
-The Apache Accumulo community is happy to promote and encourage use of Accumulo in ways that are novel and reusable
-by other users within the community. As such, we're happy to curate a list of projects related to Accumulo to give
-them visibility to a larger audience. To have you project listed here, send a request to the
-[developer's mailing list](mailto:dev@accumulo.apache.org)
-
-## Open source projects using Accumulo
-
-#### Apache Fluo
-
-[Fluo](https://fluo.apache.org) builds on Accumulo and enables low latency, continuous incremental processing of big data.
-
-#### Apache Gora
-
-[Gora](https://gora.apache.org/) open source framework provides an in-memory data model and persistence for big data.  Accumulo's continuous ingest test suite was adapted to Gora and called [Goraci](http://gora.apache.org/current/index.html#goraci-integration-testsing-suite).
-
-#### Apache Hive
-
-[Hive](https://hive.apache.org/) data warehouse software facilitates reading, writing, and managing large datasets residing in distributed storage using SQL.
-Hive has the ability to read and write data in Accumulo using the [AccumuloStorageHandler](https://cwiki.apache.org/confluence/display/Hive/AccumuloIntegration).
-
-#### Apache Pig
-
-[Pig](http://pig.apache.org/) is a platform for analyzing large data sets that consists of a high-level language for expressing data analysis programs, coupled with infrastructure for evaluating these programs.  Pig has the ability to read and write data in Accumulo using [AccumuloStorage](http://pig.apache.org/docs/r0.16.0/func.html#AccumuloStorage).
-
-#### Apache Rya
-
-[Rya](http://rya.apache.org/) is a scalable RDF triple store built on top of a columnar index store.
-
-#### Geomesa
-
-[Geomesa](http://www.geomesa.org/) is an open-source, distributed, spatio-temporal database built on a number of distributed cloud data storage systems, including Accumulo, HBase, Cassandra, and Kafka.
-
-#### Geowave
-
-[Geowave](https://ngageoint.github.io/geowave/) is a library for storage, index, and search of multi-dimensional data on top of a sorted key-value datastore.
-
-#### Graphulo
-
-Graphulo is a Java library for Apache Accumulo which delivers server-side sparse matrix math primitives that
-enable higher-level graph algorithms and analytics. [Code](https://github.com/Accla/graphulo).
-
-#### Presto
-
-[Presto](https://prestodb.io/) is an open source distributed SQL query engine for running interactive analytic queries against data sources of all sizes, ranging from gigabytes to petabytes.  Through the use of the new Accumulo connector for Presto, users are able to execute traditional SQL queries against new and existing tables in Accumulo.  For more information, see the [Accumulo Connector](https://prestodb.io/docs/current/connector/accumulo.html) documentation.
-
-#### Timely
-
-[Timely](https://nationalsecurityagency.github.io/timely/) : A secure time series database based on Accumulo and Grafana.
-
-#### Uno and Muchos
-
-[Uno](https://github.com/astralway/uno) and [Muchos](https://github.com/astralway/muchos) provide automation for quickly setting up Accumulo instances for testing.  These project were created to enable Fluo testing, but can be used to setup just Accumulo.
-
-## User-Created Applications
-
-#### Trendulo
-
-[Trendulo](http://trendulo.com/) is Twitter trend analysis using Apache Accumulo. The [source code](https://github.com/jaredwinick/Trendulo) is publicly available.
-
-#### Wikisearch
-
-The [Wikisearch project]({{ site.baseurl }}/example/wikisearch) is a rough example of generalized secondary indexing, both ingest
-and search, built on top of Apache Accumulo. This write contains more information on the project as well as some
-general performance numbers of the project.
-
-#### Node.js, RabbitMQ, and Accumulo
-
-A [simple example](https://github.com/joshelser/node-accumulo) using Node.js to interact with Accumulo using RabbitMQ .
-
-#### ProxyInstance
-
-ProxyInstance is a Java Instance implementation of the Accumulo Instance interface that communicates with
-an Accumulo cluster via Accumulo's Apache Thrift proxy server. [Documentation](https://jhuapl.github.io/accumulo-proxy-instance/proxy_instance_user_manual) and
-[code](https://github.com/JHUAPL/accumulo-proxy-instance) are available.
-
-#### AccumuloGraph
-
-ProxyInstance is an implementation of the TinkerPop Blueprints 2.6 API using
-Apache Accumulo as the backend.
-[Documentation](https://jhuapl.github.io/AccumuloGraph/) and
-[code](https://github.com/JHUAPL/AccumuloGraph) are available.
-
-## Github
-
-[Github](https://github.com/search?q=accumulo&type=Repositories) also contains many projects that use/reference Accumulo
-in some way, shape or form.


[05/11] accumulo-website git commit: Jekyll build from master:a71056c

Posted by mw...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/news.html
----------------------------------------------------------------------
diff --git a/news.html b/news.html
deleted file mode 100644
index d94cb2d..0000000
--- a/news.html
+++ /dev/null
@@ -1,367 +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>News Archive</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">News Archive</h1>
-          
-          <div>
-
-  
-  
-  
-    <hr />
-    <h3>2016</h3>
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Nov 16</div>
-    <div class="col-md-10"><a href="/blog/2016/11/16/simpler-scripts-and-config.html">Simpler scripts and configuration coming in Accumulo 2.0.0</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Nov 02</div>
-    <div class="col-md-10"><a href="/blog/2016/11/02/durability-performance.html">Durability Performance Implications</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Sep 18</div>
-    <div class="col-md-10"><a href="/release/accumulo-1.6.6/">Apache Accumulo 1.6.6</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Sep 06</div>
-    <div class="col-md-10"><a href="/release/accumulo-1.8.0/">Apache Accumulo 1.8.0</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Jun 22</div>
-    <div class="col-md-10"><a href="/release/accumulo-1.7.2/">Apache Accumulo 1.7.2</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Feb 26</div>
-    <div class="col-md-10"><a href="/release/accumulo-1.7.1/">Apache Accumulo 1.7.1</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Feb 17</div>
-    <div class="col-md-10"><a href="/release/accumulo-1.6.5/">Apache Accumulo 1.6.5</a></div>
-  </div>
-
-  
-  
-  
-    <hr />
-    <h3>2015</h3>
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Oct 03</div>
-    <div class="col-md-10"><a href="/release/accumulo-1.6.4/">Apache Accumulo 1.6.4</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Sep 21</div>
-    <div class="col-md-10"><a href="/release/accumulo-1.5.4/">Apache Accumulo 1.5.4</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Sep 19</div>
-    <div class="col-md-10"><a href="/release/accumulo-1.5.2/">Apache Accumulo 1.5.2</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Jul 04</div>
-    <div class="col-md-10"><a href="/release/accumulo-1.6.3/">Apache Accumulo 1.6.3</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Jun 25</div>
-    <div class="col-md-10"><a href="/release/accumulo-1.5.3/">Apache Accumulo 1.5.3</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">May 18</div>
-    <div class="col-md-10"><a href="/release/accumulo-1.7.0/">Apache Accumulo 1.7.0</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Apr 06</div>
-    <div class="col-md-10"><a href="/blog/2015/04/06/replicating-data-across-accumulo-clusters.html">Replicating data across Accumulo clusters</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Mar 20</div>
-    <div class="col-md-10"><a href="/blog/2015/03/20/balancing-groups-of-tablets.html">Balancing Groups of Tablets</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Feb 16</div>
-    <div class="col-md-10"><a href="/release/accumulo-1.6.2/">Apache Accumulo 1.6.2</a></div>
-  </div>
-
-  
-  
-  
-    <hr />
-    <h3>2014</h3>
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Sep 25</div>
-    <div class="col-md-10"><a href="/release/accumulo-1.6.1/">Apache Accumulo 1.6.1</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Sep 02</div>
-    <div class="col-md-10"><a href="/blog/2014/09/02/generating-keystores-for-configuring-accumulo-with-ssl.html">Generating Keystores for configuring Accumulo with SSL</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Jul 09</div>
-    <div class="col-md-10"><a href="/blog/2014/07/09/functional-reads-over-accumulo.html">Functional reads over Accumulo</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Jun 25</div>
-    <div class="col-md-10"><a href="/blog/2014/06/25/scaling-accumulo-with-multivolume-support.html">Scaling Accumulo with Multi-Volume Support</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">May 27</div>
-    <div class="col-md-10"><a href="/blog/2014/05/27/getting-started-with-accumulo-1.6.0.html">Getting Started with Apache Accumulo 1.6.0</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">May 03</div>
-    <div class="col-md-10"><a href="/blog/2014/05/03/accumulo-classloader.html">The Accumulo ClassLoader</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">May 02</div>
-    <div class="col-md-10"><a href="/release/accumulo-1.6.0/">Apache Accumulo 1.6.0</a></div>
-  </div>
-
-  
-  
-  
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">Mar 06</div>
-    <div class="col-md-10"><a href="/release/accumulo-1.5.1/">Apache Accumulo 1.5.1</a></div>
-  </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>.</p>
-
-</footer>
-
-
-      </div>
-    </div>
-  </div>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/news/index.html
----------------------------------------------------------------------
diff --git a/news/index.html b/news/index.html
new file mode 100644
index 0000000..f4b8344
--- /dev/null
+++ b/news/index.html
@@ -0,0 +1,366 @@
+<!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>News Archive</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">News Archive</h1>
+          
+          <div>
+
+  
+  
+  
+    <hr />
+    <h3>2016</h3>
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Nov 16</div>
+    <div class="col-md-10"><a href="/blog/2016/11/16/simpler-scripts-and-config.html">Simpler scripts and configuration coming in Accumulo 2.0.0</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Nov 02</div>
+    <div class="col-md-10"><a href="/blog/2016/11/02/durability-performance.html">Durability Performance Implications</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Sep 18</div>
+    <div class="col-md-10"><a href="/release/accumulo-1.6.6/">Apache Accumulo 1.6.6</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Sep 06</div>
+    <div class="col-md-10"><a href="/release/accumulo-1.8.0/">Apache Accumulo 1.8.0</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Jun 22</div>
+    <div class="col-md-10"><a href="/release/accumulo-1.7.2/">Apache Accumulo 1.7.2</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Feb 26</div>
+    <div class="col-md-10"><a href="/release/accumulo-1.7.1/">Apache Accumulo 1.7.1</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Feb 17</div>
+    <div class="col-md-10"><a href="/release/accumulo-1.6.5/">Apache Accumulo 1.6.5</a></div>
+  </div>
+
+  
+  
+  
+    <hr />
+    <h3>2015</h3>
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Oct 03</div>
+    <div class="col-md-10"><a href="/release/accumulo-1.6.4/">Apache Accumulo 1.6.4</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Sep 21</div>
+    <div class="col-md-10"><a href="/release/accumulo-1.5.4/">Apache Accumulo 1.5.4</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Sep 19</div>
+    <div class="col-md-10"><a href="/release/accumulo-1.5.2/">Apache Accumulo 1.5.2</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Jul 04</div>
+    <div class="col-md-10"><a href="/release/accumulo-1.6.3/">Apache Accumulo 1.6.3</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Jun 25</div>
+    <div class="col-md-10"><a href="/release/accumulo-1.5.3/">Apache Accumulo 1.5.3</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">May 18</div>
+    <div class="col-md-10"><a href="/release/accumulo-1.7.0/">Apache Accumulo 1.7.0</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Apr 06</div>
+    <div class="col-md-10"><a href="/blog/2015/04/06/replicating-data-across-accumulo-clusters.html">Replicating data across Accumulo clusters</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Mar 20</div>
+    <div class="col-md-10"><a href="/blog/2015/03/20/balancing-groups-of-tablets.html">Balancing Groups of Tablets</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Feb 16</div>
+    <div class="col-md-10"><a href="/release/accumulo-1.6.2/">Apache Accumulo 1.6.2</a></div>
+  </div>
+
+  
+  
+  
+    <hr />
+    <h3>2014</h3>
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Sep 25</div>
+    <div class="col-md-10"><a href="/release/accumulo-1.6.1/">Apache Accumulo 1.6.1</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Sep 02</div>
+    <div class="col-md-10"><a href="/blog/2014/09/02/generating-keystores-for-configuring-accumulo-with-ssl.html">Generating Keystores for configuring Accumulo with SSL</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Jul 09</div>
+    <div class="col-md-10"><a href="/blog/2014/07/09/functional-reads-over-accumulo.html">Functional reads over Accumulo</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Jun 25</div>
+    <div class="col-md-10"><a href="/blog/2014/06/25/scaling-accumulo-with-multivolume-support.html">Scaling Accumulo with Multi-Volume Support</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">May 27</div>
+    <div class="col-md-10"><a href="/blog/2014/05/27/getting-started-with-accumulo-1.6.0.html">Getting Started with Apache Accumulo 1.6.0</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">May 03</div>
+    <div class="col-md-10"><a href="/blog/2014/05/03/accumulo-classloader.html">The Accumulo ClassLoader</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">May 02</div>
+    <div class="col-md-10"><a href="/release/accumulo-1.6.0/">Apache Accumulo 1.6.0</a></div>
+  </div>
+
+  
+  
+  
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">Mar 06</div>
+    <div class="col-md-10"><a href="/release/accumulo-1.5.1/">Apache Accumulo 1.5.1</a></div>
+  </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>.</p>
+
+</footer>
+
+
+      </div>
+    </div>
+  </div>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/papers.html
----------------------------------------------------------------------
diff --git a/papers.html b/papers.html
index 00fac2b..b348821 100644
--- a/papers.html
+++ b/papers.html
@@ -2,9 +2,9 @@
 <html lang="en-US">
 <meta charset="utf-8">
 <title>Redirecting\u2026</title>
-<link rel="canonical" href="/papers/">
-<meta http-equiv="refresh" content="0; url=/papers/">
+<link rel="canonical" href="https://accumulo.apache.org/external-docs/">
+<meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/external-docs/">
 <h1>Redirecting\u2026</h1>
-<a href="/papers/">Click here if you are not redirected.</a>
-<script>location="/papers/"</script>
+<a href="https://accumulo.apache.org/external-docs/">Click here if you are not redirected.</a>
+<script>location="https://accumulo.apache.org/external-docs/"</script>
 </html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/papers/index.html
----------------------------------------------------------------------
diff --git a/papers/index.html b/papers/index.html
deleted file mode 100644
index b7d42a8..0000000
--- a/papers/index.html
+++ /dev/null
@@ -1,457 +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>Related Links</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">Related Links</h1>
-          
-          <h2 id="papers-and-presentations">Papers and Presentations</h2>
-
-<table id="citationtable" class="table table-bordered table-striped" style="width:100%;">
-  <thead>
-    <tr>
-      <th>Title</th>
-      <th>Links</th>
-      <th>Category</th>
-      <th>Venue</th>
-      <th>Peer-Reviewed</th>
-      <th>Awards</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>Prout, Andrew, et al. \u201cEnabling On-Demand Database Computing with MIT SuperCloud Database Management System.\u201d IEEE HPEC 2015.</td>
-      <td><a href="https://arxiv.org/abs/1506.08506">paper</a></td>
-      <td>Architecture</td>
-      <td>IEEE HPEC 2015</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Hubbell, Matthew, et al. \u201cBig Data Strategies for Data Center Infrastructure Management Using a 3D Gaming Platform.\u201d IEEE HPEC 2015.</td>
-      <td><a href="https://arxiv.org/abs/1506.08505">paper</a></td>
-      <td>Use Cases</td>
-      <td>IEEE HPEC 2015</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Gadepally, Vijay, et al. \u201cComputing on Masked Data to improve the Security of Big Data.\u201d IEEE HST 2015.</td>
-      <td><a href="https://arxiv.org/abs/1504.01287">paper</a></td>
-      <td>Use Cases</td>
-      <td>IEEE HST 2015</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Kepner, Jeremy, et al. \u201cAssociative Arrays: Unified Mathematics for Spreadsheets, Databases, Matrices, and Graphs.\u201d New England Database Summit 2015.</td>
-      <td><a href="https://arxiv.org/abs/1501.05709">paper</a></td>
-      <td>Use Cases</td>
-      <td>New England Database Summit 2015</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Achieving 100,000,000 database inserts per second using Accumulo and D4M - Kepner et al IEEE HPEC 2014</td>
-      <td><a href="https://arxiv.org/abs/1406.4923">paper</a></td>
-      <td>Performance</td>
-      <td>IEEE HPEC 2014</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Evaluating Accumulo Performance for a Scalable Cyber Data Processing Pipeline - Sawyer et al IEEE HPEC 2014</td>
-      <td><a href="https://arxiv.org/abs/1407.5661">paper</a></td>
-      <td>Performance</td>
-      <td>IEEE HPEC 2014</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Understanding Query Performance in Accumulo - Sawyer et al IEEE HPEC 2013</td>
-      <td><a href="http://ieee-hpec.org/2013/index_htm_files/28-2868615.pdf">paper</a></td>
-      <td>Performance</td>
-      <td>IEEE HPEC 2013</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Benchmarking Apache Accumulo BigData Distributed Table Store Using Its Continuous Test Suite - Sen et al 2013 IEEE International Congress on Big Data.</td>
-      <td><a href="https://sqrrl.com/media/Accumulo-Benchmark-10312013-1.pdf">paper</a></td>
-      <td>Performance</td>
-      <td>IEEE International Congress on Big Data 2013</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Benchmarking the Apache Accumulo Distributed Key-Value Store - Sen et al 2014 Updated version of the IEEE paper, including edits for clarity and additional results from benchmarking on Amazon EC2.</td>
-      <td><a href="accumulo-benchmarking-2.1.pdf">paper</a></td>
-      <td>Performance</td>
-      <td>Online</td>
-      <td>No</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Computing on Masked Data: a High Performance Method for Improving Big Data Veracity - Kepner et al IEEE HPEC 2014</td>
-      <td><a href="https://arxiv.org/abs/1406.5751">paper</a></td>
-      <td>Security</td>
-      <td>IEEE HPEC 2014</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>D4M 2.0 Schema: A General Purpose High Performance Schema for the Accumulo Database - Kepner et al IEEE HPEC 2013</td>
-      <td><a href="http://ieee-hpec.org/2013/index_htm_files/11-Kepner-D4Mschema-IEEE-HPEC.pdf">paper</a> <a href="http://ieee-hpec.org/2013/index_htm_files/11_130716-D4Mschema.pdf">slides</a></td>
-      <td>Architecture</td>
-      <td>IEEE HPEC 2013</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Genetic Sequence Matching Using D4M Big Data Approaches - Dodson et al IEEE HPEC 2014</td>
-      <td>�</td>
-      <td>Use Cases</td>
-      <td>IEEE HPEC 2014</td>
-      <td>Yes</td>
-      <td>Best Paper Finalist</td>
-    </tr>
-    <tr>
-      <td>Big Data Dimensional Analysis - Gadepally et al IEEE HPEC 2014</td>
-      <td>�</td>
-      <td>Use Cases</td>
-      <td>IEEE HPEC 2014</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>LLSuperCloud: Sharing HPC systems for diverse rapid prototyping - Reuther et al IEEE HPEC 2013</td>
-      <td><a href="http://ieee-hpec.org/2013/index_htm_files/26-HPEC13_LLSuperCloud_Reuther_final.pdf">paper</a> <a href="http://ieee-hpec.org/2013/index_htm_files/HPEC+2013+Reuther+SuperCloud+final.pdf">slides</a></td>
-      <td>Architecture</td>
-      <td>IEEE HPEC 2013</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Spatio-temporal indexing in non-relational distributed databases - Fox et al 2013 IEEE International Congress on Big Data</td>
-      <td><a href="http://geomesa.github.io/assets/outreach/SpatioTemporalIndexing_IEEEcopyright.pdf">paper</a></td>
-      <td>Use Cases</td>
-      <td>IEEE International Congress on Big Data 2013</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Typograph: Multiscale spatial exploration of text documents - Endert, Alex, et al 2013 IEEE International Congress on Big Data</td>
-      <td><a href="https://people.cs.vt.edu/aendert/Alex_Endert/Research_files/Typograph.pdf">paper</a></td>
-      <td>Use Cases</td>
-      <td>IEEE International Congress on Big Data 2013</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>UxV Data to the Cloud via Widgets - Charles et al 18th International Command &amp; Control Research &amp; Technology Symposium 2013</td>
-      <td><a href="http://www.dodccrp.org/events/18th_iccrts_2013/post_conference/papers/051.pdf">paper</a></td>
-      <td>Use Cases</td>
-      <td>Command &amp; Control Research &amp; Technology Symposium 2013</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Driving Big Data With Big Compute - Byun et al IEEE HPEC 2012</td>
-      <td><a href="http://www.mit.edu/~kepner/pubs/ByunKepner_2012_BigData_Paper.pdf">paper</a> <a href="http://ieee-hpec.org/2012/index_htm_files/42_ID18.pptx">slides</a></td>
-      <td>Architecture</td>
-      <td>IEEE HPEC 2012</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Large Scale Network Situational Awareness Via 3D Gaming Technology - Hubbell et al IEEE HPEC 2012</td>
-      <td><a href="http://ieee-hpec.org/2012/index_htm_files/HPEC12_Hubbell.pdf">paper</a> <a href="http://ieee-hpec.org/2012/index_htm_files/31_ID20.pptx">slides</a></td>
-      <td>Use Cases</td>
-      <td>IEEE HPEC 2012</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Rya: a scalable RDF triple store for the clouds - Punnoose et al 1st International Workshop on Cloud Intelligence, ACM, 2012</td>
-      <td><a href="https://sqrrl.com/media/Rya_CloudI20121.pdf">paper</a></td>
-      <td>Architecture</td>
-      <td>ACM International Workshop on Cloud Intelligence 2012</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Dynamic distributed dimensional data model (D4M) database and computation system - Kepner et al ICASSP 2012</td>
-      <td><a href="http://www.mit.edu/~kepner/pubs/Kepner_2012_D4M_Paper.pdf">paper</a> <a href="http://www.mit.edu/~kepner/pubs/Kepner_2012_D4M_Slides.pdf">slides</a></td>
-      <td>Architecture</td>
-      <td>ICASSP 2012</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>An NSA Big Graph experiment (Technical Report NSA-RD-2013-056002v1)</td>
-      <td><a href="http://www.pdl.cmu.edu/SDI/2013/slides/big_graph_nsa_rd_2013_56002v1.pdf">slides</a></td>
-      <td>Performance</td>
-      <td>Technical Report</td>
-      <td>No</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Patil, Swapnil, et al. \u201cYCSB++: benchmarking and performance debugging advanced features in scalable table stores.\u201d Proceedings of the 2nd ACM Symposium on Cloud Computing. ACM, 2011.</td>
-      <td><a href="http://www.pdl.cmu.edu/PDL-FTP/Storage/socc2011.pdf">paper</a> <a href="http://www.cercs.gatech.edu/opencirrus/OCsummit11/presentations/patil.pdf">slides</a></td>
-      <td>Performance</td>
-      <td>ACM Symposium on Cloud Computing 2011</td>
-      <td>Yes</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Turner, Keith \u201cApache Accumulo 1.4 &amp; 1.5 Features.\u201d February, 2012</td>
-      <td><a href="https://home.apache.org/~kturner/accumulo14_15.pdf">slides</a></td>
-      <td>Architecture</td>
-      <td>Meetup</td>
-      <td>No</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Fuchs, Adam \u201cAccumulo: Extensions to Google\u2019s Bigtable Design.\u201d March, 2012</td>
-      <td><a href="https://home.apache.org/~afuchs/slides/morgan_state_talk.pdf">slides</a></td>
-      <td>Architecture</td>
-      <td>Meetup</td>
-      <td>No</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>Miner, Donald \u201cAn Introduction to Apache Accumulo - how it works, why it exists, and how it is used.\u201d August, 2014</td>
-      <td><a href="https://www.slideshare.net/DonaldMiner/an-introduction-to-accumulo">slides</a></td>
-      <td>Architecture</td>
-      <td>Online</td>
-      <td>No</td>
-      <td>�</td>
-    </tr>
-  </tbody>
-</table>
-
-<script type="text/javascript">
-$(function() {
-$("#citationtable").dataTable();
-});
-</script>
-
-<h2 id="conferences-and-meetups">Conferences and Meetups</h2>
-<ul>
-  <li>Accumulo Summit:
-    <ul>
-      <li><a href="http://accumulosummit.com">Summit Website</a></li>
-      <li><a href="https://www.slideshare.net/AccumuloSummit">2014 Accumulo Summit Slides</a></li>
-    </ul>
-  </li>
-  <li>IEEE HPEC
-    <ul>
-      <li><a href="http://ieee-hpec.org/">Conference Website</a></li>
-    </ul>
-  </li>
-  <li>Strata + Hadoop World Meetup 24 Oct 2012
-    <ul>
-      <li><a href="https://aws.amazon.com/amis/accumulo-standalone-20121019">Accumulo standalone AMI</a></li>
-      <li><a href="https://www.slideshare.net/jasontrost/accumulo-at-endgame">Large-scale web analytics with Accumulo (and Nutch/Gora, Pig, and Storm)</a></li>
-      <li><a href="https://www.slideshare.net/hortonworks/compaction-and-splitting-in-apache-accumulo">Compaction and Splitting in Accumulo</a></li>
-    </ul>
-  </li>
-</ul>
-
-<h2 id="blog-posts-and-writeups">Blog Posts and Writeups</h2>
-<ul>
-  <li><a href="http://affy.blogspot.com/search?q=accumulo&amp;by-date=true">Codebits Blogs</a>
-    <ul>
-      <li><a href="http://affy.blogspot.com/2012/04/implement-word-count-in-accumulo.html">Implement Word Count in Accumulo</a></li>
-      <li><a href="http://affy.blogspot.com/2012/04/using-accumulo-to-calculate-seven-day.html">Using Accumulo To Calculate Seven Day Rolling Average</a></li>
-    </ul>
-  </li>
-  <li><a href="http://www.covert.io/">covert.io blogs</a>
-    <ul>
-      <li><a href="http://www.covert.io/post/18414889381/accumulo-nutch-and-gora">Accumulo, Nutch, and Gora</a></li>
-      <li><a href="http://www.covert.io/post/18605091231/accumulo-and-pig">Accumulo and Pig</a></li>
-    </ul>
-  </li>
-  <li><a href="https://www.mapr.com/blog/accumulo-on-mapr">Accumulo on MapR</a> <a href="http://blog.stavi.sh/instructions-for-running-accumulo-on-mapr-m5">More Accumulo on MapR</a></li>
-  <li><a href="https://gist.github.com/1535657">Accumulo on Ubuntu VirtualBox</a></li>
-  <li><a href="http://www.accumulodata.com/ec2.html">Accumulo on EC2</a></li>
-</ul>
-
-<h2 id="books">Books</h2>
-<ul>
-  <li><a href="https://www.packtpub.com/apache-accumulo-for-developers/book">Apache Accumulo for Developers (Packt Publishing)</a></li>
-  <li><a href="https://shop.oreilly.com/product/0636920032304.do">Accumulo: Application Development, Table Design, and Best Practices (O\u2019Reilly Media)</a></li>
-</ul>
-
-<h2 id="meetup-groups">Meetup Groups</h2>
-<ul>
-  <li><a href="https://www.meetup.com/Accumulo-Users-DC/">Accumulo Users Group - DC VA MD</a></li>
-  <li><a href="https://www.meetup.com/find/?keywords=accumulo">Search for more</a></li>
-</ul>
-
-<h2 id="reference">Reference</h2>
-<ul>
-  <li><a href="https://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.44.2782&amp;rep=rep1&amp;type=pdf">Log-Structured Merge Tree</a></li>
-  <li><a href="https://research.google.com/archive/bigtable.html">BigTable</a></li>
-  <li><a href="https://research.google.com/archive/gfs.html">GFS</a></li>
-  <li><a href="https://research.google.com/archive/chubby.html">Chubby</a></li>
-  <li><a href="https://research.google.com/pubs/pub36356.html">Dapper</a></li>
-  <li><a href="https://en.wikipedia.org/wiki/Bloom_filter">Bloom Filter</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/people.html
----------------------------------------------------------------------
diff --git a/people.html b/people.html
deleted file mode 100644
index aa0fac4..0000000
--- a/people.html
+++ /dev/null
@@ -1,851 +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>People</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">
-          
-          <h2 id="pmc-and-committers">PMC and Committers</h2>
-
-<table class="table table-striped">
-  <thead>
-    <tr>
-      <th>username</th>
-      <th>name</th>
-      <th>organization</th>
-      <th>timezone</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>acordova</td>
-      <td>Aaron Cordova</td>
-      <td><a href="http://www.koverse.com">Koverse</a></td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>afuchs</td>
-      <td>Adam Fuchs</td>
-      <td><a href="http://sqrrl.com">sqrrl</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>bhavanki</td>
-      <td>Bill Havanki</td>
-      <td><a href="http://www.cloudera.com">Cloudera</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>billie</td>
-      <td>Billie Rinaldi</td>
-      <td><a href="http://hortonworks.com">Hortonworks</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>bimargulies</td>
-      <td>Benson Margulies</td>
-      <td><a href="http://www.basistech.com">Basis Technology Corp.</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>brianloss</td>
-      <td>Brian Loss</td>
-      <td><a href="http://www.praxiseng.com">Praxis Engineering</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>busbey</td>
-      <td>Sean Busbey</td>
-      <td><a href="http://www.cloudera.com">Cloudera</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/ct">CT</a></td>
-    </tr>
-    <tr>
-      <td>cawaring</td>
-      <td>Chris Waring</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>cjnolet</td>
-      <td>Corey J. Nolet</td>
-      <td><a href="http://www.tetraconcepts.com">Tetra Concepts LLC</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>ctubbsii</td>
-      <td>Christopher Tubbs</td>
-      <td><a href="http://www.nsa.gov">NSA</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>dhutchis</td>
-      <td>Dylan Hutchison</td>
-      <td><a href="http://www.uw.edu">University of Washington</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
-    </tr>
-    <tr>
-      <td>dlmarion</td>
-      <td>Dave Marion</td>
-      <td><a href="http://www.objectivesolutions.com">Objective Solutions, Inc.</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>drew</td>
-      <td>Drew Farris</td>
-      <td><a href="http://www.boozallen.com">Booz Allen Hamilton</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>ecn</td>
-      <td>Eric Newton</td>
-      <td><a href="http://swcomplete.com">SW Complete Inc.</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>elserj</td>
-      <td>Josh Elser</td>
-      <td><a href="http://hortonworks.com">Hortonworks</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>etcoleman</td>
-      <td>Ed Coleman</td>
-      <td>�</td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>jtrost</td>
-      <td>Jason Trost</td>
-      <td><a href="http://www.endgame.com">Endgame</a></td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>kturner</td>
-      <td>Keith Turner</td>
-      <td><a href="http://www.ptech-llc.com">Peterson Technologies</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>mdrob</td>
-      <td>Mike Drob</td>
-      <td><a href="http://www.cloudera.com">Cloudera</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>medined</td>
-      <td>David Medinets</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>mjwall</td>
-      <td>Michael Wall</td>
-      <td><a href="http://www.objectivesolutions.com">Objective Solutions, Inc.</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>mmiller</td>
-      <td>Michael Miller</td>
-      <td><a href="http://www.centroid-llc.com/">Centroid, LLC</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>mwalch</td>
-      <td>Mike Walch</td>
-      <td><a href="http://www.ptech-llc.com">Peterson Technologies</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>phrocker</td>
-      <td>Marc Parisi</td>
-      <td><a href="http://www.wavestrike.com/">WaveStrike LLC</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>rweeks</td>
-      <td>Russ Weeks</td>
-      <td><a href="http://www.phemi.com">PHEMI</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
-    </tr>
-    <tr>
-      <td>shickey</td>
-      <td>Sean Hickey</td>
-      <td>�</td>
-      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
-    </tr>
-    <tr>
-      <td>ujustgotbilld</td>
-      <td>William Slacum</td>
-      <td><a href="http://minerkasch.com">Miner &amp; Kasch</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>vikrams</td>
-      <td>Vikram Srivastava</td>
-      <td><a href="http://www.cloudera.com">Cloudera</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
-    </tr>
-    <tr>
-      <td>vines</td>
-      <td>John Vines</td>
-      <td><a href="http://sqrrl.com">sqrrl</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-  </tbody>
-</table>
-
-<h2 id="contributors">Contributors</h2>
-
-<table class="table table-striped">
-  <thead>
-    <tr>
-      <th>username</th>
-      <th>name</th>
-      <th>organization</th>
-      <th>timezone</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>�</td>
-      <td>Aaron Glahe</td>
-      <td><a href="http://www.data-tactics.com">Data Tactics</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Adam J Shook</td>
-      <td><a href="https://datacatessen.com/">Datacatessen</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Al Krinker</td>
-      <td>�</td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Alex Moundalexis</td>
-      <td><a href="http://www.cloudera.com">Cloudera</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Andrew George Wells</td>
-      <td><a href="http://clearedgeit.com">ClearEdgeIT</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Arshak Navruzyan</td>
-      <td><a href="http://www.argyledata.com">Argyle Data</a></td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Ben Manes</td>
-      <td>�</td>
-      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Bob Thorman</td>
-      <td><a href="http://www.att.com">AT&amp;T</a></td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Chris Bennight</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Chris McCubbin</td>
-      <td><a href="http://sqrrl.com">sqrrl</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Christian Rohling</td>
-      <td><a href="http://www.endgame.com">Endgame</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Damon Brown</td>
-      <td><a href="http://www.tetraconcepts.com">Tetra Concepts LLC</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Dave Wang</td>
-      <td><a href="http://www.cloudera.com">Cloudera</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>David M. Lyle</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>David Protzman</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Dennis Patrone</td>
-      <td><a href="http://www.jhuapl.edu">The Johns Hopkins University Applied Physics Laboratory</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>dimaspivak</td>
-      <td>Dima Spivak</td>
-      <td><a href="http://www.cloudera.com">Cloudera</a></td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Ed Kohlwey</td>
-      <td><a href="http://www.boozallen.com">Booz Allen Hamilton</a></td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>edwardyoon</td>
-      <td>Edward Yoon</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Eugene Cheipesh</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Gary Singh</td>
-      <td><a href="http://www.sabre-eng.com">Sabre Engineering</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Hayden Marchant</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Hung Pham</td>
-      <td><a href="http://www.cloudera.com">Cloudera</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Ivan Bella</td>
-      <td><a href="http://www.objectivesolutions.com">Objective Solutions, Inc.</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Jacob Meisler</td>
-      <td><a href="http://www.boozallen.com">Booz Allen Hamilton</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>James Fiori</td>
-      <td><a href="http://flywheeldata.com">Flywheel Data</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>jaredwinick</td>
-      <td>Jared Winick</td>
-      <td><a href="http://www.koverse.com">Koverse</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/mt">MT</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Jason Then</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Jay Shipper</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>jfield</td>
-      <td>Jeff Field</td>
-      <td><a href="http://www.cloudera.com">Cloudera</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Jeffrey S. Schwartz</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Jenna Huston</td>
-      <td>�</td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Jerry He</td>
-      <td><a href="http://www.ibm.com">IBM</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Jesse Yates</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Jessica Seastrom</td>
-      <td><a href="http://www.cloudera.com">Cloudera</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Jim Klucar</td>
-      <td><a href="http://www.splyt.com">Splyt</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Joe Skora</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>John McNamee</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>John Stoneham</td>
-      <td>�</td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>jmhsieh</td>
-      <td>Jonathan M. Hsieh</td>
-      <td><a href="http://www.cloudera.com">Cloudera</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Jonathan Park</td>
-      <td><a href="http://sqrrl.com">sqrrl</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Kevin Faro</td>
-      <td><a href="http://www.tetraconcepts.com">Tetra Concepts LLC</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Laura Peaslee</td>
-      <td><a href="http://www.objectivesolutions.com">Objective Solutions, Inc.</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Luis Tavarez</td>
-      <td>�</td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Luke Brassard</td>
-      <td><a href="http://sqrrl.com">sqrrl</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Mario Pastorelli</td>
-      <td><a href="http://www.teralytics.net/">Teralytics AG</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/cest">CEST</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Matt Dailey</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Matthew Kirkley</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Max Jordan</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Michael Allen</td>
-      <td><a href="http://sqrrl.com">sqrrl</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Michael Berman</td>
-      <td><a href="http://sqrrl.com">sqrrl</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Miguel Pereira</td>
-      <td><a href="http://sra.com">SRA International, Inc</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Mike Fagan</td>
-      <td><a href="http://www.arcus-research.com">Arcus Research</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/mt">MT</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Morgan Haskel</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Nguessan Kouame</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Oren Falkowitz</td>
-      <td><a href="http://sqrrl.com">sqrrl</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Phil Eberhardt</td>
-      <td><a href="http://sqrrl.com">sqrrl</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Philip Young</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Pushpinder Heer</td>
-      <td><a href="http://www.atsid.com">Applied Technical Systems</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Ravi Mutyala</td>
-      <td><a href="http://hortonworks.com">Hortonworks</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/ct">CT</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Ryan Fishel</td>
-      <td><a href="http://www.cloudera.com">Cloudera</a></td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Ryan Leary</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Sapah Shah</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Scott Kuehn</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Shawn Walker</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>stevel</td>
-      <td>Steve Loughran</td>
-      <td><a href="http://hortonworks.com">Hortonworks</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/gmt">GMT</a>/<a href="http://www.timeanddate.com/time/zones/bst">BST</a></td>
-    </tr>
-    <tr>
-      <td>supun</td>
-      <td>Supun Kamburugamuva</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Takahiko Saito</td>
-      <td><a href="http://hortonworks.com">Hortonworks</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Ted Malaska</td>
-      <td><a href="http://www.cloudera.com">Cloudera</a></td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>tedyu</td>
-      <td>Ted Yu</td>
-      <td><a href="http://hortonworks.com">Hortonworks</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Tim Halloran</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Tim Reardon</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Travis Pinney</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Trent Nadeau</td>
-      <td><a href="http://www.anthemengineering.com">Anthem Engineering LLC</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Tristen Georgiou</td>
-      <td><a href="http://www.phemi.com">PHEMI</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Vicky Kak</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Vincent Russell</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Volth</td>
-      <td>�</td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td>�</td>
-      <td>Wil Selwood</td>
-      <td><a href="https://sa.catapult.org.uk">Satellite Applications Catapult</a></td>
-      <td><a href="http://www.timeanddate.com/time/zones/gmt">GMT</a>/<a href="http://www.timeanddate.com/time/zones/bst">BST</a></td>
-    </tr>
-  </tbody>
-</table>
-
-<h2 id="organizations">Organizations</h2>
-
-<p>First off, thanks to our parent organization, the <a href="https://www.apache.org">Apache Software Foundation</a> and <a href="https://www.apache.org/foundation/sponsorship">all who sponsor</a> them.</p>
-
-<p>Additionally, we would like to thank the following organizations for resources that they provide:</p>
-
-<ul>
-  <li>ej-technologies for allowing us to use their <a href="https://www.ej-technologies.com/products/jprofiler/overview.html">Java profiler</a></li>
-  <li>YourKit for allowing us use of their <a href="https://www.yourkit.com/java/profiler/features/">Java Profiler</a></li>
-  <li>Coverity for running <a href="https://scan.coverity.com/projects/accumulo">static analysis</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>


[09/11] accumulo-website git commit: Jekyll build from master:a71056c

Posted by mw...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/client.html
----------------------------------------------------------------------
diff --git a/1.8/examples/client.html b/1.8/examples/client.html
index 113488a..2dfd284 100644
--- a/1.8/examples/client.html
+++ b/1.8/examples/client.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/combiner.html
----------------------------------------------------------------------
diff --git a/1.8/examples/combiner.html b/1.8/examples/combiner.html
index 7c8b63c..72b2860 100644
--- a/1.8/examples/combiner.html
+++ b/1.8/examples/combiner.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/constraints.html
----------------------------------------------------------------------
diff --git a/1.8/examples/constraints.html b/1.8/examples/constraints.html
index ae70951..95943d0 100644
--- a/1.8/examples/constraints.html
+++ b/1.8/examples/constraints.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/dirlist.html
----------------------------------------------------------------------
diff --git a/1.8/examples/dirlist.html b/1.8/examples/dirlist.html
index 18e171b..86ea32c 100644
--- a/1.8/examples/dirlist.html
+++ b/1.8/examples/dirlist.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/export.html
----------------------------------------------------------------------
diff --git a/1.8/examples/export.html b/1.8/examples/export.html
index ba6efca..ad2c738 100644
--- a/1.8/examples/export.html
+++ b/1.8/examples/export.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/filedata.html
----------------------------------------------------------------------
diff --git a/1.8/examples/filedata.html b/1.8/examples/filedata.html
index 0f68f85..ec35c93 100644
--- a/1.8/examples/filedata.html
+++ b/1.8/examples/filedata.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/filter.html
----------------------------------------------------------------------
diff --git a/1.8/examples/filter.html b/1.8/examples/filter.html
index dabf913..19b76f6 100644
--- a/1.8/examples/filter.html
+++ b/1.8/examples/filter.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/helloworld.html
----------------------------------------------------------------------
diff --git a/1.8/examples/helloworld.html b/1.8/examples/helloworld.html
index 8ece6d2..7bc373a 100644
--- a/1.8/examples/helloworld.html
+++ b/1.8/examples/helloworld.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/index.html
----------------------------------------------------------------------
diff --git a/1.8/examples/index.html b/1.8/examples/index.html
index 801cdd1..c6cfb44 100644
--- a/1.8/examples/index.html
+++ b/1.8/examples/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/isolation.html
----------------------------------------------------------------------
diff --git a/1.8/examples/isolation.html b/1.8/examples/isolation.html
index 09b86f4..bb85ce6 100644
--- a/1.8/examples/isolation.html
+++ b/1.8/examples/isolation.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/mapred.html
----------------------------------------------------------------------
diff --git a/1.8/examples/mapred.html b/1.8/examples/mapred.html
index a20f169..5a6e694 100644
--- a/1.8/examples/mapred.html
+++ b/1.8/examples/mapred.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/maxmutation.html
----------------------------------------------------------------------
diff --git a/1.8/examples/maxmutation.html b/1.8/examples/maxmutation.html
index 11aee83..0867134 100644
--- a/1.8/examples/maxmutation.html
+++ b/1.8/examples/maxmutation.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/regex.html
----------------------------------------------------------------------
diff --git a/1.8/examples/regex.html b/1.8/examples/regex.html
index c8248fa..a34112d 100644
--- a/1.8/examples/regex.html
+++ b/1.8/examples/regex.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/reservations.html
----------------------------------------------------------------------
diff --git a/1.8/examples/reservations.html b/1.8/examples/reservations.html
index b3d7610..9bd36d3 100644
--- a/1.8/examples/reservations.html
+++ b/1.8/examples/reservations.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/rgbalancer.html
----------------------------------------------------------------------
diff --git a/1.8/examples/rgbalancer.html b/1.8/examples/rgbalancer.html
index 18ae401..87a6060 100644
--- a/1.8/examples/rgbalancer.html
+++ b/1.8/examples/rgbalancer.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/rowhash.html
----------------------------------------------------------------------
diff --git a/1.8/examples/rowhash.html b/1.8/examples/rowhash.html
index 3a0b557..307795b 100644
--- a/1.8/examples/rowhash.html
+++ b/1.8/examples/rowhash.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/sample.html
----------------------------------------------------------------------
diff --git a/1.8/examples/sample.html b/1.8/examples/sample.html
index fad6d43..fe6da7e 100644
--- a/1.8/examples/sample.html
+++ b/1.8/examples/sample.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/shard.html
----------------------------------------------------------------------
diff --git a/1.8/examples/shard.html b/1.8/examples/shard.html
index e20f850..9fb58fb 100644
--- a/1.8/examples/shard.html
+++ b/1.8/examples/shard.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/tabletofile.html
----------------------------------------------------------------------
diff --git a/1.8/examples/tabletofile.html b/1.8/examples/tabletofile.html
index 9eef61c..6b8691a 100644
--- a/1.8/examples/tabletofile.html
+++ b/1.8/examples/tabletofile.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/terasort.html
----------------------------------------------------------------------
diff --git a/1.8/examples/terasort.html b/1.8/examples/terasort.html
index be05e39..5271f95 100644
--- a/1.8/examples/terasort.html
+++ b/1.8/examples/terasort.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/visibility.html
----------------------------------------------------------------------
diff --git a/1.8/examples/visibility.html b/1.8/examples/visibility.html
index 22072d0..d63848b 100644
--- a/1.8/examples/visibility.html
+++ b/1.8/examples/visibility.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/blog/2014/05/03/accumulo-classloader.html
----------------------------------------------------------------------
diff --git a/blog/2014/05/03/accumulo-classloader.html b/blog/2014/05/03/accumulo-classloader.html
index 483dd3d..2ff8526 100644
--- a/blog/2014/05/03/accumulo-classloader.html
+++ b/blog/2014/05/03/accumulo-classloader.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/blog/2014/05/27/getting-started-with-accumulo-1.6.0.html
----------------------------------------------------------------------
diff --git a/blog/2014/05/27/getting-started-with-accumulo-1.6.0.html b/blog/2014/05/27/getting-started-with-accumulo-1.6.0.html
index c15c3ff..5657fb0 100644
--- a/blog/2014/05/27/getting-started-with-accumulo-1.6.0.html
+++ b/blog/2014/05/27/getting-started-with-accumulo-1.6.0.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/blog/2014/06/25/scaling-accumulo-with-multivolume-support.html
----------------------------------------------------------------------
diff --git a/blog/2014/06/25/scaling-accumulo-with-multivolume-support.html b/blog/2014/06/25/scaling-accumulo-with-multivolume-support.html
index cabbc36..9bc8dd8 100644
--- a/blog/2014/06/25/scaling-accumulo-with-multivolume-support.html
+++ b/blog/2014/06/25/scaling-accumulo-with-multivolume-support.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/blog/2014/07/09/functional-reads-over-accumulo.html
----------------------------------------------------------------------
diff --git a/blog/2014/07/09/functional-reads-over-accumulo.html b/blog/2014/07/09/functional-reads-over-accumulo.html
index 3d0cee3..09045e0 100644
--- a/blog/2014/07/09/functional-reads-over-accumulo.html
+++ b/blog/2014/07/09/functional-reads-over-accumulo.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/blog/2014/09/02/generating-keystores-for-configuring-accumulo-with-ssl.html
----------------------------------------------------------------------
diff --git a/blog/2014/09/02/generating-keystores-for-configuring-accumulo-with-ssl.html b/blog/2014/09/02/generating-keystores-for-configuring-accumulo-with-ssl.html
index 48eb5b7..e81e84e 100644
--- a/blog/2014/09/02/generating-keystores-for-configuring-accumulo-with-ssl.html
+++ b/blog/2014/09/02/generating-keystores-for-configuring-accumulo-with-ssl.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/blog/2015/03/20/balancing-groups-of-tablets.html
----------------------------------------------------------------------
diff --git a/blog/2015/03/20/balancing-groups-of-tablets.html b/blog/2015/03/20/balancing-groups-of-tablets.html
index 0f2043e..e87010b 100644
--- a/blog/2015/03/20/balancing-groups-of-tablets.html
+++ b/blog/2015/03/20/balancing-groups-of-tablets.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/blog/2015/04/06/replicating-data-across-accumulo-clusters.html
----------------------------------------------------------------------
diff --git a/blog/2015/04/06/replicating-data-across-accumulo-clusters.html b/blog/2015/04/06/replicating-data-across-accumulo-clusters.html
index 8d05823..ef046c8 100644
--- a/blog/2015/04/06/replicating-data-across-accumulo-clusters.html
+++ b/blog/2015/04/06/replicating-data-across-accumulo-clusters.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/blog/2016/11/02/durability-performance.html
----------------------------------------------------------------------
diff --git a/blog/2016/11/02/durability-performance.html b/blog/2016/11/02/durability-performance.html
index d0fc0da..055ef58 100644
--- a/blog/2016/11/02/durability-performance.html
+++ b/blog/2016/11/02/durability-performance.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/blog/2016/11/16/simpler-scripts-and-config.html
----------------------------------------------------------------------
diff --git a/blog/2016/11/16/simpler-scripts-and-config.html b/blog/2016/11/16/simpler-scripts-and-config.html
index babe0ce..7bdf318 100644
--- a/blog/2016/11/16/simpler-scripts-and-config.html
+++ b/blog/2016/11/16/simpler-scripts-and-config.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/blog/index.html
----------------------------------------------------------------------
diff --git a/blog/index.html b/blog/index.html
index d1704dd..9baae18 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -2,9 +2,9 @@
 <html lang="en-US">
 <meta charset="utf-8">
 <title>Redirecting\u2026</title>
-<link rel="canonical" href="https://accumulo.apache.org/news.html">
-<meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/news.html">
+<link rel="canonical" href="https://accumulo.apache.org/news/">
+<meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/news/">
 <h1>Redirecting\u2026</h1>
-<a href="https://accumulo.apache.org/news.html">Click here if you are not redirected.</a>
-<script>location="https://accumulo.apache.org/news.html"</script>
+<a href="https://accumulo.apache.org/news/">Click here if you are not redirected.</a>
+<script>location="https://accumulo.apache.org/news/"</script>
 </html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/bylaws.html
----------------------------------------------------------------------
diff --git a/bylaws.html b/bylaws.html
index cdca6fa..801320d 100644
--- a/bylaws.html
+++ b/bylaws.html
@@ -2,9 +2,9 @@
 <html lang="en-US">
 <meta charset="utf-8">
 <title>Redirecting\u2026</title>
-<link rel="canonical" href="https://accumulo.apache.org/governance/bylaws.html">
-<meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/governance/bylaws.html">
+<link rel="canonical" href="https://accumulo.apache.org/contributor/bylaws.html">
+<meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/contributor/bylaws.html">
 <h1>Redirecting\u2026</h1>
-<a href="https://accumulo.apache.org/governance/bylaws.html">Click here if you are not redirected.</a>
-<script>location="https://accumulo.apache.org/governance/bylaws.html"</script>
+<a href="https://accumulo.apache.org/contributor/bylaws.html">Click here if you are not redirected.</a>
+<script>location="https://accumulo.apache.org/contributor/bylaws.html"</script>
 </html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/contributor/bylaws.html
----------------------------------------------------------------------
diff --git a/contributor/bylaws.html b/contributor/bylaws.html
new file mode 100644
index 0000000..553d2a6
--- /dev/null
+++ b/contributor/bylaws.html
@@ -0,0 +1,437 @@
+<!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>Bylaws</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">Bylaws</h1>
+          
+          <p>This is version 3 of the bylaws. Community work actively continues on the bylaws, and so key segments of them are subject to change.</p>
+
+<h1 id="introduction">Introduction</h1>
+
+<p>This document defines the bylaws under which the Apache Accumulo project operates. It defines the roles and responsibilities of the project, who may vote, how voting works, how conflicts are resolved, etc.</p>
+
+<p>Accumulo is a project of the <a href="https://www.apache.org/foundation">Apache Software Foundation</a>. The foundation holds the copyright on Apache code including the code in the Accumulo codebase. The <a href="https://www.apache.org/foundation/faq">foundation FAQ</a> explains the operation and background of the foundation.</p>
+
+<p>Accumulo is typical of Apache projects in that it operates under a set of principles, known collectively as the Apache Way. If you are new to Apache development, please refer to the <a href="https://incubator.apache.org">Incubator project</a> for more information on how Apache projects operate. Terms used at the ASF are defined in the <a href="https://www.apache.org/foundation/glossary">ASF glossary</a>.</p>
+
+<h1 id="roles-and-responsibilities">Roles and Responsibilities</h1>
+
+<p>Apache projects define a set of roles with associated rights and responsibilities. These roles govern what tasks an individual may perform within the project. The roles are defined in the following sections.</p>
+
+<h2 id="users">Users</h2>
+
+<p>The most important participants in the project are people who use our software. The majority of our contributors start out as users and guide their development efforts from the user\u2019s perspective.</p>
+
+<p>Users contribute to the Apache projects by providing feedback to contributors in the form of bug reports and feature suggestions. As well, users participate in the Apache community by helping other users on mailing lists and user support forums.</p>
+
+<h2 id="contributors">Contributors</h2>
+
+<p>All of the volunteers who are contributing time, code, documentation, or resources to the Accumulo project are considered contributors. A contributor that makes sustained, welcome contributions to the project may be invited to become a committer, though the exact timing of such invitations depends on many factors.</p>
+
+<h2 id="committers">Committers</h2>
+
+<p>The project\u2019s committers are responsible for the project\u2019s technical management. Committers have write access to the project\u2019s code repositories and may cast binding votes on any technical discussion regarding Accumulo. Committer access is by invitation only and must be approved by consensus approval of the active PMC members. Upon acceptance of the invitation to become a committer, it is the accepting member\u2019s responsibility to update their status on the Accumulo web page accordingly.</p>
+
+<p>A committer is considered emeritus, meaning inactive, by their own declaration or by not reviewing patches or committing patches to the project for over six months. Emeritus members will be recognized by the PMC on the Accumulo web page, in honor of their past contributions. Emeritus members retain all voting and commit rights associated with their former designation and can move themselves out of emeritus status by sending an announcement of their return to the developer mailing list. It will be the returning member\u2019s responsibility to update their status on the web page accordingly.</p>
+
+<p>An emeritus committer\u2019s commit access may be disabled as part of routine security. Access shall not be removed without notifying the committer, and access shall be maintained if the committer wishes to leave it active. A committer\u2019s commit access shall be reactivated upon the committer\u2019s request to the PMC.</p>
+
+<p>All Apache committers are required to have a signed <a href="https://www.apache.org/licenses/icla.txt">Contributor License Agreement</a> (CLA) on file with the Apache Software Foundation. Under the terms of the CLA that all committers must sign, a committer\u2019s primary responsibility is to ensure that all code committed to Apache Accumulo is licensed appropriately and meets those criteria set forth in the CLA (including both original works and patches committed on behalf of other contributors). There is a <a href="https://www.apache.org/dev/committers">Committer FAQ</a> which provides more details on the requirements for committers.</p>
+
+<p>It is the custom of the Accumulo project to also invite each committer to become a member of the Accumulo PMC.</p>
+
+<h2 id="project-management-committee">Project Management Committee</h2>
+
+<p>The role of the PMC, from a Foundation perspective, is <a href="https://www.apache.org/foundation/how-it-works.html#pmc">oversight</a>. The main
+role of the PMC is not code and not coding, but to ensure that all legal
+issues are addressed, that procedure is followed, and that each and every
+release is the product of the community as a whole. That is key to our
+litigation protection mechanisms.</p>
+
+<p>Secondly, the role of the PMC is to further the long-term development and
+health of the community as a whole, and to ensure that balanced and wide
+scale peer review and collaboration does happen. Within the ASF, we worry
+about any community which centers around a few individuals who are working
+virtually uncontested. We believe that this is detrimental to quality,
+stability, and robustness of both code and long term social structures.</p>
+
+<p>The responsibilities of the PMC include:</p>
+
+<ul>
+  <li>Deciding what is distributed as products of the Apache Accumulo project.</li>
+  <li>Maintaining the project\u2019s shared resources, including the code repository, mailing lists, and websites.</li>
+  <li>Protecting and ensuring proper use of Apache trademarks by the project and by other parties.</li>
+  <li>Speaking on behalf of the project.</li>
+  <li>Nominating new PMC members and committers.</li>
+  <li>Maintaining these bylaws and other guidelines of the project.</li>
+</ul>
+
+<p>In particular, PMC members must understand both our project\u2019s criteria and ASF criteria for voting on a <a href="https://www.apache.org/dev/release#management">release</a>.
+See the <a href="https://www.apache.org/dev/pmc">PMC Guide</a> for more information on PMC responsibilities.</p>
+
+<p>Membership of the PMC is by invitation only and must be approved by a consensus approval of active PMC members. Upon acceptance of the invitation to become a PMC member, it is the accepting member\u2019s responsibility to update their status on the Accumulo web page accordingly.</p>
+
+<p>A PMC member is considered emeritus, meaning inactive, by their own declaration or by not contributing in any form to the project for over six months. Emeritus members will be recognized by the PMC on the Accumulo web page, in honor of their past contributions. Emeritus members retain all voting and commit rights associated with their former designation and can move themselves out of emeritus status by sending an announcement of their return to the developer mailing list. It will be the returning member\u2019s responsibility to update their status on the web page accordingly.</p>
+
+<p>The chair of the PMC is appointed by the ASF board. The chair is an office holder of the Apache Software Foundation (Vice President, Apache Accumulo) and has primary responsibility to the board for the management of the projects within the scope of the Accumulo PMC. The chair reports to the board quarterly on developments within the Accumulo project.</p>
+
+<p>When the current chair of the PMC resigns, the PMC votes to recommend a new chair using consensus approval, but the decision must be ratified by the Apache board.</p>
+
+<h2 id="release-manager">Release Manager</h2>
+
+<p>The <a href="https://www.apache.org/dev/release-publishing">ASF release process</a> defines the <a href="https://www.apache.org/dev/release-publishing#release_manager">release manager</a> as an individual responsible for shepherding a new project release. Any committer may serve as a release manager. The release manager for a release is chosen as part of the release plan.</p>
+
+<p>At a minimum, a release manager is responsible for packaging a release candidate for a vote and signing and publishing an approved release candidate. An Accumulo release manager is also expected to:</p>
+
+<ul>
+  <li>guide whether changes after feature freeze or code freeze should be included in the release</li>
+  <li>ensure that required release testing is being conducted</li>
+  <li>track whether the release is on target for its expected release date</li>
+  <li>adjust release plan dates to reflect the latest estimates</li>
+  <li>determine if a re-plan may be needed and, if so, call a vote</li>
+  <li>call votes on release candidates</li>
+</ul>
+
+<p>Details on <a href="/contributor/making-release">making</a> and <a href="/contributor/verifying-release">verifying</a> a release are available on the Accumulo website.</p>
+
+<h1 id="decision-making">Decision Making</h1>
+
+<p>Within the Accumulo project, different types of decisions require different forms of approval. For example, the previous section describes several decisions which require \u2018consensus approval\u2019. This section defines how voting is performed, the types of approvals, and which types of decision require which type of approval.</p>
+
+<h2 id="voting">Voting</h2>
+
+<p>Decisions regarding the project are made by votes on the primary project development mailing list: dev@accumulo.apache.org. Where necessary, PMC voting may take place on the private Accumulo PMC mailing list: private@accumulo.apache.org. Votes are clearly indicated by a subject line starting with [VOTE]. A vote message may only pertain to a single item\u2019s approval; multiple items should be separated into multiple messages. Voting is carried out by replying to the vote mail. A vote may take on one of four forms, defined below.</p>
+
+<table class="table">
+  <thead>
+    <tr>
+      <th>Vote</th>
+      <th>Meaning</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>+1</td>
+      <td><em>Yes</em>, <em>Agree</em>, or <em>The action should be performed</em>. In general, this vote also indicates a willingness on the behalf of the voter to <em>make it happen</em>.</td>
+    </tr>
+    <tr>
+      <td>+0</td>
+      <td>This vote indicates a willingness for the action under consideration to go ahead. The voter, however, will not be able to help.</td>
+    </tr>
+    <tr>
+      <td>-0</td>
+      <td>This vote indicates that the voter does not, in general, agree with the proposed action but is not concerned enough to prevent the action going ahead.</td>
+    </tr>
+    <tr>
+      <td>-1</td>
+      <td><em>No</em>, <em>Disagree</em>, or <em>The action should not be performed</em>. On issues where consensus is required, this vote counts as a veto. All vetoes must contain an explanation of why the veto is appropriate. Vetoes with no explanation are void. It may also be appropriate for a -1 vote to include an alternative course of action.</td>
+    </tr>
+  </tbody>
+</table>
+
+<p>All participants in the Accumulo project are encouraged to vote. For technical decisions, only the votes of active committers are binding. Non-binding votes are still useful for those with binding votes to understand the perception of an action across the wider Accumulo community. For PMC decisions, only the votes of active PMC members are binding.</p>
+
+<p>See the <a href="/contributor/voting">voting page</a> for more details on the mechanics of voting.</p>
+
+<h2 id="commit-then-review-ctr">Commit Then Review (CTR)</h2>
+
+<p>Voting can also be applied to changes to the Accumulo codebase. Under the Commit Then Review policy, committers can make changes to the codebase without seeking approval beforehand, and the changes are assumed to be approved unless an objection is raised. Only if an objection is raised must a vote take place on the code change.</p>
+
+<p>For some code changes, committers may wish to get feedback from the community before making the change. It is acceptable for a committer to seek approval before making a change if they so desire.</p>
+
+<h2 id="approvals">Approvals</h2>
+
+<p>These are the types of approvals that can be sought. Different actions require different types of approvals.</p>
+
+<table class="table">
+  <thead>
+    <tr>
+      <th>Approval�Type</th>
+      <th>Definition</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Consensus Approval</td>
+      <td>A consensus approval vote passes with 3 binding +1 votes and no binding vetoes.</td>
+    </tr>
+    <tr>
+      <td>Majority Approval</td>
+      <td>A majority approval vote passes with 3 binding +1 votes and more binding +1 votes than -1 votes.</td>
+    </tr>
+    <tr>
+      <td>Lazy Approval (or Lazy Consensus)</td>
+      <td>An action with lazy approval is implicitly allowed unless a -1 vote is received, at which time, depending on the type of action, either majority approval or consensus approval must be obtained.  Lazy Approval can be either <em>stated</em> or <em>assumed</em>, as detailed on the <a href="/contributor/lazyConsensus">lazy consensus page</a>.</td>
+    </tr>
+  </tbody>
+</table>
+
+<h2 id="vetoes">Vetoes</h2>
+
+<p>A valid, binding veto cannot be overruled. If a veto is cast, it must be accompanied by a valid reason explaining the veto. The validity of a veto, if challenged, can be confirmed by anyone who has a binding vote. This does not necessarily signify agreement with the veto, but merely that the veto is valid.</p>
+
+<p>If you disagree with a valid veto, you must lobby the person casting the veto to withdraw their veto. If a veto is not withdrawn, the action that has been vetoed must be reversed in a timely manner.</p>
+
+<h2 id="actions">Actions</h2>
+
+<p>This section describes the various actions which are undertaken within the project, the corresponding approval required for that action and those who have binding votes over the action. It also specifies the minimum length of time that a vote must remain open, measured in days. In general, votes should not be called at times when it is known that interested members of the project will be unavailable.</p>
+
+<p>For Code Change actions, a committer may choose to employ assumed or stated Lazy Approval under the <a href="#commit-then-review-ctr">CTR</a> policy. Assumed Lazy Approval has no minimum length of time before the change can be made.</p>
+
+<table class="table">
+  <thead>
+    <tr>
+      <th>Action</th>
+      <th>Description</th>
+      <th>Approval</th>
+      <th>Binding Votes</th>
+      <th>Min. Length (days)</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Code Change</td>
+      <td>A change made to a codebase of the project. This includes source code, documentation, website content, etc.</td>
+      <td>Lazy approval, moving to consensus approval upon veto</td>
+      <td>Active committers</td>
+      <td>1</td>
+    </tr>
+    <tr>
+      <td>Release Plan</td>
+      <td>Defines the timetable and actions for an upcoming release. The plan also nominates a Release Manager.</td>
+      <td>Lazy approval, moving to majority approval upon veto</td>
+      <td>Active committers</td>
+      <td>3</td>
+    </tr>
+    <tr>
+      <td>Release Plan Cancellation</td>
+      <td>Cancels an active release plan, due to a need to re-plan (e.g., discovery of a major issue).</td>
+      <td>Majority approval</td>
+      <td>Active committers</td>
+      <td>3</td>
+    </tr>
+    <tr>
+      <td>Product Release</td>
+      <td>Accepts or rejects a release candidate as an official release of the project.</td>
+      <td>Majority approval</td>
+      <td>Active PMC members</td>
+      <td>3</td>
+    </tr>
+    <tr>
+      <td>Adoption of New Codebase</td>
+      <td>When the codebase for an existing, released product is to be replaced with an alternative codebase. If such a vote fails to gain approval, the existing code base will continue. This also covers the creation of new sub-projects within the project.</td>
+      <td>Consensus approval</td>
+      <td>Active PMC members</td>
+      <td>7</td>
+    </tr>
+    <tr>
+      <td>New Committer</td>
+      <td>When a new committer is proposed for the project.</td>
+      <td>Consensus approval</td>
+      <td>Active PMC members</td>
+      <td>3</td>
+    </tr>
+    <tr>
+      <td>New PMC Member</td>
+      <td>When a committer is proposed for the PMC.</td>
+      <td>Consensus approval</td>
+      <td>Active PMC members</td>
+      <td>3</td>
+    </tr>
+    <tr>
+      <td>New PMC Chair</td>
+      <td>When a new PMC chair is chosen to succeed an outgoing chair.</td>
+      <td>Consensus approval</td>
+      <td>Active PMC members</td>
+      <td>3</td>
+    </tr>
+    <tr>
+      <td>Modifying Bylaws</td>
+      <td>Modifying this document.</td>
+      <td>Consensus approval</td>
+      <td>Active PMC members</td>
+      <td>7</td>
+    </tr>
+  </tbody>
+</table>
+
+<p>No other voting actions are defined; all other actions should presume Lazy Approval (defaulting to Consensus Approval upon veto). If an action is voted on multiple times, or if a different approval type is desired, these bylaws should be amended to include the action.</p>
+
+<p>For the purposes of the \u201cAdoption of New Codebase\u201d action, the Accumulo codebase is defined as the Accumulo site content, primary project code, and all contributed code (\u201ccontribs\u201d) as they exist in their respective repositories. Adoption of a new codebase generally refers to the creation of a new contrib repository, but could cover, for example, a rework of the project site, or merging a contrib project into the primary codebase.</p>
+
+<p>Voting actions for the removal of a committer or PMC member are intentionally not defined. According to ASF rules, <a href="https://www.apache.org/dev/committers#committer-set-term">committer status never expires</a> and <a href="https://www.apache.org/dev/pmc#pmc-removal">PMC members can only be removed with approval from the ASF Board</a>.</p>
+
+<h1 id="release-plans">Release Plans</h1>
+
+<p>The approval of a release plan begins the process of creating a new project release. The process ends when a release candidate is approved.</p>
+
+<p>An Accumulo release plan consists of at least the following:</p>
+
+<ul>
+  <li>a version number</li>
+  <li>a feature freeze date</li>
+  <li>a code freeze date</li>
+  <li>a release date</li>
+  <li>the choice of a release manager</li>
+</ul>
+
+<p>After feature freeze, new features should not be accepted for the release. After code freeze, only critical fixes should be accepted for the release. The release manager guides the decision on accepting changes.</p>
+
+<p>All dates in a plan are estimates, as unforeseen issues may require delays. The release manager may adjust dates as needed. In serious circumstances, the release manager may opt to call a re-plan vote.</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/consensusBuilding.html
----------------------------------------------------------------------
diff --git a/contributor/consensusBuilding.html b/contributor/consensusBuilding.html
new file mode 100644
index 0000000..24881e8
--- /dev/null
+++ b/contributor/consensusBuilding.html
@@ -0,0 +1,211 @@
+<!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>Consensus Building</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">Consensus Building</h1>
+          
+          <p>In some cases there is no obvious path to take, or you might be a new community, 
+or a new member of an existing community. In these cases people will often 
+need to build consensus by making proposals and eliciting responses.</p>
+
+<p>We want to avoid unnecessary discussion and the creation of significant
+amounts of unnecessary mail that everyone in the community needs to read. 
+That is not to say that we want to avoid constructive discussion. This is 
+the lifeblood of a successful project. However, many ASF projects adopt a 
+shorthand notation for showing support, or otherwise, for a proposal.</p>
+
+<h2 id="expressing-support-or-otherwise">Expressing support (or otherwise)</h2>
+
+<p>The notation used is \u201c+1\u201d, \u201c-1\u201d and \u201c0\u201d. It\u2019s also common to see \u201c+0\u201d and \u201c-0\u201d.</p>
+
+<p>So, what do these notations mean?</p>
+
+<ul>
+  <li>+1 means \u201cI agree with this and will help make it happen\u201d</li>
+  <li>+0 means \u201cI agree with this but probably won\u2019t make it happen, so my 
+opinion is not that important\u201d</li>
+  <li>-0 means \u201cI don\u2019t agree with this, but I\u2019m offering no alternative so 
+my opinion is not that important\u201d</li>
+  <li>-1 means \u201cI don\u2019t agree and I am offering an alternative that I am able 
+to help implement\u201d</li>
+</ul>
+
+<p>Many people will use fractions to indicate the strength of their feelings,
+ e.g. \u201c+0.5\u201d. Some will even indicate this is a \u201cno brainer\u201d with something 
+like \u201c+1000\u201d.</p>
+
+<p>The important thing is that this is not an exact science. It\u2019s just a shorthand 
+way of communicating strength of feeling.</p>
+
+<h2 id="consensus-building-is-not-voting">Consensus Building is Not Voting</h2>
+
+<p>The confusing thing about this notation is that it is the same notation
+used in a formal vote. Knowing when something is a vote and when it is a 
+preference is important. It\u2019s easy to tell though, if the subject does not have 
+\u201c[Vote]\u201d at the start then it\u2019s just an opinion. We try not to call votes,
+consensus building is much more inclusive.</p>
+
+<p>The reasons for this notation being common is 
+that when someone wants to summarise a discussion thread they can mentally 
+add up the strength of feeling of the community and decide if there is consensus
+or not.</p>
+
+<p>Once there is a clear consensus members of the community can proceed with 
+the work under the <a href="/contributor/lazyConsensus">lazy consensus</a> model.</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/contrib-projects.html
----------------------------------------------------------------------
diff --git a/contributor/contrib-projects.html b/contributor/contrib-projects.html
index 08f9aac..8e91c81 100644
--- a/contributor/contrib-projects.html
+++ b/contributor/contrib-projects.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/contributor/git.html
----------------------------------------------------------------------
diff --git a/contributor/git.html b/contributor/git.html
index bb8dd45..85dcbff 100644
--- a/contributor/git.html
+++ b/contributor/git.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>
@@ -550,9 +549,7 @@ API.</p>
 <code class="highlighter-rouge">x.y</code> (where the changes for <code class="highlighter-rouge">z'</code> are commits since <code class="highlighter-rouge">x.y.z</code>. The steps to take are as follows:</p>
 
 <ol>
-  <li>Prepare the release candidate. <a href="/governance/releasing">Release
-Guide</a>, <a href="/releasing">Maven
-Instructions</a></li>
+  <li><a href="/contributor/making-release">Make a release candidate</a></li>
   <li>Create a branch for the release candidate from the <code class="highlighter-rouge">x.y</code> branch,
 named something like <code class="highlighter-rouge">x.y.z'-RCN</code>.</li>
   <li>Test and Vote</li>
@@ -574,7 +571,7 @@ the <code class="highlighter-rouge">z</code> value back to <code class="highligh
 <p>The steps to create a new major release are very similar to a minor release:</p>
 
 <ol>
-  <li>Prepare the release candidate. <em>reference release instructions</em></li>
+  <li><a href="/contributor/making-release">Make a release candidate</a></li>
   <li>Create a tag of the release candidate from the <code class="highlighter-rouge">x.y</code> branch,
 named something like <code class="highlighter-rouge">x.y.0-RCN</code>.</li>
   <li>Test and Vote</li>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/contributor/index.html
----------------------------------------------------------------------
diff --git a/contributor/index.html b/contributor/index.html
index a8dd20b..b9d6a5d 100644
--- a/contributor/index.html
+++ b/contributor/index.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>
@@ -143,14 +142,20 @@
           
           <h1 class="title">Contributor Guide</h1>
           
-          <p>This page contains resources and documentation for Accumulo contributors.</p>
+          <p>This page contains resources and documentation for Accumulo contributors. Any documentation that is helpful
+to Accumulo users should go in the <a href="/1.8/accumulo_user_manual.html">Accumulo User Manual</a>.</p>
 
-<p>Any documentation that is helpful to Accumulo users should be placed in the <a href="/1.8/accumulo_user_manual.html">user manual</a>.</p>
+<h2 id="external-project-resources">External project resources</h2>
+
+<ul>
+  <li><a href="https://issues.apache.org/jira/browse/ACCUMULO">JIRA</a> for tracking issues</li>
+  <li><a href="https://github.com/apache/accumulo/pulls">GitHub</a> for code reviews (via pull requests)</li>
+  <li><a href="https://builds.apache.org/view/A/view/Accumulo">Jenkins</a> &amp; <a href="https://travis-ci.org/apache/accumulo">TravisCI</a> for automated builds</li>
+</ul>
+
+<h2 id="development-docs">Development docs</h2>
 
 <ul>
-  <li><a href="https://issues.apache.org/jira/browse/ACCUMULO">JIRA</a> - Accumulo\u2019s Issue Tracker</li>
-  <li><a href="https://github.com/apache/accumulo/pulls">GitHub</a> - Pull requests can be made on GitHub</li>
-  <li><a href="https://builds.apache.org/view/A/view/Accumulo">Jenkins</a> &amp; <a href="https://travis-ci.org/apache/accumulo">TravisCI</a> - Accumulo build servers</li>
   <li><a href="/contributor/source">Source Guide</a></li>
   <li><a href="/contributor/git">Git Workflow</a></li>
   <li><a href="/contributor/versioning">Versioning</a></li>
@@ -158,11 +163,20 @@
   <li><a href="/contributor/rb">Review Board</a></li>
 </ul>
 
-<p>Below are resources for Accumulo committers which may also be helpful to contributors.</p>
+<h2 id="release-guides">Release guides</h2>
+
+<ul>
+  <li><a href="/contributor/making-release">Making a release</a></li>
+  <li><a href="/contributor/verifying-release">Verifying a release</a></li>
+</ul>
+
+<h2 id="project-governance">Project governance</h2>
 
 <ul>
-  <li><a href="/contributor/releasing">Making Releases</a></li>
-  <li><a href="/contributor/verifying_releases">Verifying Releases</a></li>
+  <li><a href="/contributor/bylaws">Bylaws</a></li>
+  <li><a href="/contributor/consensusBuilding">Consensus Building</a></li>
+  <li><a href="/contributor/lazyConsensus">Lazy Consensus</a></li>
+  <li><a href="/contributor/voting">Voting</a></li>
 </ul>
 
 


[03/11] accumulo-website git commit: Several updates to website

Posted by mw...@apache.org.
Several updates to website

* Combined governance and contributor guide pages
* Added notes about testing/updating accumulo-examples during release
* Consolidated release docs in two pages: making & verifying
* Moved all pages at root of repo to pages/ (except index.md) but kept
  link structure
* Renamed 'Papers & Presentation' to 'External Docs' as it contains
  links to books and blog posts.


Project: http://git-wip-us.apache.org/repos/asf/accumulo-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-website/commit/a71056ca
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-website/tree/a71056ca
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-website/diff/a71056ca

Branch: refs/heads/master
Commit: a71056ca8083b592325123cda70dd455bf687f32
Parents: b7e5e7b
Author: Mike Walch <mw...@apache.org>
Authored: Fri Dec 9 17:05:15 2016 -0500
Committer: Mike Walch <mw...@apache.org>
Committed: Mon Dec 12 13:39:14 2016 -0500

----------------------------------------------------------------------
 _includes/nav.html                |   5 +-
 contributor/bylaws.md             | 195 +++++++++++++++++++++++++++++++++
 contributor/consensusBuilding.md  |  53 +++++++++
 contributor/git.md                |   8 +-
 contributor/index.md              |  50 ++++++---
 contributor/lazyConsensus.md      |  58 ++++++++++
 contributor/making-release.md     | 165 ++++++++++++++++++++++++++++
 contributor/rb.md                 |   4 +-
 contributor/releasing.md          | 146 ------------------------
 contributor/source.md             |   5 -
 contributor/verifying-release.md  | 130 ++++++++++++++++++++++
 contributor/verifying_releases.md |  92 ----------------
 contributor/voting.md             |  93 ++++++++++++++++
 get_involved.md                   |  93 ----------------
 governance/bylaws.md              | 193 --------------------------------
 governance/consensusBuilding.md   |  52 ---------
 governance/index.md               |   9 --
 governance/lazyConsensus.md       |  57 ----------
 governance/releasing.md           |  51 ---------
 governance/voting.md              |  92 ----------------
 mailing_list.md                   |  49 ---------
 news.md                           |  19 ----
 pages/external-docs.md            | 110 +++++++++++++++++++
 pages/get_involved.md             |  99 +++++++++++++++++
 pages/mailing_list.md             |  50 +++++++++
 pages/news.md                     |  20 ++++
 pages/people.md                   | 182 ++++++++++++++++++++++++++++++
 pages/related-projects.md         |  92 ++++++++++++++++
 pages/release.md                  |   6 +-
 papers.md                         |   6 -
 papers/index.md                   | 112 -------------------
 people.md                         | 181 ------------------------------
 projects.md                       |  90 ---------------
 33 files changed, 1292 insertions(+), 1275 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/_includes/nav.html
----------------------------------------------------------------------
diff --git a/_includes/nav.html b/_includes/nav.html
index c2a6eb2..d2f8531 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -28,8 +28,8 @@
           <li><a href="{{ site.baseurl }}/{{ site.latest_minor_release }}/apidocs">Javadocs ({{ site.latest_minor_release }})</a></li>
           <li><a href="{{ site.baseurl }}/{{ site.latest_minor_release }}/examples">Examples ({{ site.latest_minor_release }})</a></li>
           <li><a href="{{ site.baseurl }}/features">Features</a></li>
-          <li><a href="{{ site.baseurl }}/papers">Papers &amp; Presentations</a></li>
           <li><a href="{{ site.baseurl }}/glossary">Glossary</a></li>
+          <li><a href="{{ site.baseurl }}/external-docs">External Docs</a></li>
           <li><a href="{{ site.baseurl }}/docs-archive/">Archive</a></li>
         </ul>
         </li>
@@ -39,9 +39,8 @@
           <li><a href="{{ site.baseurl }}/get_involved">Get Involved</a></li>
           <li><a href="{{ site.baseurl }}/mailing_list">Mailing Lists</a></li>
           <li><a href="{{ site.baseurl }}/people">People</a></li>
-          <li><a href="{{ site.baseurl }}/projects">Related Projects</a></li>
+          <li><a href="{{ site.baseurl }}/related-projects">Related Projects</a></li>
           <li><a href="{{ site.baseurl }}/contributor/">Contributor Guide</a></li>
-          <li><a href="{{ site.baseurl }}/governance/">Governance</a></li>
         </ul>
         </li>
       </ul>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/contributor/bylaws.md
----------------------------------------------------------------------
diff --git a/contributor/bylaws.md b/contributor/bylaws.md
new file mode 100644
index 0000000..2d9da9b
--- /dev/null
+++ b/contributor/bylaws.md
@@ -0,0 +1,195 @@
+---
+title: Bylaws
+redirect_from: 
+  - /bylaws
+  - /governance/bylaws
+---
+
+This is version 3 of the bylaws. Community work actively continues on the bylaws, and so key segments of them are subject to change.
+
+# Introduction
+
+This document defines the bylaws under which the Apache Accumulo project operates. It defines the roles and responsibilities of the project, who may vote, how voting works, how conflicts are resolved, etc.
+
+Accumulo is a project of the [Apache Software Foundation][foundation]. The foundation holds the copyright on Apache code including the code in the Accumulo codebase. The [foundation FAQ][foundation-faq] explains the operation and background of the foundation.
+
+Accumulo is typical of Apache projects in that it operates under a set of principles, known collectively as the Apache Way. If you are new to Apache development, please refer to the [Incubator project][incubator] for more information on how Apache projects operate. Terms used at the ASF are defined in the [ASF glossary][glossary].
+
+# Roles and Responsibilities
+
+Apache projects define a set of roles with associated rights and responsibilities. These roles govern what tasks an individual may perform within the project. The roles are defined in the following sections.
+
+## Users
+
+The most important participants in the project are people who use our software. The majority of our contributors start out as users and guide their development efforts from the user's perspective.
+
+Users contribute to the Apache projects by providing feedback to contributors in the form of bug reports and feature suggestions. As well, users participate in the Apache community by helping other users on mailing lists and user support forums.
+
+## Contributors
+
+All of the volunteers who are contributing time, code, documentation, or resources to the Accumulo project are considered contributors. A contributor that makes sustained, welcome contributions to the project may be invited to become a committer, though the exact timing of such invitations depends on many factors.
+
+## Committers
+
+The project's committers are responsible for the project's technical management. Committers have write access to the project's code repositories and may cast binding votes on any technical discussion regarding Accumulo. Committer access is by invitation only and must be approved by consensus approval of the active PMC members. Upon acceptance of the invitation to become a committer, it is the accepting member\u2019s responsibility to update their status on the Accumulo web page accordingly.
+
+A committer is considered emeritus, meaning inactive, by their own declaration or by not reviewing patches or committing patches to the project for over six months. Emeritus members will be recognized by the PMC on the Accumulo web page, in honor of their past contributions. Emeritus members retain all voting and commit rights associated with their former designation and can move themselves out of emeritus status by sending an announcement of their return to the developer mailing list. It will be the returning member's responsibility to update their status on the web page accordingly.
+
+An emeritus committer\u2019s commit access may be disabled as part of routine security. Access shall not be removed without notifying the committer, and access shall be maintained if the committer wishes to leave it active. A committer\u2019s commit access shall be reactivated upon the committer\u2019s request to the PMC.
+
+All Apache committers are required to have a signed [Contributor License Agreement][icla] (CLA) on file with the Apache Software Foundation. Under the terms of the CLA that all committers must sign, a committer's primary responsibility is to ensure that all code committed to Apache Accumulo is licensed appropriately and meets those criteria set forth in the CLA (including both original works and patches committed on behalf of other contributors). There is a [Committer FAQ][committer-faq] which provides more details on the requirements for committers. 
+
+It is the custom of the Accumulo project to also invite each committer to become a member of the Accumulo PMC.
+
+## Project Management Committee
+
+The role of the PMC, from a Foundation perspective, is [oversight][pmc-howto]. The main
+role of the PMC is not code and not coding, but to ensure that all legal
+issues are addressed, that procedure is followed, and that each and every
+release is the product of the community as a whole. That is key to our
+litigation protection mechanisms.
+
+Secondly, the role of the PMC is to further the long-term development and
+health of the community as a whole, and to ensure that balanced and wide
+scale peer review and collaboration does happen. Within the ASF, we worry
+about any community which centers around a few individuals who are working
+virtually uncontested. We believe that this is detrimental to quality,
+stability, and robustness of both code and long term social structures.
+
+The responsibilities of the PMC include:
+
+* Deciding what is distributed as products of the Apache Accumulo project.
+* Maintaining the project's shared resources, including the code repository, mailing lists, and websites.
+* Protecting and ensuring proper use of Apache trademarks by the project and by other parties.
+* Speaking on behalf of the project.
+* Nominating new PMC members and committers.
+* Maintaining these bylaws and other guidelines of the project.
+
+In particular, PMC members must understand both our project's criteria and ASF criteria for voting on a [release][release-management].
+See the [PMC Guide][pmc-guide] for more information on PMC responsibilities.
+
+Membership of the PMC is by invitation only and must be approved by a consensus approval of active PMC members. Upon acceptance of the invitation to become a PMC member, it is the accepting member\u2019s responsibility to update their status on the Accumulo web page accordingly.
+
+A PMC member is considered emeritus, meaning inactive, by their own declaration or by not contributing in any form to the project for over six months. Emeritus members will be recognized by the PMC on the Accumulo web page, in honor of their past contributions. Emeritus members retain all voting and commit rights associated with their former designation and can move themselves out of emeritus status by sending an announcement of their return to the developer mailing list. It will be the returning member's responsibility to update their status on the web page accordingly.
+
+The chair of the PMC is appointed by the ASF board. The chair is an office holder of the Apache Software Foundation (Vice President, Apache Accumulo) and has primary responsibility to the board for the management of the projects within the scope of the Accumulo PMC. The chair reports to the board quarterly on developments within the Accumulo project.
+
+When the current chair of the PMC resigns, the PMC votes to recommend a new chair using consensus approval, but the decision must be ratified by the Apache board.
+
+## Release Manager
+
+The [ASF release process][release-pub] defines the [release manager][release-manager] as an individual responsible for shepherding a new project release. Any committer may serve as a release manager. The release manager for a release is chosen as part of the release plan.
+
+At a minimum, a release manager is responsible for packaging a release candidate for a vote and signing and publishing an approved release candidate. An Accumulo release manager is also expected to:
+
+* guide whether changes after feature freeze or code freeze should be included in the release
+* ensure that required release testing is being conducted
+* track whether the release is on target for its expected release date
+* adjust release plan dates to reflect the latest estimates
+* determine if a re-plan may be needed and, if so, call a vote
+* call votes on release candidates
+
+Details on [making][making] and [verifying][verifying] a release are available on the Accumulo website.
+
+# Decision Making
+
+Within the Accumulo project, different types of decisions require different forms of approval. For example, the previous section describes several decisions which require 'consensus approval'. This section defines how voting is performed, the types of approvals, and which types of decision require which type of approval.
+
+## Voting
+
+Decisions regarding the project are made by votes on the primary project development mailing list: dev@accumulo.apache.org. Where necessary, PMC voting may take place on the private Accumulo PMC mailing list: private@accumulo.apache.org. Votes are clearly indicated by a subject line starting with [VOTE]. A vote message may only pertain to a single item\u2019s approval; multiple items should be separated into multiple messages. Voting is carried out by replying to the vote mail. A vote may take on one of four forms, defined below.
+
+{: .table }
+| Vote | Meaning |
+|------|---------|
+| +1   | *Yes*, *Agree*, or *The action should be performed*. In general, this vote also indicates a willingness on the behalf of the voter to *make it happen*. |
+| +0   | This vote indicates a willingness for the action under consideration to go ahead. The voter, however, will not be able to help.                         |
+| -0   | This vote indicates that the voter does not, in general, agree with the proposed action but is not concerned enough to prevent the action going ahead.  |
+| -1   | *No*, *Disagree*, or *The action should not be performed*. On issues where consensus is required, this vote counts as a veto. All vetoes must contain an explanation of why the veto is appropriate. Vetoes with no explanation are void. It may also be appropriate for a -1 vote to include an alternative course of action. |
+
+All participants in the Accumulo project are encouraged to vote. For technical decisions, only the votes of active committers are binding. Non-binding votes are still useful for those with binding votes to understand the perception of an action across the wider Accumulo community. For PMC decisions, only the votes of active PMC members are binding.
+
+See the [voting page][voting] for more details on the mechanics of voting.
+
+## Commit Then Review (CTR)
+
+Voting can also be applied to changes to the Accumulo codebase. Under the Commit Then Review policy, committers can make changes to the codebase without seeking approval beforehand, and the changes are assumed to be approved unless an objection is raised. Only if an objection is raised must a vote take place on the code change.
+
+For some code changes, committers may wish to get feedback from the community before making the change. It is acceptable for a committer to seek approval before making a change if they so desire.
+
+## Approvals
+
+These are the types of approvals that can be sought. Different actions require different types of approvals.
+
+{: .table }
+| Approval&nbsp;Type                | Definition                                                                                       |
+|-----------------------------------|--------------------------------------------------------------------------------------------------|
+| Consensus Approval                | A consensus approval vote passes with 3 binding +1 votes and no binding vetoes.                  |
+| Majority Approval                 | A majority approval vote passes with 3 binding +1 votes and more binding +1 votes than -1 votes. |
+| Lazy Approval (or Lazy Consensus) | An action with lazy approval is implicitly allowed unless a -1 vote is received, at which time, depending on the type of action, either majority approval or consensus approval must be obtained.  Lazy Approval can be either *stated* or *assumed*, as detailed on the [lazy consensus page][lazy]. |
+
+## Vetoes
+
+A valid, binding veto cannot be overruled. If a veto is cast, it must be accompanied by a valid reason explaining the veto. The validity of a veto, if challenged, can be confirmed by anyone who has a binding vote. This does not necessarily signify agreement with the veto, but merely that the veto is valid.
+
+If you disagree with a valid veto, you must lobby the person casting the veto to withdraw their veto. If a veto is not withdrawn, the action that has been vetoed must be reversed in a timely manner.
+
+## Actions
+
+This section describes the various actions which are undertaken within the project, the corresponding approval required for that action and those who have binding votes over the action. It also specifies the minimum length of time that a vote must remain open, measured in days. In general, votes should not be called at times when it is known that interested members of the project will be unavailable.
+
+For Code Change actions, a committer may choose to employ assumed or stated Lazy Approval under the [CTR][ctr] policy. Assumed Lazy Approval has no minimum length of time before the change can be made.
+
+{: .table }
+| Action                    | Description                                                                                                 | Approval                                              | Binding Votes      | Min. Length (days) |
+|---------------------------|-------------------------------------------------------------------------------------------------------------|-------------------------------------------------------|--------------------|--------------------|
+| Code Change               | A change made to a codebase of the project. This includes source code, documentation, website content, etc. | Lazy approval, moving to consensus approval upon veto | Active committers  | 1                  |
+| Release Plan              | Defines the timetable and actions for an upcoming release. The plan also nominates a Release Manager.       | Lazy approval, moving to majority approval upon veto  | Active committers  | 3                  |
+| Release Plan Cancellation | Cancels an active release plan, due to a need to re-plan (e.g., discovery of a major issue).                | Majority approval                                     | Active committers  | 3                  |
+| Product Release           | Accepts or rejects a release candidate as an official release of the project.                               | Majority approval                                     | Active PMC members | 3                  |
+| Adoption of New Codebase  | When the codebase for an existing, released product is to be replaced with an alternative codebase. If such a vote fails to gain approval, the existing code base will continue. This also covers the creation of new sub-projects within the project. | Consensus approval | Active PMC members | 7 |
+| New Committer             | When a new committer is proposed for the project.                                                           | Consensus approval                                    | Active PMC members | 3                  |
+| New PMC Member            | When a committer is proposed for the PMC.                                                                   | Consensus approval                                    | Active PMC members | 3                  |
+| New PMC Chair             | When a new PMC chair is chosen to succeed an outgoing chair.                                                | Consensus approval                                    | Active PMC members | 3                  |
+| Modifying Bylaws          | Modifying this document.                                                                                    | Consensus approval                                    | Active PMC members | 7                  |
+
+No other voting actions are defined; all other actions should presume Lazy Approval (defaulting to Consensus Approval upon veto). If an action is voted on multiple times, or if a different approval type is desired, these bylaws should be amended to include the action.
+
+For the purposes of the "Adoption of New Codebase" action, the Accumulo codebase is defined as the Accumulo site content, primary project code, and all contributed code ("contribs") as they exist in their respective repositories. Adoption of a new codebase generally refers to the creation of a new contrib repository, but could cover, for example, a rework of the project site, or merging a contrib project into the primary codebase.
+
+Voting actions for the removal of a committer or PMC member are intentionally not defined. According to ASF rules, [committer status never expires][committer-terms] and [PMC members can only be removed with approval from the ASF Board][pmc-removal].
+
+# Release Plans
+
+The approval of a release plan begins the process of creating a new project release. The process ends when a release candidate is approved.
+
+An Accumulo release plan consists of at least the following:
+
+* a version number
+* a feature freeze date
+* a code freeze date
+* a release date
+* the choice of a release manager
+
+After feature freeze, new features should not be accepted for the release. After code freeze, only critical fixes should be accepted for the release. The release manager guides the decision on accepting changes.
+
+All dates in a plan are estimates, as unforeseen issues may require delays. The release manager may adjust dates as needed. In serious circumstances, the release manager may opt to call a re-plan vote.
+
+[foundation]: https://www.apache.org/foundation
+[foundation-faq]: https://www.apache.org/foundation/faq
+[incubator]: https://incubator.apache.org
+[glossary]: https://www.apache.org/foundation/glossary
+[icla]: https://www.apache.org/licenses/icla.txt
+[committer-faq]: https://www.apache.org/dev/committers
+[pmc-howto]: https://www.apache.org/foundation/how-it-works.html#pmc
+[release-management]: https://www.apache.org/dev/release#management
+[pmc-guide]: https://www.apache.org/dev/pmc
+[release-pub]: https://www.apache.org/dev/release-publishing
+[release-manager]: https://www.apache.org/dev/release-publishing#release_manager
+[making]: {{ "/contributor/making-release" | relative_url }}
+[verifying]: {{ "/contributor/verifying-release" | relative_url }}
+[voting]: {{ "/contributor/voting" | relative_url }}
+[ctr]: #commit-then-review-ctr
+[committer-terms]: https://www.apache.org/dev/committers#committer-set-term
+[pmc-removal]: https://www.apache.org/dev/pmc#pmc-removal
+[lazy]: {{ "/contributor/lazyConsensus" | relative_url }}

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/contributor/consensusBuilding.md
----------------------------------------------------------------------
diff --git a/contributor/consensusBuilding.md b/contributor/consensusBuilding.md
new file mode 100644
index 0000000..4211854
--- /dev/null
+++ b/contributor/consensusBuilding.md
@@ -0,0 +1,53 @@
+---
+title: Consensus Building
+redirect_from: /governance/consensusBuilding
+---
+
+In some cases there is no obvious path to take, or you might be a new community, 
+or a new member of an existing community. In these cases people will often 
+need to build consensus by making proposals and eliciting responses.
+
+We want to avoid unnecessary discussion and the creation of significant
+amounts of unnecessary mail that everyone in the community needs to read. 
+That is not to say that we want to avoid constructive discussion. This is 
+the lifeblood of a successful project. However, many ASF projects adopt a 
+shorthand notation for showing support, or otherwise, for a proposal.
+
+## Expressing support (or otherwise)
+
+The notation used is "+1", "-1" and "0". It's also common to see "+0" and "-0".
+
+So, what do these notations mean?
+
+  - +1 means "I agree with this and will help make it happen"
+  - +0 means "I agree with this but probably won't make it happen, so my 
+opinion is not that important"
+  - -0 means "I don't agree with this, but I'm offering no alternative so 
+my opinion is not that important"
+  - -1 means "I don't agree and I am offering an alternative that I am able 
+to help implement"
+
+Many people will use fractions to indicate the strength of their feelings,
+ e.g. "+0.5". Some will even indicate this is a "no brainer" with something 
+like "+1000".
+
+The important thing is that this is not an exact science. It's just a shorthand 
+way of communicating strength of feeling.
+
+## Consensus Building is Not Voting
+
+The confusing thing about this notation is that it is the same notation
+used in a formal vote. Knowing when something is a vote and when it is a 
+preference is important. It's easy to tell though, if the subject does not have 
+"[Vote]" at the start then it's just an opinion. We try not to call votes,
+consensus building is much more inclusive.
+
+The reasons for this notation being common is 
+that when someone wants to summarise a discussion thread they can mentally 
+add up the strength of feeling of the community and decide if there is consensus
+or not.
+
+Once there is a clear consensus members of the community can proceed with 
+the work under the [lazy consensus][1] model.
+
+[1]: {{ site.baseurl }}/contributor/lazyConsensus

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/contributor/git.md
----------------------------------------------------------------------
diff --git a/contributor/git.md b/contributor/git.md
index 278ae1d..95128cf 100644
--- a/contributor/git.md
+++ b/contributor/git.md
@@ -349,9 +349,7 @@ API.
 By convention, the branch containing the changes `z'` should be named
 `x.y` (where the changes for `z'` are commits since `x.y.z`. The steps to take are as follows:
 
-1. Prepare the release candidate. [Release
-   Guide]({{ site.baseurl }}/governance/releasing), [Maven
-   Instructions]({{ site.baseurl }}/releasing)
+1. [Make a release candidate][making]
 2. Create a branch for the release candidate from the `x.y` branch,
    named something like `x.y.z'-RCN`.
 3. Test and Vote
@@ -371,7 +369,7 @@ the `z` value back to `0`.
 
 The steps to create a new major release are very similar to a minor release:
 
-1. Prepare the release candidate. _reference release instructions_
+1. [Make a release candidate][making]
 2. Create a tag of the release candidate from the `x.y` branch,
    named something like `x.y.0-RCN`.
 3. Test and Vote
@@ -450,4 +448,4 @@ For the sake of clarity, some examples of common situations are included below.
 
 
 [1]: https://cwiki.apache.org/confluence/display/KAFKA/Patch+submission+and+review#Patchsubmissionandreview-Simplecontributorworkflow
-
+[making]: {{ site.baseurl }}/contributor/making-release

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/contributor/index.md
----------------------------------------------------------------------
diff --git a/contributor/index.md b/contributor/index.md
index 3902a17..329f4a9 100644
--- a/contributor/index.md
+++ b/contributor/index.md
@@ -2,28 +2,48 @@
 title: Contributor Guide
 ---
 
-This page contains resources and documentation for Accumulo contributors.
+This page contains resources and documentation for Accumulo contributors. Any documentation that is helpful
+to Accumulo users should go in the [Accumulo User Manual][manual].
 
-Any documentation that is helpful to Accumulo users should be placed in the [user manual][manual].
+## External project resources
 
-* [JIRA] - Accumulo's Issue Tracker
-* [GitHub] - Pull requests can be made on GitHub
-* [Jenkins] & [TravisCI] - Accumulo build servers
-* [Source Guide]({{ "/contributor/source" | relative_url }})
-* [Git Workflow]({{ "/contributor/git" | relative_url }})
-* [Versioning]({{ "/contributor/versioning" | relative_url }})
-* [Contrib Projects]({{ "/contributor/contrib-projects" | relative_url }})
-* [Review Board]({{ "/contributor/rb" | relative_url }})
+* [JIRA] for tracking issues
+* [GitHub] for code reviews (via pull requests)
+* [Jenkins] & [TravisCI] for automated builds
 
-Below are resources for Accumulo committers which may also be helpful to contributors.
+## Development docs
 
-* [Making Releases][making]
-* [Verifying Releases][verifying]
+* [Source Guide][source]
+* [Git Workflow][git]
+* [Versioning][versioning]
+* [Contrib Projects][contrib-projects]
+* [Review Board][rb]
+
+## Release guides
+
+* [Making a release][making]
+* [Verifying a release][verifying]
+
+## Project governance
+
+* [Bylaws](/contributor/bylaws)
+* [Consensus Building](/contributor/consensusBuilding)
+* [Lazy Consensus](/contributor/lazyConsensus)
+* [Voting](/contributor/voting)
 
 [manual]: {{ site.baseurl }}/{{ site.latest_minor_release }}/accumulo_user_manual.html
 [JIRA]: https://issues.apache.org/jira/browse/ACCUMULO
 [GitHub]: https://github.com/apache/accumulo/pulls
 [Jenkins]: https://builds.apache.org/view/A/view/Accumulo
 [TravisCI]: https://travis-ci.org/apache/accumulo
-[making]: {{ "/contributor/releasing" | relative_url }}
-[verifying]: {{ "/contributor/verifying_releases" | relative_url }}
+[source]: {{ "/contributor/source" | relative_url }}
+[git]: {{ "/contributor/git" | relative_url }}
+[versioning]: {{ "/contributor/versioning" | relative_url }}
+[contrib-projects]: {{ "/contributor/contrib-projects" | relative_url }}
+[rb]: {{ "/contributor/rb" | relative_url }}
+[making]: {{ "/contributor/making-release" | relative_url }}
+[verifying]: {{ "/contributor/verifying-release" | relative_url }}
+[bylaws]: {{ "/contributor/bylaws" | relative_url }}
+[consensus-building]: {{ "/contributor/consensusBuilding" | relative_url }}
+[lazyConsensus]: {{ "/contributor/lazyConsensus" | relative_url }}
+[voting]: {{ "/contributor/voting" | relative_url }}

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/contributor/lazyConsensus.md
----------------------------------------------------------------------
diff --git a/contributor/lazyConsensus.md b/contributor/lazyConsensus.md
new file mode 100644
index 0000000..367a0f1
--- /dev/null
+++ b/contributor/lazyConsensus.md
@@ -0,0 +1,58 @@
+---
+title: Lazy Consensus
+redirect_from: /governance/lazyConsensus
+---
+
+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.
+
+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.
+
+## Avoiding Unnecessary Discussion
+
+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.
+
+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.
+
+## Stating Lazy Consensus
+
+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.
+
+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.
+
+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 [express support or objections][1] and corrections to 
+the proposal before work begins. 
+
+## Silence is consent
+
+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.
+
+[1]: {{ site.baseurl }}/contributor/consensusBuilding

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/contributor/making-release.md
----------------------------------------------------------------------
diff --git a/contributor/making-release.md b/contributor/making-release.md
new file mode 100644
index 0000000..41a3e85
--- /dev/null
+++ b/contributor/making-release.md
@@ -0,0 +1,165 @@
+---
+title: Making a Release
+redirect_from: 
+  - /releasing
+  - /contributor/releasing
+  - /governance/releasing
+---
+
+This is a guide for the creation of a release of Apache Accumulo. 
+
+## Setup
+
+There are number of things that are required before attempting to build a release.
+
+1. 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 `default-cache-ttl 6000` 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 [ASF release signing documentation][1].
+2. Ensure that you're using the correct major release of Java (check javadoc too).
+3. 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).
+4. Update the CHANGES file so that it's in sync with Jira (manual process).
+5. Ensure that you have a texlive distribution installed so you are able to build the documentation.
+6. Have a clean workspace before starting.
+
+Given all of this, it's recommended that you only attempt making a release from a GNU/Linux machine.
+
+## Create the candidate
+
+**TL;DR**
+
+* `./assemble/build.sh --create-release-candidate` to make the release candidate
+* `git tag $version $version-rcN` to create an RC tag from the actual tag
+* `git tag -d $version` make sure you don't accidentally push a "release" tag
+* `git push origin $version-rcN` push the RC tag
+* `git checkout -b $version-rcN-branch` save off the branch from the Maven release plugin
+* **VOTE**
+* *If vote fails*, fix the original branch and start over.
+* *If vote passes*, `git merge $version-rcN-branch` back into the original branch you released from.
+* `git tag -s $version-rcN $version` make a GPG-signed tag
+* `git push origin $version` push the signed tag.
+
+**Long-winded explanation**
+
+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.
+
+When invoking build.sh with the --create-release-candidate option, the majority of the work will be performed
+by the maven-release-plugin, invoking *release:clean*, *release:prepare*, and *release:perform*. 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 *not* 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.
+
+One unwanted side-effect of this approach is that after creating this branch, but *before invoking release:perform*,
+you must edit the release.properties to add the _-rcN_ 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 *mvn release:perform*,
+a staging repository will be made for you on the [ASF Nexus server][2] which you can log into with your ASF 
+credentials.
+
+After you log into Nexus, click on _Staging Repositories_ in the _Build Promotion_ 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.
+
+## Vote
+
+At this point, you should have a closed repository that's ready to vote on. Send a message to [the dev
+list](mailto:dev@accumulo.apache.org) and get the ball rolling. Developers should test and verify the
+release candidate on their own. Accumulo has a guide for [verifying releases][verify].
+
+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. 
+
+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.
+
+If the vote passes, follow the steps below.
+
+## Promote the artifacts 
+
+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.
+
+## Create the final Git tag
+
+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 *must* being with "rel/". For example, a release of 1.7.0 should have a corresponding
+tag name of "rel/1.7.0".
+
+## Copy artifacts to dist.apache.org
+
+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.
+
+## Update projects.apache.org
+
+Fill out the [add release][addrelease] form to update the projects website.
+
+## Update the Website
+
+After a successful vote, this website needs to be updated with the new artifacts.
+
+  * Copy Accumulo User Manual (HTML version exists in >=1.7.0)
+  * Update downloads page
+  * Create a post in `_posts/release/` containing release notes (ensure notes contain link to JIRA changes for that version)
+  * Remove previous bug-fix release (if applicable)
+  * Update doap_Accumulo.rdf
+
+### Javadocs
+
+Javadocs are easy to update. Using the latest JDK7 or later (at least JDK 7u21
+to avoid known [vulnerabilities][7]), follow these steps:
+
+1. Unpack the source release tarball and change to its root directory, or checkout the SCM tag for the release
+2. Build the javadocs with `mvn clean package javadoc:aggregate -DskipTests -Paggregate-javadocs`
+3. Take note that the javadocs you will need to copy are the entire contents of `./target/site/apidocs/`
+4. In a different directory, checkout the `master` branch of the accumulo-website repo
+5. Remove any existing apidocs from the appropriate version folder (e.g. 1.6/apidocs for a 1.6.x release)
+6. 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)
+7. Continue updating the site content, as needed
+8. Commit the changes
+9. Update the site using jekyll with `./_devtools/git-hooks/post-commit` (if you don't have the commit hook already configured)
+10. Don't forget to push both the `master` and `asf-site` branches back to the accumulo-website repo
+11. Verify that javadocs have been updated on the production site (e.g. https://accumulo.apache.org/1.6/apidocs/)
+
+## Update Accumulo Examples
+
+After the release has been made, the Accumulo version used by [Accumulo Examples][examples] should be updated
+if this is the latest release of Accumulo.
+
+ * Update the `accumulo.version` property in `pom.xml` of accumulo-examples
+ * Run `mvn clean verify` to confirm that nothing breaks
+ * Run one of the examples for additinal testing.
+
+## References
+
+Some good references that explain a few things:
+
+- [Christopher talks about making releases][3]
+- [Publishing Maven Artifacts][4]
+- [Publishing Releases][5]
+
+[1]: https://www.apache.org/dev/release-signing
+[2]: https://repository.apache.org
+[3]: https://mail-archives.apache.org/mod_mbox/accumulo-dev/201305.mbox/raw/%3CCAL5zq9bH8y0FyjXmmfXhWPj8axosn9dZ7%2Bu-R1DK4Y-WM1YoWg%40mail.gmail.com%3E
+[4]: https://www.apache.org/dev/publishing-maven-artifacts
+[5]: https://www.apache.org/dev/release-publishing
+[7]: https://www.kb.cert.org/vuls/id/225657
+[8]: https://www.apache.org/dev/cmsref#extpaths
+[addrelease]: https://reporter.apache.org/addrelease?accumulo
+[verify]: {{ "/contributor/verifying-release" | relative_url }}
+[examples]: https://github.com/apache/accumulo-examples

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/contributor/rb.md
----------------------------------------------------------------------
diff --git a/contributor/rb.md b/contributor/rb.md
index dccbb40..3630e09 100644
--- a/contributor/rb.md
+++ b/contributor/rb.md
@@ -102,7 +102,7 @@ They should be in the form of a patch containing a single commit,
 
 [rbinstance]: https://reviews.apache.org
 [rb]: https://www.reviewboard.org
-[bylaws]: {{ "/governance/bylaws" | relative_url }}
+[bylaws]: {{ "/contributor/bylaws" | relative_url }}
 [ctr]: https://www.apache.org/foundation/glossary#CommitThenReview
-[actions]: {{ "/governance/bylaws#actions" | relative_url }}
+[actions]: {{ "/contributor/bylaws#actions" | relative_url }}
 [contributor]: {{ "/contributor/git#contributors" | relative_url }}

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/contributor/releasing.md
----------------------------------------------------------------------
diff --git a/contributor/releasing.md b/contributor/releasing.md
deleted file mode 100644
index 7488df8..0000000
--- a/contributor/releasing.md
+++ /dev/null
@@ -1,146 +0,0 @@
----
-title: Making a Release
-redirect_from: /releasing
----
-
-This is a guide for the creation of a release of Apache Accumulo. 
-
-## Setup
-
-There are number of things that are required before attempting to build a release.
-
-1. 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 `default-cache-ttl 6000` 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 [ASF release signing documentation][1].
-2. Ensure that you're using the correct major release of Java (check javadoc too).
-3. 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).
-4. Update the CHANGES file so that it's in sync with Jira (manual process).
-5. Ensure that you have a texlive distribution installed so you are able to build the documentation.
-6. Have a clean workspace before starting.
-
-Given all of this, it's recommended that you only attempt making a release from a GNU/Linux machine.
-
-## Create the candidate
-
-**TL;DR**
-
-* `./assemble/build.sh --create-release-candidate` to make the release candidate
-* `git tag $version $version-rcN` to create an RC tag from the actual tag
-* `git tag -d $version` make sure you don't accidentally push a "release" tag
-* `git push origin $version-rcN` push the RC tag
-* `git checkout -b $version-rcN-branch` save off the branch from the Maven release plugin
-* **VOTE**
-* *If vote fails*, fix the original branch and start over.
-* *If vote passes*, `git merge $version-rcN-branch` back into the original branch you released from.
-* `git tag -s $version-rcN $version` make a GPG-signed tag
-* `git push origin $version` push the signed tag.
-
-**Long-winded explanation**
-
-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.
-
-When invoking build.sh with the --create-release-candidate option, the majority of the work will be performed
-by the maven-release-plugin, invoking *release:clean*, *release:prepare*, and *release:perform*. 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 *not* 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.
-
-One unwanted side-effect of this approach is that after creating this branch, but *before invoking release:perform*,
-you must edit the release.properties to add the _-rcN_ 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 *mvn release:perform*,
-a staging repository will be made for you on the [ASF Nexus server][2] which you can log into with your ASF 
-credentials.
-
-After you log into Nexus, click on _Staging Repositories_ in the _Build Promotion_ 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.
-
-## Vote
-
-At this point, you should have a closed repository that's ready to vote on. Send a message to [the dev
-list](mailto:dev@accumulo.apache.org) 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.
-
-If the vote passes, huzzah, you're almost done.
-
-## Promote the artifacts 
-
-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.
-
-## Create the final Git tag
-
-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 *must* being with "rel/". For example, a release of 1.7.0 should have a corresponding
-tag name of "rel/1.7.0".
-
-
-## Copy artifacts to dist.apache.org
-
-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.
-
-## Update projects.apache.org
-
-Fill out the [add release][addrelease] form to update the projects website.
-
-## Update the Website
-
-After a successful vote, this website needs to be updated with the new artifacts.
-
-  * Copy Accumulo User Manual (HTML version exists in >=1.7.0)
-  * Update downloads page
-  * Create release notes (ensure notes contain link to JIRA changes for that version)
-  * Remove previous bug-fix release (if applicable)
-  * Update examples README files
-  * Update doap_Accumulo.rdf
-
-### Javadocs
-
-Javadocs are easy to update. Using the latest JDK7 or later (at least JDK 7u21
-to avoid known [vulnerabilities][7]), follow these steps:
-
-1. Unpack the source release tarball and change to its root directory, or checkout the SCM tag for the release
-2. Build the javadocs with `mvn clean package javadoc:aggregate -DskipTests -Paggregate-javadocs`
-3. Take note that the javadocs you will need to copy are the entire contents of `./target/site/apidocs/`
-4. In a different directory, checkout the `master` branch of the accumulo-website repo
-5. Remove any existing apidocs from the appropriate version folder (e.g. 1.6/apidocs for a 1.6.x release)
-6. 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)
-7. Continue updating the site content, as needed
-8. Commit the changes
-9. Update the site using jekyll with `./_devtools/git-hooks/post-commit` (if you don't have the commit hook already configured)
-10. Don't forget to push both the `master` and `asf-site` branches back to the accumulo-website repo
-11. Verify that javadocs have been updated on the production site (e.g. https://accumulo.apache.org/1.6/apidocs/)
-
-## References
-
-Some good references that explain a few things:
-
-- [Christopher talks about making releases][3]
-- [Publishing Maven Artifacts][4]
-- [Publishing Releases][5]
-- [Accumulo Release Guide][6]
-
-
-[1]: https://www.apache.org/dev/release-signing
-[2]: https://repository.apache.org
-[3]: https://mail-archives.apache.org/mod_mbox/accumulo-dev/201305.mbox/raw/%3CCAL5zq9bH8y0FyjXmmfXhWPj8axosn9dZ7%2Bu-R1DK4Y-WM1YoWg%40mail.gmail.com%3E
-[4]: https://www.apache.org/dev/publishing-maven-artifacts
-[5]: https://www.apache.org/dev/release-publishing
-[6]: {{ site.baseurl }}/governance/releasing
-[7]: https://www.kb.cert.org/vuls/id/225657
-[8]: https://www.apache.org/dev/cmsref#extpaths
-[addrelease]: https://reporter.apache.org/addrelease?accumulo

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/contributor/source.md
----------------------------------------------------------------------
diff --git a/contributor/source.md b/contributor/source.md
index 4ae22ea..466f5e2 100644
--- a/contributor/source.md
+++ b/contributor/source.md
@@ -202,10 +202,6 @@ Accumulo has [guidelines for using Review Board][rb] to support code reviews.
 
  * Formatter [plugin][intellij-formatter] that uses eclipse code style xml.
 
-### Release Guide
-
-Accumulo's release guide can be found [here][release].
-
 [16build]: https://builds.apache.org/job/Accumulo-1.6
 [17build]: https://builds.apache.org/job/Accumulo-1.7
 [1]: https://creadur.apache.org/rat/apache-rat-plugin
@@ -228,7 +224,6 @@ Accumulo's release guide can be found [here][release].
 [maven]: https://maven.apache.org
 [pom]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=pom.xml;hb=HEAD
 [rb]: {{ "/contributor/rb" | relative_url }}
-[release]: {{ "/governance/releasing" | relative_url }}
 [site-canon]: https://accumulo.apache.org
 [site-mirror]: http://apache.github.io/accumulo
 [srcheaders]: https://www.apache.org/legal/src-headers

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/contributor/verifying-release.md
----------------------------------------------------------------------
diff --git a/contributor/verifying-release.md b/contributor/verifying-release.md
new file mode 100644
index 0000000..f9a2217
--- /dev/null
+++ b/contributor/verifying-release.md
@@ -0,0 +1,130 @@
+---
+title: Verifying a Release
+redirect_from: /verifying_releases
+---
+
+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.
+
+The information here is meant to be an application of Foundation policy. When in doubt or conflict, any Foundation-level
+trumps anything written here.
+
+## Versioning
+
+Accumulo has adopted [Semantic Versioning][versioning] and follows their rules and guidelines.
+
+## Testing basics
+
+Each release of Accumulo should be tested by the community to verify correctness. 
+
+Below are some suggested tests that can be run (feel free to run your own custom tests too):
+
+* Run Accumulo's unit and integration tests using the following command:
+
+        $ mvn verify
+
+* Build the [Accumulo Examples][examples] repo using the release candidate by updating the `accumulo.version`
+  property in the `pom.xml` and using the staging repo. Also, run the unit/integration tests using `mvn verify`.
+
+* Run Accumulo's distributed tests (i.e RandomWalk, ContinuousIngest, etc). Information on these tests can
+  be found in their respective directories, `test/system/randomwalk` and `test/system/continuous`, 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.
+
+## Project testing goals
+
+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.
+
+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.
+
+### Stand alone
+
+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.
+
+  1. 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
+  - Analyze output of static analysis tools like Findbugs and PMD.
+  - For versions 1.6 and later, all functional tests must pass via the Maven failsafe plugin.
+    - Use "mvn verify" to run against the default profile of a particular release
+    - Use "mvn -Dhadoop.profile=1 verify" to run the functional tests against the Hadoop 1 profile
+
+### Cluster based
+
+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.
+
+  1. 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.
+  - 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.
+    - See $ACCUMULO_HOME/test/system/randomwalk/README for details on running the LongClean module.
+  - Two 24-hour periods of the continuous ingest test must be validated successfully. One test period must use agitation and the other should not.
+    - See $ACCUMULO_HOME/test/system/continuous/README for details on running and verifying the continuous ingest test.
+  - 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.
+
+## Foundation Level Requirements ##
+
+The ASF requires that all artifacts in a release are cryptographically signed and distributed with hashes.
+
+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. `sha1sum`, `md5sum`).
+
+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.
+
+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.
+
+The following are the aforementioned Foundation-level documents provided for reference:
+
+* [Applying the Apache Software License][2]
+* [Legal's license application guidelines][3]
+* [Common legal-discuss mailing list questions/resolutions][4]
+* [ASF Legal Affairs Page][5]
+
+## Apache Software License Application ##
+
+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.
+
+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 `lib/`. The Accumulo source tarball would not contain these same contents in the LICENSE and NOTICE files
+as it does not contain those same JARs.
+
+### LICENSE file ###
+
+The LICENSE file should be present at the top-level of the artifact. This file should be explicitly named `LICENSE`,
+however `LICENSE.txt` 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 _contained in the given
+artifact_ 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.
+
+### NOTICE file ###
+
+The NOTICE file should be present at the top-level of the artifact beside the LICENSE file. This file should be explicitly
+name `NOTICE`, while `NOTICE.txt` 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.
+
+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.
+
+[2]: https://www.apache.org/dev/apply-license
+[3]: https://www.apache.org/legal/src-headers
+[4]: https://www.apache.org/legal/resolved
+[5]: https://www.apache.org/legal
+[examples]: https://github.com/apache/accumulo-examples
+[versioning]: {{ site.baseurl }}/contributor/versioning

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/contributor/verifying_releases.md
----------------------------------------------------------------------
diff --git a/contributor/verifying_releases.md b/contributor/verifying_releases.md
deleted file mode 100644
index f36ef49..0000000
--- a/contributor/verifying_releases.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: Verifying a Release
-redirect_from: /verifying_releases
----
-
-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.
-
-The information here is meant to be an application of Foundation policy. When in doubt or conflict, any Foundation-level
-trumps anything written here.
-
-Verification of a release candidate can be broken down into three categories.
-
-## Accumulo Correctness ##
-
-Testing a distributed database is, arguably, the easiest of these requirements.
-
-Accumulo contains unit and integration tests which can be automatically run via Maven. These tests can be invoked
-by issues the following commands:
-
-    $ mvn verify
-
-Additionally, Accumulo contains multiple distributed tests, most notably the RandomWalk and ContinuousIngest tests.
-Information on these tests can be found in their respective directories, `test/system/randomwalk` and
- `test/system/continuous`, 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.
-
-More information on these tests, and the requirements in running them for a given release, can be found on the
-[governance page on releasing][1]
-
-## Foundation Level Requirements ##
-
-The ASF requires that all artifacts in a release are cryptographically signed and distributed with hashes.
-
-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. `sha1sum`, `md5sum`).
-
-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.
-
-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.
-
-The following are the aforementioned Foundation-level documents provided for reference:
-
-* [Applying the Apache Software License][2]
-* [Legal's license application guidelines][3]
-* [Common legal-discuss mailing list questions/resolutions][4]
-* [ASF Legal Affairs Page][5]
-
-## Apache Software License Application ##
-
-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.
-
-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 `lib/`. The Accumulo source tarball would not contain these same contents in the LICENSE and NOTICE files
-as it does not contain those same JARs.
-
-### LICENSE file ###
-
-The LICENSE file should be present at the top-level of the artifact. This file should be explicitly named `LICENSE`,
-however `LICENSE.txt` 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 _contained in the given
-artifact_ 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.
-
-### NOTICE file ###
-
-The NOTICE file should be present at the top-level of the artifact beside the LICENSE file. This file should be explicitly
-name `NOTICE`, while `NOTICE.txt` 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.
-
-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.
-
-[1]: {{ site.baseurl }}/governance/releasing#testing
-[2]: https://www.apache.org/dev/apply-license
-[3]: https://www.apache.org/legal/src-headers
-[4]: https://www.apache.org/legal/resolved
-[5]: https://www.apache.org/legal

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/contributor/voting.md
----------------------------------------------------------------------
diff --git a/contributor/voting.md b/contributor/voting.md
new file mode 100644
index 0000000..4ee6437
--- /dev/null
+++ b/contributor/voting.md
@@ -0,0 +1,93 @@
+---
+title: Voting
+redirect_from: /governance/voting
+---
+
+Occasionally a "feel" for consensus is not enough. Sometimes we need to have a
+measurable consensus. For example, when voting in new committers or to approve a
+release. 
+
+## Preparing for a Vote
+
+Before calling a vote it is important to ensure that the community is given time to
+discuss the upcoming vote. This will be done by posting an email to the list
+indicating the intention to call a vote and the options available. By the time a
+vote is called there should already be [consensus in the community][1]. The vote 
+itself is, normally, a formality.
+
+## Calling a Vote
+
+Once it is time to call the vote a mail is posted with a subject starting with
+"[VOTE]". This enables the community members to ensure they do not miss an important
+vote thread. It also indicates that this is not consensus building but a formal
+vote. The initiator is responsible for the vote. That means also to count the votes
+and present the results. Everyone has 1 vote.
+
+### Casting Your Vote
+
+The notation used in voting is:
+
++1 (means I vote positive)
+   You can say why you vote positive but it's not a must-have.
+
+ 0 (means I have no strong opinion, aka abstention)
+
+-1 (means I vote negative because of the following reason)
+   Yes, you must support your objection and provide an alternative course of action
+   that you are willing and able to implement (where appropriate).
+
+#### Example for a vote mail:
+
+    Address: private@
+    Subject: [VOTE] John Doe should become a regular committer
+    
+    Text:
+    "I would like to propose to vote in John Doe as committer. John has showed in
+    the last months that he has the skills and oversight for improving things (think
+    about the last UI change of the "Find" dialog)."
+    
+    +1 (means I vote for John)
+     0 (means I'm not for John but also not against to vote him in)
+    -1 (means I'm not for John because of the following reason(s):
+    
+    Voting time frame is finished 72 hours from now until June 30, 12:00 PM UTC.
+
+#### Example for a reply mail:
+
+    Text:
+    +1
+    
+    I like his work and want him to stay and to go on with his good improvements.
+
+
+#### Example for a result mail:
+
+    Subject: [VOTE][RESULTS] John Doe should become a regular committer
+    
+    Text:
+    Vote started Thu, Jun 27, 2011 at 12:00 PM UTC, voting is now closed.
+    
+    Voting results:
+    
+    --- Numbers ---
+    
+    +1: 6
+     0: 0
+    -1: 0
+    
+    --- Details ---
+    
+    +1 John
+    +1 Jane
+    +1 David
+    +1 Dolores
+    +1 Carl
+    +1 Chris
+
+[See here for more information][2] <br>
+[See here for more mail templates][3]
+
+
+[1]: consensusBuilding
+[2]: https://www.apache.org/foundation/voting
+[3]: https://community.apache.org/newcommitter

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/get_involved.md
----------------------------------------------------------------------
diff --git a/get_involved.md b/get_involved.md
deleted file mode 100644
index 52d37a3..0000000
--- a/get_involved.md
+++ /dev/null
@@ -1,93 +0,0 @@
----
-title: Get Involved
----
-
-You don't need to be a software developer to contribute to 
-Apache Accumulo. To be successful this project 
-requires a huge range of different skills, levels of involvement and degrees of 
-technical expertise. So, if you want to get involved in Apache Accumulo, there 
-is almost certainly a role for you. 
-
-We are looking for people to:
-
-  - provide feedback
-  - write or update documentation
-  - help new users
-  - recommend the project to others
-  - test the code and report bugs
-  - fix bugs
-  - give us feedback on required features
-  - write and update the software
-  - create artwork
-  - translate to different languages
-  - anything you can see that needs doing
-
-All of these contributions help to keep a project active and strengthen 
-the community. The project team and the broader community will 
-therefore welcome and encourage participation, and attempt to make it 
-as easy as possible for people to get involved.
-
-Want to get started now? Check out [open issues labeled for "newbies"][1]. If you need help, use the mailing list information below to reach out. If the issue you choose deals with code, you should read the developer's guide section.
-
-## Mailing lists and Meetups
-
-Your first engagement with the project should be to subscribe to our
-[mailing lists][2].  You can also [look for Accumulo Meetups][3] in your area. 
-Apache Accumulo developers and community members hang out in the #accumulo 
-channel on irc.freenode.net.
-
-## Contributor Guide
-
-See the [contributor guide][4] for recommended practices in interacting with our source code.
-Take a look at [Accumulo's Ohloh page][5] for an analysis of the code base.
-
-## Community Interaction
-
-Learn about [building open source communities][6].
-
-## Decision Making
-
-The most important thing about engaging with any Apache project is that everyone
-is equal. All people with an opinion are entitled to express that opinion and, where 
-appropriate, have it considered by the community.
-
-To some the idea of having to establish consensus in a large and distributed team 
-sounds inefficient and frustrating. Don't despair though, The Apache Way has a
-set of simple processes to ensure things proceed at a good pace.
-
-In ASF projects we don't like to vote. We reserve that for the few things that need 
-official approval for legal or process reasons (e.g. a release or a new committer). 
-Most of the time we work with the consensus building techniques documented below.
-
-### Lazy Consensus
-
-[Lazy consensus][7] is the first, and possibly the most important, consensus building 
-tool we have. Essentially lazy consensus means that you don't need to get explicit
-approval to proceed, but you need to be prepared to listen if someone objects.
-
-### Consensus Building
-
-Sometimes lazy consensus is not appropriate. In such cases it is necessary to
-make a proposal to the mailing list and discuss options. There are mechanisms
-for quickly showing your support or otherwise for a proposal and 
-[building consensus][8] amongst the community.
-
-Once there is a consensus people can proceed with the work under the [lazy 
-consensus][9] model.
-
-### Voting
-
-Occasionally a "feel" for consensus is not enough. Sometimes we need to 
-have a measurable consensus. For example, when [voting][10] in new committers or 
-to approve a release. 
-
-[1]: https://s.apache.org/newbie_accumulo_tickets
-[2]: {{ site.baseurl }}/mailing_list
-[3]: https://www.meetup.com/find/?keywords=accumulo
-[4]: {{ site.baseurl }}/contributor/
-[5]: https://www.ohloh.net/p/accumulo
-[6]: http://www.betaversion.org/~stefano/papers/ac2006.2.pdf
-[7]: {{ site.baseurl }}/governance/lazyConsensus
-[8]: {{ site.baseurl }}/governance/consensusBuilding
-[9]: {{ site.baseurl }}/governance/lazyConsensus
-[10]: {{ site.baseurl }}/governance/voting


[10/11] accumulo-website git commit: Jekyll build from master:a71056c

Posted by mw...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/classpath.html
----------------------------------------------------------------------
diff --git a/1.5/examples/classpath.html b/1.5/examples/classpath.html
index 5e1a099..abe2772 100644
--- a/1.5/examples/classpath.html
+++ b/1.5/examples/classpath.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/client.html
----------------------------------------------------------------------
diff --git a/1.5/examples/client.html b/1.5/examples/client.html
index a7aba03..e2e07dd 100644
--- a/1.5/examples/client.html
+++ b/1.5/examples/client.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/combiner.html
----------------------------------------------------------------------
diff --git a/1.5/examples/combiner.html b/1.5/examples/combiner.html
index 27ab0e0..cb7d06a 100644
--- a/1.5/examples/combiner.html
+++ b/1.5/examples/combiner.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/constraints.html
----------------------------------------------------------------------
diff --git a/1.5/examples/constraints.html b/1.5/examples/constraints.html
index 94dc84f..af53726 100644
--- a/1.5/examples/constraints.html
+++ b/1.5/examples/constraints.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/dirlist.html
----------------------------------------------------------------------
diff --git a/1.5/examples/dirlist.html b/1.5/examples/dirlist.html
index 6acd4cb..293fb69 100644
--- a/1.5/examples/dirlist.html
+++ b/1.5/examples/dirlist.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/export.html
----------------------------------------------------------------------
diff --git a/1.5/examples/export.html b/1.5/examples/export.html
index 830d68d..4dadc5c 100644
--- a/1.5/examples/export.html
+++ b/1.5/examples/export.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/filedata.html
----------------------------------------------------------------------
diff --git a/1.5/examples/filedata.html b/1.5/examples/filedata.html
index 8eda4aa..d3069ca 100644
--- a/1.5/examples/filedata.html
+++ b/1.5/examples/filedata.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/filter.html
----------------------------------------------------------------------
diff --git a/1.5/examples/filter.html b/1.5/examples/filter.html
index 4103cfb..bcef614 100644
--- a/1.5/examples/filter.html
+++ b/1.5/examples/filter.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/helloworld.html
----------------------------------------------------------------------
diff --git a/1.5/examples/helloworld.html b/1.5/examples/helloworld.html
index a63e679..72b39a0 100644
--- a/1.5/examples/helloworld.html
+++ b/1.5/examples/helloworld.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/index.html
----------------------------------------------------------------------
diff --git a/1.5/examples/index.html b/1.5/examples/index.html
index 943214d..b183d48 100644
--- a/1.5/examples/index.html
+++ b/1.5/examples/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/isolation.html
----------------------------------------------------------------------
diff --git a/1.5/examples/isolation.html b/1.5/examples/isolation.html
index dd62b05..972a005 100644
--- a/1.5/examples/isolation.html
+++ b/1.5/examples/isolation.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/mapred.html
----------------------------------------------------------------------
diff --git a/1.5/examples/mapred.html b/1.5/examples/mapred.html
index caf58fa..991bf14 100644
--- a/1.5/examples/mapred.html
+++ b/1.5/examples/mapred.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/maxmutation.html
----------------------------------------------------------------------
diff --git a/1.5/examples/maxmutation.html b/1.5/examples/maxmutation.html
index f18ac0e..4ff2666 100644
--- a/1.5/examples/maxmutation.html
+++ b/1.5/examples/maxmutation.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/regex.html
----------------------------------------------------------------------
diff --git a/1.5/examples/regex.html b/1.5/examples/regex.html
index 55feead..a28df88 100644
--- a/1.5/examples/regex.html
+++ b/1.5/examples/regex.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/rowhash.html
----------------------------------------------------------------------
diff --git a/1.5/examples/rowhash.html b/1.5/examples/rowhash.html
index 07d6013..a5e1221 100644
--- a/1.5/examples/rowhash.html
+++ b/1.5/examples/rowhash.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/shard.html
----------------------------------------------------------------------
diff --git a/1.5/examples/shard.html b/1.5/examples/shard.html
index ed81516..44540a1 100644
--- a/1.5/examples/shard.html
+++ b/1.5/examples/shard.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/tabletofile.html
----------------------------------------------------------------------
diff --git a/1.5/examples/tabletofile.html b/1.5/examples/tabletofile.html
index c663699..f5fc271 100644
--- a/1.5/examples/tabletofile.html
+++ b/1.5/examples/tabletofile.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/terasort.html
----------------------------------------------------------------------
diff --git a/1.5/examples/terasort.html b/1.5/examples/terasort.html
index 681cf4d..9760367 100644
--- a/1.5/examples/terasort.html
+++ b/1.5/examples/terasort.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/visibility.html
----------------------------------------------------------------------
diff --git a/1.5/examples/visibility.html b/1.5/examples/visibility.html
index ad8d617..ecbd1bf 100644
--- a/1.5/examples/visibility.html
+++ b/1.5/examples/visibility.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/batch.html
----------------------------------------------------------------------
diff --git a/1.6/examples/batch.html b/1.6/examples/batch.html
index 1c078dd..63a4840 100644
--- a/1.6/examples/batch.html
+++ b/1.6/examples/batch.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/bloom.html
----------------------------------------------------------------------
diff --git a/1.6/examples/bloom.html b/1.6/examples/bloom.html
index f4c83a3..dfa0558 100644
--- a/1.6/examples/bloom.html
+++ b/1.6/examples/bloom.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/bulkIngest.html
----------------------------------------------------------------------
diff --git a/1.6/examples/bulkIngest.html b/1.6/examples/bulkIngest.html
index 6cf968f..07e2c03 100644
--- a/1.6/examples/bulkIngest.html
+++ b/1.6/examples/bulkIngest.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/classpath.html
----------------------------------------------------------------------
diff --git a/1.6/examples/classpath.html b/1.6/examples/classpath.html
index e6e8e94..cd7160d 100644
--- a/1.6/examples/classpath.html
+++ b/1.6/examples/classpath.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/client.html
----------------------------------------------------------------------
diff --git a/1.6/examples/client.html b/1.6/examples/client.html
index 9a091c6..6cecadd 100644
--- a/1.6/examples/client.html
+++ b/1.6/examples/client.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/combiner.html
----------------------------------------------------------------------
diff --git a/1.6/examples/combiner.html b/1.6/examples/combiner.html
index 767cac3..bfe6c3f 100644
--- a/1.6/examples/combiner.html
+++ b/1.6/examples/combiner.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/constraints.html
----------------------------------------------------------------------
diff --git a/1.6/examples/constraints.html b/1.6/examples/constraints.html
index 00c4a2e..9b1f6a3 100644
--- a/1.6/examples/constraints.html
+++ b/1.6/examples/constraints.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/dirlist.html
----------------------------------------------------------------------
diff --git a/1.6/examples/dirlist.html b/1.6/examples/dirlist.html
index c111f61..a235334 100644
--- a/1.6/examples/dirlist.html
+++ b/1.6/examples/dirlist.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/export.html
----------------------------------------------------------------------
diff --git a/1.6/examples/export.html b/1.6/examples/export.html
index b861634..e6ee7b2 100644
--- a/1.6/examples/export.html
+++ b/1.6/examples/export.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/filedata.html
----------------------------------------------------------------------
diff --git a/1.6/examples/filedata.html b/1.6/examples/filedata.html
index 8cad966..1b5a5d8 100644
--- a/1.6/examples/filedata.html
+++ b/1.6/examples/filedata.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/filter.html
----------------------------------------------------------------------
diff --git a/1.6/examples/filter.html b/1.6/examples/filter.html
index e04eea4..bc36495 100644
--- a/1.6/examples/filter.html
+++ b/1.6/examples/filter.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/helloworld.html
----------------------------------------------------------------------
diff --git a/1.6/examples/helloworld.html b/1.6/examples/helloworld.html
index ecdf506..6639df8 100644
--- a/1.6/examples/helloworld.html
+++ b/1.6/examples/helloworld.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/index.html
----------------------------------------------------------------------
diff --git a/1.6/examples/index.html b/1.6/examples/index.html
index 6e597fb..4bce36f 100644
--- a/1.6/examples/index.html
+++ b/1.6/examples/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/isolation.html
----------------------------------------------------------------------
diff --git a/1.6/examples/isolation.html b/1.6/examples/isolation.html
index c62d373..3eca3d6 100644
--- a/1.6/examples/isolation.html
+++ b/1.6/examples/isolation.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/mapred.html
----------------------------------------------------------------------
diff --git a/1.6/examples/mapred.html b/1.6/examples/mapred.html
index 661f7c7..9da6f6d 100644
--- a/1.6/examples/mapred.html
+++ b/1.6/examples/mapred.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/maxmutation.html
----------------------------------------------------------------------
diff --git a/1.6/examples/maxmutation.html b/1.6/examples/maxmutation.html
index 383635d..7ef8448 100644
--- a/1.6/examples/maxmutation.html
+++ b/1.6/examples/maxmutation.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/regex.html
----------------------------------------------------------------------
diff --git a/1.6/examples/regex.html b/1.6/examples/regex.html
index 37293a5..2c5611e 100644
--- a/1.6/examples/regex.html
+++ b/1.6/examples/regex.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/reservations.html
----------------------------------------------------------------------
diff --git a/1.6/examples/reservations.html b/1.6/examples/reservations.html
index a824331..247ee71 100644
--- a/1.6/examples/reservations.html
+++ b/1.6/examples/reservations.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/rowhash.html
----------------------------------------------------------------------
diff --git a/1.6/examples/rowhash.html b/1.6/examples/rowhash.html
index 09796cf..34ae74d 100644
--- a/1.6/examples/rowhash.html
+++ b/1.6/examples/rowhash.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/shard.html
----------------------------------------------------------------------
diff --git a/1.6/examples/shard.html b/1.6/examples/shard.html
index c3f5967..4595c94 100644
--- a/1.6/examples/shard.html
+++ b/1.6/examples/shard.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/tabletofile.html
----------------------------------------------------------------------
diff --git a/1.6/examples/tabletofile.html b/1.6/examples/tabletofile.html
index 5b2de9f..9374420 100644
--- a/1.6/examples/tabletofile.html
+++ b/1.6/examples/tabletofile.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/terasort.html
----------------------------------------------------------------------
diff --git a/1.6/examples/terasort.html b/1.6/examples/terasort.html
index 67366fd..ca377d1 100644
--- a/1.6/examples/terasort.html
+++ b/1.6/examples/terasort.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.6/examples/visibility.html
----------------------------------------------------------------------
diff --git a/1.6/examples/visibility.html b/1.6/examples/visibility.html
index adf687f..27fe8d5 100644
--- a/1.6/examples/visibility.html
+++ b/1.6/examples/visibility.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/batch.html
----------------------------------------------------------------------
diff --git a/1.7/examples/batch.html b/1.7/examples/batch.html
index 1c078dd..63a4840 100644
--- a/1.7/examples/batch.html
+++ b/1.7/examples/batch.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/bloom.html
----------------------------------------------------------------------
diff --git a/1.7/examples/bloom.html b/1.7/examples/bloom.html
index f4c83a3..dfa0558 100644
--- a/1.7/examples/bloom.html
+++ b/1.7/examples/bloom.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/bulkIngest.html
----------------------------------------------------------------------
diff --git a/1.7/examples/bulkIngest.html b/1.7/examples/bulkIngest.html
index 6cf968f..07e2c03 100644
--- a/1.7/examples/bulkIngest.html
+++ b/1.7/examples/bulkIngest.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/classpath.html
----------------------------------------------------------------------
diff --git a/1.7/examples/classpath.html b/1.7/examples/classpath.html
index e6e8e94..cd7160d 100644
--- a/1.7/examples/classpath.html
+++ b/1.7/examples/classpath.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/client.html
----------------------------------------------------------------------
diff --git a/1.7/examples/client.html b/1.7/examples/client.html
index 9a091c6..6cecadd 100644
--- a/1.7/examples/client.html
+++ b/1.7/examples/client.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/combiner.html
----------------------------------------------------------------------
diff --git a/1.7/examples/combiner.html b/1.7/examples/combiner.html
index 767cac3..bfe6c3f 100644
--- a/1.7/examples/combiner.html
+++ b/1.7/examples/combiner.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/constraints.html
----------------------------------------------------------------------
diff --git a/1.7/examples/constraints.html b/1.7/examples/constraints.html
index 00c4a2e..9b1f6a3 100644
--- a/1.7/examples/constraints.html
+++ b/1.7/examples/constraints.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/dirlist.html
----------------------------------------------------------------------
diff --git a/1.7/examples/dirlist.html b/1.7/examples/dirlist.html
index c111f61..a235334 100644
--- a/1.7/examples/dirlist.html
+++ b/1.7/examples/dirlist.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/export.html
----------------------------------------------------------------------
diff --git a/1.7/examples/export.html b/1.7/examples/export.html
index b861634..e6ee7b2 100644
--- a/1.7/examples/export.html
+++ b/1.7/examples/export.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/filedata.html
----------------------------------------------------------------------
diff --git a/1.7/examples/filedata.html b/1.7/examples/filedata.html
index 8cad966..1b5a5d8 100644
--- a/1.7/examples/filedata.html
+++ b/1.7/examples/filedata.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/filter.html
----------------------------------------------------------------------
diff --git a/1.7/examples/filter.html b/1.7/examples/filter.html
index e04eea4..bc36495 100644
--- a/1.7/examples/filter.html
+++ b/1.7/examples/filter.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/helloworld.html
----------------------------------------------------------------------
diff --git a/1.7/examples/helloworld.html b/1.7/examples/helloworld.html
index ecdf506..6639df8 100644
--- a/1.7/examples/helloworld.html
+++ b/1.7/examples/helloworld.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/index.html
----------------------------------------------------------------------
diff --git a/1.7/examples/index.html b/1.7/examples/index.html
index eba7e80..2a8b9be 100644
--- a/1.7/examples/index.html
+++ b/1.7/examples/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/isolation.html
----------------------------------------------------------------------
diff --git a/1.7/examples/isolation.html b/1.7/examples/isolation.html
index c62d373..3eca3d6 100644
--- a/1.7/examples/isolation.html
+++ b/1.7/examples/isolation.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/mapred.html
----------------------------------------------------------------------
diff --git a/1.7/examples/mapred.html b/1.7/examples/mapred.html
index 661f7c7..9da6f6d 100644
--- a/1.7/examples/mapred.html
+++ b/1.7/examples/mapred.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/maxmutation.html
----------------------------------------------------------------------
diff --git a/1.7/examples/maxmutation.html b/1.7/examples/maxmutation.html
index 383635d..7ef8448 100644
--- a/1.7/examples/maxmutation.html
+++ b/1.7/examples/maxmutation.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/regex.html
----------------------------------------------------------------------
diff --git a/1.7/examples/regex.html b/1.7/examples/regex.html
index 37293a5..2c5611e 100644
--- a/1.7/examples/regex.html
+++ b/1.7/examples/regex.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/reservations.html
----------------------------------------------------------------------
diff --git a/1.7/examples/reservations.html b/1.7/examples/reservations.html
index a824331..247ee71 100644
--- a/1.7/examples/reservations.html
+++ b/1.7/examples/reservations.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/rowhash.html
----------------------------------------------------------------------
diff --git a/1.7/examples/rowhash.html b/1.7/examples/rowhash.html
index 09796cf..34ae74d 100644
--- a/1.7/examples/rowhash.html
+++ b/1.7/examples/rowhash.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/shard.html
----------------------------------------------------------------------
diff --git a/1.7/examples/shard.html b/1.7/examples/shard.html
index c3f5967..4595c94 100644
--- a/1.7/examples/shard.html
+++ b/1.7/examples/shard.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/tabletofile.html
----------------------------------------------------------------------
diff --git a/1.7/examples/tabletofile.html b/1.7/examples/tabletofile.html
index 5b2de9f..9374420 100644
--- a/1.7/examples/tabletofile.html
+++ b/1.7/examples/tabletofile.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/terasort.html
----------------------------------------------------------------------
diff --git a/1.7/examples/terasort.html b/1.7/examples/terasort.html
index 67366fd..ca377d1 100644
--- a/1.7/examples/terasort.html
+++ b/1.7/examples/terasort.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.7/examples/visibility.html
----------------------------------------------------------------------
diff --git a/1.7/examples/visibility.html b/1.7/examples/visibility.html
index adf687f..27fe8d5 100644
--- a/1.7/examples/visibility.html
+++ b/1.7/examples/visibility.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/batch.html
----------------------------------------------------------------------
diff --git a/1.8/examples/batch.html b/1.8/examples/batch.html
index f72a32e..7c558fb 100644
--- a/1.8/examples/batch.html
+++ b/1.8/examples/batch.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/bloom.html
----------------------------------------------------------------------
diff --git a/1.8/examples/bloom.html b/1.8/examples/bloom.html
index 3f0a648..87da025 100644
--- a/1.8/examples/bloom.html
+++ b/1.8/examples/bloom.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/bulkIngest.html
----------------------------------------------------------------------
diff --git a/1.8/examples/bulkIngest.html b/1.8/examples/bulkIngest.html
index 062c009..8bb424d 100644
--- a/1.8/examples/bulkIngest.html
+++ b/1.8/examples/bulkIngest.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.8/examples/classpath.html
----------------------------------------------------------------------
diff --git a/1.8/examples/classpath.html b/1.8/examples/classpath.html
index 3e7dc98..db4c61b 100644
--- a/1.8/examples/classpath.html
+++ b/1.8/examples/classpath.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>


[06/11] accumulo-website git commit: Jekyll build from master:a71056c

Posted by mw...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/governance/consensusBuilding.html
----------------------------------------------------------------------
diff --git a/governance/consensusBuilding.html b/governance/consensusBuilding.html
index cb0408f..da45a65 100644
--- a/governance/consensusBuilding.html
+++ b/governance/consensusBuilding.html
@@ -1,212 +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>Consensus Building</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">Consensus Building</h1>
-          
-          <p>In some cases there is no obvious path to take, or you might be a new community, 
-or a new member of an existing community. In these cases people will often 
-need to build consensus by making proposals and eliciting responses.</p>
-
-<p>We want to avoid unnecessary discussion and the creation of significant
-amounts of unnecessary mail that everyone in the community needs to read. 
-That is not to say that we want to avoid constructive discussion. This is 
-the lifeblood of a successful project. However, many ASF projects adopt a 
-shorthand notation for showing support, or otherwise, for a proposal.</p>
-
-<h2 id="expressing-support-or-otherwise">Expressing support (or otherwise)</h2>
-
-<p>The notation used is \u201c+1\u201d, \u201c-1\u201d and \u201c0\u201d. It\u2019s also common to see \u201c+0\u201d and \u201c-0\u201d.</p>
-
-<p>So, what do these notations mean?</p>
-
-<ul>
-  <li>+1 means \u201cI agree with this and will help make it happen\u201d</li>
-  <li>+0 means \u201cI agree with this but probably won\u2019t make it happen, so my 
-opinion is not that important\u201d</li>
-  <li>-0 means \u201cI don\u2019t agree with this, but I\u2019m offering no alternative so 
-my opinion is not that important\u201d</li>
-  <li>-1 means \u201cI don\u2019t agree and I am offering an alternative that I am able 
-to help implement\u201d</li>
-</ul>
-
-<p>Many people will use fractions to indicate the strength of their feelings,
- e.g. \u201c+0.5\u201d. Some will even indicate this is a \u201cno brainer\u201d with something 
-like \u201c+1000\u201d.</p>
-
-<p>The important thing is that this is not an exact science. It\u2019s just a shorthand 
-way of communicating strength of feeling.</p>
-
-<h2 id="consensus-building-is-not-voting">Consensus Building is Not Voting</h2>
-
-<p>The confusing thing about this notation is that it is the same notation
-used in a formal vote. Knowing when something is a vote and when it is a 
-preference is important. It\u2019s easy to tell though, if the subject does not have 
-\u201c[Vote]\u201d at the start then it\u2019s just an opinion. We try not to call votes,
-consensus building is much more inclusive.</p>
-
-<p>The reasons for this notation being common is 
-that when someone wants to summarise a discussion thread they can mentally 
-add up the strength of feeling of the community and decide if there is consensus
-or not.</p>
-
-<p>Once there is a clear consensus members of the community can proceed with 
-the work under the <a href="/governance/lazyConsensus">lazy consensus</a> model.</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>
+<title>Redirecting\u2026</title>
+<link rel="canonical" href="https://accumulo.apache.org/contributor/consensusBuilding.html">
+<meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/contributor/consensusBuilding.html">
+<h1>Redirecting\u2026</h1>
+<a href="https://accumulo.apache.org/contributor/consensusBuilding.html">Click here if you are not redirected.</a>
+<script>location="https://accumulo.apache.org/contributor/consensusBuilding.html"</script>
 </html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/governance/index.html
----------------------------------------------------------------------
diff --git a/governance/index.html b/governance/index.html
deleted file mode 100644
index 4d3a055..0000000
--- a/governance/index.html
+++ /dev/null
@@ -1,170 +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>Project Governance</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">Project Governance</h1>
-          
-          <ul>
-  <li><a href="/governance/bylaws">Bylaws</a></li>
-  <li><a href="/governance/consensusBuilding">Consensus Building</a></li>
-  <li><a href="/governance/lazyConsensus">Lazy Consensus</a></li>
-  <li><a href="/governance/releasing">Releasing</a></li>
-  <li><a href="/governance/voting">Voting</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/governance/lazyConsensus.html
----------------------------------------------------------------------
diff --git a/governance/lazyConsensus.html b/governance/lazyConsensus.html
index 283f91b..7ac2d44 100644
--- a/governance/lazyConsensus.html
+++ b/governance/lazyConsensus.html
@@ -1,215 +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>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="/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">Lazy Consensus</h1>
-          
-          <p>The concept of \u201cLazy Consensus\u201d 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\u2019t have to insist people discuss and/or
-approve your plan, and you certainly don\u2019t need to call a vote to get approval.
-You just assume you have the community\u2019s 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\u2019s 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="/governance/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>
+<title>Redirecting\u2026</title>
+<link rel="canonical" href="https://accumulo.apache.org/contributor/lazyConsensus.html">
+<meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/contributor/lazyConsensus.html">
+<h1>Redirecting\u2026</h1>
+<a href="https://accumulo.apache.org/contributor/lazyConsensus.html">Click here if you are not redirected.</a>
+<script>location="https://accumulo.apache.org/contributor/lazyConsensus.html"</script>
 </html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/governance/releasing.html
----------------------------------------------------------------------
diff --git a/governance/releasing.html b/governance/releasing.html
index c849b94..8ebc7ad 100644
--- a/governance/releasing.html
+++ b/governance/releasing.html
@@ -1,235 +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>Release Guide</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">Release Guide</h1>
-          
-          <h2 id="versioning">Versioning</h2>
-
-<p>Accumulo has adopted <a href="/versioning">Semantic Versioning</a> and follows their rules and guidelines.</p>
-
-<h2 id="testing">Testing</h2>
-
-<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. \u201c-Dhadoop.profile=2\u201d 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 \u201cmvn package\u201d to run against the default profile of a particular release
-    - Use \u201cmvn -Dhadoop.profile=2 package\u201d to test against the Hadoop 2 profile on e.g. 1.4 or 1.5
-    - Use \u201cmvn -Dhadoop.profile=1 package\u201d 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 \u201cmvn verify\u201d to run against the default profile of a particular release</li>
-          <li>Use \u201cmvn -Dhadoop.profile=1 verify\u201d 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="releasing">Releasing</h2>
-
-<ol>
-  <li>Tag the tested branch. It should:
-    - Have its version set to note it is RC1.
-    - Be fully built, including a tar.gz of the entire project as well as the documentation.
-    <ul>
-      <li>PGP Signatures of the tarball must be signed to a separate file and made available to the public, along with the tarball and MD5 and SHA512 checksums. The <a href="https://repository.apache.org">Apache Nexus server</a> fills this role for us via the maven-release-plugin.</li>
-      <li>A vote must be made on dev@accumulo. 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.
-        <ul>
-          <li>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.</li>
-        </ul>
-      </li>
-      <li>Upon successful vote, the new releases can be retagged to remove the RC status and released on the Accumulo webpage.</li>
-      <li>If at any time the tag needs to be remade due to any sort of error, it should be incremented to the next release candidate number.</li>
-    </ul>
-  </li>
-</ol>
-
-
-        </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\u2026</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\u2026</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/governance/voting.html
----------------------------------------------------------------------
diff --git a/governance/voting.html b/governance/voting.html
index 4f99f6d..ac2cbd7 100644
--- a/governance/voting.html
+++ b/governance/voting.html
@@ -1,252 +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>Voting</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">Voting</h1>
-          
-          <p>Occasionally a \u201cfeel\u201d for consensus is not enough. Sometimes we need to have a
-measurable consensus. For example, when voting in new committers or to approve a
-release.</p>
-
-<h2 id="preparing-for-a-vote">Preparing for a Vote</h2>
-
-<p>Before calling a vote it is important to ensure that the community is given time to
-discuss the upcoming vote. This will be done by posting an email to the list
-indicating the intention to call a vote and the options available. By the time a
-vote is called there should already be <a href="consensusBuilding">consensus in the community</a>. The vote 
-itself is, normally, a formality.</p>
-
-<h2 id="calling-a-vote">Calling a Vote</h2>
-
-<p>Once it is time to call the vote a mail is posted with a subject starting with
-\u201c[VOTE]\u201d. This enables the community members to ensure they do not miss an important
-vote thread. It also indicates that this is not consensus building but a formal
-vote. The initiator is responsible for the vote. That means also to count the votes
-and present the results. Everyone has 1 vote.</p>
-
-<h3 id="casting-your-vote">Casting Your Vote</h3>
-
-<p>The notation used in voting is:</p>
-
-<p>+1 (means I vote positive)
-   You can say why you vote positive but it\u2019s not a must-have.</p>
-
-<p>0 (means I have no strong opinion, aka abstention)</p>
-
-<p>-1 (means I vote negative because of the following reason)
-   Yes, you must support your objection and provide an alternative course of action
-   that you are willing and able to implement (where appropriate).</p>
-
-<h4 id="example-for-a-vote-mail">Example for a vote mail:</h4>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>Address: private@
-Subject: [VOTE] John Doe should become a regular committer
-
-Text:
-"I would like to propose to vote in John Doe as committer. John has showed in
-the last months that he has the skills and oversight for improving things (think
-about the last UI change of the "Find" dialog)."
-
-+1 (means I vote for John)
- 0 (means I'm not for John but also not against to vote him in)
--1 (means I'm not for John because of the following reason(s):
-
-Voting time frame is finished 72 hours from now until June 30, 12:00 PM UTC.
-</code></pre>
-</div>
-
-<h4 id="example-for-a-reply-mail">Example for a reply mail:</h4>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>Text:
-+1
-
-I like his work and want him to stay and to go on with his good improvements.
-</code></pre>
-</div>
-
-<h4 id="example-for-a-result-mail">Example for a result mail:</h4>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>Subject: [VOTE][RESULTS] John Doe should become a regular committer
-
-Text:
-Vote started Thu, Jun 27, 2011 at 12:00 PM UTC, voting is now closed.
-
-Voting results:
-
---- Numbers ---
-
-+1: 6
- 0: 0
--1: 0
-
---- Details ---
-
-+1 John
-+1 Jane
-+1 David
-+1 Dolores
-+1 Carl
-+1 Chris
-</code></pre>
-</div>
-
-<p><a href="https://www.apache.org/foundation/voting">See here for more information</a> <br />
-<a href="https://community.apache.org/newcommitter">See here for more mail templates</a></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>
+<title>Redirecting\u2026</title>
+<link rel="canonical" href="https://accumulo.apache.org/contributor/voting.html">
+<meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/contributor/voting.html">
+<h1>Redirecting\u2026</h1>
+<a href="https://accumulo.apache.org/contributor/voting.html">Click here if you are not redirected.</a>
+<script>location="https://accumulo.apache.org/contributor/voting.html"</script>
 </html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index a08b35f..5a33f31 100644
--- a/index.html
+++ b/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/mailing_list.html
----------------------------------------------------------------------
diff --git a/mailing_list.html b/mailing_list.html
deleted file mode 100644
index a5f755c..0000000
--- a/mailing_list.html
+++ /dev/null
@@ -1,209 +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>Mailing Lists</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">Mailing Lists</h1>
-          
-          <p>All Accumulo mailing lists are in the accumulo.apache.org domain. Please note
-that search providers linked on this page are not part of the <a href="https://lists.apache.org">official Apache
-mailing list archives</a>.</p>
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>Name</th>
-      <th>Description</th>
-      <th>Read</th>
-      <th>Follow</th>
-      <th>Post</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td><strong>user</strong></td>
-      <td>General user questions, help, and announcements</td>
-      <td><a class="btn btn-primary btn-xs" href="https://lists.apache.org/list.html?user@accumulo.apache.org"><span class="glyphicon glyphicon-search"></span> Archive</a></td>
-      <td><a class="btn btn-success btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a class="btn btn-danger btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#045;&#117;&#110;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></td>
-      <td><a class="btn btn-warning btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-envelope"></span> Post</a></td>
-    </tr>
-    <tr>
-      <td><strong>dev</strong></td>
-      <td>Contributor discussions and development activity</td>
-      <td><a class="btn btn-primary btn-xs" href="https://lists.apache.org/list.html?dev@accumulo.apache.org"><span class="glyphicon glyphicon-search"></span> Archive</a></td>
-      <td><a class="btn btn-success btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a class="btn btn-danger btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#045;&#117;&#110;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></td>
-      <td><a class="btn btn-warning btn-xs" 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;"><span class="glyphicon glyphicon-envelope"></span> Post</a></td>
-    </tr>
-    <tr>
-      <td><strong>commits</strong></td>
-      <td>Code changes</td>
-      <td><a class="btn btn-primary btn-xs" href="https://lists.apache.org/list.html?commits@accumulo.apache.org"><span class="glyphicon glyphicon-search"></span> Archive</a></td>
-      <td><a class="btn btn-success btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#099;&#111;&#109;&#109;&#105;&#116;&#115;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a class="btn btn-danger btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#099;&#111;&#109;&#109;&#105;&#116;&#115;&#045;&#117;&#110;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></td>
-      <td>�</td>
-    </tr>
-    <tr>
-      <td><strong>notifications</strong></td>
-      <td>Automated notifications (JIRA, etc.)</td>
-      <td><a class="btn btn-primary btn-xs" href="https://lists.apache.org/list.html?notifications@accumulo.apache.org"><span class="glyphicon glyphicon-search"></span> Archive</a></td>
-      <td><a class="btn btn-success btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#110;&#111;&#116;&#105;&#102;&#105;&#099;&#097;&#116;&#105;&#111;&#110;&#115;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a class="btn btn-danger btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#110;&#111;&#116;&#105;&#102;&#105;&#099;&#097;&#116;&#105;&#111;&#110;&#115;&#045;&#117;&#110;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></td>
-      <td>�</td>
-    </tr>
-  </tbody>
-</table>
-
-
-        </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/mailing_list/index.html
----------------------------------------------------------------------
diff --git a/mailing_list/index.html b/mailing_list/index.html
new file mode 100644
index 0000000..6a95be1
--- /dev/null
+++ b/mailing_list/index.html
@@ -0,0 +1,208 @@
+<!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>Mailing Lists</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">Mailing Lists</h1>
+          
+          <p>All Accumulo mailing lists are in the accumulo.apache.org domain. Please note
+that search providers linked on this page are not part of the <a href="https://lists.apache.org">official Apache
+mailing list archives</a>.</p>
+
+<table class="table">
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Description</th>
+      <th>Read</th>
+      <th>Follow</th>
+      <th>Post</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><strong>user</strong></td>
+      <td>General user questions, help, and announcements</td>
+      <td><a class="btn btn-primary btn-xs" href="https://lists.apache.org/list.html?user@accumulo.apache.org"><span class="glyphicon glyphicon-search"></span> Archive</a></td>
+      <td><a class="btn btn-success btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a class="btn btn-danger btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#045;&#117;&#110;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></td>
+      <td><a class="btn btn-warning btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-envelope"></span> Post</a></td>
+    </tr>
+    <tr>
+      <td><strong>dev</strong></td>
+      <td>Contributor discussions and development activity</td>
+      <td><a class="btn btn-primary btn-xs" href="https://lists.apache.org/list.html?dev@accumulo.apache.org"><span class="glyphicon glyphicon-search"></span> Archive</a></td>
+      <td><a class="btn btn-success btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a class="btn btn-danger btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#045;&#117;&#110;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></td>
+      <td><a class="btn btn-warning btn-xs" 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;"><span class="glyphicon glyphicon-envelope"></span> Post</a></td>
+    </tr>
+    <tr>
+      <td><strong>commits</strong></td>
+      <td>Code changes</td>
+      <td><a class="btn btn-primary btn-xs" href="https://lists.apache.org/list.html?commits@accumulo.apache.org"><span class="glyphicon glyphicon-search"></span> Archive</a></td>
+      <td><a class="btn btn-success btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#099;&#111;&#109;&#109;&#105;&#116;&#115;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a class="btn btn-danger btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#099;&#111;&#109;&#109;&#105;&#116;&#115;&#045;&#117;&#110;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td><strong>notifications</strong></td>
+      <td>Automated notifications (JIRA, etc.)</td>
+      <td><a class="btn btn-primary btn-xs" href="https://lists.apache.org/list.html?notifications@accumulo.apache.org"><span class="glyphicon glyphicon-search"></span> Archive</a></td>
+      <td><a class="btn btn-success btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#110;&#111;&#116;&#105;&#102;&#105;&#099;&#097;&#116;&#105;&#111;&#110;&#115;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a class="btn btn-danger btn-xs" href="&#109;&#097;&#105;&#108;&#116;&#111;:&#110;&#111;&#116;&#105;&#102;&#105;&#099;&#097;&#116;&#105;&#111;&#110;&#115;&#045;&#117;&#110;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#097;&#099;&#099;&#117;&#109;&#117;&#108;&#111;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a></td>
+      <td>�</td>
+    </tr>
+  </tbody>
+</table>
+
+
+        </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>


[11/11] accumulo-website git commit: Jekyll build from master:a71056c

Posted by mw...@apache.org.
Jekyll build from master:a71056c

Several updates to website

* Combined governance and contributor guide pages
* Added notes about testing/updating accumulo-examples during release
* Consolidated release docs in two pages: making & verifying
* Moved all pages at root of repo to pages/ (except index.md) but kept
  link structure
* Renamed 'Papers & Presentation' to 'External Docs' as it contains
  links to books and blog posts.


Project: http://git-wip-us.apache.org/repos/asf/accumulo-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo-website/commit/fd45f7a2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo-website/tree/fd45f7a2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo-website/diff/fd45f7a2

Branch: refs/heads/asf-site
Commit: fd45f7a21c1bb3a73eef4284af606c4d5d6eb95a
Parents: fd82a85
Author: Mike Walch <mw...@apache.org>
Authored: Wed Dec 14 09:31:27 2016 -0500
Committer: Mike Walch <mw...@apache.org>
Committed: Wed Dec 14 09:31:27 2016 -0500

----------------------------------------------------------------------
 1.3/user_manual/Accumulo_Design.html            |   5 +-
 1.3/user_manual/Accumulo_Shell.html             |   5 +-
 1.3/user_manual/Administration.html             |   5 +-
 1.3/user_manual/Analytics.html                  |   5 +-
 1.3/user_manual/Contents.html                   |   5 +-
 1.3/user_manual/High_Speed_Ingest.html          |   5 +-
 1.3/user_manual/Introduction.html               |   5 +-
 1.3/user_manual/Security.html                   |   5 +-
 1.3/user_manual/Shell_Commands.html             |   5 +-
 1.3/user_manual/Table_Configuration.html        |   5 +-
 1.3/user_manual/Table_Design.html               |   5 +-
 1.3/user_manual/Writing_Accumulo_Clients.html   |   5 +-
 1.3/user_manual/accumulo_user_manual.html       |   5 +-
 1.3/user_manual/examples/aggregation.html       |   5 +-
 1.3/user_manual/examples/batch.html             |   5 +-
 1.3/user_manual/examples/bloom.html             |   5 +-
 1.3/user_manual/examples/bulkIngest.html        |   5 +-
 1.3/user_manual/examples/constraints.html       |   5 +-
 1.3/user_manual/examples/dirlist.html           |   5 +-
 1.3/user_manual/examples/filter.html            |   5 +-
 1.3/user_manual/examples/helloworld.html        |   5 +-
 1.3/user_manual/examples/index.html             |   5 +-
 1.3/user_manual/examples/mapred.html            |   5 +-
 1.3/user_manual/examples/shard.html             |   5 +-
 1.3/user_manual/index.html                      |   5 +-
 1.4/examples/batch.html                         |   5 +-
 1.4/examples/bloom.html                         |   5 +-
 1.4/examples/bulkIngest.html                    |   5 +-
 1.4/examples/combiner.html                      |   5 +-
 1.4/examples/constraints.html                   |   5 +-
 1.4/examples/dirlist.html                       |   5 +-
 1.4/examples/filedata.html                      |   5 +-
 1.4/examples/filter.html                        |   5 +-
 1.4/examples/helloworld.html                    |   5 +-
 1.4/examples/index.html                         |   5 +-
 1.4/examples/isolation.html                     |   5 +-
 1.4/examples/mapred.html                        |   5 +-
 1.4/examples/shard.html                         |   5 +-
 1.4/examples/visibility.html                    |   5 +-
 1.4/user_manual/Accumulo_Design.html            |   5 +-
 1.4/user_manual/Accumulo_Shell.html             |   5 +-
 1.4/user_manual/Administration.html             |   5 +-
 1.4/user_manual/Analytics.html                  |   5 +-
 1.4/user_manual/Contents.html                   |   5 +-
 1.4/user_manual/Development_Clients.html        |   5 +-
 1.4/user_manual/High_Speed_Ingest.html          |   5 +-
 1.4/user_manual/Introduction.html               |   5 +-
 1.4/user_manual/Security.html                   |   5 +-
 1.4/user_manual/Shell_Commands.html             |   5 +-
 1.4/user_manual/Table_Configuration.html        |   5 +-
 1.4/user_manual/Table_Design.html               |   5 +-
 1.4/user_manual/Writing_Accumulo_Clients.html   |   5 +-
 1.4/user_manual/accumulo_user_manual.html       |   5 +-
 1.4/user_manual/index.html                      |   5 +-
 1.5/examples/batch.html                         |   5 +-
 1.5/examples/bloom.html                         |   5 +-
 1.5/examples/bulkIngest.html                    |   5 +-
 1.5/examples/classpath.html                     |   5 +-
 1.5/examples/client.html                        |   5 +-
 1.5/examples/combiner.html                      |   5 +-
 1.5/examples/constraints.html                   |   5 +-
 1.5/examples/dirlist.html                       |   5 +-
 1.5/examples/export.html                        |   5 +-
 1.5/examples/filedata.html                      |   5 +-
 1.5/examples/filter.html                        |   5 +-
 1.5/examples/helloworld.html                    |   5 +-
 1.5/examples/index.html                         |   5 +-
 1.5/examples/isolation.html                     |   5 +-
 1.5/examples/mapred.html                        |   5 +-
 1.5/examples/maxmutation.html                   |   5 +-
 1.5/examples/regex.html                         |   5 +-
 1.5/examples/rowhash.html                       |   5 +-
 1.5/examples/shard.html                         |   5 +-
 1.5/examples/tabletofile.html                   |   5 +-
 1.5/examples/terasort.html                      |   5 +-
 1.5/examples/visibility.html                    |   5 +-
 1.6/examples/batch.html                         |   5 +-
 1.6/examples/bloom.html                         |   5 +-
 1.6/examples/bulkIngest.html                    |   5 +-
 1.6/examples/classpath.html                     |   5 +-
 1.6/examples/client.html                        |   5 +-
 1.6/examples/combiner.html                      |   5 +-
 1.6/examples/constraints.html                   |   5 +-
 1.6/examples/dirlist.html                       |   5 +-
 1.6/examples/export.html                        |   5 +-
 1.6/examples/filedata.html                      |   5 +-
 1.6/examples/filter.html                        |   5 +-
 1.6/examples/helloworld.html                    |   5 +-
 1.6/examples/index.html                         |   5 +-
 1.6/examples/isolation.html                     |   5 +-
 1.6/examples/mapred.html                        |   5 +-
 1.6/examples/maxmutation.html                   |   5 +-
 1.6/examples/regex.html                         |   5 +-
 1.6/examples/reservations.html                  |   5 +-
 1.6/examples/rowhash.html                       |   5 +-
 1.6/examples/shard.html                         |   5 +-
 1.6/examples/tabletofile.html                   |   5 +-
 1.6/examples/terasort.html                      |   5 +-
 1.6/examples/visibility.html                    |   5 +-
 1.7/examples/batch.html                         |   5 +-
 1.7/examples/bloom.html                         |   5 +-
 1.7/examples/bulkIngest.html                    |   5 +-
 1.7/examples/classpath.html                     |   5 +-
 1.7/examples/client.html                        |   5 +-
 1.7/examples/combiner.html                      |   5 +-
 1.7/examples/constraints.html                   |   5 +-
 1.7/examples/dirlist.html                       |   5 +-
 1.7/examples/export.html                        |   5 +-
 1.7/examples/filedata.html                      |   5 +-
 1.7/examples/filter.html                        |   5 +-
 1.7/examples/helloworld.html                    |   5 +-
 1.7/examples/index.html                         |   5 +-
 1.7/examples/isolation.html                     |   5 +-
 1.7/examples/mapred.html                        |   5 +-
 1.7/examples/maxmutation.html                   |   5 +-
 1.7/examples/regex.html                         |   5 +-
 1.7/examples/reservations.html                  |   5 +-
 1.7/examples/rowhash.html                       |   5 +-
 1.7/examples/shard.html                         |   5 +-
 1.7/examples/tabletofile.html                   |   5 +-
 1.7/examples/terasort.html                      |   5 +-
 1.7/examples/visibility.html                    |   5 +-
 1.8/examples/batch.html                         |   5 +-
 1.8/examples/bloom.html                         |   5 +-
 1.8/examples/bulkIngest.html                    |   5 +-
 1.8/examples/classpath.html                     |   5 +-
 1.8/examples/client.html                        |   5 +-
 1.8/examples/combiner.html                      |   5 +-
 1.8/examples/constraints.html                   |   5 +-
 1.8/examples/dirlist.html                       |   5 +-
 1.8/examples/export.html                        |   5 +-
 1.8/examples/filedata.html                      |   5 +-
 1.8/examples/filter.html                        |   5 +-
 1.8/examples/helloworld.html                    |   5 +-
 1.8/examples/index.html                         |   5 +-
 1.8/examples/isolation.html                     |   5 +-
 1.8/examples/mapred.html                        |   5 +-
 1.8/examples/maxmutation.html                   |   5 +-
 1.8/examples/regex.html                         |   5 +-
 1.8/examples/reservations.html                  |   5 +-
 1.8/examples/rgbalancer.html                    |   5 +-
 1.8/examples/rowhash.html                       |   5 +-
 1.8/examples/sample.html                        |   5 +-
 1.8/examples/shard.html                         |   5 +-
 1.8/examples/tabletofile.html                   |   5 +-
 1.8/examples/terasort.html                      |   5 +-
 1.8/examples/visibility.html                    |   5 +-
 blog/2014/05/03/accumulo-classloader.html       |   5 +-
 .../27/getting-started-with-accumulo-1.6.0.html |   5 +-
 ...aling-accumulo-with-multivolume-support.html |   5 +-
 .../07/09/functional-reads-over-accumulo.html   |   5 +-
 ...tores-for-configuring-accumulo-with-ssl.html |   5 +-
 .../2015/03/20/balancing-groups-of-tablets.html |   5 +-
 ...plicating-data-across-accumulo-clusters.html |   5 +-
 blog/2016/11/02/durability-performance.html     |   5 +-
 blog/2016/11/16/simpler-scripts-and-config.html |   5 +-
 blog/index.html                                 |   8 +-
 bylaws.html                                     |   8 +-
 contributor/bylaws.html                         | 437 ++++++++++
 contributor/consensusBuilding.html              | 211 +++++
 contributor/contrib-projects.html               |   5 +-
 contributor/git.html                            |  11 +-
 contributor/index.html                          |  36 +-
 contributor/lazyConsensus.html                  | 214 +++++
 contributor/making-release.html                 | 321 +++++++
 contributor/rb.html                             |   9 +-
 contributor/releasing.html                      | 307 +------
 contributor/source.html                         |   9 +-
 contributor/verifying-release.html              | 310 +++++++
 contributor/verifying_releases.html             | 249 ------
 contributor/versioning.html                     |   5 +-
 contributor/voting.html                         | 251 ++++++
 docs-archive/index.html                         |   5 +-
 downloads/index.html                            |   5 +-
 example/wikisearch.html                         |   5 +-
 external-docs/index.html                        | 446 ++++++++++
 features/index.html                             |   5 +-
 feed.xml                                        |   4 +-
 get_involved.html                               | 244 ------
 get_involved/index.html                         | 250 ++++++
 glossary/index.html                             |   5 +-
 governance/bylaws.html                          | 442 +---------
 governance/consensusBuilding.html               | 216 +----
 governance/index.html                           | 170 ----
 governance/lazyConsensus.html                   | 219 +----
 governance/releasing.html                       | 239 +-----
 governance/voting.html                          | 256 +-----
 index.html                                      |   5 +-
 mailing_list.html                               | 209 -----
 mailing_list/index.html                         | 208 +++++
 news.html                                       | 367 --------
 news/index.html                                 | 366 ++++++++
 papers.html                                     |   8 +-
 papers/index.html                               | 457 ----------
 people.html                                     | 851 -------------------
 people/index.html                               | 850 ++++++++++++++++++
 projects.html                                   | 253 +-----
 related-projects/index.html                     | 248 ++++++
 release/accumulo-1.5.1/index.html               |   5 +-
 release/accumulo-1.5.2/index.html               |   5 +-
 release/accumulo-1.5.3/index.html               |   5 +-
 release/accumulo-1.5.4/index.html               |   5 +-
 release/accumulo-1.6.0/index.html               |   5 +-
 release/accumulo-1.6.1/index.html               |   5 +-
 release/accumulo-1.6.2/index.html               |   5 +-
 release/accumulo-1.6.3/index.html               |   5 +-
 release/accumulo-1.6.4/index.html               |   5 +-
 release/accumulo-1.6.5/index.html               |   5 +-
 release/accumulo-1.6.6/index.html               |   5 +-
 release/accumulo-1.7.0/index.html               |   5 +-
 release/accumulo-1.7.1/index.html               |   5 +-
 release/accumulo-1.7.2/index.html               |   5 +-
 release/accumulo-1.8.0/index.html               |   5 +-
 release/index.html                              |   5 +-
 releasing.html                                  |   8 +-
 verifying_releases.html                         |   8 +-
 216 files changed, 4578 insertions(+), 5022 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/Accumulo_Design.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/Accumulo_Design.html b/1.3/user_manual/Accumulo_Design.html
index ecbdb12..d92d1c6 100644
--- a/1.3/user_manual/Accumulo_Design.html
+++ b/1.3/user_manual/Accumulo_Design.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/Accumulo_Shell.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/Accumulo_Shell.html b/1.3/user_manual/Accumulo_Shell.html
index e03e25b..3f6f423 100644
--- a/1.3/user_manual/Accumulo_Shell.html
+++ b/1.3/user_manual/Accumulo_Shell.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/Administration.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/Administration.html b/1.3/user_manual/Administration.html
index e5cbfbe..3bca422 100644
--- a/1.3/user_manual/Administration.html
+++ b/1.3/user_manual/Administration.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/Analytics.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/Analytics.html b/1.3/user_manual/Analytics.html
index bba9714..33756c6 100644
--- a/1.3/user_manual/Analytics.html
+++ b/1.3/user_manual/Analytics.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/Contents.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/Contents.html b/1.3/user_manual/Contents.html
index dbe0569..e8dbbdd 100644
--- a/1.3/user_manual/Contents.html
+++ b/1.3/user_manual/Contents.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/High_Speed_Ingest.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/High_Speed_Ingest.html b/1.3/user_manual/High_Speed_Ingest.html
index 6dc72f7..81b6c73 100644
--- a/1.3/user_manual/High_Speed_Ingest.html
+++ b/1.3/user_manual/High_Speed_Ingest.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/Introduction.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/Introduction.html b/1.3/user_manual/Introduction.html
index 1d463dc..32e771d 100644
--- a/1.3/user_manual/Introduction.html
+++ b/1.3/user_manual/Introduction.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/Security.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/Security.html b/1.3/user_manual/Security.html
index cb82433..07c4e3b 100644
--- a/1.3/user_manual/Security.html
+++ b/1.3/user_manual/Security.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/Shell_Commands.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/Shell_Commands.html b/1.3/user_manual/Shell_Commands.html
index f3ddc50..b11a3b6 100644
--- a/1.3/user_manual/Shell_Commands.html
+++ b/1.3/user_manual/Shell_Commands.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/Table_Configuration.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/Table_Configuration.html b/1.3/user_manual/Table_Configuration.html
index 6007b3e..5e7190c 100644
--- a/1.3/user_manual/Table_Configuration.html
+++ b/1.3/user_manual/Table_Configuration.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/Table_Design.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/Table_Design.html b/1.3/user_manual/Table_Design.html
index 83d5ae2..c2a1d65 100644
--- a/1.3/user_manual/Table_Design.html
+++ b/1.3/user_manual/Table_Design.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/Writing_Accumulo_Clients.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/Writing_Accumulo_Clients.html b/1.3/user_manual/Writing_Accumulo_Clients.html
index bb1dbf5..cdbe6a4 100644
--- a/1.3/user_manual/Writing_Accumulo_Clients.html
+++ b/1.3/user_manual/Writing_Accumulo_Clients.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/accumulo_user_manual.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/accumulo_user_manual.html b/1.3/user_manual/accumulo_user_manual.html
index 19fe781..cda4ac2 100644
--- a/1.3/user_manual/accumulo_user_manual.html
+++ b/1.3/user_manual/accumulo_user_manual.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/examples/aggregation.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/examples/aggregation.html b/1.3/user_manual/examples/aggregation.html
index 7650dce..0b91e41 100644
--- a/1.3/user_manual/examples/aggregation.html
+++ b/1.3/user_manual/examples/aggregation.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/examples/batch.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/examples/batch.html b/1.3/user_manual/examples/batch.html
index 8bc583f..e54b919 100644
--- a/1.3/user_manual/examples/batch.html
+++ b/1.3/user_manual/examples/batch.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/examples/bloom.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/examples/bloom.html b/1.3/user_manual/examples/bloom.html
index 4e61d4a..c41a34a 100644
--- a/1.3/user_manual/examples/bloom.html
+++ b/1.3/user_manual/examples/bloom.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/examples/bulkIngest.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/examples/bulkIngest.html b/1.3/user_manual/examples/bulkIngest.html
index a9ae9d5..b7ae54f 100644
--- a/1.3/user_manual/examples/bulkIngest.html
+++ b/1.3/user_manual/examples/bulkIngest.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/examples/constraints.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/examples/constraints.html b/1.3/user_manual/examples/constraints.html
index dd16798..0e4caf7 100644
--- a/1.3/user_manual/examples/constraints.html
+++ b/1.3/user_manual/examples/constraints.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/examples/dirlist.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/examples/dirlist.html b/1.3/user_manual/examples/dirlist.html
index 7c271d3..d9af8f8 100644
--- a/1.3/user_manual/examples/dirlist.html
+++ b/1.3/user_manual/examples/dirlist.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/examples/filter.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/examples/filter.html b/1.3/user_manual/examples/filter.html
index 7615434..fbe33f8 100644
--- a/1.3/user_manual/examples/filter.html
+++ b/1.3/user_manual/examples/filter.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/examples/helloworld.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/examples/helloworld.html b/1.3/user_manual/examples/helloworld.html
index 047d566..3c1a1a1 100644
--- a/1.3/user_manual/examples/helloworld.html
+++ b/1.3/user_manual/examples/helloworld.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/examples/index.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/examples/index.html b/1.3/user_manual/examples/index.html
index 1d6e3a7..303c406 100644
--- a/1.3/user_manual/examples/index.html
+++ b/1.3/user_manual/examples/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/examples/mapred.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/examples/mapred.html b/1.3/user_manual/examples/mapred.html
index 3007e55..d0b83a7 100644
--- a/1.3/user_manual/examples/mapred.html
+++ b/1.3/user_manual/examples/mapred.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/examples/shard.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/examples/shard.html b/1.3/user_manual/examples/shard.html
index 971f73c..5cb64cc 100644
--- a/1.3/user_manual/examples/shard.html
+++ b/1.3/user_manual/examples/shard.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.3/user_manual/index.html
----------------------------------------------------------------------
diff --git a/1.3/user_manual/index.html b/1.3/user_manual/index.html
index 19fe781..cda4ac2 100644
--- a/1.3/user_manual/index.html
+++ b/1.3/user_manual/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/examples/batch.html
----------------------------------------------------------------------
diff --git a/1.4/examples/batch.html b/1.4/examples/batch.html
index 3eeb523..448b86c 100644
--- a/1.4/examples/batch.html
+++ b/1.4/examples/batch.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/examples/bloom.html
----------------------------------------------------------------------
diff --git a/1.4/examples/bloom.html b/1.4/examples/bloom.html
index b2c8019..53ae6de 100644
--- a/1.4/examples/bloom.html
+++ b/1.4/examples/bloom.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/examples/bulkIngest.html
----------------------------------------------------------------------
diff --git a/1.4/examples/bulkIngest.html b/1.4/examples/bulkIngest.html
index 28690d1..150718b 100644
--- a/1.4/examples/bulkIngest.html
+++ b/1.4/examples/bulkIngest.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/examples/combiner.html
----------------------------------------------------------------------
diff --git a/1.4/examples/combiner.html b/1.4/examples/combiner.html
index e5ca912..79451dc 100644
--- a/1.4/examples/combiner.html
+++ b/1.4/examples/combiner.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/examples/constraints.html
----------------------------------------------------------------------
diff --git a/1.4/examples/constraints.html b/1.4/examples/constraints.html
index c3795b7..62c838d 100644
--- a/1.4/examples/constraints.html
+++ b/1.4/examples/constraints.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/examples/dirlist.html
----------------------------------------------------------------------
diff --git a/1.4/examples/dirlist.html b/1.4/examples/dirlist.html
index 0ef8161..264f60c 100644
--- a/1.4/examples/dirlist.html
+++ b/1.4/examples/dirlist.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/examples/filedata.html
----------------------------------------------------------------------
diff --git a/1.4/examples/filedata.html b/1.4/examples/filedata.html
index 1aa7bab..305a9bf 100644
--- a/1.4/examples/filedata.html
+++ b/1.4/examples/filedata.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/examples/filter.html
----------------------------------------------------------------------
diff --git a/1.4/examples/filter.html b/1.4/examples/filter.html
index 4103cfb..bcef614 100644
--- a/1.4/examples/filter.html
+++ b/1.4/examples/filter.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/examples/helloworld.html
----------------------------------------------------------------------
diff --git a/1.4/examples/helloworld.html b/1.4/examples/helloworld.html
index 911adf1..2abdd56 100644
--- a/1.4/examples/helloworld.html
+++ b/1.4/examples/helloworld.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/examples/index.html
----------------------------------------------------------------------
diff --git a/1.4/examples/index.html b/1.4/examples/index.html
index 3d4c8de..058aace 100644
--- a/1.4/examples/index.html
+++ b/1.4/examples/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/examples/isolation.html
----------------------------------------------------------------------
diff --git a/1.4/examples/isolation.html b/1.4/examples/isolation.html
index bfcac64..1d3a3de 100644
--- a/1.4/examples/isolation.html
+++ b/1.4/examples/isolation.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/examples/mapred.html
----------------------------------------------------------------------
diff --git a/1.4/examples/mapred.html b/1.4/examples/mapred.html
index 2164fb9..97bd815 100644
--- a/1.4/examples/mapred.html
+++ b/1.4/examples/mapred.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/examples/shard.html
----------------------------------------------------------------------
diff --git a/1.4/examples/shard.html b/1.4/examples/shard.html
index 6e2e6e7..94e8b72 100644
--- a/1.4/examples/shard.html
+++ b/1.4/examples/shard.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/examples/visibility.html
----------------------------------------------------------------------
diff --git a/1.4/examples/visibility.html b/1.4/examples/visibility.html
index ad8d617..ecbd1bf 100644
--- a/1.4/examples/visibility.html
+++ b/1.4/examples/visibility.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/user_manual/Accumulo_Design.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Accumulo_Design.html b/1.4/user_manual/Accumulo_Design.html
index 164784b..db26a2a 100644
--- a/1.4/user_manual/Accumulo_Design.html
+++ b/1.4/user_manual/Accumulo_Design.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/user_manual/Accumulo_Shell.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Accumulo_Shell.html b/1.4/user_manual/Accumulo_Shell.html
index 08437f7..6c84b61 100644
--- a/1.4/user_manual/Accumulo_Shell.html
+++ b/1.4/user_manual/Accumulo_Shell.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/user_manual/Administration.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Administration.html b/1.4/user_manual/Administration.html
index f8babcd..72142b8 100644
--- a/1.4/user_manual/Administration.html
+++ b/1.4/user_manual/Administration.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/user_manual/Analytics.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Analytics.html b/1.4/user_manual/Analytics.html
index 4e44504..c7a09fe 100644
--- a/1.4/user_manual/Analytics.html
+++ b/1.4/user_manual/Analytics.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/user_manual/Contents.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Contents.html b/1.4/user_manual/Contents.html
index 3034c79..13d8cdf 100644
--- a/1.4/user_manual/Contents.html
+++ b/1.4/user_manual/Contents.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/user_manual/Development_Clients.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Development_Clients.html b/1.4/user_manual/Development_Clients.html
index 6a39514..667feee 100644
--- a/1.4/user_manual/Development_Clients.html
+++ b/1.4/user_manual/Development_Clients.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/user_manual/High_Speed_Ingest.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/High_Speed_Ingest.html b/1.4/user_manual/High_Speed_Ingest.html
index 1a51212..ec17feb 100644
--- a/1.4/user_manual/High_Speed_Ingest.html
+++ b/1.4/user_manual/High_Speed_Ingest.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/user_manual/Introduction.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Introduction.html b/1.4/user_manual/Introduction.html
index e951f79..4a420f6 100644
--- a/1.4/user_manual/Introduction.html
+++ b/1.4/user_manual/Introduction.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/user_manual/Security.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Security.html b/1.4/user_manual/Security.html
index 5065968..37a8c2c 100644
--- a/1.4/user_manual/Security.html
+++ b/1.4/user_manual/Security.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/user_manual/Shell_Commands.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Shell_Commands.html b/1.4/user_manual/Shell_Commands.html
index 8c2cb7e..bf10942 100644
--- a/1.4/user_manual/Shell_Commands.html
+++ b/1.4/user_manual/Shell_Commands.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/user_manual/Table_Configuration.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Table_Configuration.html b/1.4/user_manual/Table_Configuration.html
index 0d0a701..04de4b2 100644
--- a/1.4/user_manual/Table_Configuration.html
+++ b/1.4/user_manual/Table_Configuration.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/user_manual/Table_Design.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Table_Design.html b/1.4/user_manual/Table_Design.html
index c1c4ff9..0236372 100644
--- a/1.4/user_manual/Table_Design.html
+++ b/1.4/user_manual/Table_Design.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/user_manual/Writing_Accumulo_Clients.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/Writing_Accumulo_Clients.html b/1.4/user_manual/Writing_Accumulo_Clients.html
index 946025a..a3593bd 100644
--- a/1.4/user_manual/Writing_Accumulo_Clients.html
+++ b/1.4/user_manual/Writing_Accumulo_Clients.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/user_manual/accumulo_user_manual.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/accumulo_user_manual.html b/1.4/user_manual/accumulo_user_manual.html
index 8294200..3faabdf 100644
--- a/1.4/user_manual/accumulo_user_manual.html
+++ b/1.4/user_manual/accumulo_user_manual.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.4/user_manual/index.html
----------------------------------------------------------------------
diff --git a/1.4/user_manual/index.html b/1.4/user_manual/index.html
index 8294200..3faabdf 100644
--- a/1.4/user_manual/index.html
+++ b/1.4/user_manual/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/batch.html
----------------------------------------------------------------------
diff --git a/1.5/examples/batch.html b/1.5/examples/batch.html
index 286ec8d..e173669 100644
--- a/1.5/examples/batch.html
+++ b/1.5/examples/batch.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/bloom.html
----------------------------------------------------------------------
diff --git a/1.5/examples/bloom.html b/1.5/examples/bloom.html
index 2eb0f86..3152390 100644
--- a/1.5/examples/bloom.html
+++ b/1.5/examples/bloom.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/1.5/examples/bulkIngest.html
----------------------------------------------------------------------
diff --git a/1.5/examples/bulkIngest.html b/1.5/examples/bulkIngest.html
index 4748c6f..34bca93 100644
--- a/1.5/examples/bulkIngest.html
+++ b/1.5/examples/bulkIngest.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>


[08/11] accumulo-website git commit: Jekyll build from master:a71056c

Posted by mw...@apache.org.
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 \u201cLazy Consensus\u201d 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\u2019t have to insist people discuss and/or
+approve your plan, and you certainly don\u2019t need to call a vote to get approval.
+You just assume you have the community\u2019s 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\u2019s 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\u2019t 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\u2019re using the correct major release of Java (check javadoc too).</li>
+  <li>Ensure that you\u2019re 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\u2019s 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\u2019s 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\u2019t accidentally push a \u201crelease\u201d 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 \u2013test option can 
+be used as a dry run for creating a release candidate. The \u2013create-release-candidate option should be 
+used to create the actual release candidate.</p>
+
+<p>When invoking build.sh with the \u2013create-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 \u2018RC\u2019 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 \u201cnext\u201d 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\u2019re 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\u2019s 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 \u201crel/\u201d. For example, a release of 1.7.0 should have a corresponding
+tag name of \u201crel/1.7.0\u201d.</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\u2019t have the commit hook already configured)</li>
+  <li>Don\u2019t 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\u2019t 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\u2019re using the correct major release of Java (check javadoc too).</li>
-  <li>Ensure that you\u2019re 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\u2019s 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\u2019s 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\u2019t accidentally push a \u201crelease\u201d 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 \u2013test option can 
-be used as a dry run for creating a release candidate. The \u2013create-release-candidate option should be 
-used to create the actual release candidate.</p>
-
-<p>When invoking build.sh with the \u2013create-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 \u2018RC\u2019 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 \u201cnext\u201d 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\u2019re 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\u2019s 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\u2019re 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 \u201crel/\u201d. For example, a release of 1.7.0 should have a corresponding
-tag name of \u201crel/1.7.0\u201d.</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\u2019t have the commit hook already configured)</li>
-  <li>Don\u2019t 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\u2026</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\u2026</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\u2019s 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\u2019s 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\u2019s 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. \u201c-Dhadoop.profile=2\u201d 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 \u201cmvn package\u201d to run against the default profile of a particular release
+    - Use \u201cmvn -Dhadoop.profile=2 package\u201d to test against the Hadoop 2 profile on e.g. 1.4 or 1.5
+    - Use \u201cmvn -Dhadoop.profile=1 package\u201d 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 \u201cmvn verify\u201d to run against the default profile of a particular release</li>
+          <li>Use \u201cmvn -Dhadoop.profile=1 verify\u201d 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\u2019s 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\u2019s 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\u2019s
+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\u2019s NOTICE file should be appended
+to this artifact\u2019s 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\u2019s 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\u2019s 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\u2019s 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\u2019s
-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\u2019s NOTICE file should be appended
-to this artifact\u2019s 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\u2019s 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>


[02/11] accumulo-website git commit: Several updates to website

Posted by mw...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/governance/bylaws.md
----------------------------------------------------------------------
diff --git a/governance/bylaws.md b/governance/bylaws.md
deleted file mode 100644
index 04707c0..0000000
--- a/governance/bylaws.md
+++ /dev/null
@@ -1,193 +0,0 @@
----
-title: Bylaws
-redirect_from: /bylaws
----
-
-This is version 3 of the bylaws. Community work actively continues on the bylaws, and so key segments of them are subject to change.
-
-# Introduction
-
-This document defines the bylaws under which the Apache Accumulo project operates. It defines the roles and responsibilities of the project, who may vote, how voting works, how conflicts are resolved, etc.
-
-Accumulo is a project of the [Apache Software Foundation][foundation]. The foundation holds the copyright on Apache code including the code in the Accumulo codebase. The [foundation FAQ][foundation-faq] explains the operation and background of the foundation.
-
-Accumulo is typical of Apache projects in that it operates under a set of principles, known collectively as the Apache Way. If you are new to Apache development, please refer to the [Incubator project][incubator] for more information on how Apache projects operate. Terms used at the ASF are defined in the [ASF glossary][glossary].
-
-# Roles and Responsibilities
-
-Apache projects define a set of roles with associated rights and responsibilities. These roles govern what tasks an individual may perform within the project. The roles are defined in the following sections.
-
-## Users
-
-The most important participants in the project are people who use our software. The majority of our contributors start out as users and guide their development efforts from the user's perspective.
-
-Users contribute to the Apache projects by providing feedback to contributors in the form of bug reports and feature suggestions. As well, users participate in the Apache community by helping other users on mailing lists and user support forums.
-
-## Contributors
-
-All of the volunteers who are contributing time, code, documentation, or resources to the Accumulo project are considered contributors. A contributor that makes sustained, welcome contributions to the project may be invited to become a committer, though the exact timing of such invitations depends on many factors.
-
-## Committers
-
-The project's committers are responsible for the project's technical management. Committers have write access to the project's code repositories and may cast binding votes on any technical discussion regarding Accumulo. Committer access is by invitation only and must be approved by consensus approval of the active PMC members. Upon acceptance of the invitation to become a committer, it is the accepting member\u2019s responsibility to update their status on the Accumulo web page accordingly.
-
-A committer is considered emeritus, meaning inactive, by their own declaration or by not reviewing patches or committing patches to the project for over six months. Emeritus members will be recognized by the PMC on the Accumulo web page, in honor of their past contributions. Emeritus members retain all voting and commit rights associated with their former designation and can move themselves out of emeritus status by sending an announcement of their return to the developer mailing list. It will be the returning member's responsibility to update their status on the web page accordingly.
-
-An emeritus committer\u2019s commit access may be disabled as part of routine security. Access shall not be removed without notifying the committer, and access shall be maintained if the committer wishes to leave it active. A committer\u2019s commit access shall be reactivated upon the committer\u2019s request to the PMC.
-
-All Apache committers are required to have a signed [Contributor License Agreement][icla] (CLA) on file with the Apache Software Foundation. Under the terms of the CLA that all committers must sign, a committer's primary responsibility is to ensure that all code committed to Apache Accumulo is licensed appropriately and meets those criteria set forth in the CLA (including both original works and patches committed on behalf of other contributors). There is a [Committer FAQ][committer-faq] which provides more details on the requirements for committers. 
-
-It is the custom of the Accumulo project to also invite each committer to become a member of the Accumulo PMC.
-
-## Project Management Committee
-
-The role of the PMC, from a Foundation perspective, is [oversight][pmc-howto]. The main
-role of the PMC is not code and not coding, but to ensure that all legal
-issues are addressed, that procedure is followed, and that each and every
-release is the product of the community as a whole. That is key to our
-litigation protection mechanisms.
-
-Secondly, the role of the PMC is to further the long-term development and
-health of the community as a whole, and to ensure that balanced and wide
-scale peer review and collaboration does happen. Within the ASF, we worry
-about any community which centers around a few individuals who are working
-virtually uncontested. We believe that this is detrimental to quality,
-stability, and robustness of both code and long term social structures.
-
-The responsibilities of the PMC include:
-
-* Deciding what is distributed as products of the Apache Accumulo project.
-* Maintaining the project's shared resources, including the code repository, mailing lists, and websites.
-* Protecting and ensuring proper use of Apache trademarks by the project and by other parties.
-* Speaking on behalf of the project.
-* Nominating new PMC members and committers.
-* Maintaining these bylaws and other guidelines of the project.
-
-In particular, PMC members must understand both our project's criteria and ASF criteria for voting on a [release][release-management].
-See the [PMC Guide][pmc-guide] for more information on PMC responsibilities.
-
-Membership of the PMC is by invitation only and must be approved by a consensus approval of active PMC members. Upon acceptance of the invitation to become a PMC member, it is the accepting member\u2019s responsibility to update their status on the Accumulo web page accordingly.
-
-A PMC member is considered emeritus, meaning inactive, by their own declaration or by not contributing in any form to the project for over six months. Emeritus members will be recognized by the PMC on the Accumulo web page, in honor of their past contributions. Emeritus members retain all voting and commit rights associated with their former designation and can move themselves out of emeritus status by sending an announcement of their return to the developer mailing list. It will be the returning member's responsibility to update their status on the web page accordingly.
-
-The chair of the PMC is appointed by the ASF board. The chair is an office holder of the Apache Software Foundation (Vice President, Apache Accumulo) and has primary responsibility to the board for the management of the projects within the scope of the Accumulo PMC. The chair reports to the board quarterly on developments within the Accumulo project.
-
-When the current chair of the PMC resigns, the PMC votes to recommend a new chair using consensus approval, but the decision must be ratified by the Apache board.
-
-## Release Manager
-
-The [ASF release process][release-pub] defines the [release manager][release-manager] as an individual responsible for shepherding a new project release. Any committer may serve as a release manager. The release manager for a release is chosen as part of the release plan.
-
-At a minimum, a release manager is responsible for packaging a release candidate for a vote and signing and publishing an approved release candidate. An Accumulo release manager is also expected to:
-
-* guide whether changes after feature freeze or code freeze should be included in the release
-* ensure that required release testing is being conducted
-* track whether the release is on target for its expected release date
-* adjust release plan dates to reflect the latest estimates
-* determine if a re-plan may be needed and, if so, call a vote
-* call votes on release candidates
-
-[Release guidelines][release-guidelines] and [details on the mechanics of creating an Accumulo release][release-mechanics] are available on the Accumulo project site.
-
-# Decision Making
-
-Within the Accumulo project, different types of decisions require different forms of approval. For example, the previous section describes several decisions which require 'consensus approval'. This section defines how voting is performed, the types of approvals, and which types of decision require which type of approval.
-
-## Voting
-
-Decisions regarding the project are made by votes on the primary project development mailing list: dev@accumulo.apache.org. Where necessary, PMC voting may take place on the private Accumulo PMC mailing list: private@accumulo.apache.org. Votes are clearly indicated by a subject line starting with [VOTE]. A vote message may only pertain to a single item\u2019s approval; multiple items should be separated into multiple messages. Voting is carried out by replying to the vote mail. A vote may take on one of four forms, defined below.
-
-{: .table }
-| Vote | Meaning |
-|------|---------|
-| +1   | *Yes*, *Agree*, or *The action should be performed*. In general, this vote also indicates a willingness on the behalf of the voter to *make it happen*. |
-| +0   | This vote indicates a willingness for the action under consideration to go ahead. The voter, however, will not be able to help.                         |
-| -0   | This vote indicates that the voter does not, in general, agree with the proposed action but is not concerned enough to prevent the action going ahead.  |
-| -1   | *No*, *Disagree*, or *The action should not be performed*. On issues where consensus is required, this vote counts as a veto. All vetoes must contain an explanation of why the veto is appropriate. Vetoes with no explanation are void. It may also be appropriate for a -1 vote to include an alternative course of action. |
-
-All participants in the Accumulo project are encouraged to vote. For technical decisions, only the votes of active committers are binding. Non-binding votes are still useful for those with binding votes to understand the perception of an action across the wider Accumulo community. For PMC decisions, only the votes of active PMC members are binding.
-
-See the [voting page][voting] for more details on the mechanics of voting.
-
-## Commit Then Review (CTR)
-
-Voting can also be applied to changes to the Accumulo codebase. Under the Commit Then Review policy, committers can make changes to the codebase without seeking approval beforehand, and the changes are assumed to be approved unless an objection is raised. Only if an objection is raised must a vote take place on the code change.
-
-For some code changes, committers may wish to get feedback from the community before making the change. It is acceptable for a committer to seek approval before making a change if they so desire.
-
-## Approvals
-
-These are the types of approvals that can be sought. Different actions require different types of approvals.
-
-{: .table }
-| Approval&nbsp;Type                | Definition                                                                                       |
-|-----------------------------------|--------------------------------------------------------------------------------------------------|
-| Consensus Approval                | A consensus approval vote passes with 3 binding +1 votes and no binding vetoes.                  |
-| Majority Approval                 | A majority approval vote passes with 3 binding +1 votes and more binding +1 votes than -1 votes. |
-| Lazy Approval (or Lazy Consensus) | An action with lazy approval is implicitly allowed unless a -1 vote is received, at which time, depending on the type of action, either majority approval or consensus approval must be obtained.  Lazy Approval can be either *stated* or *assumed*, as detailed on the [lazy consensus page][lazy]. |
-
-## Vetoes
-
-A valid, binding veto cannot be overruled. If a veto is cast, it must be accompanied by a valid reason explaining the veto. The validity of a veto, if challenged, can be confirmed by anyone who has a binding vote. This does not necessarily signify agreement with the veto, but merely that the veto is valid.
-
-If you disagree with a valid veto, you must lobby the person casting the veto to withdraw their veto. If a veto is not withdrawn, the action that has been vetoed must be reversed in a timely manner.
-
-## Actions
-
-This section describes the various actions which are undertaken within the project, the corresponding approval required for that action and those who have binding votes over the action. It also specifies the minimum length of time that a vote must remain open, measured in days. In general, votes should not be called at times when it is known that interested members of the project will be unavailable.
-
-For Code Change actions, a committer may choose to employ assumed or stated Lazy Approval under the [CTR][ctr] policy. Assumed Lazy Approval has no minimum length of time before the change can be made.
-
-{: .table }
-| Action                    | Description                                                                                                 | Approval                                              | Binding Votes      | Min. Length (days) |
-|---------------------------|-------------------------------------------------------------------------------------------------------------|-------------------------------------------------------|--------------------|--------------------|
-| Code Change               | A change made to a codebase of the project. This includes source code, documentation, website content, etc. | Lazy approval, moving to consensus approval upon veto | Active committers  | 1                  |
-| Release Plan              | Defines the timetable and actions for an upcoming release. The plan also nominates a Release Manager.       | Lazy approval, moving to majority approval upon veto  | Active committers  | 3                  |
-| Release Plan Cancellation | Cancels an active release plan, due to a need to re-plan (e.g., discovery of a major issue).                | Majority approval                                     | Active committers  | 3                  |
-| Product Release           | Accepts or rejects a release candidate as an official release of the project.                               | Majority approval                                     | Active PMC members | 3                  |
-| Adoption of New Codebase  | When the codebase for an existing, released product is to be replaced with an alternative codebase. If such a vote fails to gain approval, the existing code base will continue. This also covers the creation of new sub-projects within the project. | Consensus approval | Active PMC members | 7 |
-| New Committer             | When a new committer is proposed for the project.                                                           | Consensus approval                                    | Active PMC members | 3                  |
-| New PMC Member            | When a committer is proposed for the PMC.                                                                   | Consensus approval                                    | Active PMC members | 3                  |
-| New PMC Chair             | When a new PMC chair is chosen to succeed an outgoing chair.                                                | Consensus approval                                    | Active PMC members | 3                  |
-| Modifying Bylaws          | Modifying this document.                                                                                    | Consensus approval                                    | Active PMC members | 7                  |
-
-No other voting actions are defined; all other actions should presume Lazy Approval (defaulting to Consensus Approval upon veto). If an action is voted on multiple times, or if a different approval type is desired, these bylaws should be amended to include the action.
-
-For the purposes of the "Adoption of New Codebase" action, the Accumulo codebase is defined as the Accumulo site content, primary project code, and all contributed code ("contribs") as they exist in their respective repositories. Adoption of a new codebase generally refers to the creation of a new contrib repository, but could cover, for example, a rework of the project site, or merging a contrib project into the primary codebase.
-
-Voting actions for the removal of a committer or PMC member are intentionally not defined. According to ASF rules, [committer status never expires][committer-terms] and [PMC members can only be removed with approval from the ASF Board][pmc-removal].
-
-# Release Plans
-
-The approval of a release plan begins the process of creating a new project release. The process ends when a release candidate is approved.
-
-An Accumulo release plan consists of at least the following:
-
-* a version number
-* a feature freeze date
-* a code freeze date
-* a release date
-* the choice of a release manager
-
-After feature freeze, new features should not be accepted for the release. After code freeze, only critical fixes should be accepted for the release. The release manager guides the decision on accepting changes.
-
-All dates in a plan are estimates, as unforeseen issues may require delays. The release manager may adjust dates as needed. In serious circumstances, the release manager may opt to call a re-plan vote.
-
-[foundation]: https://www.apache.org/foundation
-[foundation-faq]: https://www.apache.org/foundation/faq
-[incubator]: https://incubator.apache.org
-[glossary]: https://www.apache.org/foundation/glossary
-[icla]: https://www.apache.org/licenses/icla.txt
-[committer-faq]: https://www.apache.org/dev/committers
-[pmc-howto]: https://www.apache.org/foundation/how-it-works.html#pmc
-[release-management]: https://www.apache.org/dev/release#management
-[pmc-guide]: https://www.apache.org/dev/pmc
-[release-pub]: https://www.apache.org/dev/release-publishing
-[release-manager]: https://www.apache.org/dev/release-publishing#release_manager
-[release-guidelines]: governance/releasing
-[release-mechanics]: releasing
-[voting]: governance/voting
-[ctr]: #commit-then-review-ctr
-[committer-terms]: https://www.apache.org/dev/committers#committer-set-term
-[pmc-removal]: https://www.apache.org/dev/pmc#pmc-removal
-[lazy]: governance/lazyConsensus

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/governance/consensusBuilding.md
----------------------------------------------------------------------
diff --git a/governance/consensusBuilding.md b/governance/consensusBuilding.md
deleted file mode 100644
index 799c1e0..0000000
--- a/governance/consensusBuilding.md
+++ /dev/null
@@ -1,52 +0,0 @@
----
-title: Consensus Building
----
-
-In some cases there is no obvious path to take, or you might be a new community, 
-or a new member of an existing community. In these cases people will often 
-need to build consensus by making proposals and eliciting responses.
-
-We want to avoid unnecessary discussion and the creation of significant
-amounts of unnecessary mail that everyone in the community needs to read. 
-That is not to say that we want to avoid constructive discussion. This is 
-the lifeblood of a successful project. However, many ASF projects adopt a 
-shorthand notation for showing support, or otherwise, for a proposal.
-
-## Expressing support (or otherwise)
-
-The notation used is "+1", "-1" and "0". It's also common to see "+0" and "-0".
-
-So, what do these notations mean?
-
-  - +1 means "I agree with this and will help make it happen"
-  - +0 means "I agree with this but probably won't make it happen, so my 
-opinion is not that important"
-  - -0 means "I don't agree with this, but I'm offering no alternative so 
-my opinion is not that important"
-  - -1 means "I don't agree and I am offering an alternative that I am able 
-to help implement"
-
-Many people will use fractions to indicate the strength of their feelings,
- e.g. "+0.5". Some will even indicate this is a "no brainer" with something 
-like "+1000".
-
-The important thing is that this is not an exact science. It's just a shorthand 
-way of communicating strength of feeling.
-
-## Consensus Building is Not Voting
-
-The confusing thing about this notation is that it is the same notation
-used in a formal vote. Knowing when something is a vote and when it is a 
-preference is important. It's easy to tell though, if the subject does not have 
-"[Vote]" at the start then it's just an opinion. We try not to call votes,
-consensus building is much more inclusive.
-
-The reasons for this notation being common is 
-that when someone wants to summarise a discussion thread they can mentally 
-add up the strength of feeling of the community and decide if there is consensus
-or not.
-
-Once there is a clear consensus members of the community can proceed with 
-the work under the [lazy consensus][1] model.
-
-[1]: {{ site.baseurl }}/governance/lazyConsensus

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/governance/index.md
----------------------------------------------------------------------
diff --git a/governance/index.md b/governance/index.md
deleted file mode 100644
index 10d47d7..0000000
--- a/governance/index.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Project Governance
----
-
-* [Bylaws](/governance/bylaws)
-* [Consensus Building](/governance/consensusBuilding)
-* [Lazy Consensus](/governance/lazyConsensus)
-* [Releasing](/governance/releasing)
-* [Voting](/governance/voting)

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/governance/lazyConsensus.md
----------------------------------------------------------------------
diff --git a/governance/lazyConsensus.md b/governance/lazyConsensus.md
deleted file mode 100644
index 02af8c9..0000000
--- a/governance/lazyConsensus.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-title: Lazy Consensus
----
-
-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.
-
-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.
-
-## Avoiding Unnecessary Discussion
-
-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.
-
-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.
-
-## Stating Lazy Consensus
-
-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.
-
-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.
-
-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 [express support or objections][1] and corrections to 
-the proposal before work begins. 
-
-## Silence is consent
-
-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.
-
-[1]: {{ site.baseurl }}/governance/consensusBuilding

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/governance/releasing.md
----------------------------------------------------------------------
diff --git a/governance/releasing.md b/governance/releasing.md
deleted file mode 100644
index 75462fe..0000000
--- a/governance/releasing.md
+++ /dev/null
@@ -1,51 +0,0 @@
----
-title: Release Guide
----
-
-## Versioning
-
-Accumulo has adopted [Semantic Versioning][1] and follows their rules and guidelines.
-
-## Testing
-
-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.
-
-### Stand alone
-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.
-
-  1. 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
-  - Analyze output of static analysis tools like Findbugs and PMD.
-  - For versions 1.6 and later, all functional tests must pass via the Maven failsafe plugin.
-    - Use "mvn verify" to run against the default profile of a particular release
-    - Use "mvn -Dhadoop.profile=1 verify" to run the functional tests against the Hadoop 1 profile
-
-### Cluster based
-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.
-
-  1. 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.
-  - 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.
-    - See $ACCUMULO_HOME/test/system/randomwalk/README for details on running the LongClean module.
-  - Two 24-hour periods of the continuous ingest test must be validated successfully. One test period must use agitation and the other should not.
-    - See $ACCUMULO_HOME/test/system/continuous/README for details on running and verifying the continuous ingest test.
-  - 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.
-
-## Releasing
-
-  1. Tag the tested branch. It should:
-    - Have its version set to note it is RC1.
-    - Be fully built, including a tar.gz of the entire project as well as the documentation.
-  - PGP Signatures of the tarball must be signed to a separate file and made available to the public, along with the tarball and MD5 and SHA512 checksums. The [Apache Nexus server][nexus] fills this role for us via the maven-release-plugin.
-  - A vote must be made on dev@accumulo. 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. 
-  - Upon successful vote, the new releases can be retagged to remove the RC status and released on the Accumulo webpage.
-  - If at any time the tag needs to be remade due to any sort of error, it should be incremented to the next release candidate number.
-
-[1]: {{ site.baseurl }}/versioning
-[nexus]: https://repository.apache.org

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/governance/voting.md
----------------------------------------------------------------------
diff --git a/governance/voting.md b/governance/voting.md
deleted file mode 100644
index 998205b..0000000
--- a/governance/voting.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: Voting
----
-
-Occasionally a "feel" for consensus is not enough. Sometimes we need to have a
-measurable consensus. For example, when voting in new committers or to approve a
-release. 
-
-## Preparing for a Vote
-
-Before calling a vote it is important to ensure that the community is given time to
-discuss the upcoming vote. This will be done by posting an email to the list
-indicating the intention to call a vote and the options available. By the time a
-vote is called there should already be [consensus in the community][1]. The vote 
-itself is, normally, a formality.
-
-## Calling a Vote
-
-Once it is time to call the vote a mail is posted with a subject starting with
-"[VOTE]". This enables the community members to ensure they do not miss an important
-vote thread. It also indicates that this is not consensus building but a formal
-vote. The initiator is responsible for the vote. That means also to count the votes
-and present the results. Everyone has 1 vote.
-
-### Casting Your Vote
-
-The notation used in voting is:
-
-+1 (means I vote positive)
-   You can say why you vote positive but it's not a must-have.
-
- 0 (means I have no strong opinion, aka abstention)
-
--1 (means I vote negative because of the following reason)
-   Yes, you must support your objection and provide an alternative course of action
-   that you are willing and able to implement (where appropriate).
-
-#### Example for a vote mail:
-
-    Address: private@
-    Subject: [VOTE] John Doe should become a regular committer
-    
-    Text:
-    "I would like to propose to vote in John Doe as committer. John has showed in
-    the last months that he has the skills and oversight for improving things (think
-    about the last UI change of the "Find" dialog)."
-    
-    +1 (means I vote for John)
-     0 (means I'm not for John but also not against to vote him in)
-    -1 (means I'm not for John because of the following reason(s):
-    
-    Voting time frame is finished 72 hours from now until June 30, 12:00 PM UTC.
-
-#### Example for a reply mail:
-
-    Text:
-    +1
-    
-    I like his work and want him to stay and to go on with his good improvements.
-
-
-#### Example for a result mail:
-
-    Subject: [VOTE][RESULTS] John Doe should become a regular committer
-    
-    Text:
-    Vote started Thu, Jun 27, 2011 at 12:00 PM UTC, voting is now closed.
-    
-    Voting results:
-    
-    --- Numbers ---
-    
-    +1: 6
-     0: 0
-    -1: 0
-    
-    --- Details ---
-    
-    +1 John
-    +1 Jane
-    +1 David
-    +1 Dolores
-    +1 Carl
-    +1 Chris
-
-[See here for more information][2] <br>
-[See here for more mail templates][3]
-
-
-[1]: consensusBuilding
-[2]: https://www.apache.org/foundation/voting
-[3]: https://community.apache.org/newcommitter

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/mailing_list.md
----------------------------------------------------------------------
diff --git a/mailing_list.md b/mailing_list.md
deleted file mode 100644
index adf4300..0000000
--- a/mailing_list.md
+++ /dev/null
@@ -1,49 +0,0 @@
----
-title: Mailing Lists
----
-
-All Accumulo mailing lists are in the accumulo.apache.org domain. Please note
-that search providers linked on this page are not part of the [official Apache
-mailing list archives][lists].
-
-{: .table }
-| Name              | Description                                      | Read | Follow | Post |
-|-------------------|--------------------------------------------------|------|--------|------|
-| **user**          | General user questions, help, and announcements  | [<span class="glyphicon glyphicon-search"/> Archive][U_A] | [<span class="glyphicon glyphicon-plus"/> Subscribe][U_SU] [<span class="glyphicon glyphicon-remove"/> Unsubscribe][U_UN] | [<span class="glyphicon glyphicon-envelope"/> Post][U_P] |
-| **dev**           | Contributor discussions and development activity | [<span class="glyphicon glyphicon-search"/> Archive][D_A] | [<span class="glyphicon glyphicon-plus"/> Subscribe][D_SU] [<span class="glyphicon glyphicon-remove"/> Unsubscribe][D_UN] | [<span class="glyphicon glyphicon-envelope"/> Post][D_P] |
-| **commits**       | Code changes                                     | [<span class="glyphicon glyphicon-search"/> Archive][C_A] | [<span class="glyphicon glyphicon-plus"/> Subscribe][C_SU] [<span class="glyphicon glyphicon-remove"/> Unsubscribe][C_UN] | |
-| **notifications** | Automated notifications (JIRA, etc.)             | [<span class="glyphicon glyphicon-search"/> Archive][N_A] | [<span class="glyphicon glyphicon-plus"/> Subscribe][N_SU] [<span class="glyphicon glyphicon-remove"/> Unsubscribe][N_UN] | |
-
-[U_A]: https://lists.apache.org/list.html?user@accumulo.apache.org
-{: .btn .btn-primary .btn-xs }
-[U_SU]: mailto:user-subscribe@accumulo.apache.org
-{: .btn .btn-success .btn-xs }
-[U_UN]: mailto:user-unsubscribe@accumulo.apache.org
-{: .btn .btn-danger .btn-xs }
-[U_P]: mailto:user@accumulo.apache.org
-{: .btn .btn-warning .btn-xs }
-
-[D_A]: https://lists.apache.org/list.html?dev@accumulo.apache.org
-{: .btn .btn-primary .btn-xs }
-[D_SU]: mailto:dev-subscribe@accumulo.apache.org
-{: .btn .btn-success .btn-xs }
-[D_UN]: mailto:dev-unsubscribe@accumulo.apache.org
-{: .btn .btn-danger .btn-xs }
-[D_P]: mailto:dev@accumulo.apache.org
-{: .btn .btn-warning .btn-xs }
-
-[C_A]: https://lists.apache.org/list.html?commits@accumulo.apache.org
-{: .btn .btn-primary .btn-xs }
-[C_SU]: mailto:commits-subscribe@accumulo.apache.org
-{: .btn .btn-success .btn-xs }
-[C_UN]: mailto:commits-unsubscribe@accumulo.apache.org
-{: .btn .btn-danger .btn-xs }
-
-[N_A]: https://lists.apache.org/list.html?notifications@accumulo.apache.org
-{: .btn .btn-primary .btn-xs }
-[N_SU]: mailto:notifications-subscribe@accumulo.apache.org
-{: .btn .btn-success .btn-xs }
-[N_UN]: mailto:notifications-unsubscribe@accumulo.apache.org
-{: .btn .btn-danger .btn-xs }
-
-[lists]: https://lists.apache.org

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/news.md
----------------------------------------------------------------------
diff --git a/news.md b/news.md
deleted file mode 100644
index cc6aa35..0000000
--- a/news.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-title: News Archive
-redirect_from: /blog/
----
-
-<div>
-{% for post in site.posts %}
-  {% assign post_year = post.date | date: "%Y" %}
-  {% assign newer_post_year = post.next.date | date: "%Y" %}
-  {% if post_year != newer_post_year %}
-    <hr>
-    <h3>{{ post_year }}</h3>
-  {% endif %}
-  <div class="row" style="margin-top: 15px">
-    <div class="col-md-1">{{ post.date | date: "%b %d" }}</div>
-    <div class="col-md-10"><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a></div>
-  </div>
-{% endfor %}
-</div>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/pages/external-docs.md
----------------------------------------------------------------------
diff --git a/pages/external-docs.md b/pages/external-docs.md
new file mode 100644
index 0000000..8f891df
--- /dev/null
+++ b/pages/external-docs.md
@@ -0,0 +1,110 @@
+---
+title: External Documentation
+permalink: /external-docs/
+redirect_from: /papers
+---
+
+This page contains links to external documentation that may be useful to Accumulo users.
+
+## Papers and Presentations
+
+{: #citationtable .table .table-bordered .table-striped style="width:100%;" }
+| Title                                                                                                                                                                                                | Links                      | Category     | Venue                                                          | Peer-Reviewed | Awards              |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------|--------------|----------------------------------------------------------------|---------------|---------------------|
+| Prout, Andrew, et al. "Enabling On-Demand Database Computing with MIT SuperCloud Database Management System." IEEE HPEC 2015.                                                                        | [paper][p01]               | Architecture | IEEE HPEC 2015                                                 | Yes           |                     |
+| Hubbell, Matthew, et al. "Big Data Strategies for Data Center Infrastructure Management Using a 3D Gaming Platform." IEEE HPEC 2015.                                                                 | [paper][p02]               | Use Cases    | IEEE HPEC 2015                                                 | Yes           |                     |
+| Gadepally, Vijay, et al. "Computing on Masked Data to improve the Security of Big Data." IEEE HST 2015.                                                                                              | [paper][p03]               | Use Cases    | IEEE HST 2015                                                  | Yes           |                     |
+| Kepner, Jeremy, et al. "Associative Arrays: Unified Mathematics for Spreadsheets, Databases, Matrices, and Graphs." New England Database Summit 2015.                                                | [paper][p04]               | Use Cases    | New England Database Summit 2015                               | Yes           |                     |
+| Achieving 100,000,000 database inserts per second using Accumulo and D4M - Kepner et al IEEE HPEC 2014                                                                                               | [paper][p05]               | Performance  | IEEE HPEC 2014                                                 | Yes           |                     |
+| Evaluating Accumulo Performance for a Scalable Cyber Data Processing Pipeline - Sawyer et al IEEE HPEC 2014                                                                                          | [paper][p06]               | Performance  | IEEE HPEC 2014                                                 | Yes           |                     |
+| Understanding Query Performance in Accumulo - Sawyer et al IEEE HPEC 2013                                                                                                                            | [paper][p07]               | Performance  | IEEE HPEC 2013                                                 | Yes           |                     |
+| Benchmarking Apache Accumulo BigData Distributed Table Store Using Its Continuous Test Suite - Sen et al 2013 IEEE International Congress on Big Data.                                               | [paper][p08]               | Performance  | IEEE International Congress on Big Data 2013                   | Yes           |                     |
+| Benchmarking the Apache Accumulo Distributed Key-Value Store - Sen et al 2014 Updated version of the IEEE paper, including edits for clarity and additional results from benchmarking on Amazon EC2. | [paper][p09]               | Performance  | Online                                                         | No            |                     |
+| Computing on Masked Data: a High Performance Method for Improving Big Data Veracity - Kepner et al IEEE HPEC 2014                                                                                    | [paper][p10]               | Security     | IEEE HPEC 2014                                                 | Yes           |                     |
+| D4M 2.0 Schema: A General Purpose High Performance Schema for the Accumulo Database - Kepner et al IEEE HPEC 2013                                                                                    | [paper][p11] [slides][s11] | Architecture | IEEE HPEC 2013                                                 | Yes           |                     |
+| Genetic Sequence Matching Using D4M Big Data Approaches - Dodson et al IEEE HPEC 2014                                                                                                                |                            | Use Cases    | IEEE HPEC 2014                                                 | Yes           | Best Paper Finalist |
+| Big Data Dimensional Analysis - Gadepally et al IEEE HPEC 2014                                                                                                                                       |                            | Use Cases    | IEEE HPEC 2014                                                 | Yes           |                     |
+| LLSuperCloud: Sharing HPC systems for diverse rapid prototyping - Reuther et al IEEE HPEC 2013                                                                                                       | [paper][p12] [slides][s12] | Architecture | IEEE HPEC 2013                                                 | Yes           |                     |
+| Spatio-temporal indexing in non-relational distributed databases - Fox et al 2013 IEEE International Congress on Big Data                                                                            | [paper][p13]               | Use Cases    | IEEE International Congress on Big Data 2013                   | Yes           |                     |
+| Typograph: Multiscale spatial exploration of text documents - Endert, Alex, et al 2013 IEEE International Congress on Big Data                                                                       | [paper][p14]               | Use Cases    | IEEE International Congress on Big Data 2013                   | Yes           |                     |
+| UxV Data to the Cloud via Widgets - Charles et al 18th International Command &amp; Control Research &amp; Technology Symposium 2013                                                                  | [paper][p15]               | Use Cases    | Command &amp; Control Research &amp; Technology Symposium 2013 | Yes           |                     |
+| Driving Big Data With Big Compute - Byun et al IEEE HPEC 2012                                                                                                                                        | [paper][p16] [slides][s16] | Architecture | IEEE HPEC 2012                                                 | Yes           |                     |
+| Large Scale Network Situational Awareness Via 3D Gaming Technology - Hubbell et al IEEE HPEC 2012                                                                                                    | [paper][p17] [slides][s17] | Use Cases    | IEEE HPEC 2012                                                 | Yes           |                     |
+| Rya: a scalable RDF triple store for the clouds - Punnoose et al 1st International Workshop on Cloud Intelligence, ACM, 2012                                                                         | [paper][p18]               | Architecture | ACM International Workshop on Cloud Intelligence 2012          | Yes           |                     |
+| Dynamic distributed dimensional data model (D4M) database and computation system - Kepner et al ICASSP 2012                                                                                          | [paper][p19] [slides][s19] | Architecture | ICASSP 2012                                                    | Yes           |                     |
+| An NSA Big Graph experiment (Technical Report NSA-RD-2013-056002v1)                                                                                                                                  | [slides][s20]              | Performance  | Technical Report                                               | No            |                     |
+| Patil, Swapnil, et al. "YCSB++: benchmarking and performance debugging advanced features in scalable table stores." Proceedings of the 2nd ACM Symposium on Cloud Computing. ACM, 2011.              | [paper][p21] [slides][s21] | Performance  | ACM Symposium on Cloud Computing 2011                          | Yes           |                     |
+| Turner, Keith "Apache Accumulo 1.4 &amp; 1.5 Features." February, 2012                                                                                                                               | [slides][s22]              | Architecture | Meetup                                                         | No            |                     |
+| Fuchs, Adam "Accumulo: Extensions to Google's Bigtable Design." March, 2012                                                                                                                          | [slides][s23]              | Architecture | Meetup                                                         | No            |                     |
+| Miner, Donald "An Introduction to Apache Accumulo - how it works, why it exists, and how it is used." August, 2014                                                                                   | [slides][s24]              | Architecture | Online                                                         | No            |                     |
+
+<script type="text/javascript">
+$(function() {
+$("#citationtable").dataTable();
+});
+</script>
+
+## Slides from Conferences and Meetups
+
+ - [Accumulo Summit Slides](https://www.slideshare.net/AccumuloSummit)
+ - Strata + Hadoop World Meetup 24 Oct 2012
+    - [Accumulo standalone AMI](https://aws.amazon.com/amis/accumulo-standalone-20121019)
+    - [Large-scale web analytics with Accumulo (and Nutch/Gora, Pig, and Storm)](https://www.slideshare.net/jasontrost/accumulo-at-endgame)
+    - [Compaction and Splitting in Accumulo](https://www.slideshare.net/hortonworks/compaction-and-splitting-in-apache-accumulo)
+
+## Blog Posts and Writeups
+
+ - [Codebits Blogs](http://affy.blogspot.com/search?q=accumulo&by-date=true)
+    - [Implement Word Count in Accumulo](http://affy.blogspot.com/2012/04/implement-word-count-in-accumulo.html)
+    - [Using Accumulo To Calculate Seven Day Rolling Average](http://affy.blogspot.com/2012/04/using-accumulo-to-calculate-seven-day.html)
+ - [covert.io blogs](http://www.covert.io/)
+    - [Accumulo, Nutch, and Gora](http://www.covert.io/post/18414889381/accumulo-nutch-and-gora)
+    - [Accumulo and Pig](http://www.covert.io/post/18605091231/accumulo-and-pig)
+ - [Accumulo on MapR](https://www.mapr.com/blog/accumulo-on-mapr) [More Accumulo on MapR](http://blog.stavi.sh/instructions-for-running-accumulo-on-mapr-m5)
+ - [Accumulo on Ubuntu VirtualBox](https://gist.github.com/1535657)
+ - [Accumulo on EC2](http://www.accumulodata.com/ec2.html)
+
+## Books
+
+ - [Apache Accumulo for Developers (Packt Publishing)](https://www.packtpub.com/apache-accumulo-for-developers/book)
+ - [Accumulo: Application Development, Table Design, and Best Practices (O'Reilly Media)](https://shop.oreilly.com/product/0636920032304.do)
+
+## Reference
+
+ - [Log-Structured Merge Tree](https://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.44.2782&rep=rep1&type=pdf)
+ - [BigTable](https://research.google.com/archive/bigtable.html)
+ - [GFS](https://research.google.com/archive/gfs.html)
+ - [Chubby](https://research.google.com/archive/chubby.html)
+ - [Dapper](https://research.google.com/pubs/pub36356.html)
+ - [Bloom Filter](https://en.wikipedia.org/wiki/Bloom_filter)
+
+[p01]: https://arxiv.org/abs/1506.08506
+[p02]: https://arxiv.org/abs/1506.08505
+[p03]: https://arxiv.org/abs/1504.01287
+[p04]: https://arxiv.org/abs/1501.05709
+[p05]: https://arxiv.org/abs/1406.4923
+[p06]: https://arxiv.org/abs/1407.5661
+[p07]: http://ieee-hpec.org/2013/index_htm_files/28-2868615.pdf
+[p08]: https://sqrrl.com/media/Accumulo-Benchmark-10312013-1.pdf
+[p09]: accumulo-benchmarking-2.1.pdf
+[p10]: https://arxiv.org/abs/1406.5751
+[p11]: http://ieee-hpec.org/2013/index_htm_files/11-Kepner-D4Mschema-IEEE-HPEC.pdf
+[s11]: http://ieee-hpec.org/2013/index_htm_files/11_130716-D4Mschema.pdf
+[p12]: http://ieee-hpec.org/2013/index_htm_files/26-HPEC13_LLSuperCloud_Reuther_final.pdf
+[s12]: http://ieee-hpec.org/2013/index_htm_files/HPEC+2013+Reuther+SuperCloud+final.pdf
+[p13]: http://geomesa.github.io/assets/outreach/SpatioTemporalIndexing_IEEEcopyright.pdf
+[p14]: https://people.cs.vt.edu/aendert/Alex_Endert/Research_files/Typograph.pdf
+[p15]: http://www.dodccrp.org/events/18th_iccrts_2013/post_conference/papers/051.pdf
+[p16]: http://www.mit.edu/~kepner/pubs/ByunKepner_2012_BigData_Paper.pdf
+[s16]: http://ieee-hpec.org/2012/index_htm_files/42_ID18.pptx
+[p17]: http://ieee-hpec.org/2012/index_htm_files/HPEC12_Hubbell.pdf
+[s17]: http://ieee-hpec.org/2012/index_htm_files/31_ID20.pptx
+[p18]: https://sqrrl.com/media/Rya_CloudI20121.pdf
+[p19]: http://www.mit.edu/~kepner/pubs/Kepner_2012_D4M_Paper.pdf
+[s19]: http://www.mit.edu/~kepner/pubs/Kepner_2012_D4M_Slides.pdf
+[s20]: http://www.pdl.cmu.edu/SDI/2013/slides/big_graph_nsa_rd_2013_56002v1.pdf
+[p21]: http://www.pdl.cmu.edu/PDL-FTP/Storage/socc2011.pdf
+[s21]: http://www.cercs.gatech.edu/opencirrus/OCsummit11/presentations/patil.pdf
+[s22]: https://home.apache.org/~kturner/accumulo14_15.pdf
+[s23]: https://home.apache.org/~afuchs/slides/morgan_state_talk.pdf
+[s24]: https://www.slideshare.net/DonaldMiner/an-introduction-to-accumulo

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/pages/get_involved.md
----------------------------------------------------------------------
diff --git a/pages/get_involved.md b/pages/get_involved.md
new file mode 100644
index 0000000..e8df1e8
--- /dev/null
+++ b/pages/get_involved.md
@@ -0,0 +1,99 @@
+---
+title: Get Involved
+permalink: /get_involved/
+---
+
+You don't need to be a software developer to contribute to 
+Apache Accumulo. To be successful this project 
+requires a huge range of different skills, levels of involvement and degrees of 
+technical expertise. So, if you want to get involved in Apache Accumulo, there 
+is almost certainly a role for you. 
+
+We are looking for people to:
+
+  - provide feedback
+  - write or update documentation
+  - help new users
+  - recommend the project to others
+  - test the code and report bugs
+  - fix bugs
+  - give us feedback on required features
+  - write and update the software
+  - create artwork
+  - translate to different languages
+  - anything you can see that needs doing
+
+All of these contributions help to keep a project active and strengthen 
+the community. The project team and the broader community will 
+therefore welcome and encourage participation, and attempt to make it 
+as easy as possible for people to get involved.
+
+Want to get started now? Check out [open issues labeled for "newbies"][1]. If you need help, use the mailing list information below to reach out. If the issue you choose deals with code, you should read the developer's guide section.
+
+## Mailing lists and chat
+
+Your first engagement with the project should be to subscribe to our
+[mailing lists][2].  Apache Accumulo developers and community members
+hang out in the #accumulo channel on irc.freenode.net.
+
+## Contributor Guide
+
+See the [contributor guide][4] for recommended practices in interacting with our source code.
+Take a look at [Accumulo's Ohloh page][5] for an analysis of the code base.
+
+## Conferences and Meetups
+
+* [Accumulo Summit](http://accumulosummit.com)
+* [Accumulo Users Group - DC VA MD](https://www.meetup.com/Accumulo-Users-DC/)
+* Look for [Accumulo Meetups in your area](https://www.meetup.com/find/?keywords=accumulo)
+
+## Community Interaction
+
+Learn about [building open source communities][6].
+
+## Decision Making
+
+The most important thing about engaging with any Apache project is that everyone
+is equal. All people with an opinion are entitled to express that opinion and, where 
+appropriate, have it considered by the community.
+
+To some the idea of having to establish consensus in a large and distributed team 
+sounds inefficient and frustrating. Don't despair though, The Apache Way has a
+set of simple processes to ensure things proceed at a good pace.
+
+In ASF projects we don't like to vote. We reserve that for the few things that need 
+official approval for legal or process reasons (e.g. a release or a new committer). 
+Most of the time we work with the consensus building techniques documented below.
+
+### Lazy Consensus
+
+[Lazy consensus][7] is the first, and possibly the most important, consensus building 
+tool we have. Essentially lazy consensus means that you don't need to get explicit
+approval to proceed, but you need to be prepared to listen if someone objects.
+
+### Consensus Building
+
+Sometimes lazy consensus is not appropriate. In such cases it is necessary to
+make a proposal to the mailing list and discuss options. There are mechanisms
+for quickly showing your support or otherwise for a proposal and 
+[building consensus][8] amongst the community.
+
+Once there is a consensus people can proceed with the work under the [lazy 
+consensus][9] model.
+
+### Voting
+
+Occasionally a "feel" for consensus is not enough. Sometimes we need to 
+have a measurable consensus. For example, when [voting][10] in new committers or 
+to approve a release. 
+
+[1]: https://s.apache.org/newbie_accumulo_tickets
+[2]: {{ site.baseurl }}/mailing_list
+[3]: https://www.meetup.com/find/?keywords=accumulo
+[4]: {{ site.baseurl }}/contributor/
+[5]: https://www.ohloh.net/p/accumulo
+[6]: http://www.betaversion.org/~stefano/papers/ac2006.2.pdf
+[7]: {{ site.baseurl }}/contributor/lazyConsensus
+[8]: {{ site.baseurl }}/contributor/consensusBuilding
+[9]: {{ site.baseurl }}/contributor/lazyConsensus
+[10]: {{ site.baseurl }}/contributor/voting

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/pages/mailing_list.md
----------------------------------------------------------------------
diff --git a/pages/mailing_list.md b/pages/mailing_list.md
new file mode 100644
index 0000000..256d332
--- /dev/null
+++ b/pages/mailing_list.md
@@ -0,0 +1,50 @@
+---
+title: Mailing Lists
+permalink: /mailing_list/
+---
+
+All Accumulo mailing lists are in the accumulo.apache.org domain. Please note
+that search providers linked on this page are not part of the [official Apache
+mailing list archives][lists].
+
+{: .table }
+| Name              | Description                                      | Read | Follow | Post |
+|-------------------|--------------------------------------------------|------|--------|------|
+| **user**          | General user questions, help, and announcements  | [<span class="glyphicon glyphicon-search"/> Archive][U_A] | [<span class="glyphicon glyphicon-plus"/> Subscribe][U_SU] [<span class="glyphicon glyphicon-remove"/> Unsubscribe][U_UN] | [<span class="glyphicon glyphicon-envelope"/> Post][U_P] |
+| **dev**           | Contributor discussions and development activity | [<span class="glyphicon glyphicon-search"/> Archive][D_A] | [<span class="glyphicon glyphicon-plus"/> Subscribe][D_SU] [<span class="glyphicon glyphicon-remove"/> Unsubscribe][D_UN] | [<span class="glyphicon glyphicon-envelope"/> Post][D_P] |
+| **commits**       | Code changes                                     | [<span class="glyphicon glyphicon-search"/> Archive][C_A] | [<span class="glyphicon glyphicon-plus"/> Subscribe][C_SU] [<span class="glyphicon glyphicon-remove"/> Unsubscribe][C_UN] | |
+| **notifications** | Automated notifications (JIRA, etc.)             | [<span class="glyphicon glyphicon-search"/> Archive][N_A] | [<span class="glyphicon glyphicon-plus"/> Subscribe][N_SU] [<span class="glyphicon glyphicon-remove"/> Unsubscribe][N_UN] | |
+
+[U_A]: https://lists.apache.org/list.html?user@accumulo.apache.org
+{: .btn .btn-primary .btn-xs }
+[U_SU]: mailto:user-subscribe@accumulo.apache.org
+{: .btn .btn-success .btn-xs }
+[U_UN]: mailto:user-unsubscribe@accumulo.apache.org
+{: .btn .btn-danger .btn-xs }
+[U_P]: mailto:user@accumulo.apache.org
+{: .btn .btn-warning .btn-xs }
+
+[D_A]: https://lists.apache.org/list.html?dev@accumulo.apache.org
+{: .btn .btn-primary .btn-xs }
+[D_SU]: mailto:dev-subscribe@accumulo.apache.org
+{: .btn .btn-success .btn-xs }
+[D_UN]: mailto:dev-unsubscribe@accumulo.apache.org
+{: .btn .btn-danger .btn-xs }
+[D_P]: mailto:dev@accumulo.apache.org
+{: .btn .btn-warning .btn-xs }
+
+[C_A]: https://lists.apache.org/list.html?commits@accumulo.apache.org
+{: .btn .btn-primary .btn-xs }
+[C_SU]: mailto:commits-subscribe@accumulo.apache.org
+{: .btn .btn-success .btn-xs }
+[C_UN]: mailto:commits-unsubscribe@accumulo.apache.org
+{: .btn .btn-danger .btn-xs }
+
+[N_A]: https://lists.apache.org/list.html?notifications@accumulo.apache.org
+{: .btn .btn-primary .btn-xs }
+[N_SU]: mailto:notifications-subscribe@accumulo.apache.org
+{: .btn .btn-success .btn-xs }
+[N_UN]: mailto:notifications-unsubscribe@accumulo.apache.org
+{: .btn .btn-danger .btn-xs }
+
+[lists]: https://lists.apache.org

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/pages/news.md
----------------------------------------------------------------------
diff --git a/pages/news.md b/pages/news.md
new file mode 100644
index 0000000..52a2d6a
--- /dev/null
+++ b/pages/news.md
@@ -0,0 +1,20 @@
+---
+title: News Archive
+permalink: /news/
+redirect_from: /blog/
+---
+
+<div>
+{% for post in site.posts %}
+  {% assign post_year = post.date | date: "%Y" %}
+  {% assign newer_post_year = post.next.date | date: "%Y" %}
+  {% if post_year != newer_post_year %}
+    <hr>
+    <h3>{{ post_year }}</h3>
+  {% endif %}
+  <div class="row" style="margin-top: 15px">
+    <div class="col-md-1">{{ post.date | date: "%b %d" }}</div>
+    <div class="col-md-10"><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a></div>
+  </div>
+{% endfor %}
+</div>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/pages/people.md
----------------------------------------------------------------------
diff --git a/pages/people.md b/pages/people.md
new file mode 100644
index 0000000..4eeeac5
--- /dev/null
+++ b/pages/people.md
@@ -0,0 +1,182 @@
+---
+title: People
+skiph1fortitle: true
+permalink: /people/
+---
+
+## PMC and Committers
+
+{: .table .table-striped}
+| username      | name              | organization                           | timezone |
+|---------------|-------------------|----------------------------------------|----------|
+| acordova      | Aaron Cordova     | [Koverse][KOVERSE]                     |          |
+| afuchs        | Adam Fuchs        | [sqrrl][SQRRL]                         | [ET][ET] |
+| bhavanki      | Bill Havanki      | [Cloudera][CLOUDERA]                   | [ET][ET] |
+| billie        | Billie Rinaldi    | [Hortonworks][HORTONWORKS]             | [ET][ET] |
+| bimargulies   | Benson Margulies  | [Basis Technology Corp.][BASISTECH]    | [ET][ET] |
+| brianloss     | Brian Loss        | [Praxis Engineering][PRAXIS]           | [ET][ET] |
+| busbey        | Sean Busbey       | [Cloudera][CLOUDERA]                   | [CT][CT] |
+| cawaring      | Chris Waring      |                                        |          |
+| cjnolet       | Corey J. Nolet    | [Tetra Concepts LLC][TETRA]            | [ET][ET] |
+| ctubbsii      | Christopher Tubbs | [NSA][NSA]                             | [ET][ET] |
+| dhutchis      | Dylan Hutchison   | [University of Washington][UW]         | [PT][PT] |
+| dlmarion      | Dave Marion       | [Objective Solutions, Inc.][OBJECTIVE] | [ET][ET] |
+| drew          | Drew Farris       | [Booz Allen Hamilton][BOOZ]            | [ET][ET] |
+| ecn           | Eric Newton       | [SW Complete Inc.][SWC]                | [ET][ET] |
+| elserj        | Josh Elser        | [Hortonworks][HORTONWORKS]             | [ET][ET] |
+| etcoleman     | Ed Coleman        |                                        | [ET][ET] |
+| jtrost        | Jason Trost       | [Endgame][ENDGAME]                     |          |
+| kturner       | Keith Turner      | [Peterson Technologies][PETERSON]      | [ET][ET] |
+| mdrob         | Mike Drob         | [Cloudera][CLOUDERA]                   | [ET][ET] |
+| medined       | David Medinets    |                                        |          |
+| mjwall        | Michael Wall      | [Objective Solutions, Inc.][OBJECTIVE] | [ET][ET] |
+| mmiller       | Michael Miller    | [Centroid, LLC][CENTROID]              | [ET][ET] |
+| mwalch        | Mike Walch        | [Peterson Technologies][PETERSON]      | [ET][ET] |
+| phrocker      | Marc Parisi       | [WaveStrike LLC][WAVE]                 | [ET][ET] |
+| rweeks        | Russ Weeks        | [PHEMI][PHEMI]                         | [PT][PT] |
+| shickey       | Sean Hickey       |                                        | [PT][PT] |
+| ujustgotbilld | William Slacum    | [Miner &amp; Kasch][MINERKASCH]        | [ET][ET] |
+| vikrams       | Vikram Srivastava | [Cloudera][CLOUDERA]                   | [PT][PT] |
+| vines         | John Vines        | [sqrrl][SQRRL]                         | [ET][ET] |
+
+## Contributors
+
+{: .table .table-striped}
+| username    | name                | organization                                                      | timezone              |
+|-------------|---------------------|-------------------------------------------------------------------|-----------------------|
+|             | Aaron Glahe         | [Data Tactics][DATATACT]                                          | [ET][ET]              |
+|             | Adam J Shook        | [Datacatessen][DATACATESS]                                        | [ET][ET]              |
+|             | Al Krinker          |                                                                   | [ET][ET]              |
+|             | Alex Moundalexis    | [Cloudera][CLOUDERA]                                              | [ET][ET]              |
+|             | Andrew George Wells | [ClearEdgeIT][CLEAREDGE]                                          | [ET][ET]              |
+|             | Arshak Navruzyan    | [Argyle Data][ARGYLE]                                             |                       |
+|             | Ben Manes           |                                                                   | [PT][PT]              |
+|             | Bob Thorman         | [AT&amp;T][ATT]                                                   |                       |
+|             | Chris Bennight      |                                                                   |                       |
+|             | Chris McCubbin      | [sqrrl][SQRRL]                                                    | [ET][ET]              |
+|             | Christian Rohling   | [Endgame][ENDGAME]                                                | [ET][ET]              |
+|             | Damon Brown         | [Tetra Concepts LLC][TETRA]                                       | [ET][ET]              |
+|             | Dave Wang           | [Cloudera][CLOUDERA]                                              | [PT][PT]              |
+|             | David M. Lyle       |                                                                   |                       |
+|             | David Protzman      |                                                                   |                       |
+|             | Dennis Patrone      | [The Johns Hopkins University Applied Physics Laboratory][JHUAPL] | [ET][ET]              |
+| dimaspivak  | Dima Spivak         | [Cloudera][CLOUDERA]                                              |                       |
+|             | Ed Kohlwey          | [Booz Allen Hamilton][BOOZ]                                       |                       |
+| edwardyoon  | Edward Yoon         |                                                                   |                       |
+|             | Eugene Cheipesh     |                                                                   |                       |
+|             | Gary Singh          | [Sabre Engineering][SABRE]                                        | [ET][ET]              |
+|             | Hayden Marchant     |                                                                   |                       |
+|             | Hung Pham           | [Cloudera][CLOUDERA]                                              | [ET][ET]              |
+|             | Ivan Bella          | [Objective Solutions, Inc.][OBJECTIVE]                            | [ET][ET]              |
+|             | Jacob Meisler       | [Booz Allen Hamilton][BOOZ]                                       | [ET][ET]              |
+|             | James Fiori         | [Flywheel Data][FLYWHEEL]                                         | [ET][ET]              |
+| jaredwinick | Jared Winick        | [Koverse][KOVERSE]                                                | [MT][MT]              |
+|             | Jason Then          |                                                                   |                       |
+|             | Jay Shipper         |                                                                   |                       |
+| jfield      | Jeff Field          | [Cloudera][CLOUDERA]                                              | [ET][ET]              |
+|             | Jeffrey S. Schwartz |                                                                   |                       |
+|             | Jenna Huston        |                                                                   | [ET][ET]              |
+|             | Jerry He            | [IBM][IBM]                                                        | [PT][PT]              |
+|             | Jesse Yates         |                                                                   |                       |
+|             | Jessica Seastrom    | [Cloudera][CLOUDERA]                                              | [ET][ET]              |
+|             | Jim Klucar          | [Splyt][SPLYT]                                                    | [ET][ET]              |
+|             | Joe Skora           |                                                                   |                       |
+|             | John McNamee        |                                                                   |                       |
+|             | John Stoneham       |                                                                   | [ET][ET]              |
+| jmhsieh     | Jonathan M. Hsieh   | [Cloudera][CLOUDERA]                                              | [PT][PT]              |
+|             | Jonathan Park       | [sqrrl][SQRRL]                                                    | [ET][ET]              |
+|             | Kevin Faro          | [Tetra Concepts LLC][TETRA]                                       | [ET][ET]              |
+|             | Laura Peaslee       | [Objective Solutions, Inc.][OBJECTIVE]                            | [ET][ET]              |
+|             | Luis Tavarez        |                                                                   | [ET][ET]              |
+|             | Luke Brassard       | [sqrrl][SQRRL]                                                    | [ET][ET]              |
+|             | Mario Pastorelli    | [Teralytics AG][TERALYTICS]                                       | [CEST][CEST]          |
+|             | Matt Dailey         |                                                                   |                       |
+|             | Matthew Kirkley     |                                                                   |                       |
+|             | Max Jordan          |                                                                   |                       |
+|             | Michael Allen       | [sqrrl][SQRRL]                                                    | [ET][ET]              |
+|             | Michael Berman      | [sqrrl][SQRRL]                                                    | [ET][ET]              |
+|             | Miguel Pereira      | [SRA International, Inc][SRA]                                     | [ET][ET]              |
+|             | Mike Fagan          | [Arcus Research][ARCUS]                                           | [MT][MT]              |
+|             | Morgan Haskel       |                                                                   |                       |
+|             | Nguessan Kouame     |                                                                   |                       |
+|             | Oren Falkowitz      | [sqrrl][SQRRL]                                                    | [ET][ET]              |
+|             | Phil Eberhardt      | [sqrrl][SQRRL]                                                    | [ET][ET]              |
+|             | Philip Young        |                                                                   |                       |
+|             | Pushpinder Heer     | [Applied Technical Systems][ATSID]                                | [PT][PT]              |
+|             | Ravi Mutyala        | [Hortonworks][HORTONWORKS]                                        | [CT][CT]              |
+|             | Ryan Fishel         | [Cloudera][CLOUDERA]                                              |                       |
+|             | Ryan Leary          |                                                                   |                       |
+|             | Sapah Shah          |                                                                   |                       |
+|             | Scott Kuehn         |                                                                   |                       |
+|             | Shawn Walker        |                                                                   |                       |
+| stevel      | Steve Loughran      | [Hortonworks][HORTONWORKS]                                        | [GMT][GMT]/[BST][BST] |
+| supun       | Supun Kamburugamuva |                                                                   |                       |
+|             | Takahiko Saito      | [Hortonworks][HORTONWORKS]                                        | [PT][PT]              |
+|             | Ted Malaska         | [Cloudera][CLOUDERA]                                              |                       |
+| tedyu       | Ted Yu              | [Hortonworks][HORTONWORKS]                                        | [PT][PT]              |
+|             | Tim Halloran        |                                                                   |                       |
+|             | Tim Reardon         |                                                                   |                       |
+|             | Travis Pinney       |                                                                   |                       |
+|             | Trent Nadeau        | [Anthem Engineering LLC][ANTHEMENG]                               | [ET][ET]              |
+|             | Tristen Georgiou    | [PHEMI][PHEMI]                                                    | [PT][PT]              |
+|             | Vicky Kak           |                                                                   |                       |
+|             | Vincent Russell     |                                                                   |                       |
+|             | Volth               |                                                                   |                       |
+|             | Wil Selwood         | [Satellite Applications Catapult][SACAT]                          | [GMT][GMT]/[BST][BST] |
+
+## Organizations
+
+First off, thanks to our parent organization, the [Apache Software Foundation][ASF] and [all who sponsor][ASF_SPONSORS] them.
+
+Additionally, we would like to thank the following organizations for resources that they provide:
+
+  - ej-technologies for allowing us to use their [Java profiler][JPROFILER]
+  - YourKit for allowing us use of their [Java Profiler][YOURKIT]
+  - Coverity for running [static analysis][COVERITY]
+
+[ANTHEMENG]: http://www.anthemengineering.com
+[ARCUS]: http://www.arcus-research.com
+[ARGYLE]: http://www.argyledata.com
+[ATSID]: http://www.atsid.com
+[ATT]: http://www.att.com
+[BASISTECH]: http://www.basistech.com
+[BOOZ]: http://www.boozallen.com
+[CENTROID]: http://www.centroid-llc.com/
+[CLEAREDGE]: http://clearedgeit.com
+[CLOUDERA]: http://www.cloudera.com
+[DATATACT]: http://www.data-tactics.com
+[DATACATESS]: https://datacatessen.com/
+[ENDGAME]: http://www.endgame.com
+[FLYWHEEL]: http://flywheeldata.com
+[HORTONWORKS]: http://hortonworks.com
+[IBM]: http://www.ibm.com
+[JHUAPL]: http://www.jhuapl.edu
+[KOVERSE]: http://www.koverse.com
+[MINERKASCH]: http://minerkasch.com
+[NSA]: http://www.nsa.gov
+[OBJECTIVE]: http://www.objectivesolutions.com
+[PETERSON]: http://www.ptech-llc.com
+[PHEMI]: http://www.phemi.com
+[PRAXIS]: http://www.praxiseng.com
+[SABRE]: http://www.sabre-eng.com
+[SACAT]: https://sa.catapult.org.uk
+[SPLYT]: http://www.splyt.com
+[SQRRL]: http://sqrrl.com
+[SRA]: http://sra.com
+[SWC]: http://swcomplete.com
+[TERALYTICS]: http://www.teralytics.net/
+[TETRA]: http://www.tetraconcepts.com
+[UW]: http://www.uw.edu
+[WAVE]: http://www.wavestrike.com/
+[BST]: http://www.timeanddate.com/time/zones/bst
+[CT]: http://www.timeanddate.com/time/zones/ct
+[ET]: http://www.timeanddate.com/time/zones/et
+[GMT]: http://www.timeanddate.com/time/zones/gmt
+[MT]: http://www.timeanddate.com/time/zones/mt
+[PT]: http://www.timeanddate.com/time/zones/pt
+[CEST]: http://www.timeanddate.com/time/zones/cest
+[ASF]: https://www.apache.org
+[ASF_SPONSORS]: https://www.apache.org/foundation/sponsorship
+[JPROFILER]: https://www.ej-technologies.com/products/jprofiler/overview.html 
+[YOURKIT]: https://www.yourkit.com/java/profiler/features/
+[COVERITY]: https://scan.coverity.com/projects/accumulo

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/pages/related-projects.md
----------------------------------------------------------------------
diff --git a/pages/related-projects.md b/pages/related-projects.md
new file mode 100644
index 0000000..2f592d1
--- /dev/null
+++ b/pages/related-projects.md
@@ -0,0 +1,92 @@
+---
+title: Related Projects
+permalink: /related-projects/
+redirect_from: /projects
+---
+
+The Apache Accumulo community is happy to promote and encourage use of Accumulo in ways that are novel and reusable
+by other users within the community. As such, we're happy to curate a list of projects related to Accumulo to give
+them visibility to a larger audience. To have you project listed here, send a request to the
+[developer's mailing list](mailto:dev@accumulo.apache.org)
+
+## Open source projects using Accumulo
+
+#### Apache Fluo
+
+[Fluo](https://fluo.apache.org) builds on Accumulo and enables low latency, continuous incremental processing of big data.
+
+#### Apache Gora
+
+[Gora](https://gora.apache.org/) open source framework provides an in-memory data model and persistence for big data.  Accumulo's continuous ingest test suite was adapted to Gora and called [Goraci](http://gora.apache.org/current/index.html#goraci-integration-testsing-suite).
+
+#### Apache Hive
+
+[Hive](https://hive.apache.org/) data warehouse software facilitates reading, writing, and managing large datasets residing in distributed storage using SQL.
+Hive has the ability to read and write data in Accumulo using the [AccumuloStorageHandler](https://cwiki.apache.org/confluence/display/Hive/AccumuloIntegration).
+
+#### Apache Pig
+
+[Pig](http://pig.apache.org/) is a platform for analyzing large data sets that consists of a high-level language for expressing data analysis programs, coupled with infrastructure for evaluating these programs.  Pig has the ability to read and write data in Accumulo using [AccumuloStorage](http://pig.apache.org/docs/r0.16.0/func.html#AccumuloStorage).
+
+#### Apache Rya
+
+[Rya](http://rya.apache.org/) is a scalable RDF triple store built on top of a columnar index store.
+
+#### Geomesa
+
+[Geomesa](http://www.geomesa.org/) is an open-source, distributed, spatio-temporal database built on a number of distributed cloud data storage systems, including Accumulo, HBase, Cassandra, and Kafka.
+
+#### Geowave
+
+[Geowave](https://ngageoint.github.io/geowave/) is a library for storage, index, and search of multi-dimensional data on top of a sorted key-value datastore.
+
+#### Graphulo
+
+Graphulo is a Java library for Apache Accumulo which delivers server-side sparse matrix math primitives that
+enable higher-level graph algorithms and analytics. [Code](https://github.com/Accla/graphulo).
+
+#### Presto
+
+[Presto](https://prestodb.io/) is an open source distributed SQL query engine for running interactive analytic queries against data sources of all sizes, ranging from gigabytes to petabytes.  Through the use of the new Accumulo connector for Presto, users are able to execute traditional SQL queries against new and existing tables in Accumulo.  For more information, see the [Accumulo Connector](https://prestodb.io/docs/current/connector/accumulo.html) documentation.
+
+#### Timely
+
+[Timely](https://nationalsecurityagency.github.io/timely/) : A secure time series database based on Accumulo and Grafana.
+
+#### Uno and Muchos
+
+[Uno](https://github.com/astralway/uno) and [Muchos](https://github.com/astralway/muchos) provide automation for quickly setting up Accumulo instances for testing.  These project were created to enable Fluo testing, but can be used to setup just Accumulo.
+
+## User-Created Applications
+
+#### Trendulo
+
+[Trendulo](http://trendulo.com/) is Twitter trend analysis using Apache Accumulo. The [source code](https://github.com/jaredwinick/Trendulo) is publicly available.
+
+#### Wikisearch
+
+The [Wikisearch project]({{ site.baseurl }}/example/wikisearch) is a rough example of generalized secondary indexing, both ingest
+and search, built on top of Apache Accumulo. This write contains more information on the project as well as some
+general performance numbers of the project.
+
+#### Node.js, RabbitMQ, and Accumulo
+
+A [simple example](https://github.com/joshelser/node-accumulo) using Node.js to interact with Accumulo using RabbitMQ .
+
+#### ProxyInstance
+
+ProxyInstance is a Java Instance implementation of the Accumulo Instance interface that communicates with
+an Accumulo cluster via Accumulo's Apache Thrift proxy server. [Documentation](https://jhuapl.github.io/accumulo-proxy-instance/proxy_instance_user_manual) and
+[code](https://github.com/JHUAPL/accumulo-proxy-instance) are available.
+
+#### AccumuloGraph
+
+ProxyInstance is an implementation of the TinkerPop Blueprints 2.6 API using
+Apache Accumulo as the backend.
+[Documentation](https://jhuapl.github.io/AccumuloGraph/) and
+[code](https://github.com/JHUAPL/AccumuloGraph) are available.
+
+## Github
+
+[Github](https://github.com/search?q=accumulo&type=Repositories) also contains many projects that use/reference Accumulo
+in some way, shape or form.

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/pages/release.md
----------------------------------------------------------------------
diff --git a/pages/release.md b/pages/release.md
index f8c92ae..6c8dda6 100644
--- a/pages/release.md
+++ b/pages/release.md
@@ -1,9 +1,9 @@
 ---
 title: Release Archive
-permalink: "/release/"
+permalink: /release/
 redirect_from: 
-  - "/release_notes/"
-  - "/release_notes.html"
+  - /release_notes/
+  - /release_notes.html
 ---
 
 <div>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/a71056ca/papers.md
----------------------------------------------------------------------
diff --git a/papers.md b/papers.md
deleted file mode 100644
index b51569f..0000000
--- a/papers.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Related Links
-redirect_to: "{{ site.baseurl }}/papers/"
----
-
-This page redirects to canonical location for papers


[07/11] accumulo-website git commit: Jekyll build from master:a71056c

Posted by mw...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/contributor/voting.html
----------------------------------------------------------------------
diff --git a/contributor/voting.html b/contributor/voting.html
new file mode 100644
index 0000000..2a7bc03
--- /dev/null
+++ b/contributor/voting.html
@@ -0,0 +1,251 @@
+<!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>Voting</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">Voting</h1>
+          
+          <p>Occasionally a \u201cfeel\u201d for consensus is not enough. Sometimes we need to have a
+measurable consensus. For example, when voting in new committers or to approve a
+release.</p>
+
+<h2 id="preparing-for-a-vote">Preparing for a Vote</h2>
+
+<p>Before calling a vote it is important to ensure that the community is given time to
+discuss the upcoming vote. This will be done by posting an email to the list
+indicating the intention to call a vote and the options available. By the time a
+vote is called there should already be <a href="consensusBuilding">consensus in the community</a>. The vote 
+itself is, normally, a formality.</p>
+
+<h2 id="calling-a-vote">Calling a Vote</h2>
+
+<p>Once it is time to call the vote a mail is posted with a subject starting with
+\u201c[VOTE]\u201d. This enables the community members to ensure they do not miss an important
+vote thread. It also indicates that this is not consensus building but a formal
+vote. The initiator is responsible for the vote. That means also to count the votes
+and present the results. Everyone has 1 vote.</p>
+
+<h3 id="casting-your-vote">Casting Your Vote</h3>
+
+<p>The notation used in voting is:</p>
+
+<p>+1 (means I vote positive)
+   You can say why you vote positive but it\u2019s not a must-have.</p>
+
+<p>0 (means I have no strong opinion, aka abstention)</p>
+
+<p>-1 (means I vote negative because of the following reason)
+   Yes, you must support your objection and provide an alternative course of action
+   that you are willing and able to implement (where appropriate).</p>
+
+<h4 id="example-for-a-vote-mail">Example for a vote mail:</h4>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>Address: private@
+Subject: [VOTE] John Doe should become a regular committer
+
+Text:
+"I would like to propose to vote in John Doe as committer. John has showed in
+the last months that he has the skills and oversight for improving things (think
+about the last UI change of the "Find" dialog)."
+
++1 (means I vote for John)
+ 0 (means I'm not for John but also not against to vote him in)
+-1 (means I'm not for John because of the following reason(s):
+
+Voting time frame is finished 72 hours from now until June 30, 12:00 PM UTC.
+</code></pre>
+</div>
+
+<h4 id="example-for-a-reply-mail">Example for a reply mail:</h4>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>Text:
++1
+
+I like his work and want him to stay and to go on with his good improvements.
+</code></pre>
+</div>
+
+<h4 id="example-for-a-result-mail">Example for a result mail:</h4>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>Subject: [VOTE][RESULTS] John Doe should become a regular committer
+
+Text:
+Vote started Thu, Jun 27, 2011 at 12:00 PM UTC, voting is now closed.
+
+Voting results:
+
+--- Numbers ---
+
++1: 6
+ 0: 0
+-1: 0
+
+--- Details ---
+
++1 John
++1 Jane
++1 David
++1 Dolores
++1 Carl
++1 Chris
+</code></pre>
+</div>
+
+<p><a href="https://www.apache.org/foundation/voting">See here for more information</a> <br />
+<a href="https://community.apache.org/newcommitter">See here for more mail templates</a></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/docs-archive/index.html
----------------------------------------------------------------------
diff --git a/docs-archive/index.html b/docs-archive/index.html
index dfdb043..bfba8db 100644
--- a/docs-archive/index.html
+++ b/docs-archive/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/downloads/index.html
----------------------------------------------------------------------
diff --git a/downloads/index.html b/downloads/index.html
index 6014000..4da7677 100644
--- a/downloads/index.html
+++ b/downloads/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/example/wikisearch.html
----------------------------------------------------------------------
diff --git a/example/wikisearch.html b/example/wikisearch.html
index 370f56d..09aa8e8 100644
--- a/example/wikisearch.html
+++ b/example/wikisearch.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/external-docs/index.html
----------------------------------------------------------------------
diff --git a/external-docs/index.html b/external-docs/index.html
new file mode 100644
index 0000000..8aabe74
--- /dev/null
+++ b/external-docs/index.html
@@ -0,0 +1,446 @@
+<!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>External Documentation</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">External Documentation</h1>
+          
+          <p>This page contains links to external documentation that may be useful to Accumulo users.</p>
+
+<h2 id="papers-and-presentations">Papers and Presentations</h2>
+
+<table id="citationtable" class="table table-bordered table-striped" style="width:100%;">
+  <thead>
+    <tr>
+      <th>Title</th>
+      <th>Links</th>
+      <th>Category</th>
+      <th>Venue</th>
+      <th>Peer-Reviewed</th>
+      <th>Awards</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Prout, Andrew, et al. \u201cEnabling On-Demand Database Computing with MIT SuperCloud Database Management System.\u201d IEEE HPEC 2015.</td>
+      <td><a href="https://arxiv.org/abs/1506.08506">paper</a></td>
+      <td>Architecture</td>
+      <td>IEEE HPEC 2015</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Hubbell, Matthew, et al. \u201cBig Data Strategies for Data Center Infrastructure Management Using a 3D Gaming Platform.\u201d IEEE HPEC 2015.</td>
+      <td><a href="https://arxiv.org/abs/1506.08505">paper</a></td>
+      <td>Use Cases</td>
+      <td>IEEE HPEC 2015</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Gadepally, Vijay, et al. \u201cComputing on Masked Data to improve the Security of Big Data.\u201d IEEE HST 2015.</td>
+      <td><a href="https://arxiv.org/abs/1504.01287">paper</a></td>
+      <td>Use Cases</td>
+      <td>IEEE HST 2015</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Kepner, Jeremy, et al. \u201cAssociative Arrays: Unified Mathematics for Spreadsheets, Databases, Matrices, and Graphs.\u201d New England Database Summit 2015.</td>
+      <td><a href="https://arxiv.org/abs/1501.05709">paper</a></td>
+      <td>Use Cases</td>
+      <td>New England Database Summit 2015</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Achieving 100,000,000 database inserts per second using Accumulo and D4M - Kepner et al IEEE HPEC 2014</td>
+      <td><a href="https://arxiv.org/abs/1406.4923">paper</a></td>
+      <td>Performance</td>
+      <td>IEEE HPEC 2014</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Evaluating Accumulo Performance for a Scalable Cyber Data Processing Pipeline - Sawyer et al IEEE HPEC 2014</td>
+      <td><a href="https://arxiv.org/abs/1407.5661">paper</a></td>
+      <td>Performance</td>
+      <td>IEEE HPEC 2014</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Understanding Query Performance in Accumulo - Sawyer et al IEEE HPEC 2013</td>
+      <td><a href="http://ieee-hpec.org/2013/index_htm_files/28-2868615.pdf">paper</a></td>
+      <td>Performance</td>
+      <td>IEEE HPEC 2013</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Benchmarking Apache Accumulo BigData Distributed Table Store Using Its Continuous Test Suite - Sen et al 2013 IEEE International Congress on Big Data.</td>
+      <td><a href="https://sqrrl.com/media/Accumulo-Benchmark-10312013-1.pdf">paper</a></td>
+      <td>Performance</td>
+      <td>IEEE International Congress on Big Data 2013</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Benchmarking the Apache Accumulo Distributed Key-Value Store - Sen et al 2014 Updated version of the IEEE paper, including edits for clarity and additional results from benchmarking on Amazon EC2.</td>
+      <td><a href="accumulo-benchmarking-2.1.pdf">paper</a></td>
+      <td>Performance</td>
+      <td>Online</td>
+      <td>No</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Computing on Masked Data: a High Performance Method for Improving Big Data Veracity - Kepner et al IEEE HPEC 2014</td>
+      <td><a href="https://arxiv.org/abs/1406.5751">paper</a></td>
+      <td>Security</td>
+      <td>IEEE HPEC 2014</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>D4M 2.0 Schema: A General Purpose High Performance Schema for the Accumulo Database - Kepner et al IEEE HPEC 2013</td>
+      <td><a href="http://ieee-hpec.org/2013/index_htm_files/11-Kepner-D4Mschema-IEEE-HPEC.pdf">paper</a> <a href="http://ieee-hpec.org/2013/index_htm_files/11_130716-D4Mschema.pdf">slides</a></td>
+      <td>Architecture</td>
+      <td>IEEE HPEC 2013</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Genetic Sequence Matching Using D4M Big Data Approaches - Dodson et al IEEE HPEC 2014</td>
+      <td>�</td>
+      <td>Use Cases</td>
+      <td>IEEE HPEC 2014</td>
+      <td>Yes</td>
+      <td>Best Paper Finalist</td>
+    </tr>
+    <tr>
+      <td>Big Data Dimensional Analysis - Gadepally et al IEEE HPEC 2014</td>
+      <td>�</td>
+      <td>Use Cases</td>
+      <td>IEEE HPEC 2014</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>LLSuperCloud: Sharing HPC systems for diverse rapid prototyping - Reuther et al IEEE HPEC 2013</td>
+      <td><a href="http://ieee-hpec.org/2013/index_htm_files/26-HPEC13_LLSuperCloud_Reuther_final.pdf">paper</a> <a href="http://ieee-hpec.org/2013/index_htm_files/HPEC+2013+Reuther+SuperCloud+final.pdf">slides</a></td>
+      <td>Architecture</td>
+      <td>IEEE HPEC 2013</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Spatio-temporal indexing in non-relational distributed databases - Fox et al 2013 IEEE International Congress on Big Data</td>
+      <td><a href="http://geomesa.github.io/assets/outreach/SpatioTemporalIndexing_IEEEcopyright.pdf">paper</a></td>
+      <td>Use Cases</td>
+      <td>IEEE International Congress on Big Data 2013</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Typograph: Multiscale spatial exploration of text documents - Endert, Alex, et al 2013 IEEE International Congress on Big Data</td>
+      <td><a href="https://people.cs.vt.edu/aendert/Alex_Endert/Research_files/Typograph.pdf">paper</a></td>
+      <td>Use Cases</td>
+      <td>IEEE International Congress on Big Data 2013</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>UxV Data to the Cloud via Widgets - Charles et al 18th International Command &amp; Control Research &amp; Technology Symposium 2013</td>
+      <td><a href="http://www.dodccrp.org/events/18th_iccrts_2013/post_conference/papers/051.pdf">paper</a></td>
+      <td>Use Cases</td>
+      <td>Command &amp; Control Research &amp; Technology Symposium 2013</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Driving Big Data With Big Compute - Byun et al IEEE HPEC 2012</td>
+      <td><a href="http://www.mit.edu/~kepner/pubs/ByunKepner_2012_BigData_Paper.pdf">paper</a> <a href="http://ieee-hpec.org/2012/index_htm_files/42_ID18.pptx">slides</a></td>
+      <td>Architecture</td>
+      <td>IEEE HPEC 2012</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Large Scale Network Situational Awareness Via 3D Gaming Technology - Hubbell et al IEEE HPEC 2012</td>
+      <td><a href="http://ieee-hpec.org/2012/index_htm_files/HPEC12_Hubbell.pdf">paper</a> <a href="http://ieee-hpec.org/2012/index_htm_files/31_ID20.pptx">slides</a></td>
+      <td>Use Cases</td>
+      <td>IEEE HPEC 2012</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Rya: a scalable RDF triple store for the clouds - Punnoose et al 1st International Workshop on Cloud Intelligence, ACM, 2012</td>
+      <td><a href="https://sqrrl.com/media/Rya_CloudI20121.pdf">paper</a></td>
+      <td>Architecture</td>
+      <td>ACM International Workshop on Cloud Intelligence 2012</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Dynamic distributed dimensional data model (D4M) database and computation system - Kepner et al ICASSP 2012</td>
+      <td><a href="http://www.mit.edu/~kepner/pubs/Kepner_2012_D4M_Paper.pdf">paper</a> <a href="http://www.mit.edu/~kepner/pubs/Kepner_2012_D4M_Slides.pdf">slides</a></td>
+      <td>Architecture</td>
+      <td>ICASSP 2012</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>An NSA Big Graph experiment (Technical Report NSA-RD-2013-056002v1)</td>
+      <td><a href="http://www.pdl.cmu.edu/SDI/2013/slides/big_graph_nsa_rd_2013_56002v1.pdf">slides</a></td>
+      <td>Performance</td>
+      <td>Technical Report</td>
+      <td>No</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Patil, Swapnil, et al. \u201cYCSB++: benchmarking and performance debugging advanced features in scalable table stores.\u201d Proceedings of the 2nd ACM Symposium on Cloud Computing. ACM, 2011.</td>
+      <td><a href="http://www.pdl.cmu.edu/PDL-FTP/Storage/socc2011.pdf">paper</a> <a href="http://www.cercs.gatech.edu/opencirrus/OCsummit11/presentations/patil.pdf">slides</a></td>
+      <td>Performance</td>
+      <td>ACM Symposium on Cloud Computing 2011</td>
+      <td>Yes</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Turner, Keith \u201cApache Accumulo 1.4 &amp; 1.5 Features.\u201d February, 2012</td>
+      <td><a href="https://home.apache.org/~kturner/accumulo14_15.pdf">slides</a></td>
+      <td>Architecture</td>
+      <td>Meetup</td>
+      <td>No</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Fuchs, Adam \u201cAccumulo: Extensions to Google\u2019s Bigtable Design.\u201d March, 2012</td>
+      <td><a href="https://home.apache.org/~afuchs/slides/morgan_state_talk.pdf">slides</a></td>
+      <td>Architecture</td>
+      <td>Meetup</td>
+      <td>No</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>Miner, Donald \u201cAn Introduction to Apache Accumulo - how it works, why it exists, and how it is used.\u201d August, 2014</td>
+      <td><a href="https://www.slideshare.net/DonaldMiner/an-introduction-to-accumulo">slides</a></td>
+      <td>Architecture</td>
+      <td>Online</td>
+      <td>No</td>
+      <td>�</td>
+    </tr>
+  </tbody>
+</table>
+
+<script type="text/javascript">
+$(function() {
+$("#citationtable").dataTable();
+});
+</script>
+
+<h2 id="slides-from-conferences-and-meetups">Slides from Conferences and Meetups</h2>
+
+<ul>
+  <li><a href="https://www.slideshare.net/AccumuloSummit">Accumulo Summit Slides</a></li>
+  <li>Strata + Hadoop World Meetup 24 Oct 2012
+    <ul>
+      <li><a href="https://aws.amazon.com/amis/accumulo-standalone-20121019">Accumulo standalone AMI</a></li>
+      <li><a href="https://www.slideshare.net/jasontrost/accumulo-at-endgame">Large-scale web analytics with Accumulo (and Nutch/Gora, Pig, and Storm)</a></li>
+      <li><a href="https://www.slideshare.net/hortonworks/compaction-and-splitting-in-apache-accumulo">Compaction and Splitting in Accumulo</a></li>
+    </ul>
+  </li>
+</ul>
+
+<h2 id="blog-posts-and-writeups">Blog Posts and Writeups</h2>
+
+<ul>
+  <li><a href="http://affy.blogspot.com/search?q=accumulo&amp;by-date=true">Codebits Blogs</a>
+    <ul>
+      <li><a href="http://affy.blogspot.com/2012/04/implement-word-count-in-accumulo.html">Implement Word Count in Accumulo</a></li>
+      <li><a href="http://affy.blogspot.com/2012/04/using-accumulo-to-calculate-seven-day.html">Using Accumulo To Calculate Seven Day Rolling Average</a></li>
+    </ul>
+  </li>
+  <li><a href="http://www.covert.io/">covert.io blogs</a>
+    <ul>
+      <li><a href="http://www.covert.io/post/18414889381/accumulo-nutch-and-gora">Accumulo, Nutch, and Gora</a></li>
+      <li><a href="http://www.covert.io/post/18605091231/accumulo-and-pig">Accumulo and Pig</a></li>
+    </ul>
+  </li>
+  <li><a href="https://www.mapr.com/blog/accumulo-on-mapr">Accumulo on MapR</a> <a href="http://blog.stavi.sh/instructions-for-running-accumulo-on-mapr-m5">More Accumulo on MapR</a></li>
+  <li><a href="https://gist.github.com/1535657">Accumulo on Ubuntu VirtualBox</a></li>
+  <li><a href="http://www.accumulodata.com/ec2.html">Accumulo on EC2</a></li>
+</ul>
+
+<h2 id="books">Books</h2>
+
+<ul>
+  <li><a href="https://www.packtpub.com/apache-accumulo-for-developers/book">Apache Accumulo for Developers (Packt Publishing)</a></li>
+  <li><a href="https://shop.oreilly.com/product/0636920032304.do">Accumulo: Application Development, Table Design, and Best Practices (O\u2019Reilly Media)</a></li>
+</ul>
+
+<h2 id="reference">Reference</h2>
+
+<ul>
+  <li><a href="https://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.44.2782&amp;rep=rep1&amp;type=pdf">Log-Structured Merge Tree</a></li>
+  <li><a href="https://research.google.com/archive/bigtable.html">BigTable</a></li>
+  <li><a href="https://research.google.com/archive/gfs.html">GFS</a></li>
+  <li><a href="https://research.google.com/archive/chubby.html">Chubby</a></li>
+  <li><a href="https://research.google.com/pubs/pub36356.html">Dapper</a></li>
+  <li><a href="https://en.wikipedia.org/wiki/Bloom_filter">Bloom Filter</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/features/index.html
----------------------------------------------------------------------
diff --git a/features/index.html b/features/index.html
index 2857088..ca3a519 100644
--- a/features/index.html
+++ b/features/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/feed.xml
----------------------------------------------------------------------
diff --git a/feed.xml b/feed.xml
index 4287291..fa2e054 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
 </description>
     <link>https://accumulo.apache.org/</link>
     <atom:link href="https://accumulo.apache.org/feed.xml" rel="self" type="application/rss+xml"/>
-    <pubDate>Tue, 06 Dec 2016 21:45:05 -0500</pubDate>
-    <lastBuildDate>Tue, 06 Dec 2016 21:45:05 -0500</lastBuildDate>
+    <pubDate>Wed, 14 Dec 2016 09:31:22 -0500</pubDate>
+    <lastBuildDate>Wed, 14 Dec 2016 09:31:22 -0500</lastBuildDate>
     <generator>Jekyll v3.3.0</generator>
     
       <item>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/get_involved.html
----------------------------------------------------------------------
diff --git a/get_involved.html b/get_involved.html
deleted file mode 100644
index a329ac2..0000000
--- a/get_involved.html
+++ /dev/null
@@ -1,244 +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>Get Involved</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">Get Involved</h1>
-          
-          <p>You don\u2019t need to be a software developer to contribute to 
-Apache Accumulo. To be successful this project 
-requires a huge range of different skills, levels of involvement and degrees of 
-technical expertise. So, if you want to get involved in Apache Accumulo, there 
-is almost certainly a role for you.</p>
-
-<p>We are looking for people to:</p>
-
-<ul>
-  <li>provide feedback</li>
-  <li>write or update documentation</li>
-  <li>help new users</li>
-  <li>recommend the project to others</li>
-  <li>test the code and report bugs</li>
-  <li>fix bugs</li>
-  <li>give us feedback on required features</li>
-  <li>write and update the software</li>
-  <li>create artwork</li>
-  <li>translate to different languages</li>
-  <li>anything you can see that needs doing</li>
-</ul>
-
-<p>All of these contributions help to keep a project active and strengthen 
-the community. The project team and the broader community will 
-therefore welcome and encourage participation, and attempt to make it 
-as easy as possible for people to get involved.</p>
-
-<p>Want to get started now? Check out <a href="https://s.apache.org/newbie_accumulo_tickets">open issues labeled for \u201cnewbies\u201d</a>. If you need help, use the mailing list information below to reach out. If the issue you choose deals with code, you should read the developer\u2019s guide section.</p>
-
-<h2 id="mailing-lists-and-meetups">Mailing lists and Meetups</h2>
-
-<p>Your first engagement with the project should be to subscribe to our
-<a href="/mailing_list">mailing lists</a>.  You can also <a href="https://www.meetup.com/find/?keywords=accumulo">look for Accumulo Meetups</a> in your area. 
-Apache Accumulo developers and community members hang out in the #accumulo 
-channel on irc.freenode.net.</p>
-
-<h2 id="contributor-guide">Contributor Guide</h2>
-
-<p>See the <a href="/contributor/">contributor guide</a> for recommended practices in interacting with our source code.
-Take a look at <a href="https://www.ohloh.net/p/accumulo">Accumulo\u2019s Ohloh page</a> for an analysis of the code base.</p>
-
-<h2 id="community-interaction">Community Interaction</h2>
-
-<p>Learn about <a href="http://www.betaversion.org/~stefano/papers/ac2006.2.pdf">building open source communities</a>.</p>
-
-<h2 id="decision-making">Decision Making</h2>
-
-<p>The most important thing about engaging with any Apache project is that everyone
-is equal. All people with an opinion are entitled to express that opinion and, where 
-appropriate, have it considered by the community.</p>
-
-<p>To some the idea of having to establish consensus in a large and distributed team 
-sounds inefficient and frustrating. Don\u2019t despair though, The Apache Way has a
-set of simple processes to ensure things proceed at a good pace.</p>
-
-<p>In ASF projects we don\u2019t like to vote. We reserve that for the few things that need 
-official approval for legal or process reasons (e.g. a release or a new committer). 
-Most of the time we work with the consensus building techniques documented below.</p>
-
-<h3 id="lazy-consensus">Lazy Consensus</h3>
-
-<p><a href="/governance/lazyConsensus">Lazy consensus</a> is the first, and possibly the most important, consensus building 
-tool we have. Essentially lazy consensus means that you don\u2019t need to get explicit
-approval to proceed, but you need to be prepared to listen if someone objects.</p>
-
-<h3 id="consensus-building">Consensus Building</h3>
-
-<p>Sometimes lazy consensus is not appropriate. In such cases it is necessary to
-make a proposal to the mailing list and discuss options. There are mechanisms
-for quickly showing your support or otherwise for a proposal and 
-<a href="/governance/consensusBuilding">building consensus</a> amongst the community.</p>
-
-<p>Once there is a consensus people can proceed with the work under the <a href="/governance/lazyConsensus">lazy 
-consensus</a> model.</p>
-
-<h3 id="voting">Voting</h3>
-
-<p>Occasionally a \u201cfeel\u201d for consensus is not enough. Sometimes we need to 
-have a measurable consensus. For example, when <a href="/governance/voting">voting</a> in new committers or 
-to approve a release.</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/get_involved/index.html
----------------------------------------------------------------------
diff --git a/get_involved/index.html b/get_involved/index.html
new file mode 100644
index 0000000..55ed08e
--- /dev/null
+++ b/get_involved/index.html
@@ -0,0 +1,250 @@
+<!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>Get Involved</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">Get Involved</h1>
+          
+          <p>You don\u2019t need to be a software developer to contribute to 
+Apache Accumulo. To be successful this project 
+requires a huge range of different skills, levels of involvement and degrees of 
+technical expertise. So, if you want to get involved in Apache Accumulo, there 
+is almost certainly a role for you.</p>
+
+<p>We are looking for people to:</p>
+
+<ul>
+  <li>provide feedback</li>
+  <li>write or update documentation</li>
+  <li>help new users</li>
+  <li>recommend the project to others</li>
+  <li>test the code and report bugs</li>
+  <li>fix bugs</li>
+  <li>give us feedback on required features</li>
+  <li>write and update the software</li>
+  <li>create artwork</li>
+  <li>translate to different languages</li>
+  <li>anything you can see that needs doing</li>
+</ul>
+
+<p>All of these contributions help to keep a project active and strengthen 
+the community. The project team and the broader community will 
+therefore welcome and encourage participation, and attempt to make it 
+as easy as possible for people to get involved.</p>
+
+<p>Want to get started now? Check out <a href="https://s.apache.org/newbie_accumulo_tickets">open issues labeled for \u201cnewbies\u201d</a>. If you need help, use the mailing list information below to reach out. If the issue you choose deals with code, you should read the developer\u2019s guide section.</p>
+
+<h2 id="mailing-lists-and-chat">Mailing lists and chat</h2>
+
+<p>Your first engagement with the project should be to subscribe to our
+<a href="/mailing_list">mailing lists</a>.  Apache Accumulo developers and community members
+hang out in the #accumulo channel on irc.freenode.net.</p>
+
+<h2 id="contributor-guide">Contributor Guide</h2>
+
+<p>See the <a href="/contributor/">contributor guide</a> for recommended practices in interacting with our source code.
+Take a look at <a href="https://www.ohloh.net/p/accumulo">Accumulo\u2019s Ohloh page</a> for an analysis of the code base.</p>
+
+<h2 id="conferences-and-meetups">Conferences and Meetups</h2>
+
+<ul>
+  <li><a href="http://accumulosummit.com">Accumulo Summit</a></li>
+  <li><a href="https://www.meetup.com/Accumulo-Users-DC/">Accumulo Users Group - DC VA MD</a></li>
+  <li>Look for <a href="https://www.meetup.com/find/?keywords=accumulo">Accumulo Meetups in your area</a></li>
+</ul>
+
+<h2 id="community-interaction">Community Interaction</h2>
+
+<p>Learn about <a href="http://www.betaversion.org/~stefano/papers/ac2006.2.pdf">building open source communities</a>.</p>
+
+<h2 id="decision-making">Decision Making</h2>
+
+<p>The most important thing about engaging with any Apache project is that everyone
+is equal. All people with an opinion are entitled to express that opinion and, where 
+appropriate, have it considered by the community.</p>
+
+<p>To some the idea of having to establish consensus in a large and distributed team 
+sounds inefficient and frustrating. Don\u2019t despair though, The Apache Way has a
+set of simple processes to ensure things proceed at a good pace.</p>
+
+<p>In ASF projects we don\u2019t like to vote. We reserve that for the few things that need 
+official approval for legal or process reasons (e.g. a release or a new committer). 
+Most of the time we work with the consensus building techniques documented below.</p>
+
+<h3 id="lazy-consensus">Lazy Consensus</h3>
+
+<p><a href="/contributor/lazyConsensus">Lazy consensus</a> is the first, and possibly the most important, consensus building 
+tool we have. Essentially lazy consensus means that you don\u2019t need to get explicit
+approval to proceed, but you need to be prepared to listen if someone objects.</p>
+
+<h3 id="consensus-building">Consensus Building</h3>
+
+<p>Sometimes lazy consensus is not appropriate. In such cases it is necessary to
+make a proposal to the mailing list and discuss options. There are mechanisms
+for quickly showing your support or otherwise for a proposal and 
+<a href="/contributor/consensusBuilding">building consensus</a> amongst the community.</p>
+
+<p>Once there is a consensus people can proceed with the work under the <a href="/contributor/lazyConsensus">lazy 
+consensus</a> model.</p>
+
+<h3 id="voting">Voting</h3>
+
+<p>Occasionally a \u201cfeel\u201d for consensus is not enough. Sometimes we need to 
+have a measurable consensus. For example, when <a href="/contributor/voting">voting</a> in new committers or 
+to approve a release.</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/glossary/index.html
----------------------------------------------------------------------
diff --git a/glossary/index.html b/glossary/index.html
index 598a9ae..ffc93dd 100644
--- a/glossary/index.html
+++ b/glossary/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/governance/bylaws.html
----------------------------------------------------------------------
diff --git a/governance/bylaws.html b/governance/bylaws.html
index d681cc4..801320d 100644
--- a/governance/bylaws.html
+++ b/governance/bylaws.html
@@ -1,438 +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>Bylaws</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">Bylaws</h1>
-          
-          <p>This is version 3 of the bylaws. Community work actively continues on the bylaws, and so key segments of them are subject to change.</p>
-
-<h1 id="introduction">Introduction</h1>
-
-<p>This document defines the bylaws under which the Apache Accumulo project operates. It defines the roles and responsibilities of the project, who may vote, how voting works, how conflicts are resolved, etc.</p>
-
-<p>Accumulo is a project of the <a href="https://www.apache.org/foundation">Apache Software Foundation</a>. The foundation holds the copyright on Apache code including the code in the Accumulo codebase. The <a href="https://www.apache.org/foundation/faq">foundation FAQ</a> explains the operation and background of the foundation.</p>
-
-<p>Accumulo is typical of Apache projects in that it operates under a set of principles, known collectively as the Apache Way. If you are new to Apache development, please refer to the <a href="https://incubator.apache.org">Incubator project</a> for more information on how Apache projects operate. Terms used at the ASF are defined in the <a href="https://www.apache.org/foundation/glossary">ASF glossary</a>.</p>
-
-<h1 id="roles-and-responsibilities">Roles and Responsibilities</h1>
-
-<p>Apache projects define a set of roles with associated rights and responsibilities. These roles govern what tasks an individual may perform within the project. The roles are defined in the following sections.</p>
-
-<h2 id="users">Users</h2>
-
-<p>The most important participants in the project are people who use our software. The majority of our contributors start out as users and guide their development efforts from the user\u2019s perspective.</p>
-
-<p>Users contribute to the Apache projects by providing feedback to contributors in the form of bug reports and feature suggestions. As well, users participate in the Apache community by helping other users on mailing lists and user support forums.</p>
-
-<h2 id="contributors">Contributors</h2>
-
-<p>All of the volunteers who are contributing time, code, documentation, or resources to the Accumulo project are considered contributors. A contributor that makes sustained, welcome contributions to the project may be invited to become a committer, though the exact timing of such invitations depends on many factors.</p>
-
-<h2 id="committers">Committers</h2>
-
-<p>The project\u2019s committers are responsible for the project\u2019s technical management. Committers have write access to the project\u2019s code repositories and may cast binding votes on any technical discussion regarding Accumulo. Committer access is by invitation only and must be approved by consensus approval of the active PMC members. Upon acceptance of the invitation to become a committer, it is the accepting member\u2019s responsibility to update their status on the Accumulo web page accordingly.</p>
-
-<p>A committer is considered emeritus, meaning inactive, by their own declaration or by not reviewing patches or committing patches to the project for over six months. Emeritus members will be recognized by the PMC on the Accumulo web page, in honor of their past contributions. Emeritus members retain all voting and commit rights associated with their former designation and can move themselves out of emeritus status by sending an announcement of their return to the developer mailing list. It will be the returning member\u2019s responsibility to update their status on the web page accordingly.</p>
-
-<p>An emeritus committer\u2019s commit access may be disabled as part of routine security. Access shall not be removed without notifying the committer, and access shall be maintained if the committer wishes to leave it active. A committer\u2019s commit access shall be reactivated upon the committer\u2019s request to the PMC.</p>
-
-<p>All Apache committers are required to have a signed <a href="https://www.apache.org/licenses/icla.txt">Contributor License Agreement</a> (CLA) on file with the Apache Software Foundation. Under the terms of the CLA that all committers must sign, a committer\u2019s primary responsibility is to ensure that all code committed to Apache Accumulo is licensed appropriately and meets those criteria set forth in the CLA (including both original works and patches committed on behalf of other contributors). There is a <a href="https://www.apache.org/dev/committers">Committer FAQ</a> which provides more details on the requirements for committers.</p>
-
-<p>It is the custom of the Accumulo project to also invite each committer to become a member of the Accumulo PMC.</p>
-
-<h2 id="project-management-committee">Project Management Committee</h2>
-
-<p>The role of the PMC, from a Foundation perspective, is <a href="https://www.apache.org/foundation/how-it-works.html#pmc">oversight</a>. The main
-role of the PMC is not code and not coding, but to ensure that all legal
-issues are addressed, that procedure is followed, and that each and every
-release is the product of the community as a whole. That is key to our
-litigation protection mechanisms.</p>
-
-<p>Secondly, the role of the PMC is to further the long-term development and
-health of the community as a whole, and to ensure that balanced and wide
-scale peer review and collaboration does happen. Within the ASF, we worry
-about any community which centers around a few individuals who are working
-virtually uncontested. We believe that this is detrimental to quality,
-stability, and robustness of both code and long term social structures.</p>
-
-<p>The responsibilities of the PMC include:</p>
-
-<ul>
-  <li>Deciding what is distributed as products of the Apache Accumulo project.</li>
-  <li>Maintaining the project\u2019s shared resources, including the code repository, mailing lists, and websites.</li>
-  <li>Protecting and ensuring proper use of Apache trademarks by the project and by other parties.</li>
-  <li>Speaking on behalf of the project.</li>
-  <li>Nominating new PMC members and committers.</li>
-  <li>Maintaining these bylaws and other guidelines of the project.</li>
-</ul>
-
-<p>In particular, PMC members must understand both our project\u2019s criteria and ASF criteria for voting on a <a href="https://www.apache.org/dev/release#management">release</a>.
-See the <a href="https://www.apache.org/dev/pmc">PMC Guide</a> for more information on PMC responsibilities.</p>
-
-<p>Membership of the PMC is by invitation only and must be approved by a consensus approval of active PMC members. Upon acceptance of the invitation to become a PMC member, it is the accepting member\u2019s responsibility to update their status on the Accumulo web page accordingly.</p>
-
-<p>A PMC member is considered emeritus, meaning inactive, by their own declaration or by not contributing in any form to the project for over six months. Emeritus members will be recognized by the PMC on the Accumulo web page, in honor of their past contributions. Emeritus members retain all voting and commit rights associated with their former designation and can move themselves out of emeritus status by sending an announcement of their return to the developer mailing list. It will be the returning member\u2019s responsibility to update their status on the web page accordingly.</p>
-
-<p>The chair of the PMC is appointed by the ASF board. The chair is an office holder of the Apache Software Foundation (Vice President, Apache Accumulo) and has primary responsibility to the board for the management of the projects within the scope of the Accumulo PMC. The chair reports to the board quarterly on developments within the Accumulo project.</p>
-
-<p>When the current chair of the PMC resigns, the PMC votes to recommend a new chair using consensus approval, but the decision must be ratified by the Apache board.</p>
-
-<h2 id="release-manager">Release Manager</h2>
-
-<p>The <a href="https://www.apache.org/dev/release-publishing">ASF release process</a> defines the <a href="https://www.apache.org/dev/release-publishing#release_manager">release manager</a> as an individual responsible for shepherding a new project release. Any committer may serve as a release manager. The release manager for a release is chosen as part of the release plan.</p>
-
-<p>At a minimum, a release manager is responsible for packaging a release candidate for a vote and signing and publishing an approved release candidate. An Accumulo release manager is also expected to:</p>
-
-<ul>
-  <li>guide whether changes after feature freeze or code freeze should be included in the release</li>
-  <li>ensure that required release testing is being conducted</li>
-  <li>track whether the release is on target for its expected release date</li>
-  <li>adjust release plan dates to reflect the latest estimates</li>
-  <li>determine if a re-plan may be needed and, if so, call a vote</li>
-  <li>call votes on release candidates</li>
-</ul>
-
-<p><a href="governance/releasing">Release guidelines</a> and <a href="releasing">details on the mechanics of creating an Accumulo release</a> are available on the Accumulo project site.</p>
-
-<h1 id="decision-making">Decision Making</h1>
-
-<p>Within the Accumulo project, different types of decisions require different forms of approval. For example, the previous section describes several decisions which require \u2018consensus approval\u2019. This section defines how voting is performed, the types of approvals, and which types of decision require which type of approval.</p>
-
-<h2 id="voting">Voting</h2>
-
-<p>Decisions regarding the project are made by votes on the primary project development mailing list: dev@accumulo.apache.org. Where necessary, PMC voting may take place on the private Accumulo PMC mailing list: private@accumulo.apache.org. Votes are clearly indicated by a subject line starting with [VOTE]. A vote message may only pertain to a single item\u2019s approval; multiple items should be separated into multiple messages. Voting is carried out by replying to the vote mail. A vote may take on one of four forms, defined below.</p>
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>Vote</th>
-      <th>Meaning</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>+1</td>
-      <td><em>Yes</em>, <em>Agree</em>, or <em>The action should be performed</em>. In general, this vote also indicates a willingness on the behalf of the voter to <em>make it happen</em>.</td>
-    </tr>
-    <tr>
-      <td>+0</td>
-      <td>This vote indicates a willingness for the action under consideration to go ahead. The voter, however, will not be able to help.</td>
-    </tr>
-    <tr>
-      <td>-0</td>
-      <td>This vote indicates that the voter does not, in general, agree with the proposed action but is not concerned enough to prevent the action going ahead.</td>
-    </tr>
-    <tr>
-      <td>-1</td>
-      <td><em>No</em>, <em>Disagree</em>, or <em>The action should not be performed</em>. On issues where consensus is required, this vote counts as a veto. All vetoes must contain an explanation of why the veto is appropriate. Vetoes with no explanation are void. It may also be appropriate for a -1 vote to include an alternative course of action.</td>
-    </tr>
-  </tbody>
-</table>
-
-<p>All participants in the Accumulo project are encouraged to vote. For technical decisions, only the votes of active committers are binding. Non-binding votes are still useful for those with binding votes to understand the perception of an action across the wider Accumulo community. For PMC decisions, only the votes of active PMC members are binding.</p>
-
-<p>See the <a href="governance/voting">voting page</a> for more details on the mechanics of voting.</p>
-
-<h2 id="commit-then-review-ctr">Commit Then Review (CTR)</h2>
-
-<p>Voting can also be applied to changes to the Accumulo codebase. Under the Commit Then Review policy, committers can make changes to the codebase without seeking approval beforehand, and the changes are assumed to be approved unless an objection is raised. Only if an objection is raised must a vote take place on the code change.</p>
-
-<p>For some code changes, committers may wish to get feedback from the community before making the change. It is acceptable for a committer to seek approval before making a change if they so desire.</p>
-
-<h2 id="approvals">Approvals</h2>
-
-<p>These are the types of approvals that can be sought. Different actions require different types of approvals.</p>
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>Approval�Type</th>
-      <th>Definition</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>Consensus Approval</td>
-      <td>A consensus approval vote passes with 3 binding +1 votes and no binding vetoes.</td>
-    </tr>
-    <tr>
-      <td>Majority Approval</td>
-      <td>A majority approval vote passes with 3 binding +1 votes and more binding +1 votes than -1 votes.</td>
-    </tr>
-    <tr>
-      <td>Lazy Approval (or Lazy Consensus)</td>
-      <td>An action with lazy approval is implicitly allowed unless a -1 vote is received, at which time, depending on the type of action, either majority approval or consensus approval must be obtained.  Lazy Approval can be either <em>stated</em> or <em>assumed</em>, as detailed on the <a href="governance/lazyConsensus">lazy consensus page</a>.</td>
-    </tr>
-  </tbody>
-</table>
-
-<h2 id="vetoes">Vetoes</h2>
-
-<p>A valid, binding veto cannot be overruled. If a veto is cast, it must be accompanied by a valid reason explaining the veto. The validity of a veto, if challenged, can be confirmed by anyone who has a binding vote. This does not necessarily signify agreement with the veto, but merely that the veto is valid.</p>
-
-<p>If you disagree with a valid veto, you must lobby the person casting the veto to withdraw their veto. If a veto is not withdrawn, the action that has been vetoed must be reversed in a timely manner.</p>
-
-<h2 id="actions">Actions</h2>
-
-<p>This section describes the various actions which are undertaken within the project, the corresponding approval required for that action and those who have binding votes over the action. It also specifies the minimum length of time that a vote must remain open, measured in days. In general, votes should not be called at times when it is known that interested members of the project will be unavailable.</p>
-
-<p>For Code Change actions, a committer may choose to employ assumed or stated Lazy Approval under the <a href="#commit-then-review-ctr">CTR</a> policy. Assumed Lazy Approval has no minimum length of time before the change can be made.</p>
-
-<table class="table">
-  <thead>
-    <tr>
-      <th>Action</th>
-      <th>Description</th>
-      <th>Approval</th>
-      <th>Binding Votes</th>
-      <th>Min. Length (days)</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>Code Change</td>
-      <td>A change made to a codebase of the project. This includes source code, documentation, website content, etc.</td>
-      <td>Lazy approval, moving to consensus approval upon veto</td>
-      <td>Active committers</td>
-      <td>1</td>
-    </tr>
-    <tr>
-      <td>Release Plan</td>
-      <td>Defines the timetable and actions for an upcoming release. The plan also nominates a Release Manager.</td>
-      <td>Lazy approval, moving to majority approval upon veto</td>
-      <td>Active committers</td>
-      <td>3</td>
-    </tr>
-    <tr>
-      <td>Release Plan Cancellation</td>
-      <td>Cancels an active release plan, due to a need to re-plan (e.g., discovery of a major issue).</td>
-      <td>Majority approval</td>
-      <td>Active committers</td>
-      <td>3</td>
-    </tr>
-    <tr>
-      <td>Product Release</td>
-      <td>Accepts or rejects a release candidate as an official release of the project.</td>
-      <td>Majority approval</td>
-      <td>Active PMC members</td>
-      <td>3</td>
-    </tr>
-    <tr>
-      <td>Adoption of New Codebase</td>
-      <td>When the codebase for an existing, released product is to be replaced with an alternative codebase. If such a vote fails to gain approval, the existing code base will continue. This also covers the creation of new sub-projects within the project.</td>
-      <td>Consensus approval</td>
-      <td>Active PMC members</td>
-      <td>7</td>
-    </tr>
-    <tr>
-      <td>New Committer</td>
-      <td>When a new committer is proposed for the project.</td>
-      <td>Consensus approval</td>
-      <td>Active PMC members</td>
-      <td>3</td>
-    </tr>
-    <tr>
-      <td>New PMC Member</td>
-      <td>When a committer is proposed for the PMC.</td>
-      <td>Consensus approval</td>
-      <td>Active PMC members</td>
-      <td>3</td>
-    </tr>
-    <tr>
-      <td>New PMC Chair</td>
-      <td>When a new PMC chair is chosen to succeed an outgoing chair.</td>
-      <td>Consensus approval</td>
-      <td>Active PMC members</td>
-      <td>3</td>
-    </tr>
-    <tr>
-      <td>Modifying Bylaws</td>
-      <td>Modifying this document.</td>
-      <td>Consensus approval</td>
-      <td>Active PMC members</td>
-      <td>7</td>
-    </tr>
-  </tbody>
-</table>
-
-<p>No other voting actions are defined; all other actions should presume Lazy Approval (defaulting to Consensus Approval upon veto). If an action is voted on multiple times, or if a different approval type is desired, these bylaws should be amended to include the action.</p>
-
-<p>For the purposes of the \u201cAdoption of New Codebase\u201d action, the Accumulo codebase is defined as the Accumulo site content, primary project code, and all contributed code (\u201ccontribs\u201d) as they exist in their respective repositories. Adoption of a new codebase generally refers to the creation of a new contrib repository, but could cover, for example, a rework of the project site, or merging a contrib project into the primary codebase.</p>
-
-<p>Voting actions for the removal of a committer or PMC member are intentionally not defined. According to ASF rules, <a href="https://www.apache.org/dev/committers#committer-set-term">committer status never expires</a> and <a href="https://www.apache.org/dev/pmc#pmc-removal">PMC members can only be removed with approval from the ASF Board</a>.</p>
-
-<h1 id="release-plans">Release Plans</h1>
-
-<p>The approval of a release plan begins the process of creating a new project release. The process ends when a release candidate is approved.</p>
-
-<p>An Accumulo release plan consists of at least the following:</p>
-
-<ul>
-  <li>a version number</li>
-  <li>a feature freeze date</li>
-  <li>a code freeze date</li>
-  <li>a release date</li>
-  <li>the choice of a release manager</li>
-</ul>
-
-<p>After feature freeze, new features should not be accepted for the release. After code freeze, only critical fixes should be accepted for the release. The release manager guides the decision on accepting changes.</p>
-
-<p>All dates in a plan are estimates, as unforeseen issues may require delays. The release manager may adjust dates as needed. In serious circumstances, the release manager may opt to call a re-plan vote.</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>
+<title>Redirecting\u2026</title>
+<link rel="canonical" href="https://accumulo.apache.org/contributor/bylaws.html">
+<meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/contributor/bylaws.html">
+<h1>Redirecting\u2026</h1>
+<a href="https://accumulo.apache.org/contributor/bylaws.html">Click here if you are not redirected.</a>
+<script>location="https://accumulo.apache.org/contributor/bylaws.html"</script>
 </html>


[04/11] accumulo-website git commit: Jekyll build from master:a71056c

Posted by mw...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/people/index.html
----------------------------------------------------------------------
diff --git a/people/index.html b/people/index.html
new file mode 100644
index 0000000..8965cb5
--- /dev/null
+++ b/people/index.html
@@ -0,0 +1,850 @@
+<!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>People</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">
+          
+          <h2 id="pmc-and-committers">PMC and Committers</h2>
+
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th>username</th>
+      <th>name</th>
+      <th>organization</th>
+      <th>timezone</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>acordova</td>
+      <td>Aaron Cordova</td>
+      <td><a href="http://www.koverse.com">Koverse</a></td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>afuchs</td>
+      <td>Adam Fuchs</td>
+      <td><a href="http://sqrrl.com">sqrrl</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>bhavanki</td>
+      <td>Bill Havanki</td>
+      <td><a href="http://www.cloudera.com">Cloudera</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>billie</td>
+      <td>Billie Rinaldi</td>
+      <td><a href="http://hortonworks.com">Hortonworks</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>bimargulies</td>
+      <td>Benson Margulies</td>
+      <td><a href="http://www.basistech.com">Basis Technology Corp.</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>brianloss</td>
+      <td>Brian Loss</td>
+      <td><a href="http://www.praxiseng.com">Praxis Engineering</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>busbey</td>
+      <td>Sean Busbey</td>
+      <td><a href="http://www.cloudera.com">Cloudera</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/ct">CT</a></td>
+    </tr>
+    <tr>
+      <td>cawaring</td>
+      <td>Chris Waring</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>cjnolet</td>
+      <td>Corey J. Nolet</td>
+      <td><a href="http://www.tetraconcepts.com">Tetra Concepts LLC</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>ctubbsii</td>
+      <td>Christopher Tubbs</td>
+      <td><a href="http://www.nsa.gov">NSA</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>dhutchis</td>
+      <td>Dylan Hutchison</td>
+      <td><a href="http://www.uw.edu">University of Washington</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
+    </tr>
+    <tr>
+      <td>dlmarion</td>
+      <td>Dave Marion</td>
+      <td><a href="http://www.objectivesolutions.com">Objective Solutions, Inc.</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>drew</td>
+      <td>Drew Farris</td>
+      <td><a href="http://www.boozallen.com">Booz Allen Hamilton</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>ecn</td>
+      <td>Eric Newton</td>
+      <td><a href="http://swcomplete.com">SW Complete Inc.</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>elserj</td>
+      <td>Josh Elser</td>
+      <td><a href="http://hortonworks.com">Hortonworks</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>etcoleman</td>
+      <td>Ed Coleman</td>
+      <td>�</td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>jtrost</td>
+      <td>Jason Trost</td>
+      <td><a href="http://www.endgame.com">Endgame</a></td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>kturner</td>
+      <td>Keith Turner</td>
+      <td><a href="http://www.ptech-llc.com">Peterson Technologies</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>mdrob</td>
+      <td>Mike Drob</td>
+      <td><a href="http://www.cloudera.com">Cloudera</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>medined</td>
+      <td>David Medinets</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>mjwall</td>
+      <td>Michael Wall</td>
+      <td><a href="http://www.objectivesolutions.com">Objective Solutions, Inc.</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>mmiller</td>
+      <td>Michael Miller</td>
+      <td><a href="http://www.centroid-llc.com/">Centroid, LLC</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>mwalch</td>
+      <td>Mike Walch</td>
+      <td><a href="http://www.ptech-llc.com">Peterson Technologies</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>phrocker</td>
+      <td>Marc Parisi</td>
+      <td><a href="http://www.wavestrike.com/">WaveStrike LLC</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>rweeks</td>
+      <td>Russ Weeks</td>
+      <td><a href="http://www.phemi.com">PHEMI</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
+    </tr>
+    <tr>
+      <td>shickey</td>
+      <td>Sean Hickey</td>
+      <td>�</td>
+      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
+    </tr>
+    <tr>
+      <td>ujustgotbilld</td>
+      <td>William Slacum</td>
+      <td><a href="http://minerkasch.com">Miner &amp; Kasch</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>vikrams</td>
+      <td>Vikram Srivastava</td>
+      <td><a href="http://www.cloudera.com">Cloudera</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
+    </tr>
+    <tr>
+      <td>vines</td>
+      <td>John Vines</td>
+      <td><a href="http://sqrrl.com">sqrrl</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+  </tbody>
+</table>
+
+<h2 id="contributors">Contributors</h2>
+
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th>username</th>
+      <th>name</th>
+      <th>organization</th>
+      <th>timezone</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>�</td>
+      <td>Aaron Glahe</td>
+      <td><a href="http://www.data-tactics.com">Data Tactics</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Adam J Shook</td>
+      <td><a href="https://datacatessen.com/">Datacatessen</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Al Krinker</td>
+      <td>�</td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Alex Moundalexis</td>
+      <td><a href="http://www.cloudera.com">Cloudera</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Andrew George Wells</td>
+      <td><a href="http://clearedgeit.com">ClearEdgeIT</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Arshak Navruzyan</td>
+      <td><a href="http://www.argyledata.com">Argyle Data</a></td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Ben Manes</td>
+      <td>�</td>
+      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Bob Thorman</td>
+      <td><a href="http://www.att.com">AT&amp;T</a></td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Chris Bennight</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Chris McCubbin</td>
+      <td><a href="http://sqrrl.com">sqrrl</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Christian Rohling</td>
+      <td><a href="http://www.endgame.com">Endgame</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Damon Brown</td>
+      <td><a href="http://www.tetraconcepts.com">Tetra Concepts LLC</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Dave Wang</td>
+      <td><a href="http://www.cloudera.com">Cloudera</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>David M. Lyle</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>David Protzman</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Dennis Patrone</td>
+      <td><a href="http://www.jhuapl.edu">The Johns Hopkins University Applied Physics Laboratory</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>dimaspivak</td>
+      <td>Dima Spivak</td>
+      <td><a href="http://www.cloudera.com">Cloudera</a></td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Ed Kohlwey</td>
+      <td><a href="http://www.boozallen.com">Booz Allen Hamilton</a></td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>edwardyoon</td>
+      <td>Edward Yoon</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Eugene Cheipesh</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Gary Singh</td>
+      <td><a href="http://www.sabre-eng.com">Sabre Engineering</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Hayden Marchant</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Hung Pham</td>
+      <td><a href="http://www.cloudera.com">Cloudera</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Ivan Bella</td>
+      <td><a href="http://www.objectivesolutions.com">Objective Solutions, Inc.</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Jacob Meisler</td>
+      <td><a href="http://www.boozallen.com">Booz Allen Hamilton</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>James Fiori</td>
+      <td><a href="http://flywheeldata.com">Flywheel Data</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>jaredwinick</td>
+      <td>Jared Winick</td>
+      <td><a href="http://www.koverse.com">Koverse</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/mt">MT</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Jason Then</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Jay Shipper</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>jfield</td>
+      <td>Jeff Field</td>
+      <td><a href="http://www.cloudera.com">Cloudera</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Jeffrey S. Schwartz</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Jenna Huston</td>
+      <td>�</td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Jerry He</td>
+      <td><a href="http://www.ibm.com">IBM</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Jesse Yates</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Jessica Seastrom</td>
+      <td><a href="http://www.cloudera.com">Cloudera</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Jim Klucar</td>
+      <td><a href="http://www.splyt.com">Splyt</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Joe Skora</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>John McNamee</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>John Stoneham</td>
+      <td>�</td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>jmhsieh</td>
+      <td>Jonathan M. Hsieh</td>
+      <td><a href="http://www.cloudera.com">Cloudera</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Jonathan Park</td>
+      <td><a href="http://sqrrl.com">sqrrl</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Kevin Faro</td>
+      <td><a href="http://www.tetraconcepts.com">Tetra Concepts LLC</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Laura Peaslee</td>
+      <td><a href="http://www.objectivesolutions.com">Objective Solutions, Inc.</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Luis Tavarez</td>
+      <td>�</td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Luke Brassard</td>
+      <td><a href="http://sqrrl.com">sqrrl</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Mario Pastorelli</td>
+      <td><a href="http://www.teralytics.net/">Teralytics AG</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/cest">CEST</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Matt Dailey</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Matthew Kirkley</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Max Jordan</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Michael Allen</td>
+      <td><a href="http://sqrrl.com">sqrrl</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Michael Berman</td>
+      <td><a href="http://sqrrl.com">sqrrl</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Miguel Pereira</td>
+      <td><a href="http://sra.com">SRA International, Inc</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Mike Fagan</td>
+      <td><a href="http://www.arcus-research.com">Arcus Research</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/mt">MT</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Morgan Haskel</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Nguessan Kouame</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Oren Falkowitz</td>
+      <td><a href="http://sqrrl.com">sqrrl</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Phil Eberhardt</td>
+      <td><a href="http://sqrrl.com">sqrrl</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Philip Young</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Pushpinder Heer</td>
+      <td><a href="http://www.atsid.com">Applied Technical Systems</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Ravi Mutyala</td>
+      <td><a href="http://hortonworks.com">Hortonworks</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/ct">CT</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Ryan Fishel</td>
+      <td><a href="http://www.cloudera.com">Cloudera</a></td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Ryan Leary</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Sapah Shah</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Scott Kuehn</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Shawn Walker</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>stevel</td>
+      <td>Steve Loughran</td>
+      <td><a href="http://hortonworks.com">Hortonworks</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/gmt">GMT</a>/<a href="http://www.timeanddate.com/time/zones/bst">BST</a></td>
+    </tr>
+    <tr>
+      <td>supun</td>
+      <td>Supun Kamburugamuva</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Takahiko Saito</td>
+      <td><a href="http://hortonworks.com">Hortonworks</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Ted Malaska</td>
+      <td><a href="http://www.cloudera.com">Cloudera</a></td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>tedyu</td>
+      <td>Ted Yu</td>
+      <td><a href="http://hortonworks.com">Hortonworks</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Tim Halloran</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Tim Reardon</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Travis Pinney</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Trent Nadeau</td>
+      <td><a href="http://www.anthemengineering.com">Anthem Engineering LLC</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/et">ET</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Tristen Georgiou</td>
+      <td><a href="http://www.phemi.com">PHEMI</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/pt">PT</a></td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Vicky Kak</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Vincent Russell</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Volth</td>
+      <td>�</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>�</td>
+      <td>Wil Selwood</td>
+      <td><a href="https://sa.catapult.org.uk">Satellite Applications Catapult</a></td>
+      <td><a href="http://www.timeanddate.com/time/zones/gmt">GMT</a>/<a href="http://www.timeanddate.com/time/zones/bst">BST</a></td>
+    </tr>
+  </tbody>
+</table>
+
+<h2 id="organizations">Organizations</h2>
+
+<p>First off, thanks to our parent organization, the <a href="https://www.apache.org">Apache Software Foundation</a> and <a href="https://www.apache.org/foundation/sponsorship">all who sponsor</a> them.</p>
+
+<p>Additionally, we would like to thank the following organizations for resources that they provide:</p>
+
+<ul>
+  <li>ej-technologies for allowing us to use their <a href="https://www.ej-technologies.com/products/jprofiler/overview.html">Java profiler</a></li>
+  <li>YourKit for allowing us use of their <a href="https://www.yourkit.com/java/profiler/features/">Java Profiler</a></li>
+  <li>Coverity for running <a href="https://scan.coverity.com/projects/accumulo">static analysis</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/projects.html
----------------------------------------------------------------------
diff --git a/projects.html b/projects.html
index 2b0f975..33774b7 100644
--- a/projects.html
+++ b/projects.html
@@ -1,249 +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>Related Projects</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">Related Projects</h1>
-          
-          <p>The Apache Accumulo community is happy to promote and encourage use of Accumulo in ways that are novel and reusable
-by other users within the community. As such, we\u2019re happy to curate a list of projects related to Accumulo to give
-them visibility to a larger audience. To have you project listed here, send a request to the
-<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;">developer\u2019s mailing list</a></p>
-
-<h2 id="open-source-projects-using-accumulo">Open source projects using Accumulo</h2>
-
-<h4 id="apache-fluo">Apache Fluo</h4>
-
-<p><a href="https://fluo.apache.org">Fluo</a> builds on Accumulo and enables low latency, continuous incremental processing of big data.</p>
-
-<h4 id="apache-gora">Apache Gora</h4>
-
-<p><a href="https://gora.apache.org/">Gora</a> open source framework provides an in-memory data model and persistence for big data.  Accumulo\u2019s continuous ingest test suite was adapted to Gora and called <a href="http://gora.apache.org/current/index.html#goraci-integration-testsing-suite">Goraci</a>.</p>
-
-<h4 id="apache-hive">Apache Hive</h4>
-
-<p><a href="https://hive.apache.org/">Hive</a> data warehouse software facilitates reading, writing, and managing large datasets residing in distributed storage using SQL.
-Hive has the ability to read and write data in Accumulo using the <a href="https://cwiki.apache.org/confluence/display/Hive/AccumuloIntegration">AccumuloStorageHandler</a>.</p>
-
-<h4 id="apache-pig">Apache Pig</h4>
-
-<p><a href="http://pig.apache.org/">Pig</a> is a platform for analyzing large data sets that consists of a high-level language for expressing data analysis programs, coupled with infrastructure for evaluating these programs.  Pig has the ability to read and write data in Accumulo using <a href="http://pig.apache.org/docs/r0.16.0/func.html#AccumuloStorage">AccumuloStorage</a>.</p>
-
-<h4 id="apache-rya">Apache Rya</h4>
-
-<p><a href="http://rya.apache.org/">Rya</a> is a scalable RDF triple store built on top of a columnar index store.</p>
-
-<h4 id="geomesa">Geomesa</h4>
-
-<p><a href="http://www.geomesa.org/">Geomesa</a> is an open-source, distributed, spatio-temporal database built on a number of distributed cloud data storage systems, including Accumulo, HBase, Cassandra, and Kafka.</p>
-
-<h4 id="geowave">Geowave</h4>
-
-<p><a href="https://ngageoint.github.io/geowave/">Geowave</a> is a library for storage, index, and search of multi-dimensional data on top of a sorted key-value datastore.</p>
-
-<h4 id="graphulo">Graphulo</h4>
-
-<p>Graphulo is a Java library for Apache Accumulo which delivers server-side sparse matrix math primitives that
-enable higher-level graph algorithms and analytics. <a href="https://github.com/Accla/graphulo">Code</a>.</p>
-
-<h4 id="presto">Presto</h4>
-
-<p><a href="https://prestodb.io/">Presto</a> is an open source distributed SQL query engine for running interactive analytic queries against data sources of all sizes, ranging from gigabytes to petabytes.  Through the use of the new Accumulo connector for Presto, users are able to execute traditional SQL queries against new and existing tables in Accumulo.  For more information, see the <a href="https://prestodb.io/docs/current/connector/accumulo.html">Accumulo Connector</a> documentation.</p>
-
-<h4 id="timely">Timely</h4>
-
-<p><a href="https://nationalsecurityagency.github.io/timely/">Timely</a> : A secure time series database based on Accumulo and Grafana.</p>
-
-<h4 id="uno-and-muchos">Uno and Muchos</h4>
-
-<p><a href="https://github.com/astralway/uno">Uno</a> and <a href="https://github.com/astralway/muchos">Muchos</a> provide automation for quickly setting up Accumulo instances for testing.  These project were created to enable Fluo testing, but can be used to setup just Accumulo.</p>
-
-<h2 id="user-created-applications">User-Created Applications</h2>
-
-<h4 id="trendulo">Trendulo</h4>
-
-<p><a href="http://trendulo.com/">Trendulo</a> is Twitter trend analysis using Apache Accumulo. The <a href="https://github.com/jaredwinick/Trendulo">source code</a> is publicly available.</p>
-
-<h4 id="wikisearch">Wikisearch</h4>
-
-<p>The <a href="/example/wikisearch">Wikisearch project</a> is a rough example of generalized secondary indexing, both ingest
-and search, built on top of Apache Accumulo. This write contains more information on the project as well as some
-general performance numbers of the project.</p>
-
-<h4 id="nodejs-rabbitmq-and-accumulo">Node.js, RabbitMQ, and Accumulo</h4>
-
-<p>A <a href="https://github.com/joshelser/node-accumulo">simple example</a> using Node.js to interact with Accumulo using RabbitMQ .</p>
-
-<h4 id="proxyinstance">ProxyInstance</h4>
-
-<p>ProxyInstance is a Java Instance implementation of the Accumulo Instance interface that communicates with
-an Accumulo cluster via Accumulo\u2019s Apache Thrift proxy server. <a href="https://jhuapl.github.io/accumulo-proxy-instance/proxy_instance_user_manual">Documentation</a> and
-<a href="https://github.com/JHUAPL/accumulo-proxy-instance">code</a> are available.</p>
-
-<h4 id="accumulograph">AccumuloGraph</h4>
-
-<p>ProxyInstance is an implementation of the TinkerPop Blueprints 2.6 API using
-Apache Accumulo as the backend.
-<a href="https://jhuapl.github.io/AccumuloGraph/">Documentation</a> and
-<a href="https://github.com/JHUAPL/AccumuloGraph">code</a> are available.</p>
-
-<h2 id="github">Github</h2>
-
-<p><a href="https://github.com/search?q=accumulo&amp;type=Repositories">Github</a> also contains many projects that use/reference Accumulo
-in some way, shape or form.</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>
+<title>Redirecting\u2026</title>
+<link rel="canonical" href="https://accumulo.apache.org/related-projects/">
+<meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/related-projects/">
+<h1>Redirecting\u2026</h1>
+<a href="https://accumulo.apache.org/related-projects/">Click here if you are not redirected.</a>
+<script>location="https://accumulo.apache.org/related-projects/"</script>
 </html>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/related-projects/index.html
----------------------------------------------------------------------
diff --git a/related-projects/index.html b/related-projects/index.html
new file mode 100644
index 0000000..9f3a440
--- /dev/null
+++ b/related-projects/index.html
@@ -0,0 +1,248 @@
+<!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>Related Projects</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">Related Projects</h1>
+          
+          <p>The Apache Accumulo community is happy to promote and encourage use of Accumulo in ways that are novel and reusable
+by other users within the community. As such, we\u2019re happy to curate a list of projects related to Accumulo to give
+them visibility to a larger audience. To have you project listed here, send a request to the
+<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;">developer\u2019s mailing list</a></p>
+
+<h2 id="open-source-projects-using-accumulo">Open source projects using Accumulo</h2>
+
+<h4 id="apache-fluo">Apache Fluo</h4>
+
+<p><a href="https://fluo.apache.org">Fluo</a> builds on Accumulo and enables low latency, continuous incremental processing of big data.</p>
+
+<h4 id="apache-gora">Apache Gora</h4>
+
+<p><a href="https://gora.apache.org/">Gora</a> open source framework provides an in-memory data model and persistence for big data.  Accumulo\u2019s continuous ingest test suite was adapted to Gora and called <a href="http://gora.apache.org/current/index.html#goraci-integration-testsing-suite">Goraci</a>.</p>
+
+<h4 id="apache-hive">Apache Hive</h4>
+
+<p><a href="https://hive.apache.org/">Hive</a> data warehouse software facilitates reading, writing, and managing large datasets residing in distributed storage using SQL.
+Hive has the ability to read and write data in Accumulo using the <a href="https://cwiki.apache.org/confluence/display/Hive/AccumuloIntegration">AccumuloStorageHandler</a>.</p>
+
+<h4 id="apache-pig">Apache Pig</h4>
+
+<p><a href="http://pig.apache.org/">Pig</a> is a platform for analyzing large data sets that consists of a high-level language for expressing data analysis programs, coupled with infrastructure for evaluating these programs.  Pig has the ability to read and write data in Accumulo using <a href="http://pig.apache.org/docs/r0.16.0/func.html#AccumuloStorage">AccumuloStorage</a>.</p>
+
+<h4 id="apache-rya">Apache Rya</h4>
+
+<p><a href="http://rya.apache.org/">Rya</a> is a scalable RDF triple store built on top of a columnar index store.</p>
+
+<h4 id="geomesa">Geomesa</h4>
+
+<p><a href="http://www.geomesa.org/">Geomesa</a> is an open-source, distributed, spatio-temporal database built on a number of distributed cloud data storage systems, including Accumulo, HBase, Cassandra, and Kafka.</p>
+
+<h4 id="geowave">Geowave</h4>
+
+<p><a href="https://ngageoint.github.io/geowave/">Geowave</a> is a library for storage, index, and search of multi-dimensional data on top of a sorted key-value datastore.</p>
+
+<h4 id="graphulo">Graphulo</h4>
+
+<p>Graphulo is a Java library for Apache Accumulo which delivers server-side sparse matrix math primitives that
+enable higher-level graph algorithms and analytics. <a href="https://github.com/Accla/graphulo">Code</a>.</p>
+
+<h4 id="presto">Presto</h4>
+
+<p><a href="https://prestodb.io/">Presto</a> is an open source distributed SQL query engine for running interactive analytic queries against data sources of all sizes, ranging from gigabytes to petabytes.  Through the use of the new Accumulo connector for Presto, users are able to execute traditional SQL queries against new and existing tables in Accumulo.  For more information, see the <a href="https://prestodb.io/docs/current/connector/accumulo.html">Accumulo Connector</a> documentation.</p>
+
+<h4 id="timely">Timely</h4>
+
+<p><a href="https://nationalsecurityagency.github.io/timely/">Timely</a> : A secure time series database based on Accumulo and Grafana.</p>
+
+<h4 id="uno-and-muchos">Uno and Muchos</h4>
+
+<p><a href="https://github.com/astralway/uno">Uno</a> and <a href="https://github.com/astralway/muchos">Muchos</a> provide automation for quickly setting up Accumulo instances for testing.  These project were created to enable Fluo testing, but can be used to setup just Accumulo.</p>
+
+<h2 id="user-created-applications">User-Created Applications</h2>
+
+<h4 id="trendulo">Trendulo</h4>
+
+<p><a href="http://trendulo.com/">Trendulo</a> is Twitter trend analysis using Apache Accumulo. The <a href="https://github.com/jaredwinick/Trendulo">source code</a> is publicly available.</p>
+
+<h4 id="wikisearch">Wikisearch</h4>
+
+<p>The <a href="/example/wikisearch">Wikisearch project</a> is a rough example of generalized secondary indexing, both ingest
+and search, built on top of Apache Accumulo. This write contains more information on the project as well as some
+general performance numbers of the project.</p>
+
+<h4 id="nodejs-rabbitmq-and-accumulo">Node.js, RabbitMQ, and Accumulo</h4>
+
+<p>A <a href="https://github.com/joshelser/node-accumulo">simple example</a> using Node.js to interact with Accumulo using RabbitMQ .</p>
+
+<h4 id="proxyinstance">ProxyInstance</h4>
+
+<p>ProxyInstance is a Java Instance implementation of the Accumulo Instance interface that communicates with
+an Accumulo cluster via Accumulo\u2019s Apache Thrift proxy server. <a href="https://jhuapl.github.io/accumulo-proxy-instance/proxy_instance_user_manual">Documentation</a> and
+<a href="https://github.com/JHUAPL/accumulo-proxy-instance">code</a> are available.</p>
+
+<h4 id="accumulograph">AccumuloGraph</h4>
+
+<p>ProxyInstance is an implementation of the TinkerPop Blueprints 2.6 API using
+Apache Accumulo as the backend.
+<a href="https://jhuapl.github.io/AccumuloGraph/">Documentation</a> and
+<a href="https://github.com/JHUAPL/AccumuloGraph">code</a> are available.</p>
+
+<h2 id="github">Github</h2>
+
+<p><a href="https://github.com/search?q=accumulo&amp;type=Repositories">Github</a> also contains many projects that use/reference Accumulo
+in some way, shape or form.</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/release/accumulo-1.5.1/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.5.1/index.html b/release/accumulo-1.5.1/index.html
index db6048d..5584930 100644
--- a/release/accumulo-1.5.1/index.html
+++ b/release/accumulo-1.5.1/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/release/accumulo-1.5.2/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.5.2/index.html b/release/accumulo-1.5.2/index.html
index cdd07ad..d5bec36 100644
--- a/release/accumulo-1.5.2/index.html
+++ b/release/accumulo-1.5.2/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/release/accumulo-1.5.3/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.5.3/index.html b/release/accumulo-1.5.3/index.html
index 8276b84..ad12f92 100644
--- a/release/accumulo-1.5.3/index.html
+++ b/release/accumulo-1.5.3/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/release/accumulo-1.5.4/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.5.4/index.html b/release/accumulo-1.5.4/index.html
index 56f441b..30e932f 100644
--- a/release/accumulo-1.5.4/index.html
+++ b/release/accumulo-1.5.4/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/release/accumulo-1.6.0/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.6.0/index.html b/release/accumulo-1.6.0/index.html
index 4e18ab5..b6aa866 100644
--- a/release/accumulo-1.6.0/index.html
+++ b/release/accumulo-1.6.0/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/release/accumulo-1.6.1/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.6.1/index.html b/release/accumulo-1.6.1/index.html
index ab71493..29db41f 100644
--- a/release/accumulo-1.6.1/index.html
+++ b/release/accumulo-1.6.1/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/release/accumulo-1.6.2/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.6.2/index.html b/release/accumulo-1.6.2/index.html
index 22f65d7..a0bf674 100644
--- a/release/accumulo-1.6.2/index.html
+++ b/release/accumulo-1.6.2/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/release/accumulo-1.6.3/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.6.3/index.html b/release/accumulo-1.6.3/index.html
index 65398ee..3c9b4ee 100644
--- a/release/accumulo-1.6.3/index.html
+++ b/release/accumulo-1.6.3/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/release/accumulo-1.6.4/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.6.4/index.html b/release/accumulo-1.6.4/index.html
index 00f92bf..d879d49 100644
--- a/release/accumulo-1.6.4/index.html
+++ b/release/accumulo-1.6.4/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/release/accumulo-1.6.5/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.6.5/index.html b/release/accumulo-1.6.5/index.html
index 38feafd..fcf8ad4 100644
--- a/release/accumulo-1.6.5/index.html
+++ b/release/accumulo-1.6.5/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/release/accumulo-1.6.6/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.6.6/index.html b/release/accumulo-1.6.6/index.html
index 2734fd8..e16921f 100644
--- a/release/accumulo-1.6.6/index.html
+++ b/release/accumulo-1.6.6/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/release/accumulo-1.7.0/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.7.0/index.html b/release/accumulo-1.7.0/index.html
index cb9d777..29918f8 100644
--- a/release/accumulo-1.7.0/index.html
+++ b/release/accumulo-1.7.0/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/release/accumulo-1.7.1/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.7.1/index.html b/release/accumulo-1.7.1/index.html
index 114c3a3..f2943c5 100644
--- a/release/accumulo-1.7.1/index.html
+++ b/release/accumulo-1.7.1/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/release/accumulo-1.7.2/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.7.2/index.html b/release/accumulo-1.7.2/index.html
index 3abc87f..341be23 100644
--- a/release/accumulo-1.7.2/index.html
+++ b/release/accumulo-1.7.2/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/release/accumulo-1.8.0/index.html
----------------------------------------------------------------------
diff --git a/release/accumulo-1.8.0/index.html b/release/accumulo-1.8.0/index.html
index ee882e7..f9937ac 100644
--- a/release/accumulo-1.8.0/index.html
+++ b/release/accumulo-1.8.0/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/release/index.html
----------------------------------------------------------------------
diff --git a/release/index.html b/release/index.html
index 531ebcb..db174b6 100644
--- a/release/index.html
+++ b/release/index.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>

http://git-wip-us.apache.org/repos/asf/accumulo-website/blob/fd45f7a2/releasing.html
----------------------------------------------------------------------
diff --git a/releasing.html b/releasing.html
index a85e0f5..8ebc7ad 100644
--- a/releasing.html
+++ b/releasing.html
@@ -2,9 +2,9 @@
 <html lang="en-US">
 <meta charset="utf-8">
 <title>Redirecting\u2026</title>
-<link rel="canonical" href="https://accumulo.apache.org/contributor/releasing.html">
-<meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/contributor/releasing.html">
+<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\u2026</h1>
-<a href="https://accumulo.apache.org/contributor/releasing.html">Click here if you are not redirected.</a>
-<script>location="https://accumulo.apache.org/contributor/releasing.html"</script>
+<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/verifying_releases.html
----------------------------------------------------------------------
diff --git a/verifying_releases.html b/verifying_releases.html
index db67414..8110ac9 100644
--- a/verifying_releases.html
+++ b/verifying_releases.html
@@ -2,9 +2,9 @@
 <html lang="en-US">
 <meta charset="utf-8">
 <title>Redirecting\u2026</title>
-<link rel="canonical" href="https://accumulo.apache.org/contributor/verifying_releases.html">
-<meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/contributor/verifying_releases.html">
+<link rel="canonical" href="https://accumulo.apache.org/contributor/verifying-release.html">
+<meta http-equiv="refresh" content="0; url=https://accumulo.apache.org/contributor/verifying-release.html">
 <h1>Redirecting\u2026</h1>
-<a href="https://accumulo.apache.org/contributor/verifying_releases.html">Click here if you are not redirected.</a>
-<script>location="https://accumulo.apache.org/contributor/verifying_releases.html"</script>
+<a href="https://accumulo.apache.org/contributor/verifying-release.html">Click here if you are not redirected.</a>
+<script>location="https://accumulo.apache.org/contributor/verifying-release.html"</script>
 </html>