From: Artur Signell Date: Tue, 23 Aug 2011 12:17:32 +0000 (+0000) Subject: Clarified Vaadin vs GWT relationship X-Git-Tag: 6.7.0.beta1~23 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e6f8e5df8559867c27f74d79d65011fc7f14b239;p=vaadin-framework.git Clarified Vaadin vs GWT relationship svn changeset:20567/svn branch:6.7 --- diff --git a/WebContent/license.html b/WebContent/license.html index f3e589df55..db05574fae 100644 --- a/WebContent/license.html +++ b/WebContent/license.html @@ -18,7 +18,7 @@
-

Licensing Summary

+

Licensing

Vaadin Framework is intended to be freely @@ -26,29 +26,37 @@ these freedoms, Vaadin Framework is licensed under the Apache License, Version 2.0.

-

The Vaadin software and sample code developed by Vaadin Ltd. is - licensed under the Apache License, v. 2.0.

+

Vaadin Framework is built using Google Web Toolkit, which is + also licensed under the Apache License, v 2.0. Development using + Vaadin Framework or use of applications created with Vaadin Framework + do not require Google Web Toolkit. Vaadin Framework includes a + precompiled "widget set", which uses only Apache 2 licensed code from + Google Web Toolkit.

+ +

+ Extending Vaadin Framework requires use of Google Web Toolkit. For + details on Google Web Toolkit licensing, see http://code.google.com/webtoolkit/terms.html. +

- Vaadin uses, but does not include, Google Web Toolkit. Google Web - Toolkit is also licensed under the Apache License, v 2.0. See http://code.google.com/webtoolkit/terms.html - for more details. + If you have any questions on licensing terms, please contact us + through the vaadin.com + web-site.

+ +

Copyright and trademarks

- Trademarks for "Vaadin" and "}>" are owned by " are registered trademarks of Vaadin Ltd. You may not market - your products using Vaadin -brand name without written permission - from Vaadin Ltd. + your products or services using the Vaadin -brand name, use Vaadin + logos or trademarks without written permission from Vaadin Ltd.

Copyright to Vaadin Framework is owned by Vaadin Ltd.

-

- If you have any questions on licensing terms, please contact us. -

Apache License