Bug 494834: [help] update user guide for 2.5
+ HTML clean-up
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/callhierarchy.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/callhierarchy.html
index 02b97d5..4bdc6c0 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/callhierarchy.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/callhierarchy.html
@@ -13,7 +13,7 @@
     <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   </head>
   <body>
-	<h1 align="center">Call hierarchy extended for OT/J<a name="callhierarchy"></a></h1>
+	<h1 align="center" id="callhierarchy">Call hierarchy extended for OT/J</h1>
       <p>
          The purpose of the <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-call-hierarchy.htm">Java call hierarchy view</a>
          is to statically display all potential
@@ -42,12 +42,12 @@
 	  	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>
+	  </p>
+	  <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>
+	  </ul>
       <img src="images/screenshots/CallHierarchyLifting.png"
 	  	   alt="Call hierarchy showing implicit role creation by lifting">
    </body>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/compilation.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/compilation.html
index 4b3a252..eba0bbf 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/compilation.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/compilation.html
@@ -9,7 +9,7 @@
   <body>
     <h1>Compiling Object Teams programs</h1>
     <p>
-    Object Teams programs are compiled <u>automatically</u> and <u>incrementally</u> using
+    Object Teams programs are compiled <span class="underline">automatically</span> and <span class="underline">incrementally</span> using
     an <b><a href="builder.html">extended Java builder</a></b>.
     </p>
     <p>The language accepted by the compiler is defined in the <a href="otjld/def/index.html">OTJLD</a>
@@ -26,6 +26,7 @@
 	erroneous method).
 	<p>
 	<h3>Configuring Diagnostics</h3>
+	<p>
     For a number of problems you can specify if you want the OT/J compiler
     to report them as warnings, errors or to ignore them. 
     To change the default settings, use the <span class="ui">Window > Preferences > Java >
@@ -43,14 +44,12 @@
     language definition the internal HTML-browser is used to allow easy navigation within the
     language definition.</p>
     <img style="margin-left:10px;" title="Language Definition Integrated in the OTDT" src="images/screenshots/langdef.png"/>
-    </p>
     <p>
     Alternatively, the same action <span class="ui">Go to Language Definition</span> can be invoked 
     without using the <b>Problems</b> view:
-    <p><u>Using the context menu on the problem marker in the editor's left gutter:</u></p>
+    <p><span class="underline">Using the context menu on the problem marker in the editor's left gutter:</span></p>
     <img style="margin-left:10px;" title="Language Definition from the left gutter" src="images/screenshots/GoToLangDefGutter.png"/>
-    <p><u>Using a button in the problem hover in the editor:</u></p>
+    <p><span class="underline">Using a button in the problem hover in the editor:</span></p>
     <img style="margin-left:10px;" title="Language Definition from the left gutter" src="images/screenshots/GoToLangDefHover.png"/>
-    </p>
   </body>
 </html>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/completion.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/completion.html
index 6578a50..d313045 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/completion.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/completion.html
@@ -3,6 +3,7 @@
     <meta name="copyright" content="Copyright Technical University Berlin and others 2004, 2010. This page is made available under the Eclipse Public License v1.0. For full details see http://www.eclipse.org/legal/epl-v10.html" />
 	<link rel=stylesheet type="text/css" href="../css/book.css">
 	<link rel=stylesheet type="text/css" href="otjld/css/ot.css">
