Return-Path: 
 <commits-return-11156-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 109A111358
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Tue,  6 May 2014 15:42:23 +0000 (UTC)
Received: (qmail 40635 invoked by uid 500); 6 May 2014 15:13:33 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 40613 invoked by uid 500); 6 May 2014 15:13:33 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 40595 invoked by uid 99); 6 May 2014 15:13:33 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 May 2014 15:13:33 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 May 2014 15:13:31 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 390C423888E2;
	Tue,  6 May 2014 15:13:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1592773 -
 /accumulo/site/trunk/content/downloads/index.mdtext
Date: Tue, 06 May 2014 15:13:11 -0000
To: commits@accumulo.apache.org
From: ctubbsii@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140506151311.390C423888E2@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ctubbsii
Date: Tue May  6 15:13:10 2014
New Revision: 1592773

URL: http://svn.apache.org/r1592773
Log:
ACCUMULO-2171 Update links to 1.6.0 release on the download page (also cleanup links)

Modified:
    accumulo/site/trunk/content/downloads/index.mdtext

Modified: accumulo/site/trunk/content/downloads/index.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/downloads/index.mdtext?rev=1592773&r1=1592772&r2=1592773&view=diff
==============================================================================
--- accumulo/site/trunk/content/downloads/index.mdtext (original)
+++ accumulo/site/trunk/content/downloads/index.mdtext Tue May  6 15:13:10 2014
@@ -17,88 +17,150 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-Be sure to verify your downloads by these [procedures][1] using these [KEYS][2].  
+Be sure to verify your downloads by these [procedures][VERIFY_PROCEDURES] using these [KEYS][GPG_KEYS].
 
 ## Current Release
 
-### 1.5.1 <span class="label label-primary">latest</span>
+### 1.6.0 <span class="label label-primary">latest</span>
 
-The most recent Apache Accumulo&trade; release is version 1.5.1.  See the [release notes][33] and [CHANGES][21].  
+The most recent Apache Accumulo&trade; release is version 1.6.0. See the [release notes][REL_NOTES_160] and [CHANGES][CHANGES_160].
 
-For convenience, [MD5][22] and [SHA1][23] hashes are also available.
+For convenience, [MD5][MD5SUM_160] and [SHA1][SHA1SUM_160] hashes are also available.
 
 <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>
+<tr>
+<th>Generic Binaries</th>
+<td><a href=https://www.apache.org/dyn/closer.cgi/accumulo/1.6.0/accumulo-1.6.0-bin.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.6.0-bin.tar.gz']);">accumulo-1.6.0-bin.tar.gz</a></td>
+<td>[ASC][BIN_SIG_160]</td>
+</tr>
+<tr>
+<th>Source</th>
+<td><a href=https://www.apache.org/dyn/closer.cgi/accumulo/1.6.0/accumulo-1.6.0-src.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.6.0-src.tar.gz']);">accumulo-1.6.0-src.tar.gz</a></td>
+<td>[ASC][SRC_SIG_160]</td>
+</tr>
+</table>
+
+#### 1.6 Documentation
+* <a href=https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;hb=06162580e885f11863d1a6d22f952bce35b78b68 onClick="javascript: _gaq.push(['_trackPageview', '/1.6/README']);">README</a>
+* <a href=/1.6/accumulo_user_manual.pdf onClick="javascript: _gaq.push(['_trackPageview', '/1.6/accumulo_user_manual.pdf']);">PDF manual</a>
+* [html manual][MANUAL_16]
+* [examples][EXAMPLES_16]
+* <a href=/1.6/apidocs onClick="javascript: _gaq.push(['_trackPageview', '/1.6/apidocs']);">Javadoc</a>
+
+### 1.5.1
+
+The most recent Apache Accumulo&trade; 1.5 release is version 1.5.1. See the [release notes][REL_NOTES_151] and [CHANGES][CHANGES_151].
+
+For convenience, [MD5][MD5SUM_151] and [SHA1][SHA1SUM_151] hashes are also available.
+
+<table class="table">
+<tr>
+<th>Generic Binaries</th>
+<td><a href=https://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>[ASC][BIN_SIG_151]</td>
+</tr>
+<tr>
+<th rowspan="6">Platform Binaries</th>
+<td><a href=https://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="https://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-bin.rpm.asc">ASC</a></td>
+</tr>
+<tr>
+<td><a href=https://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="https://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-native.rpm.asc">ASC</a></td>
+</tr>
+<tr>
+<td><a href=https://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><a href="https://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-test.rpm.asc"asc>ASC</a></td>
+</tr>
+<tr>
+<td><a href=https://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="https://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-bin.deb.asc">ASC</a></td>
+</tr>
+<tr>
+<td><a href=https://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="https://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-native.deb.asc">ASC</a></td>
+</tr>
+<tr>
+<td><a href=https://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="https://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=https://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>[ASC][SRC_SIG_151]</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>
-  * [examples][32]
+* <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>
+* [html manual][MANUAL_15]
+* [examples][EXAMPLES_15]
+* <a href=/1.5/apidocs onClick="javascript: _gaq.push(['_trackPageview', '/1.5/apidocs']);">Javadoc</a>
 
 ### 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].  
