accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhava...@apache.org
Subject svn commit: r1592390 - in /accumulo/site/trunk: ./ content/ content/1.4/examples/ content/1.5/examples/ content/css/ content/downloads/ content/fonts/ content/governance/ content/images/ content/js/ templates/
Date Sun, 04 May 2014 17:29:11 GMT
Author: bhavanki
Date: Sun May  4 17:29:10 2014
New Revision: 1592390

URL: http://svn.apache.org/r1592390
Log:
Merge redesign14 branch into trunk of Accumlo site.

Added:
    accumulo/site/trunk/content/css/bootstrap-theme.css
      - copied unchanged from r1592387, accumulo/site/branches/redesign14/content/css/bootstrap-theme.css
    accumulo/site/trunk/content/css/bootstrap-theme.css.map
      - copied unchanged from r1592387, accumulo/site/branches/redesign14/content/css/bootstrap-theme.css.map
    accumulo/site/trunk/content/css/bootstrap-theme.min.css
      - copied unchanged from r1592387, accumulo/site/branches/redesign14/content/css/bootstrap-theme.min.css
    accumulo/site/trunk/content/css/bootstrap.css
      - copied unchanged from r1592387, accumulo/site/branches/redesign14/content/css/bootstrap.css
    accumulo/site/trunk/content/css/bootstrap.css.map
      - copied unchanged from r1592387, accumulo/site/branches/redesign14/content/css/bootstrap.css.map
    accumulo/site/trunk/content/css/bootstrap.min.css
      - copied unchanged from r1592387, accumulo/site/branches/redesign14/content/css/bootstrap.min.css
    accumulo/site/trunk/content/fonts/
      - copied from r1592387, accumulo/site/branches/redesign14/content/fonts/
    accumulo/site/trunk/content/images/GitHub-Mark-32px.png
      - copied unchanged from r1592387, accumulo/site/branches/redesign14/content/images/GitHub-Mark-32px.png
    accumulo/site/trunk/content/images/InBug-16px_0.png
      - copied unchanged from r1592387, accumulo/site/branches/redesign14/content/images/InBug-16px_0.png
    accumulo/site/trunk/content/images/Twitter_logo_blue.png
      - copied unchanged from r1592387, accumulo/site/branches/redesign14/content/images/Twitter_logo_blue.png
    accumulo/site/trunk/content/images/accumulo-summit-2014.png
      - copied unchanged from r1592387, accumulo/site/branches/redesign14/content/images/accumulo-summit-2014.png
    accumulo/site/trunk/content/images/glyphicons_social_17_linked_in.png
      - copied unchanged from r1592387, accumulo/site/branches/redesign14/content/images/glyphicons_social_17_linked_in.png
    accumulo/site/trunk/content/images/glyphicons_social_21_github.png
      - copied unchanged from r1592387, accumulo/site/branches/redesign14/content/images/glyphicons_social_21_github.png
    accumulo/site/trunk/content/images/glyphicons_social_31_twitter.png
      - copied unchanged from r1592387, accumulo/site/branches/redesign14/content/images/glyphicons_social_31_twitter.png
    accumulo/site/trunk/content/js/
      - copied from r1592387, accumulo/site/branches/redesign14/content/js/
    accumulo/site/trunk/templates/nav.html
      - copied unchanged from r1592387, accumulo/site/branches/redesign14/templates/nav.html
Modified:
    accumulo/site/trunk/   (props changed)
    accumulo/site/trunk/content/1.4/examples/index.mdtext
    accumulo/site/trunk/content/1.5/examples/index.mdtext
    accumulo/site/trunk/content/bylaws.mdtext
    accumulo/site/trunk/content/contrib.mdtext
    accumulo/site/trunk/content/css/accumulo.css
    accumulo/site/trunk/content/downloads/index.mdtext
    accumulo/site/trunk/content/get_involved.mdtext
    accumulo/site/trunk/content/git.mdtext
    accumulo/site/trunk/content/glossary.mdtext
    accumulo/site/trunk/content/governance/consensusBuilding.mdtext
    accumulo/site/trunk/content/governance/lazyConsensus.mdtext
    accumulo/site/trunk/content/governance/releasing.mdtext
    accumulo/site/trunk/content/governance/voting.mdtext
    accumulo/site/trunk/content/index.mdtext
    accumulo/site/trunk/content/mailing_list.mdtext
    accumulo/site/trunk/content/notable_features.mdtext
    accumulo/site/trunk/content/papers.mdtext
    accumulo/site/trunk/content/people.mdtext
    accumulo/site/trunk/content/releasing.mdtext
    accumulo/site/trunk/content/screenshots.mdtext
    accumulo/site/trunk/content/source.mdtext
    accumulo/site/trunk/templates/skeleton.html

Propchange: accumulo/site/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/site/branches/redesign14:r1579718-1592387

Modified: accumulo/site/trunk/content/1.4/examples/index.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/1.4/examples/index.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/1.4/examples/index.mdtext (original)
+++ accumulo/site/trunk/content/1.4/examples/index.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,5 @@
 Title: Apache Accumulo Examples
+Nav: nav_examples_1_4
 Notice:    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

Modified: accumulo/site/trunk/content/1.5/examples/index.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/1.5/examples/index.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/1.5/examples/index.mdtext (original)
+++ accumulo/site/trunk/content/1.5/examples/index.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,5 @@
 Title: Apache Accumulo Examples
+Nav: nav_examples_1_5
 Notice:    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

Modified: accumulo/site/trunk/content/bylaws.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/bylaws.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/bylaws.mdtext (original)
+++ accumulo/site/trunk/content/bylaws.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,5 @@
 Title:     Apache Accumulo Bylaws
+Nav: nav_bylaws
 Notice:    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
@@ -110,7 +111,7 @@ Within the Accumulo project, different t
 
 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’s 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>
+<table class="table">
 <tr><th>Vote</th>
     <th>Meaning</th>
 <tr><td>+1</td>
@@ -138,7 +139,7 @@ For some code changes, committers may wi
 
 These are the types of approvals that can be sought. Different actions require different types of approvals.
 
-<table>
+<table class="table">
 <tr><th>Approval Type</th>
     <th>Definition</th>
 <tr><td>Consensus Approval</td>
@@ -146,7 +147,7 @@ These are the types of approvals that ca
 <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><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="http://accumulo.apache.org/governance/lazyConsensus.html">lazy consensus page</a>.</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.html">lazy consensus page</a>.</td>
 </table>
 
 ## Vetoes
@@ -161,7 +162,7 @@ This section describes the various actio
 
 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>
+<table class="table">
 <tr><th>Action</th>
     <th>Description</th>
     <th>Approval</th>

Modified: accumulo/site/trunk/content/contrib.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/contrib.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/contrib.mdtext (original)
+++ accumulo/site/trunk/content/contrib.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,5 @@
 Title: Apache Accumulo Contrib Projects
+Nav: nav_contrib
 Notice:    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
@@ -16,38 +17,37 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-# Contrib Scope
 Apache Accumulo is a complex distributed system. In order to minimize that complexity for both operators and developers the project maintains contrib repositories for instructive applications and code that builds interoperability between Accumulo and other systems. This helps minimize the set of dependencies needed when building or installing Accumulo, keeps the build time down, and allows the contrib projects to follow their own release schedule.
 