+	<link rel=stylesheet type="text/css" href="otguide.css"/>
 	<style type="text/css">
 		body { margin:10px; }
 		.high { background-color:#a5b7bd;color:white; }
@@ -13,15 +14,15 @@
     <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   </head>
   <body>
-	<h1 align="center">OT/J code completion<a name="completion"></a></h1>
-	<u>On this page:</u>
+	<h1 align="center" id="completion">OT/J code completion</h1>
+	<span class="underline">On this page:</span>
 	<br /><a href="#completeRole">1. Overriding an inherited role class</a>
 	<br /><a href="#completeBase">2. Completing a role's base class</a>
 	<br /><a href="#completeMapping">3. Creating callout/callin method bindings</a>
 	<br /><a href="#completeCall">4. Completing special method calls</a>
 	<br /><a href="#completeTemplate">5. Completion templates</a>
 
-	<h2><a name="completeRole">1. Overriding an inherited role class</a></h2>
+	<h2 id="completeRole">1. Overriding an inherited role class</h2>
 	Simply by typing <code class="ui">Ctrl-Space</code> in the body of a team class that inherits from another team, completion proposes
 	to create a role declaration overriding any inherited role from the super team (<a href="otjld/def/s1.html#s1.3.1.c"><img src="../images/ot_paragraph.png"> 1.3.1(c).</a>).
 	
@@ -33,13 +34,13 @@
 <code class="keyword">protected class</code> <code>Subscriber {
 }</code></pre>
 	
-    <h2><a name="completeBase">2. Completing a role's base class</a></h2>
+    <h2 id="completeBase">2. Completing a role's base class</h2>
         When expanding the base type after the keyword <code class="keyword">playedBy</code>,
         completion will also generate an "<code class="keyword">import <strong>base</strong> ...</code>" declaration 
         (<a href="otjld/def/s2.html#s2.1.2.d"><img src="../images/ot_paragraph.png"> 2.1.2(d)</a>), if needed.
         
 
-	<h2><a name="completeMapping">3. Creating callout/callin method bindings</a></h2>
+	<h2 id="completeMapping">3. Creating callout/callin method bindings</h2>
 	
 	Specific support for code completion exists to facilitate the creation of <b>callout</b> (<a href="otjld/def/s3.html"><img src="../images/ot_paragraph.png"> 3.</a>) and <b>callin</b> (<a href="otjld/def/s4.html"><img src="../images/ot_paragraph.png"> 4.</a>) method bindings.<br />
 	Completion can be used for
@@ -49,7 +50,7 @@
 	<li><a href="#correct">Corrections after callin creation.</a>
 	</ul>
 	
-	<h3><a name="full">3.1 Creating full method bindings (callout/callin)</a></h3>
+	<h3 id="full">3.1 Creating full method bindings (callout/callin)</h3>
 	Just activating the completion anywhere in the body of a role class allows you to create a full callout or callin binding to an existing base method (or field &mdash; "callout to field", see <a href="otjld/def/s3.html#s3.5"><img src="../images/ot_paragraph.png"> 3.5</a>).<br />
 	<table>
 	<tr><td colspan=2>
@@ -64,14 +65,16 @@
 	<h4>3.1.1 Creating callout to field</h4>
 	<p>	
 	Two additional kinds of callouts can be generated, by typing "<code>get</code>" or "<code>set</code>" before invoking completion:
-	<table class="border" cellpadding=3>
-	<tr class="z2"><td>after typing <code class="keyword">get</code>
-	<td>Create a callout to field <i>getter</i>.</tr>
+	<table class="border pad5" >
+	<tr class="z2">
+		<td>after typing <code class="keyword">get</code></td>
+		<td>Create a callout to field <i>getter</i>.</td>
+	</tr>
 	<tr class="z3">
-	<td>after typing <code class="keyword">set</code>
-	<td>Create a callout to field <i>setter</i>.
-        </table>
-    </p> 
+		<td>after typing <code class="keyword">set</code></td>
+		<td>Create a callout to field <i>setter</i>.</td>
+	</tr>
+    </table>
     <h4>3.1.2 Mapping signatures using lifting/lowering</h4>
     <p>
     When binding to a base method/field, whose signature contains other base types for which a bound role exists in the current team,
@@ -79,18 +82,18 @@
     If role types are selected, they will be conform to the corresponding base type by implicitly using lifting (<a href="otjld/def/s2.html#s2.3"><img src="../images/ot_paragraph.png"> 2.3</a>) or lowering (<a href="otjld/def/s2.html#s2.2"><img src="../images/ot_paragraph.png"> 2.2</a>).
     </p>
     
-    <h3><a name="partial">3.2 Completing partial callin/callout bindings</a></h3>
+    <h3 id="partial">3.2 Completing partial callin/callout bindings</h3>
         <p>
         If a callin or callout binding has been typed up-to and including the "<code class="keyword">&lt;-</code>" or "<code class="keyword">-&gt;</code>" token, completion can be used to expand the right hand side specifying the base method or field. For callin bindings you may optionally first type the callin modifier (<code class="keyword">before, replace</code> or <code class="keyword">after</code>). Otherwise you will be prompted for the desired callin modifier.
         In this case the proposed modifier is inferred to match the bound base method:<br />
-        <table class="border">
+        <table class="border pad5">
         <tr class="z2"><td>regular method<td>Default is <code class="keyword">before</code> (also <code class="keyword">after</code> is legal).
         <tr class="z3"><td><code class="keyword">callin</code> method<td>Default is <code class="keyword">replace</code>
         </table>
-        </p><p>
+        <p>
         Normally, after "<code class="keyword">-&gt;</code>" (as well as for "<code class="keyword">&lt;-</code>") completion will try to expand a base <i>method</i>, if for a callout one of the modifiers <code>get</code> or <code>set</code> has been typed, a <i>field</i> is searched instead.
         
-    <h3><a name="correct">3.3 Corrections after callin creation</a></h3>
+    <h3 id="correct">3.3 Corrections after callin creation</h3>
         After generating a callin binding using completion, the following two corrections might be especially helpful:
         <ul>
         <li>Adjusting the role method's <code class="keyword">callin</code> modifier, to match the binding's callin modifier.
@@ -98,13 +101,14 @@
         </ul>
         Both corrections can easily be performed by a <a href="quickfix.html">quickfix</a> offered on the erroneous role method spec.
 
-	<h2><a name="completeCall">4. Completing special method calls</a></h2>
+	<h2 id="completeCall">4. Completing special method calls</h2>
 	<ul>
 	<li>After <code class="keyword">base.</code> (<a href="otjld/def/s4.html#s4.3"><img src="../images/ot_paragraph.png"> 4.3</a>) and <code class="keyword">tsuper.</code> (<a href="otjld/def/s1.html#s1.3.1.f"><img src="../images/ot_paragraph.png"> 1.3.1(f)</a>) completion offers only those methods that are actually legal in this context,
 	 which in both cases implies the same name and signature as the surrounding role (callin) method.</li>
 	<li>Completion also offers calls to members of the bound base class which are implicitly available using <b>inferred callout</b> (<a href="otjld/def/s3.html#s3.1.j"><img src="../images/ot_paragraph.png"> 3.1(j)</a>, <a href="otjld/def/s3.html#s3.5.h"><img src="../images/ot_paragraph.png"> 3.5(h)</a>)
     </ul>        
-    <h2><a name="completeTemplate">5. Completion templates</a></h2>
+    <h2 id="completeTemplate">5. Completion templates</h2>
+    <p>
 	 Content assist in the
 	form of <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/concepts/concept-editor-templates.htm">
 	templates</a> exists for a few specific OT/J language constructs like <span class="low"><code class="keyword">within</code> (<i>Expression</i>)</span>.
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/contentassist.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/contentassist.html
index e3923a5..d3218e5 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/contentassist.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/contentassist.html
@@ -3,6 +3,7 @@
     <meta name="copyright" content="Copyright Technical University Berlin and others 2004, 2010. This page is made available under the Eclipse Public License v1.0. For full details see http://www.eclipse.org/legal/epl-v10.html" />
 	<link rel=stylesheet type="text/css" href="../css/book.css">
 	<link rel=stylesheet type="text/css" href="otjld/css/ot.css">
+	<link rel=stylesheet type="text/css" href="otguide.css"/>
     <title>OT/J content/code assist</title>
     <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
   </head>
@@ -15,13 +16,13 @@
 	<code class="keyword">team, playedBy, callin, before, after, replace</code> etc.) as well.
 	Code completion and quick fixes provide more specific assistance depending on the current context of editing.
 	<p>
