Resolved Bug 382155 - [doc] update user guide for 2.1
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/callhierarchy.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/callhierarchy.html
index 273fc99..a70fe10 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/callhierarchy.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/callhierarchy.html
@@ -33,5 +33,21 @@
       </p>
       <img src="images/screenshots/CallHierarchy.png"
 	  	   alt="Call hierarchy showing Object Teams method bindings">
+	  <p>Additionally, whenever the call hierarchy shows the <b>lifting constructor</b> 
+	    (<a href="otjld/def/s2.html#s2.3.1.b"><img src="../images/ot_paragraph.png"> 2.3.1(b &amp; c)</a>) of a role
+	  	(either as an intermediate node or when requesting the call hierarchy for
+	  	the role class) all those locations are considered as callers that involve
+	  	lifting a base object to the given role, because the lifting operation
+	  	can implicitly trigger creation of a role instance. According to
+	  	<a href="otjld/def/s2.html#s2.3.b"><img src="../images/ot_paragraph.png"> 2.3(b)</a>	  	
+	  	lifting can occur
+	  	<ul>
+	  	<li>in a callout method binding (for the return value)</li>
+	  	<li>in a callin method binding (call target and arguments)</li>
+	  	<li>in a team method with declared lifting</li>
+	  	</ul>
+	  </p>
+      <img src="images/screenshots/CallHierarchyLifting.png"
+	  	   alt="Call hierarchy showing implicit role creation by lifting">
    </body>
 </html>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/callinmarker.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/callinmarker.html
index 781f2be..0ce6e08 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/callinmarker.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/callinmarker.html
@@ -61,5 +61,15 @@
 	Binding markers are enabled/disabled globally on the <span class="ui">Object Teams</span> preference page.<br>
 	Detailed configuration is possible via <span class="ui">Window->Preferences->General->Editors->Text Editors->Annotations</span>
 	</p>
-  </body>
+	<p>
+	Whenever the same base method is affected by multiple callin bindings of the same kind (before, replace or after),
+	the compiler will add a warning marker. This should help to prevent situations where different callin bindings
+	could potentiall interfere with each other.
+	</p>
+	<table>
+	<tr><td class="caption">Multiple-callins marker
+	  <td><img src="images/screenshots/NN21/MultipleCallins.png"
+	  	   alt="Warning marker for multiple callin bindings">
+	</tr>
+	</table>  </body>
 </html>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/debugging.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/debugging.html
index 42b715c..794be4d 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/debugging.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/debugging.html
@@ -36,5 +36,9 @@
     role/base/team instances. For that reason, filtering of these variables
     can be toggled from the variable view's menu: <span class="ui">Java &gt; Show OT/J Internal Variables</span>.
     The same holds for the detail drill down of the team monitor.
+    <h2><a name="hot-code-replace">Hot code replacement</a></h2>
+    During debugging, code changes can automatically be swapped into the running program even for classes
+    requiring bytecode weaving. Naturally, this is bounded by the inability of the JVM to handle
+    signature changes (incl. addition & removal of methods / fields) for hot code replacement.
   </body>
 </html>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/editor.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/editor.html
index a20315f..335eb7a 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/editor.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/editor.html
@@ -28,6 +28,7 @@
 	  <li><b>Templates (source patterns)</b> for Object Teams specific language constructs
 	  using content assist (<b>Ctrl+Space</b>),
 	      e.g. <code class="keyword">within</code> (<i>Expression</i>) <i>Statement</i>
+	  <li><b>Code formatting</b> for OT/J syntax.
 	  </li>
 	  <li>New <a href="callinmarker.html"><b>binding marker</b></a> annotations in the vertical ruler (for base classes/methods bound using playedBy/callin/callout)
 	      allowing navigation to the affecting role.
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/images/screenshots/CallHierarchyLifting.png b/plugins/org.eclipse.objectteams.otdt.doc/guide/images/screenshots/CallHierarchyLifting.png
new file mode 100644
index 0000000..3413365
--- /dev/null
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/images/screenshots/CallHierarchyLifting.png
Binary files differ