Merge pull request #309 from cloudant/add-dco-instructions

Update CONTRIBUTING.rst with DCO instructions

Author: smithsz

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 Thanks for your hard work, please ensure all items are complete before opening.
 
-- [ ] You have signed the CLA as per the instructions in [CONTRIBUTING.rst](https://github.com/cloudant/python-cloudant/blob/master/CONTRIBUTING.rst#contributor-license-agreement)
+- [ ] Tick to sign-off your agreement to the [Developer Certificate of Origin (DCO) 1.1](https://github.com/cloudant/python-cloudant/blob/master/DCO1.1.txt)
 - [ ] You have added tests for any code changes
 - [ ] You have updated the [CHANGES.rst](https://github.com/cloudant/python-cloudant/blob/master/CHANGES.rst) 
 - [ ] You have completed the PR template below:

CONTRIBUTING.rst

@@ -3,26 +3,21 @@ Developing this library
 
 Python-Cloudant Client Library is written in Python.
 
-=============================
-Contributor License Agreement
-=============================
+===============================
+Developer Certificate of Origin
+===============================
 
-In order for us to accept pull-requests, the contributor must first complete
-a Contributor License Agreement (CLA). This clarifies the intellectual
-property license granted with any contribution. It is for your protection as a
-Contributor as well as the protection of IBM and its customers; it does not
-change your rights to use your own Contributions for any other purpose.
+In order for us to accept pull-requests, the contributor must sign-off a
+[Developer Certificate of Origin (DCO)](DCO1.1.txt). This clarifies the
+intellectual property license granted with any contribution. It is for your
+protection as a Contributor as well as the protection of IBM and its customers;
+it does not change your rights to use your own Contributions for any other
+purpose.
 
-This is a quick process: one option is signing using Preview on a Mac,
-then sending a copy to us via email.
+Please read the agreement and acknowledge it by ticking the appropriate box in
+the PR text, for example:
 
-You can download the CLAs here:
-
-- `Individual <http://cloudant.github.io/cloudant-sync-eap/cla/cla-individual.pdf>`_
-- `Corporate <http://cloudant.github.io/cloudant-sync-eap/cla/cla-corporate.pdf>`_
-
-If you are an IBMer, please contact us directly as the contribution process is
-slightly different.
+- [x] Tick to sign-off your agreement to the Developer Certificate of Origin (DCO) 1.1
 
 ======================
 Development Quickstart

DCO1.1.txt

@@ -0,0 +1,25 @@
+Developer's Certificate of Origin 1.1
+
+       By making a contribution to this project, I certify that:
+
+       (a) The contribution was created in whole or in part by me and I
+           have the right to submit it under the open source license
+           indicated in the file; or
+
+       (b) The contribution is based upon previous work that, to the best
+           of my knowledge, is covered under an appropriate open source
+           license and I have the right under that license to submit that
+           work with modifications, whether created in whole or in part
+           by me, under the same open source license (unless I am
+           permitted to submit under a different license), as indicated
+           in the file; or
+
+       (c) The contribution was provided directly to me by some other
+           person who certified (a), (b) or (c) and I have not modified
+           it.
+
+       (d) I understand and agree that this project and the contribution
+           are public and that a record of the contribution (including all
+           personal information I submit with it, including my sign-off) is
+           maintained indefinitely and may be redistributed consistent with
+           this project or the open source license(s) involved.