+The most recent Apache Accumulo&trade; 1.4 release is version 1.4.5. See the [CHANGES][CHANGES_145].
+
+For convenience, [MD5][MD5SUM_145] and [SHA1][SHA1SUM_145] hashes are also available.
 
 <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>
+<tr>
+<th>Binaries</th>
+<td><a href=https://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>[ASC][BIN_SIG_15]</td>
+</tr>
+<tr>
+<th>Source</th>
+<td><a href=https://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>[ASC][SRC_SIG_15]</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]
+* [html manual][MANUAL_14]
+* [examples][EXAMPLES_14]
+* <a href=/1.4/apidocs onClick="javascript: _gaq.push(['_trackPageview', '/1.4/apidocs']);">Javadoc</a>
 
 ## Older releases
 
-Older releases can be found in the [archives][34].
+Older releases can be found in the [archives][ARCHIVES].
+
+
+[VERIFY_PROCEDURES]: https://www.apache.org/info/verification.html "Verify"
+[GPG_KEYS]: https://www.apache.org/dist/accumulo/KEYS "KEYS"
+[ARCHIVES]: https://archive.apache.org/dist/accumulo/
+
+[MANUAL_14]: /1.4/user_manual "1.4 user manual"
+[MANUAL_15]: /1.5/user_manual "1.5 user manual"
+[MANUAL_16]: /1.6/user_manual "1.6 user manual"
+
+[EXAMPLES_14]: /1.4/examples "1.4 examples"
+[EXAMPLES_15]: /1.5/examples "1.5 examples"
+[EXAMPLES_15]: /1.6/examples "1.6 examples"
+
+[CHANGES_145]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=CHANGES;hb=f7d87b6e407de6597b6c0ca60ca1b6a321faf237 "1.4.5 CHANGES"
+[CHANGES_151]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=CHANGES;hb=3478f71ae888f8d73aaa93837319a6dbb4ba0c8a "1.5.1 CHANGES"
+[CHANGES_160]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=CHANGES;hb=06162580e885f11863d1a6d22f952bce35b78b68 "1.6.0 CHANGES"
+
+[REL_NOTES_151]: /release_notes/1.5.1.html
+[REL_NOTES_160]: /release_notes/1.6.0.html
+
+[MD5SUM_145]: https://www.apache.org/dist/accumulo/1.4.5/MD5SUM "1.4.5 MD5 file hashes"
+[MD5SUM_151]: https://www.apache.org/dist/accumulo/1.5.1/MD5SUM "1.5.1 MD5 file hashes"
+[MD5SUM_160]: https://www.apache.org/dist/accumulo/1.6.0/MD5SUM "1.6.0 MD5 file hashes"
+
+[SHA1SUM_145]: https://www.apache.org/dist/accumulo/1.4.5/SHA1SUM "1.4.5 SHA1 file hashes"
+[SHA1SUM_151]: https://www.apache.org/dist/accumulo/1.5.1/SHA1SUM "1.5.1 SHA1 file hashes"
+[SHA1SUM_160]: https://www.apache.org/dist/accumulo/1.6.0/SHA1SUM "1.6.0 SHA1 file hashes"
 
-[1]: http://www.apache.org/info/verification.html   "Verify"
-[2]: http://www.apache.org/dist/accumulo/KEYS   "KEYS"
+[BIN_SIG_145]: https://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz.asc "1.4.5 dist GPG Signature"
+[BIN_SIG_151]: https://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-bin.tar.gz.asc "1.5.1 bin GPG Signature"
+[BIN_SIG_160]: https://www.apache.org/dist/accumulo/1.6.0/accumulo-1.6.0-bin.tar.gz.asc "1.6.0 bin GPG Signature"
 
-[12]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=CHANGES;hb=f7d87b6e407de6597b6c0ca60ca1b6a321faf237   "1.4.5 Release Notes"
-[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
-[32]: /1.5/examples
-[33]: /release_notes/1.5.1.html
-[34]: http://archive.apache.org/dist/accumulo/
\ No newline at end of file
+[SRC_SIG_145]: https://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz.asc "1.4.5 src GPG Signature"
+[SRC_SIG_151]: https://www.apache.org/dist/accumulo/1.5.1/accumulo-1.5.1-src.tar.gz.asc "1.5.1 src GPG Signature"
+[SRC_SIG_160]: https://www.apache.org/dist/accumulo/1.6.0/accumulo-1.6.0-src.tar.gz.asc "1.6.0 src GPG Signature"