Skip to content
Browse files

CONTRIBUTING.md wording tweaks

Signed-off-by: Patrick Cozzi <pjcozzi@gmail.com>
  • Loading branch information...
1 parent 539681c commit 8e655624f84bb972ff669dd6737a0f4e5533aa67 @pjcozzi pjcozzi committed
Showing with 12 additions and 4 deletions.
  1. +12 −4 CONTRIBUTING.md
View
16 CONTRIBUTING.md
@@ -1,18 +1,26 @@
-This document describes how we merge pull requests. See the [Contributor's Guide](https://github.com/AnalyticalGraphicsInc/cesium/wiki/Contributor%27s-Guide) for getting the code and setting of a development environment.
+This document describes how we merge pull requests. See the [Contributor's Guide](https://github.com/AnalyticalGraphicsInc/cesium/wiki/Contributor%27s-Guide) for how to get the code and setup a development environment.
-We love pull requests. We promptly [review](https://github.com/AnalyticalGraphicsInc/cesium/wiki/Code-Review-Tips) them, provide feedback, and merge. Before we can merge, we require either:
+We love pull requests. We promptly [review](https://github.com/AnalyticalGraphicsInc/cesium/wiki/Code-Review-Tips) them, provide feedback, and merge. We use the [Apache 2.0 License](LICENSE.md). Before we can merge a pull request, we require either:
+
+1. A signed [Contributor License Agreement](http://producingoss.com/en/copyright-assignment.html#copyright-assignment-cla) (CLA). This can be emailed to cla@agi.com, and only needs to be completed once. The CLA ensures you retain copyright to your contributions, and we have the right to use them and incorporate them into Cesium. There is a CLA for [individuals](http://www.agi.com/licenses/individual-cla-agi-v1.0.txt) and [corporations](http://www.agi.com/licenses/corporate-cla-agi-v1.0.txt). Please email completed CLAs and related questions to [cla@agi.com](mailto:cla@agi.com).
+
+or
+
+2. Every commit is signed-off on to indicate agreement to the Developer Certificate of Origin originally (DCO). The DCO was originally developed for the Linux kernel, and its text is here: [SubmittingPatches](https://github.com/wking/signed-off-by/blob/ab5bce80ad2259b47202b28905efff0d04032709/Documentation/SubmittingPatches). Like the CLA, you retain copyright to your contributions, and that we have the right to use them and incorporate them into Cesium. A comment with a sign-off has a line like the following at the bottom:
-1. A [Contributor License Agreement](http://producingoss.com/en/copyright-assignment.html#copyright-assignment-cla) (CLA). This can be emailed to cla@agi.com, and only needs to be completed once. The CLA ensures that you retain copyright to your contributions, and that we have the right to use them and incorporate them into Cesium. There is a CLA for [individuals](http://www.agi.com/licenses/individual-cla-agi-v1.0.txt) and [corporations](http://www.agi.com/licenses/corporate-cla-agi-v1.0.txt). Please email completed CLAs and related questions to cla@agi.com.
-2. Every commit is signed-off on to indicate agreement to the Developer Certificate of Origin originally (DCO) developed for the Linux kernel. The DCO text is here: [SubmittingPatches](https://github.com/wking/signed-off-by/blob/ab5bce80ad2259b47202b28905efff0d04032709/Documentation/SubmittingPatches). Like the CLA, you retain copyright to your contributions, and that we have the right to use them and incorporate them into Cesium. A sign-off looks like:
```
Signed-off-by: First-name Last-name <email-address>
```
+
To sign-off on commits, first make sure your name and email are setup with git:
+
```
git config --global --add user.name "First-name Last-name"
git config --global --add user.email "email-address"
```
+
Then include the `-s` option with every commit, e.g.,
+
```
git commit -s -m 'commit message as before`
```

0 comments on commit 8e65562

Please sign in to comment.
Something went wrong with that request. Please try again.