-# Existing Contrib Projects
+## Existing Contrib Projects
 Each of the below contrib project handles their own development and release cycle. For information on what version(s) of Accumulo they work with, see the documentation for the individual project.
 
-## Instamo Archetype 
+### Instamo Archetype 
 A Maven Archetype that automates the customization of Instamo to quickly spin up an Accumulo process in memory.
 
 The Apache Accumulo Instamo Archetype uses [Git](http://git-scm.com/) version control ([browse](https://git-wip-us.apache.org/repos/asf?p=accumulo-instamo-archetype.git;a=summary)|[checkout](https://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype.git)). It builds with [Apache Maven](http://maven.apache.org/). See the [section on contributing](#contributing-to-contrib) for instructions on submitting issues and patches.
 
-## Wikisearch Application
+### Wikisearch Application
 A complex application example that makes use of most of the Accumulo feature stack. The Wikisearch application provides an example of indexing and querying Wikipedia data within Accumulo. It is a great place to start if you want to get familiar with good development practices building on Accumulo. 
 
 For details on setting up the application, see the project's README. You can also read [an overview and some performance numbers](example/wikisearch.html).
 
 The Apache Accumulo Wikisearch Example uses [Git](http://git-scm.com/) version control ([browse](https://git-wip-us.apache.org/repos/asf?p=accumulo-wikisearch.git;a=summary)|[checkout](https://git-wip-us.apache.org/repos/asf/accumulo-wikisearch.git)). It builds with [Apache Maven](http://maven.apache.org/). See the [section on contributing](#contributing-to-contrib) for instructions on submitting issues and patches.
 
-## Pig Support
+### Pig Support
 A storage module for [Pig](http://pig.apache.org/) allows users to use an Accumulo as either a source or a sink when writing analytics in the Pig scripting language. For details on which Pig version(s) are required to run the storage module, see the project details.
 
 The Apache Accumulo Pig Module uses [Git](http://git-scm.com/) version control ([browse](https://git-wip-us.apache.org/repos/asf?p=accumulo-pig.git;a=summary)|[checkout](https://git-wip-us.apache.org/repos/asf/accumulo-pig.git)). It builds with [Apache Maven](http://maven.apache.org/). See the [section on contributing](#contributing-to-contrib) for instructions on submitting issues and patches.
 
-## Hama Integration
+### Hama Integration
 An implementation for running [Bulk Synchronous Parallel (BSP) algorithms](http://hama.apache.org/hama_bsp_tutorial.html) implemented via [Apache Hama](http://hama.apache.org/) on top of data stored in Accumulo.
 
 The Apache Accumulo BSP implementation uses [Git](http://git-scm.com/) version control ([browse](https://git-wip-us.apache.org/repos/asf?p=accumulo-bsp.git;a=summary)|[checkout](https://git-wip-us.apache.org/repos/asf/accumulo-bsp.git)). It builds with [Apache Maven](http://maven.apache.org/). See the [section on contributing](#contributing-to-contrib) for instructions on submitting issues and patches.
 
-# Contributing to Contrib
+## Contributing to Contrib
 All contributions to the various Apache Accumulo contrib projects should follow the [same process used in the primary project](git.html#the-implementation). All contributions should have a corresponding issue filed in the [contrib component in the Accumulo issue tracker](https://issues.apache.org/jira/browse/ACCUMULO/component/12316610).
 
-# Adding a new Contrib Project
+## Adding a new Contrib Project
 Proposals for new contrib projects should be sent to the [Accumulo mailing list](mailing_list.html) for [developers](mailto:dev@accumulo.apache.org?subject=[Accumulo Contrib Proposal]). 
 
 If an example application only makes use of a single Accumulo feature, it is probably better off as an Accumulo version-specific example. You can see several of these demonstrative applications in the [simple example codebase](https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=tree;f=examples/simple;) and the related published documentation for versions [1.4](1.4/examples/) and [1.5](1.5/examples/).

Modified: accumulo/site/trunk/content/css/accumulo.css
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/css/accumulo.css?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/css/accumulo.css (original)
+++ accumulo/site/trunk/content/css/accumulo.css Sun May  4 17:29:10 2014
@@ -15,19 +15,20 @@
 * limitations under the License.
 */
 body {
-    color: white;
-    font-family: Verdana,Geneva,sans-serif;
-    font-size: 10pt;
-    margin: 0;
-}
-#banner {
-    margin-top: 0;
-    min-width: 850px;
-    padding: 10px;
+    /* for fixed top navbar */
+    padding-top: 70px;
+    font-size: 16px;
 }
-#logo {
-    margin-left: 20px;
-    text-align: left;
+ul.nav li.dropdown:hover > ul.dropdown-menu {
+    /* so nav submenus open on hover */
+    display: block;
+}
+#sidebar {
+    font-size: 14px;
+}
+#sociallinks td {
+    /* no lines in the link table */
+    border-top: none;
 }
 #bannertext {
     margin-top: 10px;
@@ -36,129 +37,34 @@ body {
 .clear {
     clear: both;
 }
-a {
-    color: #107EC0;
-}
-a:visited {
-    color: #107EC0;
-}
-a:hover {
-    background-color: #E6EBED;
-    color: #107EC0;
-}
-a img {
-    border: medium none;
-}
-h1, h2, h3, h4, h5, h6 {
-    border-bottom: 2px dashed #666666;
-    color: black;
-    text-transform: uppercase;
-}
 #content {
-    color: #333333;
-    margin: 0 150px 20px 220px;
     padding: 0 8px 40px;
 }
 #content h1 {
-    font-size: 1.4em;
-    padding-top: 15px;
-    padding-bottom: 15px;
+    margin-bottom: 0.5em;
 }
 #content h2 {
-    border-bottom: 1px dashed #666666;
-    font-size: 1.2em;
-    margin-top: 2em;
+    margin-bottom: 0.5em;
+    border-bottom: 1px solid #CCCCCC;
+    padding-bottom: 0.25em;
 }
 #content h3 {
-    border-bottom: medium none;
-    font-size: 1.1em;
-    margin-bottom: 0;
-}
-#content h4, h5, h6 {
-    border-bottom: medium none;
-    font-size: 1em;
-    margin-bottom: 0;
+    margin-bottom: 0.5em;
 }
 #content img {
     vertical-align: middle;
 }
-.codehilite {
-    background-color: #FFFFFF;
-    border-radius: 10px 10px 10px 10px;
-    padding: 0.01em 1em;
-}
-#navigation {
-    -moz-border-bottom-colors: none;
-    -moz-border-image: none;
-    -moz-border-left-colors: none;
-    -moz-border-right-colors: none;
-    -moz-border-top-colors: none;
-    background: none repeat scroll 0 0 #F5F8FA;
-    border-color: #C0C0C0 #C0C0C0 #C0C0C0 -moz-use-text-color;
-    border-radius: 0 10px 10px 0;
-    border-style: solid solid solid none;
-    border-width: 1px 1px 1px medium;
-    color: #000033;
-    float: left;
-    font-size: 0.9em;
-    margin: 0 0 20px;
-    padding: 15px 15px 5px 25px;
-    width: 170px;
-}
-#navigation img {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-}
-#navigation h1 {
-    border-bottom: 2px dashed #666666;
-    color: #000000;
-    font-size: 1em;
-    margin-bottom: 0;
-    margin-top: 0.8em;
-    padding: 0;
-}
-#navigation ul {
-    list-style: none outside none;
-    margin: 0;
-    padding: 0;
-}
-#navigation li {
-    border-bottom: 1px solid #CCCCCC;
-    margin: 0.2em 0;
-    padding: 0;
-}
-#navigation li a {
-    margin: 0;
-    text-decoration: none;
-}
-#navigation li a:hover {
-    background: none repeat scroll 0 0 transparent;
-    color: #193240;
-}
 #footer {
     border-top: 1px solid #CCCCCC;
     color: #666666;
     font-size: 0.8em;
