fix #410 - add explanation of branches

(cherry picked from commit 06dfc00)

Author: sammefford

CONTRIBUTING.md

@@ -62,6 +62,21 @@ at least one of the project maintainers before you start coding.
 Nothing is more frustrating than seeing your hard work go to waste because
 your vision does not align with that of a project maintainer.
 
+#### Choose the appropriate branch
+
+While the \*master branches reflect the latest released code for the
+corresponding server release, the \*develop branches reflect the latest changes
+that will be released next and are therefore the right place to commit changes.
+To be clear, the following branches have the assigned meaning:
+* develop - the place to make changes for the next release
+* master  - the stable code from the last release
+* 3.0-develop - the place to make changes for the next 3.x release (corresponds with the next server 8.x release)
+* 3.0-master  - the stable code from the last 3.x release (corresponds with the latest server 8.x release)
+* 2.0-develop - the place to make changes for the next 2.x release (corresponds with the next server 7.x release)
+* 2.0-master  - the stable code from the last 2.x release (corresponds with the latest server 7.x release)
+* 1.0-develop - the place to make changes for the next 1.x release (corresponds with the next server 6.x release)
+* 1.0-master  - the stable code from the last 1.x release (corresponds with the latest server 6.x release)
+
 #### Create a branch for your changes
 
 Okay, so you have decided to fix something. Create a feature branch
@@ -161,7 +176,7 @@ local shell as follows:
 
     $ git branch -D my-feature-branch
 
-* Update your dev with the latest upstream version:
+* Update your *develop* with the latest upstream version:
 
-    $ git pull --ff upstream dev
-[issue tracker]: https://github.com/marklogic/java-client-api/issues
+    $ git pull --ff upstream develop
+[issue tracker]: https://github.com/marklogic/java-client-api/issues

README.md

@@ -51,13 +51,13 @@ To use the API in your maven project, include the following in your pom.xml:
     <dependency>
         <groupId>com.marklogic</groupId>
         <artifactId>java-client-api</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.5</version>
     </dependency>
 
 For gradle projects, include the following:
 
     dependencies {
-        compile group: 'com.marklogic', name: 'java-client-api', version: '3.0.1'
+        compile group: 'com.marklogic', name: 'java-client-api', version: '3.0.5'
     }
 
 Read [The Java API in Five Minutes](http://developer.marklogic.com/try/java/index)
@@ -82,22 +82,23 @@ https://developer.marklogic.com/free-developer
 
 To obtain verified downloads signed with MarkLogic's PGP key, use maven tools or directly download
 the .jar and .asc files from
-[maven central](http://repo1.maven.org/maven2/com/marklogic/java-client-api/3.0.1/).  MarkLogic's
+[maven central](http://repo1.maven.org/maven2/com/marklogic/java-client-api/3.0.5/).  MarkLogic's
 pgp key ID is 48D4B86E and it is available from pgp.mit.edu by installing gnupg and running the command:
 
     $ gpg --keyserver pgp.mit.edu --recv-key 48D4B86E
 
 Files can be verified with the command:
 
-    $ gpg java-client-api-3.0.1.jar.asc
+    $ gpg java-client-api-3.0.5.jar.asc
 
 
 ### Building and Contributing
 
 You can build the API in the same way as any Maven project on git:
 
 1. Clone the java-client-api repository on your machine.
-2. Execute a Maven build in the directory containing the pom.xml file.  
+2. Choose the appropriate branch (usually develop)
+3. Execute a Maven build in the directory containing the pom.xml file.
 
 You might want to skip the tests until you have configured a test database and REST server: