You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2012/03/26 22:29:37 UTC

svn commit: r1305542 - in /accumulo/site/trunk/content/accumulo: downloads/downloads.mdtext favicon.png governance/voting.mdtext source.mdtext

Author: billie
Date: Mon Mar 26 20:29:36 2012
New Revision: 1305542

URL: http://svn.apache.org/viewvc?rev=1305542&view=rev
Log:
ACCUMULO-497 fixed more links

Added:
    accumulo/site/trunk/content/accumulo/favicon.png   (with props)
Modified:
    accumulo/site/trunk/content/accumulo/downloads/downloads.mdtext
    accumulo/site/trunk/content/accumulo/governance/voting.mdtext
    accumulo/site/trunk/content/accumulo/source.mdtext

Modified: accumulo/site/trunk/content/accumulo/downloads/downloads.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/accumulo/downloads/downloads.mdtext?rev=1305542&r1=1305541&r2=1305542&view=diff
==============================================================================
--- accumulo/site/trunk/content/accumulo/downloads/downloads.mdtext (original)
+++ accumulo/site/trunk/content/accumulo/downloads/downloads.mdtext Mon Mar 26 20:29:36 2012
@@ -25,7 +25,7 @@ Download Source: [accumulo-1.3.5-incubat
 Download Binaries: [accumulo-1.3.5-incubating-dist.tar.gz][8] ([asc][9], [md5][10], [sha][11])
 
 [1]: http://www.apache.org/info/verification.html   "Verify"
-[2]: http://svn.apache.org/repos/asf/incubator/accumulo/branches/1.3/CHANGES   "Release Notes"
+[2]: http://svn.apache.org/repos/asf/accumulo/branches/1.3/CHANGES   "Release Notes"
 [3]: http://www.apache.org/dist/incubator/accumulo/KEYS   "KEYS"
 [4]: /accumulo/downloads/1.3.5/accumulo-1.3.5-incubating-src   "1.3.5-incubating src download"
 [5]: http://www.apache.org/dist/incubator/accumulo/1.3.5-incubating/accumulo-1.3.5-incubating-src.tar.gz.asc   "1.3.5-incubating src asc"

Added: accumulo/site/trunk/content/accumulo/favicon.png
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/accumulo/favicon.png?rev=1305542&view=auto
==============================================================================
Binary file - no diff available.

Propchange: accumulo/site/trunk/content/accumulo/favicon.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: accumulo/site/trunk/content/accumulo/governance/voting.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/accumulo/governance/voting.mdtext?rev=1305542&r1=1305541&r2=1305542&view=diff
==============================================================================
--- accumulo/site/trunk/content/accumulo/governance/voting.mdtext (original)
+++ accumulo/site/trunk/content/accumulo/governance/voting.mdtext Mon Mar 26 20:29:36 2012
@@ -101,6 +101,6 @@ The notation used in voting is:
 [See here for more mail templates][3]
 
 
-  [1]: http://incubator.apache.org/accumulo/governance/consensusBuilding.html
+  [1]: /accumulo/governance/consensusBuilding.html
   [2]: http://apache.org/foundation/voting.html
-  [3]: http://community.apache.org/newcommitter.html
\ No newline at end of file
+  [3]: http://community.apache.org/newcommitter.html

Modified: accumulo/site/trunk/content/accumulo/source.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/accumulo/source.mdtext?rev=1305542&r1=1305541&r2=1305542&view=diff
==============================================================================
--- accumulo/site/trunk/content/accumulo/source.mdtext (original)
+++ accumulo/site/trunk/content/accumulo/source.mdtext Mon Mar 26 20:29:36 2012
@@ -31,15 +31,15 @@ Committers may edit the site by followin
 ### Building code
 To check out the code:
 
-    svn co https://svn.apache.org/repos/asf/incubator/accumulo/trunk/
+    svn co https://svn.apache.org/repos/asf/accumulo/trunk/
 
 To build the code:
 
     mvn package -P assemble
 
-For older branches, "mvn package && mvn assembly:single" may be required instead.
+This will create a file accumulo-*-SNAPSHOT-dist.tar.gz in the assemble/target directory.
 
-This will create a file accumulo-*-SNAPSHOT-dist.tar.gz in the target directory.
+For older branches, "mvn package && mvn assembly:single" may be required instead, and the tar will be built in the target directory.
 
 ### Continuous Integration
 
@@ -75,6 +75,8 @@ Changes should be merged from earlier br
 
     make sure the commit includes the svn mergeinfo
 
+An additional step is now required to merge from 1.4 to 1.5 since the directory structure changed.  Ask the dev list for instructions.
+
 ### Coding Practices
 
 * License Header: Always add the current ASF license header as described in [ASF Source Header][srcheaders].
@@ -99,10 +101,10 @@ Accumulo's release guide can be found [h
 
 [subversion]: http://subversion.apache.org/
 [maven]: http://maven.apache.org/
-[viewvc]: http://svn.apache.org/viewvc/incubator/accumulo/
-[svnloc]: https://svn.apache.org/repos/asf/incubator/accumulo/trunk/
+[viewvc]: http://svn.apache.org/viewvc/accumulo/
+[svnloc]: https://svn.apache.org/repos/asf/accumulo/trunk/
 [srcheaders]: http://www.apache.org/legal/src-headers.html
-[styles]: https://svn.apache.org/repos/asf/incubator/accumulo/trunk/contrib/
+[styles]: https://svn.apache.org/repos/asf/accumulo/trunk/contrib/
 [jenkins]: http://jenkins-ci.org/
 [trunkbuild]: https://builds.apache.org/job/Accumulo-Trunk/
 [14build]: https://builds.apache.org/job/Accumulo-1.4.x/