diff --git a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/DocBuild.xml b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/DocBuild.xml
index de2c4d6..e4f1af8 100644
--- a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/DocBuild.xml
+++ b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/DocBuild.xml
@@ -45,14 +45,14 @@
 	<target name="eclipsehelp">
 		<ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
 			<property name="args.copycss" value="no" />
-			<property name="args.csspath" value="../org.eclipse.wst.doc.user" />
+			<property name="args.csspath" value="org.eclipse.wst.doc.user" />
 			<property name="args.eclipse.provider" value="Eclipse.org" />
 			<property name="args.eclipse.version" value="3.0.0" />
 			<property name="args.input" location="wsaxis2_reltable_toc.ditamap" />   
 			<property name="clean.temp" value="true" />
 			<property name="dita.extname" value=".dita" />
 			<property name="dita.temp.dir" location="temp" />
-			<property name="output.dir" location="" />
+			<property name="output.dir" location="../" />
 			<property name="transtype" value="eclipsehelp" />
 		</ant>
 		<copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
diff --git a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/plugin.properties b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/plugin.properties
index cbcbf1a..af302f4 100644
--- a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/plugin.properties
+++ b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
+# Copyright (c) 2001, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
diff --git a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/caxis2tover.html b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/caxis2tover.html
index a636564..9f71e88 100644
--- a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/caxis2tover.html
+++ b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/caxis2tover.html
@@ -129,15 +129,11 @@
 
 </div>
 
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/taxis2bu.html">Creating a Web service from a Java bean using the Apache Axis2 runtime environment</a></strong><br />
-The Web Service wizard assists you in creating a new Web service, configuring it for deployment, and deploying the Web service to a server. Once your Web service is deployed, the wizard assists you in generating the client proxy and sample application to test the Web service. When you have completed testing, you can publish your Web service to a UDDI Business Registry using the Export wizard.</li>
-<li class="ulchildlink"><strong><a href="../topics/taxis2td.html">Creating a Java bean skeleton from a WSDL document using the Apache Axis2 runtime environment</a></strong><br />
-The Web service wizard assists you in creating a skeleton bean from an existing WSDL document. The skeleton bean contains a set of methods that correspond to the operations described in the WSDL document. When the bean is created, each method has a trivial implementation that you replace by editing the bean.</li>
-<li class="ulchildlink"><strong><a href="../topics/taxis2client.html">Generating a Java client proxy and a sample application from a WSDL document using the Axis2 runtime environment</a></strong><br />
-The Web Service Client wizard assists you in generating a Java bean proxy and a sample application. The sample Web application demonstrates how to code a proxy file.</li>
-</ul>
+<div><div class="reltasks"><strong>Related tasks</strong><br />
+<div><a href="../topics/taxis2bu.html" title="The Web Service wizard assists you in creating a new Web service, configuring it for deployment, and deploying the Web service to a server. Once your Web service is deployed, the wizard assists you in generating the client proxy and sample application to test the Web service. When you have completed testing, you can publish your Web service to a UDDI Business Registry using the Export wizard.">Creating a Web service from a Java bean using the Apache Axis2 runtime environment</a></div>
+<div><a href="../topics/taxis2td.html" title="The Web service wizard assists you in creating a skeleton bean from an existing WSDL document. The skeleton bean contains a set of methods that correspond to the operations described in the WSDL document. When the bean is created, each method has a trivial implementation that you replace by editing the bean.">Creating a Java bean skeleton from a WSDL document using the Apache Axis2 runtime environment</a></div>
+<div><a href="../topics/taxis2client.html" title="The Web Service Client wizard assists you in generating a Java bean proxy and a sample application. The sample Web application demonstrates how to code a proxy file.">Generating a Java client proxy and a sample application from a WSDL document using the Axis2 runtime environment</a></div>
+</div>
 
 <div class="linklist"><strong>Related Concepts</strong><br />
 
diff --git a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2bu.dita b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2bu.dita
index 2fa33d7..0b03d68 100644
--- a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2bu.dita
+++ b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2bu.dita
@@ -41,8 +41,8 @@
 <context>To create a Web service from a bean using the Apache Axis2 runtime
 environment:</context>
 <steps>
