svn commit: r1504703 - in /accumulo/site/branches/git: ./ content/source.mdtext

[el...@apache.org]

Author: elserj
Date: Thu Jul 18 22:42:28 2013
New Revision: 1504703

URL: http://svn.apache.org/r1504703
Log:
ACCUMULO-1498 Clean up the changes I made with what Keith changed.

Modified:
    accumulo/site/branches/git/   (props changed)
    accumulo/site/branches/git/content/source.mdtext

Propchange: accumulo/site/branches/git/
------------------------------------------------------------------------------
  Merged /accumulo/site/trunk:r1504678-1504698

Modified: accumulo/site/branches/git/content/source.mdtext
URL: http://svn.apache.org/viewvc/accumulo/site/branches/git/content/source.mdtext?rev=1504703&r1=1504702&r2=1504703&view=diff
==============================================================================
--- accumulo/site/branches/git/content/source.mdtext (original)
+++ accumulo/site/branches/git/content/source.mdtext Thu Jul 18 22:42:28 2013
@@ -73,6 +73,10 @@ Accumulo uses [Jenkins][jenkins] for aut
 
 Accumulo [tracks issues][jiraloc] with [JIRA][jira].  Every commit should reference a JIRA ticket of the form ACCUMULO-#.
 
+### Merging Practices
+
+Changes should be merged from earlier branches of Accumulo to later branches.  Ask the dev list for instructions.
+
 ### Coding Practices
 
 * License Header: Always add the current ASF license header as described in [ASF Source Header][srcheaders].
@@ -91,17 +95,16 @@ Accumulo [tracks issues][jiraloc] with [
 ### Intellij Configuration Tips
  * Formatter [plugin](https://code.google.com/p/eclipse-code-formatter-intellij-plugin/) that uses eclipse code style xml.
 
-### SVN
+### Git
 
- Instructions for configuring svn clients are [here](http://www.apache.org/dev/version-control.html#https-svn-config).
+ Instructions for configuring git are [here](https://git-wip-us.apache.org/).
 
 ### Release Guide
 Accumulo's release guide can be found [here][release].
 
-[subversion]: http://subversion.apache.org/
 [maven]: http://maven.apache.org/
 [srcheaders]: http://www.apache.org/legal/src-headers.html
-[styles]: https://svn.apache.org/repos/asf/accumulo/trunk/contrib/
+[styles]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=tree;f=contrib;h=e43cff51b721cf7fc48ce5e3cf5c9b25cd3d1166;hb=HEAD
 [jenkins]: http://jenkins-ci.org/
 [trunkbuild]: https://builds.apache.org/job/Accumulo-Trunk/
 [15build]: https://builds.apache.org/job/Accumulo-1.5.x/