summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonatan Kronqvist <jonatan@vaadin.com>2016-01-19 14:22:36 +0200
committerTeemu Suo-Anttila <teemusa@vaadin.com>2016-02-15 17:11:17 +0200
commit04a99893d18a3d4ee64beeaa6cab74b4678d4bad (patch)
treea3c7d8af79d835f651023a2b71a5a6aabc237049
parentb49746fa3eb57e57de93a0e8ff369d1fddea0dca (diff)
downloadvaadin-framework-04a99893d18a3d4ee64beeaa6cab74b4678d4bad.tar.gz
vaadin-framework-04a99893d18a3d4ee64beeaa6cab74b4678d4bad.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: I547371cd14e8cc89add3e02badcb5cae265690ec
-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/