diff options
| author | Chris Rebert <[email protected]> | 2015-01-15 11:23:09 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-01-15 11:25:05 -0800 |
| commit | 16089d92de03ba212882ad5082fc0d5e4da38ad6 (patch) | |
| tree | 0fed2a35b3506040c5515e485c50a22a73461bbc | |
| parent | f1cb639c3439d2cca006ebc28f05bc694c6c4ed2 (diff) | |
| download | bootstrap-16089d92de03ba212882ad5082fc0d5e4da38ad6.tar.xz bootstrap-16089d92de03ba212882ad5082fc0d5e4da38ad6.zip | |
Clarify in CONTRIBUTING docs that CC-BY 3.0 License applies to Bootstrap's docs
[ci skip]
| -rw-r--r-- | CONTRIBUTING.md | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8950dc487..7b14660c6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -197,7 +197,10 @@ included in the project: with a clear title and description against the `master` branch. **IMPORTANT**: By submitting a patch, you agree to allow the project owners to -license your work under the terms of the [MIT License](LICENSE). +license your work under the terms of the [MIT License](LICENSE) (if it +includes code changes) and under the terms of the +[Creative Commons Attribution 3.0 Unported License](docs/LICENSE) +(if it includes documentation changes). ### Pull request bots @@ -240,6 +243,7 @@ Run `grunt test` before committing to ensure your changes follow our coding stan ## License -By contributing your code, you agree to license your contribution under the [MIT license](LICENSE). +By contributing your code, you agree to license your contribution under the [MIT License](LICENSE). +By contributing to the documentation, you agree to license your contribution under the [Creative Commons Attribution 3.0 Unported License](docs/LICENSE). -Prior to v3.1.0, Bootstrap was released under the Apache License v2.0. +Prior to v3.1.0, Bootstrap's code was released under the Apache License v2.0. |