Clarified Vaadin vs GWT relationship

svn changeset:20567/svn branch:6.7

diff --git a/WebContent/license.html b/WebContent/license.html
index f3e589df5528092a32215b6db4acd653ee5e6e4e..db05574fae868afb61b656c8c2fc4843abbd24e4 100644 (file)
--- a/WebContent/license.html
+++ b/WebContent/license.html
@@ -18,7 +18,7 @@
 
        <div id="content">
 
-               <h1>Licensing Summary</h1>
+               <h1>Licensing</h1>
 
                <p>
                        <strong><i>Vaadin Framework</i> is intended to be freely
@@ -26,29 +26,37 @@
                        these freedoms, <i>Vaadin Framework</i> is licensed under the Apache
                        License, Version 2.0.
                </p>
-               <p>The Vaadin software and sample code developed by Vaadin Ltd. is
-                       licensed under the Apache License, v. 2.0.</p>
+               <p>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.</p>
+
+               <p>
+                       Extending Vaadin Framework requires use of Google Web Toolkit. For
+                       details on Google Web Toolkit licensing, see <a
+                               href="http://code.google.com/webtoolkit/terms.html">http://code.google.com/webtoolkit/terms.html</a>.
+               </p>
                <p>
-                       Vaadin uses, but does not include, Google Web Toolkit. Google Web
-                       Toolkit is also licensed under the Apache License, v 2.0. See <a
-                               href="http://code.google.com/webtoolkit/terms.html">http://code.google.com/webtoolkit/terms.html</a>
-                       for more details.
+                       If you have any questions on licensing terms, please contact us
+                       through <a href="http://vaadin.com/contact">the vaadin.com
+                               web-site</a>.
                </p>
+
+               <h1>Copyright and trademarks</h1>
                <p>
-                       Trademarks for "Vaadin" and "}>" are owned by <a
+                       "Vaadin" and "}>" are registered trademarks of <a
                                href="http://vaadin.com/company">Vaadin Ltd</a>. You may not market
-                       your products using Vaadin -brand name without written permission
-                       from <a href="http://vaadin.com/company">Vaadin Ltd</a>.
+                       your products or services using the Vaadin -brand name, use Vaadin
+                       logos or trademarks without written permission from <a
+                               href="http://vaadin.com/company">Vaadin Ltd</a>.
                </p>
                <p>
                        Copyright to <i>Vaadin Framework</i> is owned by <a
                                href="http://vaadin.com/company">Vaadin Ltd</a>.
                </p>
 
-               <p>
-                       If you have any questions on licensing terms, please <a
-                               href="http://vaadin.com/contact">contact us</a>.
-               </p>
 
                <h1>
                        <a name="apachelicense">Apache License</a>