-    margin: 20px 150px 20px 250px;
-    padding: 0 8px;
+    padding: 8px 8px;
     text-align: center;
 }
-.copyright {
-    float: left;
-}
 #asf-logo {
     float: left;
     padding-top: 15px;
 }
-dd {
-}
-dl {
-}
-dt {
-    display: inline;
-    float: left;
-}
 
 #release_notes_testing {
     border-collapse:collapse;
@@ -170,4 +76,26 @@ dt {
 
 #release_notes_testing tbody tr th, #release_notes_testing tbody tr td {
     padding: 5px;
-}
\ No newline at end of file
+}
+
+#download-button-sidebar {
+    width: 60%;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+#accumulo-summit-logo img {
+    margin-left: auto;
+    margin-right: auto;
+}
+
+div.copyright {
+    width: 60%;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+code {
+    /* override nowrap in bootstrap */
+    white-space: normal;
+}

Modified: accumulo/site/trunk/content/downloads/index.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/downloads/index.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/downloads/index.mdtext (original)
+++ accumulo/site/trunk/content/downloads/index.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,5 @@
 Title: Apache Accumulo Downloads
+Nav: nav_downloads
 Notice:    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
@@ -16,75 +17,88 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-## 1.5.1 (latest)
-The most recent Apache Accumulo&trade; release is version 1.5.1.  See the [release notes][33] and [CHANGES][21].  
 Be sure to verify your downloads by these [procedures][1] using these [KEYS][2].  
-For convenience, [MD5][22] and [SHA1][23] hashes are also available.
 
-#### Generic Binaries
-  * accumulo-1.5.1-bin.tar.gz <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-bin.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-bin.tar.gz']);">mirrors</a> ([gpg signature][24])
+## Current Release
 
-#### Platform Binaries
-  * accumulo-1.5.1-bin.rpm <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-bin.rpm onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-bin.rpm']);">mirrors</a> ([gpg signature][25])
-  * accumulo-1.5.1-native.rpm <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-native.rpm onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-native.rpm']);">mirrors</a> ([gpg signature][26])
-  * accumulo-1.5.1-test.rpm <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-test.rpm onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-test.rpm']);">mirrors</a> ([gpg signature][27])
-  * accumulo-1.5.1-bin.deb <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-bin.deb onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-bin.deb']);">mirrors</a> ([gpg signature][28])
-  * accumulo-1.5.1-native.deb <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-native.deb onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-native.deb']);">mirrors</a> ([gpg signature][29])
-  * accumulo-1.5.1-test.deb <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-test.deb onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-test.deb']);">mirrors</a> ([gpg signature][30])
+### 1.5.1 <span class="label label-primary">latest</span>
 
-#### Source
-  * accumulo-1.5.1-src.tar.gz <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-src.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-src.tar.gz']);">mirrors</a> ([gpg signature][31])
+The most recent Apache Accumulo&trade; release is version 1.5.1.  See the [release notes][33] and [CHANGES][21].  
+
+For convenience, [MD5][22] and [SHA1][23] hashes are also available.
 
-#### Documentation
+<table class="table">
+<tr><th>Generic Binaries</th><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-bin.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-bin.tar.gz']);">accumulo-1.5.1-bin.tar.gz</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-bin.tar.gz.asc">ASC</a>
+</td></tr>
+<tr><th rowspan="6">Platform Binaries</th><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-bin.rpm onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-bin.rpm']);">accumulo-1.5.1-bin.rpm</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-bin.rpm.asc">ASC</a>
+</td></tr>
+<tr><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-native.rpm onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-native.rpm']);">accumulo-1.5.1-native.rpm</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-native.rpm.asc">ASC</a>
+</td></tr>
+<tr><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-test.rpm onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-test.rpm']);">accumulo-1.5.1-test.rpm</a></td></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-test.rpm.asc"asc>ASC</a>
+</td></tr>
+<tr><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-bin.deb onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-bin.deb']);">accumulo-1.5.1-bin.deb</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-bin.deb.asc">ASC</a>
+</td></tr>
+<tr><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-native.deb onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-native.deb']);">accumulo-1.5.1-native.deb</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-native.deb.asc">ASC</a>
+</td></tr>
+<tr><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-test.deb onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-test.deb']);">accumulo-1.5.1-test.deb</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-test.deb.asc">ASC</a>
+</td></tr>
+<tr><th>Source</th><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.5.1/accumulo-1.5.1-src.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.5.1-src.tar.gz']);">accumulo-1.5.1-src.tar.gz</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-src.tar.gz.asc">ASC</a>
+</td></tr>
+</table>
+
+#### 1.5 Documentation
   * <a href=https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;hb=3478f71ae888f8d73aaa93837319a6dbb4ba0c8a onClick="javascript: _gaq.push(['_trackPageview', '/1.5/README']);">README</a>
-  * <a href=/1.5/accumulo_user_manual.pdf onClick="javascript: _gaq.push(['_trackPageview', '/1.5/accumulo_user_manual.pdf']);">pdf manual</a>
-  * <a href=/1.5/accumulo_user_manual.html onClick="javascript: _gaq.push(['_trackPageview', '/1.5/accumulo_user_manual.html']);">html manual</a>
-  * <a href=/1.5/apidocs onClick="javascript: _gaq.push(['_trackPageview', '/1.5/apidocs']);">javadoc</a>
+  * <a href=/1.5/accumulo_user_manual.pdf onClick="javascript: _gaq.push(['_trackPageview', '/1.5/accumulo_user_manual.pdf']);">PDF manual</a>
+  * <a href=/1.5/accumulo_user_manual.html onClick="javascript: _gaq.push(['_trackPageview', '/1.5/accumulo_user_manual.html']);">HTML manual</a>
+  * <a href=/1.5/apidocs onClick="javascript: _gaq.push(['_trackPageview', '/1.5/apidocs']);">Javadoc</a>
   * [examples][32]
 
-## 1.4.5 (legacy)
+### 1.4.5 <span class="label label-warning">legacy</span>
+
 The most recent 1.4 release is 1.4.5.  See the [Release Notes][12].  
-Be sure to verify your downloads by these [procedures][1] using these [KEYS][2].
 
-  * Download Binaries: accumulo-1.4.5-dist.tar.gz <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.4.5-dist.tar.gz']);">mirrors</a> ([asc][16], [md5][17], [sha][18])
-  * Download Source: accumulo-1.4.5-src.tar.gz <a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.4.5-src.tar.gz']);">mirrors</a> ([asc][13], [md5][14], [sha][15])
-  * Read Documentation: <a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;hb=f7d87b6e407de6597b6c0ca60ca1b6a321faf237" onClick="javascript: _gaq.push(['_trackPageview', '/1.4/README']);">README</a>, [html manual][19], <a href=/1.4/accumulo_user_manual.pdf onClick="javascript: _gaq.push(['_trackPageview', '/1.4/accumulo_user_manual.pdf']);">pdf manual</a>, [examples][20]
+<table class="table">
+<tr><th>Binaries</th><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.4.5-dist.tar.gz']);">accumulo-1.4.5-dist.tar.gz</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz.asc" title="1.4.5 dist asc">ASC</a>
+<a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz.md5" title="1.4.5 dist md5">MD5</a>
+<a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz.sha" title="1.4.5 dist sha">SHA</a>
+</td></tr>
+<tr><th>Source</th><td><a href=http://www.apache.org/dyn/closer.cgi/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.4.5-src.tar.gz']);">accumulo-1.4.5-src.tar.gz</a></td><td>
+<a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz.asc" title="1.4.5 src asc">ASC</a>
+<a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz.md5" title="1.4.5 src md5">MD5</a>
+<a href="http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz.sha" title="1.4.5 src sha">SHA</a>
+</td></tr>
+</table>
+
+#### 1.4 Documentation
+
+* <a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;hb=f7d87b6e407de6597b6c0ca60ca1b6a321faf237" onClick="javascript: _gaq.push(['_trackPageview', '/1.4/README']);">README</a>
+* [html manual][19]
+* <a href=/1.4/accumulo_user_manual.pdf onClick="javascript: _gaq.push(['_trackPageview', '/1.4/accumulo_user_manual.pdf']);">pdf manual</a>
+* [examples][20]
 
 ## Older releases
+
 Older releases can be found in the [archives][34].
 
 [1]: http://www.apache.org/info/verification.html   "Verify"
 [2]: http://www.apache.org/dist/accumulo/KEYS   "KEYS"
 
-[3]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=CHANGES;hb=3b4ffc158945c1f834fc6f257f21484c61691d0f   "1.3.6 Release Notes"
-[5]: http://www.apache.org/dist/accumulo/1.3.6/accumulo-1.3.6-src.tar.gz.asc   "1.3.6 src asc"
-[6]: http://www.apache.org/dist/accumulo/1.3.6/accumulo-1.3.6-src.tar.gz.md5   "1.3.6 src md5"
-[7]: http://www.apache.org/dist/accumulo/1.3.6/accumulo-1.3.6-src.tar.gz.sha   "1.3.6 src sha"
-[9]: http://www.apache.org/dist/accumulo/1.3.6/accumulo-1.3.6-dist.tar.gz.asc   "1.3.6 dist asc"
-[10]: http://www.apache.org/dist/accumulo/1.3.6/accumulo-1.3.6-dist.tar.gz.md5   "1.3.6 dist md5"
-[11]: http://www.apache.org/dist/accumulo/1.3.6/accumulo-1.3.6-dist.tar.gz.sha   "1.3.6 dist sha"
-
 [12]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=CHANGES;hb=f7d87b6e407de6597b6c0ca60ca1b6a321faf237   "1.4.5 Release Notes"
-[13]: http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz.asc   "1.4.5 src asc"
-[14]: http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz.md5   "1.4.5 src md5"
-[15]: http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz.sha   "1.4.5 src sha"
-[16]: http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz.asc   "1.4.5 dist asc"
-[17]: http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz.md5   "1.4.5 dist md5"
-[18]: http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz.sha   "1.4.5 dist sha"
 [19]: /1.4/user_manual
 [20]: /1.4/examples
 
 [21]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=CHANGES;hb=3478f71ae888f8d73aaa93837319a6dbb4ba0c8a   "1.5.1 CHANGES"
 [22]: http://www.apache.org/dist/accumulo/1.5.1/MD5SUM
 [23]: http://www.apache.org/dist/accumulo/1.5.1/SHA1SUM
-[24]: http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-bin.tar.gz.asc
-[25]: http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-bin.rpm.asc
-[26]: http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-native.rpm.asc
-[27]: http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-test.rpm.asc
-[28]: http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-bin.deb.asc
-[29]: http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-native.deb.asc
-[30]: http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-test.deb.asc
-[31]: http://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-src.tar.gz.asc
 [32]: /1.5/examples
 [33]: /release_notes/1.5.1.html
 [34]: http://archive.apache.org/dist/accumulo/
\ No newline at end of file

Modified: accumulo/site/trunk/content/get_involved.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/get_involved.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/get_involved.mdtext (original)
+++ accumulo/site/trunk/content/get_involved.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,5 @@
 Title: Get Involved
+Nav: nav_getinvolved
 Notice:    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

Modified: accumulo/site/trunk/content/git.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/git.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/git.mdtext (original)
+++ accumulo/site/trunk/content/git.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,5 @@
 Title: Apache Accumulo Git WIP
+Nav: nav_git
 Notice:    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
@@ -16,8 +17,6 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-# Git
-
 [Git](http://git-scm.com) is an open source, distributed version control system
 which has become very popular in large, complicated software projects due to
 its efficient handling of multiple, simultaneously and independently developed
@@ -380,8 +379,8 @@ By convention, the branch containing the
 `x.y.z'-SNAPSHOT`. The steps to take are as follows:
 
 1. Prepare the release candidate. [Release
-   Guide](http://accumulo.apache.org/governance/releasing.html), [Maven
-   Instructions -- doesn't exist yet!](http://accumulo.apache.org/foobar)
+   Guide](/governance/releasing.html), [Maven
+   Instructions](/releasing.html)
 2. Create a tag of the release candidate from the `x.y.z'-SNAPSHOT` branch,
    named something like `x.y.z'-RC-N`.
 3. Test and Vote
@@ -505,4 +504,5 @@ For the sake of clarity, some examples o
 
     `git checkout 1.6.1-SNAPSHOT && git merge 1.5.1-SNAPSHOT`
 
- [1]: https://cwiki.apache.org/confluence/display/KAFKA/Patch+submission+and+review#Patchsubmissionandreview-Simplecontributorworkflow
\ No newline at end of file
+ [1]: https://cwiki.apache.org/confluence/display/KAFKA/Patch+submission+and+review#Patchsubmissionandreview-Simplecontributorworkflow
+

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

Modified: accumulo/site/trunk/content/governance/consensusBuilding.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/governance/consensusBuilding.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/governance/consensusBuilding.mdtext (original)
+++ accumulo/site/trunk/content/governance/consensusBuilding.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,5 @@
 Title:     Consensus Building
+Nav: nav_consensusbuilding
 Notice:    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

Modified: accumulo/site/trunk/content/governance/lazyConsensus.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/governance/lazyConsensus.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/governance/lazyConsensus.mdtext (original)
+++ accumulo/site/trunk/content/governance/lazyConsensus.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,5 @@
 Title:     Lazy Consensus
+Nav: nav_lazyconsensus
 Notice:    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

Modified: accumulo/site/trunk/content/governance/releasing.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/governance/releasing.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/governance/releasing.mdtext (original)
+++ accumulo/site/trunk/content/governance/releasing.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,5 @@
 Title: Accumulo Release Guide
+Nav: nav_releasing
 Notice:    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

Modified: accumulo/site/trunk/content/governance/voting.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/governance/voting.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/governance/voting.mdtext (original)
+++ accumulo/site/trunk/content/governance/voting.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,5 @@
 Title:     Voting
+Nav: nav_voting
 Notice:    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

Modified: accumulo/site/trunk/content/index.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/index.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/index.mdtext (original)
+++ accumulo/site/trunk/content/index.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,6 @@
 Title: Apache Accumulo
+Skiph1fortitle: true
+Nav: nav_index
 Notice:    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
@@ -16,8 +18,15 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-The Apache Accumulo&trade; sorted, distributed key/value store is a robust, scalable, high performance 
-data storage and retrieval system. Apache Accumulo is based on Google's [BigTable][1] design and is built on
+<br>
+<div class="jumbotron" style="text-align: center">
+<p>
+The Apache Accumulo&trade; sorted, distributed key/value store is a robust, scalable, high performance data storage and retrieval system.  
+</p>
+<a class="btn btn-success btn-lg" href="/downloads/" role="button"><span class="glyphicon glyphicon-download"></span> Download</a>
+</div>
+
+Apache Accumulo is based on Google's [BigTable][1] design and is built on
 top of Apache [Hadoop][2], [Zookeeper][3], and [Thrift][4].  Apache Accumulo features a few novel 
 improvements on the BigTable design in the form of cell-based access control and a server-side
 programming mechanism that can modify key/value pairs at various points in the
@@ -35,4 +44,4 @@ and [Cassandra][7].  Accumulo began its 
 [5]: http://hbase.apache.org                     "HBase"
 [6]: http://hypertable.org                       "Hypertable"
 [7]: http://cassandra.apache.org                 "Cassandra"
-[8]: http://www.apache.org/                      "Apache Software Foundation"
\ No newline at end of file
+[8]: http://www.apache.org/                      "Apache Software Foundation"

Modified: accumulo/site/trunk/content/mailing_list.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/mailing_list.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/mailing_list.mdtext (original)
+++ accumulo/site/trunk/content/mailing_list.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,5 @@
 Title: Apache Accumulo Mailing Lists
+Nav: nav_mailinglists
 Notice:    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
@@ -16,55 +17,24 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-### Users
+### User <a href="mailto:user-subscribe@accumulo.apache.org" class="btn btn-success btn-xs"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a href="mailto:user@accumulo.apache.org" class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-envelope"></span> Post</a> <a href="mailto:user-unsubscribe@accumulo.apache.org" class="btn btn-warning btn-xs"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a>
 
-  - [Subscribe][1]
-  - [Post][2]
-  - [Unsubscribe][3]
-  - [Archive][4]
+**[user@accumulo.apache.org][4]** is for general user questions, help, and
+announcements.
 
-### Developers
+### Dev <a href="mailto:dev-subscribe@accumulo.apache.org" class="btn btn-success btn-xs"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a href="mailto:dev@accumulo.apache.org" class="btn btn-primary btn-xs"><span class="glyphicon glyphicon-envelope"></span> Post</a> <a href="mailto:dev-unsubscribe@accumulo.apache.org" class="btn btn-warning btn-xs"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a>
 
-This list is for anyone interested in contributing or following development activities.
-It is recommended that you also subscribe to the JIRA notifications list.
+**[dev@accumulo.apache.org][8]** is for anyone interested in contributing or following development activities. It is recommended that you also subscribe to notifications@accumulo.apache.org.
 
-  - [Subscribe][5]
-  - [Post][6]
-  - [Unsubscribe][7]
-  - [Archive][8]
+### Commits <a href="mailto:commits-subscribe@accumulo.apache.org" class="btn btn-success btn-xs"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a href="mailto:commits-unsubscribe@accumulo.apache.org" class="btn btn-warning btn-xs"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a>
 
-### Commits
+**[commits@accumulo.apache.org][11]** is for following commits.
 
-This list is for following svn commits.
+### Notifications <a href="mailto:notifications-subscribe@accumulo.apache.org" class="btn btn-success btn-xs"><span class="glyphicon glyphicon-plus"></span> Subscribe</a> <a href="mailto:notifications-unsubscribe@accumulo.apache.org" class="btn btn-warning btn-xs"><span class="glyphicon glyphicon-remove"></span> Unsubscribe</a>
 
-  - [Subscribe][9]
-  - [Unsubscribe][10]
-  - [Archive][11]
+**[notifications@accumulo.apache.org][14]** is for following JIRA notifications.
 
-### Notifications
-
-This list is for following JIRA notifications.
-
-  - [Subscribe][12]
-  - [Unsubscribe][13]
-  - [Archive][14]
-
-### IRC
-
-Apache Accumulo developers and community members hang out in the #accumulo channel on irc.freenode.net.
-
-
-  [1]: mailto:user-subscribe@accumulo.apache.org
-  [2]: mailto:user@accumulo.apache.org
-  [3]: mailto:user-unsubscribe@accumulo.apache.org
   [4]: http://mail-archives.apache.org/mod_mbox/accumulo-user
-  [5]: mailto:dev-subscribe@accumulo.apache.org
-  [6]: mailto:dev@accumulo.apache.org
-  [7]: mailto:dev-unsubscribe@accumulo.apache.org
   [8]: http://mail-archives.apache.org/mod_mbox/accumulo-dev
-  [9]: mailto:commits-subscribe@accumulo.apache.org
-  [10]: mailto:commits-unsubscribe@accumulo.apache.org
   [11]: http://mail-archives.apache.org/mod_mbox/accumulo-commits
-  [12]: mailto:notifications-subscribe@accumulo.apache.org
-  [13]: mailto:notifications-unsubscribe@accumulo.apache.org
   [14]: http://mail-archives.apache.org/mod_mbox/accumulo-notifications
\ No newline at end of file

Modified: accumulo/site/trunk/content/notable_features.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/notable_features.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/notable_features.mdtext (original)
+++ accumulo/site/trunk/content/notable_features.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,5 @@
 Title: Apache Accumulo Notable Features
+Nav: nav_features
 Notice:    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
@@ -94,7 +95,7 @@ to adjust the timestamps they issue. So 
 always correct and master authoritative time tries to ensure that timestamps
 are meaningful.
 
-### Logical Time for bulk import (1.4)
+### Logical Time for bulk import <span class="label label-default">1.4</span>
 
 Logical time as described above works with streaming (batch) ingest, where the
 tablet server assigns the timestamp.  Logical time is also important for bulk
@@ -108,7 +109,7 @@ file is imported, but whenever it is rea
 time is obtained and always used by the specialized system iterator to set that
 time.
 
-### FATE (1.4)
+### FATE <span class="label label-default">1.4</span>
 
 Fault Tolerant Executor. A framework for executing operations in a fault
 tolerant manner. In the previous release, if the master process died in the
@@ -160,7 +161,7 @@ does not activate for short scans.
 Recently scanned data is cached into memory.  There are separate caches for
 indexes and data.  Caching can be turned on and off for individual tables.
 
-### Multi-level RFile Index (1.4)
+### Multi-level RFile Index <span class="label label-default">1.4</span>
 
 RFiles store an index of the last key in each block. For large files the index
 can become quite large. When the index is large a lot of memory is consumed and
@@ -171,7 +172,7 @@ written. When an index block exceeds the
 written out between data blocks. The size of index blocks is configurable on a
 per table basis.
 
-### Binary search in RFile blocks (1.5)
+### Binary search in RFile blocks <span class="label label-default">1.5</span>
 
 RFile uses its index to locate a block of key values.  Once it reaches a block 
 it performs a linear scan to find a key on interest.  Starting with 1.5, Accumulo
@@ -188,7 +189,7 @@ to read patterns without precomputing bl
 The Accumulo client API has a mock implementation that is useful writing unit
 test against Accumulo. Mock Accumulo is in memory and in process.
 
-### Mini Accumulo Cluster (1.5 & 1.4.4)
+### Mini Accumulo Cluster <span class="label label-default">1.5</span> <span class="label label-default">1.4.4</span>
 
 Mini Accumulo cluster is a set of utility code that makes it easy to spin up 
 a local Accumulo instance running against the local filesystem.  Mini Accumulo
@@ -254,7 +255,7 @@ could be different from the Accumulo nod
 
 Accumulo can be a source and/or sink for map reduce jobs.
 
-### Thrift Proxy (1.5 & 1.4.4)
+### Thrift Proxy <span class="label label-default">1.5</span> <span class="label label-default">1.4.4</span>
 
 The Accumulo client code contains a lot of complexity.  For example, the 
 client code locates tablets, retries in the case of failures, and supports 
@@ -342,7 +343,7 @@ multiplied by the largest file size.  If
 files, the largest file is removed from consideration, and the remaining files
 are considered for compaction.  This is done until there are no files to merge.
 
-### Merging Minor Compaction (1.4)
+### Merging Minor Compaction <span class="label label-default">1.4</span>
 
 When a max number of files per tablet is reached, minor compactions will merge
 data from the in-memory map with the smallest file instead of creating new
@@ -352,7 +353,7 @@ was growing.  Without this feature, inge
 constant rate, even as scan performance decreases because tablets have too many
 files.
 
-### Loading jars using VFS (1.5)
+### Loading jars using VFS <span class="label label-default">1.5</span>
 
 User written iterators are a useful way to manipulate data in data in Accumulo. 
 Before 1.5., users had to copy their iterators to each tablet server.  Starting 
@@ -375,13 +376,13 @@ Arbitrary split points can be added to a
 This is useful for increasing ingest performance on a new table. It can also be
 used to accommodate new data patterns in an existing table.
 
-### Tablet Merging (1.4)
+### Tablet Merging <span class="label label-default">1.4</span>
 
 Tablet merging is a new feature. Merging of tablets can be requested in the
 shell; Accumulo does not merge tablets automatically. In 1.5, the METADATA tablets 
 can be merged.
 
-### Table Cloning (1.4)
+### Table Cloning <span class="label label-default">1.4</span>
 
 Allows users to quickly create a new table that references an existing table's
 data and copies its configuration. A cloned table and its source table can be
@@ -389,16 +390,16 @@ mutated independently. Testing was the m
 feature. For example to test a new filtering iterator, clone the table, add the
 filter to the clone, and force a major compaction.
 
-### Import/Export Table (1.5)
+### Import/Export Table <span class="label label-default">1.5</span>
 
 An offline tables metadata and files can easily be copied to another cluster and 
 imported.
 
-### Compact Range (1.4)
+### Compact Range <span class="label label-default">1.4</span>
 
 Compact each tablet that falls within a row range down to a single file.  
 
-### Delete Range (1.4)
+### Delete Range <span class="label label-default">1.4</span>
 
 Added an operation to efficiently delete a range of rows from a table. Tablets
 that fall completely within a range are simply dropped. Tablets overlapping the

Modified: accumulo/site/trunk/content/papers.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/papers.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/papers.mdtext (original)
+++ accumulo/site/trunk/content/papers.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,5 @@
 Title: Apache Accumulo Related Links
+Nav: nav_papers
 Notice:    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

Modified: accumulo/site/trunk/content/people.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/people.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/people.mdtext (original)
+++ accumulo/site/trunk/content/people.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,6 @@
 Title: Apache Accumulo Contributors
+Skiph1fortitle: true
+Nav: nav_people
 Notice:    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
@@ -16,35 +18,10 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-<style type="text/css">
-table {
-  width:100%;
-}
-table, td {
-  border-collapse: collapse;
-  border-top: 1px solid #ccc;
-  border-bottom: 1px solid #ccc;
-  padding: 5px;
-}
-th {
-  style: font-weight:bold;
-  text-align: left;
-  background: #FFFFFF;
-}
-tr:nth-child(2n){
-  background: #F0FFF0;
-}
-
-tr:nth-child(2n+1) {
-  background: #FFFFFF;
-}
-
-</style>
-
 PMC and Committers
 ------------------
 
-<table>
+<table class="table table-striped">
   <tr><th>username</th><th>name</th><th>organization</th><th>timezone</th></tr>
   <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>ET (<a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5</a> / <a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4</a>)</td></tr>
@@ -72,7 +49,7 @@ PMC and Committers
 Contributors
 ------------
 
-<table>
+<table class="table table-striped">
   <tr><th>username</th><th>name</th><th>organization</th><th>timezone</th></tr>
   <tr><td></td><td>Aaron Glahe</td><td><a href=http://www.data-tactics.com/>Data Tatics</a></td><td>ET (<a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5</a> / <a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4</a>)</td></tr>
   <tr><td></td><td>Al Krinker</td><td></td><td>ET (<a href=http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5</a> / <a href=http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4</a>)</td></tr>

Modified: accumulo/site/trunk/content/releasing.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/releasing.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/releasing.mdtext (original)
+++ accumulo/site/trunk/content/releasing.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,5 @@
 Title: Making a Release
+Nav: nav_releasing
 Notice:    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
@@ -136,4 +137,4 @@ Some good references that explain a few 
 [6]: http://accumulo.apache.org/governance/releasing.html
 [7]: http://www.kb.cert.org/vuls/id/225657
 [8]: http://www.apache.org/dev/cmsref#extpaths
-[9]: https://svn.apache.org/repos/asf/accumulo/site/trunk
\ No newline at end of file
+[9]: https://svn.apache.org/repos/asf/accumulo/site/trunk

Modified: accumulo/site/trunk/content/screenshots.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/screenshots.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/screenshots.mdtext (original)
+++ accumulo/site/trunk/content/screenshots.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,5 @@
 Title: Apache Accumulo Screenshots
+Nav: nav_screenshots
 Notice:    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
@@ -16,13 +17,27 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
+<div class="row">
+<div class="col-xs-3">
 The following is a screenshot of the Apache Accumulo&trade; monitor overview web page.  Accumulo was running on an eleven node cluster.  The continuous ingest test suite was running to generate load.  Ten continuous ingest clients were running.
+</div>
+<div class="col-xs-9">
+<a class="thumbnail" href="/images/overview2.png">
+<img src="/images/overview2.png" alt="monitor overview"/>
+</a>
+</div>
+</div>
 
-<img src=/images/overview2.png />
-
+<div class="row">
+<div class="col-xs-3">
 The following screenshot shows the monitor master page.  This page gives information about individual tables within accumulo.  Continuous ingest is running against the table ci.
-
-<img src=/images/master2.png />
+</div>
+<div class="col-xs-9">
+<a class="thumbnail" href="/images/master2.png">
+<img src="/images/master2.png" alt="monitor master"/>
+</a>
+</div>
+</div>
 
 The data generated by the continuous ingest test suite looks like the following.  The data is random, but forms many giant linked list.  Each ingest client continually generates linked list containing 25 million nodes.  In the shell session below a few scans are issued to start following the linked list that the first node in the table is part of.
 
@@ -44,4 +59,4 @@ The data generated by the continuous ing
     root@test15 ci> scan -b 53a9e4ba97e4a6e0 -e 53a9e4ba97e4a6e0
     53a9e4ba97e4a6e0 37f3:33a2 []    2db1de18-cd37-407d-b060-481a0a214c90:000000002b0d4b61:1c16a4ae1bef9f1f:f03c869b
     root@test15 ci> scan -b 1c16a4ae1bef9f1f -e 1c16a4ae1bef9f1f
-    1c16a4ae1bef9f1f 07c8:7cd3 []    2db1de18-cd37-407d-b060-481a0a214c90:000000002afe0921:2e3ec09a8d2fdf52:8b82be48
\ No newline at end of file
+    1c16a4ae1bef9f1f 07c8:7cd3 []    2db1de18-cd37-407d-b060-481a0a214c90:000000002afe0921:2e3ec09a8d2fdf52:8b82be48

Modified: accumulo/site/trunk/content/source.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/source.mdtext?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/content/source.mdtext (original)
+++ accumulo/site/trunk/content/source.mdtext Sun May  4 17:29:10 2014
@@ -1,4 +1,6 @@
 Title: Apache Accumulo Source Code & Developers Guide
+Skiph1fortitle: true
+Nav: nav_source
 Notice:    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
@@ -16,29 +18,37 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-##  Source Code
+<div class="panel panel-default pull-right">
+<div class="panel-heading">Quick Links</div>
+<div class="list-group">
+<a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=summary" class="list-group-item"><i class="fa fa-external-link"></i> Accumulo source</a>
+<a href="https://builds.apache.org/job/Accumulo-Master/" class="list-group-item"><i class="fa fa-external-link"></i> Master build on Jenkins</a>
+<a href="https://issues.apache.org/jira/browse/accumulo" class="list-group-item"><i class="fa fa-external-link"></i> Accumulo JIRA</a>
+</div>
+</div>
+
+## Source Code
+
+### Apache Accumulo
 
 Apache Accumulo&trade; source code is maintained using [Git][git] version control 
 ([browse][cgit]|[checkout][anongit]).  It builds with [Apache Maven][maven].
 
-## Website
+Instructions for configuring git are [here](https://git-wip-us.apache.org/).
 
-Accumulo's web site is maintained with [Apache Subversion][subversion] [here][sitesvn] using Apache's [Content Management System][cms].
-Committers may edit the site by following [these instructions][cmsusage].  Non-committers should follow
-[this FAQ entry][cmsanon].
+### Contrib Projects
 
-## Contribs
+Accumulo has a number of [contrib projects](contrib.html) that maintain their own code repositories and release schedules.
 
-Accumulo has a number of [contrib projects](contrib.html) that maintain their own code repositories and release schedules. All build with [Apache Maven][maven].
+### Website
 
-* Instamo Archetype ([browse](https://git-wip-us.apache.org/repos/asf?p=accumulo-instamo-archetype.git;a=summary)|[checkout](https://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype.git))
-* Wikisearch Application ([browse](https://git-wip-us.apache.org/repos/asf?p=accumulo-wikisearch.git;a=summary)|[checkout](https://git-wip-us.apache.org/repos/asf/accumulo-wikisearch.git))
-* Apache Pig Support ([browse](https://git-wip-us.apache.org/repos/asf?p=accumulo-pig.git;a=summary)|[checkout](https://git-wip-us.apache.org/repos/asf/accumulo-pig.git))
-* BSP via Apache Hama ([browse](https://git-wip-us.apache.org/repos/asf?p=accumulo-bsp.git;a=summary)|[checkout](https://git-wip-us.apache.org/repos/asf/accumulo-bsp.git))
+Accumulo's web site is maintained with [Apache Subversion][subversion] [here][sitesvn] using Apache's [Content Management System][cms].
+Committers may edit the site by following [these instructions][cmsusage].  Non-committers should follow
+[this FAQ entry][cmsanon].
 
 ## Developer's Guide
 
-### Building code
+### Building
 
 #### Installing Thrift
 
@@ -50,13 +60,11 @@ need to install or modify the Thrift def
 
 #### Checking out from Git
 
-
 To check out the code:
 
     git clone http://git-wip-us.apache.org/repos/asf/accumulo.git
 
-#### Building
-
+#### Running a Build
 
 To build the code:
 
@@ -70,15 +78,15 @@ For older branches, "mvn package && mvn 
 
 Accumulo uses [Jenkins][jenkins] for automatic builds.
 
-<img src="https://builds.apache.org/job/Accumulo-Master/lastBuild/buildStatus" width=18> [Master][masterbuild]
+<img src="https://builds.apache.org/job/Accumulo-Master/lastBuild/buildStatus" style="height: 1.1em"> [Master][masterbuild]
 
-<img src="https://builds.apache.org/job/Accumulo-1.6/lastBuild/buildStatus" width=18> [1.6 Branch][16build]
+<img src="https://builds.apache.org/job/Accumulo-1.6/lastBuild/buildStatus" style="height: 1.1em"> [1.6 Branch][16build]
 
-<img src="https://builds.apache.org/job/Accumulo-1.5-Hadoop-2/lastBuild/buildStatus" width=18> [1.5 Branch (Hadoop 2)][15buildh2]
+<img src="https://builds.apache.org/job/Accumulo-1.5-Hadoop-2/lastBuild/buildStatus" style="height: 1.1em"> [1.5 Branch (Hadoop 2)][15buildh2]
 
-<img src="https://builds.apache.org/job/Accumulo-1.5/lastBuild/buildStatus" width=18> [1.5 Branch (Hadoop 1)][15build]
+<img src="https://builds.apache.org/job/Accumulo-1.5/lastBuild/buildStatus" style="height: 1.1em"> [1.5 Branch (Hadoop 1)][15build]
 
-<img src="https://builds.apache.org/job/Accumulo-1.4/lastBuild/buildStatus" width=18> [1.4 Branch][14build]
+<img src="https://builds.apache.org/job/Accumulo-1.4/lastBuild/buildStatus" style="height: 1.1em"> [1.4 Branch][14build]
 
 ### Issue Tracking
 
@@ -86,7 +94,7 @@ Accumulo [tracks issues][jiraloc] with [
 
 ### Merging Practices
 
-Changes should be merged from earlier branches of Accumulo to later branches.  Ask the dev list for instructions.
+Changes should be merged from earlier branches of Accumulo to later branches.  Ask the [dev list][devlist] for instructions.
 
 ### Public API
 
@@ -96,27 +104,29 @@ Changes to non-private members of those 
 
 ### Coding Practices
 
-* License Header: Always add the current ASF license header as described in [ASF Source Header][srcheaders].
-* Trailing Whitespaces: Remove all trailing whitespaces. Eclipse users can use Source->Cleanup option to accomplish this.
-* Indentation: Use 2 space indents and never use tabs!
-* Line Wrapping: Use 160-column line width for Java code and Javadoc.
-* Control Structure New Lines: Use a new line with single statement if/else blocks.
-* Author Tags: Do not use Author Tags. The code is developed and owned by the community. 
+<table class="table">
+<tr><th>License Header</th><td>Always add the current ASF license header as described in <a href="http://www.apache.org/legal/src-headers.html">ASF Source Header</a>.</td></tr>
+<tr><th>Trailing Whitespaces</th><td>Remove all trailing whitespaces. Eclipse users can use Source&rarr;Cleanup option to accomplish this.</td></tr>
+<tr><th>Indentation</th><td>Use 2 space indents and never use tabs!
+<tr><th>Line Wrapping</th><td>Use 160-column line width for Java code and Javadoc.</td></tr>
+<tr><th>Control Structure New Lines</th><td>Use a new line with single statement if/else blocks.</td></tr>
+<tr><th>Author Tags</th><td>Do not use Author Tags. The code is developed and owned by the community.</td></tr>
+</table>
 
-### Eclipse Configuration Tips
+### IDE Configuration Tips
+
+#### Eclipse
 
 * Download Eclipse [formatting and style guides for Accumulo][styles].
 * Import Formatter: Preferences > Java > Code Style >  Formatter and import the Eclipse-Accumulo-Codestyle.xml downloaded in the previous step. 
 * Import Template: Preferences > Java > Code Style > Code Templates and import the Eclipse-Accumulo-Template.xml. Make sure to check the "Automatically add comments" box. This template adds the ASF header and so on for new code.
 
-### Intellij Configuration Tips
- * Formatter [plugin](https://code.google.com/p/eclipse-code-formatter-intellij-plugin/) that uses eclipse code style xml.
+#### IntelliJ
 
-### Git
-
- Instructions for configuring git are [here](https://git-wip-us.apache.org/).
+ * Formatter [plugin](https://code.google.com/p/eclipse-code-formatter-intellij-plugin/) that uses eclipse code style xml.
 
 ### Release Guide
+
 Accumulo's release guide can be found [here][release].
 
 [subversion]: http://subversion.apache.org/
@@ -132,6 +142,7 @@ Accumulo's release guide can be found [h
 [14build]: https://builds.apache.org/job/Accumulo-1.4/
 [jiraloc]: https://issues.apache.org/jira/browse/accumulo
 [jira]: http://www.atlassian.com/software/jira/overview
+[devlist]: mailto:dev@accumulo.apache.org
 [release]: governance/releasing.html
 [cms]: http://www.apache.org/dev/cms.html
 [cmsusage]: http://www.apache.org/dev/cms.html#usage

Modified: accumulo/site/trunk/templates/skeleton.html
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/templates/skeleton.html?rev=1592390&r1=1592389&r2=1592390&view=diff
==============================================================================
--- accumulo/site/trunk/templates/skeleton.html (original)
+++ accumulo/site/trunk/templates/skeleton.html Sun May  4 17:29:10 2014
@@ -1,5 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
+<!DOCTYPE html>
+<html lang="en">
 <head>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,12 +17,24 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link href="/css/bootstrap.min.css" rel="stylesheet">
+  <link href="/css/bootstrap-theme.min.css" rel="stylesheet">
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+    <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+  <![endif]-->
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+  <script src="/js/bootstrap.min.js"></script>
   <link href="/css/accumulo.css" rel="stylesheet" type="text/css">
+  <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
   <title>{% block title %}{{ headers.title }}{% endblock %}</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   
   <script type="text/javascript">
-
+/*
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', 'UA-21103458-6']);
     _gaq.push(['_setDomainName', 'apache.org']);
@@ -34,44 +46,73 @@
       ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
       var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
     })();
-
+*/
   </script>
 
 
 </head>
 
 <body>
-  <div id="banner">&nbsp;
-  </div>
+{% include "nav.html" %}
 
-  <div id="navigation">
-  {% filter markdown %}{% include "sidenav.mdtext" %}{% endfilter %}
+<div class="container-fluid">
+<div class="row">
+  <div class="col-md-2" id="sidebar">
+  <div style="text-align: center">
+    <a href="/index.html"><img id="logo" alt="Apache Accumulo &trade;" class="img-responsive" src="/images/accumulo-logo.png"/></a>
+    <br>
+Latest 1.5 release: <strong>1.5.1</strong><br>
+Latest 1.4 release: <strong>1.4.5</strong><br>
+    <br>
+    <a id="download-button-sidebar" class="btn btn-success btn-block" href="/downloads/" role="button">Download</a>
   </div>
-
+    <hr>
+<table class="table" id="sociallinks">
+<tr><td><img src="/images/Twitter_logo_blue.png" style="height: 1em"></td><td><a href="https://twitter.com/apacheaccumulo">@ApacheAccumulo</a></td></tr>
+<tr><td><img src="/images/InBug-16px_0.png"></td><td><a href="https://www.linkedin.com/groups/Apache-Accumulo-Professionals-4554913">Apache Accumulo Professionals</a></td></tr>
+<tr><td><img src="/images/GitHub-Mark-32px.png" style="height: 1em"></td><td><a href="https://github.com/apache/accumulo">apache / accumulo</a></td></tr>
+<tr><td><span class="glyphicon glyphicon-comment"></span></td><td><a href="irc://chat.freenode.net/accumulo">#accumulo @ freenode</a></td></tr>
+</table>
+<hr>
+<a id="accumulo-summit-logo" href="http://accumulosummit.com/"><img alt="Accumulo Summit" class="img-responsive" src="/images/accumulo-summit-2014.png"></a>
+  </div>
+  <div class="col-md-8 col-md-offset-1">
+<!--
   <div id="bannertext">
-    <img id="logo" alt="Apache Accumulo" src="/images/accumulo-logo.png"/>&trade;
+    <img id="logo" alt="Apache Accumulo &trade;" src="/images/accumulo-logo.png"/>
   </div>
+-->
 
   <div id="content">
+{% if not headers.skiph1fortitle %}
     <h1 class="title">{% block title %}{{ headers.title }}{% endblock %}</h1>
+{% endif %}
     {% block content %}{{ content|markdown }}{% endblock %}
   </div>
 
   <div id="footer">
     <a alt="Apache Software Foundation" href="http://www.apache.org">
-      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif"/ width="100">
+      <img id="asf-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100">
     </a>
     <div class="copyright">
       <p>
-        Copyright &copy; 2011-2013 The Apache Software Foundation, Licensed under
+        Copyright &copy; 2011-2014 The Apache Software Foundation, Licensed under
         the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
         Apache Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-        <br />
-        project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.
+        project logo are trademarks of the <a href="http://www.apache.org">Apache Software Foundation</a>.<br />
+        Site created with <a href="http://getbootstrap.com/">Bootstrap</a> including icons from <a href="http://glyphicons.com/">GLYPHICONS</a> and <a href="http://fontawesome.io/">Font Awesome</a>.
       </p>
     </div> 
   </div>
+  </div>
+
+</div>
+</div>
 
+<script type="text/javascript">
+{% if headers.nav %}
+$("#{{headers.nav}}").addClass("active");
+{% endif %}
+</script>
 </body>
 </html>



Mime
View raw message