-<step><cmd>Switch to the J2EE perspective (<uicontrol>Window > Open Perspective
-> J2EE</uicontrol>).</cmd></step>
+<step><cmd>Switch to the Java EE perspective (<uicontrol>Window > Open Perspective
+> Java EE</uicontrol>).</cmd></step>
 <step><cmd>In the Project Explorer view, select the bean that you created
 or imported into the source folder of your Web project.</cmd></step>
 <step><cmd>Click  <uicontrol>File > New > Other</uicontrol>.</cmd><info>Select<uicontrol>Web
diff --git a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2bu.html b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2bu.html
index cb98d8e..de0cdec 100644
--- a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2bu.html
+++ b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2bu.html
@@ -63,8 +63,8 @@
 environment:</div>
 
 <ol>
-<li class="stepexpand"><span>Switch to the J2EE perspective (<span class="uicontrol">Window &gt; Open Perspective
-&gt; J2EE</span>).</span></li>
+<li class="stepexpand"><span>Switch to the Java EE perspective (<span class="uicontrol">Window &gt; Open Perspective
+&gt; Java EE</span>).</span></li>
 
 <li class="stepexpand"><span>In the Project Explorer view, select the bean that you created
 or imported into the source folder of your Web project.</span></li>
@@ -217,9 +217,8 @@
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/caxis2tover.html" title="This runtime environment is for users who prefer to develop for the open Apache Axis platform. Both Axis1 and Axis2 are supported by the Web services tools.">Creating Web services with the Apache Axis2 runtime environments</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/caxis2tover.html" title="This runtime environment is for users who prefer to develop for the open Apache Axis platform. Both Axis1 and Axis2 are supported by the Web services tools.">Creating Web services with the Apache Axis2 runtime environments</a></div>
 </div>
 
 <div class="linklist"><strong>Related Concepts</strong><br />
diff --git a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2client.dita b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2client.dita
index 788084c..8f8a970 100644
--- a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2client.dita
+++ b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2client.dita
@@ -2,7 +2,6 @@
 <!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "task.dtd">
-<?Pub Inc?>
 <task id="tsampappa" xml:lang="en-us">
 <title>Generating a <tm tmclass="special" tmowner="Sun Microsystems, Inc."
 tmtype="tm" trademark="Java">Java</tm> client proxy and a sample application
@@ -22,7 +21,7 @@
 <taskbody>
 <prereq><p>Prerequisites:</p><ol>
 <li conref="taxis2bu.dita#twsbeana/installaxis2link"></li>
-<li conref="taxis2bu.dita#twsbeana/createtomcatlink"></li><?Pub Caret?>
+<li conref="taxis2bu.dita#twsbeana/createtomcatlink"></li>
 <li>Discover and import a WSDL document into the Web project. You can only
 use a WSDL file that contains a service element.</li>
 </ol></prereq>
@@ -30,8 +29,8 @@
 tmtype="tm" trademark="Java">Java</tm> client proxy and a sample application
 from a discovered WSDL document:</context>
 <steps>
-<step><cmd>Switch to the J2EE perspective (<uicontrol>Window > Open Perspective
-> J2EE</uicontrol>).</cmd></step>
+<step><cmd>Switch to the Java EE perspective (<uicontrol>Window > Open Perspective
+> Java EE</uicontrol>).</cmd></step>
 <step><cmd>In the Navigator view, select the Web project in which you want
 to generate a sample application.</cmd></step>
 <step><cmd>Click  <uicontrol>File > New > Other</uicontrol>. Select  <uicontrol>Web
@@ -143,4 +142,3 @@
 </linklist>
 </related-links>
 </task>
-<?Pub *0000008334?>
diff --git a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2client.html b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2client.html
index 296efad..34efe66 100644
--- a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2client.html
+++ b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2client.html
@@ -55,8 +55,8 @@
 from a discovered WSDL document:</div>
 
 <ol>
