diff --git a/org.eclipse.scout.sdk.s2e.doc/contexts_scout.xml b/org.eclipse.scout.sdk.s2e.doc/contexts_scout.xml
index 96f4105..d2d73cd 100644
--- a/org.eclipse.scout.sdk.s2e.doc/contexts_scout.xml
+++ b/org.eclipse.scout.sdk.s2e.doc/contexts_scout.xml
@@ -34,4 +34,4 @@
         <description>This wizard creates an additional translation file in order to localize the user interface.</description>
         <topic label="Add a Language Wizard" href="html/sdk_wizard_language.html"/>
     </context>
-</contexts>
+</contexts>
\ No newline at end of file
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/images/sdk_new_page.png b/org.eclipse.scout.sdk.s2e.doc/html/images/sdk_new_page.png
index ad3e804..1e0db79 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/images/sdk_new_page.png
+++ b/org.eclipse.scout.sdk.s2e.doc/html/images/sdk_new_page.png
Binary files differ
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/scout_user_guide.html b/org.eclipse.scout.sdk.s2e.doc/html/scout_user_guide.html
index 2f73a36..f9eb9d2 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/scout_user_guide.html
+++ b/org.eclipse.scout.sdk.s2e.doc/html/scout_user_guide.html
@@ -60,7 +60,7 @@
   <div id="footer"> 
    <div id="footer-text">
      Version 6.0
-    <br /> Last updated 2016-07-13 02:33:13 CEST 
+    <br /> Last updated 2017-01-23 11:56:29 CET 
    </div> 
   </div>  
  </body>
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/sdk.html b/org.eclipse.scout.sdk.s2e.doc/html/sdk.html
index 68631d4..4364009 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/sdk.html
+++ b/org.eclipse.scout.sdk.s2e.doc/html/sdk.html
@@ -83,7 +83,7 @@
   <div id="footer"> 
    <div id="footer-text">
      Version 6.0
-    <br /> Last updated 2016-07-13 02:33:13 CEST 
+    <br /> Last updated 2017-01-23 11:56:29 CET 
    </div> 
   </div>  
  </body>
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/sdk_editor_java.html b/org.eclipse.scout.sdk.s2e.doc/html/sdk_editor_java.html
index da814ab..74009ea 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/sdk_editor_java.html
+++ b/org.eclipse.scout.sdk.s2e.doc/html/sdk_editor_java.html
@@ -36,7 +36,7 @@
      <p>To create new Scout components that are represented by inner classes in the Scout framework, the Scout tooling extends the Java content assist of the Eclipse Java editor. The offered proposals are context specific. Depending on the current cursor position in the Java editor, possible Scout components are added to the proposal list.</p> 
     </div> 
     <div class="paragraph"> 
-     <p>In a class representing a group box in a form, the Scout content assist adds proposals for various form fields are shown and in a table class the content assist adds proposals to add table columns or context menus. are added that trigger the creation of inner classes for form fields, table columns or codes. The Eclipse content assist can be started by typing <span class="keyseq"><kbd>Ctrl</kbd>+<kbd>Space</kbd></span>.</p> 
+     <p>In a class representing a group box in a form, the Scout content assist adds proposals for various form fields are shown and in a table class the content assist adds proposals to add table columns or context menus. Those proposals trigger the creation of inner classes for form fields, table columns or codes. The Eclipse content assist can be started by typing <span class="keyseq"><kbd>Ctrl</kbd>+<kbd>Space</kbd></span>.</p> 
     </div> 
     <div class="sect3"> 
      <h4 id="sec-sdk_new_form_field"><a class="anchor" href="#sec-sdk_new_form_field"></a>Create new Form Fields</h4> 
@@ -55,7 +55,7 @@
       </div> 
      </div> 
      <div class="paragraph"> 
