From: Jonatan Kronqvist <jonatan@vaadin.com>
Date: Tue, 19 Jan 2016 12:22:36 +0000 (+0200)
Subject: Specify the license of the documentation in the LICENSE file.
X-Git-Tag: 7.6.3~14
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=04a99893d18a3d4ee64beeaa6cab74b4678d4bad;p=vaadin-framework.git

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
---

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/