-	<u>OT/J specific content assist comprises:</u>
+	<span class="underline">OT/J specific content assist comprises:</span>
+	</p>
 	<ul>
 	<li><a href="completion.html">Completion</a> (<a href="completion.html#completeMapping">callout, callin</a>, <a href="completion.html#completeBase">base class</a>).
 	<li><a href="quickfix.html">Quick fixes</a>
 	<li><a href="quickassist.html">Quick assists</a>
 	</ul>
-	</p>
 
   </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 794be4d..6cee689 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/debugging.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/debugging.html
@@ -16,29 +16,30 @@
     <li>Has a team instance be created and activated?</li>
     <li>Is the callin blocked by either a guard predicate or a <code>org.objectteams.LiftingVetoException</code>?</li>
     </ol>
+    <p>
     Investigating question 1 is supported by the new <b>team monitor view</b>, 
     support for question 2 is provided by enhancements of the debug view and its stepping actions.
     </p>
-    <h2><a name="teammonitor" href="teammonitor.html">Team Monitor View</a></h2>
+    <h2 id="teammonitor"><a href="teammonitor.html">Team Monitor View</a></h2>
     A special view exists for monitoring which team instances have been created and whether each 
     of them is currently active or not. When debugging callin bindings which do not trigger while
     they are intended to do so, the team monitor should provide first help to find out whether
     there is any active instance of the team being considered. If no active instance exists,
     callins can not trigger. <a href="teammonitor.html">Read more...</a>