-      <p>When a template is selected, it is possible to customized it by navigating between the different Edit-Groups with the <kbd>Tab</kbd> Key (this works exactly like other templates in the Eclipse Editor). With this mechanism you can quickly define the class name, the parent class and other properties. To exit the Edit-Mode just press <kbd>Enter</kbd>.</p> 
+      <p>When a template is selected, it is possible to customize it by navigating between the different Edit-Groups with the <kbd>Tab</kbd> Key (this works exactly like other templates in the Eclipse Editor). With this mechanism you can quickly define the class name, the parent class and other properties. To exit the Edit-Mode just press <kbd>Enter</kbd>.</p> 
      </div> 
     </div> 
     <div class="sect3"> 
@@ -136,7 +136,7 @@
   <div id="footer"> 
    <div id="footer-text">
      Version 6.0
-    <br /> Last updated 2016-07-13 02:33:13 CEST 
+    <br /> Last updated 2017-01-23 11:56:29 CET 
    </div> 
   </div>  
  </body>
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/sdk_editor_nls.html b/org.eclipse.scout.sdk.s2e.doc/html/sdk_editor_nls.html
index 9df3ce7..c29e46b 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/sdk_editor_nls.html
+++ b/org.eclipse.scout.sdk.s2e.doc/html/sdk_editor_nls.html
@@ -69,7 +69,7 @@
        <tr> 
         <td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_find_obj.gif" alt="icon find obj" /></span></p></td> 
         <td class="tableblock halign-left valign-top"><p class="tableblock">Show NLS entry usage</p></td> 
-        <td class="tableblock halign-left valign-top"><p class="tableblock">Search in the Java code where the NLS Key is used.</p></td> 
+        <td class="tableblock halign-left valign-top"><p class="tableblock">For each row, search in the Java code where the NLS Key is used. Results are displayed in the first column.</p></td> 
        </tr> 
        <tr> 
         <td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_text_add.png" alt="icon text add" /></span></p></td> 
@@ -100,7 +100,7 @@
       <p>Hide inherited rows checkbox</p> 
      </div> 
      <div class="paragraph"> 
-      <p>On the top of each columns, the text fields allow you to filter the entries in the table. With the <b class="button">Reset</b> button on the right you will empty those filters.</p> 
+      <p>On the top of each column, the text fields allow you to filter the entries in the table. With the <b class="button">Reset</b> button on the right you will empty those filters.</p> 
      </div> 
      <div class="paragraph"> 
       <p>The entries in the table can be directly edited by pressing F2 or double-clicking into a text cell.</p> 
@@ -118,7 +118,7 @@
        <tr> 
         <td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_text.png" alt="icon text" /></span></p></td> 
         <td class="tableblock halign-left valign-top"><p class="tableblock">Modify Entry</p></td> 
-        <td class="tableblock halign-left valign-top"><p class="tableblock">Opens the <a href="sdk_wizard_nls-entry.html">NLS Entry Wizard</a></p></td> 
+        <td class="tableblock halign-left valign-top"><p class="tableblock">Opens the <a href="sdk_wizard_nls-entry.html">New Text Entry Wizard</a></p></td> 
        </tr> 
        <tr> 
         <td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="images/icon_find_obj.gif" alt="icon find obj" /></span></p></td> 
@@ -134,7 +134,7 @@
      </table> 
     </div> 
     <div class="sect3"> 
-     <h4 id="default-mapping-to-property-files"><a class="anchor" href="#default-mapping-to-property-files"></a>Default Mapping to Property Files</h4> 
+     <h4 id="default-mapping-to-properties-files"><a class="anchor" href="#default-mapping-to-properties-files"></a>Default Mapping to Properties Files</h4> 
      <div class="paragraph"> 
       <p>The mapping between the properties files is registered in the &quot;Text Provider Service&quot; class. Per default the files follow this pattern: <code>&lt;your application&gt;.shared/src/main/resources/&lt;identifier of the project&gt;/texts/Texts&lt;language&gt;.properties</code></p> 
      </div> 
@@ -179,7 +179,7 @@
   <div id="footer"> 
    <div id="footer-text">
      Version 6.0
-    <br /> Last updated 2016-07-13 02:33:13 CEST 
+    <br /> Last updated 2017-01-23 11:56:29 CET 
    </div> 
   </div>  
  </body>
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard.html b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard.html
index 498aa53..5ad3d05 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard.html
+++ b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard.html
@@ -97,7 +97,7 @@
   <div id="footer"> 
    <div id="footer-text">
      Version 6.0
