]> source.dussan.org Git - vaadin-framework.git/commitdiff
Specify the license of the documentation in the LICENSE file.
authorJonatan Kronqvist <jonatan@vaadin.com>
Tue, 19 Jan 2016 12:22:36 +0000 (14:22 +0200)
committerTeemu Suo-Anttila <teemusa@vaadin.com>
Mon, 15 Feb 2016 15:11:17 +0000 (17:11 +0200)
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

LICENSE

diff --git a/LICENSE b/LICENSE
index 5c304d1a4a7b439f767990bf1360d3283e45d0ee..4023fe8f84dabfb5c8668f66ba3ad7859f84d1d2 100644 (file)
--- 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/