summaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorJonatan Kronqvist <jonatan@vaadin.com>2016-01-19 14:22:36 +0200
committerArtur Signell <artur@vaadin.com>2016-02-02 19:36:42 +0000
commit7fc5844508f555c0e12df6fd6407907642a0d46c (patch)
tree9c52dbd9b16f3106589588475591c90f6df95ef3 /LICENSE
parentabe2ac900b205ba4edd9db51f2fcc4bc3f1077bf (diff)
downloadvaadin-framework-7fc5844508f555c0e12df6fd6407907642a0d46c.tar.gz
vaadin-framework-7fc5844508f555c0e12df6fd6407907642a0d46c.zip
Specify the license of the documentation in the LICENSE file.
Added a mention that the license of the documentation is CC-BY-ND and not Apache 2.0, as the other contents of the repository. Change-Id: If74ac2abbff2d6eea10d0f1f17ef1f1cc60e98d9
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE11
1 files changed, 10 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 5c304d1a4a..4023fe8f84 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,13 @@
-Apache License
+All parts, except the contents of the documentation directory, are licenced
+under Apache License v2.0. See the license text below.
+
+The documentation is licensed under Creative Commons CC-BY-ND 2.0
+(http://creativecommons.org/licenses/by-nd/2.0/legalcode).
+
+
+-----------------------------------------------------------------------------
+
+ Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/