-    <br /> Last updated 2016-07-13 02:33:13 CEST 
+    <br /> Last updated 2017-01-23 11:56:29 CET 
    </div> 
   </div>  
  </body>
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_code-type.html b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_code-type.html
index 2a77349..91ea694 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_code-type.html
+++ b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_code-type.html
@@ -132,7 +132,7 @@
   <div id="footer"> 
    <div id="footer-text">
      Version 6.0
-    <br /> Last updated 2016-07-13 02:33:13 CEST 
+    <br /> Last updated 2017-01-23 11:56:29 CET 
    </div> 
   </div>  
  </body>
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_form.html b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_form.html
index 5f71d6b..10bf01a 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_form.html
+++ b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_form.html
@@ -170,7 +170,7 @@
   <div id="footer"> 
    <div id="footer-text">
      Version 6.0
-    <br /> Last updated 2016-07-13 02:33:13 CEST 
+    <br /> Last updated 2017-01-23 11:56:29 CET 
    </div> 
   </div>  
  </body>
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_language.html b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_language.html
index f91c9b6..5cc6032 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_language.html
+++ b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_language.html
@@ -86,7 +86,7 @@
   <div id="footer"> 
    <div id="footer-text">
      Version 6.0
-    <br /> Last updated 2016-07-13 02:33:13 CEST 
+    <br /> Last updated 2017-01-23 11:56:29 CET 
    </div> 
   </div>  
  </body>
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_lookupcall.html b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_lookupcall.html
index 8bb7a31..e6ac3cf 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_lookupcall.html
+++ b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_lookupcall.html
@@ -150,7 +150,7 @@
   <div id="footer"> 
    <div id="footer-text">
      Version 6.0
-    <br /> Last updated 2016-07-13 02:33:13 CEST 
+    <br /> Last updated 2017-01-23 11:56:29 CET 
    </div> 
   </div>  
  </body>
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_nls-entry.html b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_nls-entry.html
index 21c4d08..a2f27e9 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_nls-entry.html
+++ b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_nls-entry.html
@@ -42,11 +42,11 @@
      <div class="content"> 
       <img src="images/sdk_wizard_nls_entry.png" alt="sdk wizard nls entry" /> 
      </div> 
+     <div class="title">
+      Figure 1. Adding a new text with the New Entry wizard.
+     </div> 
     </div> 
     <div class="dlist"> 
-     <div class="title">
-      Adding a new text with the New Entry wizard.
-     </div> 
      <dl> 
       <dt class="hdlist1">
        Key Name
@@ -98,7 +98,7 @@
   <div id="footer"> 
    <div id="footer-text">
      Version 6.0
-    <br /> Last updated 2016-07-13 02:33:13 CEST 
+    <br /> Last updated 2017-01-23 11:56:29 CET 
    </div> 
   </div>  
  </body>
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_page.html b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_page.html
index 3ec27e4..cf94436 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_page.html
+++ b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_page.html
@@ -69,7 +69,7 @@
         Name
        </dt> 
        <dd> 
-        <p>The name of the page class. According to Scout conventions the class name ends with the suffix <code>Page</code>.</p> 
+        <p>The name of the page class. According to Scout conventions the class name ends with the suffix <code>TablePage</code> (for subclasses of <code>AbstractPageWithTable</code>) or <code>NodePage</code> (for <code>AbstractPageWithNodes</code>).</p> 
        </dd> 
        <dt class="hdlist1">
         Super Class
@@ -102,14 +102,14 @@
        <li> <p>In Maven module <strong>helloworld.client</strong></p> 
         <div class="ulist"> 
          <ul> 
-          <li> <p>The <code>MyPage</code> page class in folder <code>src/main/java</code> and package <code>org.eclipse.scout.apps.helloworld.client.helloworld</code></p> </li> 
+          <li> <p>The <code>MyTablePage</code> page class in folder <code>src/main/java</code> and package <code>org.eclipse.scout.apps.helloworld.client.helloworld</code></p> </li> 
          </ul> 
         </div> </li> 
        <li> <p>In Maven module <strong>helloworld.shared</strong></p> 
         <div class="ulist"> 
          <ul> 
           <li> <p>The <code>IMyService</code> service interface in folder <code>src/main/java</code> and package <code>org.eclipse.scout.apps.helloworld.shared.helloworld</code></p> </li> 
