aboutsummaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorJakob Borg <jakob@nym.se>2016-06-01 13:47:25 +0000
committerJakob Borg <jakob@nym.se>2016-06-01 13:47:25 +0000
commit3b8ae33fe38042570d9756d93091f0e59e4a8aa4 (patch)
tree0633665446fabdecf600c7d408f1438fcbd44a6a /CONTRIBUTING.md
parent6f63909c653608218e78bc96e23b13c66a2ac694 (diff)
downloadsyncthing-3b8ae33fe38042570d9756d93091f0e59e4a8aa4.tar.gz
syncthing-3b8ae33fe38042570d9756d93091f0e59e4a8aa4.zip
contributing: Clarify license situation for parts of the project
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3234
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md21
1 files changed, 16 insertions, 5 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0ab98ba9a..30b78efe5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -44,9 +44,20 @@ repository](https://github.com/syncthing/docs).
## Licensing
-All contributions are made under the same MPLv2 license as the rest of
-the project, except documentation, user interface text and translation
-strings which are licensed under the Creative Commons Attribution 4.0
-International License. You retain the copyright to code you have
-written.
+All contributions are made available under the same license as the already
+existing material being contributed to. For most of the project and unless
+otherwise stated this means MPLv2, but there are exceptions:
+
+- Certain commands (under cmd/...) may have a separate license, indicated by
+ the presence of a LICENSE file in the corresponding directory.
+
+- The documentation (man/...) is licensed under the Creative Commons
+ Attribution 4.0 International License.
+
+- Projects under vendor/... are copyright by and licensed from their
+ respective original authors. Contributions should be made to the original
+ project, not here.
+
+Regardless of the license in effect, you retain the copyright to your
+contribution.