Merge branch 'master' into primary-stylename

3 files changed, 39 insertions, 39 deletions

diff --git a/WebContent/VAADIN/vaadinBootstrap.js b/WebContent/VAADIN/vaadinBootstrap.js
index 96c1b0e014..e6d8272ab3 100644
--- a/WebContent/VAADIN/vaadinBootstrap.js
+++ b/WebContent/VAADIN/vaadinBootstrap.js
@@ -107,7 +107,7 @@
 				}
 
 				var initialPath = getConfig("initialPath");
-				if (initialPath === null) {
+				if (initialPath !== undefined) {
 					url += '&initialPath=' + encodeURIComponent(initialPath);
 				}
 				url += '&initialParams=' + encodeURIComponent(JSON.stringify(getConfig("initialParams")));
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 6112e5ba1c..67eaba0cca 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -14,6 +14,11 @@
 		<param-value>false</param-value>
 		<description>Vaadin production mode</description>
 	</context-param>
+
+	<context-param>
+		<param-name>resourceCacheTime</param-name>
+		<param-value>3600</param-value>
+	</context-param>	
 	<servlet>
 		<servlet-name>Embed App 1</servlet-name>
 		<servlet-class>com.vaadin.server.LegacyVaadinServlet</servlet-class>
@@ -43,11 +48,6 @@
 		</init-param>
 	</servlet>
 
-	<context-param>
-		<param-name>resourceCacheTime</param-name>
-		<param-value>3600</param-value>
-	</context-param>
-
 	<servlet>
 		<servlet-name>VaadinApplicationRunner</servlet-name>
 		<servlet-class>com.vaadin.launcher.ApplicationRunnerServlet</servlet-class>
diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index 63449514d9..cefd29f665 100644
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -111,41 +111,16 @@
         server-side components integrated with client-side widgets.
       </p>
 
-      <h2 id="enhancements">Enhancements in Vaadin @version-minor@</h2>
+      <h2 id="enhancements">Enhancements in Vaadin @version@</h2>
 
       <p>
-        @version-minor@ is the first beta release release of the upcoming Version 7 of the
-        Vaadin Framework. It introduces the final major set of new features in Vaadin 7,
-        for the purpose of receiving feedback about the changes.
+        @version@ is a beta release release of the upcoming version 7 of the
+        Vaadin Framework. It introduces some minor changes, minor new features and fixes.
       </p>
 
-      <p>The major new changes in this first beta release are:</p>
-
-      <ul>
-        <li>Applications are now written by extending the <b>UI</b> class
-          <ul>
-            <li>UIs use heartbeat to detect closing</li>
-          </ul>
-        </li>
-        <li>The <b>Application</b> class is removed altogether
-          <ul>
-            <li><b>ApplicationServlet</b> is replaced with <b>VaadinServlet</b></li>
-            <li><b>ApplicationResource</b> is replaced with <b>ConnectorResource</b></li>
-          </ul>
-        </li>
-        <li>Themeing with <a href="http://sass-lang.com/">SASS</a> in addition to CSS
-          <ul>
-            <li>SASS themes need to (and CSS themes can) be compiled to a single CSS stylesheet with the <tt>vaadin-theme-compiler</tt></li>
-          </ul>
-        </li>
-        <li>Add-ons can modify the startup page</i></li>
-        <li>All <tt>addListener()</tt> methods have changed to listener-specific methods, such as <tt>addClickListener()</tt>, <tt>addValueChangeListener()</tt>, etc.</li>
-        <li>Packaging has changed, now in a ZIP package (see <a href="package">Package Contents</a> above)
-        </li>
-      </ul>
-
       <p>
-        The following major changes were first introduced in the alpha releases:
+        The following major changes were introduced in the earlier
+        @version-minor@ releases:
       </p>
 
       <ul>
@@ -185,6 +160,29 @@
         <li><b>Form</b> is deprecated and form hand is replaced with the <b>FieldGroup</b></li>
         <li>Get computed style of a component from the browser</li>
         <li>Support for border, padding, and margin in core layout components</li>
+              <ul>
+        <li>Applications are now written by extending the <b>UI</b> class
+          <ul>
+            <li>UIs use heartbeat to detect closing</li>
+          </ul>
+        </li>
+        <li>The <b>Application</b> class is removed altogether
+          <ul>
+            <li><b>ApplicationServlet</b> is replaced with <b>VaadinServlet</b></li>
+            <li><b>ApplicationResource</b> is replaced with <b>ConnectorResource</b></li>
+          </ul>
+        </li>
+        <li>Themeing with <a href="http://sass-lang.com/">SASS</a> in addition to CSS
+          <ul>
+            <li>SASS themes need to (and CSS themes can) be compiled to a single CSS stylesheet with the <tt>vaadin-theme-compiler</tt></li>
+          </ul>
+        </li>
+        <li>Add-ons can modify the startup page</i></li>
+        <li>All <tt>addListener()</tt> methods have changed to listener-specific methods, such as <tt>addClickListener()</tt>, <tt>addValueChangeListener()</tt>, etc.</li>
+        <li>Packaging has changed, now in a ZIP package (see <a href="package">Package Contents</a> above)
+        </li>
+      </ul>
+        
       </ul>
         
       <p>
@@ -198,8 +196,10 @@
         href="http://vaadin.com/download/prerelease/7.0/7.0.0/7.0.0.alpha1/release-notes.html">alpha1</a>,
         <a
         href="http://vaadin.com/download/prerelease/7.0/7.0.0/7.0.0.alpha2/release-notes.html">alpha2</a>,
+        <a
+        href="http://vaadin.com/download/prerelease/7.0/7.0.0/7.0.0.alpha3/release-notes.html">alpha3</a>,
         and <a
-        href="http://vaadin.com/download/prerelease/7.0/7.0.0/7.0.0.alpha3/release-notes.html">alpha3</a>
+        href="http://vaadin.com/download/prerelease/7.0/7.0.0/7.0.0.beta1/release-notes.html">beta1</a>
         for the lists of where the major enhancements were introduced.
       </p>
 
@@ -207,7 +207,7 @@
 
       <p>
         For a complete list of changes in this release, please see the <a
-        href="http://dev.vaadin.com/query?status=closed&group=resolution&milestone=Vaadin+7.0.0.beta1">list
+        href="http://dev.vaadin.com/query?status=closed&group=resolution&milestone=Vaadin+@version@">list
         of closed tickets</a>.
       </p>
 
@@ -270,7 +270,7 @@
 
       <h3>Upgrading the Eclipse Plugin</h3>
 
-      <p>
+      <p>	
         This release requires that you use the <i>experimental</i> Vaadin Plugin for
         Eclipse. Its update site is
         <tt>http://vaadin.com/eclipse/experimental</tt>. Please see the <a