-          <li> <p><code>MyPageData</code> page data class in folder <code>src/generated/java</code> and package <code>org.eclipse.scout.apps.helloworld.shared.helloworld</code></p> </li> 
+          <li> <p><code>MyTablePageData</code> page data class in folder <code>src/generated/java</code> and package <code>org.eclipse.scout.apps.helloworld.shared.helloworld</code></p> </li> 
          </ul> 
         </div> </li> 
        <li> <p>In Maven module <strong>helloworld.server</strong></p> 
@@ -145,7 +145,7 @@
   <div id="footer"> 
    <div id="footer-text">
      Version 6.0
-    <br /> Last updated 2016-07-13 02:33:13 CEST 
+    <br /> Last updated 2017-01-23 11:56:29 CET 
    </div> 
   </div>  
  </body>
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_permission.html b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_permission.html
index 8292e4a..2f2117a 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_permission.html
+++ b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_permission.html
@@ -120,7 +120,7 @@
   <div id="footer"> 
    <div id="footer-text">
      Version 6.0
-    <br /> Last updated 2016-07-13 02:33:13 CEST 
+    <br /> Last updated 2017-01-23 11:56:29 CET 
    </div> 
   </div>  
  </body>
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_project.html b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_project.html
index f20e6bf..4745bdc 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_project.html
+++ b/org.eclipse.scout.sdk.s2e.doc/html/sdk_wizard_project.html
@@ -104,7 +104,7 @@
         <div class="ulist"> 
          <ul> 
           <li> <p>Contains components needed in both the client and the server application.</p> </li> 
-          <li> <p>For examples see the <code>IHelloWorldFormService</code> interface in <code>src/main/java</code> and class <code>HelloWorldFormData</code> in <code>src/generated/java</code>.</p> </li> 
+          <li> <p>For examples see the <code>IHelloWorldService</code> interface in <code>src/main/java</code> and class <code>HelloWorldFormData</code> in <code>src/generated/java</code>.</p> </li> 
           <li> <p>The <code>Texts.nls</code> file that can be opened in the <a href="sdk_editor_nls.html">Scout NLS Editor</a>.</p> </li> 
          </ul> 
         </div> </li> 
@@ -112,7 +112,7 @@
         <div class="ulist"> 
          <ul> 
           <li> <p>Contains the model components of the server application in <code>src/main/java</code> and model tests in <code>src/test/java</code>.</p> </li> 
-          <li> <p>The class <code>HelloWorldFormService</code> in package <code>org.eclipse.scout.apps.helloworld.server.helloworld</code> is an example of such a model class.</p> </li> 
+          <li> <p>The class <code>HelloWorldService</code> in package <code>org.eclipse.scout.apps.helloworld.server.helloworld</code> is an example of such a model class.</p> </li> 
          </ul> 
         </div> </li> 
        <li> <p>Maven module <strong>helloworld.server.app.dev</strong></p> 
@@ -121,7 +121,7 @@
           <li> <p>Contains all components to run the Scout server application from within the Eclipse IDE.</p> </li> 
           <li> <p>The file <code>config.properties</code> in folder <code>src/main/resources</code> contains the development configuration for the Scout server application.</p> </li> 
           <li> <p>The file <code>pom.xml</code> bundles the Jetty web server with the server application.</p> </li> 
-          <li> <p>The file <code>server-dev.launch</code> contains the launch configuration for the Eclipse IDE.</p> </li> 
+          <li> <p>The file <code>[webapp] dev server.launch</code> contains the launch configuration for the Eclipse IDE.</p> </li> 
          </ul> 
         </div> </li> 
        <li> <p>Maven module <strong>helloworld.server.app.war</strong></p> 