-    <h2><a name="stepping" href="stepping.html">Stepping through OT/J code</a></h2>
+    <h2 id="stepping"><a href="stepping.html">Stepping through OT/J code</a></h2>
     The byte code into which OT/J programs are translated has some significant differences
     to the original source code. In order to hide some generated code and to provided
     convenient stepping even through declarative method bindings, the debug view has
     been enhanced for OT/J. <a href="stepping.html">Read more...</a>
-    <h2><a name="variables">Variables View</a></h2>
+    <h2 id="variables">Variables View</h2>
     By default the variables view hides some internal fields that are generated by the compiler.
     However, in some situations these variables might come handy for inspecting the linkage between
     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>
+    <h2 id="hot-code-replace">Hot code replacement</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.
+    signature changes (incl. addition &amp; 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 b29eae7..7a1907b 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/editor.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/editor.html
@@ -34,7 +34,7 @@
 	      allowing navigation to the affecting role.
 	  </li>
 	</ul>
-	<h2><a name="navigation">Navigation</a></h2>
+	<h2 id="navigation">Navigation</h2>
     Obvious enhancements for the normal F3 navigation regard the following:
     <ul>
     <li>Go to a role's base class using the <code class="keyword">playedBy</code> clause.</li>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/otguide.css b/plugins/org.eclipse.objectteams.otdt.doc/guide/otguide.css
index 77c7bba..b917e64 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/otguide.css
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/otguide.css
@@ -1,2 +1,4 @@
 .ui { background-color:#e0e0e0; padding:2px; }
+.underline { text-decoration: underline; }
+table.pad5 td { padding: 5px; }
 body { margin:10px; }
\ No newline at end of file
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/packageexplorer.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/packageexplorer.html
index 2c25a12..fa76f9c 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/packageexplorer.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/packageexplorer.html
@@ -17,27 +17,27 @@
 	  <li>Showing the <b>Object Teams element hierarchy</b> of the Object Teams projects in the
 	  workbench including
 	  <ul>
-	  <li><u>specific classes:</u><br />
+	  <li><span class="underline">specific classes:</span><br />
 	    	&ndash; <b>team</b> class (<img src="../images/team_obj.gif">).<br>
 	    	&ndash; <b>role</b> class (<img src="../images/role_obj.png">).<br>
 	  	  	&ndash; a <b>nested team</b> (<img src="../images/team_role_obj.gif">) is a role as well as a team.
 	  	  	</li>
-	  <li><u>role class decorations:</u><br>
+	  <li><span class="underline">role class decorations:</span><br>
 	  		&ndash; <b>bound role</b> class (<span><img style="position:relative;left:0px;" src="../images/role_obj.png"><img style="position:relative;left:-2px;top:-4px;" src="../images/boundrole_co.gif"></span>)
 	  		&mdash; <em>has a <code class="keyword">playedBy</code> declaration.</em>
 	  		<br>
 	  		&ndash; <b>overriding role</b> class (<span><img style="position:relative;left:0px;" src="../images/role_obj.png"><img style="position:relative;left:-2px;top:4px;" src="../images/over_co_ovr16.gif"></span>)
 	  		&mdash; <em>overrides a role from the super team</em><br>
-	  <li><u>methods:</u><br />
+	  <li><span class="underline">methods:</span><br />
 	  	    &ndash; <b>callin</b> methods are marked with a decoration <img src="../images/callinmethod_co.gif">.
 	  	    </li>
-	  <li><u>method bindings:</u><br />
+	  <li><span class="underline">method bindings:</span><br />
 	  		&ndash; <b>callin</b>: before(<img src="../images/callinbindingbefore_obj.gif">), 
 	  		after (<img src="../images/callinbindingafter_obj.gif">), replace (<img src="../images/callinbindingreplace_obj.gif">)
 	  		<br />
 	  		&ndash; <b>callout</b>: (<img src="../images/calloutbinding_obj.gif">)
 	  		</li>
-	  <li><u>guard predicates:</u><br>
+	  <li><span class="underline">guard predicates:</span><br>
 	  		&ndash; <b>regular guard</b> (<img src="../images/guard_obj.gif">)<br>
 	  		&ndash; <b>base guard</b> (<img src="../images/baseguard_obj.gif">)<br>
    	  </ul>
@@ -52,25 +52,24 @@
    	     and <b>packages</b> (team package) can be enabled by checking
 		 <span class="ui">Preferences-&gt;General-&gt;Appearance-&gt;Label Decorations-&gt;Java Type Indicator</span>.
 		 <ul>
-		 <li><u>compilation unit:</u><br>
+		 <li><span class="underline">compilation unit:</span><br>
 		 	&ndash; holding a team class (<span><img style="position:relative;left:0px;" src="../images/jcu_obj.gif"><img style="position:relative;left:-7px;top:-5px;" src="../images/team_ovr.gif"></span>)<br>
 		 	&ndash; holding a role class (<span><img style="position:relative;left:0px;" src="../images/jcu_obj.gif"><img style="position:relative;left:-7px;top:-5px;" src="../images/role_ovr.png"></span> or 
 		 	<span><img style="position:relative;left:0px;" src="../images/jcu_obj.gif"><img style="position:relative;left:-7px;top:-5px;" src="../images/team_role_ovr.gif"></span>)</li>
-		 <li><u>package:</u><br>
+		 <li><span class="underline">package:</span><br>
 		 	&ndash; team package  (<span><img style="position:relative;left:0px;" src="../images/package.gif"><img style="position:relative;left:-7px;top:-5px;" src="../images/team_ovr.gif"></span>)
 		 </ul>
    	</ul>
-    </p>
     <table>
     <tr><td>
-    	<p><u><b>Physical view:</b></u><br>
+    	<p><span class="underline"><b>Physical view:</b></span><br>
     		role file <code>FlightBonusDialog</code> is displayed as
     		a child of its team package.
     	</p>
     	  <img src="images/screenshots/packageExplorer.png"
 	  	   alt="Object Teams package explorer view">
     </td><td><span style="width=20px;">&nbsp;</span></td><td>
-		<p><u><b>Logical view:</b></u><br>
+		<p><span class="underline"><b>Logical view:</b></span><br>
 			role <code>FlightBonusDialog</code> is displayed as
 			a child of its enclosing team class.
 		</p>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/quickassist.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/quickassist.html
index 381926b..73067ba 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/quickassist.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/quickassist.html
@@ -9,7 +9,7 @@
   </head>
   <body>	
 	<h1 align="center">OT/J quick assist</h1>
-	<u>Specific <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/ref-java-editor-quickassist.htm">quick assists</a> are available for typical changes in OT/J programs, including:</u>
+	<span class="underline">Specific <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/ref-java-editor-quickassist.htm">quick assists</a> are available for typical changes in OT/J programs, including:</span>
 	<dl>
 	<dt>method bindings
 	<dd>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/quickfix.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/quickfix.html
index 76a3156..cff8eee 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/quickfix.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/quickfix.html
@@ -9,7 +9,7 @@
   </head>
   <body>	
 	<h1 align="center">OT/J quick fixes</h1>
-	<u>Specific <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/ref-java-editor-quickfix.htm">quick fixes</a> are available for mending OT/J-related problems, including:</u>
+	<span class="underline">Specific <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/ref-java-editor-quickfix.htm">quick fixes</a> are available for mending OT/J-related problems, including:</span>
 	<dl>
 	<dt>class modifiers
 	<dd>
@@ -52,7 +52,7 @@
 	  &ndash; adding a missing <code>@Override</code> annotation to a role method that overrides a corresponding method from the implicit super role.<br />
 	</dl>
 	
-	<u>Additionally, some standard Java quickfixes and content assists have been extended to be applicable for OT/J elements, too.</u>
+	<span class="underline">Additionally, some standard Java quickfixes and content assists have been extended to be applicable for OT/J elements, too.</span>
 	<dl>
 	<dt>suppress warnings
 	<dd>&ndash; <code style="color:#505050;">@SuppressWarnings</code> annotations can be added to method bindings, too.
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/running.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/running.html
index c42e225..e98b006 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/running.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/running.html
@@ -24,46 +24,46 @@
     from a context menu or use one of the run/debug tool bar buttons.
     From here just select one of the standard launch configuration types: 
     <ul>
-    <li><a href="#JavaApp"><img src="images/java_app.gif" valing="absmiddle"> Java Application</a></li> 
-    <li><a href="#RemoteJavaApp"><img src="images/java_attach.gif" valing="absmiddle"> Remote Java Application</a></li> 
-    <li><a href="#JavaApp"><img src="images/julaunch.gif" valing="absmiddle"> JUnit</a></li>
-    <li><a href="#Plugin"><img src="images/julaunchpgn.gif" valing="absmiddle"> JUnit Plug-in Test</a></li>
-    <li><a href="#Plugin"><img src="images/eclipse_launcher.gif" valing="absmiddle"> Eclipse Application</a></li>
-    <li><a href="#OSGi"><img src="images/bundle_obj.gif" valing="absmiddle"> OSGi Framework</a></li>
+    <li><a href="#JavaApp"><img src="images/java_app.gif" valign="absmiddle"> Java Application</a></li> 
+    <li><a href="#RemoteJavaApp"><img src="images/java_attach.gif" valign="absmiddle"> Remote Java Application</a></li> 
+    <li><a href="#JavaApp"><img src="images/julaunch.gif" valign="absmiddle"> JUnit</a></li>
+    <li><a href="#Plugin"><img src="images/julaunchpgn.gif" valign="absmiddle"> JUnit Plug-in Test</a></li>
+    <li><a href="#Plugin"><img src="images/eclipse_launcher.gif" valign="absmiddle"> Eclipse Application</a></li>
+    <li><a href="#OSGi"><img src="images/bundle_obj.gif" valign="absmiddle"> OSGi Framework</a></li>
     </ul>
+    <p>
     All these launches now consistently provide one additional checkbox, which is shown next to where the Runtime JRE is configured.
     </p>
   
-  <p style="margin-top:30px;"><a name="JavaApp"/>
-    For <strong>Java Applications</strong> (<img src="images/java_app.gif" valing="absmiddle">, <img src="images/julaunch.gif" valing="absmiddle">) this checkbox is found on the <img src="images/library_obj.gif"><code>JRE</code> tab:
+  <p style="margin-top:30px;" id="JavaApp">
+    For <strong>Java Applications</strong> (<img src="images/java_app.gif" valign="absmiddle">, <img src="images/julaunch.gif" valign="absmiddle">) this checkbox is found on the <img src="images/library_obj.gif"><code>JRE</code> tab:
   </p>
     <p><img src="images/screenshots/JRETab.png"></p>
     <ul>
     <li style="margin-bottom:7px;">If the new option is checked the application will be launched with the Object Teams Runtime Environment (OTRE) enabled which is needed to weave callin bindings into base classes. Conversely, disabling the OTRE lets you run an OT/J application with all callin-bindings disabled. But note that a few more OT/J mechanisms will not work either (like decapsulation).</li>
     <li style="margin-bottom:7px;">For OT/J projects this option is enabled by default.</li>
-    <li style="margin-bottom:7px;">If <span class="ui">Enable OTRE</span> is checked an additional <a href="#activation"><img valing="absmiddle" src="../images/team_obj.gif"><code>Team Activation</code> tab</a> will be shown.<br>
+    <li style="margin-bottom:7px;">If <span class="ui">Enable OTRE</span> is checked an additional <a href="#activation"><img valign="absmiddle" src="../images/team_obj.gif"><code>Team Activation</code> tab</a> will be shown.<br>
     <i>(If a launch configuration was opened while the OTRE was disabled, you need to re-open this configuration (e.g., unselect and select) in order for the new tab to show.)</i></li>
     <li style="margin-bottom:7px;">Behind the scenes, when <span class="ui">Enable OTRE</span> is checked, the correct <a href="weavingscheme.html">weaving scheme</a> is selected based on the configuration of projects involved in the launch.</li>
     </ul>
-  </p>
   
-  <p style="margin-top:30px;"><a name="RemoteJavaApp"/>
-    For <strong>Remote Debugging</strong> of a java applications</strong> (<img src="images/java_attach.gif" valing="absmiddle">) this checkbox is found on the <img src="images/disconnect_co.gif"><code>Connect</code> tab:
+  <p style="margin-top:30px;" id="RemoteJavaApp">
+    For <strong>Remote Debugging</strong> of a <strong>java applications</strong> (<img src="images/java_attach.gif" valign="absmiddle">) this checkbox is found on the <img src="images/disconnect_co.gif"><code>Connect</code> tab:
   </p>
     <p><img alt="Remote Debugging" src="images/screenshots/RemoteDebugging.png" /></p>
   
-  <p style="margin-top:30px;"><a name="Plugin">
-    For launching a <strong>Runtime Workbench</strong> (<img src="images/julaunchpgn.gif" valing="absmiddle">, <img src="images/eclipse_launcher.gif" valing="absmiddle">) the new checkbox is right on the main page:
+  <p style="margin-top:30px;" id="Plugin">
+    For launching a <strong>Runtime Workbench</strong> (<img src="images/julaunchpgn.gif" valign="absmiddle">, <img src="images/eclipse_launcher.gif" valign="absmiddle">) the new checkbox is right on the main page:
     </p>
     <p><img src="images/screenshots/RuntimeWorkbenchMainTab.png">
   </p>
-  <p style="margin-top:30px;"><a name="OSGi">
-    For <strong>OSGi Framework</strong> launches (<img src="images/bundle_obj.gif" valing="absmiddle">) the runtime environment is configured on the <code>Settings</code> tab:
+  <p style="margin-top:30px;" id="OSGi">
+    For <strong>OSGi Framework</strong> launches (<img src="images/bundle_obj.gif" valign="absmiddle">) the runtime environment is configured on the <code>Settings</code> tab:
     </p>
-    <p><img src="images/screenshots/OSGiLaunchSettings.png"></p></td></tr>
+    <p><img src="images/screenshots/OSGiLaunchSettings.png"></p>
   
 
-    <h2><a name="activation">Team activation:</a></h2>
+    <h2 id="activation">Team activation:</h2>
     <p>
     I you wish to compose your program from a base application and a number of aspects, 
     you may use a launch configuration to select which aspects should be included.
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/stepping.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/stepping.html
index b701c7b..e48444f 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/stepping.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/stepping.html
@@ -37,8 +37,7 @@
     <p>
     Typical stepping paths will be explained using the example <code>OTSample-Flightbonus</code>
     which can be installed using the wizard at 
-    <code><ul><li>New...<ul><li>Other... <ul><li>Code Samples</li></ul></li></ul></li></ul></code>
-    </p>
+    <ul><li class="ui">New...<ul><li class="ui">Other... <ul><li class="ui">Code Samples</li></ul></li></ul></li></ul>
   <p>
     After the example has been installed and configured for running with the team
     <code>GUIConnector</code> activated (see the example's documentation), 
@@ -135,7 +134,7 @@
   	This is relevant mostly if you want to analyze how multiple teams that affect the same base method are scheduled.<br>
   	When enabling the display of OT/J internal variables you may inspect the internal iterator of team instances (an array of teams plus an index into the array).</dd> 
   <dt>Pending call to the original base method</dt>
-  	<dd>This signifies the final iteration of the dispatch code at what point the original method will be entered by the next step-into.</br>
+  	<dd>This signifies the final iteration of the dispatch code at what point the original method will be entered by the next step-into.<br/>
   	This stage can, e.g., be reached when a <code class="keyword">callin</code> method has issued a base-call.<br>
   	Instead of directly entering the base method, the dispatch code needs to take over,
   	because more team instances might be waiting to receive the control.</dd>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/teammonitor.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/teammonitor.html
index 16c273e..0a6f8ce 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/teammonitor.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/teammonitor.html
@@ -31,11 +31,12 @@
     <li>Inspect fields of a team instance or perform any operation inherited from the <a href="debugging.html#variables">variables view</a>.<br/>
     	Note, that filtering of OT/J Internal Variables is also supported (and enabled by default).
     </ul>
+    <p>
     <i>Note that teams may only appear if a thread is currently suspended. If teams are visible while
     all threads are running, the <span class="ui">Activate Team</span> or <span class="ui">Deactivate Team</span> options
-    cannot be performed.
+    cannot be performed.</i>
     </p>
-    <p><u>Technical note:</u> When debugging an Eclipse application or OSGi fragment with OT/Equinox enabled,
+    <p><span class="underline">Technical note:</span> When debugging an Eclipse application or OSGi fragment with OT/Equinox enabled,
     	the team monitor can only work if an open Object Teams Plug-in Project can be found in the workspace.
     	If this requirement is not met a corresponding warning will be logged.</p> 
   </body>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/typehierarchy.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/typehierarchy.html
index 2f083f7..2d95bf2 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/typehierarchy.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/typehierarchy.html
@@ -45,12 +45,12 @@
    <p>
 	 <strong>Type hierarchy</strong>:<br>
 	 <img src="images/screenshots/typeHierarchy.jpg" 
-	  	  styles="left" alt="Object Teams type hierarchy view">
+	  	  style="left" alt="Object Teams type hierarchy view">
    </p>	
    <p>
 	 <strong>Role hierarchy</strong>:<br>
 	 <img src="images/screenshots/implicitRoleHierarchy.jpg"
-	  	  styles="bottom" alt="Object Teams implicit role hierarchy view">
+	  	  style="bottom" alt="Object Teams implicit role hierarchy view">
    </p>
    Note, that for roles, the super types are not restricted to a linear chain, but due to combination 
    of explicit and implicit inheritance (<a href="otjld/def/s1.html#s1.3.1">OTJLD &sect;1.3.1 </a>)
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/whatsnew.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/whatsnew.html
index 78f1d32..216887b 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/whatsnew.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/whatsnew.html
@@ -7,7 +7,7 @@
   </head>
   <body>
     <h2>Changes in the Object Teams Development Tooling are presented per release:</h2>
-   	<table border=0>
+   	<table border="0">
   	  <tr><td>&bull; <b><a href="news/new_in_2.5.html">OTDT 2.5 New&amp;Noteworthy</a></b></td><td> - <b>"Neon" Release June 2016</b></td></tr>
   	  <tr><td>&bull; <b>OTDT 2.4</b> consolidation release<br>&nbsp;&nbsp;<em>no new user visible features</em></td><td valign="top"> - <b>"Mars" Release June 2015</b></td></tr>
   	  <tr><td>&bull; <b><a href="news/new_in_2.3.html">OTDT 2.3 New&amp;Noteworthy</a></b></td><td> - <b>"Luna" Release June 2014</b></td></tr>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/wizards.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/wizards.html
index 976023c..218768f 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/wizards.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/wizards.html
@@ -80,7 +80,8 @@
 	<h4>Interfaces</h4>
 	Interfaces which the role should implement can be added/removed with the <b>Add.../
 	Remove</b> buttons.
-	<h4>Method stubs</h4>	
+	<h4>Method stubs</h4>
+	<p>	
 	Method stubs for inherited abstract methods	can be created by selecting the	according
 	checkbox. Note, that this option includes those	abstract methods that are inherited
 	from an implicit super role