Author: elserj
Date: Tue Jun 11 12:58:02 2013
New Revision: 1491775
URL: http://svn.apache.org/r1491775
Log:
ACCUMULO-1498 Add in spelling fixes from [~ecn], link to release guide and put
in place holder for addt'l release instructions
Modified:
accumulo/site/branches/git/content/git.mdtext
Modified: accumulo/site/branches/git/content/git.mdtext
URL:
http://svn.apache.org/viewvc/accumulo/site/branches/git/content/git.mdtext?rev=1491775&r1=1491774&r2=1491775&view=diff
==============================================================================
--- accumulo/site/branches/git/content/git.mdtext (original)
+++ accumulo/site/branches/git/content/git.mdtext Tue Jun 11 12:58:02 2013
@@ -38,7 +38,7 @@ one SCM tool to another is a shift in th
Some background, the common case, as is present with this team, is that
developers coming from a Subversion history are very light on merging being a
-critical consideration on how to perform development. Because mering in
+critical consideration on how to perform development. Because merging in
Subversion is typically of no consequence to the complete view of history, not
to mention that Subversion allows "merging" of specific revisions instead of
sub-trees. As such, a transition to Git typically requires a shift in mindset
in
@@ -80,7 +80,7 @@ I'll try to summarize what has thus far
committers/PMC members on d...@accumulo.apache.org. I will attempt to refer to
concepts in a abstract sense. Concrete example will be later created.
-1. Active development is performed concurrently over no less than two version
of
+1. Active development is performed concurrently over no less than two versions
of
Apache Accumulo at any one point in time. As such, the workflow must provide
guidance on how and where changes should be made which apply to multiple
versions and how to ensure that such changes are contained in all applicable
@@ -206,7 +206,7 @@ releases are named. In other words, the
`git apply --stat ACCUMULO-12345.patch`
-3. Verify that the patach applies cleanly:
+3. Verify that the patch applies cleanly:
`git apply --check ACCUMULO-12345.patch`
@@ -277,7 +277,7 @@ API.
By convention, the branch containing the changes `z'` should be named
`x.y.z'-SNAPSHOT`. The steps to take are as follows:
-1. Prepare the release candidate. _reference release instructions_
+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)
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
