Bug 436979 - [doc] Update user guide for 2.3
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/builder.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/builder.html
index 712e167..8217c69 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/builder.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/builder.html
@@ -19,7 +19,7 @@
Incremental compilation is guided by an analysis of the various dependencies among classes.
</p><p>
If for some reason incremental compilation fails were it should not, a full build can
- be triggered by <span class="ui">Project->Clean...</code>.
+ be triggered by <span class="ui">Project->Clean...</span>.
</p>
<p>Note that the produced class files contain standard Java byte code. However, for execution
the Object Teams Runtime Environment (OTRE) is needed in order to weave aspect code into
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/callhierarchy.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/callhierarchy.html
index a70fe10..02b97d5 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/callhierarchy.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/callhierarchy.html
@@ -15,7 +15,8 @@
<body>
<h1 align="center">Call hierarchy extended for OT/J<a name="callhierarchy"></a></h1>
<p>
- The purpose of the Java call hierarchy view is to statically display all potential
+ 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
control flows originating from or leading to a specific program element.
Since callout and callin method bindings in OT/J introduce new kinds of control flows,
it is only appropriate to also visualize the control flows induced by such method bindings.
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/callinmarker.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/callinmarker.html
index 0ce6e08..cdc92e9 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/callinmarker.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/callinmarker.html
@@ -15,7 +15,7 @@
</head>
<body>
<h1>Binding markers</h1>
- <p><b>Binding</b> <a href="/help/topic/org.eclipse.platform.doc.user/concepts/concepts-11.htm">
+ <p><b>Binding</b> <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/concepts-11.htm">
markers</a> are OT/J specific annotations on the vertical ruler (marker bar) left of the
extended <a href="editor.html">Java Editor</a>. These markers come in three flavors:
<ul>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/completion.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/completion.html
index 8ff478e..6578a50 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/completion.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/completion.html
@@ -101,12 +101,12 @@
<h2><a name="completeCall">4. Completing special method calls</a></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 bose cases implies the same name and signature as the surrounding role (callin) method.</li>
+ 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>
Content assist in the
- form of <a href="/help/topic/org.eclipse.jdt.doc.user/concepts/ctemplates.htm">
+ 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>.
</p>
\ No newline at end of file
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/contentassist.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/contentassist.html
index 30eaa9f..e3923a5 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/contentassist.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/contentassist.html
@@ -8,9 +8,9 @@
</head>
<body style="margin:10px">
<h1 align="center">OT/J content/code assist</h1>
- <p>The <a href="/help/topic/org.eclipse.jdt.doc.user/reference/ref-java-editor-code-assist.htm">content/code
+ <p>The <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/ref-java-editor-code-assist.htm">content/code
assist (code completions)</a> inherent in the
- <a href="/help/topic/org.eclipse.jdt.doc.user/concepts/concepts-java-editor.htm">Java editor</a>
+ <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/concepts/concept-java-editor.htm">Java editor</a>
has been extended in order to provide for Object Teams specific keywords and modifiers (e.g.
<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.
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/develop.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/develop.html
index 74e474c..804e753 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/develop.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/develop.html
@@ -44,14 +44,14 @@
<h2>Prerequisites</h2>
If you have never used the eclipse Java IDE before, please consider getting familiar with the
- <a href="/help/topic/org.eclipse.jdt.doc.user/concepts/concepts-1.htm">Java Development Tooling</a>, as
+ <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/gettingStarted/intro/overview.htm">Java Development Tooling</a>, as
the OTDT is built on top of and extends the JDT.
<h2>Feedback</h2>
<p>
If you have questions regarding the <a href="otjld/def/index.html">OT/J</a>
language or if you experience problems or bugs with the OTDT, do not hesitate to post to the
- <a href="http://www.eclipse.org/newsportal/thread.php?group=eclipse.objectteams">Object Teams forum</a>.
+ <a href="http://www.eclipse.org/forums/eclipse.objectteams">Object Teams forum</a>.
</p>
<p>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/editor.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/editor.html
index 335eb7a..b29eae7 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/editor.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/editor.html
@@ -10,7 +10,7 @@
<body>
<h1>Java editor with Object Teams capability</h1>
The extended Java editor provides specialized features for editing
- OT/J code. The original <a href="/help/topic/org.eclipse.jdt.doc.user/concepts/concepts-java-editor.htm">Java editor</a>
+ OT/J code. The original <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/concepts/concept-java-editor.htm">Java editor</a>
has been extended for the following features:
<ul>
<li><b>Navigation</b> support for Object Teams elements (F3 = <span class="ui">Open Declaration</span>, see below)</li>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/features.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/features.html
index a157be1..0b9527d 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/features.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/features.html
@@ -12,12 +12,12 @@
</head>
<body>
<div id="head">
- <h1>Features of the OTDT (version 2.2)</h1>
+ <h1>Features of the OTDT (version 2.3)</h1>
</div>
<div style="margin:10px;margin-top:100px;">
<div style="margin-left:40px;padding:2px;float:left;background-color:#D0D0D0;">
<div style="padding:4px;background-color:#def4fe;">
- The release 2.2 is based on Eclipse SDK 4.3.<br/>
+ The release 2.3 is based on Eclipse SDK 4.4 (Luna).<br/>
The OTDT contains a modified version of the JDT core and several added plugins.
</div>
</div>
@@ -46,7 +46,8 @@
<h1>Compiler</h1>
</div></div>
- The Object Teams Compiler is an incremental compiler, based on the Eclipse Compiler for Java.
+ The Object Teams Compiler is an incremental compiler, based on the Eclipse Compiler for Java.
+ As of version 2.3 the compiler supports all features of <strong>Java™ 8</strong>.
<dl>
<dt><strong>Language Definition</strong></dt>
<dd>The compiler implements the language as defined in the OT/J
@@ -69,6 +70,7 @@
source code using the <code>@SuppressWarnings</code> annotation.</li>
<li>Scoped keywords <a href="otjld/def/sA.html#sA.0.1"><img alt="otjld" src="../images/ot_paragraph.png"/> OTJLD § A.0.1</a> can be disabled (default is enabled).
</li>
+ <li>The <a href="#weaving_scheme">target weaving scheme</a> can be selected during project creation.</li>
</ul>
</dd>
</dl>
@@ -204,7 +206,9 @@
<dt><strong>Java Structure Compare</strong></dt>
<dd><ul>
<li>When comparing versions of an OT/J file, the Java Structure Compare will correctly render
- Object Teams elements, too.
+ Object Teams elements, too.</li>
+ <li>When selecting a callin replace binding, an action "Compare With > Bound Base Method" is available via the context menu,
+ which easily let's you compare the method implementations of role and base.</li>
</ul></dd>
</dl>
@@ -243,8 +247,33 @@
All this is handled transparently using the standard Eclipse "Run" feature.
Running any main class of an Object Teams project automatically includes
the OTRE (This feature has been <a href="new_in_1.3.html#launch">changed in the OTDT 1.2.2</a>).
- </li>
- </ul></dd>
+ </li>
+ </ul>
+ </dd>
+ <dt id="weaving_scheme"><strong>Weaving schemes</strong></dt>
+ <dd><ul>
+ <li>As of version 2.3, the OTDT ships with two distinct weavers with the properties mentioned below.
+ Since the OT/J compiler performs some preparation for the respective weaver,
+ it has to generate different byte code formats, depending on the targeted weaving scheme.
+ As a result, switching from one weaving scheme to the other requires a full recompilation of all OT/J code involved.
+ <ul>
+ <li><strong>OTRE</strong>: This is the traditional <strong>load-time</strong> weaver.
+ This weaver has <strong>matured</strong> over many years,
+ but unfortunately, the underlying library <strong>BCEL</strong> is no longer maintained
+ and thus cannot handle class files from recent Java versions.
+ Up-to Java 7 this could be worked around,
+ but Java 8 class files contain several elements that this BCEL-based weaver cannot handle.</li>
+ <li><strong>OTDRE</strong>:
+ The newer Object Teams Dynamic Runtime Environment has been developed to enable even <strong>runtime weaving</strong>.
+ To work around limitations of the JVM this weaver has to insert a few general hooks into every weavable class.
+ This weaver is also interesting for weaving into <strong>Java 8</strong> class files,
+ as it is based on the library <strong>ASM</strong>, for which a Java-8-enabled version already exists.
+ It should be noted, however, that the OTDRE is not as mature as the OTRE,
+ both in terms of complete coverage of all combinations of language features
+ as well as in terms of performance measurement (we simply have no large-scale experience with the OTDRE, yet).</li>
+ </ul>
+ </li>
+ </ul></dd>
<dt><strong>Aspect deployment/activation</strong></dt>
<dd><ul>
<li>A new "Team Activation" tab in the "Run-Configuration" allows to instantiate and activate teams without modifying the program's source code.
@@ -265,8 +294,6 @@
<li id="JPLIS">Integrating the weaver into the JVM leverages the Java-agent concept of Java 5
(<a href="http://java.sun.com/developer/technicalArticles/releases/j2se15/index.html">JPLIS</a>).
(<i>The original implementation using the JMangler framework is no longer maintained</i>).<br/>
- In the future this integration will support aspect weaving not only at load time
- but also while an application is running.
</li>
</ul></dd>
</dl>
@@ -299,12 +326,9 @@
<code>Object Teams Plugin Project</code> is provided, supporting the
development of plugins written in OT/J.</li>
<li>Support for OT/Equinox is added to the run/debug dialogs for all Equinox related launches.</li>
- <li>If desired the load-time weaver can be disabled by commenting out or removing the following
- line from the file <code>configuration/config.ini</code>:
- <div class="ttindent" style="font-size:small;">
- osgi.hook.configurators.include=org.eclipse.objectteams.otequinox.hook.HookConfigurator</div>
- Ideally, disabling OT/Equinox will be handled by temporarily uninstalling this feature,
- but the required support by the p2 provisioning system is not yet stable enough to do this.</li>
+ <li>If desired the load-time weaver can be disabled by adding the following
+ line to the file <code>eclipse.ini</code> after a <code>-vmargs</code> line:
+ <div class="ttindent">-Dot.equinox=false</div>.</li>
</ul>
<p></p>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/images/screenshots/selectTargetWeavingScheme.png b/plugins/org.eclipse.objectteams.otdt.doc/guide/images/screenshots/selectTargetWeavingScheme.png
new file mode 100644
index 0000000..67a7c81
--- /dev/null
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/images/screenshots/selectTargetWeavingScheme.png
Binary files differ
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/outline.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/outline.html
index 3cfaa1b..f9a4855 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/outline.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/outline.html
@@ -9,7 +9,7 @@
<h1>Object Teams Outline</h1>
The <b>Object Teams outline</b> provides the following features
(in addition to the features of the standard JDT
- <a href="/help/topic/org.eclipse.platform.doc.user/concepts/coutline.htm">
+ <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/coutline.htm">
outline view</a>):
<ul>
<li>lists the <b>structural elements</b> of an Object Teams source file, i.e. team
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/packageexplorer.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/packageexplorer.html
index ccfe173..2c25a12 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/packageexplorer.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/packageexplorer.html
@@ -11,7 +11,7 @@
<p>
The <b>Object Teams package explorer</b> provides the following features
(in addition to the features of the standard JDT
- <a href="/help/topic/org.eclipse.jdt.doc.user/reference/ref-view-package-explorer.htm">
+ <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-view-package-explorer.htm">
package explorer view</a>):<br>
<ul>
<li>Showing the <b>Object Teams element hierarchy</b> of the Object Teams projects in the
@@ -27,7 +27,7 @@
— <em>has a <code class="keyword">playedBy</code> declaration.</em>
<br>
– <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>
+ — <em>overrides a role from the super team</em><br>
<li><u>methods:</u><br />
– <b>callin</b> methods are marked with a decoration <img src="../images/callinmethod_co.gif">.
</li>
@@ -53,11 +53,11 @@
<span class="ui">Preferences->General->Appearance->Label Decorations->Java Type Indicator</span>.
<ul>
<li><u>compilation unit:</u><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
+ – 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>
+ – 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>
- &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>)
+ – 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>
@@ -81,7 +81,7 @@
<h2>Aspect bindings in Object Teams Plug-in projects</h2>
<p>
If an Object Teams Plug-in project has
- <a href="../reference/extension-points/org_objectteams_otequinox_aspectBindings.html">aspect bindings</a>
+ <a href="../reference/extension-points/org_eclipse_objectteams_otequinox_aspectBindings.html">aspect bindings</a>
these will be displayed in the package explorer directly under the project's root:
</p><p>
<img src="images/screenshots/AspectBindingsInPackageExplorer.png" title="Package explorer showing aspect bindings"/>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/perspective.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/perspective.html
index 5a074bc..b0ee6f7 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/perspective.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/perspective.html
@@ -12,7 +12,7 @@
<h1>Object Teams perspective</h1>
The <b>Object Teams perspective</b> combines views that you use while
editing OT/J source files (see
- <a href="/help/topic/org.eclipse.platform.doc.user/concepts/concepts-4.htm">
+ <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/concepts-4.htm">
perspectives</a>).
<h2>Opening the Object Teams perspective</h2>
To open the Object Teams perspective:
@@ -31,7 +31,7 @@
the same window.
<p>
<img src="images/screenshots/perspective.png" width=285 height=63
- alt="Object Teams icon in shortcut bar"<br>
+ alt="Object Teams icon in shortcut bar"><br>
Object Teams icon in the shortcut bar ("Show text" disabled).
</p>
<p>By default, a perspective will open in the same window. If you would rather it opened
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/project.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/project.html
index d384fda..64a4dc7 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/project.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/project.html
@@ -21,11 +21,11 @@
</p>
<h2>Define settings</h2>
- <p>On the first page of the project wizard the name of the project has to be entered.
- On the second and last page the standard Java build settings can be defined as desired
- (source folder, output folder, libraries etc.).
- </p>
-
+ <p>The wizard supports all features of the <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/ref-wizard-java-project.htm">New Java Project Wizard</a>
+ and automatically configures the project for OT/J.
+ Only one user-visible option is added to the wizard, viz. selection of the <a href="features.html#weaving_scheme">"Target weaving scheme"</a>:</p>
+ <img src="images/screenshots/selectTargetWeavingScheme.png" alt="Select Weaving Scheme"/>
+
<h2>Resulting effects</h2>
<p>After all information has been entered the project with the chosen name will be created,
the files <i>.classpath</i> and <i>.project</i> will be created and the tree view in the
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/quickassist.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/quickassist.html
index e1695cd..381926b 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="/help/topic/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>
+ <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>
<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 75d20ce..c8949b7 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="/help/topic/org.eclipse.jdt.doc.user/reference/ref-java-editor-quickfix.htm">quick fixes</a> are available for mending OT/J-related problems, including:</u>
+ <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>
<dl>
<dt>class modifiers
<dd>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/syntaxhighlight.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/syntaxhighlight.html
index 546889a..0c7f87f 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/syntaxhighlight.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/syntaxhighlight.html
@@ -10,7 +10,7 @@
<body>
<h1>OT/J syntax highlighting</h1>
<p>In addition to the <b>syntax highlighting</b> for standard Java keywords and
- modifiers incorporated in the <a href="/help/topic/org.eclipse.jdt.doc.user/concepts/concepts-java-editor.htm">Java editor</a>,
+ modifiers incorporated in the <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/concepts/concept-java-editor.htm">Java editor</a>,
the new Object Teams specific keywords and modifiers like <code class="keyword">team, playedBy, callin,
base, within</code> etc. are also highlighted for better accentuation and clearness.
</p>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/typehierarchy.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/typehierarchy.html
index 5b7aa28..90f7aa6 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/typehierarchy.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/typehierarchy.html
@@ -13,7 +13,7 @@
<h1>Object Teams Type Hierarchy</h1>
The <b>Object Teams type hierarchy</b> provides the following features
(in addition to the features of the standard JDT
- <a href="/help/topic/org.eclipse.jdt.doc.user/reference/ref-type-hierarchy.htm">
+ <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/views/ref-type-hierarchy.htm">
type hierarchy view</a>):
<h3>Type hierarchy tree:</h3>
<ul>
diff --git a/plugins/org.eclipse.objectteams.otdt.doc/guide/wizards.html b/plugins/org.eclipse.objectteams.otdt.doc/guide/wizards.html
index 1dcef28..976023c 100644
--- a/plugins/org.eclipse.objectteams.otdt.doc/guide/wizards.html
+++ b/plugins/org.eclipse.objectteams.otdt.doc/guide/wizards.html
@@ -26,7 +26,7 @@
workbench toolbar.
<h3>Define settings / enter information</h3>
Most settings for a new team correspond exactly to those specified for a regular
- <a href="/help/topic/org.eclipse.jdt.doc.user/reference/ref-126.htm">Java class</a>.
+ <a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/ref-wizard-class.htm">Java class</a>.
<h4>Edit using the Binding Editor</h4>
If a super-team has been selected and if the team should be constructed as a <i>connector</i>
the binding editor can be launched for adding class and method bindings.