-<li><span>Switch to the J2EE perspective (<span class="uicontrol">Window &gt; Open Perspective
-&gt; J2EE</span>).</span></li>
+<li><span>Switch to the Java EE perspective (<span class="uicontrol">Window &gt; Open Perspective
+&gt; Java EE</span>).</span></li>
 
 <li><span>In the Navigator view, select the Web project in which you want
 to generate a sample application.</span></li>
@@ -193,9 +193,8 @@
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/caxis2tover.html" title="This runtime environment is for users who prefer to develop for the open Apache Axis platform. Both Axis1 and Axis2 are supported by the Web services tools.">Creating Web services with the Apache Axis2 runtime environments</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/caxis2tover.html" title="This runtime environment is for users who prefer to develop for the open Apache Axis platform. Both Axis1 and Axis2 are supported by the Web services tools.">Creating Web services with the Apache Axis2 runtime environments</a></div>
 </div>
 
 <div class="linklist"><strong>Related Concepts</strong><br />
diff --git a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2td.dita b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2td.dita
index 0e9c487..6f21bec 100644
--- a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2td.dita
+++ b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2td.dita
@@ -2,8 +2,7 @@
 <!--Arbortext, Inc., 1988-2006, v.4002-->
 <!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
  "../../dtd/task.dtd">
-<?Pub Inc?>
-<task id="tsklwsdla" xml:lang="en-us"><?Pub Caret?>
+<task id="tsklwsdla" xml:lang="en-us">
 <title>Creating a <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
 trademark="Java">Java</tm> bean skeleton from a WSDL document using the Apache
 Axis2 runtime environment</title>
@@ -31,8 +30,8 @@
 <context>To create a Web service from a WSDL file using the Apache Axis2 runtime
 environment:</context>
 <steps>
-<step><cmd>Switch to the J2EE perspective (<uicontrol>Window > Open Perspective
-> J2EE</uicontrol>).</cmd></step>
+<step><cmd>Switch to the Java EE perspective (<uicontrol>Window > Open Perspective
+> Java EE</uicontrol>).</cmd></step>
 <step><cmd>In the Project Explorer view, select the WSDL file that you created
 or imported into the Web Content folder of your Web project.</cmd></step>
 <step><cmd>Click  <uicontrol>File > New > Other</uicontrol>. Select  <uicontrol>Web
@@ -140,4 +139,3 @@
 </linklist>
 </related-links>
 </task>
-<?Pub *0000007842?>
diff --git a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2td.html b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2td.html
index 871eeb8..801990d 100644
--- a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2td.html
+++ b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/topics/taxis2td.html
@@ -59,8 +59,8 @@
 environment:</div>
 
 <ol>
-<li><span>Switch to the J2EE perspective (<span class="uicontrol">Window &gt; Open Perspective
-&gt; J2EE</span>).</span></li>
+<li><span>Switch to the Java EE perspective (<span class="uicontrol">Window &gt; Open Perspective
+&gt; Java EE</span>).</span></li>
 
 <li><span>In the Project Explorer view, select the WSDL file that you created
 or imported into the Web Content folder of your Web project.</span></li>
@@ -231,9 +231,8 @@
 
 </div>
 
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/caxis2tover.html" title="This runtime environment is for users who prefer to develop for the open Apache Axis platform. Both Axis1 and Axis2 are supported by the Web services tools.">Creating Web services with the Apache Axis2 runtime environments</a></div>
+<div><div class="relconcepts"><strong>Related concepts</strong><br />
+<div><a href="../topics/caxis2tover.html" title="This runtime environment is for users who prefer to develop for the open Apache Axis platform. Both Axis1 and Axis2 are supported by the Web services tools.">Creating Web services with the Apache Axis2 runtime environments</a></div>
 </div>
 
 <div class="linklist"><strong>Related Concepts</strong><br />
diff --git a/docs/org.eclipse.jst.ws.axis2.ui.doc.user/wsaxis2_reltable_toc.xml b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/wsaxis2_reltable_toc.xml
new file mode 100644
index 0000000..2a520d3
--- /dev/null
+++ b/docs/org.eclipse.jst.ws.axis2.ui.doc.user/wsaxis2_reltable_toc.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?NLS TYPE="org.eclipse.help.toc"?>
+
+<toc label="Reltable for Axis Web services docs"/>