@@ -146,7 +146,7 @@
           <li> <p>The file <code>config.properties</code> in folder <code>src/main/resources</code> contains the development configuration for the application.</p> </li> 
           <li> <p>The file <code>web.xml</code> in folder <code>src/main/webapp</code> contains the web configuration for the application.</p> </li> 
           <li> <p>The file <code>pom.xml</code> bundles the Jetty web server with the application.</p> </li> 
-          <li> <p>The file <code>ui-html-dev.launch</code> contains the launch configuration for the Eclipse IDE.</p> </li> 
+          <li> <p>The file <code>[webapp] dev ui.launch</code> contains the launch configuration for the Eclipse IDE.</p> </li> 
          </ul> 
         </div> </li> 
        <li> <p>Maven module <strong>helloworld.ui.html.app.war</strong></p> 
@@ -184,7 +184,8 @@
   </table>
   <div id="footer"> 
    <div id="footer-text">
-     Last updated 2016-07-13 02:33:13 CEST 
+     Version 6.0
+    <br /> Last updated 2017-01-23 11:56:29 CET 
    </div> 
   </div>  
  </body>
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/tutorial.html b/org.eclipse.scout.sdk.s2e.doc/html/tutorial.html
index 293e8a0..31798eb 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/tutorial.html
+++ b/org.eclipse.scout.sdk.s2e.doc/html/tutorial.html
@@ -61,7 +61,7 @@
   <div id="footer"> 
    <div id="footer-text">
      Version 6.0
-    <br /> Last updated 2016-07-13 02:33:13 CEST 
+    <br /> Last updated 2017-01-23 11:56:29 CET 
    </div> 
   </div>  
  </body>
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/tutorial_existingdemo.html b/org.eclipse.scout.sdk.s2e.doc/html/tutorial_existingdemo.html
index a5b04fd..60c7bd4 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/tutorial_existingdemo.html
+++ b/org.eclipse.scout.sdk.s2e.doc/html/tutorial_existingdemo.html
@@ -297,7 +297,7 @@
   <div id="footer"> 
    <div id="footer-text">
      Version 6.0
-    <br /> Last updated 2016-07-13 02:33:13 CEST 
+    <br /> Last updated 2017-01-23 11:56:29 CET 
    </div> 
   </div>  
  </body>
diff --git a/org.eclipse.scout.sdk.s2e.doc/html/tutorial_helloworld.html b/org.eclipse.scout.sdk.s2e.doc/html/tutorial_helloworld.html
index a1bd775..320f45a 100644
--- a/org.eclipse.scout.sdk.s2e.doc/html/tutorial_helloworld.html
+++ b/org.eclipse.scout.sdk.s2e.doc/html/tutorial_helloworld.html
@@ -153,7 +153,7 @@
   <div id="footer"> 
    <div id="footer-text">
      Version 6.0
-    <br /> Last updated 2016-07-13 02:33:13 CEST 
+    <br /> Last updated 2017-01-23 11:56:29 CET 
    </div> 
   </div>  
  </body>
diff --git a/org.eclipse.scout.sdk.s2e.doc/toc.xml b/org.eclipse.scout.sdk.s2e.doc/toc.xml
index a425b17..63c4e13 100644
--- a/org.eclipse.scout.sdk.s2e.doc/toc.xml
+++ b/org.eclipse.scout.sdk.s2e.doc/toc.xml
@@ -30,7 +30,7 @@
 			<topic href="html/sdk_editor_nls.html#accessing-the-nls-editor" label="Accessing the NLS Editor"></topic>
 			<topic href="html/sdk_editor_nls.html#the-nls-editor" label="The NLS Editor"></topic>
 			<topic href="html/sdk_editor_nls.html#action-buttons" label="Action Buttons"></topic>
-			<topic href="html/sdk_editor_nls.html#default-mapping-to-property-files" label="Default Mapping to Property Files"></topic>
+			<topic href="html/sdk_editor_nls.html#default-mapping-to-properties-files" label="Default Mapping to Properties Files"></topic>
 		</topic>
 		<topic href="html/sdk_wizard.html" label="Scout Wizards">
 			<topic href="html/sdk_wizard.html#new-project-wizard" label="New Project Wizard"></topic>